markt 2005/06/12 08:21:44
Modified: catalina/src/share/org/apache/catalina/connector
HttpRequestFacade.java HttpResponseBase.java
HttpResponseFacade.java RequestBase.java
RequestFacade.java RequestWrapper.java
ResponseBase.java ResponseFacade.java
ResponseWrapper.java ResponseWriter.java
catalina/src/share/org/apache/catalina/connector/http10
HttpConnector.java HttpProcessor.java
catalina/src/share/org/apache/catalina/connector/http
HttpConnector.java HttpHeader.java
HttpProcessor.java HttpRequestImpl.java
HttpRequestLine.java HttpRequestStream.java
HttpResponseImpl.java HttpResponseStream.java
Log:
Remove unused imports identified by Eclipse
Revision Changes Path
1.4 +1 -8
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/HttpRequestFacade.java
Index: HttpRequestFacade.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/HttpRequestFacade.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- HttpRequestFacade.java 26 Aug 2004 21:30:19 -0000 1.3
+++ HttpRequestFacade.java 12 Jun 2005 15:21:44 -0000 1.4
@@ -18,14 +18,7 @@
package org.apache.catalina.connector;
-import java.security.Principal;
-import java.util.Locale;
import java.util.Enumeration;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.ServletInputStream;
-import javax.servlet.ServletRequest;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpSession;
1.56 +1 -3
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/HttpResponseBase.java
Index: HttpResponseBase.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/HttpResponseBase.java,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- HttpResponseBase.java 26 Aug 2004 21:30:19 -0000 1.55
+++ HttpResponseBase.java 12 Jun 2005 15:21:44 -0000 1.56
@@ -25,7 +25,6 @@
import java.net.MalformedURLException;
// import java.net.URL;
import java.security.AccessController;
-import java.security.PrivilegedAction;
import java.security.PrivilegedExceptionAction;
import java.security.PrivilegedActionException;
import java.text.SimpleDateFormat;
@@ -45,7 +44,6 @@
import org.apache.catalina.Globals;
import org.apache.catalina.Logger;
import org.apache.catalina.util.CookieTools;
-import org.apache.catalina.util.RequestUtil;
import org.apache.catalina.util.URL;
1.7 +1 -3
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/HttpResponseFacade.java
Index: HttpResponseFacade.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/HttpResponseFacade.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- HttpResponseFacade.java 26 Aug 2004 21:30:19 -0000 1.6
+++ HttpResponseFacade.java 12 Jun 2005 15:21:44 -0000 1.7
@@ -19,8 +19,6 @@
import java.io.IOException;
-import javax.servlet.ServletException;
-import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.Cookie;
import org.apache.catalina.HttpResponse;
1.23 +1 -3
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/RequestBase.java
Index: RequestBase.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/RequestBase.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- RequestBase.java 26 Aug 2004 21:30:19 -0000 1.22
+++ RequestBase.java 12 Jun 2005 15:21:44 -0000 1.23
@@ -24,7 +24,6 @@
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.Socket;
-import java.security.Principal;
import java.util.ArrayList;
import java.util.Enumeration;
import java.util.HashMap;
@@ -33,7 +32,6 @@
import java.util.Map;
import javax.servlet.RequestDispatcher;
import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
import javax.servlet.ServletInputStream;
import javax.servlet.ServletRequest;
import org.apache.catalina.Connector;
1.6 +1 -4
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/RequestFacade.java
Index: RequestFacade.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/RequestFacade.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- RequestFacade.java 26 Aug 2004 21:30:19 -0000 1.5
+++ RequestFacade.java 12 Jun 2005 15:21:44 -0000 1.6
@@ -18,14 +18,11 @@
package org.apache.catalina.connector;
-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 javax.servlet.RequestDispatcher;
1.6 +1 -2
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/RequestWrapper.java
Index: RequestWrapper.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/RequestWrapper.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- RequestWrapper.java 26 Aug 2004 21:30:19 -0000 1.5
+++ RequestWrapper.java 12 Jun 2005 15:21:44 -0000 1.6
@@ -21,7 +21,6 @@
import java.io.InputStream;
import java.io.IOException;
import java.net.Socket;
-import javax.servlet.ServletException;
import javax.servlet.ServletInputStream;
import javax.servlet.ServletRequest;
import org.apache.catalina.Connector;
1.28 +2 -3
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/ResponseBase.java
Index: ResponseBase.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/ResponseBase.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- ResponseBase.java 26 Aug 2004 21:30:19 -0000 1.27
+++ ResponseBase.java 12 Jun 2005 15:21:44 -0000 1.28
@@ -23,7 +23,6 @@
import java.io.OutputStreamWriter;
import java.io.PrintWriter;
import java.util.Locale;
-import javax.servlet.ServletException;
import javax.servlet.ServletOutputStream;
import javax.servlet.ServletResponse;
import org.apache.catalina.Connector;
@@ -291,7 +290,7 @@
*/
public String getInfo() {
- return (this.info);
+ return (ResponseBase.info);
}
1.8 +1 -3
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/ResponseFacade.java
Index: ResponseFacade.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/ResponseFacade.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ResponseFacade.java 26 Aug 2004 21:30:19 -0000 1.7
+++ ResponseFacade.java 12 Jun 2005 15:21:44 -0000 1.8
@@ -19,10 +19,8 @@
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 org.apache.catalina.Response;
1.5 +1 -3
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/ResponseWrapper.java
Index: ResponseWrapper.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/ResponseWrapper.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ResponseWrapper.java 26 Aug 2004 21:30:19 -0000 1.4
+++ ResponseWrapper.java 12 Jun 2005 15:21:44 -0000 1.5
@@ -21,14 +21,12 @@
import java.io.IOException;
import java.io.OutputStream;
import java.io.PrintWriter;
-import javax.servlet.ServletException;
import javax.servlet.ServletOutputStream;
import javax.servlet.ServletResponse;
import org.apache.catalina.Connector;
import org.apache.catalina.Context;
import org.apache.catalina.Request;
import org.apache.catalina.Response;
-import org.apache.catalina.Wrapper;
/**
1.4 +1 -2
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/ResponseWriter.java
Index: ResponseWriter.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/ResponseWriter.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ResponseWriter.java 26 Aug 2004 21:30:19 -0000 1.3
+++ ResponseWriter.java 12 Jun 2005 15:21:44 -0000 1.4
@@ -18,7 +18,6 @@
package org.apache.catalina.connector;
-import java.io.IOException;
import java.io.OutputStreamWriter;
import java.io.PrintWriter;
1.19 +1 -4
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http10/HttpConnector.java
Index: HttpConnector.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http10/HttpConnector.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- HttpConnector.java 26 Aug 2004 21:29:22 -0000 1.18
+++ HttpConnector.java 12 Jun 2005 15:21:44 -0000 1.19
@@ -32,10 +32,7 @@
import java.security.KeyManagementException;
import org.apache.catalina.Connector;
import org.apache.catalina.Container;
-import org.apache.catalina.HttpRequest;
-import org.apache.catalina.HttpResponse;
import org.apache.catalina.Lifecycle;
-import org.apache.catalina.LifecycleEvent;
import org.apache.catalina.LifecycleException;
import org.apache.catalina.LifecycleListener;
import org.apache.catalina.Logger;
1.11 +1 -6
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http10/HttpProcessor.java
Index: HttpProcessor.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http10/HttpProcessor.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- HttpProcessor.java 26 Aug 2004 21:29:22 -0000 1.10
+++ HttpProcessor.java 12 Jun 2005 15:21:44 -0000 1.11
@@ -22,7 +22,6 @@
import java.io.InputStream;
import java.io.IOException;
import java.io.OutputStream;
-import java.net.InetAddress;
import java.net.Socket;
import java.util.NoSuchElementException;
import java.util.StringTokenizer;
@@ -34,13 +33,9 @@
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.catalina.Connector;
-import org.apache.catalina.Container;
import org.apache.catalina.Globals;
import org.apache.catalina.HttpRequest;
-import org.apache.catalina.HttpResponse;
import org.apache.catalina.Lifecycle;
-import org.apache.catalina.LifecycleEvent;
import org.apache.catalina.LifecycleException;
import org.apache.catalina.LifecycleListener;
import org.apache.catalina.Logger;
1.36 +1 -6
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpConnector.java
Index: HttpConnector.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpConnector.java,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- HttpConnector.java 26 Aug 2004 21:28:57 -0000 1.35
+++ HttpConnector.java 12 Jun 2005 15:21:44 -0000 1.36
@@ -23,11 +23,9 @@
import java.net.InetAddress;
import java.net.ServerSocket;
import java.net.Socket;
-import java.net.UnknownHostException;
import java.security.AccessControlException;
import java.util.Stack;
import java.util.Vector;
-import java.util.Enumeration;
import java.security.KeyStoreException;
import java.security.NoSuchAlgorithmException;
import java.security.cert.CertificateException;
@@ -35,10 +33,7 @@
import java.security.KeyManagementException;
import org.apache.catalina.Connector;
import org.apache.catalina.Container;
-import org.apache.catalina.HttpRequest;
-import org.apache.catalina.HttpResponse;
import org.apache.catalina.Lifecycle;
-import org.apache.catalina.LifecycleEvent;
import org.apache.catalina.LifecycleException;
import org.apache.catalina.LifecycleListener;
import org.apache.catalina.Logger;
1.6 +1 -7
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpHeader.java
Index: HttpHeader.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpHeader.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- HttpHeader.java 26 Aug 2004 21:28:57 -0000 1.5
+++ HttpHeader.java 12 Jun 2005 15:21:44 -0000 1.6
@@ -18,12 +18,6 @@
package org.apache.catalina.connector.http;
-import java.io.IOException;
-import java.net.InetAddress;
-import javax.servlet.ServletInputStream;
-import org.apache.catalina.connector.HttpRequestBase;
-
-
/**
* HTTP header enum type.
*
1.48 +1 -8
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpProcessor.java
Index: HttpProcessor.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpProcessor.java,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- HttpProcessor.java 26 Aug 2004 21:28:57 -0000 1.47
+++ HttpProcessor.java 12 Jun 2005 15:21:44 -0000 1.48
@@ -18,30 +18,23 @@
package org.apache.catalina.connector.http;
-import java.io.BufferedInputStream;
import java.io.EOFException;
import java.io.InterruptedIOException;
import java.io.InputStream;
import java.io.IOException;
import java.io.OutputStream;
-import java.net.InetAddress;
import java.net.Socket;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.Locale;
-import java.util.StringTokenizer;
import java.util.TreeMap;
import javax.servlet.ServletException;
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.catalina.Connector;
-import org.apache.catalina.Container;
import org.apache.catalina.Globals;
import org.apache.catalina.HttpRequest;
-import org.apache.catalina.HttpResponse;
import org.apache.catalina.Lifecycle;
-import org.apache.catalina.LifecycleEvent;
import org.apache.catalina.LifecycleException;
import org.apache.catalina.LifecycleListener;
import org.apache.catalina.Logger;
1.15 +1 -3
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpRequestImpl.java
Index: HttpRequestImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpRequestImpl.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- HttpRequestImpl.java 26 Aug 2004 21:28:57 -0000 1.14
+++ HttpRequestImpl.java 12 Jun 2005 15:21:44 -0000 1.15
@@ -20,8 +20,6 @@
import java.io.IOException;
import java.net.InetAddress;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
import java.util.ArrayList;
import java.util.Enumeration;
import javax.servlet.ServletInputStream;
1.8 +1 -7
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpRequestLine.java
Index: HttpRequestLine.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpRequestLine.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- HttpRequestLine.java 26 Aug 2004 21:28:57 -0000 1.7
+++ HttpRequestLine.java 12 Jun 2005 15:21:44 -0000 1.8
@@ -18,12 +18,6 @@
package org.apache.catalina.connector.http;
-import java.io.IOException;
-import java.net.InetAddress;
-import javax.servlet.ServletInputStream;
-import org.apache.catalina.connector.HttpRequestBase;
-
-
/**
* HTTP request line enum type.
*
1.13 +0 -1
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpRequestStream.java
Index: HttpRequestStream.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpRequestStream.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- HttpRequestStream.java 26 Aug 2004 21:28:57 -0000 1.12
+++ HttpRequestStream.java 12 Jun 2005 15:21:44 -0000 1.13
@@ -18,7 +18,6 @@
package org.apache.catalina.connector.http;
import java.io.IOException;
-import org.apache.catalina.Request;
import org.apache.catalina.connector.RequestStream;
/**
1.15 +1 -3
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpResponseImpl.java
Index: HttpResponseImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpResponseImpl.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- HttpResponseImpl.java 26 Aug 2004 21:28:57 -0000 1.14
+++ HttpResponseImpl.java 12 Jun 2005 15:21:44 -0000 1.15
@@ -19,8 +19,6 @@
import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.OutputStream;
import java.util.ArrayList;
import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletResponse;
1.16 +0 -1
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpResponseStream.java
Index: HttpResponseStream.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpResponseStream.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- HttpResponseStream.java 26 Aug 2004 21:28:57 -0000 1.15
+++ HttpResponseStream.java 12 Jun 2005 15:21:44 -0000 1.16
@@ -20,7 +20,6 @@
import java.io.IOException;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpServletRequest;
-import org.apache.catalina.Response;
import org.apache.catalina.connector.ResponseStream;
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
