components/tomcat/patches/build.properties.patch
author Petr Sumbera <petr.sumbera@oracle.com>
Wed, 08 Jun 2011 01:30:17 -0700
changeset 288 2a474229e9a1
parent 142 6f1cb90a0ef3
child 479 c9b8e016b757
permissions -rw-r--r--
7002141 Problem with utility/apache
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
288
2a474229e9a1 7002141 Problem with utility/apache
Petr Sumbera <petr.sumbera@oracle.com>
parents: 142
diff changeset
     1
--- apache-tomcat-6.0.32-src/build.properties.default	Wed Feb  2 11:07:31 2011
2a474229e9a1 7002141 Problem with utility/apache
Petr Sumbera <petr.sumbera@oracle.com>
parents: 142
diff changeset
     2
+++ apache-tomcat-6.0.32-src/build.properties.default	Thu Jun  2 05:02:15 2011
2a474229e9a1 7002141 Problem with utility/apache
Petr Sumbera <petr.sumbera@oracle.com>
parents: 142
diff changeset
     3
@@ -49,6 +49,12 @@
2a474229e9a1 7002141 Problem with utility/apache
Petr Sumbera <petr.sumbera@oracle.com>
parents: 142
diff changeset
     4
 base-sf.loc=http://downloads.sourceforge.net
2a474229e9a1 7002141 Problem with utility/apache
Petr Sumbera <petr.sumbera@oracle.com>
parents: 142
diff changeset
     5
 base-maven1.loc=http://repo1.maven.org/maven
142
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
     6
 
288
2a474229e9a1 7002141 Problem with utility/apache
Petr Sumbera <petr.sumbera@oracle.com>
parents: 142
diff changeset
     7
+# In Userland we really don't want Tomcat to download its build
2a474229e9a1 7002141 Problem with utility/apache
Petr Sumbera <petr.sumbera@oracle.com>
parents: 142
diff changeset
     8
+# dependencies itself but instead we will do it ourself in advance.
2a474229e9a1 7002141 Problem with utility/apache
Petr Sumbera <petr.sumbera@oracle.com>
parents: 142
diff changeset
     9
+# Therefore those dependencies which are really required need to be
2a474229e9a1 7002141 Problem with utility/apache
Petr Sumbera <petr.sumbera@oracle.com>
parents: 142
diff changeset
    10
+# redirected to local file system.
2a474229e9a1 7002141 Problem with utility/apache
Petr Sumbera <petr.sumbera@oracle.com>
parents: 142
diff changeset
    11
+userland-files.loc=file://${base.path}/../../
2a474229e9a1 7002141 Problem with utility/apache
Petr Sumbera <petr.sumbera@oracle.com>
parents: 142
diff changeset
    12
+
142
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    13
 # ----- Commons Logging, version 1.1 or later -----
288
2a474229e9a1 7002141 Problem with utility/apache
Petr Sumbera <petr.sumbera@oracle.com>
parents: 142
diff changeset
    14
 # If this version is updated, check the versions required for the deps
2a474229e9a1 7002141 Problem with utility/apache
Petr Sumbera <petr.sumbera@oracle.com>
parents: 142
diff changeset
    15
 # - avalon-framework
2a474229e9a1 7002141 Problem with utility/apache
Petr Sumbera <petr.sumbera@oracle.com>
parents: 142
diff changeset
    16
@@ -108,7 +114,7 @@
2a474229e9a1 7002141 Problem with utility/apache
Petr Sumbera <petr.sumbera@oracle.com>
parents: 142
diff changeset
    17
 jdt.jar=${jdt.home}/ecj-${jdt.version}.jar
2a474229e9a1 7002141 Problem with utility/apache
Petr Sumbera <petr.sumbera@oracle.com>
parents: 142
diff changeset
    18
 # The download will be moved to the archive area eventually. We are taking care of that in advance.
2a474229e9a1 7002141 Problem with utility/apache
Petr Sumbera <petr.sumbera@oracle.com>
parents: 142
diff changeset
    19
 # Note older JARs were called ecj.jar. Newer JARs are called ecj-${jdt.version}.jar
2a474229e9a1 7002141 Problem with utility/apache
Petr Sumbera <petr.sumbera@oracle.com>
parents: 142
diff changeset
    20
-jdt.loc.1=http://archive.eclipse.org/eclipse/downloads/drops/${jdt.release}/ecj.jar
2a474229e9a1 7002141 Problem with utility/apache
Petr Sumbera <petr.sumbera@oracle.com>
parents: 142
diff changeset
    21
+jdt.loc.1=${userland-files.loc}/ecj.jar
2a474229e9a1 7002141 Problem with utility/apache
Petr Sumbera <petr.sumbera@oracle.com>
parents: 142
diff changeset
    22
 jdt.loc.2=http://download.eclipse.org/eclipse/downloads/drops/${jdt.release}/ecj.jar
142
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    23
 
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    24
 # ----- Tomcat native library -----
288
2a474229e9a1 7002141 Problem with utility/apache
Petr Sumbera <petr.sumbera@oracle.com>
parents: 142
diff changeset
    25
@@ -118,15 +124,15 @@
2a474229e9a1 7002141 Problem with utility/apache
Petr Sumbera <petr.sumbera@oracle.com>
parents: 142
diff changeset
    26
 tomcat-native.loc=${base-tomcat.loc}/tomcat-connectors/native/${tomcat-native.version}/source/tomcat-native-${tomcat-native.version}-src.tar.gz
2a474229e9a1 7002141 Problem with utility/apache
Petr Sumbera <petr.sumbera@oracle.com>
parents: 142
diff changeset
    27
 tomcat-native.dll=${base-tomcat.loc}/tomcat-connectors/native/${tomcat-native.version}/binaries
142
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    28
 
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    29
-# ----- Commons DBCP, version 1.1 or later -----
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    30
-commons-dbcp.version=1.3
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    31
+# ----- Commons DBCP, version 1.4 (for JDK 1.6) -----
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    32
+commons-dbcp.version=1.4
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    33
 commons-dbcp.home=${base.path}/commons-dbcp-${commons-dbcp.version}-src
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    34
-commons-dbcp-src.loc=${base-commons.loc}/dbcp/source/commons-dbcp-${commons-dbcp.version}-src.tar.gz
288
2a474229e9a1 7002141 Problem with utility/apache
Petr Sumbera <petr.sumbera@oracle.com>
parents: 142
diff changeset
    35
+commons-dbcp-src.loc=${userland-files.loc}/commons-dbcp-${commons-dbcp.version}-src.tar.gz
142
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    36
 
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    37
 # ----- Commons Pool, version 1.1 or later -----
288
2a474229e9a1 7002141 Problem with utility/apache
Petr Sumbera <petr.sumbera@oracle.com>
parents: 142
diff changeset
    38
 commons-pool.version=1.5.5
142
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    39
 commons-pool.home=${base.path}/commons-pool-${commons-pool.version}-src
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    40
-commons-pool-src.loc=${base-commons.loc}/pool/source/commons-pool-${commons-pool.version}-src.tar.gz
288
2a474229e9a1 7002141 Problem with utility/apache
Petr Sumbera <petr.sumbera@oracle.com>
parents: 142
diff changeset
    41
+commons-pool-src.loc=${userland-files.loc}/commons-pool-${commons-pool.version}-src.tar.gz
142
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    42
 
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    43
 # ----- NSIS, version 2.0 or later -----
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    44
 nsis.home=${base.path}/nsis-2.46