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

[pawelz]

Author: pawelz                       Date: Tue Jun 29 11:56:54 2010 GMT
Module: packages                      Tag: DEVEL
---- Log message:
- updated for tomcat-7.0.0-beta

---- Files affected:
packages/tomcat:
   tomcat-build.xml.patch (1.2.2.4 -> 1.2.2.5) 

---- Diffs:

================================================================
Index: packages/tomcat/tomcat-build.xml.patch
diff -u packages/tomcat/tomcat-build.xml.patch:1.2.2.4 packages/tomcat/tomcat-build.xml.patch:1.2.2.5
--- packages/tomcat/tomcat-build.xml.patch:1.2.2.4	Thu Jun 10 10:34:17 2010
+++ packages/tomcat/tomcat-build.xml.patch	Tue Jun 29 13:56:49 2010
@@ -1,6 +1,6 @@
---- tomcat-7.0.0/build.xml.orig	2010-06-10 09:45:49.000000000 +0200
-+++ tomcat-7.0.0/build.xml	2010-06-10 09:43:07.000000000 +0200
-@@ -408,7 +408,7 @@
+--- apache-tomcat-7.0.0-src/build.xml.orig	2010-06-13 16:55:18.000000000 +0200
++++ apache-tomcat-7.0.0-src/build.xml	2010-06-29 13:52:40.000000000 +0200
+@@ -409,7 +409,7 @@
    	
    </target>
  
@@ -9,7 +9,7 @@
  
      <!-- Compile internal server components -->
      <javac srcdir="java" destdir="${tomcat.classes}"
-@@ -667,13 +667,6 @@
+@@ -668,13 +668,6 @@
    <target name="deploy" depends="package,build-docs"
            description="Default. Builds a working Tomcat instance">
  
@@ -23,7 +23,7 @@
      <!-- Copy scripts -->
      <copy todir="${tomcat.build}/bin">
        <fileset dir="bin">
-@@ -892,7 +885,7 @@
+@@ -893,7 +886,7 @@
  	      description="Creates the experimental embedded release"
  	      depends="embed,embed-sources,embed-extras" />
  
@@ -32,7 +32,7 @@
      <mkdir dir="${test.classes}"/>
      <!-- Compile -->
      <javac srcdir="test" destdir="${test.classes}"
-@@ -954,16 +947,6 @@
+@@ -955,16 +948,6 @@
    	      depends="extras-prepare,compile,build-manifests"
            description="Build JULI for log4j extras package">
  
@@ -49,7 +49,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"
-@@ -986,12 +969,6 @@
+@@ -987,12 +970,6 @@
  
      <ant antfile="${tomcat.extras}/logging/commons-logging-${commons-logging-version}-src/build2.xml"
           dir="${tomcat.extras}/logging/commons-logging-${commons-logging-version}-src"
@@ -62,7 +62,7 @@
           target="compile" />
  
      <jar jarfile="${tomcat-juli-extras.jar}"
-@@ -1064,18 +1041,6 @@
+@@ -1065,18 +1042,6 @@
            depends="extras-prepare,compile,build-manifests"
            description="Build web services extras package">
  
@@ -81,16 +81,16 @@
      <copy file="${jaxrpc-lib.jar}"
            tofile="${tomcat.extras}/webservices/jaxrpc.jar" />
      <copy file="${wsdl4j-lib.jar}"
-@@ -1176,7 +1141,7 @@
+@@ -1177,7 +1142,7 @@
  
    </target>
  
 -  <target name="dist-prepare" depends="download-dist">
 +  <target name="dist-prepare">
-     <!-- This is why releasing must be done on Windows / with wine:
-          otherwise this check fails and the .exe distro is not generated -->
-     <condition property="execute.installer">
-@@ -1843,232 +1808,7 @@
+     <mkdir dir="${tomcat.dist}"/>
+     <mkdir dir="${tomcat.dist}/bin"/>
+     <mkdir dir="${tomcat.dist}/conf"/>
+@@ -1832,232 +1797,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.4&r2=1.2.2.5&f=u