Author: michiel
Date: 2009-08-14 21:20:45 +0200 (Fri, 14 Aug 2009)
New Revision: 37827
Modified:
mmbase/trunk/core/src/main/java/org/mmbase/util/xml/DocumentReader.java
Log:
Added constructor for 'xsd' parsing
Modified:
mmbase/trunk/core/src/main/java/org/mmbase/util/xml/DocumentReader.java
===================================================================
--- mmbase/trunk/core/src/main/java/org/mmbase/util/xml/DocumentReader.java
2009-08-14 19:18:34 UTC (rev 37826)
+++ mmbase/trunk/core/src/main/java/org/mmbase/util/xml/DocumentReader.java
2009-08-14 19:20:45 UTC (rev 37827)
@@ -130,16 +130,20 @@
* @param source the input source from which to read the document
* @param validating whether to validate the document
* @param resolveBase the base class whose package is used to resolve
dtds, set to null if unknown
+ * @since MMBase-1.9.2
*/
- public DocumentReader(InputSource source, boolean validating, Class<?>
resolveBase) {
+ public DocumentReader(InputSource source, boolean xsd, boolean validating,
Class<?> resolveBase) {
if (source == null) {
throw new IllegalArgumentException("InputSource cannot be null");
}
try {
systemId = source.getSystemId();
org.xml.sax.EntityResolver resolver = null;
- if (resolveBase != null) resolver = new EntityResolver(validating,
resolveBase);
- DocumentBuilder dbuilder = getDocumentBuilder(validating, null/*
no error handler */, resolver);
+ if (resolveBase != null) {
+ resolver = new EntityResolver(validating, resolveBase);
+ }
+
+ DocumentBuilder dbuilder = getDocumentBuilder(validating, xsd,
null/* no error handler */, resolver);
if(dbuilder == null) throw new RuntimeException("failure
retrieving document builder");
if (log != null && log.isDebugEnabled()) {
log.debug("Reading " + source.getSystemId());
@@ -151,6 +155,9 @@
throw new RuntimeException("failure reading document: " +
source.getSystemId() + "\n" + ioe, ioe);
}
}
+ public DocumentReader(InputSource source, boolean validating, Class<?>
resolveBase) {
+ this(source, false, validating, resolveBase);
+ }
/**
* @since MMBase-1.8
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
