patrickl 2002/07/31 21:53:03
Modified: catalina/src/share/org/apache/catalina/startup
Constants.java ContextConfig.java
Log:
Correct resource locations to match patch to jakarta-servletapi-5 build
Revision Changes Path
1.3 +7 -7
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Constants.java 1 Aug 2002 00:21:30 -0000 1.2
+++ Constants.java 1 Aug 2002 04:53:03 -0000 1.3
@@ -95,7 +95,7 @@
public static final String TldSchemaPublicId_20 =
"web-jsptaglibrary_2_0.xsd";
public static final String TldSchemaResourcePath_20 =
- "/javax/servlet/resources/web-jsptaglibrary_2_0.xsd";
+ "/javax/servlet/jsp/resources/web-jsptaglibrary_2_0.xsd";
public static final String WebDtdPublicId_22 =
"-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN";
@@ -109,7 +109,7 @@
// "conf/web_23.dtd";
"/javax/servlet/resources/web-app_2_3.dtd";
- public static final String WebSchemaPubliId_24 =
+ public static final String WebSchemaPublicId_24 =
"web-app_2_4.xsd";
public static final String WebSchemaResourcePath_24 =
"/javax/servlet/resources/web-app_2_4.xsd";
@@ -127,6 +127,6 @@
public static final String JspSchemaPublicId_20 =
"jsp_2_0.xsd";
public static final String JspSchemaResourcePath_20 =
- "/javax/servlet/resources/jsp_2_0.xsd";
+ "/javax/servlet/jsp/resources/jsp_2_0.xsd";
}
1.4 +7 -4
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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ContextConfig.java 1 Aug 2002 00:21:30 -0000 1.3
+++ ContextConfig.java 1 Aug 2002 04:53:03 -0000 1.4
@@ -535,6 +535,9 @@
url.toString());
url = ContextConfig.class.getResource(Constants.WebSchemaResourcePath_24);
+ webDigester.register(Constants.WebSchemaPublicId_24,
+ url.toString());
+
// to support servlet.jar that does not contains the schema
if (url != null){
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
