Author: markt
Date: Sat Oct 10 11:33:30 2015
New Revision: 1707864
URL: http://svn.apache.org/viewvc?rev=1707864&view=rev
Log:
Servlet 4.0
Add support for 4.0 web.xml
Modified:
tomcat/trunk/java/org/apache/tomcat/util/descriptor/DigesterFactory.java
tomcat/trunk/java/org/apache/tomcat/util/descriptor/LocalResolver.java
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/WebXml.java
Modified:
tomcat/trunk/java/org/apache/tomcat/util/descriptor/DigesterFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/descriptor/DigesterFactory.java?rev=1707864&r1=1707863&r2=1707864&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/descriptor/DigesterFactory.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/descriptor/DigesterFactory.java
Sat Oct 10 11:33:30 2015
@@ -120,6 +120,12 @@ public class DigesterFactory {
addSelf(systemIds, "javaee_web_services_1_4.xsd");
addSelf(systemIds, "javaee_web_services_client_1_4.xsd");
+ // from JavaEE 8
+ add(systemIds, XmlIdentifiers.WEB_40_XSD,
locationFor("web-app_4_0.xsd"));
+ add(systemIds, XmlIdentifiers.WEB_FRAGMENT_40_XSD,
locationFor("web-fragment_4_0.xsd"));
+ addSelf(systemIds, "web-common_4_0.xsd");
+ addSelf(systemIds, "javaee_8.xsd");
+
SERVLET_API_PUBLIC_IDS = Collections.unmodifiableMap(publicIds);
SERVLET_API_SYSTEM_IDS = Collections.unmodifiableMap(systemIds);
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/descriptor/LocalResolver.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/descriptor/LocalResolver.java?rev=1707864&r1=1707863&r2=1707864&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/descriptor/LocalResolver.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/descriptor/LocalResolver.java Sat
Oct 10 11:33:30 2015
@@ -40,7 +40,7 @@ public class LocalResolver implements En
private static final String[] JAVA_EE_NAMESPACES = {
XmlIdentifiers.JAVAEE_1_4_NS,
XmlIdentifiers.JAVAEE_5_NS,
- XmlIdentifiers.JAVAEE_7_NS };
+ XmlIdentifiers.JAVAEE_7_NS};
private final Map<String,String> publicIds;
Modified: tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/WebXml.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/WebXml.java?rev=1707864&r1=1707863&r2=1707864&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/WebXml.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/WebXml.java Sat Oct
10 11:33:30 2015
@@ -681,8 +681,8 @@ public class WebXml {
javaeeNamespace = XmlIdentifiers.JAVAEE_7_NS;
webXmlSchemaLocation = XmlIdentifiers.WEB_31_XSD;
} else if ("4.0".equals(version)) {
- // TODO Servlet 4.0
- throw new UnsupportedOperationException();
+ javaeeNamespace = XmlIdentifiers.JAVAEE_8_NS;
+ webXmlSchemaLocation = XmlIdentifiers.WEB_40_XSD;
}
sb.append("<web-app xmlns=\"");
sb.append(javaeeNamespace);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
