packages (DEVEL): tomcat/tomcat-build.xml.patch - updated for tomcat 7.0.6
pawelz
pawelz at pld-linux.org
Fri Feb 4 20:18:36 CET 2011
Author: pawelz Date: Fri Feb 4 19:18:36 2011 GMT
Module: packages Tag: DEVEL
---- Log message:
- updated for tomcat 7.0.6
---- Files affected:
packages/tomcat:
tomcat-build.xml.patch (1.2.2.10 -> 1.2.2.11)
---- Diffs:
================================================================
Index: packages/tomcat/tomcat-build.xml.patch
diff -u packages/tomcat/tomcat-build.xml.patch:1.2.2.10 packages/tomcat/tomcat-build.xml.patch:1.2.2.11
--- packages/tomcat/tomcat-build.xml.patch:1.2.2.10 Mon Dec 6 12:45:15 2010
+++ packages/tomcat/tomcat-build.xml.patch Fri Feb 4 20:18:31 2011
@@ -1,24 +1,38 @@
---- 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,24 +410,7 @@
+--- 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 @@
</target>
- <target name="validate" depends="download-validate" if="${execute.validate}">
- <taskdef resource="checkstyletask.properties"
- classpath="${checkstyle.jar}" />
-- <checkstyle config="checkstyle.xml">
+- <checkstyle config="res/checkstyle/checkstyle.xml">
- <fileset dir="." >
- <patternset refid="text.files" />
- <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 these else Gump runs validate on them -->
- <exclude name="**/org/apache/tomcat/dbcp/**"/>
- <exclude name="**/tomcat-deps/**"/>
- </fileset>
- </checkstyle>
+- <!-- javax package checks -->
+- <checkstyle config="res/checkstyle/javax-checkstyle.xml">
+- <fileset dir="java/javax" >
+- <include name="**/*.java"/>
+- </fileset>
+- </checkstyle>
+- <!-- org package checks -->
+- <checkstyle config="res/checkstyle/org-checkstyle.xml">
+- <fileset dir="java/org" >
+- <include name="**/*.java"/>
+- </fileset>
+- </checkstyle>
- </target>
-
- <target name="compile" depends="build-prepare,download-compile,validate">
@@ -26,7 +40,7 @@
<!-- Compile internal server components -->
<javac srcdir="java" destdir="${tomcat.classes}"
-@@ -701,13 +687,6 @@
+@@ -732,13 +701,6 @@
<target name="deploy" depends="package,build-docs"
description="Default. Builds a working Tomcat instance">
@@ -40,16 +54,16 @@
<!-- Copy scripts -->
<copy todir="${tomcat.build}/bin">
<fileset dir="bin">
-@@ -928,7 +907,7 @@
- description="Creates the experimental embedded release"
- depends="embed,embed-sources,embed-extras" />
+@@ -994,7 +956,7 @@
+
+ </target>
- <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}"
-@@ -1027,51 +1006,10 @@
+@@ -1091,52 +1053,10 @@
<mkdir dir="${tomcat.extras}/webservices"/>
</target>
@@ -57,8 +71,9 @@
- depends="extras-prepare"
- description="Prepare to build web services extras package">
-
-- <antcall target="downloadfile">
-- <param name="sourcefile" value="${commons-logging-src.loc}"/>
+- <antcall target="downloadfile-2">
+- <param name="sourcefile.1" value="${commons-logging-src.loc.1}"/>
+- <param name="sourcefile.2" value="${commons-logging-src.loc.2}"/>
- <param name="destfile" value="${commons-logging-src.tar.gz}"/>
- <param name="destdir" value="${commons-logging.home}"/>
- </antcall>
@@ -102,7 +117,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"
-@@ -1050,7 +1000,8 @@
+@@ -1158,7 +1078,8 @@
file="${tomcat.extras}/logging/commons-logging-${commons-logging.version}-src/build.xml" />
<copy todir="${tomcat.extras}/logging/commons-logging-${commons-logging.version}-src">
@@ -112,7 +127,7 @@
<fileset file="${log4j.jar}" />
<fileset file="${logkit.jar}" />
<fileset file="${servletapi.jar}" />
-@@ -1137,18 +1100,6 @@
+@@ -1238,18 +1159,6 @@
depends="extras-prepare"
description="Prepare to build web services extras package">
@@ -131,7 +146,7 @@
<copy file="${jaxrpc-lib.jar}"
tofile="${tomcat.extras}/webservices/jaxrpc.jar" />
<copy file="${wsdl4j-lib.jar}"
-@@ -1255,7 +1206,7 @@
+@@ -1356,7 +1265,7 @@
</target>
@@ -140,11 +155,12 @@
<mkdir dir="${tomcat.dist}"/>
<mkdir dir="${tomcat.dist}/bin"/>
<mkdir dir="${tomcat.dist}/conf"/>
-@@ -1968,244 +1919,6 @@
+@@ -2080,301 +1989,7 @@
+ description="Delete the default output folders">
<delete dir="${tomcat.output}" />
</target>
-
--
+-
+
- <!-- ================ Download and dependency building =================== -->
-
- <target name="download-validate"
@@ -162,31 +178,36 @@
- <target name="download-compile"
- description="Download (and build) components necessary to compile" >
-
-- <antcall target="downloadfile">
-- <param name="sourcefile" value="${tomcat-native.loc}"/>
+- <antcall target="downloadfile-2">
+- <param name="sourcefile.1" value="${tomcat-native.loc.1}"/>
+- <param name="sourcefile.2" value="${tomcat-native.loc.2}"/>
- <param name="destfile" value="${tomcat-native.tar.gz}"/>
- <param name="destdir" value="${tomcat-native.home}"/>
- </antcall>
-
- <!-- Download Commons Daemon -->
-- <antcall target="downloadgz">
-- <param name="sourcefile" value="${commons-daemon.bin.loc}"/>
+- <antcall target="downloadgz-2">
+- <param name="sourcefile.1" value="${commons-daemon.bin.loc.1}"/>
+- <param name="sourcefile.2" value="${commons-daemon.bin.loc.2}"/>
- <param name="destfile" value="${commons-daemon.jar}"/>
- </antcall>
-
-- <antcall target="downloadfile">
-- <param name="sourcefile" value="${commons-daemon.native.src.loc}"/>
+- <antcall target="downloadfile-2">
+- <param name="sourcefile.1" value="${commons-daemon.native.src.loc.1}"/>
+- <param name="sourcefile.2" value="${commons-daemon.native.src.loc.2}"/>
- <param name="destfile" value="${commons-daemon.native.src.tgz}"/>
- <param name="destdir" value="${commons-daemon.home}"/>
- </antcall>
-
- <!-- Download src and build Tomcat DBCP bundle -->
-- <antcall target="downloadgz">
-- <param name="sourcefile" value="${commons-pool-src.loc}"/>
+- <antcall target="downloadgz-2">
+- <param name="sourcefile.1" value="${commons-pool-src.loc.1}"/>
+- <param name="sourcefile.2" value="${commons-pool-src.loc.2}"/>
- <param name="destfile" value="${commons-pool.home}/build.xml" />
- </antcall>
-- <antcall target="downloadgz">
-- <param name="sourcefile" value="${commons-dbcp-src.loc}"/>
+- <antcall target="downloadgz-2">
+- <param name="sourcefile.1" value="${commons-dbcp-src.loc.1}"/>
+- <param name="sourcefile.2" value="${commons-dbcp-src.loc.2}"/>
- <param name="destfile" value="${commons-dbcp.home}/build.xml" />
- </antcall>
- <mkdir dir="${tomcat-dbcp.home}"/>
@@ -221,26 +242,30 @@
- <target name="download-dist"
- description="Download additional components for a distribution" >
-
-- <antcall target="downloadfile">
-- <param name="sourcefile" value="${tomcat-native.dll}/win32/tcnative-1.dll"/>
+- <antcall target="downloadfile-2">
+- <param name="sourcefile.1" value="${tomcat-native.dll.1}/win32/tcnative-1.dll"/>
+- <param name="sourcefile.2" value="${tomcat-native.dll.2}/win32/tcnative-1.dll"/>
- <param name="destfile" value="${tomcat-native.dll.win32}"/>
- <param name="destdir" value="${tomcat-native.home}"/>
- </antcall>
-
-- <antcall target="downloadfile">
-- <param name="sourcefile" value="${tomcat-native.dll}/win64/x64/tcnative-1.dll"/>
+- <antcall target="downloadfile-2">
+- <param name="sourcefile.1" value="${tomcat-native.dll.1}/win64/x64/tcnative-1.dll"/>
+- <param name="sourcefile.2" value="${tomcat-native.dll.2}/win64/x64/tcnative-1.dll"/>
- <param name="destfile" value="${tomcat-native.dll.x64}"/>
- <param name="destdir" value="${tomcat-native.home}"/>
- </antcall>
-
-- <antcall target="downloadfile">
-- <param name="sourcefile" value="${tomcat-native.dll}/win64/ia64/tcnative-1.dll"/>
+- <antcall target="downloadfile-2">
+- <param name="sourcefile.1" value="${tomcat-native.dll.1}/win64/ia64/tcnative-1.dll"/>
+- <param name="sourcefile.2" value="${tomcat-native.dll.2}/win64/ia64/tcnative-1.dll"/>
- <param name="destfile" value="${tomcat-native.dll.i64}"/>
- <param name="destdir" value="${tomcat-native.home}"/>
- </antcall>
-
-- <antcall target="downloadzip">
-- <param name="sourcefile" value="${commons-daemon.native.win.loc}"/>
+- <antcall target="downloadzip-2">
+- <param name="sourcefile.1" value="${commons-daemon.native.win.loc.1}"/>
+- <param name="sourcefile.2" value="${commons-daemon.native.win.loc.2}"/>
- <param name="destfile" value="${commons-daemon.native.win.mgr.exe}"/>
- <param name="destdir" value="${commons-daemon.native.win.home}"/>
- </antcall>
@@ -336,6 +361,24 @@
- <delete file="${base.path}/file.tar.gz"/>
- </target>
-
+- <target name="downloadgz-2" unless="exist" depends="setproxy,testexist">
+- <!-- Download and extract the package from the two alternative locations -->
+- <delete file="${base.path}/file.tar" quiet="true" />
+- <delete file="${base.path}/file.tar.gz" quiet="true" />
+- <antcall target="trydownload">
+- <param name="sourcefile" value="${sourcefile.1}" />
+- <param name="destfile" value="${base.path}/file.tar.gz" />
+- </antcall>
+- <antcall target="trydownload">
+- <param name="sourcefile" value="${sourcefile.2}" />
+- <param name="destfile" value="${base.path}/file.tar.gz" />
+- </antcall>
+- <gunzip src="${base.path}/file.tar.gz" dest="${base.path}/file.tar"/>
+- <untar src="${base.path}/file.tar" dest="${base.path}"/>
+- <delete file="${base.path}/file.tar"/>
+- <delete file="${base.path}/file.tar.gz"/>
+- </target>
+-
- <target name="downloadzip" unless="exist" depends="setproxy,testexist">
- <!-- Download and extract the package -->
- <get src="${sourcefile}" dest="${base.path}/file.zip" />
@@ -344,6 +387,22 @@
- <delete file="${base.path}/file.zip"/>
- </target>
-
+- <target name="downloadzip-2" unless="exist" depends="testexist">
+- <!-- Download and extract the package from the two alternative locations -->
+- <delete file="${base.path}/file.zip" quiet="true" />
+- <antcall target="trydownload">
+- <param name="sourcefile" value="${sourcefile.1}" />
+- <param name="destfile" value="${base.path}/file.zip" />
+- </antcall>
+- <antcall target="trydownload">
+- <param name="sourcefile" value="${sourcefile.2}" />
+- <param name="destfile" value="${base.path}/file.zip" />
+- </antcall>
+- <mkdir dir="${destdir}" />
+- <unzip src="${base.path}/file.zip" dest="${destdir}"/>
+- <delete file="${base.path}/file.zip"/>
+- </target>
+-
- <target name="downloadfile" unless="exist" depends="setproxy,testexist">
- <!-- Download extract the file -->
- <mkdir dir="${destdir}" />
@@ -382,6 +441,19 @@
- <get src="${sourcefile}" dest="${destfile}" />
- </target>
-
- <!-- ============================ IDE Support ============================ -->
+- <!-- ============================ IDE Support ============================ -->
+-
+- <target name="ide-eclipse" depends="deploy, extras-webservices-prepare"
+- description="Prepares the source tree to be built in Eclipse">
+-
+- <!-- Copy the sample project files into the root directory -->
+- <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/>
+- <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.classpath" tofile="${tomcat.home}/.classpath"/>
+-
+- <echo>Eclipse project files created.
+-Read the Building page on the Apache Tomcat documentation site for details on how to configure your Eclipse workplace.</echo>
+- </target>
+-
+ <!-- ======================= Macros, Taskdefs etc ======================== -->
- <target name="ide-eclipse" depends="deploy, extras-webservices-prepare"
+ <macrodef name="jarIt" description="utility macro for standard JAR packaging">
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/tomcat/tomcat-build.xml.patch?r1=1.2.2.10&r2=1.2.2.11&f=u
More information about the pld-cvs-commit
mailing list