--- a/components/tomcat/patches/build.properties.patch Wed Aug 17 18:42:48 2011 -0700
+++ b/components/tomcat/patches/build.properties.patch Thu Aug 18 12:18:21 2011 -0700
@@ -1,8 +1,8 @@
---- apache-tomcat-6.0.32-src/build.properties.default Wed Feb 2 11:07:31 2011
-+++ apache-tomcat-6.0.32-src/build.properties.default Thu Jun 2 05:02:15 2011
-@@ -49,6 +49,12 @@
+--- apache-tomcat-6.0.33-src/build.properties.default Tue Aug 16 06:34:59 2011
++++ apache-tomcat-6.0.33-src/build.properties.default Tue Aug 16 06:39:29 2011
+@@ -54,6 +54,12 @@
base-sf.loc=http://downloads.sourceforge.net
- base-maven1.loc=http://repo1.maven.org/maven
+ base-maven.loc=http://repo2.maven.org/maven2
+# In Userland we really don't want Tomcat to download its build
+# dependencies itself but instead we will do it ourself in advance.
@@ -13,7 +13,7 @@
# ----- Commons Logging, version 1.1 or later -----
# If this version is updated, check the versions required for the deps
# - avalon-framework
-@@ -108,7 +114,7 @@
+@@ -114,7 +120,7 @@
jdt.jar=${jdt.home}/ecj-${jdt.version}.jar
# The download will be moved to the archive area eventually. We are taking care of that in advance.
# Note older JARs were called ecj.jar. Newer JARs are called ecj-${jdt.version}.jar
@@ -22,23 +22,24 @@
jdt.loc.2=http://download.eclipse.org/eclipse/downloads/drops/${jdt.release}/ecj.jar
# ----- Tomcat native library -----
-@@ -118,15 +124,15 @@
- 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
+@@ -129,16 +135,16 @@
+ 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, version 1.4 (for JDK 1.6) -----
+commons-dbcp.version=1.4
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=${userland-files.loc}/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.1=${userland-files.loc}/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.5
+ 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=${userland-files.loc}/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.1=${userland-files.loc}/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