hgomez 2003/09/18 09:21:02
Modified: jk/java/org/apache/jk/common Shm.java JniHandler.java
MsgAjp.java ChannelShm.java WorkerDummy.java
ChannelUn.java ChannelJni.java
jk/java/org/apache/ajp/tomcat4 Ajp13Processor.java
Ajp13Request.java Ajp13Connector.java
JkServlet.java
jk/java/org/apache/ajp/tomcat33 Ajp14Interceptor.java
jk/java/org/apache/jk/apr TomcatStarter.java
jk/java/org/apache/jk/config GeneratorJk1.java
GeneratorApache2.java GeneratorJk2.java
WebXml2Jk.java
jk/java/org/apache/ajp AjpHandler.java
NegociationHandler.java Ajp13Packet.java
RequestHandler.java Ajp13.java
jk/java/org/apache/jk/core MsgContext.java Msg.java
jk/java/org/apache/ajp/tomcat4/config ApacheConfig.java
jk/java/org/apache/jk/server JkMain.java
JkCoyoteHandler.java
Log:
Last batch of clean import.
More next week (if Remy didn't drop my commiter status before ;)
Revision Changes Path
1.13 +7 -12 jakarta-tomcat-connectors/jk/java/org/apache/jk/common/Shm.java
Index: Shm.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/common/Shm.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- Shm.java 28 May 2002 22:51:11 -0000 1.12
+++ Shm.java 18 Sep 2003 16:21:00 -0000 1.13
@@ -59,20 +59,15 @@
package org.apache.jk.common;
-import java.io.*;
-
-import java.net.*;
-import java.util.*;
-
-import org.apache.tomcat.util.buf.*;
-import org.apache.tomcat.util.http.*;
-
-import org.apache.tomcat.util.threads.*;
-
-import org.apache.jk.core.*;
-import org.apache.jk.apr.*;
+import java.io.IOException;
+import java.util.Vector;
+import org.apache.jk.apr.AprImpl;
+import org.apache.jk.core.Msg;
+import org.apache.jk.core.MsgContext;
+import org.apache.jk.core.WorkerEnv;
import org.apache.tomcat.util.IntrospectionUtils;
+import org.apache.tomcat.util.buf.C2BConverter;
/* The code is a bit confusing at this moment - the class is used as
a Bean, or ant Task, or CLI - i.e. you set properties and call execute.
1.13 +9 -11
jakarta-tomcat-connectors/jk/java/org/apache/jk/common/JniHandler.java
Index: JniHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/common/JniHandler.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- JniHandler.java 19 Apr 2003 21:09:44 -0000 1.12
+++ JniHandler.java 18 Sep 2003 16:21:00 -0000 1.13
@@ -59,20 +59,18 @@
package org.apache.jk.common;
-import java.io.*;
+import java.io.IOException;
-import java.net.*;
-import java.util.*;
-
-import org.apache.tomcat.util.buf.*;
-import org.apache.tomcat.util.http.*;
-
-import org.apache.tomcat.util.threads.*;
+import javax.management.ObjectName;
-import org.apache.jk.core.*;
-import org.apache.jk.apr.*;
import org.apache.commons.modeler.Registry;
-import javax.management.ObjectName;
+import org.apache.jk.apr.AprImpl;
+import org.apache.jk.core.JkHandler;
+import org.apache.jk.core.Msg;
+import org.apache.jk.core.MsgContext;
+import org.apache.tomcat.util.buf.ByteChunk;
+import org.apache.tomcat.util.buf.C2BConverter;
+import org.apache.tomcat.util.buf.MessageBytes;
/**
1.14 +3 -12
jakarta-tomcat-connectors/jk/java/org/apache/jk/common/MsgAjp.java
Index: MsgAjp.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/common/MsgAjp.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- MsgAjp.java 20 Jan 2003 19:20:32 -0000 1.13
+++ MsgAjp.java 18 Sep 2003 16:21:00 -0000 1.14
@@ -59,19 +59,10 @@
package org.apache.jk.common;
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.security.*;
-import org.apache.tomcat.util.http.MimeHeaders;
-import org.apache.tomcat.util.buf.*;
-import org.apache.tomcat.util.http.HttpMessages;
-import org.apache.tomcat.util.buf.HexUtils;
-
-import org.apache.jk.core.*;
+import org.apache.jk.core.Msg;
+import org.apache.tomcat.util.buf.ByteChunk;
+import org.apache.tomcat.util.buf.MessageBytes;
/**
* A single packet for communication between the web server and the
1.2 +1 -14
jakarta-tomcat-connectors/jk/java/org/apache/jk/common/ChannelShm.java
Index: ChannelShm.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/common/ChannelShm.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ChannelShm.java 9 May 2002 00:18:51 -0000 1.1
+++ ChannelShm.java 18 Sep 2003 16:21:00 -0000 1.2
@@ -59,20 +59,7 @@
package org.apache.jk.common;
-import java.io.*;
-
-import java.net.*;
-import java.util.*;
-
-import org.apache.tomcat.util.buf.*;
-import org.apache.tomcat.util.http.*;
-
-import org.apache.tomcat.util.threads.*;
-
-import org.apache.jk.core.*;
-import org.apache.jk.apr.*;
-
-import org.apache.tomcat.util.IntrospectionUtils;
+import org.apache.jk.core.JkHandler;
1.7 +6 -9
jakarta-tomcat-connectors/jk/java/org/apache/jk/common/WorkerDummy.java
Index: WorkerDummy.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/common/WorkerDummy.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- WorkerDummy.java 17 Apr 2002 22:38:59 -0000 1.6
+++ WorkerDummy.java 18 Sep 2003 16:21:00 -0000 1.7
@@ -58,16 +58,13 @@
*/
package org.apache.jk.common;
-import java.io.*;
-import java.net.*;
-import java.util.*;
+import java.io.IOException;
-import org.apache.jk.core.*;
-
-import org.apache.tomcat.util.buf.*;
-import org.apache.tomcat.util.log.*;
-import org.apache.tomcat.util.http.*;
-import org.apache.tomcat.util.threads.*;
+import org.apache.jk.core.JkHandler;
+import org.apache.jk.core.Msg;
+import org.apache.jk.core.MsgContext;
+import org.apache.jk.core.WorkerEnv;
+import org.apache.tomcat.util.buf.MessageBytes;
/** A dummy worker, will just send back a dummy response.
1.24 +8 -11
jakarta-tomcat-connectors/jk/java/org/apache/jk/common/ChannelUn.java
Index: ChannelUn.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/common/ChannelUn.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- ChannelUn.java 11 Apr 2003 20:25:13 -0000 1.23
+++ ChannelUn.java 18 Sep 2003 16:21:00 -0000 1.24
@@ -59,18 +59,15 @@
package org.apache.jk.common;
-import java.io.*;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
-import java.net.*;
-import java.util.*;
-
-import org.apache.tomcat.util.buf.*;
-import org.apache.tomcat.util.http.*;
-
-import org.apache.tomcat.util.threads.*;
-
-import org.apache.jk.core.*;
-import org.apache.jk.apr.*;
+import org.apache.jk.core.JkHandler;
+import org.apache.jk.core.Msg;
+import org.apache.jk.core.MsgContext;
+import org.apache.tomcat.util.threads.ThreadPool;
+import org.apache.tomcat.util.threads.ThreadPoolRunnable;
/** Pass messages using unix domain sockets.
1.15 +4 -11
jakarta-tomcat-connectors/jk/java/org/apache/jk/common/ChannelJni.java
Index: ChannelJni.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/common/ChannelJni.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ChannelJni.java 19 Sep 2002 06:26:52 -0000 1.14
+++ ChannelJni.java 18 Sep 2003 16:21:00 -0000 1.15
@@ -59,18 +59,11 @@
package org.apache.jk.common;
-import java.io.*;
+import java.io.IOException;
-import java.net.*;
-import java.util.*;
-
-import org.apache.tomcat.util.buf.*;
-import org.apache.tomcat.util.http.*;
-
-import org.apache.tomcat.util.threads.*;
-
-import org.apache.jk.core.*;
-import org.apache.jk.apr.*;
+import org.apache.jk.core.JkHandler;
+import org.apache.jk.core.Msg;
+import org.apache.jk.core.MsgContext;
/** Pass messages using jni
1.12 +7 -28
jakarta-tomcat-connectors/jk/java/org/apache/ajp/tomcat4/Ajp13Processor.java
Index: Ajp13Processor.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/ajp/tomcat4/Ajp13Processor.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Ajp13Processor.java 2 Jan 2003 12:57:53 -0000 1.11
+++ Ajp13Processor.java 18 Sep 2003 16:21:01 -0000 1.12
@@ -65,39 +65,18 @@
package org.apache.ajp.tomcat4;
-import java.io.BufferedInputStream;
-import java.io.EOFException;
-import java.io.InterruptedIOException;
-import java.io.InputStream;
import java.io.IOException;
-import java.io.OutputStream;
-import java.net.InetAddress;
import java.net.Socket;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.Locale;
-import java.util.StringTokenizer;
-import java.util.TreeMap;
+
import javax.servlet.ServletException;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.catalina.Connector;
-import org.apache.catalina.Container;
-import org.apache.catalina.Globals;
-import org.apache.catalina.HttpRequest;
-import org.apache.catalina.HttpResponse;
+
+import org.apache.ajp.Ajp13;
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;
-import org.apache.catalina.util.RequestUtil;
import org.apache.catalina.util.LifecycleSupport;
import org.apache.catalina.util.StringManager;
-import org.apache.catalina.util.StringParser;
-
-import org.apache.ajp.Ajp13;
import org.apache.tomcat.util.http.BaseRequest;
/**
1.10 +4 -9
jakarta-tomcat-connectors/jk/java/org/apache/ajp/tomcat4/Ajp13Request.java
Index: Ajp13Request.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/ajp/tomcat4/Ajp13Request.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Ajp13Request.java 19 Jun 2002 10:32:08 -0000 1.9
+++ Ajp13Request.java 18 Sep 2003 16:21:01 -0000 1.10
@@ -60,28 +60,23 @@
import java.io.IOException;
import java.io.UnsupportedEncodingException;
-
import java.util.ArrayList;
-import java.util.List;
import java.util.Iterator;
import java.util.Locale;
-import java.util.Map;
import java.util.TreeMap;
import javax.servlet.ServletInputStream;
-import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletRequest;
-import org.apache.catalina.connector.HttpRequestBase;
import org.apache.catalina.Globals;
-import org.apache.catalina.util.RequestUtil;
+import org.apache.catalina.connector.HttpRequestBase;
import org.apache.catalina.util.StringParser;
-
import org.apache.tomcat.util.buf.MessageBytes;
-import org.apache.tomcat.util.http.Cookies;
-import org.apache.tomcat.util.http.ServerCookie;
import org.apache.tomcat.util.http.BaseRequest;
+import org.apache.tomcat.util.http.Cookies;
import org.apache.tomcat.util.http.MimeHeaders;
+import org.apache.tomcat.util.http.ServerCookie;
public class Ajp13Request extends HttpRequestBase {
1.18 +5 -9
jakarta-tomcat-connectors/jk/java/org/apache/ajp/tomcat4/Ajp13Connector.java
Index: Ajp13Connector.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/ajp/tomcat4/Ajp13Connector.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- Ajp13Connector.java 27 Dec 2002 02:21:27 -0000 1.17
+++ Ajp13Connector.java 18 Sep 2003 16:21:01 -0000 1.18
@@ -71,16 +71,12 @@
import java.security.AccessControlException;
import java.util.Stack;
import java.util.Vector;
-import java.util.Enumeration;
+
import org.apache.catalina.Connector;
import org.apache.catalina.Container;
-import org.apache.catalina.HttpRequest;
-import org.apache.catalina.HttpResponse;
import org.apache.catalina.Lifecycle;
-import org.apache.catalina.LifecycleEvent;
import org.apache.catalina.LifecycleException;
import org.apache.catalina.LifecycleListener;
-import org.apache.catalina.Logger;
import org.apache.catalina.Request;
import org.apache.catalina.Response;
import org.apache.catalina.Service;
1.2 +7 -8
jakarta-tomcat-connectors/jk/java/org/apache/ajp/tomcat4/JkServlet.java
Index: JkServlet.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/ajp/tomcat4/JkServlet.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JkServlet.java 20 Nov 2001 17:47:38 -0000 1.1
+++ JkServlet.java 18 Sep 2003 16:21:01 -0000 1.2
@@ -59,18 +59,17 @@
package org.apache.ajp.tomcat4;
-import java.io.*;
-import java.net.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import java.io.IOException;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
import org.apache.catalina.Container;
import org.apache.catalina.ContainerServlet;
import org.apache.catalina.Context;
-import org.apache.catalina.Deployer;
-import org.apache.catalina.Globals;
-import org.apache.catalina.Session;
import org.apache.catalina.Wrapper;
-import org.apache.catalina.util.StringManager;
/**
1.11 +17 -11
jakarta-tomcat-connectors/jk/java/org/apache/ajp/tomcat33/Ajp14Interceptor.java
Index: Ajp14Interceptor.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/ajp/tomcat33/Ajp14Interceptor.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Ajp14Interceptor.java 21 Apr 2002 05:51:20 -0000 1.10
+++ Ajp14Interceptor.java 18 Sep 2003 16:21:01 -0000 1.11
@@ -59,19 +59,25 @@
package org.apache.ajp.tomcat33;
-import java.io.*;
-import java.net.*;
-import java.util.*;
+import java.io.IOException;
+import java.net.InetAddress;
+import java.net.Socket;
-import org.apache.ajp.*;
+import org.apache.ajp.Ajp13;
+import org.apache.ajp.NegociationHandler;
+import org.apache.ajp.RequestHandler;
+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.TomcatException;
import org.apache.tomcat.modules.server.PoolTcpConnector;
-
-import org.apache.tomcat.core.*;
-
-import org.apache.tomcat.util.net.*;
-import org.apache.tomcat.util.buf.*;
-import org.apache.tomcat.util.log.*;
-import org.apache.tomcat.util.http.*;
+import org.apache.tomcat.util.buf.UDecoder;
+import org.apache.tomcat.util.http.BaseRequest;
+import org.apache.tomcat.util.http.Cookies;
+import org.apache.tomcat.util.http.HttpMessages;
+import org.apache.tomcat.util.net.TcpConnection;
+import org.apache.tomcat.util.net.TcpConnectionHandler;
/** Note. PoolTcpConnector is a convenience base class used for
TCP-based connectors in tomcat33. It allows all those modules
1.14 +1 -4
jakarta-tomcat-connectors/jk/java/org/apache/jk/apr/TomcatStarter.java
Index: TomcatStarter.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/apr/TomcatStarter.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- TomcatStarter.java 14 Jul 2002 13:32:13 -0000 1.13
+++ TomcatStarter.java 18 Sep 2003 16:21:01 -0000 1.14
@@ -59,10 +59,7 @@
package org.apache.jk.apr;
-import java.io.*;
-import java.lang.reflect.*;
-import java.util.*;
-import org.apache.jk.core.*;
+import java.lang.reflect.Method;
// Hack for Catalina 4.1 who hungs the calling thread.
// Also avoids delays in apache initialization ( tomcat can take a while )
1.3 +5 -12
jakarta-tomcat-connectors/jk/java/org/apache/jk/config/GeneratorJk1.java
Index: GeneratorJk1.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/config/GeneratorJk1.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- GeneratorJk1.java 1 May 2002 19:55:45 -0000 1.2
+++ GeneratorJk1.java 18 Sep 2003 16:21:01 -0000 1.3
@@ -58,18 +58,11 @@
*/
package org.apache.jk.config;
-import java.io.*;
-import java.net.*;
-import java.util.*;
-import java.security.*;
-
-import org.apache.tomcat.util.IntrospectionUtils;
-
-import javax.xml.parsers.*;
-
-/* Yes, it's using DOM */
-import org.w3c.dom.*;
-import org.xml.sax.*;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.Vector;
/* Naming conventions:
1.4 +6 -11
jakarta-tomcat-connectors/jk/java/org/apache/jk/config/GeneratorApache2.java
Index: GeneratorApache2.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/config/GeneratorApache2.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- GeneratorApache2.java 17 May 2002 21:38:12 -0000 1.3
+++ GeneratorApache2.java 18 Sep 2003 16:21:01 -0000 1.4
@@ -58,18 +58,13 @@
*/
package org.apache.jk.config;
-import java.io.*;
-import java.net.*;
-import java.util.*;
-import java.security.*;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.Vector;
-import org.apache.tomcat.util.IntrospectionUtils;
-
-import javax.xml.parsers.*;
-
-/* Yes, it's using DOM */
-import org.w3c.dom.*;
-import org.xml.sax.*;
+import org.w3c.dom.Node;
/* Naming conventions:
1.4 +5 -12
jakarta-tomcat-connectors/jk/java/org/apache/jk/config/GeneratorJk2.java
Index: GeneratorJk2.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/config/GeneratorJk2.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- GeneratorJk2.java 17 May 2002 21:38:12 -0000 1.3
+++ GeneratorJk2.java 18 Sep 2003 16:21:01 -0000 1.4
@@ -58,18 +58,11 @@
*/
package org.apache.jk.config;
-import java.io.*;
-import java.net.*;
-import java.util.*;
-import java.security.*;
-
-import org.apache.tomcat.util.IntrospectionUtils;
-
-import javax.xml.parsers.*;
-
-/* Yes, it's using DOM */
-import org.w3c.dom.*;
-import org.xml.sax.*;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.Vector;
/* Naming conventions:
1.5 +14 -10
jakarta-tomcat-connectors/jk/java/org/apache/jk/config/WebXml2Jk.java
Index: WebXml2Jk.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/config/WebXml2Jk.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- WebXml2Jk.java 1 May 2002 19:55:45 -0000 1.4
+++ WebXml2Jk.java 18 Sep 2003 16:21:01 -0000 1.5
@@ -58,18 +58,22 @@
*/
package org.apache.jk.config;
-import java.io.*;
-import java.net.*;
-import java.util.*;
-import java.security.*;
+import java.io.File;
+import java.io.IOException;
+import java.io.StringReader;
+import java.util.Hashtable;
+import java.util.Vector;
-import org.apache.tomcat.util.IntrospectionUtils;
-
-import javax.xml.parsers.*;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
-/* Yes, it's using DOM */
-import org.w3c.dom.*;
-import org.xml.sax.*;
+import org.apache.tomcat.util.IntrospectionUtils;
+import org.w3c.dom.Document;
+import org.w3c.dom.Node;
+import org.xml.sax.EntityResolver;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
/* Naming conventions:
1.5 +1 -8 jakarta-tomcat-connectors/jk/java/org/apache/ajp/AjpHandler.java
Index: AjpHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/ajp/AjpHandler.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AjpHandler.java 26 Nov 2001 16:56:19 -0000 1.4
+++ AjpHandler.java 18 Sep 2003 16:21:01 -0000 1.5
@@ -60,15 +60,8 @@
package org.apache.ajp;
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.security.*;
-import org.apache.tomcat.util.http.*;
-import org.apache.tomcat.util.buf.*;
+import org.apache.tomcat.util.http.BaseRequest;
/**
* Base class for handlers of Ajp messages. Jk provide a simple bidirectional
1.6 +3 -8
jakarta-tomcat-connectors/jk/java/org/apache/ajp/NegociationHandler.java
Index: NegociationHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/ajp/NegociationHandler.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- NegociationHandler.java 26 Nov 2001 16:57:25 -0000 1.5
+++ NegociationHandler.java 18 Sep 2003 16:21:01 -0000 1.6
@@ -60,15 +60,10 @@
package org.apache.ajp;
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.security.*;
+import java.security.MessageDigest;
-import org.apache.tomcat.util.http.*;
-import org.apache.tomcat.util.buf.*;
+import org.apache.tomcat.util.buf.HexUtils;
+import org.apache.tomcat.util.http.BaseRequest;
/**
1.11 +1 -9
jakarta-tomcat-connectors/jk/java/org/apache/ajp/Ajp13Packet.java
Index: Ajp13Packet.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/ajp/Ajp13Packet.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Ajp13Packet.java 21 Feb 2002 03:13:27 -0000 1.10
+++ Ajp13Packet.java 18 Sep 2003 16:21:01 -0000 1.11
@@ -58,18 +58,10 @@
*/
package org.apache.ajp;
-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.security.*;
-import org.apache.tomcat.util.http.MimeHeaders;
import org.apache.tomcat.util.buf.MessageBytes;
-import org.apache.tomcat.util.http.HttpMessages;
-import org.apache.tomcat.util.buf.HexUtils;
+import org.apache.tomcat.util.http.MimeHeaders;
/**
1.17 +9 -7
jakarta-tomcat-connectors/jk/java/org/apache/ajp/RequestHandler.java
Index: RequestHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/ajp/RequestHandler.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- RequestHandler.java 26 Aug 2002 09:54:34 -0000 1.16
+++ RequestHandler.java 18 Sep 2003 16:21:01 -0000 1.17
@@ -59,14 +59,16 @@
package org.apache.ajp;
-import java.io.*;
-import java.net.Socket;
-import java.util.Enumeration;
-import java.security.*;
-import java.security.cert.*;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.security.cert.CertificateFactory;
+import java.security.cert.X509Certificate;
-import org.apache.tomcat.util.http.*;
-import org.apache.tomcat.util.buf.*;
+import org.apache.tomcat.util.buf.ByteChunk;
+import org.apache.tomcat.util.buf.MessageBytes;
+import org.apache.tomcat.util.http.BaseRequest;
+import org.apache.tomcat.util.http.HttpMessages;
+import org.apache.tomcat.util.http.MimeHeaders;
/**
1.25 +2 -10 jakarta-tomcat-connectors/jk/java/org/apache/ajp/Ajp13.java
Index: Ajp13.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/ajp/Ajp13.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- Ajp13.java 20 Feb 2002 16:12:42 -0000 1.24
+++ Ajp13.java 18 Sep 2003 16:21:01 -0000 1.25
@@ -60,21 +60,13 @@
package org.apache.ajp;
import java.io.IOException;
-import java.io.UnsupportedEncodingException;
import java.io.InputStream;
import java.io.OutputStream;
-import java.io.ByteArrayInputStream;
-
import java.net.Socket;
-import java.util.Enumeration;
-import java.security.cert.X509Certificate;
-import java.security.cert.CertificateFactory;
-import org.apache.tomcat.util.buf.MessageBytes;
-import org.apache.tomcat.util.buf.ByteChunk;
-import org.apache.tomcat.util.http.MimeHeaders;
-import org.apache.tomcat.util.http.HttpMessages;
import org.apache.tomcat.util.http.BaseRequest;
+import org.apache.tomcat.util.http.HttpMessages;
+import org.apache.tomcat.util.http.MimeHeaders;
/**
* Represents a single, persistent connection between the web server and
1.7 +0 -12
jakarta-tomcat-connectors/jk/java/org/apache/jk/core/MsgContext.java
Index: MsgContext.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/core/MsgContext.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- MsgContext.java 16 Jan 2003 22:18:55 -0000 1.6
+++ MsgContext.java 18 Sep 2003 16:21:01 -0000 1.7
@@ -59,18 +59,6 @@
package org.apache.jk.core;
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.security.*;
-
-import org.apache.tomcat.util.http.MimeHeaders;
-import org.apache.tomcat.util.buf.MessageBytes;
-import org.apache.tomcat.util.http.HttpMessages;
-import org.apache.tomcat.util.buf.HexUtils;
-import org.apache.tomcat.util.threads.ThreadPool;
/**
1.7 +2 -10 jakarta-tomcat-connectors/jk/java/org/apache/jk/core/Msg.java
Index: Msg.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/core/Msg.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Msg.java 2 May 2003 19:22:05 -0000 1.6
+++ Msg.java 18 Sep 2003 16:21:01 -0000 1.7
@@ -59,17 +59,9 @@
package org.apache.jk.core;
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.security.*;
-import org.apache.tomcat.util.http.MimeHeaders;
-import org.apache.tomcat.util.buf.*;
-import org.apache.tomcat.util.http.HttpMessages;
-import org.apache.tomcat.util.buf.HexUtils;
+import org.apache.tomcat.util.buf.ByteChunk;
+import org.apache.tomcat.util.buf.MessageBytes;
/**
1.5 +10 -4
jakarta-tomcat-connectors/jk/java/org/apache/ajp/tomcat4/config/ApacheConfig.java
Index: ApacheConfig.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/ajp/tomcat4/config/ApacheConfig.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ApacheConfig.java 23 Dec 2002 03:00:57 -0000 1.4
+++ ApacheConfig.java 18 Sep 2003 16:21:01 -0000 1.5
@@ -58,10 +58,16 @@
*/
package org.apache.ajp.tomcat4.config;
-import org.apache.catalina.*;
-import java.io.*;
-import java.util.*;
-import javax.servlet.*;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.Date;
+import java.util.Hashtable;
+
+import org.apache.catalina.Context;
+import org.apache.catalina.Host;
+
/* The idea is to keep all configuration in server.xml and
the normal apache config files. We don't want people to
touch apache ( or IIS, NES ) config files unless they
1.42 +16 -8
jakarta-tomcat-connectors/jk/java/org/apache/jk/server/JkMain.java
Index: JkMain.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/server/JkMain.java,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- JkMain.java 2 Sep 2003 00:17:40 -0000 1.41
+++ JkMain.java 18 Sep 2003 16:21:02 -0000 1.42
@@ -59,17 +59,25 @@
package org.apache.jk.server;
-import java.io.*;
-import java.util.*;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.PrintStream;
+import java.util.Enumeration;
+import java.util.Hashtable;
+import java.util.Properties;
+import java.util.StringTokenizer;
+import java.util.Vector;
-import org.apache.jk.core.*;
+import javax.management.MBeanRegistration;
+import javax.management.MBeanServer;
+import javax.management.ObjectName;
-import org.apache.tomcat.util.IntrospectionUtils;
import org.apache.commons.modeler.Registry;
-import javax.management.ObjectName;
-import javax.management.MBeanServer;
-import javax.management.MBeanRegistration;
-import javax.management.MalformedObjectNameException;
+import org.apache.jk.core.JkHandler;
+import org.apache.jk.core.WorkerEnv;
+import org.apache.tomcat.util.IntrospectionUtils;
/** Main class used to startup and configure jk. It manages the conf/jk2.properties
file
* and is the target of JMX proxy.
1.45 +26 -15
jakarta-tomcat-connectors/jk/java/org/apache/jk/server/JkCoyoteHandler.java
Index: JkCoyoteHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/server/JkCoyoteHandler.java,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- JkCoyoteHandler.java 7 Sep 2003 18:05:15 -0000 1.44
+++ JkCoyoteHandler.java 18 Sep 2003 16:21:02 -0000 1.45
@@ -59,24 +59,35 @@
package org.apache.jk.server;
-import java.io.*;
-import java.net.*;
-import java.util.*;
-import java.security.*;
-import java.security.cert.*;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.net.InetAddress;
+import java.security.cert.CertificateFactory;
+import java.security.cert.X509Certificate;
-import org.apache.jk.core.*;
-import org.apache.jk.common.*;
-
-import org.apache.tomcat.util.buf.*;
-import org.apache.tomcat.util.log.*;
-import org.apache.tomcat.util.http.*;
-import org.apache.tomcat.util.net.SSLSupport;
+import javax.management.MBeanServer;
+import javax.management.ObjectName;
-import org.apache.coyote.*;
import org.apache.commons.modeler.Registry;
-import javax.management.ObjectName;
-import javax.management.MBeanServer;
+import org.apache.coyote.ActionCode;
+import org.apache.coyote.ActionHook;
+import org.apache.coyote.Adapter;
+import org.apache.coyote.ProtocolHandler;
+import org.apache.coyote.Request;
+import org.apache.coyote.Response;
+import org.apache.jk.common.HandlerRequest;
+import org.apache.jk.common.JkInputStream;
+import org.apache.jk.common.MsgAjp;
+import org.apache.jk.core.JkHandler;
+import org.apache.jk.core.Msg;
+import org.apache.jk.core.MsgContext;
+import org.apache.jk.core.WorkerEnv;
+import org.apache.tomcat.util.buf.ByteChunk;
+import org.apache.tomcat.util.buf.C2BConverter;
+import org.apache.tomcat.util.buf.MessageBytes;
+import org.apache.tomcat.util.http.HttpMessages;
+import org.apache.tomcat.util.http.MimeHeaders;
+import org.apache.tomcat.util.net.SSLSupport;
/** Plugs Jk2 into Coyote. Must be named "type=JkHandler,name=container"
*
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
