You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2015/10/10 13:49:23 UTC
svn commit: r1707868 - in /tomcat/trunk: conf/ res/META-INF/jasper.jar/
res/META-INF/tomcat-websocket.jar/ test/javax/servlet/resources/
test/org/apache/catalina/startup/ test/org/apache/jasper/
test/org/apache/jasper/compiler/ test/webapp/WEB-INF/ web...
Author: markt
Date: Sat Oct 10 11:49:22 2015
New Revision: 1707868
URL: http://svn.apache.org/viewvc?rev=1707868&view=rev
Log:
Servlet 4.0
Update web applications that should be using the current web.xml schema to 4.0
Modified:
tomcat/trunk/conf/web.xml
tomcat/trunk/res/META-INF/jasper.jar/web-fragment.xml
tomcat/trunk/res/META-INF/tomcat-websocket.jar/web-fragment.xml
tomcat/trunk/test/javax/servlet/resources/TestSchemaValidation.java
tomcat/trunk/test/org/apache/catalina/startup/web-1lifecyclecallback.xml
tomcat/trunk/test/org/apache/catalina/startup/web-1ordering.xml
tomcat/trunk/test/org/apache/catalina/startup/web-2lifecyclecallback.xml
tomcat/trunk/test/org/apache/catalina/startup/web-2ordering.xml
tomcat/trunk/test/org/apache/catalina/startup/web-fragment-1name.xml
tomcat/trunk/test/org/apache/catalina/startup/web-fragment-1ordering.xml
tomcat/trunk/test/org/apache/catalina/startup/web-fragment-2name.xml
tomcat/trunk/test/org/apache/catalina/startup/web-fragment-2ordering.xml
tomcat/trunk/test/org/apache/jasper/TestJspC.java
tomcat/trunk/test/org/apache/jasper/compiler/TestJspConfig.java
tomcat/trunk/test/org/apache/jasper/compiler/TestValidator.java
tomcat/trunk/test/webapp/WEB-INF/web.xml
tomcat/trunk/webapps/ROOT/WEB-INF/web.xml
tomcat/trunk/webapps/docs/WEB-INF/web.xml
tomcat/trunk/webapps/docs/appdev/deployment.xml
tomcat/trunk/webapps/docs/appdev/introduction.xml
tomcat/trunk/webapps/docs/appdev/sample/web/WEB-INF/web.xml
tomcat/trunk/webapps/examples/WEB-INF/web.xml
tomcat/trunk/webapps/host-manager/WEB-INF/web.xml
tomcat/trunk/webapps/manager/WEB-INF/web.xml
Modified: tomcat/trunk/conf/web.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/conf/web.xml?rev=1707868&r1=1707867&r2=1707868&view=diff
==============================================================================
--- tomcat/trunk/conf/web.xml (original)
+++ tomcat/trunk/conf/web.xml Sat Oct 10 11:49:22 2015
@@ -18,8 +18,8 @@
<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
- http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
- version="3.1">
+ http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd"
+ version="4.0">
<!-- ======================== Introduction ============================== -->
<!-- This document defines default values for *all* web applications -->
Modified: tomcat/trunk/res/META-INF/jasper.jar/web-fragment.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/res/META-INF/jasper.jar/web-fragment.xml?rev=1707868&r1=1707867&r2=1707868&view=diff
==============================================================================
--- tomcat/trunk/res/META-INF/jasper.jar/web-fragment.xml (original)
+++ tomcat/trunk/res/META-INF/jasper.jar/web-fragment.xml Sat Oct 10 11:49:22 2015
@@ -18,8 +18,8 @@
<web-fragment xmlns="http://xmlns.jcp.org/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
- http://xmlns.jcp.org/xml/ns/javaee/web-fragment_3_1.xsd"
- version="3.1"
+ http://xmlns.jcp.org/xml/ns/javaee/web-fragment_4_0.xsd"
+ version="4.0"
metadata-complete="true">
<name>org_apache_jasper</name>
<distributable/>
Modified: tomcat/trunk/res/META-INF/tomcat-websocket.jar/web-fragment.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/res/META-INF/tomcat-websocket.jar/web-fragment.xml?rev=1707868&r1=1707867&r2=1707868&view=diff
==============================================================================
--- tomcat/trunk/res/META-INF/tomcat-websocket.jar/web-fragment.xml (original)
+++ tomcat/trunk/res/META-INF/tomcat-websocket.jar/web-fragment.xml Sat Oct 10 11:49:22 2015
@@ -18,8 +18,8 @@
<web-fragment xmlns="http://xmlns.jcp.org/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
- http://xmlns.jcp.org/xml/ns/javaee/web-fragment_3_1.xsd"
- version="3.1"
+ http://xmlns.jcp.org/xml/ns/javaee/web-fragment_4_0.xsd"
+ version="4.0"
metadata-complete="true">
<name>org_apache_tomcat_websocket</name>
<distributable/>
Modified: tomcat/trunk/test/javax/servlet/resources/TestSchemaValidation.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/javax/servlet/resources/TestSchemaValidation.java?rev=1707868&r1=1707867&r2=1707868&view=diff
==============================================================================
--- tomcat/trunk/test/javax/servlet/resources/TestSchemaValidation.java (original)
+++ tomcat/trunk/test/javax/servlet/resources/TestSchemaValidation.java Sat Oct 10 11:49:22 2015
@@ -39,7 +39,7 @@ public class TestSchemaValidation {
digester.push(new WebXml());
WebXml desc = (WebXml) digester.parse(
new File("test/webapp/WEB-INF/web.xml"));
- Assert.assertEquals("3.1", desc.getVersion());
+ Assert.assertEquals("4.0", desc.getVersion());
Assert.assertEquals(0, handler.getErrors().size());
Assert.assertEquals(0, handler.getWarnings().size());
}
Modified: tomcat/trunk/test/org/apache/catalina/startup/web-1lifecyclecallback.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/web-1lifecyclecallback.xml?rev=1707868&r1=1707867&r2=1707868&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/startup/web-1lifecyclecallback.xml (original)
+++ tomcat/trunk/test/org/apache/catalina/startup/web-1lifecyclecallback.xml Sat Oct 10 11:49:22 2015
@@ -18,8 +18,8 @@
<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
- http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
- version="3.1"
+ http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd"
+ version="4.0"
metadata-complete="true">
<post-construct>
<lifecycle-callback-class>test.TestServlet</lifecycle-callback-class>
Modified: tomcat/trunk/test/org/apache/catalina/startup/web-1ordering.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/web-1ordering.xml?rev=1707868&r1=1707867&r2=1707868&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/startup/web-1ordering.xml (original)
+++ tomcat/trunk/test/org/apache/catalina/startup/web-1ordering.xml Sat Oct 10 11:49:22 2015
@@ -18,8 +18,8 @@
<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
- http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
- version="3.1"
+ http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd"
+ version="4.0"
metadata-complete="true">
<absolute-ordering>
<name>bar</name>
Modified: tomcat/trunk/test/org/apache/catalina/startup/web-2lifecyclecallback.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/web-2lifecyclecallback.xml?rev=1707868&r1=1707867&r2=1707868&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/startup/web-2lifecyclecallback.xml (original)
+++ tomcat/trunk/test/org/apache/catalina/startup/web-2lifecyclecallback.xml Sat Oct 10 11:49:22 2015
@@ -18,8 +18,8 @@
<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
- http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
- version="3.1"
+ http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd"
+ version="4.0"
metadata-complete="true">
<post-construct>
<lifecycle-callback-class>test.TestServlet</lifecycle-callback-class>
Modified: tomcat/trunk/test/org/apache/catalina/startup/web-2ordering.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/web-2ordering.xml?rev=1707868&r1=1707867&r2=1707868&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/startup/web-2ordering.xml (original)
+++ tomcat/trunk/test/org/apache/catalina/startup/web-2ordering.xml Sat Oct 10 11:49:22 2015
@@ -18,8 +18,8 @@
<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
- http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
- version="3.1"
+ http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd"
+ version="4.0"
metadata-complete="true">
<absolute-ordering>
<name>foo</name>
Modified: tomcat/trunk/test/org/apache/catalina/startup/web-fragment-1name.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/web-fragment-1name.xml?rev=1707868&r1=1707867&r2=1707868&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/startup/web-fragment-1name.xml (original)
+++ tomcat/trunk/test/org/apache/catalina/startup/web-fragment-1name.xml Sat Oct 10 11:49:22 2015
@@ -18,8 +18,8 @@
<web-fragment xmlns="http://xmlns.jcp.org/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
- http://xmlns.jcp.org/xml/ns/javaee/web-fragment_3_1.xsd"
- version="3.1"
+ http://xmlns.jcp.org/xml/ns/javaee/web-fragment_4_0.xsd"
+ version="4.0"
metadata-complete="true">
<name>name1</name>
</web-fragment>
\ No newline at end of file
Modified: tomcat/trunk/test/org/apache/catalina/startup/web-fragment-1ordering.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/web-fragment-1ordering.xml?rev=1707868&r1=1707867&r2=1707868&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/startup/web-fragment-1ordering.xml (original)
+++ tomcat/trunk/test/org/apache/catalina/startup/web-fragment-1ordering.xml Sat Oct 10 11:49:22 2015
@@ -18,8 +18,8 @@
<web-fragment xmlns="http://xmlns.jcp.org/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
- http://xmlns.jcp.org/xml/ns/javaee/web-fragment_3_1.xsd"
- version="3.1"
+ http://xmlns.jcp.org/xml/ns/javaee/web-fragment_4_0.xsd"
+ version="4.0"
metadata-complete="true">
<ordering>
<before>
Modified: tomcat/trunk/test/org/apache/catalina/startup/web-fragment-2name.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/web-fragment-2name.xml?rev=1707868&r1=1707867&r2=1707868&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/startup/web-fragment-2name.xml (original)
+++ tomcat/trunk/test/org/apache/catalina/startup/web-fragment-2name.xml Sat Oct 10 11:49:22 2015
@@ -18,8 +18,8 @@
<web-fragment xmlns="http://xmlns.jcp.org/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
- http://xmlns.jcp.org/xml/ns/javaee/web-fragment_3_1.xsd"
- version="3.1"
+ http://xmlns.jcp.org/xml/ns/javaee/web-fragment_4_0.xsd"
+ version="4.0"
metadata-complete="true">
<name>name1</name>
<name>name2</name>
Modified: tomcat/trunk/test/org/apache/catalina/startup/web-fragment-2ordering.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/web-fragment-2ordering.xml?rev=1707868&r1=1707867&r2=1707868&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/startup/web-fragment-2ordering.xml (original)
+++ tomcat/trunk/test/org/apache/catalina/startup/web-fragment-2ordering.xml Sat Oct 10 11:49:22 2015
@@ -18,8 +18,8 @@
<web-fragment xmlns="http://xmlns.jcp.org/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
- http://xmlns.jcp.org/xml/ns/javaee/web-fragment_3_1.xsd"
- version="3.1"
+ http://xmlns.jcp.org/xml/ns/javaee/web-fragment_4_0.xsd"
+ version="4.0"
metadata-complete="true">
<ordering>
<after>
Modified: tomcat/trunk/test/org/apache/jasper/TestJspC.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/jasper/TestJspC.java?rev=1707868&r1=1707867&r2=1707868&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/jasper/TestJspC.java (original)
+++ tomcat/trunk/test/org/apache/jasper/TestJspC.java Sat Oct 10 11:49:22 2015
@@ -95,6 +95,14 @@ public class TestJspC {
verify(webappOut);
}
+ @Test
+ public void precompileWebapp_4_0() throws IOException {
+ File appDir = new File("test/webapp-4.0");
+ File webappOut = new File(outputDir, appDir.getName());
+ precompile(appDir, webappOut);
+ verify(webappOut);
+ }
+
private void verify(File webappOut) {
// for now, just check some expected files exist
Assert.assertTrue(new File(webappOut, "generated_web.xml").exists());
Modified: tomcat/trunk/test/org/apache/jasper/compiler/TestJspConfig.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/jasper/compiler/TestJspConfig.java?rev=1707868&r1=1707867&r2=1707868&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/jasper/compiler/TestJspConfig.java (original)
+++ tomcat/trunk/test/org/apache/jasper/compiler/TestJspConfig.java Sat Oct 10 11:49:22 2015
@@ -33,8 +33,7 @@ public class TestJspConfig extends Tomca
public void testServlet22NoEL() throws Exception {
Tomcat tomcat = getTomcatInstance();
- File appDir =
- new File("test/webapp-2.2");
+ File appDir = new File("test/webapp-2.2");
// app dir is relative to server home
tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
@@ -73,8 +72,7 @@ public class TestJspConfig extends Tomca
public void testServlet24NoEL() throws Exception {
Tomcat tomcat = getTomcatInstance();
- File appDir =
- new File("test/webapp-2.4");
+ File appDir = new File("test/webapp-2.4");
// app dir is relative to server home
tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
@@ -93,8 +91,7 @@ public class TestJspConfig extends Tomca
public void testServlet25NoEL() throws Exception {
Tomcat tomcat = getTomcatInstance();
- File appDir =
- new File("test/webapp-2.5");
+ File appDir = new File("test/webapp-2.5");
// app dir is relative to server home
tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
@@ -112,8 +109,7 @@ public class TestJspConfig extends Tomca
public void testServlet30NoEL() throws Exception {
Tomcat tomcat = getTomcatInstance();
- File appDir =
- new File("test/webapp-3.0");
+ File appDir = new File("test/webapp-3.0");
// app dir is relative to server home
tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
@@ -131,8 +127,25 @@ public class TestJspConfig extends Tomca
public void testServlet31NoEL() throws Exception {
Tomcat tomcat = getTomcatInstance();
- File appDir =
- new File("test/webapp-3.1");
+ File appDir = new File("test/webapp-3.1");
+ // app dir is relative to server home
+ tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
+
+ tomcat.start();
+
+ ByteChunk res = getUrl("http://localhost:" + getPort() +
+ "/test/el-as-literal.jsp");
+
+ String result = res.toString();
+
+ assertTrue(result.indexOf("<p>00-hello world</p>") > 0);
+ }
+
+ @Test
+ public void testServlet40NoEL() throws Exception {
+ Tomcat tomcat = getTomcatInstance();
+
+ File appDir = new File("test/webapp-4.0");
// app dir is relative to server home
tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
Modified: tomcat/trunk/test/org/apache/jasper/compiler/TestValidator.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/jasper/compiler/TestValidator.java?rev=1707868&r1=1707867&r2=1707868&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/jasper/compiler/TestValidator.java (original)
+++ tomcat/trunk/test/org/apache/jasper/compiler/TestValidator.java Sat Oct 10 11:49:22 2015
@@ -195,6 +195,31 @@ public class TestValidator extends Tomca
assertTrue(result.indexOf("<p>06-hello world</p>") > 0);
}
+ @Test
+ public void testTldVersions40() throws Exception {
+ Tomcat tomcat = getTomcatInstance();
+
+ File appDir =
+ new File("test/webapp-4.0");
+ // app dir is relative to server home
+ tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
+
+ tomcat.start();
+
+ ByteChunk res = getUrl("http://localhost:" + getPort() +
+ "/test/tld-versions.jsp");
+
+ String result = res.toString();
+
+ assertTrue(result.indexOf("<p>00-hello world</p>") > 0);
+ assertTrue(result.indexOf("<p>#{'01-hello world'}</p>") > 0);
+ assertTrue(result.indexOf("<p>02-hello world</p>") > 0);
+ assertTrue(result.indexOf("<p>#{'03-hello world'}</p>") > 0);
+ assertTrue(result.indexOf("<p>04-hello world</p>") > 0);
+ assertTrue(result.indexOf("<p>#{'05-hello world'}</p>") > 0);
+ assertTrue(result.indexOf("<p>06-hello world</p>") > 0);
+ }
+
public static class Echo extends TagSupport {
private static final long serialVersionUID = 1L;
Modified: tomcat/trunk/test/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/webapp/WEB-INF/web.xml?rev=1707868&r1=1707867&r2=1707868&view=diff
==============================================================================
--- tomcat/trunk/test/webapp/WEB-INF/web.xml (original)
+++ tomcat/trunk/test/webapp/WEB-INF/web.xml Sat Oct 10 11:49:22 2015
@@ -18,8 +18,8 @@
<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
- http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
- version="3.1"
+ http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd"
+ version="4.0"
metadata-complete="true">
<display-name>Tomcat Test Application</display-name>
Modified: tomcat/trunk/webapps/ROOT/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/ROOT/WEB-INF/web.xml?rev=1707868&r1=1707867&r2=1707868&view=diff
==============================================================================
--- tomcat/trunk/webapps/ROOT/WEB-INF/web.xml (original)
+++ tomcat/trunk/webapps/ROOT/WEB-INF/web.xml Sat Oct 10 11:49:22 2015
@@ -18,8 +18,8 @@
<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
- http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
- version="3.1"
+ http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd"
+ version="4.0"
metadata-complete="true">
<display-name>Welcome to Tomcat</display-name>
Modified: tomcat/trunk/webapps/docs/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/WEB-INF/web.xml?rev=1707868&r1=1707867&r2=1707868&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/WEB-INF/web.xml (original)
+++ tomcat/trunk/webapps/docs/WEB-INF/web.xml Sat Oct 10 11:49:22 2015
@@ -18,8 +18,8 @@
<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
- http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
- version="3.1"
+ http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd"
+ version="4.0"
metadata-complete="true">
<display-name>Tomcat Documentation</display-name>
Modified: tomcat/trunk/webapps/docs/appdev/deployment.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/appdev/deployment.xml?rev=1707868&r1=1707867&r2=1707868&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/appdev/deployment.xml (original)
+++ tomcat/trunk/webapps/docs/appdev/deployment.xml Sat Oct 10 11:49:22 2015
@@ -136,7 +136,7 @@ drivers that are required for both your
<p>Out of the box, a standard Tomcat installation includes a variety
of pre-installed shared library files, including:</p>
<ul>
-<li>The <em>Servlet 3.1</em> and <em>JSP 2.3</em> APIs that are fundamental
+<li>The <em>Servlet 4.0</em> and <em>JSP 2.3</em> APIs that are fundamental
to writing servlets and JavaServer Pages.<br/><br/></li>
</ul>
Modified: tomcat/trunk/webapps/docs/appdev/introduction.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/appdev/introduction.xml?rev=1707868&r1=1707867&r2=1707868&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/appdev/introduction.xml (original)
+++ tomcat/trunk/webapps/docs/appdev/introduction.xml Sat Oct 10 11:49:22 2015
@@ -72,6 +72,7 @@ web applications with Tomcat.</p>
and packaging JSP pages (Appendix A) is useful. The Javadoc
API Documentation is included in the specification, and with the
Tomcat download.</p></li>
+<!-- TODO Servley 4.0 -->
<li><p><a href="http://jcp.org/aboutJava/communityprocess/final/jsr340/index.html">http://jcp.org/aboutJava/communityprocess/final/jsr340/index.html</a> -
<i>Servlet API Specification, Version 3.1</i>. Describes the
programming environment that must be provided by all servlet
Modified: tomcat/trunk/webapps/docs/appdev/sample/web/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/appdev/sample/web/WEB-INF/web.xml?rev=1707868&r1=1707867&r2=1707868&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/appdev/sample/web/WEB-INF/web.xml (original)
+++ tomcat/trunk/webapps/docs/appdev/sample/web/WEB-INF/web.xml Sat Oct 10 11:49:22 2015
@@ -18,8 +18,8 @@
<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
- http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
- version="3.1">
+ http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd"
+ version="4.0">
<display-name>Hello, World Application</display-name>
<description>
Modified: tomcat/trunk/webapps/examples/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/web.xml?rev=1707868&r1=1707867&r2=1707868&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/WEB-INF/web.xml (original)
+++ tomcat/trunk/webapps/examples/WEB-INF/web.xml Sat Oct 10 11:49:22 2015
@@ -18,8 +18,8 @@
<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
- http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
- version="3.1"
+ http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd"
+ version="4.0"
metadata-complete="true">
<description>
Modified: tomcat/trunk/webapps/host-manager/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/host-manager/WEB-INF/web.xml?rev=1707868&r1=1707867&r2=1707868&view=diff
==============================================================================
--- tomcat/trunk/webapps/host-manager/WEB-INF/web.xml (original)
+++ tomcat/trunk/webapps/host-manager/WEB-INF/web.xml Sat Oct 10 11:49:22 2015
@@ -18,8 +18,8 @@
<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
- http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
- version="3.1"
+ http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd"
+ version="4.0"
metadata-complete="true">
<display-name>Tomcat Host Manager Application</display-name>
Modified: tomcat/trunk/webapps/manager/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/manager/WEB-INF/web.xml?rev=1707868&r1=1707867&r2=1707868&view=diff
==============================================================================
--- tomcat/trunk/webapps/manager/WEB-INF/web.xml (original)
+++ tomcat/trunk/webapps/manager/WEB-INF/web.xml Sat Oct 10 11:49:22 2015
@@ -18,8 +18,8 @@
<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
- http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
- version="3.1"
+ http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd"
+ version="4.0"
metadata-complete="true">
<display-name>Tomcat Manager Application</display-name>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org