This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 60d8274a3fba7853150385eefb29a3422fe7561f
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Sep 22 19:18:18 2021 +0100
Update web apps, pre-compilation etc to use Jakarta EE 10 schema
---
conf/web.xml | 4 ++--
java/org/apache/jasper/resources/LocalStrings.properties | 4 ++--
java/org/apache/jasper/resources/LocalStrings_cs.properties | 4 ++--
java/org/apache/jasper/resources/LocalStrings_de.properties | 4 ++--
java/org/apache/jasper/resources/LocalStrings_es.properties | 4 ++--
java/org/apache/jasper/resources/LocalStrings_fr.properties | 4 ++--
java/org/apache/jasper/resources/LocalStrings_ja.properties | 4 ++--
java/org/apache/jasper/resources/LocalStrings_ko.properties | 4 ++--
.../apache/jasper/resources/LocalStrings_pt_BR.properties | 4 ++--
.../apache/jasper/resources/LocalStrings_zh_CN.properties | 4 ++--
java/org/apache/tomcat/util/descriptor/web/WebXml.java | 3 +++
test/webapp/WEB-INF/web.xml | 4 ++--
webapps/ROOT/WEB-INF/web.xml | 4 ++--
webapps/docs/WEB-INF/web.xml | 4 ++--
webapps/docs/appdev/sample/web/WEB-INF/web.xml | 4 ++--
webapps/docs/appdev/web.xml.txt | 11 +++++------
webapps/docs/changelog.xml | 12 ++++++++++++
webapps/docs/jndi-datasource-examples-howto.xml | 11 ++++++-----
webapps/examples/WEB-INF/web.xml | 4 ++--
webapps/host-manager/WEB-INF/web.xml | 4 ++--
webapps/manager/WEB-INF/web.xml | 4 ++--
21 files changed, 60 insertions(+), 45 deletions(-)
diff --git a/conf/web.xml b/conf/web.xml
index a685947..cbdd6fe 100644
--- a/conf/web.xml
+++ b/conf/web.xml
@@ -18,8 +18,8 @@
<web-app xmlns="https://jakarta.ee/xml/ns/jakartaee";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee
- https://jakarta.ee/xml/ns/jakartaee/web-app_5_0.xsd";
- version="5.0">
+ https://jakarta.ee/xml/ns/jakartaee/web-app_6_0.xsd";
+ version="6.0">
<!-- ======================== Introduction ============================== -->
<!-- This document defines default values for *all* web applications -->
diff --git a/java/org/apache/jasper/resources/LocalStrings.properties
b/java/org/apache/jasper/resources/LocalStrings.properties
index 867c69f..898e173 100644
--- a/java/org/apache/jasper/resources/LocalStrings.properties
+++ b/java/org/apache/jasper/resources/LocalStrings.properties
@@ -395,8 +395,8 @@ jspc.webxml.header=<?xml version="1.0" encoding="{0}"?>\n\
<web-app xmlns="https://jakarta.ee/xml/ns/jakartaee"\n\
\ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\n\
\ xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee\n\
-\ https://jakarta.ee/xml/ns/jakartaee/web-app_5_0.xsd"\n\
-\ version="5.0"\n\
+\ https://jakarta.ee/xml/ns/jakartaee/web-app_6_0.xsd"\n\
+\ version="6.0"\n\
\ metadata-complete="false">\n\
<!--\n\
Automatically created by Apache Tomcat JspC.\n\
diff --git a/java/org/apache/jasper/resources/LocalStrings_cs.properties
b/java/org/apache/jasper/resources/LocalStrings_cs.properties
index f042af1..7da196c 100644
--- a/java/org/apache/jasper/resources/LocalStrings_cs.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_cs.properties
@@ -92,8 +92,8 @@ jspc.webxml.header=<?xml version="1.0" encoding="{0}"?>\n\
<web-app xmlns="https://jakarta.ee/xml/ns/jakartaee"\n\
\ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\n\
\ xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee\n\
-\ https://jakarta.ee/xml/ns/jakartaee/web-app_5_0.xsd"\n\
-\ version="5.0"\n\
+\ https://jakarta.ee/xml/ns/jakartaee/web-app_6_0.xsd"\n\
+\ version="6.0"\n\
\ metadata-complete="false">\n\
<!--\n\
Automaticky vytvořeno pomocí Apache Tomcat JspC.\n\
diff --git a/java/org/apache/jasper/resources/LocalStrings_de.properties
b/java/org/apache/jasper/resources/LocalStrings_de.properties
index 34c7923..7a0ab81 100644
--- a/java/org/apache/jasper/resources/LocalStrings_de.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_de.properties
@@ -100,8 +100,8 @@ jspc.webxml.header=<?xml version="1.0" encoding="{0}"?>\n\
<web-app xmlns="https://jakarta.ee/xml/ns/jakartaee"\n\
\ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\n\
\ xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee\n\
-\ https://jakarta.ee/xml/ns/jakartaee/web-app_5_0.xsd"\n\
-\ version="5.0"\n\
+\ https://jakarta.ee/xml/ns/jakartaee/web-app_6_0.xsd"\n\
+\ version="6.0"\n\
\ metadata-complete="false">\n\
<!--\n\
Automatisch erstellt durch Apache Tomcat JspC.\n\
diff --git a/java/org/apache/jasper/resources/LocalStrings_es.properties
b/java/org/apache/jasper/resources/LocalStrings_es.properties
index 4cb1c17..7d97ec9 100644
--- a/java/org/apache/jasper/resources/LocalStrings_es.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_es.properties
@@ -328,8 +328,8 @@ jspc.webxml.header=<?xml version="1.0" encoding="{0}"?>\n\
<web-app xmlns="https://jakarta.ee/xml/ns/jakartaee"\n\
\ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\n\
\ xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee\n\
-\ https://jakarta.ee/xml/ns/jakartaee/web-app_5_0.xsd"\n\
-\ version="5.0"\n\
+\ https://jakarta.ee/xml/ns/jakartaee/web-app_6_0.xsd"\n\
+\ version="6.0"\n\
\ metadata-complete="false">\n\
<!--\n\
Creado automaticamente mediante Apache Tomcat JspC.\n\
diff --git a/java/org/apache/jasper/resources/LocalStrings_fr.properties
b/java/org/apache/jasper/resources/LocalStrings_fr.properties
index 788a06b..8d78f49 100644
--- a/java/org/apache/jasper/resources/LocalStrings_fr.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_fr.properties
@@ -395,8 +395,8 @@ jspc.webxml.header=<?xml version="1.0" encoding="{0}"?>\n\
<web-app xmlns="https://jakarta.ee/xml/ns/jakartaee"\n\
\ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\n\
\ xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee\n\
-\ https://jakarta.ee/xml/ns/jakartaee/web-app_5_0.xsd"\n\
-\ version="5.0"\n\
+\ https://jakarta.ee/xml/ns/jakartaee/web-app_6_0.xsd"\n\
+\ version="6.0"\n\
\ metadata-complete="false">\n\
<!--\n\
Crée automatiquement par JspC de Apache Tomcat.\n\
diff --git a/java/org/apache/jasper/resources/LocalStrings_ja.properties
b/java/org/apache/jasper/resources/LocalStrings_ja.properties
index b4c4071..f2ace89 100644
--- a/java/org/apache/jasper/resources/LocalStrings_ja.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_ja.properties
@@ -392,8 +392,8 @@ jspc.webxml.header=<?xml version="1.0" encoding="{0}"?>\n\
<web-app xmlns="https://jakarta.ee/xml/ns/jakartaee"\n\
\ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\n\
\ xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee\n\
-\ https://jakarta.ee/xml/ns/jakartaee/web-app_5_0.xsd"\n\
-\ version="5.0"\n\
+\ https://jakarta.ee/xml/ns/jakartaee/web-app_6_0.xsd"\n\
+\ version="6.0"\n\
\ metadata-complete="false">\n\
<!--\n\
Apache Tomcat JspC による自動生成\n\
diff --git a/java/org/apache/jasper/resources/LocalStrings_ko.properties
b/java/org/apache/jasper/resources/LocalStrings_ko.properties
index 8755802..c0ced0a 100644
--- a/java/org/apache/jasper/resources/LocalStrings_ko.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_ko.properties
@@ -393,8 +393,8 @@ jspc.webxml.header=<?xml version="1.0" encoding="{0}"?>\n\
<web-app xmlns="https://jakarta.ee/xml/ns/jakartaee"\n\
\ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\n\
\ xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee\n\
-\ https://jakarta.ee/xml/ns/jakartaee/web-app_5_0.xsd"\n\
-\ version="5.0"\n\
+\ https://jakarta.ee/xml/ns/jakartaee/web-app_6_0.xsd"\n\
+\ version="6.0"\n\
\ metadata-complete="false">\n\
<!--\n\
Automatically created by Apache Tomcat JspC.\n\
diff --git a/java/org/apache/jasper/resources/LocalStrings_pt_BR.properties
b/java/org/apache/jasper/resources/LocalStrings_pt_BR.properties
index 7ec2d0f..d4bae33 100644
--- a/java/org/apache/jasper/resources/LocalStrings_pt_BR.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_pt_BR.properties
@@ -57,8 +57,8 @@ jspc.webxml.header=<?xml version="1.0" encoding="{0}"?>\n\
<web-app xmlns="https://jakarta.ee/xml/ns/jakartaee"\n\
\ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\n\
\ xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee\n\
-\ https://jakarta.ee/xml/ns/jakartaee/web-app_5_0.xsd"\n\
-\ version="5.0"\n\
+\ https://jakarta.ee/xml/ns/jakartaee/web-app_6_0.xsd"\n\
+\ version="6.0"\n\
\ metadata-complete="false">\n\
<!--\n\
Automaticamente criado pelo Apache Tomcat JspC.\n\
diff --git a/java/org/apache/jasper/resources/LocalStrings_zh_CN.properties
b/java/org/apache/jasper/resources/LocalStrings_zh_CN.properties
index fd953a3..cd7edd4 100644
--- a/java/org/apache/jasper/resources/LocalStrings_zh_CN.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_zh_CN.properties
@@ -392,8 +392,8 @@ jspc.webxml.header=<?xml version="1.0" encoding="{0}"?>\n\
<web-app xmlns="https://jakarta.ee/xml/ns/jakartaee"\n\
\ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\n\
\ xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee\n\
-\ https://jakarta.ee/xml/ns/jakartaee/web-app_5_0.xsd"\n\
-\ version="5.0"\n\
+\ https://jakarta.ee/xml/ns/jakartaee/web-app_6_0.xsd"\n\
+\ version="6.0"\n\
\ metadata-complete="false">\n\
<!--\n\
由 Apache Tomcat JspC 自动生成。\n\
diff --git a/java/org/apache/tomcat/util/descriptor/web/WebXml.java
b/java/org/apache/tomcat/util/descriptor/web/WebXml.java
index 8384413..4708f7c 100644
--- a/java/org/apache/tomcat/util/descriptor/web/WebXml.java
+++ b/java/org/apache/tomcat/util/descriptor/web/WebXml.java
@@ -755,6 +755,9 @@ public class WebXml extends XmlEncodingBase implements
DocumentProperties.Charse
} else if ("5.0".equals(version)) {
javaeeNamespace = XmlIdentifiers.JAKARTAEE_9_NS;
webXmlSchemaLocation = XmlIdentifiers.WEB_50_XSD;
+ } else if ("6.0".equals(version)) {
+ javaeeNamespace = XmlIdentifiers.JAKARTAEE_10_NS;
+ webXmlSchemaLocation = XmlIdentifiers.WEB_60_XSD;
}
sb.append("<web-app xmlns=\"");
sb.append(javaeeNamespace);
diff --git a/test/webapp/WEB-INF/web.xml b/test/webapp/WEB-INF/web.xml
index e3dd228..0a28fc1 100644
--- a/test/webapp/WEB-INF/web.xml
+++ b/test/webapp/WEB-INF/web.xml
@@ -18,8 +18,8 @@
<web-app xmlns="https://jakarta.ee/xml/ns/jakartaee";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee
- https://jakarta.ee/xml/ns/jakartaee/web-app_5_0.xsd";
- version="5.0"
+ https://jakarta.ee/xml/ns/jakartaee/web-app_6_0.xsd";
+ version="6.0"
metadata-complete="true">
<display-name>Tomcat Test Application</display-name>
diff --git a/webapps/ROOT/WEB-INF/web.xml b/webapps/ROOT/WEB-INF/web.xml
index fdbcca0..e243601 100644
--- a/webapps/ROOT/WEB-INF/web.xml
+++ b/webapps/ROOT/WEB-INF/web.xml
@@ -18,8 +18,8 @@
<web-app xmlns="https://jakarta.ee/xml/ns/jakartaee";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee
- https://jakarta.ee/xml/ns/jakartaee/web-app_5_0.xsd";
- version="5.0"
+ https://jakarta.ee/xml/ns/jakartaee/web-app_6_0.xsd";
+ version="6.0"
metadata-complete="true">
<display-name>Welcome to Tomcat</display-name>
diff --git a/webapps/docs/WEB-INF/web.xml b/webapps/docs/WEB-INF/web.xml
index e1abb10..6abe1f9 100644
--- a/webapps/docs/WEB-INF/web.xml
+++ b/webapps/docs/WEB-INF/web.xml
@@ -18,8 +18,8 @@
<web-app xmlns="https://jakarta.ee/xml/ns/jakartaee";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee
- https://jakarta.ee/xml/ns/jakartaee/web-app_5_0.xsd";
- version="5.0"
+ https://jakarta.ee/xml/ns/jakartaee/web-app_6_0.xsd";
+ version="6.0"
metadata-complete="true">
<display-name>Tomcat Documentation</display-name>
diff --git a/webapps/docs/appdev/sample/web/WEB-INF/web.xml
b/webapps/docs/appdev/sample/web/WEB-INF/web.xml
index 717c137..f9e24c1 100644
--- a/webapps/docs/appdev/sample/web/WEB-INF/web.xml
+++ b/webapps/docs/appdev/sample/web/WEB-INF/web.xml
@@ -18,8 +18,8 @@
<web-app xmlns="https://jakarta.ee/xml/ns/jakartaee";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee
- https://jakarta.ee/xml/ns/jakartaee/web-app_5_0.xsd";
- version="5.0">
+ https://jakarta.ee/xml/ns/jakartaee/web-app_6_0.xsd";
+ version="6.0">
<display-name>Hello, World Application</display-name>
<description>
diff --git a/webapps/docs/appdev/web.xml.txt b/webapps/docs/appdev/web.xml.txt
index 8f07916..70caa81 100644
--- a/webapps/docs/appdev/web.xml.txt
+++ b/webapps/docs/appdev/web.xml.txt
@@ -15,12 +15,11 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-<!DOCTYPE web-app
- PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
- "http://java.sun.com/dtd/web-app_2_3.dtd";>
-
-<web-app>
+<web-app xmlns="https://jakarta.ee/xml/ns/jakartaee";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee
+ https://jakarta.ee/xml/ns/jakartaee/web-app_6_0.xsd";
+ version="6.0">
<!-- General description of your web application -->
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index e596cf1..5aba0a1 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -119,6 +119,10 @@
Remove all deprecated code from the Servlet API to align Tomcat with
recent changes in the Jakarta Servlet specification project. (markt)
</update>
+ <add>
+ Add the current available Jakarta EE 10 schemas from the Jakarta EE
+ schema project. (markt)
+ </add>
</changelog>
</subsection>
<subsection name="Coyote">
@@ -177,6 +181,14 @@
</fix>
</changelog>
</subsection>
+ <subsection name="Web applications">
+ <changelog>
+ <update>
+ Update the web applications that are included with Apache Tomcat to use
+ the Jakarta EE 10 schema for web.xml. (markt)
+ </update>
+ </changelog>
+ </subsection>
</section>
<section name="Tomcat 10.1.0-M5 (markt)" rtext="release in progress">
<subsection name="Catalina">
diff --git a/webapps/docs/jndi-datasource-examples-howto.xml
b/webapps/docs/jndi-datasource-examples-howto.xml
index 60ea32f..d1b6eff 100644
--- a/webapps/docs/jndi-datasource-examples-howto.xml
+++ b/webapps/docs/jndi-datasource-examples-howto.xml
@@ -294,11 +294,12 @@ resource to your <a
href="config/context.html">Context</a>.</p>
<h5>3. web.xml configuration</h5>
<p>Now create a <code>WEB-INF/web.xml</code> for this test application.</p>
-<source><