packages: tomcat/apache-tomcat.init, tomcat/server.xml-URIEncoding-utf8.pat...
baggins
baggins at pld-linux.org
Wed Apr 13 11:51:41 CEST 2011
Author: baggins Date: Wed Apr 13 09:51:41 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- merged from DEVEL
---- Files affected:
packages/tomcat:
apache-tomcat.init (1.21 -> 1.22) , server.xml-URIEncoding-utf8.patch (1.1 -> 1.2) , tomcat-LDAPUserDatabase.patch (1.3 -> 1.4) , tomcat-build.properties (1.3 -> 1.4) , tomcat-build.xml.patch (1.3 -> 1.4) , tomcat-userdir.patch (1.1 -> 1.2) , tomcat.spec (1.186 -> 1.187) , jcl-build.xml.patch (1.1 -> 1.2)
---- Diffs:
================================================================
Index: packages/tomcat/apache-tomcat.init
diff -u packages/tomcat/apache-tomcat.init:1.21 packages/tomcat/apache-tomcat.init:1.22
--- packages/tomcat/apache-tomcat.init:1.21 Fri Jan 28 00:34:57 2011
+++ packages/tomcat/apache-tomcat.init Wed Apr 13 11:51:36 2011
@@ -47,9 +47,7 @@
JSVC_OPTS="-classpath ${CLASSPATH} \
-home ${JAVA_HOME} \
- -pidfile /var/run/tomcat.pid \
- -outfile /var/log/tomcat/catalina.out \
- -errfile /var/log/tomcat/catalina.err"
+ -pidfile /var/run/tomcat.pid"
if is_yes "${SECURITY_MANAGER}"; then
CATALINA_OPTS="$CATALINA_OPTS \
@@ -73,8 +71,10 @@
-Dcatalina.home=${CATALINA_HOME} \
-Djava.io.tmpdir=${CATALINA_TMPDIR} \
-Djava.library.path=/usr/lib64:/usr/lib \
+ -Djava.util.logging.config.file="${CATALINA_BASE}/conf/logging.properties" \
+ -Djava.util.logging.manager="org.apache.juli.ClassLoaderLogManager" \
$CATALINA_OPTS \
- org.apache.catalina.startup.Bootstrap
+ org.apache.catalina.startup.Bootstrap >> /var/log/tomcat/catalina.out 2>&1
[ $? -ne 0 ] && RETVAL=1
if [ $RETVAL -eq 0 ]; then
ok
================================================================
Index: packages/tomcat/server.xml-URIEncoding-utf8.patch
diff -u packages/tomcat/server.xml-URIEncoding-utf8.patch:1.1 packages/tomcat/server.xml-URIEncoding-utf8.patch:1.2
--- packages/tomcat/server.xml-URIEncoding-utf8.patch:1.1 Tue Jul 20 12:18:15 2010
+++ packages/tomcat/server.xml-URIEncoding-utf8.patch Wed Apr 13 11:51:36 2011
@@ -7,9 +7,9 @@
following URIEncoding attribute to the connector definition in
$TOMCAT_HOME/conf/server.xml.
---- apache-tomcat-6.0.28-src/conf/server.xml~ 2010-06-29 17:33:40.000000000 +0300
-+++ apache-tomcat-6.0.28-src/conf/server.xml 2010-07-20 09:12:35.045149469 +0300
-@@ -68,12 +68,14 @@
+--- a/conf/server.xml.orig 2010-06-13 16:55:18.000000000 +0200
++++ b/conf/server.xml 2010-07-20 13:51:33.000000000 +0200
+@@ -66,12 +66,14 @@
-->
<Connector port="8080" protocol="HTTP/1.1"
connectionTimeout="20000"
@@ -24,7 +24,7 @@
redirectPort="8443" />
-->
<!-- Define a SSL HTTP/1.1 Connector on port 8443
-@@ -82,12 +84,12 @@
+@@ -80,12 +82,12 @@
described in the APR documentation -->
<!--
<Connector port="8443" protocol="HTTP/1.1" SSLEnabled="true"
================================================================
Index: packages/tomcat/tomcat-LDAPUserDatabase.patch
diff -u packages/tomcat/tomcat-LDAPUserDatabase.patch:1.3 packages/tomcat/tomcat-LDAPUserDatabase.patch:1.4
--- packages/tomcat/tomcat-LDAPUserDatabase.patch:1.3 Thu Nov 18 22:34:40 2010
+++ packages/tomcat/tomcat-LDAPUserDatabase.patch Wed Apr 13 11:51:36 2011
@@ -259,8 +259,8 @@
+
+package org.apache.catalina.startup;
+
-+import java.util.Hashtable;
+import java.util.Enumeration;
++import java.util.Hashtable;
+
+import javax.naming.Context;
+import javax.naming.NamingEnumeration;
@@ -301,7 +301,7 @@
+ /**
+ * The set of home directories for all defined users, keyed by username.
+ */
-+ private Hashtable homes = new Hashtable();
++ private Hashtable<String,String> homes = new Hashtable<String,String>();
+
+ /**
+ * The UserConfig listener with which we are associated.
@@ -335,14 +335,14 @@
+ * @param user User for which a home directory should be retrieved
+ */
+ public String getHome(String user) {
-+ return ((String) homes.get(user));
++ return homes.get(user);
+ }
+
+
+ /**
+ * Return an enumeration of the usernames defined on this server.
+ */
-+ public Enumeration getUsers() {
++ public Enumeration<String> getUsers() {
+ return (homes.keys());
+ }
+
@@ -431,7 +431,7 @@
+ }
+ } while ((cookie != null) && (cookie.length != 0));
+ } catch (Exception e) {
-+ // e.printStackTrace();
++ e.printStackTrace();
+ }
+ }
+}
================================================================
Index: packages/tomcat/tomcat-build.properties
diff -u packages/tomcat/tomcat-build.properties:1.3 packages/tomcat/tomcat-build.properties:1.4
--- packages/tomcat/tomcat-build.properties:1.3 Fri Oct 23 11:15:52 2009
+++ packages/tomcat/tomcat-build.properties Wed Apr 13 11:51:36 2011
@@ -24,35 +24,37 @@
# $Id$
# -----------------------------------------------------------------------------
-# ----- Vesion Control Flags -----
-version.major=6
-version.minor=0
-version.build=0
-version.patch=0
-version=6.0-snapshot
-
# ----- Default Base Path for Dependent Packages -----
-rpm.javadir=/usr/share/java
-rpm.libdir=/usr/lib
+# Please note this path must be absolute, not relative,
+# as it is referenced with different working directory
+# contexts by the various build scripts.
+base.path=/usr/share/java
-compile.source=1.5
-compile.target=1.5
+compile.source=1.6
+compile.target=1.6
compile.debug=true
-
-ant.jar=${rpm.javadir}/ant.jar
-jdt.jar=${rpm.javadir}/org.eclipse.jdt.core.jar
-jasper-jdt.jar=${rpm.javadir}/org.eclipse.jdt.core.jar
-
-tomcat-dbcp.jar=${rpm.javadir}/commons-dbcp-tomcat5.jar
-commons-pool.home=${rpm.javadir}/commons-pool-1.4-src
-commons-pool-src.loc=${base-commons.loc}/pool/source/commons-pool-1.4-src.tar.gz
-commons-logging.jar=${rpm.javadir}/commons-logging.jar
-commons-collections.jar=${rpm.javadir}/commons-collections.jar
-commons-daemon.jar=${rpm.javadir}/commons-daemon.jar
-
-# XXX Are these jars really needed?
-# jaxrpc-src.loc=${rpm.javadir}/geronimo-spec-jaxrpc.jar
-# wsdl4j-src.loc=${rpm.javadir}/wsdl4j-1.6.1.jar
-
-# commons-daemon.jsvc.tar.gz=${commons-daemon.lib}/bin/jsvc.tar.gz
+# ----- Webservices - JAX RPC -----
+jaxrpc-lib.version=1.1-rc4
+jaxrpc-lib.jar=${base.path}/geronimo-spec-jaxrpc.jar
+
+# ----- Webservices - WSDL4J -----
+wsdl4j-lib.jar=${base.path}/wsdl4j.jar
+
+# ----- Eclipse JDT, version 3.2 or later -----
+jdt.jar=${base.path}/org.eclipse.jdt.core.jar
+
+# ----- Commons Daemon, version 1.0-Alpha or later -----
+commons-daemon.jar=${base.path}/commons-daemon.jar
+
+# ----- JUnit Unit Test Suite, version 3.7 or later -----
+junit.jar=${base.path}/junit.jar
+
+# What about following?
+# # ----- JSON Libraries (for bayeux module) -----
+# json-lib.jar=${base.path}/json.jar
+#
+# # ----- Dojo Toolkit (for bayeux module) -----
+# dojo-js.home=${base.path}/dojo-release-1.1.1
+# dojo-js.loc=http://download.dojotoolkit.org/release-1.1.1/dojo-release-1.1.1.tar.gz
+# dojo-js.jar=${dojo-js.home}/dojo/dojo.js
================================================================
Index: packages/tomcat/tomcat-build.xml.patch
diff -u packages/tomcat/tomcat-build.xml.patch:1.3 packages/tomcat/tomcat-build.xml.patch:1.4
--- packages/tomcat/tomcat-build.xml.patch:1.3 Fri Jul 9 18:35:56 2010
+++ packages/tomcat/tomcat-build.xml.patch Wed Apr 13 11:51:36 2011
@@ -1,8 +1,61 @@
---- build.xml~ 2010-06-29 16:33:40.000000000 +0200
-+++ build.xml 2010-07-09 18:26:01.000000000 +0200
-@@ -471,13 +471,6 @@
+--- 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,51 +421,7 @@
+
+ </target>
- <target name="deploy" depends="build-only,build-docs,warn.dbcp">
+- <target name="validate" depends="download-validate" if="${execute.validate}">
+- <!-- Required so we can cache checkstyle results -->
+- <mkdir dir="${tomcat.output}/res/checkstyle"/>
+-
+- <taskdef resource="checkstyletask.properties"
+- classpath="${checkstyle.jar}" />
+- <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 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/**"/>
+- </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">
++ <target name="compile" depends="build-prepare">
+
+ <!-- Compile internal server components -->
+ <javac srcdir="java" destdir="${tomcat.classes}"
+@@ -744,13 +703,6 @@
+ <target name="deploy" depends="package,build-docs"
+ description="Default. Builds a working Tomcat instance">
- <copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz"
- file="${tomcat-native.tar.gz}" />
@@ -14,3 +67,406 @@
<!-- Copy scripts -->
<copy todir="${tomcat.build}/bin">
<fileset dir="bin">
+@@ -1006,7 +958,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}"
+@@ -1103,52 +1055,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-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>
+-
+- <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>
+-
+- <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"
+ encoding="ISO-8859-1">
+ <replacefilter token="org.apache.commons"
+@@ -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">
+- <fileset file="${avalon-framework.jar}" />
++ <fileset file="${avalon-framework-api.jar}" />
++ <fileset file="${avalon-framework-impl.jar}" />
+ <fileset file="${log4j.jar}" />
+ <fileset file="${logkit.jar}" />
+ <fileset file="${servletapi.jar}" />
+@@ -1250,18 +1161,6 @@
+ depends="extras-prepare"
+ description="Prepare to build web services extras package">
+
+- <antcall target="downloadfile">
+- <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
+- <param name="destfile" value="${jaxrpc-lib.jar}"/>
+- <param name="destdir" value="${jaxrpc-lib.home}"/>
+- </antcall>
+-
+- <antcall target="downloadfile">
+- <param name="sourcefile" value="${wsdl4j-lib.loc}"/>
+- <param name="destfile" value="${wsdl4j-lib.jar}"/>
+- <param name="destdir" value="${wsdl4j-lib.home}"/>
+- </antcall>
+-
+ <copy file="${jaxrpc-lib.jar}"
+ tofile="${tomcat.extras}/webservices/jaxrpc.jar" />
+ <copy file="${wsdl4j-lib.jar}"
+@@ -1368,7 +1267,7 @@
+
+ </target>
+
+- <target name="dist-prepare" depends="download-dist">
++ <target name="dist-prepare">
+ <mkdir dir="${tomcat.dist}"/>
+ <mkdir dir="${tomcat.dist}/bin"/>
+ <mkdir dir="${tomcat.dist}/conf"/>
+@@ -2092,301 +1991,7 @@
+ description="Delete the default output folders">
+ <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" >
+-
+- <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-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-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-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-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}"/>
+- <condition property="no.build.dbcp">
+- <and>
+- <available file="${tomcat-dbcp.jar}"/>
+- <available file="${tomcat-dbcp-src.jar}"/>
+- </and>
+- </condition>
+- <antcall target="build-tomcat-dbcp" />
+-
+- <!-- Download JDT (Eclipse compiler) -->
+- <antcall target="downloadfile-2">
+- <param name="sourcefile.1" value="${jdt.loc.1}"/>
+- <param name="sourcefile.2" value="${jdt.loc.2}"/>
+- <param name="destfile" value="${jdt.jar}"/>
+- <param name="destdir" value="${jdt.home}"/>
+- </antcall>
+- </target>
+-
+- <target name="download-test-compile"
+- description="Download additional components for the tests" >
+-
+- <antcall target="downloadzip">
+- <param name="sourcefile" value="${junit.loc}"/>
+- <param name="destfile" value="${junit.jar}"/>
+- <param name="destdir" value="${base.path}"/>
+- </antcall>
+-
+- </target>
+-
+- <target name="download-dist"
+- description="Download additional components for a distribution" >
+-
+- <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-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-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-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>
+-
+- <antcall target="downloadzip">
+- <param name="sourcefile" value="${nsis.loc}"/>
+- <param name="destfile" value="${nsis.exe}"/>
+- <param name="destdir" value="${nsis.home}/.."/>
+- </antcall>
+-
+- </target>
+-
+-
+- <!-- =============== Targets for dependencies that need to =============== -->
+- <!-- ================ be built rather than used directly ================ -->
+-
+- <target name="build-tomcat-dbcp" depends="build-manifests" unless="no.build.dbcp">
+- <copy todir="${tomcat-dbcp.home}">
+- <fileset dir="${commons-pool.home}">
+- <include name="**/*.java" />
+- <exclude name="**/test/**" />
+- </fileset>
+- <fileset dir="${commons-dbcp.home}">
+- <include name="**/*.java" />
+- <exclude name="**/test/**" />
+- <exclude name="**/managed/**" />
+- </fileset>
+- </copy>
+- <replace dir="${tomcat-dbcp.home}/src/java/org/apache/commons"
+- encoding="ISO-8859-1">
+- <replacefilter token="org.apache.commons"
+- value="org.apache.tomcat.dbcp" />
+- </replace>
+- <replace dir="${tomcat-dbcp.home}/src/java/org/apache/commons/pool/impl"
+- encoding="ISO-8859-1">
+- <replacefilter token="enum"
+- value="enumeration" />
+- </replace>
+-
+- <mkdir dir="${tomcat-dbcp.home}/src/java/org/apache/tomcat/dbcp" />
+- <move todir="${tomcat-dbcp.home}/src/java/org/apache/tomcat/dbcp">
+- <fileset dir="${tomcat-dbcp.home}/src/java/org/apache/commons" />
+- </move>
+- <mkdir dir="${tomcat-dbcp.home}/classes"/>
+- <javac destdir="${tomcat-dbcp.home}/classes"
+- optimize="off"
+- debug="${compile.debug}"
+- deprecation="${compile.deprecation}"
+- source="${compile.source}"
+- target="${compile.target}"
+- sourcepath="${tomcat-dbcp.home}/src/java"
+- srcdir="${tomcat-dbcp.home}/src/java"
+- 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-src.jar}"
+- filesDir="${tomcat-dbcp.home}/src/java"
+- filesId="files.tomcat-dbcp" />
+- </target>
+-
+- <!-- =============== Utility Targets to support downloads ================ -->
+-
+- <target name="proxyflags">
+- <!-- check proxy parameters. -->
+- <condition property="useproxy">
+- <equals arg1="${proxy.use}" arg2="on" />
+- </condition>
+- </target>
+-
+- <target name="setproxy" depends="proxyflags" if="useproxy">
+- <taskdef name="setproxy"
+- classname="org.apache.tools.ant.taskdefs.optional.net.SetProxy" />
+- <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
+- proxyuser="${proxy.user}" proxypassword="${proxy.password}" />
+- <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/>
+- </target>
+-
+- <target name="testexist">
+- <echo message="Testing for ${destfile}"/>
+- <available file="${destfile}" property="exist"/>
+- </target>
+-
+- <target name="downloadgz" unless="exist" depends="setproxy,testexist">
+- <!-- Download and extract the package -->
+- <get src="${sourcefile}" dest="${base.path}/file.tar.gz" />
+- <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="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" />
+- <mkdir dir="${destdir}" />
+- <unzip src="${base.path}/file.zip" dest="${destdir}"/>
+- <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}"/>
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/tomcat/apache-tomcat.init?r1=1.21&r2=1.22&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/tomcat/server.xml-URIEncoding-utf8.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/tomcat/tomcat-LDAPUserDatabase.patch?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/tomcat/tomcat-build.properties?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/tomcat/tomcat-build.xml.patch?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/tomcat/tomcat-userdir.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/tomcat/tomcat.spec?r1=1.186&r2=1.187&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/tomcat/jcl-build.xml.patch?r1=1.1&r2=1.2&f=u
More information about the pld-cvs-commit
mailing list