Author: kkolinko
Date: Thu Aug 4 10:09:45 2011
New Revision: 1153824
URL: http://svn.apache.org/viewvc?rev=1153824&view=rev
Log:
* Update to Apache Commons Daemon 1.0.7
* Use two alternative download locations for components downloaded from
apache.org.
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/build.properties.default
tomcat/tc6.0.x/trunk/build.xml
tomcat/tc6.0.x/trunk/extras.xml
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1153824&r1=1153823&r2=1153824&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Aug 4 10:09:45 2011
@@ -178,10 +178,3 @@ PATCHES PROPOSED TO BACKPORT:
http://svn.apache.org/viewvc?rev=1152601&view=rev
+1: markt, kkolinko,kfujino
-1:
-
-* Update to Apache Commons Daemon 1.0.7
- Use two alternative download locations for components downloaded from
- apache.org.
- http://people.apache.org/~kkolinko/patches/2011-08-03_tc6_daemon107.patch
- +1: kkolinko, markt, kfujino
- -1:
Modified: tomcat/tc6.0.x/trunk/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/build.properties.default?rev=1153824&r1=1153823&r2=1153824&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/build.properties.default (original)
+++ tomcat/tc6.0.x/trunk/build.properties.default Thu Aug 4 10:09:45 2011
@@ -43,8 +43,13 @@ compile.source=1.5
compile.target=1.5
compile.debug=true
-base-commons.loc=http://archive.apache.org/dist/commons
-base-tomcat.loc=http://archive.apache.org/dist/tomcat
+base-apache.loc.1=http://www.apache.org/dist
+base-apache.loc.2=http://archive.apache.org/dist
+base-commons.loc.1=${base-apache.loc.1}/commons
+base-commons.loc.2=${base-apache.loc.2}/commons
+base-tomcat.loc.1=${base-apache.loc.1}/tomcat
+base-tomcat.loc.2=${base-apache.loc.2}/tomcat
+
base-sf.loc=http://downloads.sourceforge.net
base-maven.loc=http://repo2.maven.org/maven2
@@ -56,7 +61,8 @@ base-maven.loc=http://repo2.maven.org/ma
# - servletapi
commons-logging.version=1.1.1
commons-logging.home=${base.path}/commons-logging-${commons-logging.version}
-commons-logging-src.loc=${base-commons.loc}/logging/source/commons-logging-${commons-logging.version}-src.tar.gz
+commons-logging-src.loc.1=${base-commons.loc.1}/logging/source/commons-logging-${commons-logging.version}-src.tar.gz
+commons-logging-src.loc.2=${base-commons.loc.2}/logging/source/commons-logging-${commons-logging.version}-src.tar.gz
commons-logging-src.tar.gz=${commons-logging.home}/commons-logging-${commons-logging.version}-src.tar.gz
# ----- Avalon Framework (required by commons logging) -----
@@ -114,18 +120,25 @@ jdt.loc.2=http://download.eclipse.org/ec
tomcat-native.version=1.1.20
tomcat-native.home=${base.path}/tomcat-native-${tomcat-native.version}
tomcat-native.tar.gz=${tomcat-native.home}/tomcat-native.tar.gz
-tomcat-native.loc=${base-tomcat.loc}/tomcat-connectors/native/${tomcat-native.version}/source/tomcat-native-${tomcat-native.version}-src.tar.gz
-tomcat-native.dll=${base-tomcat.loc}/tomcat-connectors/native/${tomcat-native.version}/binaries
+tomcat-native.loc.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/source/tomcat-native-${tomcat-native.version}-src.tar.gz
+tomcat-native.loc.2=${base-tomcat.loc.2}/tomcat-connectors/native/${tomcat-native.version}/source/tomcat-native-${tomcat-native.version}-src.tar.gz
+tomcat-native.dll.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/binaries
+tomcat-native.dll.2=${base-tomcat.loc.2}/tomcat-connectors/native/${tomcat-native.version}/binaries
+tomcat-native.dll.win32=${tomcat-native.home}/tcnative-1.dll.x86
+tomcat-native.dll.x64=${tomcat-native.home}/tcnative-1.dll.x64
+tomcat-native.dll.i64=${tomcat-native.home}/tcnative-1.dll.i64
# ----- Commons DBCP, version 1.1 or later -----
commons-dbcp.version=1.3
commons-dbcp.home=${base.path}/commons-dbcp-${commons-dbcp.version}-src
-commons-dbcp-src.loc=${base-commons.loc}/dbcp/source/commons-dbcp-${commons-dbcp.version}-src.tar.gz
+commons-dbcp-src.loc.1=${base-commons.loc.1}/dbcp/source/commons-dbcp-${commons-dbcp.version}-src.tar.gz
+commons-dbcp-src.loc.2=${base-commons.loc.2}/dbcp/source/commons-dbcp-${commons-dbcp.version}-src.tar.gz
# ----- Commons Pool, version 1.1 or later -----
commons-pool.version=1.5.6
commons-pool.home=${base.path}/commons-pool-${commons-pool.version}-src
-commons-pool-src.loc=${base-commons.loc}/pool/source/commons-pool-${commons-pool.version}-src.tar.gz
+commons-pool-src.loc.1=${base-commons.loc.1}/pool/source/commons-pool-${commons-pool.version}-src.tar.gz
+commons-pool-src.loc.2=${base-commons.loc.2}/pool/source/commons-pool-${commons-pool.version}-src.tar.gz
# ----- NSIS, version 2.0 or later -----
nsis.home=${base.path}/nsis-2.46
@@ -136,13 +149,16 @@ nsis.nsisdl.dll=${nsis.home}/Plugins/NSI
nsis.loc=${base-sf.loc}/nsis/nsis-2.46.zip
# ----- Commons Daemon, version 1.0-Alpha or later -----
-commons-daemon.version=1.0.5
+commons-daemon.version=1.0.7
commons-daemon.home=${base.path}/commons-daemon-${commons-daemon.version}
commons-daemon.jar=${commons-daemon.home}/commons-daemon-${commons-daemon.version}.jar
commons-daemon.native.win.home=${commons-daemon.home}/windows
commons-daemon.native.win.mgr.exe=${commons-daemon.native.win.home}/prunmgr.exe
commons-daemon.native.src.tgz=${commons-daemon.home}/commons-daemon-${commons-daemon.version}-native-src.tar.gz
commons-daemon.native.win.zip=${commons-daemon.home}/commons-daemon-${commons-daemon.version}-bin-windows.zip
-commons-daemon.bin.loc=${base-commons.loc}/daemon/binaries/${commons-daemon.version}/commons-daemon-${commons-daemon.version}-bin.tar.gz
-commons-daemon.native.src.loc=${base-commons.loc}/daemon/source/commons-daemon-${commons-daemon.version}-native-src.tar.gz
-commons-daemon.native.win.loc=${base-commons.loc}/daemon/binaries/${commons-daemon.version}/windows/commons-daemon-${commons-daemon.version}-bin-windows.zip
+commons-daemon.bin.loc.1=${base-commons.loc.1}/daemon/binaries/commons-daemon-${commons-daemon.version}-bin.tar.gz
+commons-daemon.bin.loc.2=${base-commons.loc.2}/daemon/binaries/commons-daemon-${commons-daemon.version}-bin.tar.gz
+commons-daemon.native.src.loc.1=${base-commons.loc.1}/daemon/source/commons-daemon-${commons-daemon.version}-native-src.tar.gz
+commons-daemon.native.src.loc.2=${base-commons.loc.2}/daemon/source/commons-daemon-${commons-daemon.version}-native-src.tar.gz
+commons-daemon.native.win.loc.1=${base-commons.loc.1}/daemon/binaries/windows/commons-daemon-${commons-daemon.version}-bin-windows.zip
+commons-daemon.native.win.loc.2=${base-commons.loc.2}/daemon/binaries/windows/commons-daemon-${commons-daemon.version}-bin-windows.zip
Modified: tomcat/tc6.0.x/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/build.xml?rev=1153824&r1=1153823&r2=1153824&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/build.xml (original)
+++ tomcat/tc6.0.x/trunk/build.xml Thu Aug 4 10:09:45 2011
@@ -675,6 +675,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" />
@@ -683,6 +701,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}" />
@@ -725,55 +759,64 @@
description="Download (and build as necessary) dependent components"
depends="build-manifests">
- <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>
- <antcall target="downloadfile">
- <param name="sourcefile"
value="${tomcat-native.dll}/win32/tcnative-1.dll"/>
- <param name="destfile" value="${tomcat-native.home}/tcnative-1.dll.x86"/>
+ <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"/>
- <param name="destfile" value="${tomcat-native.home}/tcnative-1.dll.x64"/>
+ <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"/>
- <param name="destfile" value="${tomcat-native.home}/tcnative-1.dll.i64"/>
+ <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>
<!-- 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>
- <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>
<!-- 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}"/>
Modified: tomcat/tc6.0.x/trunk/extras.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/extras.xml?rev=1153824&r1=1153823&r2=1153824&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/extras.xml (original)
+++ tomcat/tc6.0.x/trunk/extras.xml Thu Aug 4 10:09:45 2011
@@ -112,8 +112,9 @@
depends="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>
@@ -345,6 +346,38 @@
<get src="${sourcefile}" dest="${destfile}" />
</target>
+ <target name="downloadfile-2" unless="exist" depends="testexist">
+ <!-- Download the file from the two alternative locations -->
+ <mkdir dir="${destdir}" />
+
+ <antcall target="trydownload">
+ <param name="sourcefile" value="${sourcefile.1}" />
+ </antcall>
+
+ <antcall target="trydownload">
+ <param name="sourcefile" value="${sourcefile.2}" />
+ </antcall>
+
+ <available file="${destfile}" property="exist"/>
+ <fail unless="exist" message="Failed to download [${destfile}]. All
download sources are unavailable." />
+ </target>
+
+ <target name="trydownload.check" depends="setproxy">
+ <condition property="trydownload.run">
+ <and>
+ <not>
+ <available file="${destfile}" />
+ </not>
+ <http url="${sourcefile}" />
+ </and>
+ </condition>
+ </target>
+
+ <target name="trydownload" if="trydownload.run" depends="trydownload.check">
+ <!-- Downloads a file if not yet downloaded and the source URL is
available -->
+ <get src="${sourcefile}" dest="${destfile}" />
+ </target>
+
<!-- Helper target, used to create a md5 checksum file -->
<!-- Requires 'file' as a parameter. -->
<target name="md5sum">
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1153824&r1=1153823&r2=1153824&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Thu Aug 4 10:09:45 2011
@@ -371,6 +371,13 @@
<update>
Update Apache Commons Pool to 1.5.6. (kkolinko)
</update>
+ <update>
+ Update Apache Commons Daemon to 1.0.7. (kkolinko)
+ </update>
+ <update>
+ At build time use two alternative download locations for components
+ downloaded from apache.org. (kkolinko)
+ </update>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
