You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by re...@apache.org on 2016/03/13 16:37:41 UTC
svn commit: r1734821 - in /tomcat/tc8.5.x/trunk: build.xml conf/web.xml
java/org/apache/tomcat/util/descriptor/DigesterFactory.java
java/org/apache/tomcat/util/descriptor/XmlIdentifiers.java
java/org/apache/tomcat/util/descriptor/web/WebXml.java
Author: remm
Date: Sun Mar 13 15:37:41 2016
New Revision: 1734821
URL: http://svn.apache.org/viewvc?rev=1734821&view=rev
Log:
Remove some instances of 4.0 use.
Modified:
tomcat/tc8.5.x/trunk/build.xml
tomcat/tc8.5.x/trunk/conf/web.xml
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/DigesterFactory.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/XmlIdentifiers.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/web/WebXml.java
Modified: tomcat/tc8.5.x/trunk/build.xml
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/build.xml?rev=1734821&r1=1734820&r2=1734821&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/build.xml (original)
+++ tomcat/tc8.5.x/trunk/build.xml Sun Mar 13 15:37:41 2016
@@ -81,7 +81,7 @@
<!-- build output directory for jdbc-pool -->
<property name="tomcat.pool" value="${tomcat.output}/jdbc-pool"/>
- <!-- Servlet 4.0 spec requires 1.8+ -->
+ <!-- Servlet 3.1 spec requires 1.7+ -->
<property name="compile.source" value="1.7"/>
<property name="compile.target" value="1.7"/>
Modified: tomcat/tc8.5.x/trunk/conf/web.xml
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/conf/web.xml?rev=1734821&r1=1734820&r2=1734821&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/conf/web.xml (original)
+++ tomcat/tc8.5.x/trunk/conf/web.xml Sun Mar 13 15:37:41 2016
@@ -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_4_0.xsd"
- version="4.0">
+ http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
+ version="3.1">
<!-- ======================== Introduction ============================== -->
<!-- This document defines default values for *all* web applications -->
Modified: tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/DigesterFactory.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/DigesterFactory.java?rev=1734821&r1=1734820&r2=1734821&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/DigesterFactory.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/DigesterFactory.java Sun Mar 13 15:37:41 2016
@@ -120,12 +120,6 @@ 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/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/XmlIdentifiers.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/XmlIdentifiers.java?rev=1734821&r1=1734820&r2=1734821&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/XmlIdentifiers.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/XmlIdentifiers.java Sun Mar 13 15:37:41 2016
@@ -73,11 +73,6 @@ public final class XmlIdentifiers {
public static final String WEB_FRAGMENT_31_XSD = JAVAEE_7_NS + "/web-fragment_3_1.xsd";
public static final String WEBSERVICES_14_XSD = JAVAEE_7_NS + "/javaee_web_services_1_4.xsd";
- // from JavaEE 8
- public static final String JAVAEE_8_NS = JAVAEE_7_NS;
- public static final String WEB_40_XSD = JAVAEE_8_NS + "/web-app_4_0.xsd";
- public static final String WEB_FRAGMENT_40_XSD = JAVAEE_8_NS + "/web-fragment_4_0.xsd";
-
private XmlIdentifiers() {
}
}
\ No newline at end of file
Modified: tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/web/WebXml.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/web/WebXml.java?rev=1734821&r1=1734820&r2=1734821&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/web/WebXml.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/web/WebXml.java Sun Mar 13 15:37:41 2016
@@ -160,10 +160,6 @@ public class WebXml {
majorVersion = 3;
minorVersion = 1;
break;
- case "4.0":
- majorVersion = 4;
- minorVersion = 0;
- break;
default:
log.warn(sm.getString("webXml.version.unknown", version));
}
@@ -215,9 +211,9 @@ public class WebXml {
}
// Derived major and minor version attributes
- // Default to 4.0 until we know otherwise
- private int majorVersion = 4;
- private int minorVersion = 0;
+ // Default to 3,1
+ private int majorVersion = 3;
+ private int minorVersion = 1;
public int getMajorVersion() { return majorVersion; }
public int getMinorVersion() { return minorVersion; }
@@ -689,9 +685,6 @@ public class WebXml {
} else if ("3.1".equals(version)) {
javaeeNamespace = XmlIdentifiers.JAVAEE_7_NS;
webXmlSchemaLocation = XmlIdentifiers.WEB_31_XSD;
- } else if ("4.0".equals(version)) {
- javaeeNamespace = XmlIdentifiers.JAVAEE_8_NS;
- webXmlSchemaLocation = XmlIdentifiers.WEB_40_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