# HG changeset patch
# User Petr Sumbera <petr.sumbera@oracle.com>
# Date 1469437605 25200
# Node ID ee6fa154236ba3166f37c2ac564714a4cfc2987a
# Parent  5730eca693a94b9a4525ac0c9d2cc68177d0dca2
23623227 Upgrade Apache Tomcat to version 8.5.3
23631794 problem in UTILITY/TOMCAT

diff -r 5730eca693a9 -r ee6fa154236b components/tomcat-8/Makefile
--- a/components/tomcat-8/Makefile	Tue Jul 26 11:56:10 2016 -0700
+++ b/components/tomcat-8/Makefile	Mon Jul 25 02:06:45 2016 -0700
@@ -26,23 +26,23 @@
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		tomcat
-COMPONENT_VERSION=	8.0.32
+COMPONENT_VERSION=	8.5.3
 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:b8f7770ae947a0c0aed9b5a6f3e2ff18fd27a07f068cc6029f019b5d4c6de560
+    sha256:d0d1ecfd88d733cf3666cc39483ea092627840cd2cfab8fae09f93b7bf05d21d
 COMPONENT_ARCHIVE_URL=	http://www.apache.org/dist/tomcat/tomcat-8/v$(COMPONENT_VERSION)/src/$(COMPONENT_ARCHIVE)
 COMPONENT_BUGDB=	utility/tomcat
 
 # Tomcat subcomponents
-COMPONENT_ARCHIVE_1= ecjsrc-4.4.2.jar
+COMPONENT_ARCHIVE_1= ecjsrc-4.5.1.jar
 COMPONENT_ARCHIVE_HASH_1= \
-    sha256:ad3daf77ab710268f88c41fba87218dcdf502b423217a3799b5227ddf03b5858
-COMPONENT_ARCHIVE_URL_1= http://archive.eclipse.org/eclipse/downloads/drops4/R-4.4.2-201502041700/$(COMPONENT_ARCHIVE_1)
+    sha256:101a31ee0474282a287b16c46fa6e793ede43ceecaecabbd382f6e0b1b67ef72
+COMPONENT_ARCHIVE_URL_1= http://archive.eclipse.org/eclipse/downloads/drops4/R-4.5.1-201509040015/$(COMPONENT_ARCHIVE_1)
 
-TPNO=			26981
+TPNO=			29493
 
 include $(WS_MAKE_RULES)/prep.mk
 include $(WS_MAKE_RULES)/ant.mk
@@ -61,6 +61,7 @@
 COMPONENT_PRE_BUILD_ACTION+= \
 	($(MKDIR) $(@D)/ECJ/scripts/binary/META-INF; cd $(@D)/ECJ ; \
 	    $(JAVA_HOME)/bin/jar xf $(COMPONENT_DIR)/$(COMPONENT_ARCHIVE_1); \
+	    $(GPATCH) $(GPATCH_FLAGS) < $(COMPONENT_DIR)/$(PATCH_DIR)/ECJ.ecj-patch; \
 	    $(CP) META-INF/MANIFEST.MF scripts/binary/META-INF/; \
 	    JAVA_HOME="$(JAVA_HOME)" LC_ALL="en_US.UTF-8" $(ANT) )
 
diff -r 5730eca693a9 -r ee6fa154236b components/tomcat-8/patches/ECJ.ecj-patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/tomcat-8/patches/ECJ.ecj-patch	Mon Jul 25 02:06:45 2016 -0700
@@ -0,0 +1,34 @@
+https://bugs.eclipse.org/bugs/show_bug.cgi?id=479134
+
+--- org/eclipse/jdt/internal/compiler/batch/ClasspathDirectory.java
++++ org/eclipse/jdt/internal/compiler/batch/ClasspathDirectory.java
+@@ -18,7 +18,6 @@
+ import java.util.Hashtable;
+ import java.util.List;
+ 
+-import org.eclipse.jdt.core.JavaCore;
+ import org.eclipse.jdt.core.compiler.CharOperation;
+ import org.eclipse.jdt.internal.compiler.CompilationResult;
+ import org.eclipse.jdt.internal.compiler.DefaultErrorHandlingPolicies;
+@@ -189,7 +188,7 @@
+ 		ProblemReporter problemReporter = 
+ 				new ProblemReporter(
+ 					DefaultErrorHandlingPolicies.proceedWithAllProblems(),
+-					new CompilerOptions(JavaCore.getOptions()),
++					new CompilerOptions(),
+ 					new DefaultProblemFactory());
+ 		Parser parser = new Parser(problemReporter, false);
+ 
+--- build.xml
++++ build.xml
+@@ -22,8 +22,8 @@
+ 
+ 		<javac srcdir="${basedir}" destdir="${output}"
+ 					debuglevel="lines,source"
+-					source="1.6"
+-					target="1.6">
++					source="1.8"
++					target="1.8">
+ 			<compilerarg line="-Xlint:none"/>
+ 		</javac>
+ 
diff -r 5730eca693a9 -r ee6fa154236b components/tomcat-8/patches/build.properties.patch
--- a/components/tomcat-8/patches/build.properties.patch	Tue Jul 26 11:56:10 2016 -0700
+++ b/components/tomcat-8/patches/build.properties.patch	Mon Jul 25 02:06:45 2016 -0700
@@ -6,7 +6,7 @@
 
 --- build.properties.default
 +++ build.properties.default
