packages (DEVEL): tomcat/tomcat-build.xml.patch - updated for tomcat-7.0.2
pawelz
pawelz at pld-linux.org
Thu Aug 12 09:56:52 CEST 2010
Author: pawelz Date: Thu Aug 12 07:56:52 2010 GMT
Module: packages Tag: DEVEL
---- Log message:
- updated for tomcat-7.0.2
---- Files affected:
packages/tomcat:
tomcat-build.xml.patch (1.2.2.5 -> 1.2.2.6)
---- Diffs:
================================================================
Index: packages/tomcat/tomcat-build.xml.patch
diff -u packages/tomcat/tomcat-build.xml.patch:1.2.2.5 packages/tomcat/tomcat-build.xml.patch:1.2.2.6
--- packages/tomcat/tomcat-build.xml.patch:1.2.2.5 Tue Jun 29 13:56:49 2010
+++ packages/tomcat/tomcat-build.xml.patch Thu Aug 12 09:56:47 2010
@@ -1,15 +1,29 @@
---- 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 @@
-
+--- 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 @@
+
</target>
-- <target name="compile" depends="build-prepare,download-compile">
+- <target name="validate" depends="download-validate" if="${execute.validate}">
+- <taskdef resource="checkstyletask.properties"
+- classpath="${checkstyle.jar}" />
+- <checkstyle config="checkstyle.xml">
+- <fileset dir="." >
+- <patternset refid="text.files" />
+- <exclude name=".*/**"/>
+- <exclude name="output/**"/>
+- <exclude name="modules/**"/>
+- <exclude name="**/*.mdl"/>
+- </fileset>
+- </checkstyle>
+- </target>
+-
+- <target name="compile" depends="build-prepare,download-compile,validate">
+ <target name="compile" depends="build-prepare">
<!-- Compile internal server components -->
<javac srcdir="java" destdir="${tomcat.classes}"
-@@ -668,13 +668,6 @@
+@@ -701,13 +687,6 @@
<target name="deploy" depends="package,build-docs"
description="Default. Builds a working Tomcat instance">
@@ -23,17 +37,17 @@
<!-- Copy scripts -->
<copy todir="${tomcat.build}/bin">
<fileset dir="bin">
-@@ -893,7 +886,7 @@
- description="Creates the experimental embedded release"
- depends="embed,embed-sources,embed-extras" />
+@@ -928,7 +907,7 @@
+ description="Creates the experimental embedded release"
+ depends="embed,embed-sources,embed-extras" />
- <target name="test-compile" depends="compile,download-test-compile" >
+ <target name="test-compile" depends="compile" >
<mkdir dir="${test.classes}"/>
<!-- Compile -->
<javac srcdir="test" destdir="${test.classes}"
-@@ -955,16 +948,6 @@
- depends="extras-prepare,compile,build-manifests"
+@@ -1027,16 +1006,6 @@
+ depends="extras-prepare,compile,build-manifests"
description="Build JULI for log4j extras package">
- <antcall target="downloadfile">
@@ -49,7 +63,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"
-@@ -987,12 +970,6 @@
+@@ -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"
@@ -62,9 +76,9 @@
target="compile" />
<jar jarfile="${tomcat-juli-extras.jar}"
-@@ -1065,18 +1042,6 @@
- depends="extras-prepare,compile,build-manifests"
- description="Build web services extras package">
+@@ -1137,18 +1100,6 @@
+ depends="extras-prepare"
+ description="Prepare to build web services extras package">
- <antcall target="downloadfile">
- <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
@@ -81,7 +95,7 @@
<copy file="${jaxrpc-lib.jar}"
tofile="${tomcat.extras}/webservices/jaxrpc.jar" />
<copy file="${wsdl4j-lib.jar}"
-@@ -1177,7 +1142,7 @@
+@@ -1255,7 +1206,7 @@
</target>
@@ -90,16 +104,27 @@
<mkdir dir="${tomcat.dist}"/>
<mkdir dir="${tomcat.dist}/bin"/>
<mkdir dir="${tomcat.dist}/conf"/>
-@@ -1832,232 +1797,7 @@
- description="Delete the default output folders">
+@@ -1968,244 +1919,6 @@
<delete dir="${tomcat.output}" />
</target>
--
-
+
+-
- <!-- ================ Download and dependency building =================== -->
-
+- <target name="download-validate"
+- description="Download components necessary to validate source"
+- if="${execute.validate}">
+-
+- <antcall target="downloadzip">
+- <param name="sourcefile" value="${checkstyle.loc}"/>
+- <param name="destfile" value="${checkstyle.jar}"/>
+- <param name="destdir" value="${base.path}"/>
+- </antcall>
+-
+- </target>
+-
- <target name="download-compile"
-- description="Download (and build) components necessary to compile" >
+- description="Download (and build) components necessary to compile" >
-
- <antcall target="downloadfile">
- <param name="sourcefile" value="${tomcat-native.loc}"/>
@@ -232,12 +257,13 @@
- target="${compile.target}"
- sourcepath="${tomcat-dbcp.home}/src/java"
- srcdir="${tomcat-dbcp.home}/src/java"
-- encoding="ISO-8859-1">
+- encoding="ISO-8859-1"
+- includeantruntime="false">
- <include name="**" />
- </javac>
-- <jarIt jarfile="${tomcat-dbcp.jar}"
-- filesDir="${tomcat-dbcp.home}/classes"
-- filesId="files.tomcat-dbcp" />
+- <jarIt jarfile="${tomcat-dbcp.jar}"
+- filesDir="${tomcat-dbcp.home}/classes"
+- filesId="files.tomcat-dbcp" />
- <jarIt jarfile="${tomcat-dbcp-src.jar}"
- filesDir="${tomcat-dbcp.home}/src/java"
- filesId="files.tomcat-dbcp" />
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/tomcat/tomcat-build.xml.patch?r1=1.2.2.5&r2=1.2.2.6&f=u
More information about the pld-cvs-commit
mailing list