22817809 Upgrade Apache Tomcat to version 8.0.32
22824943 Upgrade Apache Tomcat to version 6.0.45
22817436 problem in UTILITY/TOMCAT
22817540 problem in UTILITY/TOMCAT
--- a/components/tomcat-8/Makefile Wed Feb 24 05:57:34 2016 -0800
+++ b/components/tomcat-8/Makefile Thu Feb 25 01:05:50 2016 -0800
@@ -20,19 +20,19 @@
#
#
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
#
include ../../make-rules/shared-macros.mk
COMPONENT_NAME= tomcat
-COMPONENT_VERSION= 8.0.30
+COMPONENT_VERSION= 8.0.32
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:0f79b74f303cce809ea63a85586efb5d4bb67ea53622f1b44ecffff0f1aa9cf6
+ sha256:b8f7770ae947a0c0aed9b5a6f3e2ff18fd27a07f068cc6029f019b5d4c6de560
COMPONENT_ARCHIVE_URL= http://www.apache.org/dist/tomcat/tomcat-8/v$(COMPONENT_VERSION)/src/$(COMPONENT_ARCHIVE)
COMPONENT_BUGDB= utility/tomcat
@@ -42,7 +42,7 @@
sha256:ad3daf77ab710268f88c41fba87218dcdf502b423217a3799b5227ddf03b5858
COMPONENT_ARCHIVE_URL_1= http://archive.eclipse.org/eclipse/downloads/drops4/R-4.4.2-201502041700/$(COMPONENT_ARCHIVE_1)
-TPNO= 25995
+TPNO= 26981
include $(WS_MAKE_RULES)/prep.mk
include $(WS_MAKE_RULES)/ant.mk
--- a/components/tomcat-8/patches/build.xml.patch Wed Feb 24 05:57:34 2016 -0800
+++ b/components/tomcat-8/patches/build.xml.patch Thu Feb 25 01:05:50 2016 -0800
@@ -20,7 +20,7 @@
<!-- Copy scripts -->
<copy todir="${tomcat.build}/bin">
<fileset dir="bin">
-@@ -2796,27 +2789,6 @@
+@@ -2755,27 +2748,6 @@
<target name="download-compile"
description="Download (and build) components necessary to compile" >
--- a/components/tomcat/Makefile Wed Feb 24 05:57:34 2016 -0800
+++ b/components/tomcat/Makefile Thu Feb 25 01:05:50 2016 -0800
@@ -20,19 +20,19 @@
#
#
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
#
include ../../make-rules/shared-macros.mk
COMPONENT_NAME= tomcat
-COMPONENT_VERSION= 6.0.44
+COMPONENT_VERSION= 6.0.45
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:c6f01526d58f2ba7b9da496e959d9e68cc49183006077704ab91c36ebebf5a4a
+ sha256:d464b3e770197f026bf802d19be0195b941e8c3be7e552dc2f8eb563f9cc010e
COMPONENT_ARCHIVE_URL= http://www.apache.org/dist/tomcat/tomcat-6/v$(COMPONENT_VERSION)/src/$(COMPONENT_ARCHIVE)
COMPONENT_BUGDB= utility/tomcat
@@ -50,7 +50,7 @@
sha256:5f86314f67dc57a0a9865265a48fd7831f16ab177c0c1349eea798c2c6297295
COMPONENT_ARCHIVE_URL_3= http://download.eclipse.org/eclipse/downloads/drops4/R-4.3.1-201309111000/$(COMPONENT_ARCHIVE_3)
-TPNO= 23695
+TPNO= 26982
include $(WS_MAKE_RULES)/prep.mk
include $(WS_MAKE_RULES)/ant.mk
@@ -66,15 +66,16 @@
(cd $(PROTO_DIR) ; $(RM) conf/CONF.tar.gz ; \
gtar cfz conf/CONF.tar.gz conf/* )
+COMPONENT_TEST_ARGS = $(COMPONENT_BUILD_ARGS) -Djunit.home=/usr/share/lib/java
+COMPONENT_TEST_TARGETS = test
+
ASLR_MODE = $(ASLR_NOT_APPLICABLE)
build: $(BUILD_32)
install: build
-test: build
- @cd $(BUILD_DIR_32)/test; $(ENV) $(COMPONENT_BUILD_ENV) \
- $(ANT) $(COMPONENT_BUILD_ARGS) -Djunit.home=/usr/share/lib/java
+test: $(TEST_32)
REQUIRED_PACKAGES += runtime/java/jre-8
--- a/components/tomcat/patches/build.properties.patch Wed Feb 24 05:57:34 2016 -0800
+++ b/components/tomcat/patches/build.properties.patch Thu Feb 25 01:05:50 2016 -0800
@@ -7,7 +7,7 @@
--- build.properties.default
+++ build.properties.default
-@@ -52,6 +52,12 @@
+@@ -67,6 +67,12 @@
# repo.maven.apache.org is the same as repo2.maven.org
base-maven.loc=http://repo.maven.apache.org/maven2
@@ -20,7 +20,7 @@
# ----- Commons Logging, version 1.1 or later -----
# If this version is updated, check the versions required for the deps
# - avalon-framework
-@@ -112,7 +118,7 @@
+@@ -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
@@ -29,7 +29,7 @@
jdt.loc.2=http://download.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj-${jdt.version}.jar
# ----- Tomcat native library -----
-@@ -124,16 +130,16 @@
+@@ -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
--- a/components/tomcat/patches/build.xml.patch Wed Feb 24 05:57:34 2016 -0800
+++ b/components/tomcat/patches/build.xml.patch Thu Feb 25 01:05:50 2016 -0800
@@ -7,7 +7,7 @@
--- build.xml
+++ build.xml
-@@ -492,13 +492,6 @@
+@@ -515,13 +515,6 @@
<target name="deploy" depends="build-only,build-docs,warn.dbcp">
@@ -21,10 +21,11 @@
<!-- Copy scripts -->
<copy todir="${tomcat.build}/bin">
<fileset dir="bin">
-@@ -780,41 +773,6 @@
+@@ -956,42 +949,6 @@
description="Download (and build as necessary) dependent components"
depends="build-manifests">
+- <!-- Download Apache Tomcat Native -->
- <antcall target="downloadfile-2">
- <param name="sourcefile.1" value="${tomcat-native.loc.1}"/>
- <param name="sourcefile.2" value="${tomcat-native.loc.2}"/>
@@ -39,7 +40,7 @@
- <param name="destdir" value="${tomcat-native.home}"/>
- </antcall>
-
-- <!-- Download Commons Daemon -->
+- <!-- Download Apache Commons Daemon -->
- <antcall target="downloadgz-2">
- <param name="sourcefile.1" value="${commons-daemon.bin.loc.1}"/>
- <param name="sourcefile.2" value="${commons-daemon.bin.loc.2}"/>
@@ -63,7 +64,7 @@
<!-- Build Tomcat DBCP bundle -->
<antcall target="downloadgz-2">
<param name="sourcefile.1" value="${commons-pool-src.loc.1}"/>
-@@ -826,6 +784,11 @@
+@@ -1003,6 +960,11 @@
<param name="sourcefile.2" value="${commons-dbcp-src.loc.2}"/>
<param name="destfile" value="${commons-dbcp.home}/build.xml" />
</antcall>
@@ -75,16 +76,30 @@
<mkdir dir="${tomcat-dbcp.home}"/>
<antcall target="build-tomcat-dbcp" />
-@@ -837,15 +800,9 @@
+@@ -1014,29 +976,9 @@
<param name="destdir" value="${jdt.home}"/>
</antcall>
+- <!-- Download NSIS (Nullsoft Scriptable Install System) -->
- <antcall target="downloadzip">
- <param name="sourcefile" value="${nsis.loc}"/>
- <param name="destfile" value="${nsis.exe}"/>
- <param name="destdir" value="${nsis.home}/.."/>
- </antcall>
-
+- <!-- Libraries used for testing. JUnit, Hamcrest -->
+- <antcall target="downloadfile">
+- <param name="sourcefile" value="${junit.loc}"/>
+- <param name="destfile" value="${junit.jar}"/>
+- <param name="destdir" value="${junit.home}"/>
+- </antcall>
+-
+- <antcall target="downloadfile">
+- <param name="sourcefile" value="${hamcrest.loc}"/>
+- <param name="destfile" value="${hamcrest.jar}"/>
+- <param name="destdir" value="${hamcrest.home}"/>
+- </antcall>
+-
</target>
- <target name="build-tomcat-dbcp" unless="jdk16.present"
--- a/components/tomcat/patches/tomcat_strict_servlet.patch Wed Feb 24 05:57:34 2016 -0800
+++ b/components/tomcat/patches/tomcat_strict_servlet.patch Thu Feb 25 01:05:50 2016 -0800
@@ -38,7 +38,7 @@
org.apache.catalina.startup.Bootstrap "$@" start
fi
-@@ -376,6 +380,7 @@
+@@ -378,6 +382,7 @@
-Dcatalina.base="$CATALINA_BASE" \
-Dcatalina.home="$CATALINA_HOME" \
-Djava.io.tmpdir="$CATALINA_TMPDIR" \
@@ -46,7 +46,7 @@
org.apache.catalina.startup.Bootstrap "$@" start \
>> "$CATALINA_OUT" 2>&1 &
-@@ -385,6 +390,7 @@
+@@ -387,6 +392,7 @@
-Dcatalina.base="$CATALINA_BASE" \
-Dcatalina.home="$CATALINA_HOME" \
-Djava.io.tmpdir="$CATALINA_TMPDIR" \
@@ -54,7 +54,7 @@
org.apache.catalina.startup.Bootstrap "$@" start \
>> "$CATALINA_OUT" 2>&1 &
-@@ -435,6 +441,7 @@
+@@ -437,6 +443,7 @@
-Dcatalina.base="$CATALINA_BASE" \
-Dcatalina.home="$CATALINA_HOME" \
-Djava.io.tmpdir="$CATALINA_TMPDIR" \
--- a/components/tomcat/tomcat.license Wed Feb 24 05:57:34 2016 -0800
+++ b/components/tomcat/tomcat.license Thu Feb 25 01:05:50 2016 -0800
@@ -212,6 +212,7 @@
1. The follow files are available in source code form under the Eclipse Public License at: http://archive.eclipse.org/eclipse/downloads/ . (The EPL license is reproduced below).
+ * ecj-4.3.1.jar
2. All past Contributors to the Eclipse JDT Java compiler disclaim all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose. In addition, such Contributors are not liable for any damages, including direct, indirect, special, incidental and consequential damages, such as lost profits.
--- a/components/tomcat/tomcat.p5m Wed Feb 24 05:57:34 2016 -0800
+++ b/components/tomcat/tomcat.p5m Thu Feb 25 01:05:50 2016 -0800
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr/tomcat6/(.+)$ -> \
@@ -235,6 +235,7 @@
file path=var/tomcat6/webapps/host-manager/images/tomcat.gif
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/index.jsp
file path=var/tomcat6/webapps/host-manager/manager.xml
file path=var/tomcat6/webapps/manager/META-INF/context.xml
file path=var/tomcat6/webapps/manager/WEB-INF/jsp/401.jsp
@@ -251,6 +252,7 @@
file path=var/tomcat6/webapps/manager/images/tomcat.gif
file path=var/tomcat6/webapps/manager/images/update.gif
file path=var/tomcat6/webapps/manager/images/void.gif
+file path=var/tomcat6/webapps/manager/index.jsp
file path=var/tomcat6/webapps/manager/status.xsd
file path=var/tomcat6/webapps/manager/xform.xsl
dir path=var/tomcat6/work owner=webservd group=webservd
--- a/make-rules/ant.mk Wed Feb 24 05:57:34 2016 -0800
+++ b/make-rules/ant.mk Thu Feb 25 01:05:50 2016 -0800
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
#
ANT=/usr/bin/ant
@@ -46,6 +46,21 @@
$(COMPONENT_POST_INSTALL_ACTION)
$(TOUCH) $@
+COMPONENT_TEST_ENV_CMD = $(ENV)
+COMPONENT_TEST_ENV += JAVA_HOME="$(JAVA_HOME)"
+COMPONENT_TEST_CMD = $(ANT)
+COMPONENT_TEST_DIR = $(@D)
+
+$(BUILD_DIR)/%/.tested: $(BUILD_DIR)/%/.built
+ $(COMPONENT_PRE_TEST_ACTION)
+ (cd $(COMPONENT_TEST_DIR) ; \
+ $(COMPONENT_TEST_ENV_CMD) $(COMPONENT_TEST_ENV) \
+ $(COMPONENT_TEST_CMD) \
+ $(COMPONENT_TEST_ARGS) $(COMPONENT_TEST_TARGETS))
+ $(COMPONENT_POST_TEST_ACTION)
+ $(COMPONENT_TEST_CLEANUP)
+ $(TOUCH) $@
+
ifeq ($(strip $(PARFAIT_BUILD)),yes)
parfait: build
else