tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From amy...@apache.org
Subject cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup ContextConfig.java
Date Sat, 03 Aug 2002 01:02:07 GMT
amyroh      2002/08/02 18:02:07

  Modified:    catalina/src/share/org/apache/catalina/startup
                        ContextConfig.java
  Log:
  Clean up the code and turn on automatically namespace validation when using schema.
  
  Patch submitted by Jean-francois Arcand.
  
  Revision  Changes    Path
  1.5       +9 -12     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.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ContextConfig.java	1 Aug 2002 04:53:03 -0000	1.4
  +++ ContextConfig.java	3 Aug 2002 01:02:07 -0000	1.5
  @@ -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());
  @@ -512,6 +508,10 @@
           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:tomcat-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:tomcat-dev-help@jakarta.apache.org>


Mime
View raw message