remm        2003/08/26 01:39:59

  Modified:    catalina/src/share/org/apache/catalina/startup
                        ContextConfig.java TldConfig.java
  Log:
  - Reenable validation (there are still problems validating TLDs, even with
    Xerces 2.1).
  
  Revision  Changes    Path
  1.31      +2 -3      
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.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- ContextConfig.java        20 Aug 2003 08:35:43 -0000      1.30
  +++ ContextConfig.java        26 Aug 2003 08:39:59 -0000      1.31
  @@ -493,8 +493,7 @@
           SchemaResolver webEntityResolver = new SchemaResolver(url.toString(),
                                                                 webDigester);
   
  -        // FIXME: if (validation) {
  -        if (false) {
  +        if (validation) {
               webDigester.setSchema(url.toString());
           }
   
  
  
  
  1.19      +1 -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.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- TldConfig.java    26 Aug 2003 07:17:43 -0000      1.18
  +++ TldConfig.java    26 Aug 2003 08:39:59 -0000      1.19
  @@ -388,8 +388,7 @@
           SchemaResolver tldEntityResolver = new SchemaResolver(url.toString(), 
                                                                 tldDigester);
   
  -        // FIXME: if (xmlValidation) {
  -        if (false) {
  +        if (xmlValidation) {
               tldDigester.setSchema(url.toString());
           }
           
  
  
  

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

Reply via email to