sboag 01/06/20 07:02:41
Modified: java/src/org/apache/xalan/transformer TrAXFilter.java
TransformerIdentityImpl.java
java/src/org/apache/xml/dtm/ref DTMManagerDefault.java
java/src/org/apache/xpath SourceTreeManager.java
Log:
Don't set dynamic validation for the source tree as per discussion with
[EMAIL PROTECTED]
about bug 2124.
Revision Changes Path
1.8 +4 -2
xml-xalan/java/src/org/apache/xalan/transformer/TrAXFilter.java
Index: TrAXFilter.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/transformer/TrAXFilter.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- TrAXFilter.java 2001/06/12 19:15:27 1.7
+++ TrAXFilter.java 2001/06/20 14:02:19 1.8
@@ -108,8 +108,10 @@
{
parent.setFeature("http://xml.org/sax/features/namespace-prefixes";,
true);
-
parent.setFeature("http://apache.org/xml/features/validation/dynamic";,
- true);
+ // Commented out as per discussion with [EMAIL PROTECTED]
+ // about bug 2124.
+//
parent.setFeature("http://apache.org/xml/features/validation/dynamic";,
+// true);
}
catch (org.xml.sax.SAXException se){}
// setParent calls setupParse...
1.15 +5 -3
xml-xalan/java/src/org/apache/xalan/transformer/TransformerIdentityImpl.java
Index: TransformerIdentityImpl.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/transformer/TransformerIdentityImpl.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- TransformerIdentityImpl.java 2001/06/18 21:42:52 1.14
+++ TransformerIdentityImpl.java 2001/06/20 14:02:22 1.15
@@ -400,9 +400,11 @@
{
reader.setFeature("http://xml.org/sax/features/namespace-prefixes";,
true);
- if(!isUserReader)
-
reader.setFeature("http://apache.org/xml/features/validation/dynamic";,
- true);
+ // Commented out as per discussion with [EMAIL PROTECTED]
+ // about bug 2124.
+// if(!isUserReader)
+//
reader.setFeature("http://apache.org/xml/features/validation/dynamic";,
+// true);
}
catch (org.xml.sax.SAXException se)
{
1.8 +20 -18
xml-xalan/java/src/org/apache/xml/dtm/ref/DTMManagerDefault.java
Index: DTMManagerDefault.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xml/dtm/ref/DTMManagerDefault.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- DTMManagerDefault.java 2001/06/18 21:42:59 1.7
+++ DTMManagerDefault.java 2001/06/20 14:02:30 1.8
@@ -187,10 +187,10 @@
addDTM(dtm, dtmPos);
- if (DUMPTREE)
- {
- dtm.dumpDTM();
- }
+// if (DUMPTREE)
+// {
+// dtm.dumpDTM();
+// }
return dtm;
}
@@ -518,20 +518,22 @@
// TODO: User diagnostics.
}
- if(!isUserReader)
- {
- try
- {
-
reader.setFeature("http://apache.org/xml/features/validation/dynamic";,
- true);
- }
- catch (org.xml.sax.SAXException se)
- {
-
- // What can we do?
- // TODO: User diagnostics.
- }
- }
+ // Commented out as per discussion with [EMAIL PROTECTED]
+ // about bug 2124.
+// if(!isUserReader)
+// {
+// try
+// {
+//
reader.setFeature("http://apache.org/xml/features/validation/dynamic";,
+// true);
+// }
+// catch (org.xml.sax.SAXException se)
+// {
+//
+// // What can we do?
+// // TODO: User diagnostics.
+// }
+// }
return reader;
}
1.28 +5 -3
xml-xalan/java/src/org/apache/xpath/SourceTreeManager.java
Index: SourceTreeManager.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/SourceTreeManager.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- SourceTreeManager.java 2001/06/18 21:43:03 1.27
+++ SourceTreeManager.java 2001/06/20 14:02:37 1.28
@@ -411,9 +411,11 @@
{
reader.setFeature("http://xml.org/sax/features/namespace-prefixes";,
true);
- if(!isUserReader)
-
reader.setFeature("http://apache.org/xml/features/validation/dynamic";,
- true);
+ // Commented out as per discussion with [EMAIL PROTECTED]
+ // about bug 2124.
+// if(!isUserReader)
+//
reader.setFeature("http://apache.org/xml/features/validation/dynamic";,
+// true);
}
catch (org.xml.sax.SAXException se)
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
