hgomez 2003/09/22 02:19:27
Modified: src/share/org/apache/tomcat/util/test HttpRequest.java
HttpResponse.java Parameter.java Properties.java
TestDefaults.java Cookie.java GTest.java
Header.java Attributes.java Matcher.java
HttpClient.java Body.java
src/share/org/apache/tomcat/util/test/matchers
ResponseMatchFile.java HeaderMatch.java
GoldenMatch.java SessionMatch.java
ResponseMatch.java HttpStatusMatch.java
src/share/org/apache/tomcat/util/depend
DependClassLoader.java DependManager.java
DependClassLoader12.java Dependency.java
src/share/org/apache/tomcat/util/xml SaxContext.java
PathMatch.java XmlMatch.java XmlAction.java
XmlMapper.java
src/share/org/apache/tomcat/util/io
RecycleBufferedInputStream.java
src/share/org/apache/tomcat/util/compat
SimpleClassLoader.java
src/share/org/apache/tomcat/util/compat/jar Handler.java
src/share/org/apache/tomcat/util PrefixMapper.java
ObjectSerializer.java
src/share/org/apache/tomcat/util/hooks Hooks.java
src/share/org/apache/tomcat/util/qlog FastDateFormat.java
Log:
Sixth and latst batch of imports cleanup in TC 3.3.2-dev (tc-util)
Revision Changes Path
1.7 +4 -4
jakarta-tomcat/src/share/org/apache/tomcat/util/test/HttpRequest.java
Index: HttpRequest.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/test/HttpRequest.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- HttpRequest.java 20 Sep 2002 23:58:05 -0000 1.6
+++ HttpRequest.java 22 Sep 2003 09:19:25 -0000 1.7
@@ -58,10 +58,10 @@
*/
package org.apache.tomcat.util.test;
-import java.net.*;
-import java.io.*;
-import java.util.*;
-import java.net.*;
+import java.util.Enumeration;
+import java.util.Hashtable;
+import java.util.StringTokenizer;
+import java.util.Vector;
import org.apache.tomcat.util.buf.Base64;
1.2 +1 -4
jakarta-tomcat/src/share/org/apache/tomcat/util/test/HttpResponse.java
Index: HttpResponse.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/test/HttpResponse.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- HttpResponse.java 9 Feb 2001 03:48:15 -0000 1.1
+++ HttpResponse.java 22 Sep 2003 09:19:25 -0000 1.2
@@ -58,10 +58,7 @@
*/
package org.apache.tomcat.util.test;
-import java.net.*;
-import java.io.*;
-import java.util.*;
-import java.net.*;
+import java.util.Hashtable;
/**
1.4 +0 -4
jakarta-tomcat/src/share/org/apache/tomcat/util/test/Parameter.java
Index: Parameter.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/test/Parameter.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Parameter.java 20 Sep 2002 23:58:05 -0000 1.3
+++ Parameter.java 22 Sep 2003 09:19:25 -0000 1.4
@@ -58,10 +58,6 @@
*/
package org.apache.tomcat.util.test;
-import java.net.*;
-import java.io.*;
-import java.util.*;
-import java.net.*;
/**
1.2 +1 -4
jakarta-tomcat/src/share/org/apache/tomcat/util/test/Properties.java
Index: Properties.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/test/Properties.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Properties.java 9 Feb 2001 03:48:15 -0000 1.1
+++ Properties.java 22 Sep 2003 09:19:25 -0000 1.2
@@ -58,10 +58,7 @@
*/
package org.apache.tomcat.util.test;
-import java.net.*;
-import java.io.*;
-import java.util.*;
-import java.net.*;
+import java.util.Hashtable;
/**
1.5 +1 -5
jakarta-tomcat/src/share/org/apache/tomcat/util/test/TestDefaults.java
Index: TestDefaults.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/test/TestDefaults.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TestDefaults.java 22 Sep 2001 02:45:45 -0000 1.4
+++ TestDefaults.java 22 Sep 2003 09:19:25 -0000 1.5
@@ -58,11 +58,7 @@
*/
package org.apache.tomcat.util.test;
-import java.net.*;
-import java.io.*;
-import java.util.*;
-import java.net.*;
-import org.apache.tools.ant.*;
+import org.apache.tools.ant.Project;
/** Set default values for HttpClient and GTest.
*/
1.3 +0 -4 jakarta-tomcat/src/share/org/apache/tomcat/util/test/Cookie.java
Index: Cookie.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/test/Cookie.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Cookie.java 20 Sep 2002 23:58:05 -0000 1.2
+++ Cookie.java 22 Sep 2003 09:19:25 -0000 1.3
@@ -58,10 +58,6 @@
*/
package org.apache.tomcat.util.test;
-import java.net.*;
-import java.io.*;
-import java.util.*;
-import java.net.*;
/**
1.15 +10 -6 jakarta-tomcat/src/share/org/apache/tomcat/util/test/GTest.java
Index: GTest.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/test/GTest.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- GTest.java 22 Sep 2001 21:10:50 -0000 1.14
+++ GTest.java 22 Sep 2003 09:19:25 -0000 1.15
@@ -58,12 +58,16 @@
*/
package org.apache.tomcat.util.test;
-import java.net.*;
-import java.io.*;
-import java.util.*;
-import java.net.*;
-import org.apache.tomcat.util.test.matchers.*;
-import org.apache.tools.ant.*;
+import java.io.PrintWriter;
+import java.util.Hashtable;
+import java.util.Vector;
+
+import org.apache.tomcat.util.test.matchers.GoldenMatch;
+import org.apache.tomcat.util.test.matchers.HeaderMatch;
+import org.apache.tomcat.util.test.matchers.HttpStatusMatch;
+import org.apache.tomcat.util.test.matchers.ResponseMatch;
+import org.apache.tomcat.util.test.matchers.ResponseMatchFile;
+import org.apache.tools.ant.Project;
/** Original tester for a web application. Will send a http request and
verify the response code, compare the response with a golden
1.7 +6 -4 jakarta-tomcat/src/share/org/apache/tomcat/util/test/Header.java
Index: Header.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/test/Header.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Header.java 20 Sep 2002 23:58:05 -0000 1.6
+++ Header.java 22 Sep 2003 09:19:25 -0000 1.7
@@ -58,10 +58,12 @@
*/
package org.apache.tomcat.util.test;
-import java.net.*;
-import java.io.*;
-import java.util.*;
-import java.net.*;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Enumeration;
+import java.util.Hashtable;
+import java.util.StringTokenizer;
+import java.util.Vector;
// XXX TODO Use the util.http
1.2 +1 -4
jakarta-tomcat/src/share/org/apache/tomcat/util/test/Attributes.java
Index: Attributes.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/test/Attributes.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Attributes.java 20 Jan 2001 19:42:09 -0000 1.1
+++ Attributes.java 22 Sep 2003 09:19:25 -0000 1.2
@@ -58,10 +58,7 @@
*/
package org.apache.tomcat.util.test;
-import java.net.*;
-import java.io.*;
-import java.util.*;
-import java.net.*;
+import java.util.Hashtable;
/**
1.4 +3 -5
jakarta-tomcat/src/share/org/apache/tomcat/util/test/Matcher.java
Index: Matcher.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/test/Matcher.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Matcher.java 31 Dec 2001 21:39:06 -0000 1.3
+++ Matcher.java 22 Sep 2003 09:19:25 -0000 1.4
@@ -58,11 +58,9 @@
*/
package org.apache.tomcat.util.test;
-import org.apache.tools.ant.*;
-import java.net.*;
-import java.io.*;
-import java.util.*;
-import java.net.*;
+import java.util.StringTokenizer;
+
+import org.apache.tools.ant.Project;
/**
Part of the GTest application
1.12 +18 -6
jakarta-tomcat/src/share/org/apache/tomcat/util/test/HttpClient.java
Index: HttpClient.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/test/HttpClient.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- HttpClient.java 16 Feb 2003 23:18:50 -0000 1.11
+++ HttpClient.java 22 Sep 2003 09:19:25 -0000 1.12
@@ -58,12 +58,24 @@
*/
package org.apache.tomcat.util.test;
-import org.apache.tomcat.util.test.matchers.*;
-import org.apache.tools.ant.*;
-import java.net.*;
-import java.io.*;
-import java.util.*;
-import java.net.*;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.PrintWriter;
+import java.net.Socket;
+import java.net.SocketException;
+import java.util.Enumeration;
+import java.util.Hashtable;
+import java.util.Vector;
+
+import org.apache.tomcat.util.test.matchers.GoldenMatch;
+import org.apache.tomcat.util.test.matchers.HeaderMatch;
+import org.apache.tomcat.util.test.matchers.HttpStatusMatch;
+import org.apache.tomcat.util.test.matchers.ResponseMatch;
+import org.apache.tomcat.util.test.matchers.ResponseMatchFile;
+import org.apache.tomcat.util.test.matchers.SessionMatch;
+import org.apache.tools.ant.Project;
/**
1.4 +0 -4 jakarta-tomcat/src/share/org/apache/tomcat/util/test/Body.java
Index: Body.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/test/Body.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Body.java 20 Sep 2002 23:58:05 -0000 1.3
+++ Body.java 22 Sep 2003 09:19:25 -0000 1.4
@@ -58,10 +58,6 @@
*/
package org.apache.tomcat.util.test;
-import java.net.*;
-import java.io.*;
-import java.util.*;
-import java.net.*;
//XXX rename it to Text
1.3 +7 -5
jakarta-tomcat/src/share/org/apache/tomcat/util/test/matchers/ResponseMatchFile.java
Index: ResponseMatchFile.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/test/matchers/ResponseMatchFile.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ResponseMatchFile.java 22 Sep 2001 21:10:50 -0000 1.2
+++ ResponseMatchFile.java 22 Sep 2003 09:19:26 -0000 1.3
@@ -58,11 +58,13 @@
*/
package org.apache.tomcat.util.test.matchers;
-import org.apache.tomcat.util.test.*;
-import java.net.*;
-import java.io.*;
-import java.util.*;
-import java.net.*;
+import java.io.BufferedReader;
+import java.io.FileNotFoundException;
+import java.io.FileReader;
+import java.io.IOException;
+import java.util.Hashtable;
+
+import org.apache.tomcat.util.test.Matcher;
/**
Check if the response matches a response file
1.4 +6 -5
jakarta-tomcat/src/share/org/apache/tomcat/util/test/matchers/HeaderMatch.java
Index: HeaderMatch.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/test/matchers/HeaderMatch.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- HeaderMatch.java 22 Sep 2001 21:10:50 -0000 1.3
+++ HeaderMatch.java 22 Sep 2003 09:19:26 -0000 1.4
@@ -58,11 +58,12 @@
*/
package org.apache.tomcat.util.test.matchers;
-import org.apache.tomcat.util.test.*;
-import java.net.*;
-import java.io.*;
-import java.util.*;
-import java.net.*;
+import java.util.Enumeration;
+import java.util.Hashtable;
+import java.util.Vector;
+
+import org.apache.tomcat.util.test.Header;
+import org.apache.tomcat.util.test.Matcher;
/** Check if the response has ( or has not ) some headers
*/
1.3 +7 -5
jakarta-tomcat/src/share/org/apache/tomcat/util/test/matchers/GoldenMatch.java
Index: GoldenMatch.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/test/matchers/GoldenMatch.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- GoldenMatch.java 22 Sep 2001 21:10:50 -0000 1.2
+++ GoldenMatch.java 22 Sep 2003 09:19:26 -0000 1.3
@@ -58,11 +58,13 @@
*/
package org.apache.tomcat.util.test.matchers;
-import org.apache.tomcat.util.test.*;
-import java.net.*;
-import java.io.*;
-import java.util.*;
-import java.net.*;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Hashtable;
+import java.util.StringTokenizer;
+
+import org.apache.tomcat.util.test.Matcher;
/**
1.4 +4 -5
jakarta-tomcat/src/share/org/apache/tomcat/util/test/matchers/SessionMatch.java
Index: SessionMatch.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/test/matchers/SessionMatch.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SessionMatch.java 16 Feb 2003 23:18:50 -0000 1.3
+++ SessionMatch.java 22 Sep 2003 09:19:26 -0000 1.4
@@ -58,11 +58,10 @@
*/
package org.apache.tomcat.util.test.matchers;
-import org.apache.tomcat.util.test.*;
-import java.net.*;
-import java.io.*;
-import java.util.*;
-import java.net.*;
+import java.util.Hashtable;
+
+import org.apache.tomcat.util.test.Header;
+import org.apache.tomcat.util.test.Matcher;
/** Extract the session Id from the response
*/
1.4 +3 -5
jakarta-tomcat/src/share/org/apache/tomcat/util/test/matchers/ResponseMatch.java
Index: ResponseMatch.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/test/matchers/ResponseMatch.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ResponseMatch.java 22 Sep 2001 21:10:50 -0000 1.3
+++ ResponseMatch.java 22 Sep 2003 09:19:26 -0000 1.4
@@ -58,11 +58,9 @@
*/
package org.apache.tomcat.util.test.matchers;
-import org.apache.tomcat.util.test.*;
-import java.net.*;
-import java.io.*;
-import java.util.*;
-import java.net.*;
+import java.util.Hashtable;
+
+import org.apache.tomcat.util.test.Matcher;
/**
Check if the response contains a substring
1.4 +3 -5
jakarta-tomcat/src/share/org/apache/tomcat/util/test/matchers/HttpStatusMatch.java
Index: HttpStatusMatch.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/test/matchers/HttpStatusMatch.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- HttpStatusMatch.java 22 Sep 2001 21:10:50 -0000 1.3
+++ HttpStatusMatch.java 22 Sep 2003 09:19:26 -0000 1.4
@@ -58,11 +58,9 @@
*/
package org.apache.tomcat.util.test.matchers;
-import org.apache.tomcat.util.test.*;
-import java.net.*;
-import java.io.*;
-import java.util.*;
-import java.net.*;
+import java.util.Hashtable;
+
+import org.apache.tomcat.util.test.Matcher;
/**
1.19 +5 -8
jakarta-tomcat/src/share/org/apache/tomcat/util/depend/DependClassLoader.java
Index: DependClassLoader.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/depend/DependClassLoader.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- DependClassLoader.java 12 Sep 2002 04:38:37 -0000 1.18
+++ DependClassLoader.java 22 Sep 2003 09:19:26 -0000 1.19
@@ -55,15 +55,12 @@
package org.apache.tomcat.util.depend;
-import java.io.*;
-import java.lang.*;
-import java.net.*;
-import java.text.*;
-import java.util.*;
-import java.util.zip.*;
-import java.security.*;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
-import org.apache.tomcat.util.compat.*;
+import org.apache.tomcat.util.compat.Jdk11Compat;
/**
* This is a wrapper class loader that will delegate all calls to
1.9 +0 -7
jakarta-tomcat/src/share/org/apache/tomcat/util/depend/DependManager.java
Index: DependManager.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/depend/DependManager.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- DependManager.java 12 Sep 2002 04:38:37 -0000 1.8
+++ DependManager.java 22 Sep 2003 09:19:26 -0000 1.9
@@ -55,13 +55,6 @@
package org.apache.tomcat.util.depend;
-import java.io.*;
-import java.lang.*;
-import java.net.*;
-import java.text.*;
-import java.util.*;
-import java.util.zip.*;
-import java.security.*;
/** How it works:
- A DependManager gets loaded with a number of Dependency
1.14 +14 -9
jakarta-tomcat/src/share/org/apache/tomcat/util/depend/DependClassLoader12.java
Index: DependClassLoader12.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/depend/DependClassLoader12.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- DependClassLoader12.java 12 Sep 2002 04:38:37 -0000 1.13
+++ DependClassLoader12.java 22 Sep 2003 09:19:26 -0000 1.14
@@ -55,16 +55,21 @@
package org.apache.tomcat.util.depend;
-import java.io.*;
-import java.lang.*;
-import java.net.*;
-import java.text.*;
-import java.util.*;
-import java.util.jar.*;
-import java.util.zip.*;
-import java.security.*;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.security.AccessController;
+import java.security.PrivilegedActionException;
+import java.security.PrivilegedExceptionAction;
+import java.security.ProtectionDomain;
+import java.util.Enumeration;
+import java.util.jar.Attributes;
+import java.util.jar.JarFile;
+import java.util.jar.Manifest;
-import org.apache.tomcat.util.compat.*;
+import org.apache.tomcat.util.compat.SimpleClassLoader;
public class DependClassLoader12 implements DependClassLoader.DCLFactory {
1.5 +1 -7
jakarta-tomcat/src/share/org/apache/tomcat/util/depend/Dependency.java
Index: Dependency.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/depend/Dependency.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Dependency.java 8 Jun 2001 03:12:46 -0000 1.4
+++ Dependency.java 22 Sep 2003 09:19:26 -0000 1.5
@@ -55,13 +55,7 @@
package org.apache.tomcat.util.depend;
-import java.io.*;
-import java.lang.*;
-import java.net.*;
-import java.text.*;
-import java.util.*;
-import java.util.zip.*;
-import java.security.*;
+import java.io.File;
/** Represents a dependency between a real file and a server object.
* The servler object has a timestamp, and it is compared with the
1.4 +3 -12
jakarta-tomcat/src/share/org/apache/tomcat/util/xml/SaxContext.java
Index: SaxContext.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/xml/SaxContext.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SaxContext.java 28 Jun 2001 07:15:01 -0000 1.3
+++ SaxContext.java 22 Sep 2003 09:19:26 -0000 1.4
@@ -1,17 +1,8 @@
package org.apache.tomcat.util.xml;
-import org.apache.tomcat.util.*;
-import java.beans.*;
-import java.io.*;
-import java.io.IOException;
-import java.lang.reflect.*;
-import java.util.*;
-import java.util.StringTokenizer;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import org.xml.sax.*;
-import org.xml.sax.helpers.*;
-import org.w3c.dom.*;
+import java.util.Stack;
+
+import org.xml.sax.AttributeList;
// XXX this interface is not final, but a prototype.
1.2 +0 -10
jakarta-tomcat/src/share/org/apache/tomcat/util/xml/PathMatch.java
Index: PathMatch.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/xml/PathMatch.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PathMatch.java 8 Feb 2000 20:13:32 -0000 1.1
+++ PathMatch.java 22 Sep 2003 09:19:26 -0000 1.2
@@ -1,16 +1,6 @@
package org.apache.tomcat.util.xml;
-import java.beans.*;
-import java.io.*;
-import java.io.IOException;
-import java.lang.reflect.*;
-import java.util.*;
import java.util.StringTokenizer;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import org.xml.sax.*;
-import org.xml.sax.helpers.*;
-import org.w3c.dom.*;
/** micro-XPath match - match a path
*/
1.2 +0 -11
jakarta-tomcat/src/share/org/apache/tomcat/util/xml/XmlMatch.java
Index: XmlMatch.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/xml/XmlMatch.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XmlMatch.java 8 Feb 2000 20:13:32 -0000 1.1
+++ XmlMatch.java 22 Sep 2003 09:19:26 -0000 1.2
@@ -1,16 +1,5 @@
package org.apache.tomcat.util.xml;
-import java.beans.*;
-import java.io.*;
-import java.io.IOException;
-import java.lang.reflect.*;
-import java.util.*;
-import java.util.StringTokenizer;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import org.xml.sax.*;
-import org.xml.sax.helpers.*;
-import org.w3c.dom.*;
/**
* @author [EMAIL PROTECTED]
1.2 +0 -11
jakarta-tomcat/src/share/org/apache/tomcat/util/xml/XmlAction.java
Index: XmlAction.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/xml/XmlAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XmlAction.java 8 Feb 2000 20:13:32 -0000 1.1
+++ XmlAction.java 22 Sep 2003 09:19:26 -0000 1.2
@@ -1,16 +1,5 @@
package org.apache.tomcat.util.xml;
-import java.beans.*;
-import java.io.*;
-import java.io.IOException;
-import java.lang.reflect.*;
-import java.util.*;
-import java.util.StringTokenizer;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import org.xml.sax.*;
-import org.xml.sax.helpers.*;
-import org.w3c.dom.*;
/** Each rule in Xml Mapper can invoke certain actions.
1.42 +17 -10
jakarta-tomcat/src/share/org/apache/tomcat/util/xml/XmlMapper.java
Index: XmlMapper.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/xml/XmlMapper.java,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- XmlMapper.java 13 Sep 2002 05:47:59 -0000 1.41
+++ XmlMapper.java 22 Sep 2003 09:19:26 -0000 1.42
@@ -1,20 +1,27 @@
package org.apache.tomcat.util.xml;
-import org.apache.tomcat.util.IntrospectionUtils;
-import java.beans.*;
-import java.io.*;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
import java.io.IOException;
-import java.lang.reflect.*;
+import java.io.InputStream;
+import java.lang.reflect.Method;
import java.net.URL;
-import java.net.URLConnection;
-import java.util.*;
-import java.util.StringTokenizer;
+import java.util.Hashtable;
+import java.util.Stack;
+
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
-import org.xml.sax.*;
-import org.xml.sax.helpers.*;
-import org.apache.tomcat.util.compat.*;
+import org.apache.tomcat.util.IntrospectionUtils;
+import org.apache.tomcat.util.compat.Jdk11Compat;
+import org.xml.sax.AttributeList;
+import org.xml.sax.ErrorHandler;
+import org.xml.sax.HandlerBase;
+import org.xml.sax.InputSource;
+import org.xml.sax.Locator;
+import org.xml.sax.Parser;
+import org.xml.sax.SAXException;
/**
* SAX Handler - it will read the XML and construct java objects
1.2 +2 -4
jakarta-tomcat/src/share/org/apache/tomcat/util/io/RecycleBufferedInputStream.java
Index: RecycleBufferedInputStream.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/io/RecycleBufferedInputStream.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RecycleBufferedInputStream.java 20 Feb 2001 03:12:59 -0000 1.1
+++ RecycleBufferedInputStream.java 22 Sep 2003 09:19:26 -0000 1.2
@@ -58,10 +58,8 @@
*/
package org.apache.tomcat.util.io;
-import java.io.*;
-import java.net.*;
-import java.util.*;
-import java.text.*;
+import java.io.BufferedInputStream;
+import java.io.InputStream;
public class RecycleBufferedInputStream extends BufferedInputStream {
public RecycleBufferedInputStream( InputStream is ) {
1.6 +9 -7
jakarta-tomcat/src/share/org/apache/tomcat/util/compat/SimpleClassLoader.java
Index: SimpleClassLoader.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/compat/SimpleClassLoader.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SimpleClassLoader.java 13 Sep 2002 04:47:02 -0000 1.5
+++ SimpleClassLoader.java 22 Sep 2003 09:19:26 -0000 1.6
@@ -54,13 +54,15 @@
*/
package org.apache.tomcat.util.compat;
-import java.io.*;
-import java.lang.*;
-import java.net.*;
-import java.text.*;
-import java.util.*;
-import java.util.zip.*;
-import java.security.*;
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
/**
* This is a JDK1.1 equivalent of URLClassLoader. It have no dependency on
1.2 +2 -3
jakarta-tomcat/src/share/org/apache/tomcat/util/compat/jar/Handler.java
Index: Handler.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/compat/jar/Handler.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Handler.java 16 Sep 2001 00:33:30 -0000 1.1
+++ Handler.java 22 Sep 2003 09:19:26 -0000 1.2
@@ -59,9 +59,8 @@
package org.apache.tomcat.util.compat.jar;
-import java.net.*;
-import java.io.*;
-import java.util.*;
+import java.io.IOException;
+import java.net.URL;
/** Jar: protocol handler for JDK1.1 ( where it is not present ).
1.11 +7 -11
jakarta-tomcat/src/share/org/apache/tomcat/util/PrefixMapper.java
Index: PrefixMapper.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/PrefixMapper.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- PrefixMapper.java 4 Apr 2001 04:04:49 -0000 1.10
+++ PrefixMapper.java 22 Sep 2003 09:19:26 -0000 1.11
@@ -64,15 +64,11 @@
package org.apache.tomcat.util;
-import org.apache.tomcat.util.collections.*;
-import org.apache.tomcat.util.buf.*;
-import org.apache.tomcat.util.io.FileUtil;
+import java.util.Enumeration;
-import java.net.URL;
-import java.io.File;
-import java.net.MalformedURLException;
-import java.io.IOException;
-import java.util.*;
+import org.apache.tomcat.util.buf.MessageBytes;
+import org.apache.tomcat.util.collections.SimpleHashtable;
+import org.apache.tomcat.util.io.FileUtil;
/** Prefix and exact mapping alghoritm.
*XXX finish factoring out the creation of the map ( right now direct field access
is
1.4 +7 -2
jakarta-tomcat/src/share/org/apache/tomcat/util/ObjectSerializer.java
Index: ObjectSerializer.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/ObjectSerializer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ObjectSerializer.java 13 Sep 2002 07:44:43 -0000 1.3
+++ ObjectSerializer.java 22 Sep 2003 09:19:26 -0000 1.4
@@ -59,8 +59,13 @@
package org.apache.tomcat.util;
-import java.io.*;
-import java.util.*;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.ObjectStreamClass;
// from tomcat.session.SessionSerializer
1.10 +1 -4 jakarta-tomcat/src/share/org/apache/tomcat/util/hooks/Hooks.java
Index: Hooks.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/hooks/Hooks.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Hooks.java 13 Sep 2002 05:23:32 -0000 1.9
+++ Hooks.java 22 Sep 2003 09:19:26 -0000 1.10
@@ -59,10 +59,7 @@
package org.apache.tomcat.util.hooks;
-import java.io.*;
-import java.net.*;
-import java.util.*;
-import org.apache.tomcat.util.IntrospectionUtils;
+import java.util.Vector;
/** Hooks support. Hooks implement a chain-of-command pattern, and
* are commonly used in most web servers as a mechanism of extensibility.
1.4 +1 -3
jakarta-tomcat/src/share/org/apache/tomcat/util/qlog/FastDateFormat.java
Index: FastDateFormat.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/qlog/FastDateFormat.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- FastDateFormat.java 28 May 2001 02:09:55 -0000 1.3
+++ FastDateFormat.java 22 Sep 2003 09:19:26 -0000 1.4
@@ -61,12 +61,10 @@
package org.apache.tomcat.util.qlog;
-import java.util.Date;
-
import java.text.DateFormat;
import java.text.FieldPosition;
import java.text.ParsePosition;
-import java.text.SimpleDateFormat;
+import java.util.Date;
/**
* Fast date formatter that caches recently formatted date information
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