-@@ -100,6 +100,12 @@
+@@ -95,6 +95,12 @@
  # Mirror, was used when there were problems with the main SF downloads site
  # base-sf.loc=http://sunet.dl.sourceforge.net
  
@@ -19,7 +19,7 @@
  # ----- Commons Logging, version 1.1 or later -----
  # If this version is updated, check the versions required for the dependencies below
  # - avalon-framework
-@@ -155,7 +161,7 @@
+@@ -150,7 +156,7 @@
  jdt.home=${base.path}/ecj-${jdt.version}
  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.
diff -r 5730eca693a9 -r ee6fa154236b components/tomcat-8/patches/build.xml.patch
--- a/components/tomcat-8/patches/build.xml.patch	Tue Jul 26 11:56:10 2016 -0700
+++ b/components/tomcat-8/patches/build.xml.patch	Mon Jul 25 02:06:45 2016 -0700
@@ -6,7 +6,7 @@
 
 --- build.xml
 +++ build.xml
-@@ -988,13 +988,6 @@
+@@ -1002,13 +1002,6 @@
    <target name="deploy" depends="package,build-docs,build-tomcat-jdbc,compile-webapp-examples"
            description="Default. Builds a working Tomcat instance">
  
@@ -20,7 +20,7 @@
      <!-- Copy scripts -->
      <copy todir="${tomcat.build}/bin">
        <fileset dir="bin">
-@@ -2755,27 +2748,6 @@
+@@ -2788,27 +2781,6 @@
    <target name="download-compile"
            description="Download (and build) components necessary to compile" >
  
diff -r 5730eca693a9 -r ee6fa154236b components/tomcat-8/patches/setenv.patch
--- a/components/tomcat-8/patches/setenv.patch	Tue Jul 26 11:56:10 2016 -0700
+++ b/components/tomcat-8/patches/setenv.patch	Mon Jul 25 02:06:45 2016 -0700
@@ -5,7 +5,7 @@
 
 --- bin/catalina.sh
 +++ bin/catalina.sh
-@@ -145,7 +146,13 @@
+@@ -138,7 +139,13 @@
  # but allow them to be specified in setenv.sh, in rare case when it is needed.
  CLASSPATH=
  
@@ -22,7 +22,7 @@
    . "$CATALINA_HOME/bin/setenv.sh"
 --- bin/tool-wrapper.sh
 +++ bin/tool-wrapper.sh
-@@ -73,8 +75,16 @@
+@@ -67,8 +69,16 @@
  # but allow them to be specified in setenv.sh, in rare case when it is needed.
  CLASSPATH=
  
diff -r 5730eca693a9 -r ee6fa154236b components/tomcat-8/tomcat-examples.p5m
--- a/components/tomcat-8/tomcat-examples.p5m	Tue Jul 26 11:56:10 2016 -0700
+++ b/components/tomcat-8/tomcat-examples.p5m	Mon Jul 25 02:06:45 2016 -0700
@@ -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=var/tomcat8/(.+)$ -> \
@@ -105,9 +105,6 @@
 file path=var/tomcat8/webapps/examples/WEB-INF/classes/cal/JspCalendar.java
 file path=var/tomcat8/webapps/examples/WEB-INF/classes/cal/TableBean.class
 file path=var/tomcat8/webapps/examples/WEB-INF/classes/cal/TableBean.java
-file path=var/tomcat8/webapps/examples/WEB-INF/classes/chat/ChatServlet$MessageSender.class
-file path=var/tomcat8/webapps/examples/WEB-INF/classes/chat/ChatServlet.class
-file path=var/tomcat8/webapps/examples/WEB-INF/classes/chat/ChatServlet.java
 file path=var/tomcat8/webapps/examples/WEB-INF/classes/checkbox/CheckTest.class
 file path=var/tomcat8/webapps/examples/WEB-INF/classes/checkbox/CheckTest.java
 file path=var/tomcat8/webapps/examples/WEB-INF/classes/colors/ColorGameBean.class
