--- a/components/tomcat/patches/build.xml.patch Wed Aug 17 18:42:48 2011 -0700
+++ b/components/tomcat/patches/build.xml.patch Thu Aug 18 12:18:21 2011 -0700
@@ -1,6 +1,6 @@
---- apache-tomcat-6.0.28-src/build.xml.orig Tue Jun 29 07:33:40 2010
-+++ apache-tomcat-6.0.28-src/build.xml Fri Jul 9 08:12:35 2010
-@@ -471,13 +471,6 @@
+--- apache-tomcat-6.0.33-src/build.xml Tue Aug 16 05:26:13 2011
++++ apache-tomcat-6.0.33-src/build.xml Tue Aug 16 06:44:09 2011
+@@ -469,13 +469,6 @@
<target name="deploy" depends="build-only,build-docs,warn.dbcp">
@@ -14,57 +14,64 @@
<!-- Copy scripts -->
<copy todir="${tomcat.build}/bin">
<fileset dir="bin">
-@@ -696,48 +689,6 @@
+@@ -759,55 +752,6 @@
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}"/>
-@@ -763,15 +714,9 @@
- <param name="basedir" value="${jasper-jdt.home}" />
+ <antcall target="downloadgz-2">
+ <param name="sourcefile.1" value="${commons-pool-src.loc.1}"/>
+@@ -832,15 +776,9 @@
+ <param name="destdir" value="${jdt.home}"/>
</antcall>
- <antcall target="downloadzip">