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 2021/09/09 09:10:06 UTC
[tomcat] branch 10.0.x updated (fd14af6 -> cb1b00d)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a change to branch 10.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git.
from fd14af6 Provide implementation of isParametersProvided
new 9e4ab0b Add support for Servlet 5 to WebXml.toString()
new cb1b00d Align with 10.1.x
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
java/org/apache/tomcat/util/descriptor/web/WebXml.java | 3 +++
test/org/apache/tomcat/util/descriptor/web/TestWebXml.java | 5 +++++
2 files changed, 8 insertions(+)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 02/02: Align with 10.1.x
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit cb1b00d46c62f150c3d4d3537510e47d40cb392d
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Sep 9 10:09:52 2021 +0100
Align with 10.1.x
---
test/org/apache/tomcat/util/descriptor/web/TestWebXml.java | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/test/org/apache/tomcat/util/descriptor/web/TestWebXml.java b/test/org/apache/tomcat/util/descriptor/web/TestWebXml.java
index d68605c..898cec6 100644
--- a/test/org/apache/tomcat/util/descriptor/web/TestWebXml.java
+++ b/test/org/apache/tomcat/util/descriptor/web/TestWebXml.java
@@ -177,6 +177,11 @@ public class TestWebXml {
doTestValidateVersion("4.0");
}
+ @Test
+ public void testValidateVersion50() throws IOException, SAXException {
+ doTestValidateVersion("5.0");
+ }
+
private void doTestValidateVersion(String version) throws IOException, SAXException {
WebXml webxml = new WebXml();
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 01/02: Add support for Servlet 5 to WebXml.toString()
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 9e4ab0bc5e44d898445800aed4ac0a69d3f95b66
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Sep 9 10:05:10 2021 +0100
Add support for Servlet 5 to WebXml.toString()
---
java/org/apache/tomcat/util/descriptor/web/WebXml.java | 3 +++
1 file changed, 3 insertions(+)
diff --git a/java/org/apache/tomcat/util/descriptor/web/WebXml.java b/java/org/apache/tomcat/util/descriptor/web/WebXml.java
index 434e630..62b5ed7 100644
--- a/java/org/apache/tomcat/util/descriptor/web/WebXml.java
+++ b/java/org/apache/tomcat/util/descriptor/web/WebXml.java
@@ -752,6 +752,9 @@ public class WebXml extends XmlEncodingBase implements DocumentProperties.Charse
} else if ("4.0".equals(version)) {
javaeeNamespace = XmlIdentifiers.JAVAEE_8_NS;
webXmlSchemaLocation = XmlIdentifiers.WEB_40_XSD;
+ } else if ("5.0".equals(version)) {
+ javaeeNamespace = XmlIdentifiers.JAKARTAEE_9_NS;
+ webXmlSchemaLocation = XmlIdentifiers.WEB_50_XSD;
}
sb.append("<web-app xmlns=\"");
sb.append(javaeeNamespace);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org