tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jfarc...@apache.org
Subject cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup ContextConfig.java TldConfig.java
Date Tue, 23 Sep 2003 21:37:01 GMT
jfarcand    2003/09/23 14:37:01

  Modified:    catalina/src/share/org/apache/catalina/startup
                        ContextConfig.java TldConfig.java
  Log:
  Revert my previous patch since it force validation even when the value is set to false (for
schema).
  
  Revision  Changes    Path
  1.35      +2 -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.34
  retrieving revision 1.35
  diff -u -r1.34 -r1.35
  --- ContextConfig.java	23 Sep 2003 18:43:12 -0000	1.34
  +++ ContextConfig.java	23 Sep 2003 21:37:00 -0000	1.35
  @@ -459,8 +459,6 @@
           try{
               digester.setFeature(
                   "http://apache.org/xml/features/allow-java-encodings", true);
  -            digester.setFeature(
  -                "http://apache.org/xml/features/validation/schema", true);
           } catch(ParserConfigurationException e){
                   // log("contextConfig.registerLocalSchema", e);
           } catch(SAXNotRecognizedException e){
  @@ -492,7 +490,6 @@
                                                   boolean validation) {
           URL url = null;
           Digester webDigester = new Digester();
  -        webDigester.setUseContextClassLoader(false);
           webDigester.setNamespaceAware(namespaceAware);
           webDigester.setValidating(validation);
          
  @@ -507,7 +504,7 @@
           if (validation) {
               webDigester.setSchema(url.toString());
           }
  -
  +        
           url = ContextConfig.class.getResource(Constants.WebDtdResourcePath_22);
           webEntityResolver.register(Constants.WebDtdPublicId_22,
                                      url.toString());
  
  
  
  1.28      +0 -2      jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/TldConfig.java
  
  Index: TldConfig.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/TldConfig.java,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- TldConfig.java	23 Sep 2003 20:06:07 -0000	1.27
  +++ TldConfig.java	23 Sep 2003 21:37:00 -0000	1.28
  @@ -437,8 +437,6 @@
           try{
               digester.setFeature(
                   "http://apache.org/xml/features/allow-java-encodings", true);
  -            digester.setFeature(
  -                "http://apache.org/xml/features/validation/schema", true);
           } catch(ParserConfigurationException e){
                   // log("contextConfig.registerLocalSchema", e);
           } catch(SAXNotRecognizedException e){
  
  
  

Mime
View raw message