[PATCH]'jakarta-tomcat-catalina]

[Jean-francois Arcand]

Hi,

this patch clean up the code and turn on automatically namespace 
validation when using schema.

Thanks,

-- Jeanfrancois


Index: ContextConfig.java
===================================================================
RCS file: 
/home/cvspublic/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/ContextConfig.java,v
retrieving revision 1.4
diff -u -r1.4 ContextConfig.java
--- ContextConfig.java  1 Aug 2002 04:53:03 -0000       1.4
+++ ContextConfig.java  2 Aug 2002 20:01:18 -0000
@@ -496,10 +496,6 @@
         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());
@@ -511,7 +507,11 @@
         url = ContextConfig.class.getResource(Constants.TldSchemaResourcePath_20);
         tldDigester.register(Constants.TldSchemaPublicId_20,
                              url.toString());
-
+        
+        url = ContextConfig.class.getResource(Constants.WebSchemaResourcePath_24);
+        tldDigester.register(Constants.WebSchemaPublicId_24,
+                             url.toString());
+        
         tldDigester.addRuleSet(new TldRuleSet());
         return (tldDigester);
 
@@ -526,6 +526,7 @@
 
         URL url = null;
         Digester webDigester = new Digester();
+        webDigester.setNamespaceAware(true);
         webDigester.setValidating(true);
         url = ContextConfig.class.getResource(Constants.WebDtdResourcePath_22);
         webDigester.register(Constants.WebDtdPublicId_22,
@@ -555,10 +556,6 @@
 
         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);


--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>