Bug 561211: Update Apache Tomcat to version 8.5.53
diff --git a/build-web-container/copyToOsgi.sh b/build-web-container/copyToOsgi.sh
index 0074254..678e591 100755
--- a/build-web-container/copyToOsgi.sh
+++ b/build-web-container/copyToOsgi.sh
@@ -7,18 +7,18 @@
cp $SRC/org.eclipse.virgo.util.io-3.6.3.*.jar $REPO/org.eclipse.virgo.util.io/org.eclipse.virgo.util.io-3.6.3.jar
cp $SRC/org.eclipse.virgo.util.math-3.6.3.*.jar $REPO/org.eclipse.virgo.util.math/org.eclipse.virgo.util.math-3.6.3.jar
cp $SRC/org.eclipse.virgo.util.parser.manifest-3.6.3.*.jar $REPO/org.eclipse.virgo.util.parser.manifest/org.eclipse.virgo.util.parser.manifest-3.6.3.jar
-cp $SRC/org.apache.catalina.ha-8.5.35.jar $REPO/org.apache.catalina.ha/org.apache.catalina.ha-8.5.35.jar
-cp $SRC/org.apache.catalina-8.5.35.jar $REPO/org.apache.catalina/org.apache.catalina-8.5.35.jar
-cp $SRC/org.apache.catalina.tribes-8.5.35.jar $REPO/org.apache.catalina.tribes/org.apache.catalina.tribes-8.5.35.jar
-cp $SRC/org.apache.coyote-8.5.35.jar $REPO/org.apache.coyote/org.apache.coyote-8.5.35.jar
-cp $SRC/org.apache.el-8.5.35.jar $REPO/org.apache.el/org.apache.el-8.5.35.jar
-cp $SRC/org.apache.jasper-8.5.35.jar $REPO/org.apache.jasper/org.apache.jasper-8.5.35.jar
-cp $SRC/org.apache.juli.extras-8.5.35.jar $REPO/org.apache.juli.extras/org.apache.juli.extras-8.5.35.jar
-cp $SRC/org.apache.tomcat.api-8.5.35.jar $REPO/org.apache.tomcat.api/org.apache.tomcat.api-8.5.35.jar
-cp $SRC/org.apache.tomcat.jni-8.5.35.jar $REPO/org.apache.tomcat.jni/org.apache.tomcat.jni-8.5.35.jar
-cp $SRC/org.apache.tomcat.util-8.5.35.jar $REPO/org.apache.tomcat.util/org.apache.tomcat.util-8.5.35.jar
-cp $SRC/org.apache.tomcat.util.scan-8.5.35.jar $REPO/org.apache.tomcat.util.scan/org.apache.tomcat.util.scan-8.5.35.jar
-cp $SRC/org.apache.tomcat.websocket-8.5.35.jar $REPO/org.apache.tomcat.websocket/org.apache.tomcat.websocket-8.5.35.jar
+cp $SRC/org.apache.catalina.ha-8.5.53.jar $REPO/org.apache.catalina.ha/org.apache.catalina.ha-8.5.53.jar
+cp $SRC/org.apache.catalina-8.5.53.jar $REPO/org.apache.catalina/org.apache.catalina-8.5.53.jar
+cp $SRC/org.apache.catalina.tribes-8.5.53.jar $REPO/org.apache.catalina.tribes/org.apache.catalina.tribes-8.5.53.jar
+cp $SRC/org.apache.coyote-8.5.53.jar $REPO/org.apache.coyote/org.apache.coyote-8.5.53.jar
+cp $SRC/org.apache.el-8.5.53.jar $REPO/org.apache.el/org.apache.el-8.5.53.jar
+cp $SRC/org.apache.jasper-8.5.53.jar $REPO/org.apache.jasper/org.apache.jasper-8.5.53.jar
+cp $SRC/org.apache.juli.extras-8.5.53.jar $REPO/org.apache.juli.extras/org.apache.juli.extras-8.5.53.jar
+cp $SRC/org.apache.tomcat.api-8.5.53.jar $REPO/org.apache.tomcat.api/org.apache.tomcat.api-8.5.53.jar
+cp $SRC/org.apache.tomcat.jni-8.5.53.jar $REPO/org.apache.tomcat.jni/org.apache.tomcat.jni-8.5.53.jar
+cp $SRC/org.apache.tomcat.util-8.5.53.jar $REPO/org.apache.tomcat.util/org.apache.tomcat.util-8.5.53.jar
+cp $SRC/org.apache.tomcat.util.scan-8.5.53.jar $REPO/org.apache.tomcat.util.scan/org.apache.tomcat.util.scan-8.5.53.jar
+cp $SRC/org.apache.tomcat.websocket-8.5.53.jar $REPO/org.apache.tomcat.websocket/org.apache.tomcat.websocket-8.5.53.jar
cp $SRC/org.eclipse.gemini.web.core-3.0.0.*.jar $REPO/org.eclipse.gemini.web.core/org.eclipse.gemini.web.core-3.0.0.jar
cp $SRC/org.eclipse.gemini.web.extender-3.0.0.*.jar $REPO/org.eclipse.gemini.web.extender/org.eclipse.gemini.web.extender-3.0.0.jar
cp $SRC/org.eclipse.gemini.web.tomcat-3.0.0.*.jar $REPO/org.eclipse.gemini.web.tomcat/org.eclipse.gemini.web.tomcat-3.0.0.jar
diff --git a/build-web-container/resources/About.html b/build-web-container/resources/About.html
index 7cc1b3c..5310c48 100644
--- a/build-web-container/resources/About.html
+++ b/build-web-container/resources/About.html
@@ -9,7 +9,7 @@
<body lang="EN-US">
<h2>About This Content</h2>
-<p>November 18, 2017</p>
+<p>April 20, 2020</p>
<h3>License</h3>
<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise
@@ -45,7 +45,7 @@
This product contains software developed by the Apache Software Foundation (<a href="http://www.apache.org">http://www.apache.org</a>).
<ul>
<li>
- Apache Tomcat 8.5.35 - binary and source is available from the
+ Apache Tomcat 8.5.53 - binary and source is available from the
<a href="http://tomcat.apache.org/">Apache Tomcat project</a>
</li>
</ul>
diff --git a/build.versions b/build.versions
index 579c5d3..9ce0117 100644
--- a/build.versions
+++ b/build.versions
@@ -1,6 +1,6 @@
# Test
-org.eclipse.virgo.test=3.7.0.BUILD-20150104200311
+org.eclipse.virgo.test=3.7.0.M01
#CQ4131
org.easymock=2.3.0
@@ -46,8 +46,8 @@
#CQ4111
org.apache.taglibs=1.1.2.v20110518
-#CQ18132
-org.apache.catalina=8.5.35
+#CQ21807
+org.apache.catalina=8.5.53
#CQ16946
javax.el=3.0.0.20180730
javax.security.auth.message=1.1.0.20180730
diff --git a/org.eclipse.gemini.web.core/.classpath b/org.eclipse.gemini.web.core/.classpath
index 96fa0a5..9f37f90 100644
--- a/org.eclipse.gemini.web.core/.classpath
+++ b/org.eclipse.gemini.web.core/.classpath
@@ -22,12 +22,12 @@
</classpathentry>
<classpathentry kind="var" path="IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-4.7.0.jar" sourcepath="/IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-sources-4.7.0.jar"/>
<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.slf4j.api/1.7.2.v20121108-1250/org.slf4j.api-1.7.2.v20121108-1250.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.slf4j.api/1.7.2.v20121108-1250/org.slf4j.api-sources-1.7.2.v20121108-1250.jar"/>
- <classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.catalina/8.5.35/org.apache.catalina-8.5.35.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.catalina/8.5.35/org.apache.catalina.source-8.5.35.jar"/>
- <classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.juli/8.5.35/org.apache.juli-8.5.35.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.juli/8.5.35/org.apache.juli.source-8.5.35.jar"/>
- <classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.jasper/8.5.35/org.apache.jasper-8.5.35.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.jasper/8.5.35/org.apache.jasper.source-8.5.35.jar"/>
- <classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.catalina.ha/8.5.35/org.apache.catalina.ha-8.5.35.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.catalina.ha/8.5.35/org.apache.catalina.ha.source-8.5.35.jar"/>
- <classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.catalina.tribes/8.5.35/org.apache.catalina.tribes-8.5.35.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.catalina.tribes/8.5.35/org.apache.catalina.tribes.source-8.5.35.jar"/>
- <classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.coyote/8.5.35/org.apache.coyote-8.5.35.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.coyote/8.5.35/org.apache.coyote.source-8.5.35.jar"/>
+ <classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.catalina/8.5.53/org.apache.catalina-8.5.53.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.catalina/8.5.53/org.apache.catalina.source-8.5.53.jar"/>
+ <classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.juli/8.5.53/org.apache.juli-8.5.53.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.juli/8.5.53/org.apache.juli.source-8.5.53.jar"/>
+ <classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.jasper/8.5.53/org.apache.jasper-8.5.53.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.jasper/8.5.53/org.apache.jasper.source-8.5.53.jar"/>
+ <classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.catalina.ha/8.5.53/org.apache.catalina.ha-8.5.53.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.catalina.ha/8.5.53/org.apache.catalina.ha.source-8.5.53.jar"/>
+ <classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.catalina.tribes/8.5.53/org.apache.catalina.tribes-8.5.53.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.catalina.tribes/8.5.53/org.apache.catalina.tribes.source-8.5.53.jar"/>
+ <classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.coyote/8.5.53/org.apache.coyote-8.5.53.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.coyote/8.5.53/org.apache.coyote.source-8.5.53.jar"/>
<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/javax.servlet/3.1.0.20180730/javax.servlet-3.1.0.20180730.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/javax.servlet/3.1.0.20180730/javax.servlet-sources-3.1.0.20180730.jar"/>
<classpathentry kind="var" path="IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-2.3.0.jar" sourcepath="/IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-sources-2.3.0.jar"/>
<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.equinox.event/1.3.100.v20140115-1647/org.eclipse.equinox.event-1.3.100.v20140115-1647.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.equinox.event/1.3.100.v20140115-1647/org.eclipse.equinox.event-sources-1.3.100.v20140115-1647.jar"/>
diff --git a/org.eclipse.gemini.web.test/.classpath b/org.eclipse.gemini.web.test/.classpath
index 1872499..9ef3d78 100644
--- a/org.eclipse.gemini.web.test/.classpath
+++ b/org.eclipse.gemini.web.test/.classpath
@@ -13,12 +13,12 @@
<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.launcher/3.7.0.D-20140919122012/org.eclipse.virgo.util.parser.launcher-3.7.0.D-20140919122012.jar"/>
<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.launcher/3.7.0.BUILD-20150104200311/org.eclipse.virgo.test.launcher-3.7.0.BUILD-20150104200311.jar"/>
<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.slf4j.api/1.7.2.v20121108-1250/org.slf4j.api-1.7.2.v20121108-1250.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.slf4j.api/1.7.2.v20121108-1250/org.slf4j.api-sources-1.7.2.v20121108-1250.jar"/>
- <classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.catalina/8.5.35/org.apache.catalina-8.5.35.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.catalina/8.5.35/org.apache.catalina.source-8.5.35.jar"/>
- <classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.juli/8.5.35/org.apache.juli-8.5.35.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.juli/8.5.35/org.apache.juli.source-8.5.35.jar"/>
- <classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.jasper/8.5.35/org.apache.jasper-8.5.35.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.jasper/8.5.35/org.apache.jasper.source-8.5.35.jar"/>
- <classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.catalina.ha/8.5.35/org.apache.catalina.ha-8.5.35.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.catalina.ha/8.5.35/org.apache.catalina.ha.source-8.5.35.jar"/>
- <classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.catalina.tribes/8.5.35/org.apache.catalina.tribes-8.5.35.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.catalina.tribes/8.5.35/org.apache.catalina.tribes.source-8.5.35.jar"/>
- <classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.coyote/8.5.35/org.apache.coyote-8.5.35.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.coyote/8.5.35/org.apache.coyote.source-8.5.35.jar"/>
+ <classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.catalina/8.5.53/org.apache.catalina-8.5.53.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.catalina/8.5.53/org.apache.catalina.source-8.5.53.jar"/>
+ <classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.juli/8.5.53/org.apache.juli-8.5.53.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.juli/8.5.53/org.apache.juli.source-8.5.53.jar"/>
+ <classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.jasper/8.5.53/org.apache.jasper-8.5.53.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.jasper/8.5.53/org.apache.jasper.source-8.5.53.jar"/>
+ <classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.catalina.ha/8.5.53/org.apache.catalina.ha-8.5.53.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.catalina.ha/8.5.53/org.apache.catalina.ha.source-8.5.53.jar"/>
+ <classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.catalina.tribes/8.5.53/org.apache.catalina.tribes-8.5.53.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.catalina.tribes/8.5.53/org.apache.catalina.tribes.source-8.5.53.jar"/>
+ <classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.coyote/8.5.53/org.apache.coyote-8.5.53.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.coyote/8.5.53/org.apache.coyote.source-8.5.53.jar"/>
<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/javax.servlet/3.1.0.20180730/javax.servlet-3.1.0.20180730.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/javax.servlet/3.1.0.20180730/javax.servlet-sources-3.1.0.20180730.jar"/>
<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/javax.websocket/1.1.0.20180730/javax.websocket-1.1.0.20180730.jar"/>
<classpathentry kind="var" path="IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-2.3.0.jar" sourcepath="/IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-sources-2.3.0.jar"/>
diff --git a/org.eclipse.gemini.web.test/src/test/java/org/eclipse/gemini/web/test/tomcat/TomcatServletContainerTests.java b/org.eclipse.gemini.web.test/src/test/java/org/eclipse/gemini/web/test/tomcat/TomcatServletContainerTests.java
index 7664b49..989e615 100644
--- a/org.eclipse.gemini.web.test/src/test/java/org/eclipse/gemini/web/test/tomcat/TomcatServletContainerTests.java
+++ b/org.eclipse.gemini.web.test/src/test/java/org/eclipse/gemini/web/test/tomcat/TomcatServletContainerTests.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2009, 2018 VMware Inc.
+ * Copyright (c) 2009, 2020 VMware Inc.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -575,7 +575,7 @@
Object[] result = startWebApplicationWith(LOCATION_WAR_WITH_TLD, "/war-with-tld");
try {
- validateURLExpectedContent("http://localhost:8080/war-with-tld", new String[] { "test.jsp", "0.2 kb" });
+ validateURLExpectedContent("http://localhost:8080/war-with-tld", new String[] { "test.jsp", "0.3 kb" });
} finally {
this.container.stopWebApplication((WebApplicationHandle) result[1]);
((Bundle) result[0]).uninstall();
diff --git a/org.eclipse.gemini.web.tomcat/.classpath b/org.eclipse.gemini.web.tomcat/.classpath
index 21a1d2c..54e6896 100644
--- a/org.eclipse.gemini.web.tomcat/.classpath
+++ b/org.eclipse.gemini.web.tomcat/.classpath
@@ -26,16 +26,16 @@
<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/3.6.3.RELEASE/org.eclipse.virgo.util.osgi-3.6.3.RELEASE.jar" sourcepath="/IVY_CACHE/org.eclispe.virgo.util/org.eclipse.virgo.util.osgi/3.6.3.RELEASE/org.eclipse.virgo.util.osgi-sources-3.6.3.RELEASE.jar"/>
<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.6.3.RELEASE/org.eclipse.virgo.util.common-3.6.3.RELEASE.jar" sourcepath="/IVY_CACHE/org.eclispe.virgo.util/org.eclipse.virgo.util.common/3.6.3.RELEASE/org.eclipse.virgo.util.common-sources-3.6.3.RELEASE.jar"/>
<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.slf4j.api/1.7.2.v20121108-1250/org.slf4j.api-1.7.2.v20121108-1250.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.slf4j.api/1.7.2.v20121108-1250/org.slf4j.api-sources-1.7.2.v20121108-1250.jar"/>
- <classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.catalina/8.5.35/org.apache.catalina-8.5.35.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.catalina/8.5.35/org.apache.catalina.source-8.5.35.jar"/>
- <classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.juli/8.5.35/org.apache.juli-8.5.35.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.juli/8.5.35/org.apache.juli.source-8.5.35.jar"/>
- <classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.jasper/8.5.35/org.apache.jasper-8.5.35.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.jasper/8.5.35/org.apache.jasper.source-8.5.35.jar"/>
- <classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.catalina.ha/8.5.35/org.apache.catalina.ha-8.5.35.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.catalina.ha/8.5.35/org.apache.catalina.ha.source-8.5.35.jar"/>
- <classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.catalina.tribes/8.5.35/org.apache.catalina.tribes-8.5.35.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.catalina.tribes/8.5.35/org.apache.catalina.tribes.source-8.5.35.jar"/>
- <classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.coyote/8.5.35/org.apache.coyote-8.5.35.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.coyote/8.5.35/org.apache.coyote.source-8.5.35.jar"/>
- <classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.tomcat.api/8.5.35/org.apache.tomcat.api-8.5.35.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.tomcat.api/8.5.35/org.apache.tomcat.api.source-8.5.35.jar"/>
- <classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.tomcat.util/8.5.35/org.apache.tomcat.util-8.5.35.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.tomcat.util/8.5.35/org.apache.tomcat.util.source-8.5.35.jar"/>
- <classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.tomcat.util.scan/8.5.35/org.apache.tomcat.util.scan-8.5.35.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.tomcat.util.scan/8.5.35/org.apache.tomcat.util.scan.source-8.5.35.jar"/>
- <classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.tomcat.websocket/8.5.35/org.apache.tomcat.websocket-8.5.35.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.tomcat.websocket/8.5.35/org.apache.tomcat.websocket.source-8.5.35.jar"/>
+ <classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.catalina/8.5.53/org.apache.catalina-8.5.53.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.catalina/8.5.53/org.apache.catalina.source-8.5.53.jar"/>
+ <classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.juli/8.5.53/org.apache.juli-8.5.53.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.juli/8.5.53/org.apache.juli.source-8.5.53.jar"/>
+ <classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.jasper/8.5.53/org.apache.jasper-8.5.53.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.jasper/8.5.53/org.apache.jasper.source-8.5.53.jar"/>
+ <classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.catalina.ha/8.5.53/org.apache.catalina.ha-8.5.53.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.catalina.ha/8.5.53/org.apache.catalina.ha.source-8.5.53.jar"/>
+ <classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.catalina.tribes/8.5.53/org.apache.catalina.tribes-8.5.53.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.catalina.tribes/8.5.53/org.apache.catalina.tribes.source-8.5.53.jar"/>
+ <classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.coyote/8.5.53/org.apache.coyote-8.5.53.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.coyote/8.5.53/org.apache.coyote.source-8.5.53.jar"/>
+ <classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.tomcat.api/8.5.53/org.apache.tomcat.api-8.5.53.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.tomcat.api/8.5.53/org.apache.tomcat.api.source-8.5.53.jar"/>
+ <classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.tomcat.util/8.5.53/org.apache.tomcat.util-8.5.53.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.tomcat.util/8.5.53/org.apache.tomcat.util.source-8.5.53.jar"/>
+ <classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.tomcat.util.scan/8.5.53/org.apache.tomcat.util.scan-8.5.53.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.tomcat.util.scan/8.5.53/org.apache.tomcat.util.scan.source-8.5.53.jar"/>
+ <classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.tomcat.websocket/8.5.53/org.apache.tomcat.websocket-8.5.53.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.tomcat.websocket/8.5.53/org.apache.tomcat.websocket.source-8.5.53.jar"/>
<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/javax.servlet/3.1.0.20180730/javax.servlet-3.1.0.20180730.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/javax.servlet/3.1.0.20180730/javax.servlet-sources-3.1.0.20180730.jar"/>
<classpathentry kind="var" path="IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-2.3.0.jar" sourcepath="/IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-sources-2.3.0.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.gemini.web.core"/>
diff --git a/org.eclipse.gemini.web.tomcat/src/main/resources/META-INF/tomcat/default-server.xml b/org.eclipse.gemini.web.tomcat/src/main/resources/META-INF/tomcat/default-server.xml
index dc49e00..e261ae1 100644
--- a/org.eclipse.gemini.web.tomcat/src/main/resources/META-INF/tomcat/default-server.xml
+++ b/org.eclipse.gemini.web.tomcat/src/main/resources/META-INF/tomcat/default-server.xml
@@ -63,7 +63,7 @@
connectionTimeout="20000"
redirectPort="8443" />
-->
- <!-- Define a SSL/TLS HTTP/1.1 Connector on port 8443
+ <!-- Define an SSL/TLS HTTP/1.1 Connector on port 8443
This connector uses the NIO implementation. The default
SSLImplementation will depend on the presence of the APR/native
library and the useOpenSSL attribute of the
@@ -80,7 +80,7 @@
</SSLHostConfig>
</Connector>
-->
- <!-- Define a SSL/TLS HTTP/1.1 Connector on port 8443 with HTTP/2
+ <!-- Define an SSL/TLS HTTP/1.1 Connector on port 8443 with HTTP/2
This connector uses the APR/native implementation which always uses
OpenSSL for TLS.
Either JSSE or OpenSSL style configuration may be used. OpenSSL style
@@ -100,8 +100,12 @@
-->
<!-- Define an AJP 1.3 Connector on port 8009 -->
- <Connector port="8009" protocol="AJP/1.3" redirectPort="8443" />
-
+ <!--
+ <Connector protocol="AJP/1.3"
+ address="::1"
+ port="8009"
+ redirectPort="8443" />
+ -->
<!-- An Engine represents the entry point (within Catalina) that processes
every request. The Engine implementation for Tomcat stand alone
diff --git a/org.eclipse.gemini.web.tomcat/src/main/resources/conf/web.xml b/org.eclipse.gemini.web.tomcat/src/main/resources/conf/web.xml
index f6a32d2..4b4b948 100755
--- a/org.eclipse.gemini.web.tomcat/src/main/resources/conf/web.xml
+++ b/org.eclipse.gemini.web.tomcat/src/main/resources/conf/web.xml
@@ -48,6 +48,11 @@
<!-- fileEncoding Encoding to be used to read static resources -->
<!-- [platform default] -->
<!-- -->
+ <!-- useBomIfPresent If a static file contains a byte order mark -->
+ <!-- (BOM), should this be used to determine the -->
+ <!-- file encoding in preference to fileEncoding. -->
+ <!-- [true] -->
+ <!-- -->
<!-- input Input buffer size (in bytes) when reading -->
<!-- resources to be served. [2048] -->
<!-- -->
@@ -99,6 +104,11 @@
<!-- showServerInfo Should server information be presented in the -->
<!-- response sent to clients when directory -->
<!-- listings is enabled? [true] -->
+ <!-- -->
+ <!-- allowPartialPut Should the server treat an HTTP PUT request -->
+ <!-- with a Range header as a partial PUT? Note -->
+ <!-- that RFC 7233 clarified that Range headers are -->
+ <!-- only valid for GET requests. [true] -->
<servlet>
<servlet-name>default</servlet-name>
@@ -335,10 +345,32 @@
<!-- If not set, then webAppRootDir is used. -->
<!-- Recommended value: WEB-INF/cgi -->
<!-- -->
+ <!-- cmdLineArgumentsDecoded -->
+ <!-- Only used when enableCmdLineArguments is -->
+ <!-- true. The pattern that individual decoded -->
+ <!-- command line arguments must match else the -->
+ <!-- request will be rejected. This is to -->
+ <!-- work-around various issues when Java passes -->
+ <!-- the arguments to the OS. See the CGI How-To -->
+ <!-- for more details. The default varies by -->
+ <!-- platform. -->
+ <!-- Windows: [[a-zA-Z0-9\Q-_.\\/:\E]+] -->
+ <!-- Others: [.*] -->
+ <!-- Note that internally the CGI Servlet treats -->
+ <!-- [.*] as a special case to improve performance -->
+ <!-- -->
+ <!-- cmdLineArgumentsEncoded -->
+ <!-- Only used when enableCmdLineArguments is -->
+ <!-- true. The pattern that individual encoded -->
+ <!-- command line arguments must match else the -->
+ <!-- request will be rejected. The default matches -->
+ <!-- the allowed values defined by RFC3875. -->
+ <!-- [[a-zA-Z0-9\Q%;/?:@&,$-_.!~*'()\E]+] -->
+ <!-- -->
<!-- enableCmdLineArguments -->
<!-- Are command line parameters generated from -->
<!-- the query string as per section 4.4 of 3875 -->
- <!-- RFC? [true] -->
+ <!-- RFC? [false] -->
<!-- -->
<!-- executable Name of the executable used to run the -->
<!-- script. [perl] -->
@@ -4620,10 +4652,6 @@
<mime-type>application/x-compress</mime-type>
</mime-mapping>
<mime-mapping>
- <extension>Z</extension>
- <mime-type>application/x-compress</mime-type>
- </mime-mapping>
- <mime-mapping>
<extension>z1</extension>
<mime-type>application/x-zmachine</mime-type>
</mime-mapping>
diff --git a/test-bundles/customizer-bundle/.classpath b/test-bundles/customizer-bundle/.classpath
index 08c9a9e..f78670f 100755
--- a/test-bundles/customizer-bundle/.classpath
+++ b/test-bundles/customizer-bundle/.classpath
@@ -3,8 +3,8 @@
<classpathentry kind="src" path="src/main/java"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.gemini.web.tomcat"/>
- <classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.tomcat.api/8.5.35/org.apache.tomcat.api-8.5.35.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.tomcat.api/8.5.35/org.apache.tomcat.api.source-8.5.35.jar"/>
- <classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.tomcat.util.scan/8.5.35/org.apache.tomcat.util.scan-8.5.35.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.tomcat.util.scan/8.5.35/org.apache.tomcat.util.scan.source-8.5.35.jar"/>
+ <classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.tomcat.api/8.5.53/org.apache.tomcat.api-8.5.53.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.tomcat.api/8.5.53/org.apache.tomcat.api.source-8.5.53.jar"/>
+ <classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.tomcat.util.scan/8.5.53/org.apache.tomcat.util.scan-8.5.53.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.tomcat.util.scan/8.5.53/org.apache.tomcat.util.scan.source-8.5.53.jar"/>
<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.osgi/3.10.0.v20140606-1445/org.eclipse.osgi-3.10.0.v20140606-1445.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.osgi/3.10.0.v20140606-1445/org.eclipse.osgi.source-3.10.0.v20140606-1445.jar"/>
<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/javax.servlet/3.1.0.20180730/javax.servlet-3.1.0.20180730.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/javax.servlet/3.1.0.20180730/javax.servlet-sources-3.1.0.20180730.jar"/>
<classpathentry kind="output" path="target"/>
