packages (DEVEL): tomcat/tomcat-build.xml.patch - updated to 7.0.5

[baggins]

Author: baggins                      Date: Mon Dec  6 11:06:22 2010 GMT
Module: packages                      Tag: DEVEL
---- Log message:
- updated to 7.0.5

---- Files affected:
packages/tomcat:
   tomcat-build.xml.patch (1.2.2.6 -> 1.2.2.7) 

---- Diffs:

================================================================
Index: packages/tomcat/tomcat-build.xml.patch
diff -u packages/tomcat/tomcat-build.xml.patch:1.2.2.6 packages/tomcat/tomcat-build.xml.patch:1.2.2.7
--- packages/tomcat/tomcat-build.xml.patch:1.2.2.6	Thu Aug 12 09:56:47 2010
+++ packages/tomcat/tomcat-build.xml.patch	Mon Dec  6 12:06:17 2010
@@ -1,6 +1,6 @@
 --- apache-tomcat-7.0.2-src/build.xml.orig	2010-08-04 01:26:35.000000000 +0200
 +++ apache-tomcat-7.0.2-src/build.xml	2010-08-12 09:53:07.435556513 +0200
-@@ -410,21 +410,7 @@
+@@ -410,24 +410,7 @@
      
    </target>
  
@@ -14,6 +14,9 @@
 -        <exclude name="output/**"/>
 -        <exclude name="modules/**"/>
 -        <exclude name="**/*.mdl"/>
+-        <!-- Exclude these else Gump runs validate on them -->
+-        <exclude name="**/org/apache/tomcat/dbcp/**"/>
+-        <exclude name="**/tomcat-deps/**"/>
 -      </fileset>
 -    </checkstyle>
 -  </target>
@@ -46,36 +49,59 @@
      <mkdir dir="${test.classes}"/>
      <!-- Compile -->
      <javac srcdir="test" destdir="${test.classes}"
-@@ -1027,16 +1006,6 @@
-           depends="extras-prepare,compile,build-manifests"
-           description="Build JULI for log4j extras package">
+@@ -1027,51 +1006,10 @@
+     <mkdir dir="${tomcat.extras}/webservices"/>
+   </target>
  
+-  <target name="extras-commons-logging-prepare"
+-          depends="extras-prepare"
+-          description="Prepare to build web services extras package">
+-
 -    <antcall target="downloadfile">
 -      <param name="sourcefile" value="${commons-logging-src.loc}"/>
--      <param name="destfile" value="${tomcat.extras}/logging/commons-logging-src.tar.gz"/>
--      <param name="destdir" value="${tomcat.extras}/logging/"/>
+-      <param name="destfile" value="${commons-logging-src.tar.gz}"/>
+-      <param name="destdir" value="${commons-logging.home}"/>
+-    </antcall>
+-
+-    <antcall target="downloadfile">
+-      <param name="sourcefile" value="${avalon-framework.loc}"/>
+-      <param name="destfile" value="${avalon-framework.jar}"/>
+-      <param name="destdir" value="${avalon-framework.home}"/>
+-    </antcall>
+-
+-    <antcall target="downloadfile">
+-      <param name="sourcefile" value="${log4j.loc}"/>
+-      <param name="destfile" value="${log4j.jar}"/>
+-      <param name="destdir" value="${log4j.home}"/>
+-    </antcall>
+-
+-    <antcall target="downloadfile">
+-      <param name="sourcefile" value="${logkit.loc}"/>
+-      <param name="destfile" value="${logkit.jar}"/>
+-      <param name="destdir" value="${logkit.home}"/>
 -    </antcall>
--    <gunzip src="${tomcat.extras}/logging/commons-logging-src.tar.gz"
+-
+-    <antcall target="downloadfile">
+-      <param name="sourcefile" value="${servletapi.loc}"/>
+-      <param name="destfile" value="${servletapi.jar}"/>
+-      <param name="destdir" value="${servletapi.home}"/>
+-    </antcall>
+-
+-  </target>
+-
+   <target name="extras-commons-logging"
+-          depends="extras-commons-logging-prepare,compile,build-manifests"
++          depends="extras-prepare,compile,build-manifests"
+           description="Build JULI for log4j extras package">
+ 
+-    <gunzip src="${commons-logging-src.tar.gz}"
 -      dest="${tomcat.extras}/logging/commons-logging-src.tar"/>
 -    <untar src="${tomcat.extras}/logging/commons-logging-src.tar"
 -      dest="${tomcat.extras}/logging/"/>
 -
-     <replace dir="${tomcat.extras}/logging/commons-logging-${commons-logging-version}-src/src/java/org/apache/commons"
+     <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"
-@@ -1059,12 +1028,6 @@
- 
-     <ant antfile="${tomcat.extras}/logging/commons-logging-${commons-logging-version}-src/build2.xml"
-          dir="${tomcat.extras}/logging/commons-logging-${commons-logging-version}-src"
--         target="getlibs" />
--    <copy todir="${tomcat.extras}/logging/commons-logging-${commons-logging-version}-src">
--      <fileset dir="${tomcat.extras}/logging/commons-logging-${commons-logging-version}-src/lib" />
--    </copy>
--    <ant antfile="${tomcat.extras}/logging/commons-logging-${commons-logging-version}-src/build2.xml"
--         dir="${tomcat.extras}/logging/commons-logging-${commons-logging-version}-src"
-          target="compile" />
- 
-     <jar jarfile="${tomcat-juli-extras.jar}"
 @@ -1137,18 +1100,6 @@
            depends="extras-prepare"
            description="Prepare to build web services extras package">
@@ -346,6 +372,6 @@
 -    <get src="${sourcefile}" dest="${destfile}" />
 -  </target>
 -
-   <!-- ======================= Macros, Taskdefs etc ======================== -->
+   <!-- ============================ IDE Support ============================ -->
  
-   <macrodef name="jarIt" description="utility macro for standard JAR packaging">
+   <target name="ide-eclipse" depends="deploy, extras-webservices-prepare"
================================================================

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