tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject svn commit: r535038 - in /tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup: Constants.java DigesterFactory.java
Date Fri, 04 May 2007 00:19:57 GMT
Author: remm
Date: Thu May  3 17:19:56 2007
New Revision: 535038

URL: http://svn.apache.org/viewvc?view=rev&rev=535038
Log:
- Add some xsds to the constants.

Modified:
    tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/Constants.java
    tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/DigesterFactory.java

Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/Constants.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/Constants.java?view=diff&rev=535038&r1=535037&r2=535038
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/Constants.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/Constants.java Thu May  3 17:19:56
2007
@@ -49,10 +49,15 @@
         "/javax/servlet/jsp/resources/web-jsptaglibrary_1_2.dtd";
 
     public static final String TldSchemaPublicId_20 =
-        "web-jsptaglibrary_2_0.xsd";;
+        "web-jsptaglibrary_2_0.xsd";
     public static final String TldSchemaResourcePath_20 =
         "/javax/servlet/jsp/resources/web-jsptaglibrary_2_0.xsd";
 
+    public static final String TldSchemaPublicId_21 =
+        "web-jsptaglibrary_2_1.xsd";
+    public static final String TldSchemaResourcePath_21 =
+        "/javax/servlet/jsp/resources/web-jsptaglibrary_2_1.xsd";
+
     public static final String WebDtdPublicId_22 =
         "-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN";
     public static final String WebDtdResourcePath_22 =
@@ -64,24 +69,34 @@
         "/javax/servlet/resources/web-app_2_3.dtd";
 
     public static final String WebSchemaPublicId_24 =
-        "web-app_2_4.xsd";;
+        "web-app_2_4.xsd";
     public static final String WebSchemaResourcePath_24 =
         "/javax/servlet/resources/web-app_2_4.xsd";
 
+    public static final String WebSchemaPublicId_25 =
+        "web-app_2_5.xsd";
+    public static final String WebSchemaResourcePath_25 =
+        "/javax/servlet/resources/web-app_2_5.xsd";
+
     public static final String J2eeSchemaPublicId_14 =
-        "j2ee_1_4.xsd";;
+        "j2ee_1_4.xsd";
     public static final String J2eeSchemaResourcePath_14 =
         "/javax/servlet/resources/j2ee_1_4.xsd";
 
     public static final String W3cSchemaPublicId_10 =
-        "xml.xsd";;
+        "xml.xsd";
     public static final String W3cSchemaResourcePath_10 =
         "/javax/servlet/resources/xml.xsd";
 
     public static final String JspSchemaPublicId_20 =
-        "jsp_2_0.xsd";;
+        "jsp_2_0.xsd";
     public static final String JspSchemaResourcePath_20 =
         "/javax/servlet/jsp/resources/jsp_2_0.xsd";
+    
+    public static final String JspSchemaPublicId_21 =
+        "jsp_2_1.xsd";
+    public static final String JspSchemaResourcePath_21 =
+        "/javax/servlet/jsp/resources/jsp_2_1.xsd";
     
     public static final String J2eeWebServiceSchemaPublicId_11 =
             "j2ee_web_services_1_1.xsd";

Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/DigesterFactory.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/DigesterFactory.java?view=diff&rev=535038&r1=535037&r2=535038
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/DigesterFactory.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/DigesterFactory.java Thu May  3
17:19:56 2007
@@ -104,6 +104,10 @@
         // JSP
         register(Constants.JspSchemaResourcePath_20,
                  Constants.JspSchemaPublicId_20);
+
+        register(Constants.JspSchemaResourcePath_21,
+                Constants.JspSchemaPublicId_21);
+
         // TLD
         register(Constants.TldDtdResourcePath_11,  
                  Constants.TldDtdPublicId_11);
@@ -114,6 +118,9 @@
         register(Constants.TldSchemaResourcePath_20,
                  Constants.TldSchemaPublicId_20);
 
+        register(Constants.TldSchemaResourcePath_21,
+                Constants.TldSchemaPublicId_21);
+
         // web.xml    
         register(Constants.WebDtdResourcePath_22,
                  Constants.WebDtdPublicId_22);
@@ -123,6 +130,9 @@
 
         register(Constants.WebSchemaResourcePath_24,
                  Constants.WebSchemaPublicId_24);
+
+        register(Constants.WebSchemaResourcePath_25,
+                Constants.WebSchemaPublicId_25);
 
         // Web Service
         register(Constants.J2eeWebServiceSchemaResourcePath_11,



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


Mime
View raw message