remm 2003/08/20 01:35:43
Modified: catalina/src/share/org/apache/catalina/startup
ContextConfig.java TldConfig.java
Log:
- Disable schema validation for now.
- Validation attempts of 2.4 style web.xml or TLD files will fail.
Revision Changes Path
1.30 +4 -2
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.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- ContextConfig.java 18 Aug 2003 17:44:20 -0000 1.29
+++ ContextConfig.java 20 Aug 2003 08:35:43 -0000 1.30
@@ -492,7 +492,9 @@
url = ContextConfig.class.getResource(Constants.WebSchemaResourcePath_24);
SchemaResolver webEntityResolver = new SchemaResolver(url.toString(),
webDigester);
- if (validation) {
+
+ // FIXME: if (validation) {
+ if (false) {
webDigester.setSchema(url.toString());
}
1.16 +3 -1
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.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- TldConfig.java 12 Aug 2003 16:15:52 -0000 1.15
+++ TldConfig.java 20 Aug 2003 08:35:43 -0000 1.16
@@ -381,7 +381,9 @@
url = TldConfig.class.getResource(Constants.TldSchemaResourcePath_20);
SchemaResolver tldEntityResolver = new SchemaResolver(url.toString(),
tldDigester);
- if( xmlValidation ) {
+
+ // FIXME: if (xmlValidation) {
+ if (false) {
tldDigester.setSchema(url.toString());
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
