- Add some xsds to the constants.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk@535038 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/catalina/startup/Constants.java b/java/org/apache/catalina/startup/Constants.java
index 2cc9ba5..a4b6a21 100644 (file)
--- a/java/org/apache/catalina/startup/Constants.java
+++ b/java/org/apache/catalina/startup/Constants.java
@@ -49,10 +49,15 @@ public final class Constants {
         "/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,25 +69,35 @@ public final class Constants {
         "/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";
     public static final String J2eeWebServiceSchemaResourcePath_11 =

diff --git a/java/org/apache/catalina/startup/DigesterFactory.java b/java/org/apache/catalina/startup/DigesterFactory.java
index 96dee1b..98f5942 100644 (file)
--- a/java/org/apache/catalina/startup/DigesterFactory.java
+++ b/java/org/apache/catalina/startup/DigesterFactory.java
@@ -104,6 +104,10 @@ public class DigesterFactory {
         // 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 @@ public class DigesterFactory {
         register(Constants.TldSchemaResourcePath_20,
                  Constants.TldSchemaPublicId_20);
 
+        register(Constants.TldSchemaResourcePath_21,
+                Constants.TldSchemaPublicId_21);
+
         // web.xml    
         register(Constants.WebDtdResourcePath_22,
                  Constants.WebDtdPublicId_22);
@@ -124,6 +131,9 @@ public class DigesterFactory {
         register(Constants.WebSchemaResourcePath_24,
                  Constants.WebSchemaPublicId_24);
 
+        register(Constants.WebSchemaResourcePath_25,
+                Constants.WebSchemaPublicId_25);
+
         // Web Service
         register(Constants.J2eeWebServiceSchemaResourcePath_11,
                  Constants.J2eeWebServiceSchemaPublicId_11);