Author: markt
Date: Thu Dec 31 11:05:45 2009
New Revision: 894813
URL: http://svn.apache.org/viewvc?rev=894813&view=rev
Log:
Add the Java EE 6 schemas to support validation
Modified:
tomcat/trunk/java/org/apache/catalina/startup/Constants.java
tomcat/trunk/java/org/apache/catalina/startup/DigesterFactory.java
Modified: tomcat/trunk/java/org/apache/catalina/startup/Constants.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/Constants.java?rev=894813&r1=894812&r2=894813&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/Constants.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/Constants.java Thu Dec 31
11:05:45 2009
@@ -49,6 +49,11 @@
public static final String JavaeeSchemaResourcePath_5 =
"/javax/servlet/resources/javaee_5.xsd";
+ public static final String JavaeeSchemaPublicId_6 =
+ "javaee_6.xsd";
+ public static final String JavaeeSchemaResourcePath_6 =
+ "/javax/servlet/resources/javaee_6.xsd";
+
// W3C
public static final String W3cSchemaPublicId_10 =
@@ -77,7 +82,12 @@
"jsp_2_1.xsd";
public static final String JspSchemaResourcePath_21 =
"/javax/servlet/jsp/resources/jsp_2_1.xsd";
-
+
+ public static final String JspSchemaPublicId_22 =
+ "jsp_2_2.xsd";
+ public static final String JspSchemaResourcePath_22 =
+ "/javax/servlet/jsp/resources/jsp_2_2.xsd";
+
// TLD
public static final String TldDtdPublicId_11 =
@@ -122,6 +132,20 @@
public static final String WebSchemaResourcePath_25 =
"/javax/servlet/resources/web-app_2_5.xsd";
+ public static final String WebSchemaPublicId_30 =
+ "web-app_3_0.xsd";
+ public static final String WebSchemaResourcePath_30 =
+ "/javax/servlet/resources/web-app_3_0.xsd";
+
+ public static final String WebCommonSchemaPublicId_30 =
+ "web-common_3_0.xsd";
+ public static final String WebCommonSchemaResourcePath_30 =
+ "/javax/servlet/resources/web-common_3_0.xsd";
+
+ public static final String WebFragmentSchemaPublicId_30 =
+ "web-fragment_3_0.xsd";
+ public static final String WebFragmentSchemaResourcePath_30 =
+ "/javax/servlet/resources/web-fragment_3_0.xsd";
// Web service
public static final String J2eeWebServiceSchemaPublicId_11 =
@@ -144,4 +168,14 @@
public static final String JavaeeWebServiceClientSchemaResourcePath_12 =
"/javax/servlet/resources/javaee_web_services_client_1_2.xsd";
+ public static final String JavaeeWebServiceSchemaPublicId_13 =
+ "javaee_web_services_1_3.xsd";
+ public static final String JavaeeWebServiceSchemaResourcePath_13 =
+ "/javax/servlet/resources/javaee_web_services_1_3.xsd";
+
+ public static final String JavaeeWebServiceClientSchemaPublicId_13 =
+ "javaee_web_services_client_1_3.xsd";
+ public static final String JavaeeWebServiceClientSchemaResourcePath_13 =
+ "/javax/servlet/resources/javaee_web_services_client_1_3.xsd";
+
}
Modified: tomcat/trunk/java/org/apache/catalina/startup/DigesterFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/DigesterFactory.java?rev=894813&r1=894812&r2=894813&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/DigesterFactory.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/startup/DigesterFactory.java Thu Dec
31 11:05:45 2009
@@ -95,6 +95,10 @@
Constants.JavaeeSchemaPublicId_5,
schemaResolver);
+ register(Constants.JavaeeSchemaResourcePath_6,
+ Constants.JavaeeSchemaPublicId_6,
+ schemaResolver);
+
// W3C
register(Constants.W3cSchemaResourcePath_10,
Constants.W3cSchemaPublicId_10,
@@ -117,6 +121,10 @@
Constants.JspSchemaPublicId_21,
schemaResolver);
+ register(Constants.JspSchemaResourcePath_22,
+ Constants.JspSchemaPublicId_22,
+ schemaResolver);
+
// TLD
register(Constants.TldDtdResourcePath_11,
Constants.TldDtdPublicId_11,
@@ -151,6 +159,18 @@
Constants.WebSchemaPublicId_25,
schemaResolver);
+ register(Constants.WebSchemaResourcePath_30,
+ Constants.WebSchemaPublicId_30,
+ schemaResolver);
+
+ register(Constants.WebCommonSchemaResourcePath_30,
+ Constants.WebCommonSchemaPublicId_30,
+ schemaResolver);
+
+ register(Constants.WebFragmentSchemaResourcePath_30,
+ Constants.WebFragmentSchemaPublicId_30,
+ schemaResolver);
+
// Web Service
register(Constants.J2eeWebServiceSchemaResourcePath_11,
Constants.J2eeWebServiceSchemaPublicId_11,
@@ -168,6 +188,13 @@
Constants.JavaeeWebServiceClientSchemaPublicId_12,
schemaResolver);
+ register(Constants.JavaeeWebServiceSchemaResourcePath_13,
+ Constants.JavaeeWebServiceSchemaPublicId_13,
+ schemaResolver);
+
+ register(Constants.JavaeeWebServiceClientSchemaResourcePath_13,
+ Constants.JavaeeWebServiceClientSchemaPublicId_13,
+ schemaResolver);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
