Resolving delta between what the XML parser does under Eclipse and wh…

…at it does outside of Eclipse.
kuali · Aug 28, 2008 · 7407cc9 · 7407cc9
1 parent 3e56cbc
commit 7407cc9
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 14 deletions.
diff --git a/src/net/sourceforge/schemaspy/Main.java b/src/net/sourceforge/schemaspy/Main.java
@@ -19,7 +19,7 @@ public static void main(String[] argv) throws Exception {
         try {
             rc = analyzer.analyze(new Config(argv));
         } catch (Exception exc) {
-            System.err.println(exc);
+            System.err.println(exc.getClass().getSimpleName() + ": " + exc.getMessage());
         }
 
         System.exit(rc);

diff --git a/src/net/sourceforge/schemaspy/model/InvalidConfigurationException.java b/src/net/sourceforge/schemaspy/model/InvalidConfigurationException.java
@@ -19,6 +19,6 @@ public InvalidConfigurationException(Throwable cause) {
     }
 
     public InvalidConfigurationException(String msg, Throwable cause) {
-        super(msg, cause);
+        super(msg + " " + cause.getMessage(), cause);
     }
 }
diff --git a/src/net/sourceforge/schemaspy/model/xml/SchemaMeta.java b/src/net/sourceforge/schemaspy/model/xml/SchemaMeta.java
@@ -54,9 +54,6 @@ public SchemaMeta(String xmlMeta, String dbName, String schema) throws InvalidCo
         metaFile = meta;
 
         Document doc = parse(metaFile);
-        if (doc == null) {
-            throw new InvalidConfigurationException();
-        }
 
         NodeList commentsNodes = doc.getElementsByTagName("comments");
         if (commentsNodes != null && commentsNodes.getLength() > 0)
@@ -97,7 +94,7 @@ private void validate(Document document) throws SAXException, IOException {
 
         // load a WXS schema, represented by a Schema instance
         InputStream xsl = getClass().getResourceAsStream("/schemaspy.meta.xsd");
-        
+
         Schema schema = factory.newSchema(new StreamSource(xsl));
 
         // create a Validator instance, which can be used to validate an instance document
@@ -107,30 +104,27 @@ private void validate(Document document) throws SAXException, IOException {
         validator.validate(new DOMSource(document));
     }
 
-    private Document parse(File file) {
+    private Document parse(File file) throws InvalidConfigurationException {
         DocumentBuilder docBuilder;
         Document doc = null;
         DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+        factory.setNamespaceAware(true);
         factory.setIgnoringElementContentWhitespace(true);
         factory.setIgnoringComments(true);
 
         try {
             docBuilder = factory.newDocumentBuilder();
         } catch (ParserConfigurationException exc) {
-            System.err.println("Invalid parser configuration: " + exc.getMessage());
-            return null;
+            throw new InvalidConfigurationException("Invalid XML parser configuration", exc);
         }
 
         try {
             doc = docBuilder.parse(file);
             validate(doc);
         } catch (SAXException exc) {
-            // exception already reported to stderr by error handler
-            System.err.println(file + " failed XML validation");
-            return null;
+            throw new InvalidConfigurationException(file + " failed XML validation:", exc);
         } catch (IOException exc) {
-            System.err.println("Could not read file: " + exc.getMessage());
-            return null;
+            throw new InvalidConfigurationException("Could not read " + file + ":", exc);
         }
 
         return doc;