tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1547912 - in /tomcat/tc7.0.x/trunk: java/org/apache/tomcat/util/descriptor/DigesterFactory.java java/org/apache/tomcat/util/descriptor/XmlIdentifiers.java test/org/apache/tomcat/util/descriptor/TestLocalResolver.java
Date Wed, 04 Dec 2013 21:04:41 GMT
Author: markt
Date: Wed Dec  4 21:04:41 2013
New Revision: 1547912

URL: http://svn.apache.org/r1547912
Log:
Drop the references to the Java EE 7 resources

Modified:
    tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/descriptor/DigesterFactory.java
    tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/descriptor/XmlIdentifiers.java
    tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/descriptor/TestLocalResolver.java

Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/descriptor/DigesterFactory.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/descriptor/DigesterFactory.java?rev=1547912&r1=1547911&r2=1547912&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/descriptor/DigesterFactory.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/descriptor/DigesterFactory.java Wed Dec
 4 21:04:41 2013
@@ -80,15 +80,6 @@ public class DigesterFactory {
         addSelf(systemIds, "javaee_web_services_1_3.xsd");
         addSelf(systemIds, "javaee_web_services_client_1_3.xsd");
 
-        // from JavaEE 7
-        systemIds.put(XmlIdentifiers.WEB_31_XSD, idFor("web-app_3_1.xsd"));
-        systemIds.put(XmlIdentifiers.WEB_FRAGMENT_31_XSD, idFor("web-fragment_3_1.xsd"));
-        addSelf(systemIds, "web-common_3_1.xsd");
-        addSelf(systemIds, "javaee_7.xsd");
-        addSelf(systemIds, "jsp_2_3.xsd");
-        addSelf(systemIds, "javaee_web_services_1_4.xsd");
-        addSelf(systemIds, "javaee_web_services_client_1_4.xsd");
-
         SERVLET_API_RESOLVER = new LocalResolver(publicIds, systemIds);
     }
 

Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/descriptor/XmlIdentifiers.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/descriptor/XmlIdentifiers.java?rev=1547912&r1=1547911&r2=1547912&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/descriptor/XmlIdentifiers.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/descriptor/XmlIdentifiers.java Wed Dec
 4 21:04:41 2013
@@ -72,14 +72,6 @@ public final class XmlIdentifiers {
     public static final String WEBSERVICES_13_XSD =
             "http://java.sun.com/xml/ns/javaee/javaee_web_services_1_3.xsd";
 
-    // from JavaEE 7
-    public static final String WEB_31_XSD =
-            "http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd";
-    public static final String WEB_FRAGMENT_31_XSD =
-            "http://xmlns.jcp.org/xml/ns/javaee/web-fragment_3_1.xsd";
-    public static final String WEBSERVICES_14_XSD =
-            "http://xmlns.jcp.org/xml/ns/javaee/javaee_web_services_1_4.xsd";
-
     private XmlIdentifiers() {
     }
 }
\ No newline at end of file

Modified: tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/descriptor/TestLocalResolver.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/descriptor/TestLocalResolver.java?rev=1547912&r1=1547911&r2=1547912&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/descriptor/TestLocalResolver.java (original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/descriptor/TestLocalResolver.java Wed
Dec  4 21:04:41 2013
@@ -36,17 +36,17 @@ public class TestLocalResolver {
 
     private LocalResolver resolver = new LocalResolver(publicIds, systemIds);
     private String WEB_22_LOCAL;
-    private String WEB_31_LOCAL;
-    private String WEBCOMMON_31_LOCAL;
+    private String WEB_30_LOCAL;
+    private String WEBCOMMON_30_LOCAL;
 
     @Before
     public void init() {
         WEB_22_LOCAL = urlFor("resources/web-app_2_2.dtd");
-        WEB_31_LOCAL = urlFor("resources/web-app_3_1.xsd");
-        WEBCOMMON_31_LOCAL = urlFor("resources/web-common_3_1.xsd");
+        WEB_30_LOCAL = urlFor("resources/web-app_3_0.xsd");
+        WEBCOMMON_30_LOCAL = urlFor("resources/web-common_3_0.xsd");
         publicIds.put(XmlIdentifiers.WEB_22_PUBLIC, WEB_22_LOCAL);
-        systemIds.put(XmlIdentifiers.WEB_31_XSD, WEB_31_LOCAL);
-        systemIds.put(WEBCOMMON_31_LOCAL, WEBCOMMON_31_LOCAL);
+        systemIds.put(XmlIdentifiers.WEB_30_XSD, WEB_30_LOCAL);
+        systemIds.put(WEBCOMMON_30_LOCAL, WEBCOMMON_30_LOCAL);
     }
 
     public String urlFor(String id) {
@@ -99,26 +99,26 @@ public class TestLocalResolver {
     @Test
     public void systemIdIsResolved() throws IOException, SAXException {
         InputSource source =
-                resolver.resolveEntity(null, XmlIdentifiers.WEB_31_XSD);
+                resolver.resolveEntity(null, XmlIdentifiers.WEB_30_XSD);
         Assert.assertEquals(null, source.getPublicId());
-        Assert.assertEquals(WEB_31_LOCAL, source.getSystemId());
+        Assert.assertEquals(WEB_30_LOCAL, source.getSystemId());
     }
 
     @Test
     public void relativeSystemIdIsResolvedAgainstBaseURI()
             throws IOException, SAXException {
         InputSource source = resolver.resolveEntity(
-                null, null, WEB_31_LOCAL, "web-common_3_1.xsd");
+                null, null, WEB_30_LOCAL, "web-common_3_1.xsd");
         Assert.assertEquals(null, source.getPublicId());
-        Assert.assertEquals(WEBCOMMON_31_LOCAL, source.getSystemId());
+        Assert.assertEquals(WEBCOMMON_30_LOCAL, source.getSystemId());
     }
 
     @Test
     public void absoluteSystemIdOverridesBaseURI()
             throws IOException, SAXException {
         InputSource source = resolver.resolveEntity(null, null,
-                "http://example.com/home.html", XmlIdentifiers.WEB_31_XSD);
+                "http://example.com/home.html", XmlIdentifiers.WEB_30_XSD);
         Assert.assertEquals(null, source.getPublicId());
-        Assert.assertEquals(WEB_31_LOCAL, source.getSystemId());
+        Assert.assertEquals(WEB_30_LOCAL, source.getSystemId());
     }
 }
\ No newline at end of file



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message