XML Catalogs for XML files should now work; #40

ph-schematron-ant-task/pom.xml

@@ -67,6 +67,12 @@
       <version>${ant.version}</version>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>org.apache.ant</groupId>
+      <artifactId>ant-apache-resolver</artifactId>
+      <version>${ant.version}</version>
+      <scope>provided</scope>
+    </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-simple</artifactId>

ph-schematron-ant-task/src/main/java/com/helger/schematron/ant/Schematron.java

@@ -112,9 +112,15 @@ public class Schematron extends Task
    */
   private boolean m_bExpectSuccess = true;
 
-  /** for resolving entities such as dtds */
+  /**
+   * For resolving entities such as DTDs. This is used both for the Schematron
+   * file as well as for the XML files to be validated.
+   */
   private final XMLCatalog m_aXmlCatalog = new XMLCatalog ();
 
+  public Schematron ()
+  {}
+
   public void setSchematronFile (@Nonnull final File aFile)
   {
     m_aSchematronFile = aFile;

ph-schematron-ant-task/src/test/java/com/helger/schematron/ant/Issue40Test.java

@@ -1,27 +1,74 @@
 package com.helger.schematron.ant;
 
+import org.apache.tools.ant.BuildEvent;
+import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.BuildFileRule;
+import org.apache.tools.ant.BuildListener;
+import org.apache.tools.ant.Project;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
-
-import com.helger.commons.system.SystemProperties;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public final class Issue40Test
 {
+  private static final Logger s_aLogger = LoggerFactory.getLogger (Issue40Test.class);
+
   @Rule
-  public final BuildFileRule buildRule = new BuildFileRule ();
+  public final BuildFileRule m_aBuildRule = new BuildFileRule ();
 
   @Before
   public void init ()
   {
-    SystemProperties.setPropertyValue ("javax.xml.accessExternalDTD", "all");
-    buildRule.configureProject ("src/test/resources/issues/40/build.xml");
+    m_aBuildRule.configureProject ("src/test/resources/issues/40/build.xml");
+    m_aBuildRule.getProject ().addBuildListener (new BuildListener ()
+    {
+      public void taskStarted (final BuildEvent aEvent)
+      {}
+
+      public void taskFinished (final BuildEvent aEvent)
+      {}
+
+      public void targetStarted (final BuildEvent aEvent)
+      {}
+
+      public void targetFinished (final BuildEvent aEvent)
+      {}
+
+      public void messageLogged (final BuildEvent aEvent)
+      {
+        if (aEvent.getPriority () <= Project.MSG_ERR)
+          s_aLogger.error (aEvent.getMessage (), aEvent.getException ());
+        else
+          if (aEvent.getPriority () <= Project.MSG_WARN)
+            s_aLogger.warn (aEvent.getMessage (), aEvent.getException ());
+          else
+            if (aEvent.getPriority () <= Project.MSG_INFO)
+              s_aLogger.info (aEvent.getMessage (), aEvent.getException ());
+            else
+              s_aLogger.debug (aEvent.getMessage (), aEvent.getException ());
+      }
+
+      public void buildStarted (final BuildEvent aEvent)
+      {}
+
+      public void buildFinished (final BuildEvent aEvent)
+      {}
+    });
   }
 
   @Test
   public void testWithExternalDTD ()
   {
-    buildRule.executeTarget ("check");
+    try
+    {
+      // Do not redirect stdout etc.
+      m_aBuildRule.getProject ().executeTarget ("check");
+    }
+    catch (final BuildException ex)
+    {
+      s_aLogger.error ("Ooops", ex);
+    }
   }
 }