--- apache-tomcat-6.0.35-src/build.properties.default	Thu Jan 12 06:48:46 2012
+++ apache-tomcat-6.0.35-src/build.properties.default	Thu Jan 12 06:51:47 2012
@@ -54,6 +54,12 @@
 base-sf.loc=http://downloads.sourceforge.net
 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.
+# Therefore those dependencies which are really required need to be
+# redirected to local file system.
+userland-files.loc=file://${base.path}/../../
+
 # ----- Commons Logging, version 1.1 or later -----
 # If this version is updated, check the versions required for the deps
 # - avalon-framework
@@ -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
-jdt.loc.1=http://archive.eclipse.org/eclipse/downloads/drops/${jdt.release}/ecj-${jdt.version}.jar
+jdt.loc.1=${userland-files.loc}/ecj-${jdt.version}.jar
 jdt.loc.2=http://download.eclipse.org/eclipse/downloads/drops/${jdt.release}/ecj-${jdt.version}.jar
 
 # ----- Tomcat native library -----
@@ -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.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.6
 commons-pool.home=${base.path}/commons-pool-${commons-pool.version}-src
-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 -----