curcuru 2003/01/10 16:46:05
Modified: java/src/org/apache/xml/resolver Catalog.java
CatalogManager.java Resolver.java
java/src/org/apache/xml/resolver/apps XParseError.java
resolver.java xparse.java xread.java
java/src/org/apache/xml/resolver/readers
DOMCatalogReader.java ExtendedXMLCatalogReader.java
OASISXMLCatalogReader.java SAXCatalogReader.java
TR9401CatalogReader.java TextCatalogReader.java
XCatalogReader.java
java/src/org/apache/xml/resolver/tools CatalogResolver.java
ResolvingParser.java ResolvingXMLFilter.java
ResolvingXMLReader.java
Log:
Cleanup imports Submitted by: vladimir@bossicard.com PR: 15647
Revision Changes Path
1.4 +0 -2 xml-commons/java/src/org/apache/xml/resolver/Catalog.java
Index: Catalog.java
===================================================================
RCS file: /home/cvs/xml-commons/java/src/org/apache/xml/resolver/Catalog.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Catalog.java 13 Nov 2002 20:49:31 -0000 1.3
+++ Catalog.java 11 Jan 2003 00:46:04 -0000 1.4
@@ -59,12 +59,10 @@
package org.apache.xml.resolver;
-import java.lang.Integer;
import java.io.IOException;
import java.io.FileNotFoundException;
import java.io.InputStream;
import java.io.UnsupportedEncodingException;
-import java.io.File;
import java.io.DataInputStream;
import java.util.Enumeration;
import java.util.Hashtable;
1.3 +0 -5 xml-commons/java/src/org/apache/xml/resolver/CatalogManager.java
Index: CatalogManager.java
===================================================================
RCS file: /home/cvs/xml-commons/java/src/org/apache/xml/resolver/CatalogManager.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CatalogManager.java 13 Nov 2002 20:46:19 -0000 1.2
+++ CatalogManager.java 11 Jan 2003 00:46:04 -0000 1.3
@@ -59,11 +59,6 @@
package org.apache.xml.resolver;
-import java.lang.ClassNotFoundException;
-import java.lang.IllegalAccessException;
-import java.lang.InstantiationException;
-import java.lang.SecurityException;
-import java.lang.ClassCastException;
import java.net.URL;
import java.net.MalformedURLException;
1.3 +0 -15 xml-commons/java/src/org/apache/xml/resolver/Resolver.java
Index: Resolver.java
===================================================================
RCS file: /home/cvs/xml-commons/java/src/org/apache/xml/resolver/Resolver.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Resolver.java 13 Nov 2002 20:47:19 -0000 1.2
+++ Resolver.java 11 Jan 2003 00:46:04 -0000 1.3
@@ -59,32 +59,17 @@
package org.apache.xml.resolver;
-import java.lang.Integer;
import java.io.IOException;
-import java.io.File;
import java.io.InputStream;
-import java.io.DataInputStream;
-import java.io.PrintWriter;
-import java.io.FileWriter;
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
import java.io.FileNotFoundException;
import java.util.Enumeration;
-import java.util.Hashtable;
import java.util.Vector;
import java.net.URL;
import java.net.URLConnection;
-import java.net.HttpURLConnection;
import java.net.MalformedURLException;
-import org.apache.xml.resolver.readers.CatalogReader;
import org.apache.xml.resolver.readers.SAXCatalogReader;
import org.apache.xml.resolver.readers.OASISXMLCatalogReader;
-import org.apache.xml.resolver.readers.ExtendedXMLCatalogReader;
import org.apache.xml.resolver.readers.TR9401CatalogReader;
-import org.apache.xml.resolver.readers.TextCatalogReader;
-import org.apache.xml.resolver.helpers.Debug;
-import org.xml.sax.SAXException;
-import org.xml.sax.EntityResolver;
import javax.xml.parsers.SAXParserFactory;
/**
1.2 +0 -1 xml-commons/java/src/org/apache/xml/resolver/apps/XParseError.java
Index: XParseError.java
===================================================================
RCS file: /home/cvs/xml-commons/java/src/org/apache/xml/resolver/apps/XParseError.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XParseError.java 30 Jan 2002 12:24:59 -0000 1.1
+++ XParseError.java 11 Jan 2003 00:46:04 -0000 1.2
@@ -59,7 +59,6 @@
package org.apache.xml.resolver.apps;
-import java.io.IOException;
import java.net.URL;
import java.net.MalformedURLException;
1.3 +0 -3 xml-commons/java/src/org/apache/xml/resolver/apps/resolver.java
Index: resolver.java
===================================================================
RCS file: /home/cvs/xml-commons/java/src/org/apache/xml/resolver/apps/resolver.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- resolver.java 13 Nov 2002 20:55:47 -0000 1.2
+++ resolver.java 11 Jan 2003 00:46:04 -0000 1.3
@@ -64,15 +64,12 @@
import java.net.URL;
import java.net.MalformedURLException;
import java.util.Vector;
-import java.util.Date;
-import java.util.GregorianCalendar;
import org.xml.sax.*;
import org.xml.sax.helpers.*;
import javax.xml.parsers.*;
import javax.xml.transform.*;
-import javax.xml.transform.sax.SAXSource;
import org.apache.xml.resolver.Catalog;
import org.apache.xml.resolver.CatalogManager;
1.3 +0 -1 xml-commons/java/src/org/apache/xml/resolver/apps/xparse.java
Index: xparse.java
===================================================================
RCS file: /home/cvs/xml-commons/java/src/org/apache/xml/resolver/apps/xparse.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xparse.java 13 Nov 2002 20:55:47 -0000 1.2
+++ xparse.java 11 Jan 2003 00:46:04 -0000 1.3
@@ -63,7 +63,6 @@
import java.io.IOException;
import java.util.Vector;
import java.util.Date;
-import java.util.GregorianCalendar;
import org.xml.sax.*;
import org.xml.sax.helpers.*;
1.3 +0 -1 xml-commons/java/src/org/apache/xml/resolver/apps/xread.java
Index: xread.java
===================================================================
RCS file: /home/cvs/xml-commons/java/src/org/apache/xml/resolver/apps/xread.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xread.java 13 Nov 2002 20:55:47 -0000 1.2
+++ xread.java 11 Jan 2003 00:46:04 -0000 1.3
@@ -63,7 +63,6 @@
import java.io.IOException;
import java.util.Vector;
import java.util.Date;
-import java.util.GregorianCalendar;
import org.xml.sax.*;
import org.xml.sax.helpers.*;
1.3 +0 -6 xml-commons/java/src/org/apache/xml/resolver/readers/DOMCatalogReader.java
Index: DOMCatalogReader.java
===================================================================
RCS file: /home/cvs/xml-commons/java/src/org/apache/xml/resolver/readers/DOMCatalogReader.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DOMCatalogReader.java 13 Nov 2002 20:50:49 -0000 1.2
+++ DOMCatalogReader.java 11 Jan 2003 00:46:04 -0000 1.3
@@ -59,10 +59,7 @@
package org.apache.xml.resolver.readers;
-import java.lang.Integer;
-import java.util.Vector;
import java.util.Hashtable;
-import java.util.Enumeration;
import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
@@ -74,11 +71,8 @@
import javax.xml.parsers.ParserConfigurationException;
import org.apache.xml.resolver.Catalog;
-import org.apache.xml.resolver.CatalogEntry;
import org.apache.xml.resolver.CatalogException;
import org.apache.xml.resolver.readers.CatalogReader;
-import org.apache.xml.resolver.helpers.Debug;
-import org.apache.xml.resolver.helpers.PublicId;
import org.apache.xml.resolver.helpers.Namespaces;
import org.xml.sax.SAXException;
1.3 +0 -11 xml-commons/java/src/org/apache/xml/resolver/readers/ExtendedXMLCatalogReader.java
Index: ExtendedXMLCatalogReader.java
===================================================================
RCS file: /home/cvs/xml-commons/java/src/org/apache/xml/resolver/readers/ExtendedXMLCatalogReader.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ExtendedXMLCatalogReader.java 13 Nov 2002 20:50:49 -0000 1.2
+++ ExtendedXMLCatalogReader.java 11 Jan 2003 00:46:04 -0000 1.3
@@ -59,22 +59,11 @@
package org.apache.xml.resolver.readers;
-import java.lang.Integer;
-import java.util.Stack;
import java.util.Vector;
-import java.util.Enumeration;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.net.URLConnection;
-import java.net.MalformedURLException;
import org.apache.xml.resolver.Catalog;
import org.apache.xml.resolver.Resolver;
import org.apache.xml.resolver.CatalogEntry;
import org.apache.xml.resolver.CatalogException;
-import org.apache.xml.resolver.readers.CatalogReader;
-import org.apache.xml.resolver.helpers.PublicId;
-import org.apache.xml.resolver.helpers.Debug;
import org.xml.sax.*;
import org.w3c.dom.*;
1.3 +0 -8 xml-commons/java/src/org/apache/xml/resolver/readers/OASISXMLCatalogReader.java
Index: OASISXMLCatalogReader.java
===================================================================
RCS file: /home/cvs/xml-commons/java/src/org/apache/xml/resolver/readers/OASISXMLCatalogReader.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- OASISXMLCatalogReader.java 13 Nov 2002 20:50:49 -0000 1.2
+++ OASISXMLCatalogReader.java 11 Jan 2003 00:46:05 -0000 1.3
@@ -59,21 +59,13 @@
package org.apache.xml.resolver.readers;
-import java.lang.Integer;
import java.util.Stack;
import java.util.Vector;
import java.util.Enumeration;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.net.URLConnection;
-import java.net.MalformedURLException;
import org.apache.xml.resolver.Catalog;
import org.apache.xml.resolver.CatalogEntry;
import org.apache.xml.resolver.CatalogException;
-import org.apache.xml.resolver.readers.CatalogReader;
import org.apache.xml.resolver.helpers.PublicId;
-import org.apache.xml.resolver.helpers.Debug;
import org.xml.sax.*;
import org.w3c.dom.*;
1.3 +0 -6 xml-commons/java/src/org/apache/xml/resolver/readers/SAXCatalogReader.java
Index: SAXCatalogReader.java
===================================================================
RCS file: /home/cvs/xml-commons/java/src/org/apache/xml/resolver/readers/SAXCatalogReader.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SAXCatalogReader.java 13 Nov 2002 20:50:49 -0000 1.2
+++ SAXCatalogReader.java 11 Jan 2003 00:46:05 -0000 1.3
@@ -59,10 +59,7 @@
package org.apache.xml.resolver.readers;
-import java.lang.Integer;
-import java.util.Vector;
import java.util.Hashtable;
-import java.util.Enumeration;
import java.io.IOException;
import java.io.FileNotFoundException;
import java.io.InputStream;
@@ -72,12 +69,9 @@
import java.net.UnknownHostException;
import org.apache.xml.resolver.Catalog;
import org.apache.xml.resolver.CatalogManager;
-import org.apache.xml.resolver.CatalogEntry;
import org.apache.xml.resolver.CatalogException;
import org.apache.xml.resolver.readers.CatalogReader;
import org.apache.xml.resolver.helpers.Debug;
-import org.apache.xml.resolver.helpers.PublicId;
-import org.apache.xml.resolver.helpers.Namespaces;
import org.xml.sax.*;
1.3 +0 -9 xml-commons/java/src/org/apache/xml/resolver/readers/TR9401CatalogReader.java
Index: TR9401CatalogReader.java
===================================================================
RCS file: /home/cvs/xml-commons/java/src/org/apache/xml/resolver/readers/TR9401CatalogReader.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TR9401CatalogReader.java 13 Nov 2002 20:50:49 -0000 1.2
+++ TR9401CatalogReader.java 11 Jan 2003 00:46:05 -0000 1.3
@@ -59,22 +59,13 @@
package org.apache.xml.resolver.readers;
-import java.lang.Integer;
-import java.io.DataInputStream;
import java.io.InputStream;
import java.io.IOException;
-import java.io.FileNotFoundException;
-import java.net.URL;
-import java.net.URLConnection;
import java.net.MalformedURLException;
import java.util.Vector;
-import java.util.Stack;
import org.apache.xml.resolver.Catalog;
import org.apache.xml.resolver.CatalogEntry;
import org.apache.xml.resolver.CatalogException;
-import org.apache.xml.resolver.readers.CatalogReader;
-import org.apache.xml.resolver.helpers.Debug;
-import org.apache.xml.resolver.helpers.PublicId;
/**
* <p>Parses OASIS Open Catalog files.</p>
1.3 +0 -4 xml-commons/java/src/org/apache/xml/resolver/readers/TextCatalogReader.java
Index: TextCatalogReader.java
===================================================================
RCS file: /home/cvs/xml-commons/java/src/org/apache/xml/resolver/readers/TextCatalogReader.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TextCatalogReader.java 13 Nov 2002 20:50:49 -0000 1.2
+++ TextCatalogReader.java 11 Jan 2003 00:46:05 -0000 1.3
@@ -59,8 +59,6 @@
package org.apache.xml.resolver.readers;
-import java.lang.Integer;
-import java.io.DataInputStream;
import java.io.InputStream;
import java.io.IOException;
import java.io.FileNotFoundException;
@@ -73,8 +71,6 @@
import org.apache.xml.resolver.CatalogEntry;
import org.apache.xml.resolver.CatalogException;
import org.apache.xml.resolver.readers.CatalogReader;
-import org.apache.xml.resolver.helpers.Debug;
-import org.apache.xml.resolver.helpers.PublicId;
/**
* <p>Parses plain text Catalog files.</p>
1.3 +0 -9 xml-commons/java/src/org/apache/xml/resolver/readers/XCatalogReader.java
Index: XCatalogReader.java
===================================================================
RCS file: /home/cvs/xml-commons/java/src/org/apache/xml/resolver/readers/XCatalogReader.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XCatalogReader.java 13 Nov 2002 20:50:49 -0000 1.2
+++ XCatalogReader.java 11 Jan 2003 00:46:05 -0000 1.3
@@ -59,20 +59,11 @@
package org.apache.xml.resolver.readers;
-import java.lang.Integer;
import java.util.Vector;
-import java.util.Enumeration;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.net.URLConnection;
-import java.net.MalformedURLException;
import org.apache.xml.resolver.Catalog;
import org.apache.xml.resolver.CatalogEntry;
import org.apache.xml.resolver.CatalogException;
-import org.apache.xml.resolver.readers.CatalogReader;
import org.apache.xml.resolver.helpers.PublicId;
-import org.apache.xml.resolver.helpers.Debug;
import org.xml.sax.*;
1.3 +0 -3 xml-commons/java/src/org/apache/xml/resolver/tools/CatalogResolver.java
Index: CatalogResolver.java
===================================================================
RCS file: /home/cvs/xml-commons/java/src/org/apache/xml/resolver/tools/CatalogResolver.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CatalogResolver.java 13 Nov 2002 20:54:30 -0000 1.2
+++ CatalogResolver.java 11 Jan 2003 00:46:05 -0000 1.3
@@ -59,8 +59,6 @@
package org.apache.xml.resolver.tools;
-import java.lang.ClassNotFoundException;
-import java.lang.ClassCastException;
import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
@@ -75,7 +73,6 @@
import org.apache.xml.resolver.Catalog;
import org.apache.xml.resolver.CatalogManager;
-import org.apache.xml.resolver.helpers.Debug;
/**
* <p>A SAX EntityResolver/JAXP URIResolver that uses catalogs.</p>
1.3 +0 -1 xml-commons/java/src/org/apache/xml/resolver/tools/ResolvingParser.java
Index: ResolvingParser.java
===================================================================
RCS file: /home/cvs/xml-commons/java/src/org/apache/xml/resolver/tools/ResolvingParser.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ResolvingParser.java 13 Nov 2002 20:54:30 -0000 1.2
+++ ResolvingParser.java 11 Jan 2003 00:46:05 -0000 1.3
@@ -71,7 +71,6 @@
import org.apache.xml.resolver.Catalog;
import org.apache.xml.resolver.CatalogManager;
-import org.apache.xml.resolver.helpers.Debug;
/**
* <p>A SAX Parser that performs catalog-based entity resolution.</p>
1.3 +0 -1 xml-commons/java/src/org/apache/xml/resolver/tools/ResolvingXMLFilter.java
Index: ResolvingXMLFilter.java
===================================================================
RCS file: /home/cvs/xml-commons/java/src/org/apache/xml/resolver/tools/ResolvingXMLFilter.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ResolvingXMLFilter.java 13 Nov 2002 20:53:12 -0000 1.2
+++ ResolvingXMLFilter.java 11 Jan 2003 00:46:05 -0000 1.3
@@ -71,7 +71,6 @@
import org.apache.xml.resolver.Catalog;
import org.apache.xml.resolver.CatalogManager;
-import org.apache.xml.resolver.helpers.Debug;
/**
* <p>A SAX XMLFilter that performs catalog-based entity resolution.</p>
1.3 +0 -4 xml-commons/java/src/org/apache/xml/resolver/tools/ResolvingXMLReader.java
Index: ResolvingXMLReader.java
===================================================================
RCS file: /home/cvs/xml-commons/java/src/org/apache/xml/resolver/tools/ResolvingXMLReader.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ResolvingXMLReader.java 13 Nov 2002 20:53:44 -0000 1.2
+++ ResolvingXMLReader.java 11 Jan 2003 00:46:05 -0000 1.3
@@ -59,11 +59,7 @@
package org.apache.xml.resolver.tools;
-import java.io.IOException;
-import java.net.URL;
-
import org.xml.sax.*;
-import org.xml.sax.helpers.XMLFilterImpl;
import javax.xml.parsers.*;
|