Eliminate use of DocumentBuilder (use DOM LS everywhere) + use validation to catch undefined entities.

There seems to be no way to catch the undefined entity error (when it
is considered a validation error, e.g., when the document has an
external subset) other than by turning on validation.  So we register
an error handler to throw away useless validation errors.

1 files changed, 9 insertions, 8 deletions

diff --git a/org/madore/damlengine/WeblogPopulate.java b/org/madore/damlengine/WeblogPopulate.java
index 56e51ac..16c7ea0 100644
--- a/org/madore/damlengine/WeblogPopulate.java
+++ b/org/madore/damlengine/WeblogPopulate.java
@@ -6,12 +6,12 @@ import java.security.MessageDigest;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
-import javax.xml.parsers.DocumentBuilder;
 import javax.xml.xpath.*;
 import org.w3c.dom.*;
 import org.w3c.dom.ls.DOMImplementationLS;
+import org.w3c.dom.ls.LSParser;
 import org.w3c.dom.ls.LSSerializer;
-// import org.xml.sax.EntityResolver;
+import org.w3c.dom.ls.LSInput;
 
 public final class WeblogPopulate {
 
@@ -29,12 +29,11 @@ public final class WeblogPopulate {
     public static void populate(InputStream in)
 	throws Exception {
 
-	final DocumentBuilder db = DamlEngine.GetDocumentBuilder.db;
-
-	final DOMImplementationLS domi
-	    = (DOMImplementationLS)(db.getDOMImplementation());
-	LSSerializer ser = domi.createLSSerializer();
+	final DOMImplementationLS domils
+	    = (DOMImplementationLS)(DamlEngine.IncantDOM.getDOMI());
+	LSSerializer ser = domils.createLSSerializer();
 	ser.getDomConfig().setParameter("xml-declaration", false);
+	LSParser par = domils.createLSParser(DOMImplementationLS.MODE_SYNCHRONOUS, null);
 
 	MessageDigest sha1 = MessageDigest.getInstance("SHA-1");
 
@@ -53,7 +52,9 @@ public final class WeblogPopulate {
 	final PreparedStatement setCatSt
 	    = conn.prepareStatement("INSERT INTO incat(id,code) VALUES (?,?)");
 
-	Document doc = db.parse(in);
+	LSInput input = domils.createLSInput();
+	input.setByteStream(in);
+	Document doc = par.parse(input);
 	XPathFactory xpf = XPathFactory.newInstance();
 	XPath xp = xpf.newXPath();
 	xp.setNamespaceContext(new DamlEngine.DamlNSMapping());