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 ChangesPath
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 - 1.12
+++ Shm.java 18 Sep 2003 16:21:00 - 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 - 1.12
+++ JniHandler.java 18 Sep 2003 16:21:00 - 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 - 1.13
+++ MsgAjp.java 18 Sep 2003 16:21:00 - 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 w
