jfarcand 2003/09/23 11:43:12
Modified: catalina/src/share/org/apache/catalina/startup
ContextConfig.java TldConfig.java
Log:
Partial fix for xml validation. At least DTD works now and the stack trace for
schema is no longer 1 km long.
Revision Changes Path
1.34 +4 -1
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.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- ContextConfig.java 9 Sep 2003 15:27:00 -0000 1.33
+++ ContextConfig.java 23 Sep 2003 18:43:12 -0000 1.34
@@ -459,6 +459,8 @@
try{
digester.setFeature(
"http://apache.org/xml/features/allow-java-encodings";, true);
+ digester.setFeature(
+ "http://apache.org/xml/features/validation/schema";, true);
} catch(ParserConfigurationException e){
// log("contextConfig.registerLocalSchema", e);
} catch(SAXNotRecognizedException e){
@@ -490,6 +492,7 @@
boolean validation) {
URL url = null;
Digester webDigester = new Digester();
+ webDigester.setUseContextClassLoader(false);
webDigester.setNamespaceAware(namespaceAware);
webDigester.setValidating(validation);
1.24 +2 -0
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.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- TldConfig.java 22 Sep 2003 23:56:11 -0000 1.23
+++ TldConfig.java 23 Sep 2003 18:43:12 -0000 1.24
@@ -416,6 +416,8 @@
try{
digester.setFeature(
"http://apache.org/xml/features/allow-java-encodings";, true);
+ digester.setFeature(
+ "http://apache.org/xml/features/validation/schema";, true);
} catch(ParserConfigurationException e){
// log("contextConfig.registerLocalSchema", e);
} catch(SAXNotRecognizedException e){
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
