7080654 Upgrade Apache Tomcat to version 6.0.33
7067820 Problem with utility/apache
--- a/components/tomcat/Makefile Wed Aug 17 18:42:48 2011 -0700
+++ b/components/tomcat/Makefile Thu Aug 18 12:18:21 2011 -0700
@@ -26,18 +26,18 @@
include ../../make-rules/shared-macros.mk
COMPONENT_NAME= apache-tomcat
-COMPONENT_VERSION= 6.0.32
+COMPONENT_VERSION= 6.0.33
COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)-src
COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz
-COMPONENT_ARCHIVE_HASH= sha1:ec94c511e54da2b02dd2ba45b9fd1703d5771a45
-COMPONENT_ARCHIVE_URL= http://archive.apache.org/dist/tomcat/tomcat-6/v$(COMPONENT_VERSION)/src/$(COMPONENT_ARCHIVE)
+COMPONENT_ARCHIVE_HASH= sha1:437db0ba55c6e398fe3af73c4fa5eed3c4666842
+COMPONENT_ARCHIVE_URL= http://www.apache.org/dist/tomcat/tomcat-6/v$(COMPONENT_VERSION)/src/$(COMPONENT_ARCHIVE)
# Tomcat subcomponents
COMPONENT_ARCHIVE_1= commons-dbcp-1.4-src.tar.gz
COMPONENT_ARCHIVE_HASH_1= sha1:48702486eaba6ec40fb65e912c8f597d80654f54
COMPONENT_ARCHIVE_URL_1= http://archive.apache.org/dist/commons/dbcp/source/$(COMPONENT_ARCHIVE_1)
-COMPONENT_ARCHIVE_2= commons-pool-1.5.5-src.tar.gz
-COMPONENT_ARCHIVE_HASH_2= sha1:375408d445be1b87e935bb8e68cc9f746a3b59fb
+COMPONENT_ARCHIVE_2= commons-pool-1.5.6-src.tar.gz
+COMPONENT_ARCHIVE_HASH_2= sha1:d97caa6670d7683f97749defb96aee6a7bcdbdf9
COMPONENT_ARCHIVE_URL_2= http://archive.apache.org/dist/commons/pool/source/$(COMPONENT_ARCHIVE_2)
COMPONENT_ARCHIVE_3= ecj.jar
COMPONENT_ARCHIVE_HASH_3= sha1:f4ddfbb80cb97b0bdfa8730102db9fec1630a983
--- a/components/tomcat/Solaris/index.jsp Wed Aug 17 18:42:48 2011 -0700
+++ b/components/tomcat/Solaris/index.jsp Thu Aug 18 12:18:21 2011 -0700
@@ -1,1 +1,1 @@
-<html><body><h1>Apache Tomcat (SUNWtcat-examples package not installed)</h1></body></html>
+<html><body><h1>Apache Tomcat (tomcat-examples package not installed)</h1></body></html>
--- 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
--- a/components/tomcat/patches/build.xml.patch Wed Aug 17 18:42:48 2011 -0700
+++ b/components/tomcat/patches/build.xml.patch Thu Aug 18 12:18:21 2011 -0700
@@ -1,6 +1,6 @@
---- apache-tomcat-6.0.28-src/build.xml.orig Tue Jun 29 07:33:40 2010
-+++ apache-tomcat-6.0.28-src/build.xml Fri Jul 9 08:12:35 2010
-@@ -471,13 +471,6 @@
+--- apache-tomcat-6.0.33-src/build.xml Tue Aug 16 05:26:13 2011
++++ apache-tomcat-6.0.33-src/build.xml Tue Aug 16 06:44:09 2011
+@@ -469,13 +469,6 @@
<target name="deploy" depends="build-only,build-docs,warn.dbcp">
@@ -14,57 +14,64 @@
<!-- Copy scripts -->
<copy todir="${tomcat.build}/bin">
<fileset dir="bin">
-@@ -696,48 +689,6 @@
+@@ -759,55 +752,6 @@
description="Download (and build as necessary) dependent components"
depends="build-manifests">
-- <antcall target="downloadfile">
-- <param name="sourcefile" value="${tomcat-native.loc}"/>
+- <antcall target="downloadfile-2">
+- <param name="sourcefile.1" value="${tomcat-native.loc.1}"/>
+- <param name="sourcefile.2" value="${tomcat-native.loc.2}"/>
- <param name="destfile" value="${tomcat-native.tar.gz}"/>
- <param name="destdir" value="${tomcat-native.home}"/>
- </antcall>
-
-- <antcall target="downloadfile">
-- <param name="sourcefile" value="${tomcat-native.dll}/win32/tcnative-1.dll"/>
-- <param name="destfile" value="${tomcat-native.home}/tcnative-1.dll.x86"/>
+- <antcall target="downloadfile-2">
+- <param name="sourcefile.1" value="${tomcat-native.dll.1}/win32/tcnative-1.dll"/>
+- <param name="sourcefile.2" value="${tomcat-native.dll.2}/win32/tcnative-1.dll"/>
+- <param name="destfile" value="${tomcat-native.dll.win32}"/>
- <param name="destdir" value="${tomcat-native.home}"/>
- </antcall>
-
-- <antcall target="downloadfile">
-- <param name="sourcefile" value="${tomcat-native.dll}/win64/x64/tcnative-1.dll"/>
-- <param name="destfile" value="${tomcat-native.home}/tcnative-1.dll.x64"/>
+- <antcall target="downloadfile-2">
+- <param name="sourcefile.1" value="${tomcat-native.dll.1}/win64/x64/tcnative-1.dll"/>
+- <param name="sourcefile.2" value="${tomcat-native.dll.2}/win64/x64/tcnative-1.dll"/>
+- <param name="destfile" value="${tomcat-native.dll.x64}"/>
- <param name="destdir" value="${tomcat-native.home}"/>
- </antcall>
-
-- <antcall target="downloadfile">
-- <param name="sourcefile" value="${tomcat-native.dll}/win64/ia64/tcnative-1.dll"/>
-- <param name="destfile" value="${tomcat-native.home}/tcnative-1.dll.i64"/>
+- <antcall target="downloadfile-2">
+- <param name="sourcefile.1" value="${tomcat-native.dll.1}/win64/ia64/tcnative-1.dll"/>
+- <param name="sourcefile.2" value="${tomcat-native.dll.2}/win64/ia64/tcnative-1.dll"/>
+- <param name="destfile" value="${tomcat-native.dll.i64}"/>
- <param name="destdir" value="${tomcat-native.home}"/>
- </antcall>
-
- <!-- Download Commons Daemon -->
-- <antcall target="downloadgz">
-- <param name="sourcefile" value="${commons-daemon.bin.loc}"/>
+- <antcall target="downloadgz-2">
+- <param name="sourcefile.1" value="${commons-daemon.bin.loc.1}"/>
+- <param name="sourcefile.2" value="${commons-daemon.bin.loc.2}"/>
- <param name="destfile" value="${commons-daemon.jar}"/>
- </antcall>
-
-- <antcall target="downloadfile">
-- <param name="sourcefile" value="${commons-daemon.native.src.loc}"/>
+- <antcall target="downloadfile-2">
+- <param name="sourcefile.1" value="${commons-daemon.native.src.loc.1}"/>
+- <param name="sourcefile.2" value="${commons-daemon.native.src.loc.2}"/>
- <param name="destfile" value="${commons-daemon.native.src.tgz}"/>
- <param name="destdir" value="${commons-daemon.home}"/>
- </antcall>
-
-- <antcall target="downloadzip">
-- <param name="sourcefile" value="${commons-daemon.native.win.loc}"/>
+- <antcall target="downloadzip-2">
+- <param name="sourcefile.1" value="${commons-daemon.native.win.loc.1}"/>
+- <param name="sourcefile.2" value="${commons-daemon.native.win.loc.2}"/>
- <param name="destfile" value="${commons-daemon.native.win.mgr.exe}"/>
- <param name="destdir" value="${commons-daemon.native.win.home}"/>
- </antcall>
-
<!-- Build Tomcat DBCP bundle -->
- <antcall target="downloadgz">
- <param name="sourcefile" value="${commons-pool-src.loc}"/>
-@@ -763,15 +714,9 @@
- <param name="basedir" value="${jasper-jdt.home}" />
+ <antcall target="downloadgz-2">
+ <param name="sourcefile.1" value="${commons-pool-src.loc.1}"/>
+@@ -832,15 +776,9 @@
+ <param name="destdir" value="${jdt.home}"/>
</antcall>
- <antcall target="downloadzip">