packages (DEVEL): tomcat/tomcat-build.xml.patch - just don't copy those jars

baggins baggins at pld-linux.org
Mon Dec 6 12:31:15 CET 2010


Author: baggins                      Date: Mon Dec  6 11:31:15 2010 GMT
Module: packages                      Tag: DEVEL
---- Log message:
- just don't copy those jars

---- Files affected:
packages/tomcat:
   tomcat-build.xml.patch (1.2.2.8 -> 1.2.2.9) 

---- Diffs:

================================================================
Index: packages/tomcat/tomcat-build.xml.patch
diff -u packages/tomcat/tomcat-build.xml.patch:1.2.2.8 packages/tomcat/tomcat-build.xml.patch:1.2.2.9
--- packages/tomcat/tomcat-build.xml.patch:1.2.2.8	Mon Dec  6 12:14:50 2010
+++ packages/tomcat/tomcat-build.xml.patch	Mon Dec  6 12:31:09 2010
@@ -102,16 +102,20 @@
      <replace dir="${tomcat.extras}/logging/commons-logging-${commons-logging.version}-src/src/java/org/apache/commons"
          encoding="ISO-8859-1">
        <replacefilter token="org.apache.commons"
-@@ -1050,7 +1000,8 @@
+@@ -1050,13 +1000,6 @@
+     <copy tofile="${tomcat.extras}/logging/commons-logging-${commons-logging.version}-src/build2.xml"
        file="${tomcat.extras}/logging/commons-logging-${commons-logging.version}-src/build.xml" />
  
-     <copy todir="${tomcat.extras}/logging/commons-logging-${commons-logging.version}-src">
--      <fileset file="${avalon-framework.jar}" />
-+      <fileset file="${avalon-framework-api.jar}" />
-+      <fileset file="${avalon-framework-impl.jar}" />
-       <fileset file="${log4j.jar}" />
-       <fileset file="${logkit.jar}" />
-       <fileset file="${servletapi.jar}" />
+-    <copy todir="${tomcat.extras}/logging/commons-logging-${commons-logging.version}-src">
+-      <fileset file="${avalon-framework-api.jar}" />
+-      <fileset file="${avalon-framework-impl.jar}" />
+-      <fileset file="${log4j.jar}" />
+-      <fileset file="${logkit.jar}" />
+-      <fileset file="${servletapi.jar}" />
+-    </copy>
+ 
+     <ant antfile="${tomcat.extras}/logging/commons-logging-${commons-logging.version}-src/build2.xml"
+          dir="${tomcat.extras}/logging/commons-logging-${commons-logging.version}-src"
 @@ -1137,18 +1100,6 @@
            depends="extras-prepare"
            description="Prepare to build web services extras package">
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/tomcat/tomcat-build.xml.patch?r1=1.2.2.8&r2=1.2.2.9&f=u



More information about the pld-cvs-commit mailing list