- adapted to changed ValidationResourceResolver

java/org/slub/rosetta/dps/repository/plugin/Validation/TestValidateSchema.java

@@ -67,10 +67,9 @@ public class TestValidateSchema {
 
     @org.junit.Test
     public void schema_valid() {
-
-        ValidationResourceResolver validationResourceResolver = new ValidationResourceResolver(mock.getNamespaceSchemaMap(), true);
-        ValidationResultHandle logger = new ValidationResultHandle();
-        var v = new ValidateSchema(validationResourceResolver, logger);
+        ValidationResultHandle resultHandle = new ValidationResultHandle();
+        ValidationResourceResolver validationResourceResolver = new ValidationResourceResolver(mock.getNamespaceSchemaMap(), resultHandle);
+        var v = new ValidateSchema(validationResourceResolver, resultHandle);
         assertNotNull( "validator schema sucessfully instantiated", v);
         var has_exception = false;
         var res = false;
@@ -81,15 +80,16 @@ public class TestValidateSchema {
             e.printStackTrace();
             has_exception = true;
         }
+        System.out.println( resultHandle.getLog());
         assertFalse("schema validation should not raise an exception", has_exception );
         assertTrue("schema validation should return true for sucessful validation",  res);
     }
 
     @org.junit.Test
     public void schema_invalid() {
-        ValidationResourceResolver validationResourceResolver = new ValidationResourceResolver(mock.getNamespaceSchemaMap(), true);
-        ValidationResultHandle logger = new ValidationResultHandle();
-        var v = new ValidateSchema(validationResourceResolver, logger);
+        ValidationResultHandle resultHandle = new ValidationResultHandle();
+        ValidationResourceResolver validationResourceResolver = new ValidationResourceResolver(mock.getNamespaceSchemaMap(), resultHandle);
+        var v = new ValidateSchema(validationResourceResolver, resultHandle);
         assertNotNull( "validator schema sucessfully instantiated", v);
         var has_exception = false;
         var res = false;
@@ -115,9 +115,9 @@ public class TestValidateSchema {
                 nssm.add(val);
             }
         }
-        ValidationResultHandle logger = new ValidationResultHandle();
-        ValidationResourceResolver validationResourceResolver = new ValidationResourceResolver(nssm,  true);
-        var v = new ValidateSchema(validationResourceResolver, logger);
+        ValidationResultHandle resultHandle = new ValidationResultHandle();
+        ValidationResourceResolver validationResourceResolver = new ValidationResourceResolver(nssm,  resultHandle);
+        var v = new ValidateSchema(validationResourceResolver, resultHandle);
         assertNotNull( "validator schema sucessfully instantiated", v);
         var has_exception = false;
         var res = false;

java/org/slub/rosetta/dps/repository/plugin/XmlFormatValidationPlugin.java

@@ -157,7 +157,7 @@ public class XmlFormatValidationPlugin implements FormatValidationPlugin {
         };
         validationCatalogResolver = new ValidationCatalogResolver(catalogs,validationLogger);
         loadNamespaceSchemaMap( initp.get("schemacatalog").trim() );
-        validationResourceResolver = new ValidationResourceResolver(namespaceSchemaMap, debug);
+        validationResourceResolver = new ValidationResourceResolver(namespaceSchemaMap, validationLogger);
     }
 
     private XmlInfoRecord getXMLinfo(Document doc) {
@@ -318,6 +318,7 @@ public class XmlFormatValidationPlugin implements FormatValidationPlugin {
         dbf.setFeature("http://xml.org/sax/features/validation", false);
         dbf.setValidating(false);
         dbf.setSchema(null);
+
         //dbf.setXIncludeAware(true);
         dbf.setNamespaceAware(true);
         DocumentBuilder db = dbf.newDocumentBuilder();