You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by er...@locus.apache.org on 2000/11/01 03:57:56 UTC
cvs commit: xml-xerces/java/src/org/apache/xerces/validators/common XMLValidator.java
ericye 00/10/31 18:57:55
Modified: java/src/org/apache/xerces/validators/common
XMLValidator.java
Log:
use user defined EntityResolver for TraverseSchema, by Jerry Lawson, jerry.lawson@virtualsummit.com
Revision Changes Path
1.91 +6 -2 xml-xerces/java/src/org/apache/xerces/validators/common/XMLValidator.java
Index: XMLValidator.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/validators/common/XMLValidator.java,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- XMLValidator.java 2000/10/31 17:40:36 1.90
+++ XMLValidator.java 2000/11/01 02:57:54 1.91
@@ -111,7 +111,7 @@
/**
* This class is the super all-in-one validator used by the parser.
*
- * @version $Id: XMLValidator.java,v 1.90 2000/10/31 17:40:36 jeffreyr Exp $
+ * @version $Id: XMLValidator.java,v 1.91 2000/11/01 02:57:54 ericye Exp $
*/
public final class XMLValidator
implements DefaultEntityHandler.EventHandler,
@@ -2246,7 +2246,11 @@
}
grammar = new SchemaGrammar();
grammar.setGrammarDocument(document);
- tst = new TraverseSchema( root, fStringPool, (SchemaGrammar)grammar, fGrammarResolver, fErrorReporter, source.getSystemId());
+
+ // pass parser's entity resolver (local Resolver), which also has reference to user's
+ // entity resolver, and also can fall-back to entityhandler's expandSystemId()
+
+ tst = new TraverseSchema( root, fStringPool, (SchemaGrammar)grammar, fGrammarResolver, fErrorReporter, source.getSystemId(), currentER);
fGrammarResolver.putGrammar(document.getDocumentElement().getAttribute("targetNamespace"), grammar);
}
} catch (Exception e) {