Changeset 1859 for ComponentRegistry/trunk/CMDValidate/src/main/java/clarin/cmdi/schema/cmd/Validator.java

Timestamp:

04/05/12 14:10:58 (12 years ago)

Author:

twagoo

Message:

CMDValidate:

• now version 1.1
• Validator takes an optional LSResourceSolver that it wall pass to SchemaFactory? so that schema catalog can be used
• Added test resolver + catalog config to test packages

File:

• ComponentRegistry/trunk/CMDValidate/src/main/java/clarin/cmdi/schema/cmd/Validator.java (modified) (4 diffs)

ComponentRegistry/trunk/CMDValidate/src/main/java/clarin/cmdi/schema/cmd/Validator.java

@@ -25 +25 @@
 import net.sf.saxon.s9api.XsltTransformer;
 import org.w3c.dom.Document;
+import org.w3c.dom.ls.LSResourceResolver;
 import org.xml.sax.SAXException;
 
@@ -64 +65 @@
      */
     private XdmNode validationReport = null;
+    private LSResourceResolver resourceResolver = null;
 
     /**
@@ -134 +136 @@
         if (cmdSchema == null) {
             SchemaFactory factory = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
+            if (getResourceResolver() != null) {
+                factory.setResourceResolver(getResourceResolver());
+            }
 
             // Load the CMD XSD.
@@ -374 +379 @@
 
     /**
+     * @return Resource resolver used for schemata
+     */
+    protected LSResourceResolver getResourceResolver() {
+        return resourceResolver;
+    }
+
+    /**
+     * @param resourceResolver Resource resolver to use for schemata
+     */
+    public void setResourceResolver(LSResourceResolver resourceResolver) {
+        this.resourceResolver = resourceResolver;
+    }
+
+    /**
      * Public inner class to represent validation messages.
      */