markt 2004/12/22 15:12:51
Modified: catalina/src/share/org/apache/catalina/core
ApplicationContextFacade.java
ApplicationFilterChain.java
ApplicationFilterConfig.java
ApplicationHttpRequest.java
ApplicationHttpResponse.java
ApplicationRequest.java ApplicationResponse.java
ContainerBase.java FastEngineMapper.java
MappingRequest.java StandardContextMapper.java
StandardContextValve.java StandardEngine.java
StandardEngineMapper.java StandardEngineValve.java
StandardHost.java StandardHostMapper.java
StandardHostValve.java StandardPipeline.java
StandardServer.java StandardService.java
StandardWrapper.java StandardWrapperFacade.java
Log:
Tidy code / fix Eclipse warnings in o.a.c.core:
- unused imports
- access of static fields
Revision Changes Path
1.5 +1 -16
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationContextFacade.java
Index: ApplicationContextFacade.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationContextFacade.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ApplicationContextFacade.java 26 Aug 2004 21:31:21 -0000 1.4
+++ ApplicationContextFacade.java 22 Dec 2004 23:12:50 -0000 1.5
@@ -19,29 +19,14 @@
import java.io.InputStream;
-import java.io.File;
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.util.ArrayList;
-import java.util.Arrays;
import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.HashSet;
import java.util.Set;
-import javax.naming.NamingException;
-import javax.naming.Binding;
-import javax.naming.directory.DirContext;
import javax.servlet.RequestDispatcher;
import javax.servlet.Servlet;
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
-import javax.servlet.ServletContextAttributeEvent;
-import javax.servlet.ServletContextAttributeListener;
-import javax.servlet.http.HttpServletRequest;
/**
1.13 +1 -3
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationFilterChain.java
Index: ApplicationFilterChain.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationFilterChain.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ApplicationFilterChain.java 26 Aug 2004 21:31:21 -0000 1.12
+++ ApplicationFilterChain.java 22 Dec 2004 23:12:50 -0000 1.13
@@ -21,11 +21,9 @@
import java.io.IOException;
import java.util.ArrayList;
import java.util.Iterator;
-import java.security.AccessController;
import java.security.PrivilegedActionException;
import javax.servlet.Filter;
import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
import javax.servlet.Servlet;
import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
1.10 +1 -2
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationFilterConfig.java
Index: ApplicationFilterConfig.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationFilterConfig.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ApplicationFilterConfig.java 26 Aug 2004 21:31:21 -0000 1.9
+++ ApplicationFilterConfig.java 22 Dec 2004 23:12:50 -0000 1.10
@@ -20,7 +20,6 @@
import java.util.ArrayList;
import java.util.Enumeration;
-import java.util.Iterator;
import java.util.Map;
import javax.servlet.Filter;
import javax.servlet.FilterConfig;
1.14 +2 -4
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationHttpRequest.java
Index: ApplicationHttpRequest.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationHttpRequest.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ApplicationHttpRequest.java 26 Aug 2004 21:31:21 -0000 1.13
+++ ApplicationHttpRequest.java 22 Dec 2004 23:12:50 -0000 1.14
@@ -18,7 +18,6 @@
package org.apache.catalina.core;
-import java.io.IOException;
import java.util.ArrayList;
import java.util.Enumeration;
import java.util.HashMap;
@@ -27,7 +26,6 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletRequestWrapper;
import org.apache.catalina.Globals;
-import org.apache.catalina.HttpRequest;
import org.apache.catalina.util.Enumerator;
import org.apache.catalina.util.RequestUtil;
import org.apache.catalina.util.StringManager;
@@ -346,7 +344,7 @@
*/
public String getInfo() {
- return (this.info);
+ return (ApplicationHttpRequest.info);
}
1.10 +2 -3
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationHttpResponse.java
Index: ApplicationHttpResponse.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationHttpResponse.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ApplicationHttpResponse.java 26 Aug 2004 21:31:21 -0000 1.9
+++ ApplicationHttpResponse.java 22 Dec 2004 23:12:50 -0000 1.10
@@ -23,7 +23,6 @@
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpServletResponseWrapper;
-import org.apache.catalina.HttpResponse;
import org.apache.catalina.util.StringManager;
@@ -339,7 +338,7 @@
*/
public String getInfo() {
- return (this.info);
+ return (ApplicationHttpResponse.info);
}
1.9 +1 -4
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationRequest.java
Index: ApplicationRequest.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationRequest.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ApplicationRequest.java 26 Aug 2004 21:31:21 -0000 1.8
+++ ApplicationRequest.java 22 Dec 2004 23:12:50 -0000 1.9
@@ -18,14 +18,11 @@
package org.apache.catalina.core;
-import java.io.IOException;
import java.util.Enumeration;
import java.util.HashMap;
import javax.servlet.ServletRequest;
import javax.servlet.ServletRequestWrapper;
import org.apache.catalina.Globals;
-import org.apache.catalina.Request;
-import org.apache.catalina.connector.RequestFacade;
import org.apache.catalina.util.Enumerator;
import org.apache.catalina.util.StringManager;
1.8 +1 -7
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationResponse.java
Index: ApplicationResponse.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationResponse.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ApplicationResponse.java 26 Aug 2004 21:31:21 -0000 1.7
+++ ApplicationResponse.java 22 Dec 2004 23:12:50 -0000 1.8
@@ -18,14 +18,8 @@
package org.apache.catalina.core;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.util.Locale;
-import javax.servlet.ServletOutputStream;
import javax.servlet.ServletResponse;
import javax.servlet.ServletResponseWrapper;
-import org.apache.catalina.Response;
-import org.apache.catalina.connector.ResponseFacade;
import org.apache.catalina.util.StringManager;
1.23 +1 -2
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ContainerBase.java
Index: ContainerBase.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ContainerBase.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- ContainerBase.java 26 Aug 2004 21:31:21 -0000 1.22
+++ ContainerBase.java 22 Dec 2004 23:12:50 -0000 1.23
@@ -35,7 +35,6 @@
import org.apache.catalina.ContainerEvent;
import org.apache.catalina.ContainerListener;
import org.apache.catalina.Lifecycle;
-import org.apache.catalina.LifecycleEvent;
import org.apache.catalina.LifecycleException;
import org.apache.catalina.LifecycleListener;
import org.apache.catalina.Loader;
1.6 +1 -2
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/FastEngineMapper.java
Index: FastEngineMapper.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/FastEngineMapper.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- FastEngineMapper.java 26 Aug 2004 21:31:21 -0000 1.5
+++ FastEngineMapper.java 22 Dec 2004 23:12:50 -0000 1.6
@@ -28,7 +28,6 @@
import org.apache.catalina.Engine;
import org.apache.catalina.Host;
import org.apache.catalina.Lifecycle;
-import org.apache.catalina.LifecycleEvent;
import org.apache.catalina.LifecycleException;
import org.apache.catalina.LifecycleListener;
import org.apache.catalina.Mapper;
1.3 +1 -34
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/MappingRequest.java
Index: MappingRequest.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/MappingRequest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MappingRequest.java 26 Aug 2004 21:31:21 -0000 1.2
+++ MappingRequest.java 22 Dec 2004 23:12:50 -0000 1.3
@@ -21,57 +21,24 @@
import java.io.BufferedReader;
import java.io.InputStream;
import java.io.IOException;
-import java.io.File;
import java.io.UnsupportedEncodingException;
-import java.net.MalformedURLException;
import java.net.Socket;
-import java.net.URL;
-import java.security.AccessController;
import java.security.Principal;
-import java.security.PrivilegedAction;
-import java.security.PrivilegedExceptionAction;
-import java.security.PrivilegedActionException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.HashSet;
import java.util.Iterator;
import java.util.Locale;
import java.util.Map;
-import java.util.Set;
-import javax.naming.NamingException;
-import javax.naming.Binding;
-import javax.naming.directory.DirContext;
import javax.servlet.RequestDispatcher;
-import javax.servlet.Servlet;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletContextAttributeEvent;
-import javax.servlet.ServletContextAttributeListener;
import javax.servlet.ServletInputStream;
import javax.servlet.ServletRequest;
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
-import org.apache.naming.resources.Resource;
-import org.apache.naming.resources.DirContextURLStreamHandler;
-import org.apache.naming.resources.DirContextURLConnection;
import org.apache.catalina.Connector;
-import org.apache.catalina.Container;
import org.apache.catalina.Context;
-import org.apache.catalina.Globals;
-import org.apache.catalina.Host;
import org.apache.catalina.HttpRequest;
-import org.apache.catalina.Logger;
import org.apache.catalina.Response;
import org.apache.catalina.Wrapper;
-import org.apache.catalina.connector.HttpRequestBase;
-import org.apache.catalina.deploy.ApplicationParameter;
-import org.apache.catalina.util.Enumerator;
-import org.apache.catalina.util.ResourceSet;
-import org.apache.catalina.util.ServerInfo;
-import org.apache.catalina.util.StringManager;
/**
1.10 +1 -3
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardContextMapper.java
Index: StandardContextMapper.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardContextMapper.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- StandardContextMapper.java 26 Aug 2004 21:32:20 -0000 1.9
+++ StandardContextMapper.java 22 Dec 2004 23:12:50 -0000 1.10
@@ -20,12 +20,10 @@
import javax.servlet.http.HttpServletRequest;
import org.apache.catalina.Container;
-import org.apache.catalina.Context;
import org.apache.catalina.HttpRequest;
import org.apache.catalina.Mapper;
import org.apache.catalina.Request;
import org.apache.catalina.Wrapper;
-import org.apache.catalina.util.RequestUtil;
import org.apache.catalina.util.StringManager;
1.18 +1 -7
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardContextValve.java
Index: StandardContextValve.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardContextValve.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- StandardContextValve.java 26 Aug 2004 21:32:20 -0000 1.17
+++ StandardContextValve.java 22 Dec 2004 23:12:50 -0000 1.18
@@ -19,21 +19,15 @@
import java.io.IOException;
-import java.io.PrintWriter;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import javax.naming.NamingException;
-import org.apache.naming.ContextBindings;
-import org.apache.naming.resources.DirContextURLStreamHandler;
-import org.apache.catalina.Container;
import org.apache.catalina.Context;
import org.apache.catalina.HttpRequest;
import org.apache.catalina.Request;
import org.apache.catalina.Response;
import org.apache.catalina.ValveContext;
import org.apache.catalina.Wrapper;
-import org.apache.catalina.util.RequestUtil;
import org.apache.catalina.util.StringManager;
import org.apache.catalina.valves.ValveBase;
1.18 +1 -7
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardEngine.java
Index: StandardEngine.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardEngine.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- StandardEngine.java 26 Aug 2004 21:32:20 -0000 1.17
+++ StandardEngine.java 22 Dec 2004 23:12:50 -0000 1.18
@@ -18,18 +18,12 @@
package org.apache.catalina.core;
-import java.io.IOException;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.http.HttpServletResponse;
import org.apache.catalina.Container;
import org.apache.catalina.Context;
import org.apache.catalina.DefaultContext;
import org.apache.catalina.Engine;
import org.apache.catalina.Host;
import org.apache.catalina.LifecycleException;
-import org.apache.catalina.Request;
-import org.apache.catalina.Response;
import org.apache.catalina.Service;
import org.apache.catalina.util.ServerInfo;
1.7 +1 -2
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardEngineMapper.java
Index: StandardEngineMapper.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardEngineMapper.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- StandardEngineMapper.java 26 Aug 2004 21:32:20 -0000 1.6
+++ StandardEngineMapper.java 22 Dec 2004 23:12:50 -0000 1.7
@@ -19,7 +19,6 @@
import org.apache.catalina.Container;
-import org.apache.catalina.Engine;
import org.apache.catalina.Host;
import org.apache.catalina.Mapper;
import org.apache.catalina.Request;
1.9 +1 -2
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardEngineValve.java
Index: StandardEngineValve.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardEngineValve.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- StandardEngineValve.java 26 Aug 2004 21:32:20 -0000 1.8
+++ StandardEngineValve.java 22 Dec 2004 23:12:50 -0000 1.9
@@ -22,7 +22,6 @@
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.catalina.Container;
import org.apache.catalina.Host;
import org.apache.catalina.Request;
import org.apache.catalina.Response;
1.33 +1 -12
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardHost.java
Index: StandardHost.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardHost.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- StandardHost.java 26 Aug 2004 21:32:20 -0000 1.32
+++ StandardHost.java 22 Dec 2004 23:12:50 -0000 1.33
@@ -19,24 +19,13 @@
import java.io.IOException;
-import java.net.JarURLConnection;
import java.net.URL;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
import org.apache.catalina.Container;
import org.apache.catalina.Context;
import org.apache.catalina.DefaultContext;
import org.apache.catalina.Deployer;
-import org.apache.catalina.Globals;
-import org.apache.catalina.HttpRequest;
import org.apache.catalina.Host;
-import org.apache.catalina.Lifecycle;
import org.apache.catalina.LifecycleException;
-import org.apache.catalina.LifecycleListener;
-import org.apache.catalina.Request;
-import org.apache.catalina.Response;
import org.apache.catalina.Valve;
import org.apache.catalina.valves.ErrorDispatcherValve;
1.6 +1 -3
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardHostMapper.java
Index: StandardHostMapper.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardHostMapper.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- StandardHostMapper.java 26 Aug 2004 21:32:20 -0000 1.5
+++ StandardHostMapper.java 22 Dec 2004 23:12:50 -0000 1.6
@@ -18,10 +18,8 @@
package org.apache.catalina.core;
-import javax.servlet.http.HttpServletRequest;
import org.apache.catalina.Container;
import org.apache.catalina.Context;
-import org.apache.catalina.Host;
import org.apache.catalina.HttpRequest;
import org.apache.catalina.Mapper;
import org.apache.catalina.Request;
1.9 +1 -2
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardHostValve.java
Index: StandardHostValve.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardHostValve.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- StandardHostValve.java 26 Aug 2004 21:32:20 -0000 1.8
+++ StandardHostValve.java 22 Dec 2004 23:12:50 -0000 1.9
@@ -22,7 +22,6 @@
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.catalina.Container;
import org.apache.catalina.Context;
import org.apache.catalina.Manager;
import org.apache.catalina.Request;
1.10 +0 -1
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardPipeline.java
Index: StandardPipeline.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardPipeline.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- StandardPipeline.java 26 Aug 2004 21:32:20 -0000 1.9
+++ StandardPipeline.java 22 Dec 2004 23:12:50 -0000 1.10
@@ -23,7 +23,6 @@
import org.apache.catalina.Contained;
import org.apache.catalina.Container;
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.40 +1 -3
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardServer.java
Index: StandardServer.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardServer.java,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- StandardServer.java 26 Aug 2004 21:32:20 -0000 1.39
+++ StandardServer.java 22 Dec 2004 23:12:50 -0000 1.40
@@ -23,7 +23,6 @@
import java.beans.PropertyChangeSupport;
import java.beans.PropertyDescriptor;
import java.io.File;
-import java.io.FileWriter;
import java.io.FileOutputStream;
import java.io.OutputStreamWriter;
import java.io.InputStream;
@@ -36,7 +35,6 @@
import java.sql.Timestamp;
import java.util.Enumeration;
import java.util.Hashtable;
-import java.util.Iterator;
import java.util.Random;
import javax.naming.directory.DirContext;
1.13 +2 -3
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardService.java
Index: StandardService.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardService.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- StandardService.java 26 Aug 2004 21:32:20 -0000 1.12
+++ StandardService.java 22 Dec 2004 23:12:50 -0000 1.13
@@ -24,7 +24,6 @@
import org.apache.catalina.Container;
import org.apache.catalina.Engine;
import org.apache.catalina.Lifecycle;
-import org.apache.catalina.LifecycleEvent;
import org.apache.catalina.LifecycleException;
import org.apache.catalina.LifecycleListener;
import org.apache.catalina.Server;
@@ -199,7 +198,7 @@
*/
public String getInfo() {
- return (this.info);
+ return (StandardService.info);
}
1.48 +1 -10
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardWrapper.java
Index: StandardWrapper.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardWrapper.java,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- StandardWrapper.java 26 Aug 2004 21:32:20 -0000 1.47
+++ StandardWrapper.java 22 Dec 2004 23:12:50 -0000 1.48
@@ -18,10 +18,7 @@
package org.apache.catalina.core;
-import java.io.File;
-import java.io.IOException;
import java.io.PrintStream;
-import java.net.URL;
import java.util.Enumeration;
import java.util.HashMap;
import java.util.Stack;
@@ -31,22 +28,16 @@
import javax.servlet.ServletException;
import javax.servlet.SingleThreadModel;
import javax.servlet.UnavailableException;
-import javax.servlet.http.HttpServletResponse;
import org.apache.catalina.Container;
import org.apache.catalina.ContainerServlet;
import org.apache.catalina.Context;
import org.apache.catalina.InstanceEvent;
import org.apache.catalina.InstanceListener;
-import org.apache.catalina.Lifecycle;
import org.apache.catalina.LifecycleException;
import org.apache.catalina.Loader;
-import org.apache.catalina.Logger;
-import org.apache.catalina.Request;
-import org.apache.catalina.Response;
import org.apache.catalina.Wrapper;
import org.apache.catalina.connector.HttpRequestBase;
import org.apache.catalina.connector.HttpResponseBase;
-import org.apache.catalina.loader.StandardClassLoader;
import org.apache.catalina.util.Enumerator;
import org.apache.catalina.util.InstanceSupport;
import org.apache.tomcat.util.log.SystemLogHandler;
1.5 +1 -10
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardWrapperFacade.java
Index: StandardWrapperFacade.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardWrapperFacade.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- StandardWrapperFacade.java 26 Aug 2004 21:32:20 -0000 1.4
+++ StandardWrapperFacade.java 22 Dec 2004 23:12:50 -0000 1.5
@@ -18,18 +18,9 @@
package org.apache.catalina.core;
-import java.io.File;
-import java.io.IOException;
-import java.net.URL;
import java.util.Enumeration;
-import java.util.HashMap;
-import javax.servlet.Servlet;
import javax.servlet.ServletConfig;
import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.SingleThreadModel;
-import javax.servlet.UnavailableException;
-import javax.servlet.http.HttpServletResponse;
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
