hgomez 2003/09/22 02:17:18
Modified: src/facade22/org/apache/tomcat/facade ServletHandler.java
Servlet22Interceptor.java
ServletOutputStreamFacade.java
ServletWriterFacade.java JspInterceptor.java
SessionContextImpl.java HttpSessionFacade.java
HttpServletRequestFacade.java WebXmlReader.java
ServletInputStreamFacade.java
LoadOnStartupInterceptor.java
RequestDispatcherImpl.java ServletInfo.java
CookieFacade.java ServletConfigImpl.java
Log:
First batch of imports cleanup in TC 3.3.2-dev
Revision Changes Path
1.21 +13 -7
jakarta-tomcat/src/facade22/org/apache/tomcat/facade/ServletHandler.java
Index: ServletHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/facade22/org/apache/tomcat/facade/ServletHandler.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- ServletHandler.java 5 Jun 2002 03:52:50 -0000 1.20
+++ ServletHandler.java 22 Sep 2003 09:17:17 -0000 1.21
@@ -58,14 +58,20 @@
*/
package org.apache.tomcat.facade;
-import org.apache.tomcat.core.*;
-import org.apache.tomcat.util.collections.*;
+import javax.servlet.Servlet;
+import javax.servlet.SingleThreadModel;
+import javax.servlet.UnavailableException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
-import java.io.*;
-import java.net.*;
-import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import org.apache.tomcat.core.BaseInterceptor;
+import org.apache.tomcat.core.Container;
+import org.apache.tomcat.core.Context;
+import org.apache.tomcat.core.Handler;
+import org.apache.tomcat.core.Request;
+import org.apache.tomcat.core.Response;
+import org.apache.tomcat.core.TomcatException;
+import org.apache.tomcat.util.collections.SimplePool;
/**
* Handler for servlets. It'll implement all servlet-specific
1.23 +18 -8
jakarta-tomcat/src/facade22/org/apache/tomcat/facade/Servlet22Interceptor.java
Index: Servlet22Interceptor.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/facade22/org/apache/tomcat/facade/Servlet22Interceptor.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- Servlet22Interceptor.java 15 Jan 2003 06:11:23 -0000 1.22
+++ Servlet22Interceptor.java 22 Sep 2003 09:17:17 -0000 1.23
@@ -60,16 +60,26 @@
package org.apache.tomcat.facade;
-import org.apache.tomcat.util.*;
+import java.util.Enumeration;
+import java.util.Vector;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+import javax.servlet.http.HttpSessionBindingEvent;
+import javax.servlet.http.HttpSessionBindingListener;
+
+import org.apache.tomcat.core.BaseInterceptor;
+import org.apache.tomcat.core.Container;
+import org.apache.tomcat.core.Context;
+import org.apache.tomcat.core.ContextManager;
+import org.apache.tomcat.core.Handler;
+import org.apache.tomcat.core.Request;
+import org.apache.tomcat.core.Response;
+import org.apache.tomcat.core.ServerSession;
+import org.apache.tomcat.core.TomcatException;
import org.apache.tomcat.util.collections.SimplePool;
import org.apache.tomcat.util.compat.Jdk11Compat;
-import org.apache.tomcat.core.*;
-import java.io.*;
-import java.net.*;
-import java.security.*;
-import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
/**
* Control class for facades - this is the only "gate" between servlets
1.6 +5 -3
jakarta-tomcat/src/facade22/org/apache/tomcat/facade/ServletOutputStreamFacade.java
Index: ServletOutputStreamFacade.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/facade22/org/apache/tomcat/facade/ServletOutputStreamFacade.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ServletOutputStreamFacade.java 3 Jun 2002 17:25:00 -0000 1.5
+++ ServletOutputStreamFacade.java 22 Sep 2003 09:17:17 -0000 1.6
@@ -60,10 +60,12 @@
package org.apache.tomcat.facade;
-import org.apache.tomcat.core.*;
-import org.apache.tomcat.util.*;
-import java.io.*;
+import java.io.IOException;
+
import javax.servlet.ServletOutputStream;
+
+import org.apache.tomcat.core.OutputBuffer;
+import org.apache.tomcat.core.Response;
/**
*
1.6 +5 -4
jakarta-tomcat/src/facade22/org/apache/tomcat/facade/ServletWriterFacade.java
Index: ServletWriterFacade.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/facade22/org/apache/tomcat/facade/ServletWriterFacade.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ServletWriterFacade.java 22 Mar 2002 02:54:34 -0000 1.5
+++ ServletWriterFacade.java 22 Sep 2003 09:17:17 -0000 1.6
@@ -60,10 +60,11 @@
package org.apache.tomcat.facade;
-import org.apache.tomcat.core.*;
-import org.apache.tomcat.util.res.StringManager;
-import java.io.*;
-import javax.servlet.ServletOutputStream;
+import java.io.IOException;
+import java.io.PrintWriter;
+
+import org.apache.tomcat.core.OutputBuffer;
+import org.apache.tomcat.core.Response;
/**
* Facade to the PrintWriter returned by Response.
1.41 +31 -18
jakarta-tomcat/src/facade22/org/apache/tomcat/facade/JspInterceptor.java
Index: JspInterceptor.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/facade22/org/apache/tomcat/facade/JspInterceptor.java,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- JspInterceptor.java 20 Jun 2002 10:43:29 -0000 1.40
+++ JspInterceptor.java 22 Sep 2003 09:17:17 -0000 1.41
@@ -54,30 +54,43 @@
*/
package org.apache.tomcat.facade;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.Enumeration;
+import java.util.Properties;
-import javax.servlet.jsp.HttpJspPage;
+import javax.servlet.Servlet;
import javax.servlet.jsp.JspFactory;
-import java.util.*;
-import java.io.*;
-import java.net.*;
-
-import org.apache.tomcat.util.log.Log;
-import org.apache.tomcat.util.res.StringManager;
-import org.apache.tomcat.util.depend.*;
-import org.apache.tomcat.util.compat.*;
-
-import org.apache.jasper.*;
import org.apache.jasper.Constants;
-import org.apache.jasper.runtime.*;
-import org.apache.jasper.compiler.*;
+import org.apache.jasper.JasperEngineContext;
+import org.apache.jasper.JasperException;
+import org.apache.jasper.JasperOptionsImpl;
+import org.apache.jasper.JspCompilationContext;
+import org.apache.jasper.Options;
import org.apache.jasper.compiler.Compiler;
-import org.apache.tomcat.core.*;
-import org.apache.tomcat.facade.*;
-
+import org.apache.jasper.compiler.JasperMangler;
+import org.apache.jasper.compiler.JavaCompiler;
+import org.apache.jasper.compiler.JikesJavaCompiler;
+import org.apache.jasper.compiler.Mangler;
+import org.apache.jasper.compiler.SunJavaCompiler;
+import org.apache.jasper.runtime.HttpJspBase;
+import org.apache.jasper.runtime.JspFactoryImpl;
+import org.apache.tomcat.core.BaseInterceptor;
+import org.apache.tomcat.core.Context;
+import org.apache.tomcat.core.ContextManager;
+import org.apache.tomcat.core.Handler;
+import org.apache.tomcat.core.Request;
+import org.apache.tomcat.core.Response;
+import org.apache.tomcat.core.TomcatException;
import org.apache.tomcat.util.compat.Jdk11Compat;
+import org.apache.tomcat.util.depend.DependManager;
+import org.apache.tomcat.util.depend.Dependency;
+import org.apache.tomcat.util.log.Log;
+
/**
* Plug in the JSP engine (a.k.a Jasper)!
* Tomcat uses a "built-in" mapping for jsps ( *.jsp -> jsp ). "jsp"
1.2 +5 -5
jakarta-tomcat/src/facade22/org/apache/tomcat/facade/SessionContextImpl.java
Index: SessionContextImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/facade22/org/apache/tomcat/facade/SessionContextImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SessionContextImpl.java 23 Aug 2000 05:39:20 -0000 1.1
+++ SessionContextImpl.java 22 Sep 2003 09:17:17 -0000 1.2
@@ -64,11 +64,11 @@
package org.apache.tomcat.facade;
-import org.apache.tomcat.core.*;
import java.util.Enumeration;
import java.util.Vector;
-import javax.servlet.*;
-import javax.servlet.http.*;
+
+import javax.servlet.http.HttpSession;
+import javax.servlet.http.HttpSessionContext;
/**
*
1.21 +8 -6
jakarta-tomcat/src/facade22/org/apache/tomcat/facade/HttpSessionFacade.java
Index: HttpSessionFacade.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/facade22/org/apache/tomcat/facade/HttpSessionFacade.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- HttpSessionFacade.java 15 Jan 2003 06:11:23 -0000 1.20
+++ HttpSessionFacade.java 22 Sep 2003 09:17:17 -0000 1.21
@@ -60,13 +60,15 @@
package org.apache.tomcat.facade;
-import org.apache.tomcat.core.*;
+import java.util.Enumeration;
+
+import javax.servlet.http.HttpSession;
+import javax.servlet.http.HttpSessionBindingEvent;
+import javax.servlet.http.HttpSessionBindingListener;
+import javax.servlet.http.HttpSessionContext;
+
+import org.apache.tomcat.core.ServerSession;
import org.apache.tomcat.util.res.StringManager;
-import java.io.*;
-import java.net.*;
-import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
/**
* Facade for http session. Used to prevent servlets to access
1.34 +25 -13
jakarta-tomcat/src/facade22/org/apache/tomcat/facade/HttpServletRequestFacade.java
Index: HttpServletRequestFacade.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/facade22/org/apache/tomcat/facade/HttpServletRequestFacade.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- HttpServletRequestFacade.java 27 Apr 2002 03:45:18 -0000 1.33
+++ HttpServletRequestFacade.java 22 Sep 2003 09:17:17 -0000 1.34
@@ -60,20 +60,32 @@
package org.apache.tomcat.facade;
-import org.apache.tomcat.util.res.StringManager;
-import org.apache.tomcat.util.io.FileUtil;
-import org.apache.tomcat.util.buf.DateTool;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.net.InetAddress;
+import java.security.Principal;
+import java.util.Enumeration;
+import java.util.Locale;
+
+import javax.servlet.RequestDispatcher;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletInputStream;
+import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+
+import org.apache.tomcat.core.Context;
+import org.apache.tomcat.core.Request;
+import org.apache.tomcat.core.ServerSession;
+import org.apache.tomcat.core.TomcatException;
import org.apache.tomcat.util.buf.UEncoder;
-import org.apache.tomcat.util.http.*;
-import org.apache.tomcat.core.*;
-import org.apache.tomcat.facade.*;
-import java.io.*;
-import java.net.*;
-import java.security.*;
-import java.util.*;
-import java.text.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import org.apache.tomcat.util.http.AcceptLanguage;
+import org.apache.tomcat.util.http.Cookies;
+import org.apache.tomcat.util.http.MimeHeaders;
+import org.apache.tomcat.util.http.ServerCookie;
+import org.apache.tomcat.util.io.FileUtil;
+import org.apache.tomcat.util.res.StringManager;
/**
* The facade to the request that a servlet will see.
1.18 +19 -14
jakarta-tomcat/src/facade22/org/apache/tomcat/facade/WebXmlReader.java
Index: WebXmlReader.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/facade22/org/apache/tomcat/facade/WebXmlReader.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- WebXmlReader.java 11 Oct 2002 16:46:55 -0000 1.17
+++ WebXmlReader.java 22 Sep 2003 09:17:17 -0000 1.18
@@ -1,21 +1,26 @@
package org.apache.tomcat.facade;
-import org.apache.tomcat.core.*;
-import org.apache.tomcat.util.res.StringManager;
-import org.apache.tomcat.util.io.FileUtil;
-import org.apache.tomcat.util.xml.*;
-import java.beans.*;
-import java.io.*;
+import java.io.File;
+import java.io.FileOutputStream;
import java.io.IOException;
-import java.lang.reflect.*;
-import java.util.*;
-import java.util.StringTokenizer;
-import org.xml.sax.InputSource;
+import java.util.Enumeration;
+import java.util.Stack;
+import java.util.Vector;
+
+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.compat.Action;
+import org.apache.tomcat.util.compat.Jdk11Compat;
+import org.apache.tomcat.util.io.FileUtil;
+import org.apache.tomcat.util.res.StringManager;
+import org.apache.tomcat.util.xml.SaxContext;
+import org.apache.tomcat.util.xml.XmlAction;
+import org.apache.tomcat.util.xml.XmlMapper;
+import org.xml.sax.ErrorHandler;
import org.xml.sax.SAXException;
-import org.xml.sax.*;
-import org.xml.sax.helpers.*;
-import org.w3c.dom.*;
-import org.apache.tomcat.util.compat.*;
+import org.xml.sax.SAXParseException;
// XXX XXX Specific to servlet 2.2
1.8 +5 -4
jakarta-tomcat/src/facade22/org/apache/tomcat/facade/ServletInputStreamFacade.java
Index: ServletInputStreamFacade.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/facade22/org/apache/tomcat/facade/ServletInputStreamFacade.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ServletInputStreamFacade.java 22 Mar 2002 02:54:34 -0000 1.7
+++ ServletInputStreamFacade.java 22 Sep 2003 09:17:17 -0000 1.8
@@ -60,10 +60,11 @@
package org.apache.tomcat.facade;
-import java.io.*;
-import javax.servlet.*;
-import org.apache.tomcat.core.*;
-import org.apache.tomcat.util.*;
+import java.io.IOException;
+
+import javax.servlet.ServletInputStream;
+
+import org.apache.tomcat.core.Request;
/**
* This is the input stream returned by ServletRequest.getInputStream().
1.7 +10 -5
jakarta-tomcat/src/facade22/org/apache/tomcat/facade/LoadOnStartupInterceptor.java
Index: LoadOnStartupInterceptor.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/facade22/org/apache/tomcat/facade/LoadOnStartupInterceptor.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- LoadOnStartupInterceptor.java 5 Jun 2002 03:52:50 -0000 1.6
+++ LoadOnStartupInterceptor.java 22 Sep 2003 09:17:17 -0000 1.7
@@ -59,12 +59,17 @@
package org.apache.tomcat.facade;
-import org.apache.tomcat.core.*;
-import org.apache.tomcat.util.res.StringManager;
+import java.util.Enumeration;
+import java.util.Hashtable;
+import java.util.Vector;
+
+import org.apache.tomcat.core.BaseInterceptor;
+import org.apache.tomcat.core.Container;
+import org.apache.tomcat.core.Context;
+import org.apache.tomcat.core.Handler;
+import org.apache.tomcat.core.Request;
import org.apache.tomcat.util.log.Log;
-import java.io.*;
-import java.net.*;
-import java.util.*;
+import org.apache.tomcat.util.res.StringManager;
/**
* Interceptor that loads the "load-on-startup" servlets
1.26 +14 -8
jakarta-tomcat/src/facade22/org/apache/tomcat/facade/RequestDispatcherImpl.java
Index: RequestDispatcherImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/facade22/org/apache/tomcat/facade/RequestDispatcherImpl.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- RequestDispatcherImpl.java 27 Apr 2002 01:55:18 -0000 1.25
+++ RequestDispatcherImpl.java 22 Sep 2003 09:17:17 -0000 1.26
@@ -60,15 +60,21 @@
package org.apache.tomcat.facade;
-import org.apache.tomcat.core.*;
+import java.io.IOException;
+
+import javax.servlet.RequestDispatcher;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+
+import org.apache.tomcat.core.Context;
+import org.apache.tomcat.core.Handler;
+import org.apache.tomcat.core.Request;
+import org.apache.tomcat.core.Response;
+import org.apache.tomcat.util.compat.Action;
+import org.apache.tomcat.util.compat.Jdk11Compat;
+import org.apache.tomcat.util.http.Parameters;
import org.apache.tomcat.util.res.StringManager;
-import org.apache.tomcat.util.compat.*;
-import org.apache.tomcat.util.http.*;
-import java.io.*;
-import java.util.*;
-import java.security.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
/* This code needs a re-write, it's very ugly.
The hardest problem is the requirement to pass the "same" request, but with
1.7 +12 -9
jakarta-tomcat/src/facade22/org/apache/tomcat/facade/ServletInfo.java
Index: ServletInfo.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/facade22/org/apache/tomcat/facade/ServletInfo.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ServletInfo.java 8 Jun 2001 02:58:56 -0000 1.6
+++ ServletInfo.java 22 Sep 2003 09:17:17 -0000 1.7
@@ -58,15 +58,18 @@
*/
package org.apache.tomcat.facade;
-import org.apache.tomcat.core.*;
-import org.apache.tomcat.util.*;
-import org.apache.tomcat.util.depend.*;
-import org.apache.tomcat.util.collections.*;
-import java.io.*;
-import java.net.*;
-import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import java.util.Enumeration;
+import java.util.Hashtable;
+
+import javax.servlet.ServletConfig;
+
+import org.apache.tomcat.core.BaseInterceptor;
+import org.apache.tomcat.core.Context;
+import org.apache.tomcat.core.Handler;
+import org.apache.tomcat.core.TomcatException;
+import org.apache.tomcat.util.collections.EmptyEnumeration;
+import org.apache.tomcat.util.depend.DependManager;
+import org.apache.tomcat.util.depend.Dependency;
/**
* Class used to represent a servlet inside a Context.
1.6 +3 -10
jakarta-tomcat/src/facade22/org/apache/tomcat/facade/CookieFacade.java
Index: CookieFacade.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/facade22/org/apache/tomcat/facade/CookieFacade.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- CookieFacade.java 30 Dec 2000 07:54:10 -0000 1.5
+++ CookieFacade.java 22 Sep 2003 09:17:17 -0000 1.6
@@ -60,16 +60,9 @@
package org.apache.tomcat.facade;
-import org.apache.tomcat.util.*;
-import org.apache.tomcat.util.http.*;
-import org.apache.tomcat.core.*;
-import org.apache.tomcat.facade.*;
-import java.io.*;
-import java.net.*;
-import java.security.*;
-import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import javax.servlet.http.Cookie;
+
+import org.apache.tomcat.util.http.ServerCookie;
/**
* Facade for a ServerCookie object. The ServerCookie is a recyclable
1.4 +7 -10
jakarta-tomcat/src/facade22/org/apache/tomcat/facade/ServletConfigImpl.java
Index: ServletConfigImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/facade22/org/apache/tomcat/facade/ServletConfigImpl.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ServletConfigImpl.java 12 Dec 2000 20:21:22 -0000 1.3
+++ ServletConfigImpl.java 22 Sep 2003 09:17:17 -0000 1.4
@@ -64,13 +64,10 @@
package org.apache.tomcat.facade;
-import org.apache.tomcat.core.*;
-import org.apache.tomcat.util.*;
-import java.io.*;
-import java.net.*;
-import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import java.util.Enumeration;
+
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletContext;
/**
*
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
