amyroh 2002/07/31 17:21:30
Modified: catalina/src/share/org/apache/catalina/startup
Constants.java ContextConfig.java
Log:
Add support for Web App Deployment Descriptor that uses XML Schema (Servlet 2.4)
Submitted by Jeanfrancois Arcand.
Revision Changes Path
1.2 +30 -4
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/Constants.java
Index: Constants.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/Constants.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Constants.java 18 Jul 2002 16:47:48 -0000 1.1
+++ Constants.java 1 Aug 2002 00:21:30 -0000 1.2
@@ -69,6 +69,7 @@
* String constants for the startup package.
*
* @author Craig R. McClanahan
+ * @author Jean-Francois Arcand
* @version $Revision$ $Date$
*/
@@ -91,6 +92,11 @@
// "conf/tld_12.dtd";
"/javax/servlet/jsp/resources/web-jsptaglibrary_1_2.dtd";
+ public static final String TldSchemaPublicId_20 =
+ "web-jsptaglibrary_2_0.xsd";
+ public static final String TldSchemaResourcePath_20 =
+ "/javax/servlet/resources/web-jsptaglibrary_2_0.xsd";
+
public static final String WebDtdPublicId_22 =
"-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN";
public static final String WebDtdResourcePath_22 =
@@ -102,5 +108,25 @@
public static final String WebDtdResourcePath_23 =
// "conf/web_23.dtd";
"/javax/servlet/resources/web-app_2_3.dtd";
+
+ public static final String WebSchemaPubliId_24 =
+ "web-app_2_4.xsd";
+ public static final String WebSchemaResourcePath_24 =
+ "/javax/servlet/resources/web-app_2_4.xsd";
+
+ public static final String J2eeSchemaPublicId_14 =
+ "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";
+ public static final String W3cSchemaResourcePath_10 =
+ "/javax/servlet/resources/xml.xsd";
+
+ public static final String JspSchemaPublicId_20 =
+ "jsp_2_0.xsd";
+ public static final String JspSchemaResourcePath_20 =
+ "/javax/servlet/resources/jsp_2_0.xsd";
}
1.3 +63 -5
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/ContextConfig.java
Index: ContextConfig.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/ContextConfig.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ContextConfig.java 30 Jul 2002 03:58:27 -0000 1.2
+++ ContextConfig.java 1 Aug 2002 00:21:30 -0000 1.3
@@ -133,6 +133,7 @@
* of that Context, and the associated defined servlets.
*
* @author Craig R. McClanahan
+ * @author Jean-Francois Arcand
* @version $Revision$ $Date$
*/
@@ -483,6 +484,34 @@
url = ContextConfig.class.getResource(Constants.TldDtdResourcePath_12);
tldDigester.register(Constants.TldDtdPublicId_12,
url.toString());
+
+ url = ContextConfig.class.getResource(Constants.TldSchemaResourcePath_20);
+ // to support servlet.jar that does not contains the schema
+ if (url != null){
+ tldDigester.setSchema(url.toString());
+ }
+
+ // Add local copy of Servlet 2.4 XML Schema instance.
+ url = ContextConfig.class.getResource(Constants.J2eeSchemaResourcePath_14);
+ tldDigester.register(Constants.J2eeSchemaPublicId_14,
+ url.toString());
+
+ url = ContextConfig.class.getResource(Constants.W3cSchemaResourcePath_10);
+ tldDigester.register(Constants.W3cSchemaPublicId_10,
+ url.toString());
+
+ url = ContextConfig.class.getResource(Constants.JspSchemaResourcePath_20);
+ tldDigester.register(Constants.JspSchemaPublicId_20,
+ url.toString());
+
+ url = ContextConfig.class.getResource(Constants.W3cSchemaResourcePath_10);
+ tldDigester.register(Constants.W3cSchemaPublicId_10,
+ url.toString());
+
+ url = ContextConfig.class.getResource(Constants.TldSchemaResourcePath_20);
+ tldDigester.register(Constants.TldSchemaPublicId_20,
+ url.toString());
+
tldDigester.addRuleSet(new TldRuleSet());
return (tldDigester);
@@ -504,6 +533,35 @@
url = ContextConfig.class.getResource(Constants.WebDtdResourcePath_23);
webDigester.register(Constants.WebDtdPublicId_23,
url.toString());
+
+ url = ContextConfig.class.getResource(Constants.WebSchemaResourcePath_24);
+
+ // to support servlet.jar that does not contains the schema
+ if (url != null){
+ webDigester.setSchema(url.toString());
+ }
+
+ // Add local copy of Servlet 2.4 XML Schema instance.
+ url = ContextConfig.class.getResource(Constants.J2eeSchemaResourcePath_14);
+ webDigester.register(Constants.J2eeSchemaPublicId_14,
+ url.toString());
+
+ url = ContextConfig.class.getResource(Constants.W3cSchemaResourcePath_10);
+ webDigester.register(Constants.W3cSchemaPublicId_10,
+ url.toString());
+
+ url = ContextConfig.class.getResource(Constants.JspSchemaResourcePath_20);
+ webDigester.register(Constants.JspSchemaPublicId_20,
+ url.toString());
+
+ url = ContextConfig.class.getResource(Constants.W3cSchemaResourcePath_10);
+ webDigester.register(Constants.W3cSchemaPublicId_10,
+ url.toString());
+
+ url = ContextConfig.class.getResource(Constants.TldSchemaResourcePath_20);
+ webDigester.register(Constants.TldSchemaPublicId_20,
+ url.toString());
+
webDigester.addRuleSet(new WebRuleSet());
return (webDigester);
@@ -791,7 +849,7 @@
// Removing resource links
/*
- ContextResourceLink[] contextResourceLinks =
+ ContextResourceLink[] contextResourceLinks =
context.findResourceLinks();
for (i = 0; i < contextResourceLinks.length; i++) {
context.removeResourceLink(contextResourceLinks[i].getName());
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
