You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by re...@apache.org on 2003/08/18 19:44:20 UTC

cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup ContextConfig.java

remm        2003/08/18 10:44:20

  Modified:    catalina/src/share/org/apache/catalina/startup
                        ContextConfig.java
  Log:
  - Fix cut & paste bug.
  - Schema validation is now consistently broken between the deployer validator
    task and the integrated Tomcat validation.
  - I'll disable schema validation in 5.0.8 if this is not fixed.
  
  Revision  Changes    Path
  1.29      +3 -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.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- ContextConfig.java	19 Jul 2003 16:13:36 -0000	1.28
  +++ ContextConfig.java	18 Aug 2003 17:44:20 -0000	1.29
  @@ -67,7 +67,7 @@
   import java.io.FileNotFoundException;
   import java.io.InputStream;
   import java.io.IOException;
  -import java.net.JarURLConnection;
  +import java.net.URLConnection;
   import java.net.URL;
   import java.util.Enumeration;
   import java.util.HashSet;
  @@ -492,7 +492,7 @@
           url = ContextConfig.class.getResource(Constants.WebSchemaResourcePath_24);
           SchemaResolver webEntityResolver = new SchemaResolver(url.toString(),
                                                                 webDigester);
  -        if( xmlValidation ) {
  +        if (validation) {
               webDigester.setSchema(url.toString());
           }