15990838 Upgrade Apache Tomcat to version 6.0.36
authorPetr Sumbera <petr.sumbera@oracle.com>
Fri, 14 Dec 2012 00:40:44 -0800
changeset 1084 8fac39a13695
parent 1083 dcfa3638d3e2
child 1085 23b00a0af1ef
15990838 Upgrade Apache Tomcat to version 6.0.36 15931652 problem in UTILITY/TOMCAT
components/tomcat/Makefile
components/tomcat/patches/build.properties.patch
components/tomcat/patches/build.xml.patch
components/tomcat/tomcat.p5m
--- a/components/tomcat/Makefile	Thu Dec 13 16:36:41 2012 -0800
+++ b/components/tomcat/Makefile	Fri Dec 14 00:40:44 2012 -0800
@@ -26,13 +26,13 @@
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		tomcat
-COMPONENT_VERSION=	6.0.35
+COMPONENT_VERSION=	6.0.36
 COMPONENT_PROJECT_URL=	http://tomcat.apache.org/
 COMPONENT_SRC_NAME=	apache-tomcat
 COMPONENT_SRC=		$(COMPONENT_SRC_NAME)-$(COMPONENT_VERSION)-src
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:6e5205834bd595250c8e0b640e2345ef643f23364ae0e099334b5132103be764
+    sha256:8da5b897ff28f688a5c7fe5abaa95e0ae0de9562283cec3c2643faaa13a6932c
 COMPONENT_ARCHIVE_URL=	http://www.apache.org/dist/tomcat/tomcat-6/v$(COMPONENT_VERSION)/src/$(COMPONENT_ARCHIVE)
 COMPONENT_BUGDB=	utility/tomcat
 
@@ -41,14 +41,14 @@
 COMPONENT_ARCHIVE_HASH_1= \
     sha256:f5f10846e79fc71121fe7402c61d71575506b01b59e719e974ebc4d99e6df283
 COMPONENT_ARCHIVE_URL_1= http://archive.apache.org/dist/commons/dbcp/source/$(COMPONENT_ARCHIVE_1)
-COMPONENT_ARCHIVE_2= commons-pool-1.5.6-src.tar.gz
+COMPONENT_ARCHIVE_2= commons-pool-1.5.7-src.tar.gz
 COMPONENT_ARCHIVE_HASH_2= \
-    sha256:0681c7394b3b6813dd9e06f985d4ddefe200e2abf81907352175477d91b41424
+    sha256:e9f414555c41e9584da1f6953af28208ece5cd4664ef2fea297e6a6aadc4377e
 COMPONENT_ARCHIVE_URL_2= http://archive.apache.org/dist/commons/pool/source/$(COMPONENT_ARCHIVE_2)
-COMPONENT_ARCHIVE_3= ecj-3.7.jar
+COMPONENT_ARCHIVE_3= ecj-3.7.2.jar
 COMPONENT_ARCHIVE_HASH_3= \
-    sha256:8387454f3557d2a03077cc5e96f4cfa4313e0fcd4b0febb4c385ada183de0c96
-COMPONENT_ARCHIVE_URL_3= http://download.eclipse.org/eclipse/downloads/drops/R-3.7-201106131736/$(COMPONENT_ARCHIVE_3)
+    sha256:e27bddb73290febbef88056cfd95c3dc29e00fba815321639286bb855a8cbe60
+COMPONENT_ARCHIVE_URL_3= http://download.eclipse.org/eclipse/downloads/drops/R-3.7.2-201202080800/$(COMPONENT_ARCHIVE_3)
 
 include ../../make-rules/prep.mk
 include ../../make-rules/ant.mk
--- a/components/tomcat/patches/build.properties.patch	Thu Dec 13 16:36:41 2012 -0800
+++ b/components/tomcat/patches/build.properties.patch	Fri Dec 14 00:40:44 2012 -0800
@@ -1,5 +1,5 @@
---- 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
+--- apache-tomcat-6.0.36-src/build.properties.default	Tue Oct 16 01:05:51 2012
++++ apache-tomcat-6.0.36-src/build.properties.default	Tue Dec  4 07:56:50 2012
 @@ -54,6 +54,12 @@
  base-sf.loc=http://downloads.sourceforge.net
  base-maven.loc=http://repo2.maven.org/maven2
@@ -22,9 +22,9 @@
  jdt.loc.2=http://download.eclipse.org/eclipse/downloads/drops/${jdt.release}/ecj-${jdt.version}.jar
  
  # ----- Tomcat native library -----
[email protected]@ -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
[email protected]@ -126,16 +132,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
@@ -36,7 +36,7 @@
  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.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
