--- a/usr/src/cmd/tomcat/METADATA Tue Jan 31 18:41:32 2012 +0000
+++ b/usr/src/cmd/tomcat/METADATA Tue Jan 31 18:34:04 2012 +0000
@@ -1,10 +1,10 @@
NAME: tomcat
-VERSION: 6.0.28
+VERSION: 6.0.35
DESCRIPTION: for Java Servlet and JavaServer Pages
LICENSE: Apache v2.0
PACKAGE: SUNWtcatr SUNWtcatu SUNWtcat-examples
PROJECT_URL: http://jakarta.apache.org/tomcat
-SOURCE_DOWNLOAD: http://apache.ziply.com/tomcat/tomcat-6/v6.0.28/src/apache-tomcat-6.0.28-src.tar.gz
+SOURCE_DOWNLOAD: http://apache.ziply.com/tomcat/tomcat-6/v6.0.35/src/apache-tomcat-6.0.35-src.tar.gz
SUPPORT: C
BUGTRAQ: solaris/utility/apache
OSR: 6819
--- a/usr/src/cmd/tomcat/Patches/build.properties.patch Tue Jan 31 18:41:32 2012 +0000
+++ b/usr/src/cmd/tomcat/Patches/build.properties.patch Tue Jan 31 18:34:04 2012 +0000
@@ -1,13 +1,24 @@
---- apache-tomcat-6.0.28-src/build.properties.default.orig Fri Jul 9 08:07:37 2010
-+++ apache-tomcat-6.0.28-src/build.properties.default Fri Jul 9 08:09:18 2010
-@@ -69,8 +69,8 @@
- 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
+--- apache-tomcat-6.0.35-src/build.properties.default.orig 2011-11-28 10:22:44.000000000 +0000
++++ apache-tomcat-6.0.35-src/build.properties.default 2012-02-08 18:49:56.013439693 +0000
+@@ -114,8 +114,8 @@
+ 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/drops/${jdt.release}/ecj-${jdt.version}.jar
+-jdt.loc.2=http://download.eclipse.org/eclipse/downloads/drops/${jdt.release}/ecj-${jdt.version}.jar
++jdt.loc.1=file://${base.path}/../ecj-${jdt.version}.jar
++jdt.loc.2=file://${base.path}/../ecj-${jdt.version}.jar
+
+ # ----- Tomcat native library -----
+ tomcat-native.version=1.1.22
+@@ -129,8 +129,8 @@
+ 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.1=${base-commons.loc.1}/dbcp/source/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
--- a/usr/src/cmd/tomcat/Patches/build.xml.patch Tue Jan 31 18:41:32 2012 +0000
+++ b/usr/src/cmd/tomcat/Patches/build.xml.patch Tue Jan 31 18:34:04 2012 +0000
@@ -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">
--- a/usr/src/cmd/tomcat/Solaris/build.properties.sed Tue Jan 31 18:41:32 2012 +0000
+++ b/usr/src/cmd/tomcat/Solaris/build.properties.sed Tue Jan 31 18:34:04 2012 +0000
@@ -34,9 +34,9 @@
/^base-xerces/s/=.*/=file:\/\/${base.path}\/..\//
# remove directory path so that only file name will remain
-/\${base-commons\.loc}/s/\/.*\//\//g
-/\${base-logging\.loc}/s/\/.*\//\//g
-/\${base-struts\.loc}/s/\/.*\//\//g
-/\${base-sf\.loc}/s/\/.*\//\//g
-/\${base-tomcat\.loc}/s/\/.*\//\//g
-/\${base-xerces\.loc}/s/\/.*\//\//g
+/\${base-commons\.loc\.[12]}/s/\/.*\//\//g
+/\${base-logging\.loc}\.[12]/s/\/.*\//\//g
+/\${base-struts\.loc\.[12]}/s/\/.*\//\//g
+/\${base-sf\.loc\.[12]}/s/\/.*\//\//g
+/\${base-tomcat\.loc\.[12]}/s/\/.*\//\//g
+/\${base-xerces\.loc\.[12]}/s/\/.*\//\//g
--- a/usr/src/cmd/tomcat/Solaris/tomcat.1m.sunman Tue Jan 31 18:41:32 2012 +0000
+++ b/usr/src/cmd/tomcat/Solaris/tomcat.1m.sunman Tue Jan 31 18:34:04 2012 +0000
@@ -219,4 +219,4 @@
.SH NOTES
.sp
.LP
-Source for Tomcat is available on http://opensolaris.org\&.
+Source for Tomcat is available on http://openindiana.org\&.
Binary file usr/src/cmd/tomcat/apache-tomcat-6.0.28-src.tar.gz has changed
Binary file usr/src/cmd/tomcat/apache-tomcat-6.0.35-src.tar.gz has changed
Binary file usr/src/cmd/tomcat/commons-pool-1.5.4-src.tar.gz has changed
Binary file usr/src/cmd/tomcat/commons-pool-1.5.6-src.tar.gz has changed
Binary file usr/src/cmd/tomcat/ecj-3.7.jar has changed
--- a/usr/src/pkgdefs/SUNWtcatr/prototype_com Tue Jan 31 18:41:32 2012 +0000
+++ b/usr/src/pkgdefs/SUNWtcatr/prototype_com Tue Jan 31 18:34:04 2012 +0000
@@ -84,6 +84,8 @@
f none var/tomcat6/webapps/host-manager/images/update.gif 0644 root bin
d none var/tomcat6/webapps/host-manager/WEB-INF 0755 root bin
f none var/tomcat6/webapps/host-manager/WEB-INF/web.xml 0644 root bin
+f none var/tomcat6/webapps/host-manager/401.jsp 0644 root bin
+f none var/tomcat6/webapps/host-manager/403.jsp 0644 root bin
d none var/tomcat6/webapps/manager 0755 root bin
f none var/tomcat6/webapps/manager/status.xsd 0644 root bin
d none var/tomcat6/webapps/manager/images 0755 root bin
@@ -105,5 +107,6 @@
f none var/tomcat6/webapps/manager/META-INF/context.xml 0644 root bin
f none var/tomcat6/webapps/manager/xform.xsl 0644 root bin
f none var/tomcat6/webapps/manager/401.jsp 0644 root bin
+f none var/tomcat6/webapps/manager/403.jsp 0644 root bin
d none var/tomcat6/webapps/ROOT 0755 root bin
f renamenew var/tomcat6/webapps/ROOT/index.jsp 0644 root bin
--- a/usr/src/pkgdefs/SUNWtcatu/prototype_com Tue Jan 31 18:41:32 2012 +0000
+++ b/usr/src/pkgdefs/SUNWtcatu/prototype_com Tue Jan 31 18:34:04 2012 +0000
@@ -59,9 +59,14 @@
f none usr/tomcat6/docs/index.html 0644 root bin
f none usr/tomcat6/docs/monitoring.html 0644 root bin
d none usr/tomcat6/docs/tribes 0755 root bin
+f none usr/tomcat6/docs/tribes/developers.html 0644 root bin
+f none usr/tomcat6/docs/tribes/faq.html 0644 root bin
+f none usr/tomcat6/docs/tribes/interceptors.html 0644 root bin
f none usr/tomcat6/docs/tribes/introduction.html 0644 root bin
+f none usr/tomcat6/docs/tribes/membership.html 0644 root bin
f none usr/tomcat6/docs/tribes/setup.html 0644 root bin
-f none usr/tomcat6/docs/tribes/faq.html 0644 root bin
+f none usr/tomcat6/docs/tribes/status.html 0644 root bin
+f none usr/tomcat6/docs/tribes/transport.html 0644 root bin
f none usr/tomcat6/docs/class-loader-howto.html 0644 root bin
f none usr/tomcat6/docs/RUNNING.txt 0644 root bin
f none usr/tomcat6/docs/apr.html 0644 root bin
@@ -160,6 +165,7 @@
f none usr/tomcat6/docs/config/context.html 0644 root bin
f none usr/tomcat6/docs/config/cluster-listener.html 0644 root bin
f none usr/tomcat6/docs/config/engine.html 0644 root bin
+f none usr/tomcat6/docs/config/filter.html 0644 root bin
f none usr/tomcat6/docs/config/manager.html 0644 root bin
f none usr/tomcat6/docs/config/cluster-manager.html 0644 root bin
f none usr/tomcat6/docs/config/cluster-deployer.html 0644 root bin
@@ -194,9 +200,9 @@
f none usr/tomcat6/bin/setclasspath.sh 0755 root bin
f none usr/tomcat6/bin/startup.sh 0755 root bin
d none usr/tomcat6/lib 0755 root bin
-f none usr/tomcat6/lib/jasper-jdt.jar 0644 root bin
f none usr/tomcat6/lib/tomcat-coyote.jar 0644 root bin
f none usr/tomcat6/lib/catalina-ha.jar 0644 root bin
+f none usr/tomcat6/lib/ecj-3.7.jar 0644 root bin
f none usr/tomcat6/lib/el-api.jar 0644 root bin
f none usr/tomcat6/lib/tomcat-dbcp.jar 0644 root bin
f none usr/tomcat6/lib/servlet-api.jar 0644 root bin