hgomez 2003/09/22 02:18:39
Modified: src/share/org/apache/tomcat/modules/config AutoDeploy.java
PathSetter.java AutoWebApp.java HookSetter.java
LogSetter.java ServerXmlReader.java
PolicyLoader.java ContextXmlReader.java
WorkDirSetup.java ProfileLoader.java
TrustedLoader.java LoaderInterceptor11.java
src/share/org/apache/tomcat/modules/server Ajp13Packet.java
JNIRequestAdapter.java JNIConnectionHandler.java
Ajp12.java Ajp13Interceptor.java
JNIResponseAdapter.java Http10.java
Ajp12Interceptor.java Http10Interceptor.java
JNIEndpoint.java Ajp13.java PoolTcpConnector.java
src/share/org/apache/tomcat/modules/mappers
ReloadInterceptor.java DecodeInterceptor.java
src/share/org/apache/tomcat/modules/aaa
CredentialsInterceptor.java AccessInterceptor.java
SimpleRealm.java JDBCRealm.java
src/share/org/apache/tomcat/modules/generators
Jdk12Interceptor.java InvokerInterceptor.java
StaticInterceptor.java ErrorHandler.java
src/share/org/apache/tomcat/modules/session SessionId.java
SessionIdGenerator.java SessionExpirer.java
SimpleSessionStore.java
src/share/org/apache/tomcat/modules/loggers
AccountingInterceptor.java LogEvents.java
Log:
Fourth batch of imports cleanup in TC 3.3.2-dev (tc-modules)
Revision Changes Path
1.7 +11 -7
jakarta-tomcat/src/share/org/apache/tomcat/modules/config/AutoDeploy.java
Index: AutoDeploy.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/config/AutoDeploy.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- AutoDeploy.java 8 Sep 2001 20:14:11 -0000 1.6
+++ AutoDeploy.java 22 Sep 2003 09:18:37 -0000 1.7
@@ -59,14 +59,18 @@
package org.apache.tomcat.modules.config;
-import org.apache.tomcat.core.*;
-import org.apache.tomcat.util.io.FileUtil;
-import org.apache.tomcat.util.depend.*;
-import java.io.*;
-import java.net.*;
-import java.util.*;
+import java.io.File;
+import java.io.IOException;
+import java.util.Hashtable;
-import org.apache.tomcat.util.xml.*;
+import org.apache.tomcat.core.BaseInterceptor;
+import org.apache.tomcat.core.Context;
+import org.apache.tomcat.core.ContextManager;
+import org.apache.tomcat.core.Request;
+import org.apache.tomcat.core.TomcatException;
+import org.apache.tomcat.util.depend.DependManager;
+import org.apache.tomcat.util.depend.Dependency;
+import org.apache.tomcat.util.io.FileUtil;
/**
* Will manage a repository of .war files, expanding them automatically
1.8 +9 -8
jakarta-tomcat/src/share/org/apache/tomcat/modules/config/PathSetter.java
Index: PathSetter.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/config/PathSetter.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- PathSetter.java 27 Jul 2001 01:07:34 -0000 1.7
+++ PathSetter.java 22 Sep 2003 09:18:37 -0000 1.8
@@ -59,16 +59,17 @@
package org.apache.tomcat.modules.config;
-import org.apache.tomcat.core.*;
-import java.io.*;
-import java.net.*;
-import java.util.*;
-import java.security.*;
+import java.io.File;
+import java.io.IOException;
+import java.util.Enumeration;
-import org.apache.tomcat.util.res.StringManager;
-import org.apache.tomcat.util.log.Log;
-import org.apache.tomcat.util.io.FileUtil;
+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.io.FileUtil;
+import org.apache.tomcat.util.res.StringManager;
/**
* Set ( and guess ) the paths to absolute ( and canonical ) directories.
1.13 +8 -6
jakarta-tomcat/src/share/org/apache/tomcat/modules/config/AutoWebApp.java
Index: AutoWebApp.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/config/AutoWebApp.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- AutoWebApp.java 24 Feb 2002 03:46:06 -0000 1.12
+++ AutoWebApp.java 22 Sep 2003 09:18:37 -0000 1.13
@@ -59,13 +59,15 @@
package org.apache.tomcat.modules.config;
-import org.apache.tomcat.core.*;
-import org.apache.tomcat.util.*;
-import java.io.*;
-import java.net.*;
-import java.util.*;
+import java.io.File;
+import java.io.IOException;
+import java.util.Enumeration;
+import java.util.Hashtable;
-import org.apache.tomcat.util.xml.*;
+import org.apache.tomcat.core.BaseInterceptor;
+import org.apache.tomcat.core.Context;
+import org.apache.tomcat.core.ContextManager;
+import org.apache.tomcat.core.TomcatException;
/**
* Automatically add all the web applications from a directory.
1.2 +5 -14
jakarta-tomcat/src/share/org/apache/tomcat/modules/config/HookSetter.java
Index: HookSetter.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/config/HookSetter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- HookSetter.java 21 Aug 2001 05:13:29 -0000 1.1
+++ HookSetter.java 22 Sep 2003 09:18:37 -0000 1.2
@@ -58,21 +58,12 @@
*/
package org.apache.tomcat.modules.config;
-import java.beans.*;
-import java.io.*;
-import java.lang.reflect.*;
-import java.util.Hashtable;
-import java.util.*;
-import java.net.*;
-import org.apache.tomcat.util.res.StringManager;
-import org.apache.tomcat.util.io.FileUtil;
-import org.apache.tomcat.util.xml.*;
-import org.apache.tomcat.core.*;
-import org.apache.tomcat.modules.server.*;
-import org.apache.tomcat.util.log.*;
-import org.apache.tomcat.util.hooks.*;
+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.xml.sax.*;
+import org.apache.tomcat.util.hooks.Hooks;
/**
* Keep hook chains to minimal, using introspection.
1.15 +10 -6
jakarta-tomcat/src/share/org/apache/tomcat/modules/config/LogSetter.java
Index: LogSetter.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/config/LogSetter.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- LogSetter.java 21 Aug 2001 04:58:51 -0000 1.14
+++ LogSetter.java 22 Sep 2003 09:18:37 -0000 1.15
@@ -59,13 +59,17 @@
package org.apache.tomcat.modules.config;
-import org.apache.tomcat.core.*;
-import org.apache.tomcat.util.log.*;
-import org.apache.tomcat.util.qlog.*;
+import java.io.File;
+
+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.io.FileUtil;
-import java.io.*;
-import java.net.*;
-import java.util.*;
+import org.apache.tomcat.util.log.Log;
+import org.apache.tomcat.util.log.LogManager;
+import org.apache.tomcat.util.qlog.LogDaemon;
+import org.apache.tomcat.util.qlog.QueueLogger;
/*
Logging in Tomcat is quite flexible; we can either have a log
1.21 +19 -13
jakarta-tomcat/src/share/org/apache/tomcat/modules/config/ServerXmlReader.java
Index: ServerXmlReader.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/config/ServerXmlReader.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- ServerXmlReader.java 24 Feb 2002 03:37:49 -0000 1.20
+++ ServerXmlReader.java 22 Sep 2003 09:18:37 -0000 1.21
@@ -58,21 +58,27 @@
*/
package org.apache.tomcat.modules.config;
-import java.beans.*;
-import java.io.*;
-import java.lang.reflect.*;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.Enumeration;
import java.util.Hashtable;
-import java.util.*;
-import java.net.*;
-import org.apache.tomcat.util.res.StringManager;
-import org.apache.tomcat.util.io.FileUtil;
-import org.apache.tomcat.util.xml.*;
-import org.apache.tomcat.core.*;
-import org.apache.tomcat.modules.server.*;
-import org.apache.tomcat.util.log.*;
-import org.apache.tomcat.util.hooks.*;
+import java.util.Properties;
+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.IntrospectionUtils;
-import org.xml.sax.*;
+import org.apache.tomcat.util.hooks.Hooks;
+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.AttributeList;
/**
* This is a configuration module that will read a server.xml file
1.3 +5 -9
jakarta-tomcat/src/share/org/apache/tomcat/modules/config/PolicyLoader.java
Index: PolicyLoader.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/config/PolicyLoader.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PolicyLoader.java 21 Aug 2001 05:10:38 -0000 1.2
+++ PolicyLoader.java 22 Sep 2003 09:18:37 -0000 1.3
@@ -59,15 +59,11 @@
package org.apache.tomcat.modules.config;
-import org.apache.tomcat.core.*;
-import org.apache.tomcat.util.*;
-import org.apache.tomcat.util.compat.*;
-import java.io.*;
-import java.net.*;
-import java.util.*;
-import java.security.*;
-
-import org.apache.tomcat.util.log.*;
+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.Jdk11Compat;
/**
* Load the PolicyInterceptor if JDK1.2 is detected and if "sandbox"
1.13 +13 -11
jakarta-tomcat/src/share/org/apache/tomcat/modules/config/ContextXmlReader.java
Index: ContextXmlReader.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/config/ContextXmlReader.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ContextXmlReader.java 5 Dec 2001 11:20:52 -0000 1.12
+++ ContextXmlReader.java 22 Sep 2003 09:18:37 -0000 1.13
@@ -58,19 +58,21 @@
*/
package org.apache.tomcat.modules.config;
-import java.beans.*;
-import java.io.*;
-import java.lang.reflect.*;
+import java.io.File;
+import java.util.Enumeration;
import java.util.Hashtable;
-import java.util.*;
-import java.net.*;
-import org.apache.tomcat.util.res.StringManager;
-import org.apache.tomcat.util.xml.*;
-import org.apache.tomcat.core.*;
-import org.apache.tomcat.modules.server.*;
+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.IntrospectionUtils;
-import org.apache.tomcat.util.log.Log;
-import org.xml.sax.*;
+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.AttributeList;
/**
* This is a configuration module that will read context configuration files,
1.11 +9 -6
jakarta-tomcat/src/share/org/apache/tomcat/modules/config/WorkDirSetup.java
Index: WorkDirSetup.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/config/WorkDirSetup.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- WorkDirSetup.java 25 Sep 2001 03:45:26 -0000 1.10
+++ WorkDirSetup.java 22 Sep 2003 09:18:37 -0000 1.11
@@ -59,12 +59,15 @@
package org.apache.tomcat.modules.config;
-import org.apache.tomcat.core.*;
-import org.apache.tomcat.util.*;
-import org.apache.tomcat.util.io.*;
-import java.io.*;
-import java.net.*;
-import java.util.*;
+import java.io.File;
+import java.net.URLEncoder;
+
+import org.apache.tomcat.core.BaseInterceptor;
+import org.apache.tomcat.core.Context;
+import org.apache.tomcat.core.ContextManager;
+import org.apache.tomcat.core.Request;
+import org.apache.tomcat.core.TomcatException;
+import org.apache.tomcat.util.io.FileUtil;
/**
* Handles work dir setup/removal.
1.6 +14 -13
jakarta-tomcat/src/share/org/apache/tomcat/modules/config/ProfileLoader.java
Index: ProfileLoader.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/config/ProfileLoader.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ProfileLoader.java 9 Jun 2001 03:22:32 -0000 1.5
+++ ProfileLoader.java 22 Sep 2003 09:18:37 -0000 1.6
@@ -58,21 +58,22 @@
*/
package org.apache.tomcat.modules.config;
-import java.beans.*;
-import java.io.*;
-import java.lang.reflect.*;
+import java.io.File;
+import java.net.URL;
+import java.util.Enumeration;
import java.util.Hashtable;
-import java.util.*;
-import java.net.*;
-import org.apache.tomcat.util.res.StringManager;
-import org.apache.tomcat.util.io.FileUtil;
-import org.apache.tomcat.util.xml.*;
-import org.apache.tomcat.util.compat.*;
+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.IntrospectionUtils;
-import org.apache.tomcat.core.*;
-import org.apache.tomcat.modules.server.*;
-import org.apache.tomcat.util.log.*;
-import org.xml.sax.*;
+import org.apache.tomcat.util.compat.Jdk11Compat;
+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.AttributeList;
/**
* This module can be used to specify groups of modules and
1.7 +13 -14
jakarta-tomcat/src/share/org/apache/tomcat/modules/config/TrustedLoader.java
Index: TrustedLoader.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/config/TrustedLoader.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- TrustedLoader.java 25 Sep 2002 04:31:49 -0000 1.6
+++ TrustedLoader.java 22 Sep 2003 09:18:37 -0000 1.7
@@ -58,21 +58,20 @@
*/
package org.apache.tomcat.modules.config;
-import java.beans.*;
-import java.io.*;
-import java.lang.reflect.*;
+import java.io.File;
+import java.util.Enumeration;
import java.util.Hashtable;
-import java.util.*;
-import java.net.*;
-import org.apache.tomcat.util.res.StringManager;
-import org.apache.tomcat.util.io.FileUtil;
-import org.apache.tomcat.util.xml.*;
-import org.apache.tomcat.core.*;
-import org.apache.tomcat.modules.server.*;
-import org.apache.tomcat.util.log.*;
-import org.apache.tomcat.util.hooks.*;
-import org.apache.tomcat.util.IntrospectionUtils;
-import org.xml.sax.*;
+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.Request;
+import org.apache.tomcat.core.TomcatException;
+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.AttributeList;
/**
* Special configuration for trusted applications.
1.26 +15 -7
jakarta-tomcat/src/share/org/apache/tomcat/modules/config/LoaderInterceptor11.java
Index: LoaderInterceptor11.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/config/LoaderInterceptor11.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- LoaderInterceptor11.java 21 Aug 2002 04:08:43 -0000 1.25
+++ LoaderInterceptor11.java 22 Sep 2003 09:18:37 -0000 1.26
@@ -59,13 +59,21 @@
package org.apache.tomcat.modules.config;
-import org.apache.tomcat.core.*;
-import org.apache.tomcat.util.*;
-import org.apache.tomcat.util.compat.*;
-import java.io.*;
-import java.net.*;
-import java.util.*;
-import java.security.*;
+import java.io.File;
+import java.io.FilenameFilter;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.Enumeration;
+import java.util.StringTokenizer;
+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.Request;
+import org.apache.tomcat.core.TomcatException;
+import org.apache.tomcat.util.compat.Jdk11Compat;
+import org.apache.tomcat.util.compat.SimpleClassLoader;
/**
* Set class loader based on WEB-INF/classes, lib.
1.6 +2 -9
jakarta-tomcat/src/share/org/apache/tomcat/modules/server/Ajp13Packet.java
Index: Ajp13Packet.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/server/Ajp13Packet.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Ajp13Packet.java 21 Feb 2002 03:04:20 -0000 1.5
+++ Ajp13Packet.java 22 Sep 2003 09:18:37 -0000 1.6
@@ -60,17 +60,10 @@
package org.apache.tomcat.modules.server;
import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.Socket;
-import java.util.Enumeration;
-import org.apache.tomcat.core.*;
-import org.apache.tomcat.util.*;
-import org.apache.tomcat.util.http.MimeHeaders;
+import org.apache.tomcat.core.OutputBuffer;
import org.apache.tomcat.util.buf.MessageBytes;
-import org.apache.tomcat.util.http.HttpMessages;
+import org.apache.tomcat.util.http.MimeHeaders;
/* Frozen, bug fixes only: all active development goes in
jakarta-tomcat-connectors/jk/org/apache/ajp/Ajp14*
1.2 +3 -5
jakarta-tomcat/src/share/org/apache/tomcat/modules/server/JNIRequestAdapter.java
Index: JNIRequestAdapter.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/server/JNIRequestAdapter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JNIRequestAdapter.java 23 Sep 2001 18:10:11 -0000 1.1
+++ JNIRequestAdapter.java 22 Sep 2003 09:18:37 -0000 1.2
@@ -60,11 +60,9 @@
package org.apache.tomcat.modules.server;
import java.io.IOException;
-import org.apache.tomcat.core.*;
-import org.apache.tomcat.util.*;
-import org.apache.tomcat.util.http.*;
-import java.util.Vector;
-import java.io.File;
+
+import org.apache.tomcat.core.ContextManager;
+import org.apache.tomcat.core.Request;
public class JNIRequestAdapter extends Request {
JNIConnectionHandler h;
1.16 +5 -5
jakarta-tomcat/src/share/org/apache/tomcat/modules/server/JNIConnectionHandler.java
Index: JNIConnectionHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/server/JNIConnectionHandler.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- JNIConnectionHandler.java 23 Sep 2001 22:14:35 -0000 1.15
+++ JNIConnectionHandler.java 22 Sep 2003 09:18:37 -0000 1.16
@@ -59,12 +59,12 @@
package org.apache.tomcat.modules.server;
-import java.io.IOException;
-import org.apache.tomcat.core.*;
-import org.apache.tomcat.util.*;
-import org.apache.tomcat.util.http.*;
-import java.util.Vector;
import java.io.File;
+import java.util.Vector;
+
+import org.apache.tomcat.core.BaseInterceptor;
+import org.apache.tomcat.core.ContextManager;
+import org.apache.tomcat.core.TomcatException;
// we'll use the system.out/err until the code is stable, then
// try to logger. Since this is a normal interceptor everything should
1.23 +8 -6
jakarta-tomcat/src/share/org/apache/tomcat/modules/server/Ajp12.java
Index: Ajp12.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/server/Ajp12.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- Ajp12.java 12 Sep 2001 21:40:36 -0000 1.22
+++ Ajp12.java 22 Sep 2003 09:18:37 -0000 1.23
@@ -64,12 +64,14 @@
*/
package org.apache.tomcat.modules.server;
-import java.io.*;
-import java.net.*;
-import java.util.*;
-import org.apache.tomcat.core.*;
-import org.apache.tomcat.util.net.*;
-import org.apache.tomcat.util.*;
+import java.io.BufferedInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.InetAddress;
+import java.net.Socket;
+
+import org.apache.tomcat.core.ContextManager;
+import org.apache.tomcat.core.Request;
import org.apache.tomcat.util.aaa.SimplePrincipal;
class Ajp12 {
1.22 +17 -10
jakarta-tomcat/src/share/org/apache/tomcat/modules/server/Ajp13Interceptor.java
Index: Ajp13Interceptor.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/server/Ajp13Interceptor.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- Ajp13Interceptor.java 8 Mar 2002 11:39:48 -0000 1.21
+++ Ajp13Interceptor.java 22 Sep 2003 09:18:37 -0000 1.22
@@ -63,14 +63,21 @@
package org.apache.tomcat.modules.server;
-import java.io.*;
-import java.net.*;
-import java.util.*;
-import org.apache.tomcat.core.*;
-import org.apache.tomcat.util.net.*;
-import org.apache.tomcat.util.*;
-import org.apache.tomcat.util.log.*;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.net.InetAddress;
+import java.net.Socket;
+import java.util.Properties;
+
+import org.apache.tomcat.core.ContextManager;
+import org.apache.tomcat.core.Request;
+import org.apache.tomcat.core.Response;
+import org.apache.tomcat.core.TomcatException;
import org.apache.tomcat.util.io.FileUtil;
+import org.apache.tomcat.util.log.Log;
+import org.apache.tomcat.util.net.TcpConnection;
+import org.apache.tomcat.util.net.TcpConnectionHandler;
/* Frozen, bug fixes only: all active development goes in
jakarta-tomcat-connectors/jk/org/apache/ajp/Ajp14*
1.2 +3 -5
jakarta-tomcat/src/share/org/apache/tomcat/modules/server/JNIResponseAdapter.java
Index: JNIResponseAdapter.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/server/JNIResponseAdapter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JNIResponseAdapter.java 23 Sep 2001 18:10:11 -0000 1.1
+++ JNIResponseAdapter.java 22 Sep 2003 09:18:37 -0000 1.2
@@ -60,11 +60,9 @@
package org.apache.tomcat.modules.server;
import java.io.IOException;
-import org.apache.tomcat.core.*;
-import org.apache.tomcat.util.*;
-import org.apache.tomcat.util.http.*;
-import java.util.Vector;
-import java.io.File;
+
+import org.apache.tomcat.core.Response;
+import org.apache.tomcat.util.http.HttpMessages;
public class JNIResponseAdapter extends Response {
1.15 +8 -7
jakarta-tomcat/src/share/org/apache/tomcat/modules/server/Http10.java
Index: Http10.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/server/Http10.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- Http10.java 28 Feb 2002 03:21:27 -0000 1.14
+++ Http10.java 22 Sep 2003 09:18:37 -0000 1.15
@@ -60,14 +60,15 @@
package org.apache.tomcat.modules.server;
-import org.apache.tomcat.core.*;
-import org.apache.tomcat.util.http.*;
-import org.apache.tomcat.util.buf.*;
-import org.apache.tomcat.util.io.*;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.Socket;
+
+import org.apache.tomcat.util.buf.MessageBytes;
+import org.apache.tomcat.util.http.MimeHeaders;
+import org.apache.tomcat.util.io.RecycleBufferedInputStream;
import org.apache.tomcat.util.log.Log;
-import java.io.*;
-import java.net.*;
-import java.util.*;
public class Http10 {
private Socket socket;
1.20 +14 -7
jakarta-tomcat/src/share/org/apache/tomcat/modules/server/Ajp12Interceptor.java
Index: Ajp12Interceptor.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/server/Ajp12Interceptor.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- Ajp12Interceptor.java 8 Mar 2002 11:37:21 -0000 1.19
+++ Ajp12Interceptor.java 22 Sep 2003 09:18:37 -0000 1.20
@@ -64,14 +64,21 @@
*/
package org.apache.tomcat.modules.server;
-import java.io.*;
-import java.net.*;
-import java.util.*;
-import org.apache.tomcat.core.*;
-import org.apache.tomcat.util.net.*;
-import org.apache.tomcat.util.*;
-import org.apache.tomcat.util.http.*;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.net.InetAddress;
+import java.net.Socket;
+
+import org.apache.tomcat.core.ContextManager;
+import org.apache.tomcat.core.Request;
+import org.apache.tomcat.core.Response;
+import org.apache.tomcat.core.TomcatException;
+import org.apache.tomcat.util.http.HttpMessages;
import org.apache.tomcat.util.io.FileUtil;
+import org.apache.tomcat.util.net.TcpConnection;
+import org.apache.tomcat.util.net.TcpConnectionHandler;
/*
*/
1.36 +18 -12
jakarta-tomcat/src/share/org/apache/tomcat/modules/server/Http10Interceptor.java
Index: Http10Interceptor.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/server/Http10Interceptor.java,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- Http10Interceptor.java 28 Oct 2002 19:05:40 -0000 1.35
+++ Http10Interceptor.java 22 Sep 2003 09:18:37 -0000 1.36
@@ -60,18 +60,24 @@
package org.apache.tomcat.modules.server;
-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.tomcat.util.compat.*;
+import java.io.IOException;
+import java.net.InetAddress;
+import java.net.Socket;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Locale;
+
+import org.apache.tomcat.core.Context;
+import org.apache.tomcat.core.ContextManager;
+import org.apache.tomcat.core.Request;
+import org.apache.tomcat.core.Response;
+import org.apache.tomcat.util.buf.DateTool;
+import org.apache.tomcat.util.buf.MessageBytes;
+import org.apache.tomcat.util.http.HttpMessages;
+import org.apache.tomcat.util.log.Log;
+import org.apache.tomcat.util.net.SSLSupport;
+import org.apache.tomcat.util.net.TcpConnection;
+import org.apache.tomcat.util.net.TcpConnectionHandler;
/** Standalone http.
*
1.9 +4 -4
jakarta-tomcat/src/share/org/apache/tomcat/modules/server/JNIEndpoint.java
Index: JNIEndpoint.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/server/JNIEndpoint.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- JNIEndpoint.java 23 Sep 2001 22:17:36 -0000 1.8
+++ JNIEndpoint.java 22 Sep 2003 09:18:37 -0000 1.9
@@ -59,10 +59,10 @@
package org.apache.tomcat.modules.server;
-import java.util.*;
-import java.io.*;
-import org.apache.tomcat.core.*;
-import org.apache.tomcat.util.*;
+import java.io.FileOutputStream;
+import java.io.PrintStream;
+import java.util.StringTokenizer;
+import java.util.Vector;
/**
* Handle incoming JNI connections. This class will be called from
1.33 +5 -8
jakarta-tomcat/src/share/org/apache/tomcat/modules/server/Ajp13.java
Index: Ajp13.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/server/Ajp13.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- Ajp13.java 7 Feb 2002 05:05:54 -0000 1.32
+++ Ajp13.java 22 Sep 2003 09:18:37 -0000 1.33
@@ -60,20 +60,17 @@
package org.apache.tomcat.modules.server;
import java.io.IOException;
-import java.io.UnsupportedEncodingException;
import java.io.InputStream;
import java.io.OutputStream;
import java.net.Socket;
-import java.util.Enumeration;
-import java.io.ByteArrayInputStream;
-import org.apache.tomcat.core.*;
-import org.apache.tomcat.util.*;
-import org.apache.tomcat.util.compat.*;
-import org.apache.tomcat.util.http.MimeHeaders;
-import org.apache.tomcat.util.buf.MessageBytes;
+import org.apache.tomcat.core.OutputBuffer;
+import org.apache.tomcat.core.Request;
import org.apache.tomcat.util.aaa.SimplePrincipal;
+import org.apache.tomcat.util.buf.MessageBytes;
+import org.apache.tomcat.util.compat.Jdk11Compat;
import org.apache.tomcat.util.http.HttpMessages;
+import org.apache.tomcat.util.http.MimeHeaders;
/* Frozen, bug fixes only: all active development goes in
jakarta-tomcat-connectors/jk/org/apache/ajp/Ajp14*
1.17 +10 -6
jakarta-tomcat/src/share/org/apache/tomcat/modules/server/PoolTcpConnector.java
Index: PoolTcpConnector.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/server/PoolTcpConnector.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- PoolTcpConnector.java 13 Mar 2002 03:43:33 -0000 1.16
+++ PoolTcpConnector.java 22 Sep 2003 09:18:37 -0000 1.17
@@ -59,12 +59,16 @@
package org.apache.tomcat.modules.server;
-import org.apache.tomcat.util.*;
-import org.apache.tomcat.core.*;
-import org.apache.tomcat.util.net.*;
-import java.io.*;
-import java.net.*;
-import java.util.*;
+import java.net.InetAddress;
+import java.util.Enumeration;
+import java.util.Hashtable;
+
+import org.apache.tomcat.core.BaseInterceptor;
+import org.apache.tomcat.core.ContextManager;
+import org.apache.tomcat.core.TomcatException;
+import org.apache.tomcat.util.net.PoolTcpEndpoint;
+import org.apache.tomcat.util.net.SSLImplementation;
+import org.apache.tomcat.util.net.ServerSocketFactory;
/* Similar with MPM module in Apache2.0. Handles all the details related with
1.16 +14 -6
jakarta-tomcat/src/share/org/apache/tomcat/modules/mappers/ReloadInterceptor.java
Index: ReloadInterceptor.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/mappers/ReloadInterceptor.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ReloadInterceptor.java 21 Aug 2002 04:07:35 -0000 1.15
+++ ReloadInterceptor.java 22 Sep 2003 09:18:38 -0000 1.16
@@ -59,12 +59,20 @@
package org.apache.tomcat.modules.mappers;
-import org.apache.tomcat.core.*;
-import org.apache.tomcat.util.*;
-import org.apache.tomcat.util.depend.*;
-import java.io.*;
-import java.net.*;
-import java.util.*;
+import java.io.File;
+import java.util.Enumeration;
+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.ContextManager;
+import org.apache.tomcat.core.Handler;
+import org.apache.tomcat.core.Request;
+import org.apache.tomcat.core.TomcatException;
+import org.apache.tomcat.util.depend.DependClassLoader;
+import org.apache.tomcat.util.depend.DependManager;
+import org.apache.tomcat.util.depend.Dependency;
/**
* This interceptor deals with context reloading.
1.21 +13 -5
jakarta-tomcat/src/share/org/apache/tomcat/modules/mappers/DecodeInterceptor.java
Index: DecodeInterceptor.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/mappers/DecodeInterceptor.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- DecodeInterceptor.java 16 Feb 2003 22:22:16 -0000 1.20
+++ DecodeInterceptor.java 22 Sep 2003 09:18:38 -0000 1.21
@@ -59,11 +59,19 @@
package org.apache.tomcat.modules.mappers;
-import org.apache.tomcat.core.*;
-import org.apache.tomcat.util.buf.*;
-import org.apache.tomcat.util.http.*;
-import java.util.*;
-import java.io.*;
+import java.io.IOException;
+
+import org.apache.tomcat.core.BaseInterceptor;
+import org.apache.tomcat.core.Context;
+import org.apache.tomcat.core.ContextManager;
+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.buf.ByteChunk;
+import org.apache.tomcat.util.buf.MessageBytes;
+import org.apache.tomcat.util.http.ContentType;
+import org.apache.tomcat.util.http.MimeHeaders;
/**
* Default actions after receiving the request: get charset, unescape,
1.4 +7 -6
jakarta-tomcat/src/share/org/apache/tomcat/modules/aaa/CredentialsInterceptor.java
Index: CredentialsInterceptor.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/aaa/CredentialsInterceptor.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- CredentialsInterceptor.java 20 Feb 2001 03:16:51 -0000 1.3
+++ CredentialsInterceptor.java 22 Sep 2003 09:18:38 -0000 1.4
@@ -58,13 +58,14 @@
*/
package org.apache.tomcat.modules.aaa;
-import org.apache.tomcat.core.*;
+import org.apache.tomcat.core.BaseInterceptor;
+import org.apache.tomcat.core.Context;
+import org.apache.tomcat.core.ContextManager;
+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.buf.Base64;
-import org.apache.tomcat.util.xml.*;
-import java.io.*;
-import java.net.*;
-import java.util.*;
-import org.xml.sax.*;
/**
* Extract user/password credentials from a request.
1.21 +14 -5
jakarta-tomcat/src/share/org/apache/tomcat/modules/aaa/AccessInterceptor.java
Index: AccessInterceptor.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/aaa/AccessInterceptor.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- AccessInterceptor.java 8 Dec 2001 04:50:41 -0000 1.20
+++ AccessInterceptor.java 22 Sep 2003 09:18:38 -0000 1.21
@@ -59,12 +59,21 @@
package org.apache.tomcat.modules.aaa;
-import org.apache.tomcat.core.*;
-import org.apache.tomcat.util.buf.*;
+import java.io.File;
+
+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.buf.Ascii;
+import org.apache.tomcat.util.buf.MessageBytes;
+import org.apache.tomcat.util.http.Parameters;
import org.apache.tomcat.util.io.FileUtil;
-import org.apache.tomcat.util.http.*;
-import java.util.*;
-import java.io.*;
// XXX maybe it's a good idea to use a different model for adding secuirty
// constraints - we use Container now because we want to generalize all
1.4 +12 -9
jakarta-tomcat/src/share/org/apache/tomcat/modules/aaa/SimpleRealm.java
Index: SimpleRealm.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/aaa/SimpleRealm.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SimpleRealm.java 14 Jul 2001 03:20:37 -0000 1.3
+++ SimpleRealm.java 22 Sep 2003 09:18:38 -0000 1.4
@@ -60,16 +60,19 @@
package org.apache.tomcat.modules.aaa;
-import org.apache.tomcat.core.*;
-import org.apache.tomcat.util.*;
-import org.apache.tomcat.util.log.*;
-import org.apache.tomcat.util.xml.*;
-import org.apache.tomcat.util.aaa.*;
-import java.io.*;
-import java.net.*;
-import java.util.*;
+import java.io.File;
import java.security.Principal;
-import org.xml.sax.*;
+import java.util.Hashtable;
+import java.util.Vector;
+
+import org.apache.tomcat.core.Context;
+import org.apache.tomcat.core.ContextManager;
+import org.apache.tomcat.core.TomcatException;
+import org.apache.tomcat.util.aaa.SimplePrincipal;
+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.AttributeList;
/**
* Memory based realm - will authenticate an user and password against
1.10 +12 -11
jakarta-tomcat/src/share/org/apache/tomcat/modules/aaa/JDBCRealm.java
Index: JDBCRealm.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/aaa/JDBCRealm.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- JDBCRealm.java 8 Oct 2001 04:58:19 -0000 1.9
+++ JDBCRealm.java 22 Sep 2003 09:18:38 -0000 1.10
@@ -61,16 +61,17 @@
package org.apache.tomcat.modules.aaa;
-import org.apache.tomcat.core.*;
-import org.apache.tomcat.util.aaa.*;
-import java.security.*;
import java.security.Principal;
-
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
import java.util.Vector;
-import java.io.*;
-import java.net.*;
-import java.util.*;
-import java.sql.*;
+
+import org.apache.tomcat.core.Context;
+import org.apache.tomcat.core.TomcatException;
+import org.apache.tomcat.util.aaa.SimplePrincipal;
/**
* Implmentation of <b>Realm</b> that works with any JDBC supported database.
1.9 +8 -6
jakarta-tomcat/src/share/org/apache/tomcat/modules/generators/Jdk12Interceptor.java
Index: Jdk12Interceptor.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/generators/Jdk12Interceptor.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Jdk12Interceptor.java 29 Jun 2002 03:41:02 -0000 1.8
+++ Jdk12Interceptor.java 22 Sep 2003 09:18:38 -0000 1.9
@@ -59,12 +59,14 @@
package org.apache.tomcat.modules.generators;
-import org.apache.tomcat.core.*;
-import org.apache.tomcat.util.*;
-import org.apache.tomcat.util.compat.*;
-import java.io.*;
-import java.net.*;
-import java.util.*;
+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;
/**
* JDK1.2 specific options. Fix the class loader, etc.
1.3 +6 -4
jakarta-tomcat/src/share/org/apache/tomcat/modules/generators/InvokerInterceptor.java
Index: InvokerInterceptor.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/generators/InvokerInterceptor.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- InvokerInterceptor.java 7 Nov 2001 13:41:17 -0000 1.2
+++ InvokerInterceptor.java 22 Sep 2003 09:18:38 -0000 1.3
@@ -58,10 +58,12 @@
*/
package org.apache.tomcat.modules.generators;
-import org.apache.tomcat.util.*;
-import org.apache.tomcat.core.*;
-import java.io.IOException;
-import java.io.PrintWriter;
+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.TomcatException;
/**
*
1.30 +26 -9
jakarta-tomcat/src/share/org/apache/tomcat/modules/generators/StaticInterceptor.java
Index: StaticInterceptor.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/generators/StaticInterceptor.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- StaticInterceptor.java 15 Jul 2003 06:07:15 -0000 1.29
+++ StaticInterceptor.java 22 Sep 2003 09:18:38 -0000 1.30
@@ -58,16 +58,33 @@
*/
package org.apache.tomcat.modules.generators;
-import org.apache.tomcat.core.*;
-import org.apache.tomcat.util.res.StringManager;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.Writer;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Enumeration;
+import java.util.Locale;
+
+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.OutputBuffer;
+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.buf.UEncoder;
+import org.apache.tomcat.util.http.AcceptLanguage;
+import org.apache.tomcat.util.http.LocaleToCharsetMap;
+import org.apache.tomcat.util.http.MimeHeaders;
import org.apache.tomcat.util.io.FileUtil;
-import org.apache.tomcat.util.http.*;
-import org.apache.tomcat.util.buf.*;
-import java.io.*;
-import java.net.*;
-import java.text.*;
-import java.util.*;
-import java.security.*;
+import org.apache.tomcat.util.res.StringManager;
/**
* Handler for static files.
1.29 +16 -10
jakarta-tomcat/src/share/org/apache/tomcat/modules/generators/ErrorHandler.java
Index: ErrorHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/generators/ErrorHandler.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- ErrorHandler.java 31 May 2003 02:45:58 -0000 1.28
+++ ErrorHandler.java 22 Sep 2003 09:18:38 -0000 1.29
@@ -59,18 +59,24 @@
package org.apache.tomcat.modules.generators;
-import org.apache.tomcat.core.*;
-import org.apache.tomcat.util.res.StringManager;
-import org.apache.tomcat.util.qlog.Logger;
+import java.io.IOException;
+import java.lang.reflect.Method;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.Locale;
+
+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.http.HttpMessages;
import org.apache.tomcat.util.http.LocaleToCharsetMap;
-import java.io.*;
-import java.net.*;
-import java.util.*;
-import java.security.*;
-import java.lang.reflect.*;
-
-import org.apache.tomcat.util.log.*;
+import org.apache.tomcat.util.log.Log;
+import org.apache.tomcat.util.qlog.Logger;
+import org.apache.tomcat.util.res.StringManager;
/**
* Handle errors - this is the default handler, you can replace it
1.23 +9 -6
jakarta-tomcat/src/share/org/apache/tomcat/modules/session/SessionId.java
Index: SessionId.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/session/SessionId.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- SessionId.java 18 Jan 2003 03:29:03 -0000 1.22
+++ SessionId.java 22 Sep 2003 09:18:38 -0000 1.23
@@ -59,12 +59,15 @@
package org.apache.tomcat.modules.session;
-import org.apache.tomcat.core.*;
-import org.apache.tomcat.util.*;
-import org.apache.tomcat.util.http.*;
-import java.io.*;
-import java.net.*;
-import java.util.*;
+import java.io.File;
+
+import org.apache.tomcat.core.BaseInterceptor;
+import org.apache.tomcat.core.Container;
+import org.apache.tomcat.core.Context;
+import org.apache.tomcat.core.Request;
+import org.apache.tomcat.core.Response;
+import org.apache.tomcat.core.ServerSession;
+import org.apache.tomcat.util.http.ServerCookie;
/**
* Extract the session ID from the request using cookies and
1.8 +12 -10
jakarta-tomcat/src/share/org/apache/tomcat/modules/session/SessionIdGenerator.java
Index: SessionIdGenerator.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/session/SessionIdGenerator.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- SessionIdGenerator.java 13 Oct 2001 04:25:26 -0000 1.7
+++ SessionIdGenerator.java 22 Sep 2003 09:18:38 -0000 1.8
@@ -58,17 +58,19 @@
*/
package org.apache.tomcat.modules.session;
-import java.io.*;
+import java.io.DataInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
import java.util.Random;
-import org.apache.tomcat.util.*;
-import org.apache.tomcat.util.compat.*;
-import org.apache.tomcat.util.threads.*;
-import org.apache.tomcat.core.*;
-import java.util.*;
-import org.apache.tomcat.util.collections.SimplePool;
-import org.apache.tomcat.util.log.*;
-import org.apache.tomcat.util.buf.*;
-import java.security.*;
+
+import org.apache.tomcat.core.BaseInterceptor;
+import org.apache.tomcat.core.ContextManager;
+import org.apache.tomcat.core.Request;
+import org.apache.tomcat.core.ServerSession;
+import org.apache.tomcat.core.TomcatException;
+import org.apache.tomcat.util.compat.Action;
+import org.apache.tomcat.util.compat.Jdk11Compat;
/**
1.6 +8 -11
jakarta-tomcat/src/share/org/apache/tomcat/modules/session/SessionExpirer.java
Index: SessionExpirer.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/session/SessionExpirer.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SessionExpirer.java 10 Jan 2003 05:39:11 -0000 1.5
+++ SessionExpirer.java 22 Sep 2003 09:18:38 -0000 1.6
@@ -58,17 +58,14 @@
*/
package org.apache.tomcat.modules.session;
-import java.io.*;
-import java.util.Random;
-import org.apache.tomcat.util.*;
-import org.apache.tomcat.util.compat.*;
-import org.apache.tomcat.util.threads.*;
-import org.apache.tomcat.core.*;
-import java.util.*;
-import org.apache.tomcat.util.collections.SimplePool;
-import org.apache.tomcat.util.log.*;
-import org.apache.tomcat.util.buf.*;
-import java.security.*;
+import org.apache.tomcat.core.BaseInterceptor;
+import org.apache.tomcat.core.Context;
+import org.apache.tomcat.core.ContextManager;
+import org.apache.tomcat.core.Request;
+import org.apache.tomcat.core.ServerSession;
+import org.apache.tomcat.core.TomcatException;
+import org.apache.tomcat.util.buf.TimeStamp;
+import org.apache.tomcat.util.threads.Expirer;
/**
1.23 +12 -10
jakarta-tomcat/src/share/org/apache/tomcat/modules/session/SimpleSessionStore.java
Index: SimpleSessionStore.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/session/SimpleSessionStore.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- SimpleSessionStore.java 10 Jan 2003 05:39:11 -0000 1.22
+++ SimpleSessionStore.java 22 Sep 2003 09:18:38 -0000 1.23
@@ -58,17 +58,19 @@
*/
package org.apache.tomcat.modules.session;
-import java.io.*;
-import java.util.Random;
-import org.apache.tomcat.util.*;
-import org.apache.tomcat.util.compat.*;
-import org.apache.tomcat.util.threads.*;
-import org.apache.tomcat.core.*;
-import java.util.*;
+import java.io.Serializable;
+import java.util.Enumeration;
+import java.util.Hashtable;
+
+import org.apache.tomcat.core.BaseInterceptor;
+import org.apache.tomcat.core.Context;
+import org.apache.tomcat.core.ContextManager;
+import org.apache.tomcat.core.Request;
+import org.apache.tomcat.core.ServerSession;
+import org.apache.tomcat.core.TomcatException;
+import org.apache.tomcat.util.ObjectSerializer;
+import org.apache.tomcat.util.buf.TimeStamp;
import org.apache.tomcat.util.collections.SimplePool;
-import org.apache.tomcat.util.log.*;
-import org.apache.tomcat.util.buf.*;
-import java.security.*;
/**
1.3 +9 -5
jakarta-tomcat/src/share/org/apache/tomcat/modules/loggers/AccountingInterceptor.java
Index: AccountingInterceptor.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/loggers/AccountingInterceptor.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AccountingInterceptor.java 27 Feb 2001 16:20:04 -0000 1.2
+++ AccountingInterceptor.java 22 Sep 2003 09:18:39 -0000 1.3
@@ -59,11 +59,15 @@
package org.apache.tomcat.modules.loggers;
-import org.apache.tomcat.core.*;
-import org.apache.tomcat.util.*;
-import java.io.*;
-import java.net.*;
-import java.util.*;
+import java.io.BufferedOutputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+
+import org.apache.tomcat.core.BaseInterceptor;
+import org.apache.tomcat.core.ContextManager;
+import org.apache.tomcat.core.Request;
+import org.apache.tomcat.core.Response;
+import org.apache.tomcat.core.TomcatException;
/**
* Time counting.
1.5 +9 -6
jakarta-tomcat/src/share/org/apache/tomcat/modules/loggers/LogEvents.java
Index: LogEvents.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/loggers/LogEvents.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- LogEvents.java 28 Jun 2001 07:29:03 -0000 1.4
+++ LogEvents.java 22 Sep 2003 09:18:39 -0000 1.5
@@ -59,12 +59,15 @@
package org.apache.tomcat.modules.loggers;
-import org.apache.tomcat.core.*;
-import org.apache.tomcat.util.*;
-import org.apache.tomcat.util.hooks.*;
-import java.io.*;
-import java.net.*;
-import java.util.*;
+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.TomcatException;
+import org.apache.tomcat.util.hooks.Hooks;
/** Log all hook events during tomcat execution.
* Use debug>0 to log addContainer ( since this generates a lot of
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
