Patch origin: in-house

Patch status: Solaris-specific; not suitable for upstream

Redirects build process to use local archives instead of downloading

from external webs.

Uses newer version of Commons DBCP which builds with newer JDK.

--- build.properties.default

+++ build.properties.default

@@ -67,6 +67,12 @@

# repo.maven.apache.org is the same as repo2.maven.org

base-maven.loc=http://repo.maven.apache.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

@@ -127,7 +133,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/drops4/${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/drops4/${jdt.release}/ecj-${jdt.version}.jar

# ----- Tomcat native library -----

@@ -139,16 +145,16 @@

tomcat-native.win.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-win32-bin.zip

tomcat-native.win.2=${base-tomcat.loc.2}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-win32-bin.zip

-# ----- 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.7

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 -----