@@ -138,6 +135,8 @@
 file path=var/tomcat8/webapps/examples/WEB-INF/classes/examples/ValuesTag.java
 file path=var/tomcat8/webapps/examples/WEB-INF/classes/filters/ExampleFilter.class
 file path=var/tomcat8/webapps/examples/WEB-INF/classes/filters/ExampleFilter.java
+file path=var/tomcat8/webapps/examples/WEB-INF/classes/http2/SimpleImagePush.class
+file path=var/tomcat8/webapps/examples/WEB-INF/classes/http2/SimpleImagePush.java
 file path=var/tomcat8/webapps/examples/WEB-INF/classes/jsp2/examples/BookBean.class
 file path=var/tomcat8/webapps/examples/WEB-INF/classes/jsp2/examples/BookBean.java
 file path=var/tomcat8/webapps/examples/WEB-INF/classes/jsp2/examples/FooBean.class
@@ -422,12 +421,6 @@
 file path=var/tomcat8/webapps/examples/jsp/xml/xml.html
 file path=var/tomcat8/webapps/examples/jsp/xml/xml.jsp
 file path=var/tomcat8/webapps/examples/jsp/xml/xml.jsp.html
-file path=var/tomcat8/webapps/examples/servlets/chat/index.jsp
-file path=var/tomcat8/webapps/examples/servlets/chat/index.jsp.html
-file path=var/tomcat8/webapps/examples/servlets/chat/login.jsp
-file path=var/tomcat8/webapps/examples/servlets/chat/login.jsp.html
-file path=var/tomcat8/webapps/examples/servlets/chat/post.jsp
-file path=var/tomcat8/webapps/examples/servlets/chat/post.jsp.html
 file path=var/tomcat8/webapps/examples/servlets/cookies.html
 file path=var/tomcat8/webapps/examples/servlets/helloworld.html
 file path=var/tomcat8/webapps/examples/servlets/images/code.gif
diff -r 5730eca693a9 -r ee6fa154236b components/tomcat-8/tomcat.license
--- a/components/tomcat-8/tomcat.license	Tue Jul 26 11:56:10 2016 -0700
+++ b/components/tomcat-8/tomcat.license	Mon Jul 25 02:06:45 2016 -0700
@@ -212,7 +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.4.2.jar
+    * ecj-4.5.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.  
 
diff -r 5730eca693a9 -r ee6fa154236b components/tomcat-8/tomcat.p5m
--- a/components/tomcat-8/tomcat.p5m	Tue Jul 26 11:56:10 2016 -0700
+++ b/components/tomcat-8/tomcat.p5m	Mon Jul 25 02:06:45 2016 -0700
@@ -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/tomcat8/(.+)$ -> \
@@ -126,6 +126,7 @@
 file path=usr/tomcat8/docs/config/index.html
 file path=usr/tomcat8/docs/config/jar-scan-filter.html
 file path=usr/tomcat8/docs/config/jar-scanner.html
+file path=usr/tomcat8/docs/config/jaspic.html
 file path=usr/tomcat8/docs/config/listeners.html
 file path=usr/tomcat8/docs/config/loader.html
 file path=usr/tomcat8/docs/config/manager.html
@@ -214,10 +215,11 @@
 file path=usr/tomcat8/lib/catalina-storeconfig.jar
 file path=usr/tomcat8/lib/catalina-tribes.jar
 file path=usr/tomcat8/lib/catalina.jar
-file path=usr/tomcat8/lib/ecj-4.4.2.jar
+file path=usr/tomcat8/lib/ecj-4.5.1.jar
 file path=usr/tomcat8/lib/el-api.jar
 file path=usr/tomcat8/lib/jasper-el.jar
 file path=usr/tomcat8/lib/jasper.jar
+file path=usr/tomcat8/lib/jaspic-api.jar
 file path=usr/tomcat8/lib/jsp-api.jar
 file path=usr/tomcat8/lib/servlet-api.jar
 file path=usr/tomcat8/lib/tomcat-api.jar
@@ -239,6 +241,8 @@
     original_name=SUNWtcat:var/tomcat6/conf/catalina.properties \
     preserve=renamenew
 file path=var/tomcat8/conf/context.xml mode=0644 preserve=renamenew
+file path=var/tomcat8/conf/jaspic-providers.xml mode=0644 preserve=renamenew
+file path=var/tomcat8/conf/jaspic-providers.xsd mode=0644 preserve=renamenew
 file path=var/tomcat8/conf/logging.properties mode=0644 \
     original_name=SUNWtcat:var/tomcat6/conf/logging.properties \
     preserve=renamenew