packages (DEVEL): tomcat/tomcat-build.xml.patch - updated for 7.0.8

[pawelz]

Author: pawelz                       Date: Sat Feb  5 13:01:29 2011 GMT
Module: packages                      Tag: DEVEL
---- Log message:
- updated for 7.0.8

---- Files affected:
packages/tomcat:
   tomcat-build.xml.patch (1.2.2.11 -> 1.2.2.12) 

---- Diffs:

================================================================
Index: packages/tomcat/tomcat-build.xml.patch
diff -u packages/tomcat/tomcat-build.xml.patch:1.2.2.11 packages/tomcat/tomcat-build.xml.patch:1.2.2.12
--- packages/tomcat/tomcat-build.xml.patch:1.2.2.11	Fri Feb  4 20:18:31 2011
+++ packages/tomcat/tomcat-build.xml.patch	Sat Feb  5 14:01:23 2011
@@ -1,6 +1,6 @@
---- apache-tomcat-7.0.6-src/build.xml.orig	2011-01-10 18:29:33.000000000 +0100
-+++ apache-tomcat-7.0.6-src/build.xml	2011-02-04 20:08:08.665489865 +0100
-@@ -419,38 +419,7 @@
+--- apache-tomcat-7.0.8-src/build.xml.orig	2011-02-04 13:52:30.000000000 +0100
++++ apache-tomcat-7.0.8-src/build.xml	2011-02-05 13:57:36.775158905 +0100
+@@ -421,48 +421,7 @@
      
    </target>
  
@@ -10,12 +10,22 @@
 -    <checkstyle config="res/checkstyle/checkstyle.xml">
 -      <fileset dir="." >
 -        <patternset refid="text.files" />
+-        <include name="**/*.bat"/>
+-        <include name="**/*.sh"/>
+-        <exclude name="bin/setenv.*"/>
 -        <exclude name=".*/**"/>
 -        <exclude name="output/**"/>
 -        <exclude name="modules/**"/>
 -        <exclude name="**/*.mdl"/>
--        <!-- Exclude auto-generated files with known errors -->
--        <exclude name="java/org/apache/el/parser/ELParser.java" />
+-        <exclude name="**/*_2.xml"/>
+-        <exclude name="res/checkstyle/header-al2.txt"/>
+-        <!-- Exclude auto-generated files -->
+-        <exclude name="java/org/apache/el/parser/ELParser*.java" />
+-        <exclude name="java/org/apache/el/parser/JJTELParserState.java" />
+-        <exclude name="java/org/apache/el/parser/Node.java" />
+-        <exclude name="java/org/apache/el/parser/ParseException.java" />
+-        <exclude name="java/org/apache/el/parser/SimpleCharStream.java" />
+-        <exclude name="java/org/apache/el/parser/Token*.java" />
 -        <!-- Exclude these else Gump runs validate on them -->
 -        <exclude name="**/org/apache/tomcat/dbcp/**"/>
 -        <exclude name="**/tomcat-deps/**"/>
@@ -40,7 +50,7 @@
  
      <!-- Compile internal server components -->
      <javac srcdir="java" destdir="${tomcat.classes}"
-@@ -732,13 +701,6 @@
+@@ -744,13 +703,6 @@
    <target name="deploy" depends="package,build-docs"
            description="Default. Builds a working Tomcat instance">
  
@@ -54,7 +64,7 @@
      <!-- Copy scripts -->
      <copy todir="${tomcat.build}/bin">
        <fileset dir="bin">
-@@ -994,7 +956,7 @@
+@@ -1006,7 +958,7 @@
  
    </target>
  
@@ -63,7 +73,7 @@
      <mkdir dir="${test.classes}"/>
      <!-- Compile -->
      <javac srcdir="test" destdir="${test.classes}"
-@@ -1091,52 +1053,10 @@
+@@ -1103,52 +1055,10 @@
      <mkdir dir="${tomcat.extras}/webservices"/>
    </target>
  
@@ -117,7 +127,7 @@
      <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"
-@@ -1158,7 +1078,8 @@
+@@ -1170,7 +1080,8 @@
        file="${tomcat.extras}/logging/commons-logging-${commons-logging.version}-src/build.xml" />
  
      <copy todir="${tomcat.extras}/logging/commons-logging-${commons-logging.version}-src">
@@ -127,7 +137,7 @@
        <fileset file="${log4j.jar}" />
        <fileset file="${logkit.jar}" />
        <fileset file="${servletapi.jar}" />
-@@ -1238,18 +1159,6 @@
+@@ -1250,18 +1161,6 @@
            depends="extras-prepare"
            description="Prepare to build web services extras package">
  
@@ -146,7 +156,7 @@
      <copy file="${jaxrpc-lib.jar}"
            tofile="${tomcat.extras}/webservices/jaxrpc.jar" />
      <copy file="${wsdl4j-lib.jar}"
-@@ -1356,7 +1265,7 @@
+@@ -1368,7 +1267,7 @@
  
    </target>
  
@@ -155,7 +165,7 @@
      <mkdir dir="${tomcat.dist}"/>
      <mkdir dir="${tomcat.dist}/bin"/>
      <mkdir dir="${tomcat.dist}/conf"/>
-@@ -2080,301 +1989,7 @@
+@@ -2092,301 +1991,7 @@
            description="Delete the default output folders">
      <delete dir="${tomcat.output}" />
    </target>
================================================================

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