packages (DEVEL): tomcat/tomcat-build.xml.patch - revert

[baggins]

Author: baggins                      Date: Mon Dec  6 11:45:20 2010 GMT
Module: packages                      Tag: DEVEL
---- Log message:
- revert

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

---- Diffs:

================================================================
Index: packages/tomcat/tomcat-build.xml.patch
diff -u packages/tomcat/tomcat-build.xml.patch:1.2.2.9 packages/tomcat/tomcat-build.xml.patch:1.2.2.10
--- packages/tomcat/tomcat-build.xml.patch:1.2.2.9	Mon Dec  6 12:31:09 2010
+++ packages/tomcat/tomcat-build.xml.patch	Mon Dec  6 12:45:15 2010
@@ -102,20 +102,16 @@
      <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,13 +1000,6 @@
-     <copy tofile="${tomcat.extras}/logging/commons-logging-${commons-logging.version}-src/build2.xml"
+@@ -1050,7 +1000,8 @@
        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-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"
+     <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}" />
 @@ -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.9&r2=1.2.2.10&f=u