You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by re...@apache.org on 2003/09/02 23:34:39 UTC
cvs commit: jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/http/mapper MappingData.java
remm 2003/09/02 14:34:39
Modified: util/java/org/apache/tomcat/util/log SystemLogHandler.java
LogManager.java CommonLogHandler.java
LogHandler.java Log.java CaptureLog.java
util/java/org/apache/tomcat/util/collections
MultiMapValuesEnumeration.java
MultiMapNamesEnumeration.java MultiMap.java
util/java/org/apache/tomcat/util/net
TcpConnectionHandler.java SSLImplementation.java
SSLSupport.java TcpConnection.java
util/java/org/apache/tomcat/util/buf UTF8Decoder.java
UEncoder.java DateTool.java UDecoder.java
ByteChunk.java CharChunk.java B2CConverter.java
TimeStamp.java C2BConverter.java
util/java/org/apache/tomcat/util/threads Expirer.java
Reaper.java ThreadPoolRunnable.java
ThreadPoolMX.java
util/java/org/apache/tomcat/util/net/jsse
JSSE13SocketFactory.java JSSESupport.java
JSSE14Support.java JSSEImplementation.java
JSSESocketFactory.java JSSE14SocketFactory.java
coyote/src/java/org/apache/coyote RequestInfo.java
Response.java
util/java/org/apache/tomcat/util/handler TcHandlerCtx.java
HandlerManager.java TcHandler.java
util/java/org/apache/tomcat/util/http HttpMessages.java
AcceptLanguage.java ContentType.java
MimeHeaders.java Cookies.java Parameters.java
util/java/org/apache/tomcat/util/compat Jdk14Compat.java
http11/src/java/org/apache/coyote/http11 Constants.java
Http11Protocol.java
util/java/org/apache/tomcat/util/mx DynamicMBeanProxy.java
util/java/org/apache/tomcat/util/http/mapper
MappingData.java
Log:
- Fix bad imports (thanks to Eclipse). Let me know if I broke something.
Revision Changes Path
1.3 +1 -9 jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/log/SystemLogHandler.java
Index: SystemLogHandler.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/log/SystemLogHandler.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SystemLogHandler.java 26 Jun 2002 12:36:00 -0000 1.2
+++ SystemLogHandler.java 2 Sep 2003 21:34:37 -0000 1.3
@@ -56,16 +56,8 @@
*/
package org.apache.tomcat.util.log;
-import java.io.ByteArrayOutputStream;
-import java.io.Writer;
-import java.io.PrintStream;
-import java.io.PrintWriter;
-import java.io.FileWriter;
-import java.io.File;
-import java.io.OutputStreamWriter;
import java.io.IOException;
-import java.io.StringWriter;
-
+import java.io.PrintStream;
import java.util.Hashtable;
import java.util.Stack;
1.4 +2 -3 jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/log/LogManager.java
Index: LogManager.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/log/LogManager.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- LogManager.java 12 Jul 2002 17:58:45 -0000 1.3
+++ LogManager.java 2 Sep 2003 21:34:37 -0000 1.4
@@ -56,9 +56,8 @@
*/
package org.apache.tomcat.util.log;
-import java.io.*;
-import java.lang.reflect.*;
-import java.util.*;
+import java.util.Enumeration;
+import java.util.Hashtable;
/**
1.3 +2 -11 jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/log/CommonLogHandler.java
Index: CommonLogHandler.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/log/CommonLogHandler.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CommonLogHandler.java 4 Mar 2003 18:21:47 -0000 1.2
+++ CommonLogHandler.java 2 Sep 2003 21:34:37 -0000 1.3
@@ -56,18 +56,9 @@
*/
package org.apache.tomcat.util.log;
-import org.apache.tomcat.util.log.*;
-import java.io.Writer;
-import java.io.PrintWriter;
-import java.io.FileWriter;
-import java.io.File;
-import java.io.OutputStreamWriter;
-import java.io.IOException;
-import java.io.StringWriter;
+import java.util.Hashtable;
-import java.util.*;
-
-import org.apache.commons.logging.*;
+import org.apache.commons.logging.LogFactory;
/**
* Log using common-logging.
1.3 +2 -9 jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/log/LogHandler.java
Index: LogHandler.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/log/LogHandler.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- LogHandler.java 22 Mar 2002 04:12:01 -0000 1.2
+++ LogHandler.java 2 Sep 2003 21:34:37 -0000 1.3
@@ -56,16 +56,9 @@
*/
package org.apache.tomcat.util.log;
-import org.apache.tomcat.util.log.*;
-import java.io.Writer;
-import java.io.PrintWriter;
-import java.io.FileWriter;
-import java.io.File;
import java.io.OutputStreamWriter;
-import java.io.IOException;
-import java.io.StringWriter;
-
-import java.util.*;
+import java.io.PrintWriter;
+import java.io.Writer;
/**
1.4 +0 -3 jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/log/Log.java
Index: Log.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/log/Log.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Log.java 18 Dec 2002 21:23:26 -0000 1.3
+++ Log.java 2 Sep 2003 21:34:37 -0000 1.4
@@ -56,9 +56,6 @@
*/
package org.apache.tomcat.util.log;
-import java.io.*;
-import java.lang.reflect.*;
-import java.util.*;
/**
1.2 +0 -10 jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/log/CaptureLog.java
Index: CaptureLog.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/log/CaptureLog.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CaptureLog.java 23 May 2002 17:21:09 -0000 1.1
+++ CaptureLog.java 2 Sep 2003 21:34:37 -0000 1.2
@@ -57,17 +57,7 @@
package org.apache.tomcat.util.log;
import java.io.ByteArrayOutputStream;
-import java.io.Writer;
import java.io.PrintStream;
-import java.io.PrintWriter;
-import java.io.FileWriter;
-import java.io.File;
-import java.io.OutputStreamWriter;
-import java.io.IOException;
-import java.io.StringWriter;
-
-import java.util.Hashtable;
-import java.util.Stack;
/**
* Per Thread System.err and System.out log capture data.
1.2 +2 -4 jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/collections/MultiMapValuesEnumeration.java
Index: MultiMapValuesEnumeration.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/collections/MultiMapValuesEnumeration.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MultiMapValuesEnumeration.java 16 May 2001 23:18:04 -0000 1.1
+++ MultiMapValuesEnumeration.java 2 Sep 2003 21:34:37 -0000 1.2
@@ -59,11 +59,9 @@
package org.apache.tomcat.util.collections;
-import org.apache.tomcat.util.buf.MessageBytes;
+import java.util.Enumeration;
-import java.io.*;
-import java.util.*;
-import java.text.*;
+import org.apache.tomcat.util.buf.MessageBytes;
/** Enumerate the values for a (possibly ) multiple
* value element.
1.2 +1 -5 jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/collections/MultiMapNamesEnumeration.java
Index: MultiMapNamesEnumeration.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/collections/MultiMapNamesEnumeration.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MultiMapNamesEnumeration.java 16 May 2001 23:18:03 -0000 1.1
+++ MultiMapNamesEnumeration.java 2 Sep 2003 21:34:37 -0000 1.2
@@ -59,11 +59,7 @@
package org.apache.tomcat.util.collections;
-import org.apache.tomcat.util.buf.MessageBytes;
-
-import java.io.*;
-import java.util.*;
-import java.text.*;
+import java.util.Enumeration;
/** Enumerate the distinct header names.
Each nextElement() is O(n) ( a comparation is
1.2 +0 -3 jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/collections/MultiMap.java
Index: MultiMap.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/collections/MultiMap.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MultiMap.java 16 May 2001 23:18:03 -0000 1.1
+++ MultiMap.java 2 Sep 2003 21:34:37 -0000 1.2
@@ -60,9 +60,6 @@
package org.apache.tomcat.util.collections;
import org.apache.tomcat.util.buf.MessageBytes;
-import java.io.*;
-import java.util.*;
-import java.text.*;
// Originally MimeHeaders
1.2 +3 -7 jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/TcpConnectionHandler.java
Index: TcpConnectionHandler.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/TcpConnectionHandler.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TcpConnectionHandler.java 5 Apr 2002 17:43:33 -0000 1.1
+++ TcpConnectionHandler.java 2 Sep 2003 21:34:37 -0000 1.2
@@ -63,10 +63,6 @@
package org.apache.tomcat.util.net;
-import java.io.*;
-import java.net.*;
-import java.util.*;
-import org.apache.tomcat.util.*;
/**
* This interface will be implemented by any object that
1.5 +1 -2 jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/SSLImplementation.java
Index: SSLImplementation.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/SSLImplementation.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SSLImplementation.java 13 Apr 2003 22:25:02 -0000 1.4
+++ SSLImplementation.java 2 Sep 2003 21:34:37 -0000 1.5
@@ -59,8 +59,7 @@
package org.apache.tomcat.util.net;
-import java.io.*;
-import java.net.*;
+import java.net.Socket;
/* SSLImplementation:
1.6 +1 -2 jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/SSLSupport.java
Index: SSLSupport.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/SSLSupport.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SSLSupport.java 4 Oct 2002 20:03:10 -0000 1.5
+++ SSLSupport.java 2 Sep 2003 21:34:37 -0000 1.6
@@ -59,8 +59,7 @@
package org.apache.tomcat.util.net;
-import java.io.*;
-import java.net.*;
+import java.io.IOException;
/* SSLSupport
1.2 +6 -7 jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/TcpConnection.java
Index: TcpConnection.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/TcpConnection.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TcpConnection.java 5 Apr 2002 17:43:33 -0000 1.1
+++ TcpConnection.java 2 Sep 2003 21:34:37 -0000 1.2
@@ -63,10 +63,9 @@
package org.apache.tomcat.util.net;
-import org.apache.tomcat.util.*;
-import java.io.*;
-import java.net.*;
-import java.util.*;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.Socket;
/**
*
1.2 +0 -4 jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/buf/UTF8Decoder.java
Index: UTF8Decoder.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/buf/UTF8Decoder.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- UTF8Decoder.java 29 May 2001 06:22:53 -0000 1.1
+++ UTF8Decoder.java 2 Sep 2003 21:34:38 -0000 1.2
@@ -59,11 +59,7 @@
package org.apache.tomcat.util.buf;
-import java.text.*;
-import java.util.*;
-import java.io.Serializable;
import java.io.IOException;
-import org.apache.tomcat.util.buf.*;
/**
* Moved from ByteChunk - code to convert from UTF8 bytes to chars.
1.3 +3 -2 jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/buf/UEncoder.java
Index: UEncoder.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/buf/UEncoder.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- UEncoder.java 31 Dec 2001 18:20:04 -0000 1.2
+++ UEncoder.java 2 Sep 2003 21:34:38 -0000 1.3
@@ -60,9 +60,10 @@
package org.apache.tomcat.util.buf;
-import org.apache.tomcat.util.buf.*;
+import java.io.CharArrayWriter;
+import java.io.IOException;
+import java.io.Writer;
import java.util.BitSet;
-import java.io.*;
/** Efficient implementation for encoders.
* This class is not thread safe - you need one encoder per thread.
1.8 +7 -4 jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/buf/DateTool.java
Index: DateTool.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/buf/DateTool.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- DateTool.java 18 Sep 2002 04:20:24 -0000 1.7
+++ DateTool.java 2 Sep 2003 21:34:38 -0000 1.8
@@ -59,10 +59,13 @@
package org.apache.tomcat.util.buf;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.*;
-import java.text.*;
+import java.text.DateFormat;
+import java.text.FieldPosition;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Locale;
+import java.util.TimeZone;
import org.apache.tomcat.util.res.StringManager;
1.6 +2 -4 jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/buf/UDecoder.java
Index: UDecoder.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/buf/UDecoder.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- UDecoder.java 2 Feb 2002 04:46:01 -0000 1.5
+++ UDecoder.java 2 Sep 2003 21:34:38 -0000 1.6
@@ -59,10 +59,8 @@
package org.apache.tomcat.util.buf;
-import org.apache.tomcat.util.buf.*;
-
-import java.util.BitSet;
-import java.io.*;
+import java.io.CharConversionException;
+import java.io.IOException;
/**
* All URL decoding happens here. This way we can reuse, review, optimize
1.14 +1 -3 jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/buf/ByteChunk.java
Index: ByteChunk.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/buf/ByteChunk.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ByteChunk.java 14 Jan 2003 18:20:02 -0000 1.13
+++ ByteChunk.java 2 Sep 2003 21:34:38 -0000 1.14
@@ -59,10 +59,8 @@
package org.apache.tomcat.util.buf;
-import java.text.*;
-import java.util.*;
-import java.io.Serializable;
import java.io.IOException;
+import java.io.Serializable;
/*
* In a server it is very important to be able to operate on
1.8 +1 -3 jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/buf/CharChunk.java
Index: CharChunk.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/buf/CharChunk.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- CharChunk.java 1 May 2003 20:50:50 -0000 1.7
+++ CharChunk.java 2 Sep 2003 21:34:38 -0000 1.8
@@ -59,10 +59,8 @@
package org.apache.tomcat.util.buf;
-import java.text.*;
-import java.util.*;
-import java.io.Serializable;
import java.io.IOException;
+import java.io.Serializable;
/**
* Utilities to manipluate char chunks. While String is
1.2 +4 -3 jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/buf/B2CConverter.java
Index: B2CConverter.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/buf/B2CConverter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- B2CConverter.java 29 May 2001 06:22:53 -0000 1.1
+++ B2CConverter.java 2 Sep 2003 21:34:38 -0000 1.2
@@ -60,9 +60,10 @@
package org.apache.tomcat.util.buf;
-import org.apache.tomcat.util.buf.*;
-
-import java.io.*;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.UnsupportedEncodingException;
/** Efficient conversion of bytes to character .
*
1.4 +0 -7 jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/buf/TimeStamp.java
Index: TimeStamp.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/buf/TimeStamp.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TimeStamp.java 31 Dec 2001 18:20:04 -0000 1.3
+++ TimeStamp.java 2 Sep 2003 21:34:38 -0000 1.4
@@ -58,14 +58,7 @@
*/
package org.apache.tomcat.util.buf;
-import org.apache.tomcat.util.buf.MessageBytes;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
import java.io.Serializable;
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Vector;
// XXX Shouldn't be here - has nothing to do with buffers.
1.3 +4 -3 jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/buf/C2BConverter.java
Index: C2BConverter.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/buf/C2BConverter.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- C2BConverter.java 9 Apr 2002 20:39:06 -0000 1.2
+++ C2BConverter.java 2 Sep 2003 21:34:38 -0000 1.3
@@ -60,9 +60,10 @@
package org.apache.tomcat.util.buf;
-import org.apache.tomcat.util.buf.*;
-
-import java.io.*;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.UnsupportedEncodingException;
/** Efficient conversion of character to bytes.
*
1.5 +1 -5 jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/threads/Expirer.java
Index: Expirer.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/threads/Expirer.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Expirer.java 5 Apr 2002 05:53:18 -0000 1.4
+++ Expirer.java 2 Sep 2003 21:34:38 -0000 1.5
@@ -58,11 +58,7 @@
*/
package org.apache.tomcat.util.threads;
-import java.io.IOException;
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Vector;
-import org.apache.tomcat.util.buf.*;
+import org.apache.tomcat.util.buf.TimeStamp;
/**
* Expire unused objects.
1.4 +0 -1 jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/threads/Reaper.java
Index: Reaper.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/threads/Reaper.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Reaper.java 18 Dec 2002 22:52:13 -0000 1.3
+++ Reaper.java 2 Sep 2003 21:34:38 -0000 1.4
@@ -58,7 +58,6 @@
*/
package org.apache.tomcat.util.threads;
-import org.apache.tomcat.util.*;
/**
* The reaper is a background thread with which ticks every minute
1.2 +0 -4 jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/threads/ThreadPoolRunnable.java
Index: ThreadPoolRunnable.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/threads/ThreadPoolRunnable.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ThreadPoolRunnable.java 6 Jan 2002 08:34:56 -0000 1.1
+++ ThreadPoolRunnable.java 2 Sep 2003 21:34:38 -0000 1.2
@@ -59,10 +59,6 @@
package org.apache.tomcat.util.threads;
-import java.util.zip.*;
-import java.net.*;
-import java.util.*;
-import java.io.*;
/** Implemented if you want to run a piece of code inside a thread pool.
*/
1.7 +0 -1 jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/threads/ThreadPoolMX.java
Index: ThreadPoolMX.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/threads/ThreadPoolMX.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ThreadPoolMX.java 3 Apr 2003 00:52:26 -0000 1.6
+++ ThreadPoolMX.java 2 Sep 2003 21:34:38 -0000 1.7
@@ -60,7 +60,6 @@
package org.apache.tomcat.util.threads;
-import java.util.*;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
1.5 +3 -10 jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/jsse/JSSE13SocketFactory.java
Index: JSSE13SocketFactory.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/jsse/JSSE13SocketFactory.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- JSSE13SocketFactory.java 13 Aug 2003 05:32:53 -0000 1.4
+++ JSSE13SocketFactory.java 2 Sep 2003 21:34:38 -0000 1.5
@@ -58,19 +58,12 @@
*/
package org.apache.tomcat.util.net.jsse;
-import java.io.*;
-import java.net.*;
-import java.util.Vector;
+import java.io.IOException;
import java.security.KeyStore;
-import java.security.Security;
import java.security.SecureRandom;
-import javax.net.ServerSocketFactory;
+import java.security.Security;
+
import javax.net.ssl.SSLServerSocket;
-import javax.net.ssl.SSLSocket;
-import javax.net.ssl.SSLException;
-import javax.net.ssl.SSLServerSocketFactory;
-import javax.net.ssl.HandshakeCompletedListener;
-import javax.net.ssl.HandshakeCompletedEvent;
/*
1. Make the JSSE's jars available, either as an installed
1.8 +5 -5 jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/jsse/JSSESupport.java
Index: JSSESupport.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/jsse/JSSESupport.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- JSSESupport.java 27 Aug 2003 02:28:14 -0000 1.7
+++ JSSESupport.java 2 Sep 2003 21:34:38 -0000 1.8
@@ -59,15 +59,15 @@
package org.apache.tomcat.util.net.jsse;
-import org.apache.tomcat.util.net.SSLSupport;
-import java.io.*;
-import java.net.*;
-import java.util.Vector;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
import java.security.cert.CertificateFactory;
+
import javax.net.ssl.SSLSession;
import javax.net.ssl.SSLSocket;
-import java.security.cert.CertificateFactory;
import javax.security.cert.X509Certificate;
+
+import org.apache.tomcat.util.net.SSLSupport;
/* JSSESupport
1.6 +9 -9 jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/jsse/JSSE14Support.java
Index: JSSE14Support.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/jsse/JSSE14Support.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- JSSE14Support.java 6 Jun 2003 03:25:30 -0000 1.5
+++ JSSE14Support.java 2 Sep 2003 21:34:38 -0000 1.6
@@ -59,19 +59,19 @@
package org.apache.tomcat.util.net.jsse;
-import org.apache.tomcat.util.net.SSLSupport;
-import java.io.*;
-import java.net.*;
-import java.util.Vector;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.SocketException;
+import java.security.cert.Certificate;
import java.security.cert.CertificateFactory;
import java.security.cert.X509Certificate;
-import java.security.cert.Certificate;
+
+import javax.net.ssl.HandshakeCompletedEvent;
+import javax.net.ssl.HandshakeCompletedListener;
+import javax.net.ssl.SSLException;
import javax.net.ssl.SSLSession;
import javax.net.ssl.SSLSocket;
-import javax.net.ssl.SSLException;
-import javax.net.ssl.HandshakeCompletedListener;
-import javax.net.ssl.HandshakeCompletedEvent;
-import java.security.cert.CertificateFactory;
/* JSSESupport
1.8 +2 -2 jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/jsse/JSSEImplementation.java
Index: JSSEImplementation.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/jsse/JSSEImplementation.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- JSSEImplementation.java 5 Jun 2003 05:16:25 -0000 1.7
+++ JSSEImplementation.java 2 Sep 2003 21:34:38 -0000 1.8
@@ -59,12 +59,12 @@
package org.apache.tomcat.util.net.jsse;
+import java.net.Socket;
+
import org.apache.tomcat.util.compat.JdkCompat;
import org.apache.tomcat.util.net.SSLImplementation;
import org.apache.tomcat.util.net.SSLSupport;
import org.apache.tomcat.util.net.ServerSocketFactory;
-import java.io.*;
-import java.net.*;
/* JSSEImplementation:
1.9 +12 -10 jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
Index: JSSESocketFactory.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- JSSESocketFactory.java 25 Aug 2003 18:38:52 -0000 1.8
+++ JSSESocketFactory.java 2 Sep 2003 21:34:38 -0000 1.9
@@ -58,19 +58,21 @@
*/
package org.apache.tomcat.util.net.jsse;
-import java.io.*;
-import java.net.*;
-import java.util.Vector;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.InetAddress;
+import java.net.ServerSocket;
+import java.net.Socket;
+import java.net.SocketException;
import java.security.KeyStore;
-import java.security.Security;
-import java.security.SecureRandom;
-import javax.net.ServerSocketFactory;
-import javax.net.ssl.SSLServerSocket;
-import javax.net.ssl.SSLSocket;
+import java.util.Vector;
+
import javax.net.ssl.SSLException;
+import javax.net.ssl.SSLServerSocket;
import javax.net.ssl.SSLServerSocketFactory;
-import javax.net.ssl.HandshakeCompletedListener;
-import javax.net.ssl.HandshakeCompletedEvent;
+import javax.net.ssl.SSLSocket;
/*
1. Make the JSSE's jars available, either as an installed
1.13 +6 -6 jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/jsse/JSSE14SocketFactory.java
Index: JSSE14SocketFactory.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/jsse/JSSE14SocketFactory.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- JSSE14SocketFactory.java 25 Aug 2003 17:37:26 -0000 1.12
+++ JSSE14SocketFactory.java 2 Sep 2003 21:34:38 -0000 1.13
@@ -59,18 +59,18 @@
package org.apache.tomcat.util.net.jsse;
-import java.io.*;
-import java.net.*;
-import java.util.Vector;
+import java.io.IOException;
import java.security.KeyStore;
import java.security.SecureRandom;
-import javax.net.ssl.SSLServerSocket;
-import javax.net.ssl.SSLContext;
+import java.util.Vector;
+
import javax.net.ssl.KeyManager;
-import javax.net.ssl.X509KeyManager;
import javax.net.ssl.KeyManagerFactory;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLServerSocket;
import javax.net.ssl.TrustManager;
import javax.net.ssl.TrustManagerFactory;
+import javax.net.ssl.X509KeyManager;
/*
1. Make the JSSE's jars available, either as an installed
1.5 +0 -1 jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/RequestInfo.java
Index: RequestInfo.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/RequestInfo.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- RequestInfo.java 22 Jun 2003 17:31:07 -0000 1.4
+++ RequestInfo.java 2 Sep 2003 21:34:38 -0000 1.5
@@ -60,7 +60,6 @@
package org.apache.coyote;
-import java.util.ArrayList;
/**
* Structure holding the Request and Response objects. It also holds statistical
1.26 +1 -4 jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/Response.java
Index: Response.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/Response.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- Response.java 25 Aug 2003 21:35:06 -0000 1.25
+++ Response.java 2 Sep 2003 21:34:38 -0000 1.26
@@ -64,11 +64,8 @@
import java.util.Locale;
import org.apache.tomcat.util.buf.ByteChunk;
-
-import org.apache.tomcat.util.res.StringManager;
-
-import org.apache.tomcat.util.http.MimeHeaders;
import org.apache.tomcat.util.http.ContentType;
+import org.apache.tomcat.util.http.MimeHeaders;
/**
* Response object.
1.3 +0 -7 jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/handler/TcHandlerCtx.java
Index: TcHandlerCtx.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/handler/TcHandlerCtx.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TcHandlerCtx.java 8 Apr 2002 22:29:14 -0000 1.2
+++ TcHandlerCtx.java 2 Sep 2003 21:34:38 -0000 1.3
@@ -58,13 +58,6 @@
*/
package org.apache.tomcat.util.handler;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.Socket;
-import java.util.Enumeration;
-
/**
* Store all context informations for the invocation of a handler chain.
1.2 +1 -4 jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/handler/HandlerManager.java
Index: HandlerManager.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/handler/HandlerManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- HandlerManager.java 12 Jul 2002 17:49:20 -0000 1.1
+++ HandlerManager.java 2 Sep 2003 21:34:38 -0000 1.2
@@ -59,10 +59,7 @@
package org.apache.tomcat.util.handler;
-import java.io.*;
-import java.net.*;
-import java.util.*;
-import org.apache.tomcat.util.IntrospectionUtils;
+import java.util.Hashtable;
/** Hooks support. Hooks implement a chain-of-command pattern, and
* are commonly used in most web servers as a mechanism of extensibility.
1.3 +2 -3 jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/handler/TcHandler.java
Index: TcHandler.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/handler/TcHandler.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TcHandler.java 12 Jul 2002 17:51:19 -0000 1.2
+++ TcHandler.java 2 Sep 2003 21:34:38 -0000 1.3
@@ -58,9 +58,8 @@
*/
package org.apache.tomcat.util.handler;
-import java.io.*;
-import java.util.*;
-import java.security.*;
+import java.io.IOException;
+import java.util.Hashtable;
/**
1.3 +0 -5 jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/http/HttpMessages.java
Index: HttpMessages.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/http/HttpMessages.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- HttpMessages.java 9 Jun 2001 00:12:53 -0000 1.2
+++ HttpMessages.java 2 Sep 2003 21:34:39 -0000 1.3
@@ -61,11 +61,6 @@
import org.apache.tomcat.util.res.StringManager;
-import java.io.*;
-import java.net.*;
-import java.util.*;
-import java.text.*;
-
/**
* Handle (internationalized) HTTP messages.
*
1.3 +5 -4 jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/http/AcceptLanguage.java
Index: AcceptLanguage.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/http/AcceptLanguage.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AcceptLanguage.java 29 May 2001 06:22:54 -0000 1.2
+++ AcceptLanguage.java 2 Sep 2003 21:34:39 -0000 1.3
@@ -59,10 +59,11 @@
package org.apache.tomcat.util.http;
-import java.io.*;
-import java.net.*;
-import java.util.*;
-import java.text.*;
+import java.util.Enumeration;
+import java.util.Hashtable;
+import java.util.Locale;
+import java.util.StringTokenizer;
+import java.util.Vector;
/**
* Util to process the "Accept-Language" header. Used by facade to implement
1.3 +0 -4 jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/http/ContentType.java
Index: ContentType.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/http/ContentType.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ContentType.java 29 May 2001 06:22:54 -0000 1.2
+++ ContentType.java 2 Sep 2003 21:34:39 -0000 1.3
@@ -59,10 +59,6 @@
package org.apache.tomcat.util.http;
-import java.io.*;
-import java.net.*;
-import java.util.*;
-import java.text.*;
/**
* Usefull methods for Content-Type processing
1.5 +4 -3 jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/http/MimeHeaders.java
Index: MimeHeaders.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/http/MimeHeaders.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- MimeHeaders.java 10 May 2002 23:31:26 -0000 1.4
+++ MimeHeaders.java 2 Sep 2003 21:34:39 -0000 1.5
@@ -58,10 +58,11 @@
*/
package org.apache.tomcat.util.http;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.util.Enumeration;
+
import org.apache.tomcat.util.buf.MessageBytes;
-import java.io.*;
-import java.util.*;
-import java.text.*;
/* XXX XXX XXX Need a major rewrite !!!!
*/
1.5 +5 -6 jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/http/Cookies.java
Index: Cookies.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/http/Cookies.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Cookies.java 2 Jun 2003 17:45:09 -0000 1.4
+++ Cookies.java 2 Sep 2003 21:34:39 -0000 1.5
@@ -59,13 +59,12 @@
package org.apache.tomcat.util.http;
-import org.apache.tomcat.util.buf.MessageBytes;
-import org.apache.tomcat.util.buf.CharChunk;
-import org.apache.tomcat.util.buf.ByteChunk;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.util.StringTokenizer;
-import java.io.*;
-import java.util.*;
-import java.text.*;
+import org.apache.tomcat.util.buf.ByteChunk;
+import org.apache.tomcat.util.buf.MessageBytes;
/**
* A collection of cookies - reusable and tuned for server side performance.
1.10 +9 -5 jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/http/Parameters.java
Index: Parameters.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/http/Parameters.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Parameters.java 5 Apr 2003 08:17:16 -0000 1.9
+++ Parameters.java 2 Sep 2003 21:34:39 -0000 1.10
@@ -59,11 +59,15 @@
package org.apache.tomcat.util.http;
-import org.apache.tomcat.util.buf.*;
-import org.apache.tomcat.util.collections.MultiMap;
-import java.io.*;
-import java.util.*;
-import java.text.*;
+import java.io.IOException;
+import java.util.Enumeration;
+import java.util.Hashtable;
+
+import org.apache.tomcat.util.buf.ByteChunk;
+import org.apache.tomcat.util.buf.CharChunk;
+import org.apache.tomcat.util.buf.MessageBytes;
+import org.apache.tomcat.util.buf.UDecoder;
+import org.apache.tomcat.util.collections.MultiMap;
/**
*
1.7 +4 -5 jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/compat/Jdk14Compat.java
Index: Jdk14Compat.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/compat/Jdk14Compat.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Jdk14Compat.java 14 Aug 2003 06:36:02 -0000 1.6
+++ Jdk14Compat.java 2 Sep 2003 21:34:39 -0000 1.7
@@ -64,9 +64,8 @@
import java.io.File;
import java.io.IOException;
-import java.net.URI;
-import java.net.URL;
import java.net.MalformedURLException;
+import java.net.URL;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
1.16 +0 -1 jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/Constants.java
Index: Constants.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/Constants.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- Constants.java 22 May 2003 04:47:32 -0000 1.15
+++ Constants.java 2 Sep 2003 21:34:39 -0000 1.16
@@ -58,7 +58,6 @@
*/
package org.apache.coyote.http11;
-import java.util.Locale;
/**
* Constants.
1.35 +22 -10 jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/Http11Protocol.java
Index: Http11Protocol.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/Http11Protocol.java,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- Http11Protocol.java 29 Aug 2003 02:34:47 -0000 1.34
+++ Http11Protocol.java 2 Sep 2003 21:34:39 -0000 1.35
@@ -58,22 +58,34 @@
*/
package org.apache.coyote.http11;
-import java.io.InputStream;
import java.io.IOException;
+import java.io.InputStream;
import java.io.OutputStream;
+import java.net.InetAddress;
+import java.net.Socket;
+import java.util.Enumeration;
+import java.util.Hashtable;
+
+import javax.management.MBeanRegistration;
+import javax.management.MBeanServer;
+import javax.management.ObjectName;
-import org.apache.coyote.*;
-import java.io.*;
-import java.net.*;
-import java.util.*;
+import org.apache.commons.modeler.Registry;
+import org.apache.coyote.ActionCode;
+import org.apache.coyote.ActionHook;
+import org.apache.coyote.Adapter;
+import org.apache.coyote.ProtocolHandler;
+import org.apache.coyote.RequestGroupInfo;
+import org.apache.coyote.RequestInfo;
+import org.apache.tomcat.util.net.PoolTcpEndpoint;
+import org.apache.tomcat.util.net.SSLImplementation;
+import org.apache.tomcat.util.net.SSLSupport;
+import org.apache.tomcat.util.net.ServerSocketFactory;
+import org.apache.tomcat.util.net.TcpConnection;
+import org.apache.tomcat.util.net.TcpConnectionHandler;
import org.apache.tomcat.util.res.StringManager;
import org.apache.tomcat.util.threads.ThreadPool;
import org.apache.tomcat.util.threads.ThreadWithAttributes;
-import org.apache.tomcat.util.net.*;
-import org.apache.commons.modeler.Registry;
-import javax.management.ObjectName;
-import javax.management.MBeanServer;
-import javax.management.MBeanRegistration;
/**
1.9 +22 -5 jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/mx/DynamicMBeanProxy.java
Index: DynamicMBeanProxy.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/mx/DynamicMBeanProxy.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- DynamicMBeanProxy.java 18 Dec 2002 21:21:33 -0000 1.8
+++ DynamicMBeanProxy.java 2 Sep 2003 21:34:39 -0000 1.9
@@ -59,11 +59,28 @@
package org.apache.tomcat.util.mx;
-import java.io.*;
-import java.net.*;
-import java.lang.reflect.*;
-import java.util.*;
-import javax.management.*;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.util.Enumeration;
+import java.util.Hashtable;
+import java.util.Iterator;
+
+import javax.management.Attribute;
+import javax.management.AttributeList;
+import javax.management.AttributeNotFoundException;
+import javax.management.DynamicMBean;
+import javax.management.InvalidAttributeValueException;
+import javax.management.MBeanAttributeInfo;
+import javax.management.MBeanConstructorInfo;
+import javax.management.MBeanException;
+import javax.management.MBeanInfo;
+import javax.management.MBeanNotificationInfo;
+import javax.management.MBeanOperationInfo;
+import javax.management.MBeanServer;
+import javax.management.MBeanServerFactory;
+import javax.management.ObjectName;
+import javax.management.ReflectionException;
/**
* DynamicMBean implementation using introspection to manage any
1.3 +0 -1 jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/http/mapper/MappingData.java
Index: MappingData.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/http/mapper/MappingData.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MappingData.java 29 Jan 2003 20:03:21 -0000 1.2
+++ MappingData.java 2 Sep 2003 21:34:39 -0000 1.3
@@ -58,7 +58,6 @@
*/
package org.apache.tomcat.util.http.mapper;
-import org.apache.tomcat.util.buf.CharChunk;
import org.apache.tomcat.util.buf.MessageBytes;
/**