Changeset 1859

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

Location:

ComponentRegistry/trunk/CMDValidate

Files:

• pom.xml (modified) (3 diffs)
• src/main/java/clarin/cmdi/schema/cmd/Validator.java (modified) (4 diffs)
• src/test/java/clarin/cmdi/schema/cmd/ResourceResolver.java (added)
• src/test/java/clarin/cmdi/schema/cmd/TestCMDValidate.java (modified) (2 diffs)
• src/test/resources/CatalogManager.properties (copied) (copied from ComponentRegistry/trunk/ComponentRegistry/src/main/resources/CatalogManager.properties)
• src/test/resources/catalog.cat (copied) (copied from ComponentRegistry/trunk/ComponentRegistry/src/main/resources/catalog.cat)
• src/test/resources/xml.xsd (copied) (copied from ComponentRegistry/trunk/ComponentRegistry/src/main/resources/xml.xsd)

ComponentRegistry/trunk/CMDValidate/pom.xml

@@ -10 +10 @@
     <groupId>clarin.cmdi</groupId>
     <artifactId>cmd-validate</artifactId>
-    <version>1.0</version>
+    <version>1.1</version>
     <name>CMDValidate</name>
     <build>
@@ -45 +45 @@
             <artifactId>junit</artifactId>
             <version>4.10</version>
-            <scope>test</scope>
         </dependency>
         <dependency>
@@ -51 +50 @@
             <artifactId>Saxon-HE</artifactId>
             <version>9.4</version>
+        </dependency>
+        <dependency>
+            <groupId>xml-resolver</groupId>
+            <artifactId>xml-resolver</artifactId>
+            <version>1.2</version>
+            <scope>test</scope>
         </dependency>
     </dependencies>

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.
      */

ComponentRegistry/trunk/CMDValidate/src/test/java/clarin/cmdi/schema/cmd/TestCMDValidate.java

@@ -9 +9 @@
 import javax.xml.transform.Source;
 import org.junit.*;
+
 import static org.junit.Assert.*;
 
@@ -22 +23 @@
     public void setUp() {
         cmdValidator = new Validator(getClass().getResource("/schema/general-component-schema.xsd"));
+        cmdValidator.setResourceResolver(new ResourceResolver());
     }