# HG changeset patch
# User Petr Sumbera <petr.sumbera@oracle.com>
# Date 1449060136 28800
# Node ID 651acf52b7a349e1551b9edb74ab6a9e8486eeb4
# Parent  f51fbbf6028d40ac336ed9f174fcbbf2d1880af5
22299631 Upgrade Apache Tomcat to version 8.0.29

diff -r f51fbbf6028d -r 651acf52b7a3 components/tomcat-8/Makefile
--- a/components/tomcat-8/Makefile	Thu Dec 03 10:38:43 2015 -0800
+++ b/components/tomcat-8/Makefile	Wed Dec 02 04:42:16 2015 -0800
@@ -26,13 +26,13 @@
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		tomcat
-COMPONENT_VERSION=	8.0.21
+COMPONENT_VERSION=	8.0.29
 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:9fe0d4f0f86593a78eec952b257c7282765604926c30fe13c9dbe6f9f35674d8
+    sha256:5cb87ae9afd145d68906e93b825a6a41303d7975bafe3d57530e9a8ec01c7c80
 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=			22471
+TPNO=			25875
 
 include $(WS_MAKE_RULES)/prep.mk
 include $(WS_MAKE_RULES)/ant.mk
diff -r f51fbbf6028d -r 651acf52b7a3 components/tomcat-8/Solaris/index.htm
--- a/components/tomcat-8/Solaris/index.htm	Thu Dec 03 10:38:43 2015 -0800
+++ b/components/tomcat-8/Solaris/index.htm	Wed Dec 02 04:42:16 2015 -0800
@@ -1,1 +1,1 @@
-<meta HTTP-EQUIV="REFRESH" content="0; url=ROOT.example">
+<meta HTTP-EQUIV="REFRESH" content="0; url=ROOT.example/">
diff -r f51fbbf6028d -r 651acf52b7a3 components/tomcat-8/patches/build.properties.patch
--- a/components/tomcat-8/patches/build.properties.patch	Thu Dec 03 10:38:43 2015 -0800
+++ b/components/tomcat-8/patches/build.properties.patch	Wed Dec 02 04:42:16 2015 -0800
@@ -6,7 +6,7 @@
 
 --- build.properties.default
 +++ build.properties.default
-@@ -87,6 +87,12 @@
+@@ -100,6 +100,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
-@@ -142,7 +148,7 @@
+@@ -155,7 +161,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.
@@ -27,4 +27,4 @@
 +jdt.loc.1=file://${base.path}/ECJ/ecj.jar
  jdt.loc.2=http://download.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj-${jdt.version}.jar
  
- # ---- NPN support
+ # ----- Tomcat native library -----
diff -r f51fbbf6028d -r 651acf52b7a3 components/tomcat-8/patches/build.xml.patch
--- a/components/tomcat-8/patches/build.xml.patch	Thu Dec 03 10:38:43 2015 -0800
+++ b/components/tomcat-8/patches/build.xml.patch	Wed Dec 02 04:42:16 2015 -0800
@@ -6,7 +6,7 @@
 
 --- build.xml
 +++ build.xml
-@@ -999,13 +999,6 @@
+@@ -988,13 +988,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">
-@@ -2744,27 +2737,6 @@
+@@ -2796,27 +2789,6 @@
    <target name="download-compile"
            description="Download (and build) components necessary to compile" >
  
@@ -48,19 +48,3 @@
      <!-- Download JDT (Eclipse compiler) -->
      <antcall target="downloadfile-2">
        <param name="sourcefile.1" value="${jdt.loc.1}"/>
-@@ -2775,15 +2747,6 @@
- 
-   </target>
- 
--  <target name="download-npn"
--          description="Download optional NPN" >
--    <antcall target="downloadfile">
--     <param name="sourcefile" value="${npn.loc}"/>
--     <param name="destfile" value="${npn.jar}"/>
--     <param name="destdir" value="${npn.home}"/>
--    </antcall>
--  </target>
--
-   <target name="download-test-compile"
-           description="Download additional components for the tests" >
- 
diff -r f51fbbf6028d -r 651acf52b7a3 components/tomcat-8/tomcat.license
--- a/components/tomcat-8/tomcat.license	Thu Dec 03 10:38:43 2015 -0800
+++ b/components/tomcat-8/tomcat.license	Wed Dec 02 04:42:16 2015 -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.4.2.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 f51fbbf6028d -r 651acf52b7a3 components/tomcat-8/tomcat.p5m
--- a/components/tomcat-8/tomcat.p5m	Thu Dec 03 10:38:43 2015 -0800
+++ b/components/tomcat-8/tomcat.p5m	Wed Dec 02 04:42:16 2015 -0800
@@ -90,8 +90,6 @@
 file path=usr/tomcat8/docs/architecture/index.html
 file path=usr/tomcat8/docs/architecture/overview.html
 file path=usr/tomcat8/docs/architecture/requestProcess.html
-file path=usr/tomcat8/docs/architecture/requestProcess/requestProcess.pdf
-file path=usr/tomcat8/docs/architecture/requestProcess/roseModel.mdl
 file path=usr/tomcat8/docs/architecture/startup.html
 file path=usr/tomcat8/docs/architecture/startup/serverStartup.pdf
 file path=usr/tomcat8/docs/architecture/startup/serverStartup.txt
@@ -228,7 +226,6 @@
 file path=usr/tomcat8/lib/tomcat-i18n-ja.jar
 file path=usr/tomcat8/lib/tomcat-jdbc.jar
 file path=usr/tomcat8/lib/tomcat-jni.jar
-file path=usr/tomcat8/lib/tomcat-spdy.jar
 file path=usr/tomcat8/lib/tomcat-util-scan.jar
 file path=usr/tomcat8/lib/tomcat-util.jar
 file path=usr/tomcat8/lib/tomcat-websocket.jar
@@ -252,6 +249,8 @@
 dir  path=var/tomcat8/temp owner=webservd group=webservd
 dir  path=var/tomcat8/webapps owner=webservd group=webservd
 file path=var/tomcat8/webapps/ROOT/index.jsp mode=0644 preserve=renamenew
+file path=var/tomcat8/webapps/docs/architecture/requestProcess/authentication-process.png
+file path=var/tomcat8/webapps/docs/architecture/requestProcess/request-process.png
 dir  path=var/tomcat8/work owner=webservd group=webservd
 license tomcat.license license="Apache v2.0"
 depend type=require fmri=__TBD \