You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by hg...@apache.org on 2003/09/18 18:13:57 UTC
cvs commit: jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat3 CoyoteInterceptor2.java Tomcat3Adapter.java Tomcat3Request.java Tomcat3Response.java
hgomez 2003/09/18 09:13:57
Modified: coyote/src/java/org/apache/coyote/tomcat4
CoyoteInputStream.java
CoyoteServerSocketFactory.java Constants.java
CoyoteOutputStream.java OutputBuffer.java
CoyoteResponse.java CoyoteResponseFacade.java
CoyoteRequestFacade.java CoyoteRequest.java
CoyoteWriter.java
coyote/src/java/org/apache/coyote/tomcat3
CoyoteInterceptor2.java Tomcat3Adapter.java
Tomcat3Request.java Tomcat3Response.java
Log:
More import cleaned
Revision Changes Path
1.3 +1 -3 jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteInputStream.java
Index: CoyoteInputStream.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteInputStream.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CoyoteInputStream.java 3 Oct 2002 17:20:52 -0000 1.2
+++ CoyoteInputStream.java 18 Sep 2003 16:13:51 -0000 1.3
@@ -60,14 +60,12 @@
package org.apache.coyote.tomcat4;
-import java.io.InputStream;
import java.io.IOException;
import javax.servlet.ServletInputStream;
-import org.apache.tomcat.util.buf.ByteChunk;
-
import org.apache.coyote.Request;
+import org.apache.tomcat.util.buf.ByteChunk;
/**
1.5 +0 -9 jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteServerSocketFactory.java
Index: CoyoteServerSocketFactory.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteServerSocketFactory.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- CoyoteServerSocketFactory.java 19 Jun 2002 09:25:39 -0000 1.4
+++ CoyoteServerSocketFactory.java 18 Sep 2003 16:13:51 -0000 1.5
@@ -59,17 +59,8 @@
package org.apache.coyote.tomcat4;
import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
import java.net.InetAddress;
import java.net.ServerSocket;
-import java.security.KeyStore;
-import java.security.KeyStoreException;
-import java.security.NoSuchAlgorithmException;
-import java.security.UnrecoverableKeyException;
-import java.security.KeyManagementException;
-import java.security.Security;
-import java.security.cert.CertificateException;
/**
1.7 +0 -1 jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/Constants.java
Index: Constants.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/Constants.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Constants.java 28 Apr 2003 17:08:25 -0000 1.6
+++ Constants.java 18 Sep 2003 16:13:51 -0000 1.7
@@ -58,7 +58,6 @@
*/
package org.apache.coyote.tomcat4;
-import java.util.Locale;
/**
* Constants.
1.3 +0 -2 jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteOutputStream.java
Index: CoyoteOutputStream.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteOutputStream.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CoyoteOutputStream.java 6 Nov 2002 09:26:42 -0000 1.2
+++ CoyoteOutputStream.java 18 Sep 2003 16:13:51 -0000 1.3
@@ -64,8 +64,6 @@
import javax.servlet.ServletOutputStream;
-import org.apache.coyote.Response;
-
/**
* Coyote implementation of the servlet output stream.
*
1.11 +0 -3 jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/OutputBuffer.java
Index: OutputBuffer.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/OutputBuffer.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- OutputBuffer.java 15 Sep 2003 14:16:17 -0000 1.10
+++ OutputBuffer.java 18 Sep 2003 16:13:51 -0000 1.11
@@ -60,9 +60,6 @@
package org.apache.coyote.tomcat4;
import java.io.IOException;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.io.UnsupportedEncodingException;
import java.io.Writer;
import java.util.Hashtable;
1.33 +10 -24 jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteResponse.java
Index: CoyoteResponse.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteResponse.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- CoyoteResponse.java 18 Mar 2003 10:42:21 -0000 1.32
+++ CoyoteResponse.java 18 Sep 2003 16:13:51 -0000 1.33
@@ -73,42 +73,28 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Iterator;
import java.util.Locale;
-import java.util.Map;
import java.util.TimeZone;
import java.util.Vector;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
import javax.servlet.ServletOutputStream;
import javax.servlet.ServletResponse;
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
-import javax.servlet.http.HttpUtils;
-
-import org.apache.tomcat.util.buf.CharChunk;
-import org.apache.tomcat.util.buf.UEncoder;
-import org.apache.tomcat.util.http.MimeHeaders;
-import org.apache.tomcat.util.http.ServerCookie;
-import org.apache.tomcat.util.net.URL;
-
-import org.apache.coyote.Response;
import org.apache.catalina.Connector;
import org.apache.catalina.Context;
-import org.apache.catalina.Globals;
import org.apache.catalina.HttpResponse;
-import org.apache.catalina.Manager;
-import org.apache.catalina.Realm;
-import org.apache.catalina.Session;
-import org.apache.catalina.Wrapper;
import org.apache.catalina.util.CharsetMapper;
-import org.apache.catalina.util.RequestUtil;
import org.apache.catalina.util.StringManager;
+import org.apache.coyote.Response;
+import org.apache.tomcat.util.buf.CharChunk;
+import org.apache.tomcat.util.buf.UEncoder;
+import org.apache.tomcat.util.http.MimeHeaders;
+import org.apache.tomcat.util.http.ServerCookie;
+import org.apache.tomcat.util.net.URL;
/**
1.2 +5 -7 jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteResponseFacade.java
Index: CoyoteResponseFacade.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteResponseFacade.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CoyoteResponseFacade.java 22 May 2002 01:15:18 -0000 1.1
+++ CoyoteResponseFacade.java 18 Sep 2003 16:13:51 -0000 1.2
@@ -66,12 +66,10 @@
import java.io.IOException;
-import java.io.OutputStream;
import java.io.PrintWriter;
import java.util.Locale;
-import javax.servlet.ServletException;
+
import javax.servlet.ServletOutputStream;
-import javax.servlet.ServletResponse;
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletResponse;
1.3 +7 -11 jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteRequestFacade.java
Index: CoyoteRequestFacade.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteRequestFacade.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CoyoteRequestFacade.java 1 May 2003 11:19:17 -0000 1.2
+++ CoyoteRequestFacade.java 18 Sep 2003 16:13:51 -0000 1.3
@@ -65,23 +65,19 @@
package org.apache.coyote.tomcat4;
-import java.io.InputStream;
import java.io.BufferedReader;
import java.io.IOException;
import java.util.Enumeration;
-import java.util.Map;
import java.util.Locale;
-import java.net.Socket;
-import javax.servlet.ServletException;
-import javax.servlet.ServletInputStream;
-import javax.servlet.ServletRequest;
+import java.util.Map;
+
import javax.servlet.RequestDispatcher;
+import javax.servlet.ServletInputStream;
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
import org.apache.catalina.connector.RequestFacade;
-import org.apache.catalina.session.StandardSessionFacade;
/**
1.30 +9 -15 jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteRequest.java
Index: CoyoteRequest.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteRequest.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- CoyoteRequest.java 5 Apr 2003 08:18:04 -0000 1.29
+++ CoyoteRequest.java 18 Sep 2003 16:13:51 -0000 1.30
@@ -65,10 +65,10 @@
package org.apache.coyote.tomcat4;
+import java.io.BufferedReader;
+import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
-import java.io.IOException;
-import java.io.BufferedReader;
import java.io.UnsupportedEncodingException;
import java.net.InetAddress;
import java.net.Socket;
@@ -88,7 +88,6 @@
import javax.servlet.RequestDispatcher;
import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
import javax.servlet.ServletInputStream;
import javax.servlet.ServletRequest;
import javax.servlet.http.Cookie;
@@ -96,11 +95,6 @@
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
-import org.apache.tomcat.util.http.Parameters;
-
-import org.apache.coyote.ActionCode;
-import org.apache.coyote.Request;
-
import org.apache.catalina.Connector;
import org.apache.catalina.Context;
import org.apache.catalina.Globals;
@@ -109,14 +103,14 @@
import org.apache.catalina.Realm;
import org.apache.catalina.Session;
import org.apache.catalina.Wrapper;
-
import org.apache.catalina.util.Enumerator;
import org.apache.catalina.util.ParameterMap;
import org.apache.catalina.util.RequestUtil;
import org.apache.catalina.util.StringManager;
import org.apache.catalina.util.StringParser;
-
-import org.apache.tomcat.util.net.SSLSupport;
+import org.apache.coyote.ActionCode;
+import org.apache.coyote.Request;
+import org.apache.tomcat.util.http.Parameters;
/**
* Wrapper object for the Coyote request.
1.4 +0 -2 jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteWriter.java
Index: CoyoteWriter.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteWriter.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- CoyoteWriter.java 19 Dec 2002 08:59:50 -0000 1.3
+++ CoyoteWriter.java 18 Sep 2003 16:13:51 -0000 1.4
@@ -63,8 +63,6 @@
import java.io.IOException;
import java.io.PrintWriter;
-import javax.servlet.ServletOutputStream;
-
/**
* Coyote implementation of the servlet writer.
*
1.16 +10 -11 jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat3/CoyoteInterceptor2.java
Index: CoyoteInterceptor2.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat3/CoyoteInterceptor2.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- CoyoteInterceptor2.java 23 Nov 2002 09:07:23 -0000 1.15
+++ CoyoteInterceptor2.java 18 Sep 2003 16:13:57 -0000 1.16
@@ -60,18 +60,17 @@
package org.apache.coyote.tomcat3;
-import java.io.*;
-import java.net.*;
-import java.util.*;
-import java.text.*;
-import org.apache.tomcat.core.*;
-import org.apache.tomcat.util.res.StringManager;
+import java.util.Enumeration;
+import java.util.Hashtable;
+
+import org.apache.coyote.ActionCode;
+import org.apache.coyote.ProtocolHandler;
+import org.apache.tomcat.core.BaseInterceptor;
+import org.apache.tomcat.core.Context;
+import org.apache.tomcat.core.ContextManager;
+import org.apache.tomcat.core.TomcatException;
import org.apache.tomcat.util.IntrospectionUtils;
-import org.apache.tomcat.util.buf.*;
-import org.apache.tomcat.util.http.*;
-import org.apache.tomcat.util.log.*;
-import org.apache.tomcat.util.net.*;
-import org.apache.coyote.*;
+import org.apache.tomcat.util.net.SSLSupport;
/** Standalone http.
*
1.6 +1 -12 jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat3/Tomcat3Adapter.java
Index: Tomcat3Adapter.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat3/Tomcat3Adapter.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Tomcat3Adapter.java 4 Apr 2003 05:47:37 -0000 1.5
+++ Tomcat3Adapter.java 18 Sep 2003 16:13:57 -0000 1.6
@@ -60,19 +60,8 @@
package org.apache.coyote.tomcat3;
-import java.io.*;
-import java.net.*;
-import java.util.*;
-import java.text.*;
-import org.apache.tomcat.core.*;
-import org.apache.tomcat.util.res.StringManager;
-import org.apache.tomcat.util.buf.*;
-import org.apache.tomcat.util.http.*;
-import org.apache.tomcat.util.net.*;
-import org.apache.tomcat.util.net.ServerSocketFactory;
-import org.apache.tomcat.util.log.*;
import org.apache.coyote.Adapter;
-import org.apache.coyote.Processor;
+import org.apache.tomcat.core.ContextManager;
/** Adapter between Coyote and Tomcat.
*
1.13 +4 -13 jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat3/Tomcat3Request.java
Index: Tomcat3Request.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat3/Tomcat3Request.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- Tomcat3Request.java 24 Nov 2002 11:56:14 -0000 1.12
+++ Tomcat3Request.java 18 Sep 2003 16:13:57 -0000 1.13
@@ -60,20 +60,11 @@
package org.apache.coyote.tomcat3;
-import java.io.*;
-import java.net.*;
-import java.util.*;
-import java.text.*;
-import org.apache.tomcat.core.*;
-import org.apache.tomcat.util.res.StringManager;
-import org.apache.tomcat.util.buf.*;
-import org.apache.tomcat.util.http.*;
-import org.apache.tomcat.util.net.*;
-import org.apache.tomcat.util.net.ServerSocketFactory;
-import org.apache.tomcat.util.log.*;
-import org.apache.coyote.Adapter;
+import java.io.IOException;
+
import org.apache.coyote.ActionCode;
-import org.apache.coyote.Processor;
+import org.apache.tomcat.util.buf.ByteChunk;
+import org.apache.tomcat.util.buf.MessageBytes;
/** The Request to connect with Coyote.
* This class handles the I/O requirements and transferring the request
1.8 +4 -11 jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat3/Tomcat3Response.java
Index: Tomcat3Response.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat3/Tomcat3Response.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Tomcat3Response.java 17 Feb 2003 01:54:00 -0000 1.7
+++ Tomcat3Response.java 18 Sep 2003 16:13:57 -0000 1.8
@@ -60,19 +60,12 @@
package org.apache.coyote.tomcat3;
-import java.io.*;
-import java.net.*;
-import java.util.*;
-import java.text.*;
-import org.apache.tomcat.core.*;
-import org.apache.tomcat.util.res.StringManager;
-import org.apache.tomcat.util.buf.*;
-import org.apache.tomcat.util.http.*;
-import org.apache.tomcat.util.net.*;
-import org.apache.tomcat.util.net.ServerSocketFactory;
-import org.apache.tomcat.util.log.*;
+import java.io.IOException;
+import java.util.Locale;
import org.apache.coyote.ActionCode;
+import org.apache.tomcat.core.Response;
+import org.apache.tomcat.util.buf.ByteChunk;
/** The Response to connect with Coyote.
* This class mostly handles the I/O between Tomcat and Coyte.