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 2013/07/09 17:02:15 UTC
svn commit: r1501310 -
/tomcat/trunk/java/org/apache/tomcat/util/descriptor/DigesterFactory.java
Author: markt
Date: Tue Jul 9 15:02:15 2013
New Revision: 1501310
URL: http://svn.apache.org/r1501310
Log:
Simplify.
Use DigesterFactory as base for loading resources for consistency with earlier versions.
Patch provided by Jeremy Boynes.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/descriptor/DigesterFactory.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=1501310&r1=1501309&r2=1501310&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/descriptor/DigesterFactory.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/descriptor/DigesterFactory.java Tue Jul 9 15:02:15 2013
@@ -19,8 +19,6 @@ package org.apache.tomcat.util.descripto
import java.util.HashMap;
import java.util.Map;
-import javax.servlet.Servlet;
-
import org.apache.tomcat.util.digester.Digester;
import org.apache.tomcat.util.digester.RuleSet;
@@ -43,57 +41,52 @@ public class DigesterFactory {
// W3C
publicIds.put(XmlIdentifiers.XSD_10_PUBLIC,
- urlFor("/javax/servlet/resources/XMLSchema.dtd"));
+ "/javax/servlet/resources/XMLSchema.dtd");
publicIds.put(XmlIdentifiers.DATATYPES_PUBLIC,
- urlFor("/javax/servlet/resources/datatypes.dtd"));
+ "/javax/servlet/resources/datatypes.dtd");
systemIds.put(XmlIdentifiers.XML_2001_XSD,
- urlFor("/javax/servlet/resources/xml.xsd"));
+ "/javax/servlet/resources/xml.xsd");
// from J2EE 1.2
publicIds.put(XmlIdentifiers.WEB_22_PUBLIC,
- urlFor("/javax/servlet/resources/web-app_2_2.dtd"));
+ "/javax/servlet/resources/web-app_2_2.dtd");
publicIds.put(XmlIdentifiers.TLD_11_PUBLIC,
- urlFor("/javax/servlet/resources/web-jsptaglibrary_1_1.dtd"));
+ "/javax/servlet/resources/web-jsptaglibrary_1_1.dtd");
// from J2EE 1.3
publicIds.put(XmlIdentifiers.WEB_23_PUBLIC,
- urlFor("/javax/servlet/resources/web-app_2_3.dtd"));
+ "/javax/servlet/resources/web-app_2_3.dtd");
publicIds.put(XmlIdentifiers.TLD_12_PUBLIC,
- urlFor("/javax/servlet/resources/web-jsptaglibrary_1_2.dtd"));
+ "/javax/servlet/resources/web-jsptaglibrary_1_2.dtd");
// from J2EE 1.4
systemIds.put("http://www.ibm.com/webservices/xsd/j2ee_web_services_client_1_1.xsd",
- urlFor("/javax/servlet/resources/j2ee_web_services_client_1_1.xsd"));
+ "/javax/servlet/resources/j2ee_web_services_client_1_1.xsd");
systemIds.put(XmlIdentifiers.WEB_24_XSD,
- urlFor("/javax/servlet/resources/web-app_2_4.xsd"));
+ "/javax/servlet/resources/web-app_2_4.xsd");
systemIds.put(XmlIdentifiers.TLD_20_XSD,
- urlFor("/javax/servlet/resources/web-jsptaglibrary_2_0.xsd"));
+ "/javax/servlet/resources/web-jsptaglibrary_2_0.xsd");
// from JavaEE 5
systemIds.put(XmlIdentifiers.WEB_25_XSD,
- urlFor("/javax/servlet/resources/web-app_2_5.xsd"));
+ "/javax/servlet/resources/web-app_2_5.xsd");
systemIds.put(XmlIdentifiers.TLD_21_XSD,
- urlFor("/javax/servlet/resources/web-jsptaglibrary_2_1.xsd"));
+ "/javax/servlet/resources/web-jsptaglibrary_2_1.xsd");
// from JavaEE 6
systemIds.put(XmlIdentifiers.WEB_30_XSD,
- urlFor("/javax/servlet/resources/web-app_3_0.xsd"));
+ "/javax/servlet/resources/web-app_3_0.xsd");
systemIds.put(XmlIdentifiers.WEB_FRAGMENT_30_XSD,
- urlFor("/javax/servlet/resources/web-fragment_3_0.xsd"));
+ "/javax/servlet/resources/web-fragment_3_0.xsd");
// from JavaEE 7
systemIds.put(XmlIdentifiers.WEB_31_XSD,
- urlFor("/javax/servlet/resources/web-app_3_1.xsd"));
+ "/javax/servlet/resources/web-app_3_1.xsd");
systemIds.put(XmlIdentifiers.WEB_FRAGMENT_31_XSD,
- urlFor("/javax/servlet/resources/web-fragment_3_1.xsd"));
+ "/javax/servlet/resources/web-fragment_3_1.xsd");
SERVLET_RESOLVER =
- new LocalResolver(Servlet.class, publicIds, systemIds);
- }
-
-
- private static String urlFor(String file) {
- return DigesterFactory.class.getResource(file).toExternalForm();
+ new LocalResolver(DigesterFactory.class, publicIds, systemIds);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org