tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From patri...@apache.org
Subject cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup Constants.java ContextConfig.java
Date Sat, 10 Aug 2002 22:42:34 GMT
patrickl    2002/08/10 15:42:34

  Modified:    catalina/src/share/org/apache/catalina/startup
                        Constants.java ContextConfig.java
  Log:
  This patch change the way local schema are stored -> use the full URI instead a the file
name.
  Submitted by:   Jean-Francois Arcand (jeanfrancois.arcand@sun.com)
  
  Revision  Changes    Path
  1.4       +11 -11    jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/Constants.java
  
  Index: Constants.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/Constants.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Constants.java	1 Aug 2002 04:53:03 -0000	1.3
  +++ Constants.java	10 Aug 2002 22:42:34 -0000	1.4
  @@ -93,9 +93,9 @@
           "/javax/servlet/jsp/resources/web-jsptaglibrary_1_2.dtd";
   
       public static final String TldSchemaPublicId_20 =
  -        "web-jsptaglibrary_2_0.xsd";
  +        "http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd";;
       public static final String TldSchemaResourcePath_20 =
  -        "/javax/servlet/jsp/resources/web-jsptaglibrary_2_0.xsd";
  +        "/javax/servlet/resources/web-jsptaglibrary_2_0.xsd";
   
       public static final String WebDtdPublicId_22 =
           "-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN";
  @@ -110,23 +110,23 @@
           "/javax/servlet/resources/web-app_2_3.dtd";
   
       public static final String WebSchemaPublicId_24 =
  -        "web-app_2_4.xsd";
  +        "http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd";;
       public static final String WebSchemaResourcePath_24 =
           "/javax/servlet/resources/web-app_2_4.xsd";
   
       public static final String J2eeSchemaPublicId_14 =
  -        "j2ee_1_4.xsd";
  +        "http://java.sun.com/xml/ns/j2ee/j2ee_1_4.xsd";;
       public static final String J2eeSchemaResourcePath_14 =
           "/javax/servlet/resources/j2ee_1_4.xsd";
   
       public static final String W3cSchemaPublicId_10 =
  -        "xml.xsd";
  +        "http://www.w3.org/2001/xml.xsd";;
       public static final String W3cSchemaResourcePath_10 =
           "/javax/servlet/resources/xml.xsd";
   
       public static final String JspSchemaPublicId_20 =
  -        "jsp_2_0.xsd";
  +        "http://java.sun.com/xml/ns/j2ee/jsp_2_0.xsd";;
       public static final String JspSchemaResourcePath_20 =
  -        "/javax/servlet/jsp/resources/jsp_2_0.xsd";
  +        "/javax/servlet/resources/jsp_2_0.xsd";
   
   }
  
  
  
  1.8       +6 -8      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.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- ContextConfig.java	8 Aug 2002 18:31:33 -0000	1.7
  +++ ContextConfig.java	10 Aug 2002 22:42:34 -0000	1.8
  @@ -493,10 +493,9 @@
           // to support servlet.jar that does not contains the schema
           if (url != null){
               tldDigester.setSchema(url.toString());
  +            tldDigester = registerLocalSchema(tldDigester);
           }
   
  -        tldDigester = registerLocalSchema(tldDigester);
  -
           tldDigester.addRuleSet(new TldRuleSet());
           return (tldDigester);
   
  @@ -527,9 +526,8 @@
           // to support servlet.jar that does not contains the schema
           if (url != null){
               webDigester.setSchema(url.toString());
  +            webDigester = registerLocalSchema(webDigester);
           }
  -
  -        webDigester = registerLocalSchema(webDigester);
   
           webDigester.addRuleSet(new WebRuleSet());
           return (webDigester);
  
  
  

--
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