--- a/usr/src/cmd/tomcat/build.properties.in	Mon Feb 08 12:51:29 2010 +0200
+++ b/usr/src/cmd/tomcat/build.properties.in	Mon Feb 08 15:41:40 2010 +0200
@@ -21,21 +21,15 @@
 # modules that Tomcat depends on.  Copy this file to "build.properties"
 # in the top-level source directory, and customize it as needed.
 #
-# $Id: build.properties.default 677507 2008-07-17 06:14:31Z mturk $
+# $Id: build.properties.default 900770 2010-01-19 13:24:49Z jfclere $
 # -----------------------------------------------------------------------------
 
-# ----- Vesion Control Flags -----
+# ----- Version Control Flags -----
 version.major=6
 version.minor=0
-version.build=20
+version.build=24
 version.patch=0
-version=6.0-20
-
-# ----- Proxy setup -----
-# Uncomment if using a proxy server
-#proxy.host=webcache
-#proxy.port=8080
-#proxy.use=on
+version=6.0.24
 
 # ----- Default Base Path for Dependent Packages -----
 # Please note this path must be absolute, not relative,
@@ -65,38 +59,31 @@
 jdt.home=${base.path}/eclipse/plugins
 jdt.lib=${jdt.home}
 jdt.jar=${jdt.lib}/org.eclipse.jdt.core_3.3.1.v_780_R33x.jar
-jdt.loc=http://www.eclipse.org/downloads/download.php?file=/eclipse/downloads/drops/R-3.3.1-200709211145/eclipse-JDT-3.3.1.zip
+jdt.loc=http://archive.eclipse.org/eclipse/downloads/drops/R-3.3.1-200709211145/eclipse-JDT-3.3.1.zip
 
 # ----- Tomcat native library -----
-tomcat-native.version=1.1.14
+tomcat-native.version=1.1.19
 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-${tomcat-native.version}-src.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
 
 # ----- Commons DBCP, version 1.1 or later -----
 commons-dbcp.version=1.2.2
 commons-dbcp.home=${base.path}/commons-dbcp-1.2.2-src
-commons-dbcp-src.loc=${base-commons.loc}/dbcp/source/commons-dbcp-1.2.2-src.tar.gz
+commons-dbcp-src.loc=${base-commons.loc}/dbcp/source/commons-dbcp-1.2.2-src.tar.gz.patched
 
 # ----- Commons Pool, version 1.1 or later -----
-commons-pool.home=${base.path}/commons-pool-1.4-src
-commons-pool-src.loc=${base-commons.loc}/pool/source/commons-pool-1.4-src.tar.gz
-
-# ----- Commons Collections, version 2.0 or later -----
-commons-collections.home=${base.path}/commons-collections-3.2-src
-commons-collections.lib=${commons-collections.home}
-commons-collections.jar=${commons-collections.lib}/commons-collections-3.2.jar
-commons-collections.loc=${base-jakarta.loc}/commons/collections/binaries/commons-collections-3.2.tar.gz
-commons-collections-src.loc=${base-commons.loc}/collections/source/commons-collections-3.2-src.tar.gz
+commons-pool.home=${base.path}/commons-pool-1.5.4-src
+commons-pool-src.loc=${base-commons.loc}/pool/source/commons-pool-1.5.4-src.tar.gz
 
 # ----- NSIS, version 2.0 or later -----
-nsis.home=${base.path}/nsis-2.37
+nsis.home=${base.path}/nsis-2.45
 nsis.exe=${nsis.home}/makensis.exe
 nsis.installoptions.dll=${nsis.home}/Plugins/InstallOptions.dll
 nsis.nsexec.dll=${nsis.home}/Plugins/nsExec.dll
 nsis.nsisdl.dll=${nsis.home}/Plugins/NSISdl.dll
-nsis.loc=${base-sf.loc}/nsis/nsis-2.37.zip
+nsis.loc=${base-sf.loc}/nsis/nsis-2.45.zip
 
 # ----- Commons Daemon, version 1.0-Alpha or later -----
 commons-daemon.home=${base.path}/commons-daemon-1.0.1