|
 |
6f4f13 |
From 4b691adecd92c09689b0d23b7b17cc50f4b5bee9 Mon Sep 17 00:00:00 2001
|
|
|
6f4f13 |
From: Michal Srb <msrb@redhat.com>
|
|
|
6f4f13 |
Date: Thu, 11 Apr 2013 16:26:09 +0200
|
|
|
6f4f13 |
Subject: [PATCH] Use CatalogResolver class from xml-commons-resolver
|
|
|
6f4f13 |
|
|
|
6f4f13 |
---
|
|
|
6f4f13 |
msv/examples/schemaLookup/Main.java | 2 +-
|
|
|
6f4f13 |
msv/src/com/sun/msv/driver/textui/Driver.java | 2 +-
|
|
|
6f4f13 |
msv/test/batch/BatchTester.java | 2 +-
|
|
|
6f4f13 |
msv/test/batch/driver/AbstractValidatorExImpl.java | 2 +-
|
|
|
6f4f13 |
4 files changed, 4 insertions(+), 4 deletions(-)
|
|
|
6f4f13 |
|
|
|
6f4f13 |
diff --git a/msv/examples/schemaLookup/Main.java b/msv/examples/schemaLookup/Main.java
|
|
|
6f4f13 |
index 426051d..5bcbaa3 100644
|
|
|
6f4f13 |
--- a/msv/examples/schemaLookup/Main.java
|
|
|
6f4f13 |
+++ b/msv/examples/schemaLookup/Main.java
|
|
|
6f4f13 |
@@ -36,7 +36,7 @@ import java.io.IOException;
|
|
|
6f4f13 |
|
|
|
6f4f13 |
import javax.xml.parsers.DocumentBuilderFactory;
|
|
|
6f4f13 |
|
|
|
6f4f13 |
-import com.sun.org.apache.xml.internal.resolver.tools.CatalogResolver;
|
|
|
6f4f13 |
+import org.apache.xml.resolver.tools.CatalogResolver;
|
|
|
6f4f13 |
import org.iso_relax.verifier.Schema;
|
|
|
6f4f13 |
import org.iso_relax.verifier.Verifier;
|
|
|
6f4f13 |
import org.w3c.dom.Document;
|
|
|
6f4f13 |
diff --git a/msv/src/com/sun/msv/driver/textui/Driver.java b/msv/src/com/sun/msv/driver/textui/Driver.java
|
|
|
6f4f13 |
index f659b5f..63a5794 100644
|
|
|
6f4f13 |
--- a/msv/src/com/sun/msv/driver/textui/Driver.java
|
|
|
6f4f13 |
+++ b/msv/src/com/sun/msv/driver/textui/Driver.java
|
|
|
6f4f13 |
@@ -39,7 +39,7 @@ import java.util.Locale;
|
|
|
6f4f13 |
|
|
|
6f4f13 |
import javax.xml.parsers.SAXParserFactory;
|
|
|
6f4f13 |
|
|
|
6f4f13 |
-import com.sun.org.apache.xml.internal.resolver.tools.CatalogResolver;
|
|
|
6f4f13 |
+import org.apache.xml.resolver.tools.CatalogResolver;
|
|
|
6f4f13 |
import org.iso_relax.dispatcher.Dispatcher;
|
|
|
6f4f13 |
import org.iso_relax.dispatcher.SchemaProvider;
|
|
|
6f4f13 |
import org.iso_relax.dispatcher.impl.DispatcherImpl;
|
|
|
6f4f13 |
diff --git a/msv/test/batch/BatchTester.java b/msv/test/batch/BatchTester.java
|
|
|
6f4f13 |
index 7fd8b88..b7bba01 100644
|
|
|
6f4f13 |
--- a/msv/test/batch/BatchTester.java
|
|
|
6f4f13 |
+++ b/msv/test/batch/BatchTester.java
|
|
|
6f4f13 |
@@ -40,7 +40,7 @@ import javax.xml.parsers.SAXParserFactory;
|
|
|
6f4f13 |
import junit.framework.Test;
|
|
|
6f4f13 |
import junit.framework.TestSuite;
|
|
|
6f4f13 |
|
|
|
6f4f13 |
-import com.sun.org.apache.xml.internal.resolver.tools.CatalogResolver;
|
|
|
6f4f13 |
+import org.apache.xml.resolver.tools.CatalogResolver;
|
|
|
6f4f13 |
|
|
|
6f4f13 |
import batch.driver.DTDValidator;
|
|
|
6f4f13 |
import batch.driver.GenericValidator;
|
|
|
6f4f13 |
diff --git a/msv/test/batch/driver/AbstractValidatorExImpl.java b/msv/test/batch/driver/AbstractValidatorExImpl.java
|
|
|
6f4f13 |
index dd85d93..33121f0 100644
|
|
|
6f4f13 |
--- a/msv/test/batch/driver/AbstractValidatorExImpl.java
|
|
|
6f4f13 |
+++ b/msv/test/batch/driver/AbstractValidatorExImpl.java
|
|
|
6f4f13 |
@@ -36,7 +36,7 @@ import java.io.InputStream;
|
|
|
6f4f13 |
|
|
|
6f4f13 |
import javax.xml.parsers.SAXParserFactory;
|
|
|
6f4f13 |
|
|
|
6f4f13 |
-import com.sun.org.apache.xml.internal.resolver.tools.CatalogResolver;
|
|
|
6f4f13 |
+import org.apache.xml.resolver.tools.CatalogResolver;
|
|
|
6f4f13 |
import org.xml.sax.InputSource;
|
|
|
6f4f13 |
import org.xml.sax.XMLReader;
|
|
|
6f4f13 |
|
|
|
6f4f13 |
--
|
|
|
6f4f13 |
1.8.1.4
|
|
|
6f4f13 |
|