--- a/components/tomcat/patches/build.xml.patch	Thu Dec 13 16:36:41 2012 -0800
+++ b/components/tomcat/patches/build.xml.patch	Fri Dec 14 00:40:44 2012 -0800
@@ -1,6 +1,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
[email protected]@ -469,13 +469,6 @@
+--- apache-tomcat-6.0.36-src/build.xml	Tue Oct 16 01:05:51 2012
++++ apache-tomcat-6.0.36-src/build.xml	Thu Dec  6 04:01:54 2012
[email protected]@ -487,13 +487,6 @@
  
    <target name="deploy" depends="build-only,build-docs,warn.dbcp">
  
@@ -14,7 +14,7 @@
      <!-- Copy scripts -->
      <copy todir="${tomcat.build}/bin">
        <fileset dir="bin">
[email protected]@ -759,55 +752,6 @@
[email protected]@ -777,41 +770,6 @@
            description="Download (and build as necessary) dependent components"
            depends="build-manifests">
  
@@ -25,24 +25,10 @@
 -      <param name="destdir" value="${tomcat-native.home}"/>
 -    </antcall>
 -
--    <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-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-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}"/>
+-    <antcall target="downloadzip-2">
+-      <param name="sourcefile.1" value="${tomcat-native.win.1}"/>
+-      <param name="sourcefile.2" value="${tomcat-native.win.2}"/>
+-      <param name="destfile" value="${tomcat-native.home}/LICENSE"/>
 -      <param name="destdir" value="${tomcat-native.home}"/>
 -    </antcall>
 -
@@ -70,7 +56,7 @@
      <!-- Build Tomcat DBCP bundle -->
      <antcall target="downloadgz-2">
        <param name="sourcefile.1" value="${commons-pool-src.loc.1}"/>
[email protected]@ -832,15 +776,9 @@
[email protected]@ -836,15 +794,9 @@
        <param name="destdir" value="${jdt.home}"/>
      </antcall>
  
--- a/components/tomcat/tomcat.p5m	Thu Dec 13 16:36:41 2012 -0800
+++ b/components/tomcat/tomcat.p5m	Fri Dec 14 00:40:44 2012 -0800
@@ -87,6 +87,7 @@
 dir path=var/tomcat6/webapps/host-manager
 dir path=var/tomcat6/webapps/host-manager/META-INF
 dir path=var/tomcat6/webapps/host-manager/WEB-INF
+dir path=var/tomcat6/webapps/host-manager/WEB-INF/jsp
 dir path=var/tomcat6/webapps/host-manager/images
 dir path=var/tomcat6/webapps/manager
 dir path=var/tomcat6/webapps/manager/META-INF
@@ -231,7 +232,7 @@
 file path=usr/tomcat6/lib/catalina-ha.jar
 file path=usr/tomcat6/lib/catalina-tribes.jar
 file path=usr/tomcat6/lib/catalina.jar
-file path=usr/tomcat6/lib/ecj-3.7.jar
+file path=usr/tomcat6/lib/ecj-3.7.2.jar
 file path=usr/tomcat6/lib/el-api.jar
 file path=usr/tomcat6/lib/jasper-el.jar
 file path=usr/tomcat6/lib/jasper.jar
@@ -260,10 +261,10 @@
     original_name=SUNWtcat:var/tomcat6/conf/web.xml
 file path=var/tomcat6/webapps/ROOT/index.jsp mode=0644 preserve=renamenew \
     original_name=SUNWtcat:var/tomcat6/webapps/ROOT/index.jsp
-file path=var/tomcat6/webapps/host-manager/401.jsp
-file path=var/tomcat6/webapps/host-manager/403.jsp
 file path=var/tomcat6/webapps/host-manager/META-INF/context.xml
 file path=var/tomcat6/webapps/host-manager/WEB-INF/web.xml
+file path=var/tomcat6/webapps/host-manager/WEB-INF/jsp/401.jsp
+file path=var/tomcat6/webapps/host-manager/WEB-INF/jsp/403.jsp
 file path=var/tomcat6/webapps/host-manager/images/add.gif
 file path=var/tomcat6/webapps/host-manager/images/asf-logo.gif
 file path=var/tomcat6/webapps/host-manager/images/code.gif
@@ -274,9 +275,9 @@
 file path=var/tomcat6/webapps/host-manager/images/update.gif
 file path=var/tomcat6/webapps/host-manager/images/void.gif
 file path=var/tomcat6/webapps/host-manager/manager.xml
-file path=var/tomcat6/webapps/manager/401.jsp
-file path=var/tomcat6/webapps/manager/403.jsp
 file path=var/tomcat6/webapps/manager/META-INF/context.xml
+file path=var/tomcat6/webapps/manager/WEB-INF/jsp/401.jsp
+file path=var/tomcat6/webapps/manager/WEB-INF/jsp/403.jsp
 file path=var/tomcat6/webapps/manager/WEB-INF/jsp/sessionDetail.jsp
 file path=var/tomcat6/webapps/manager/WEB-INF/jsp/sessionsList.jsp
 file path=var/tomcat6/webapps/manager/WEB-INF/web.xml