hgomez 2003/09/30 00:39:59 Modified: jk/java/org/apache/jk/common HandlerRequest.java ChannelSocket.java HandlerDispatch.java jk/java/org/apache/ajp/tomcat4/config NSConfig.java BaseJkConfig.java IISConfig.java jk/java/org/apache/jk/core JkHandler.java jk/java/org/apache/ajp/tomcat4 Ajp13OutputStream.java Ajp13InputStream.java Log: More clean imports Revision Changes Path 1.27 +17 -11 jakarta-tomcat-connectors/jk/java/org/apache/jk/common/HandlerRequest.java Index: HandlerRequest.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/common/HandlerRequest.java,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- HandlerRequest.java 25 Sep 2003 15:24:43 -0000 1.26 +++ HandlerRequest.java 30 Sep 2003 07:39:58 -0000 1.27 @@ -59,20 +59,26 @@ package org.apache.jk.common; -import java.io.*; -import java.net.*; -import java.util.*; +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.net.InetAddress; +import java.util.Properties; -import org.apache.jk.core.*; - -import org.apache.tomcat.util.http.*; -import org.apache.tomcat.util.buf.*; +import org.apache.commons.modeler.Registry; +import org.apache.coyote.Request; +import org.apache.coyote.RequestGroupInfo; +import org.apache.coyote.RequestInfo; +import org.apache.coyote.Response; +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.MessageBytes; +import org.apache.tomcat.util.http.MimeHeaders; import org.apache.tomcat.util.net.SSLSupport; import org.apache.tomcat.util.threads.ThreadWithAttributes; - -import org.apache.coyote.Request; -import org.apache.coyote.*; -import org.apache.commons.modeler.Registry; /** * Handle messages related with basic request information. 1.37 +19 -10 jakarta-tomcat-connectors/jk/java/org/apache/jk/common/ChannelSocket.java Index: ChannelSocket.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/common/ChannelSocket.java,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- ChannelSocket.java 3 Apr 2003 00:54:33 -0000 1.36 +++ ChannelSocket.java 30 Sep 2003 07:39:58 -0000 1.37 @@ -59,21 +59,30 @@ package org.apache.jk.common; -import java.io.*; -import java.net.*; +import java.io.BufferedInputStream; +import java.io.BufferedOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.net.InetAddress; +import java.net.ServerSocket; +import java.net.Socket; -import org.apache.tomcat.util.threads.*; - -import org.apache.jk.core.*; -import org.apache.commons.modeler.Registry; -import javax.management.NotificationBroadcaster; -import javax.management.NotificationBroadcasterSupport; -import javax.management.NotificationListener; -import javax.management.NotificationFilter; import javax.management.ListenerNotFoundException; import javax.management.MBeanNotificationInfo; import javax.management.Notification; +import javax.management.NotificationBroadcaster; +import javax.management.NotificationBroadcasterSupport; +import javax.management.NotificationFilter; +import javax.management.NotificationListener; import javax.management.ObjectName; + +import org.apache.commons.modeler.Registry; +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; /* XXX Make the 'message type' pluggable 1.5 +5 -2 jakarta-tomcat-connectors/jk/java/org/apache/jk/common/HandlerDispatch.java Index: HandlerDispatch.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/common/HandlerDispatch.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- HandlerDispatch.java 20 Jan 2003 19:20:32 -0000 1.4 +++ HandlerDispatch.java 30 Sep 2003 07:39:58 -0000 1.5 @@ -59,8 +59,11 @@ package org.apache.jk.common; -import java.io.*; -import org.apache.jk.core.*; +import java.io.IOException; + +import org.apache.jk.core.JkHandler; +import org.apache.jk.core.Msg; +import org.apache.jk.core.MsgContext; 1.5 +7 -3 jakarta-tomcat-connectors/jk/java/org/apache/ajp/tomcat4/config/NSConfig.java Index: NSConfig.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/ajp/tomcat4/config/NSConfig.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- NSConfig.java 4 Jan 2002 06:03:54 -0000 1.4 +++ NSConfig.java 30 Sep 2003 07:39:59 -0000 1.5 @@ -58,9 +58,13 @@ */ package org.apache.ajp.tomcat4.config; -import org.apache.catalina.*; -import java.io.*; -import java.util.*; +import java.io.File; +import java.io.FileWriter; +import java.io.IOException; +import java.io.PrintWriter; +import java.util.Date; + +import org.apache.catalina.Context; /** 1.4 +13 -3 jakarta-tomcat-connectors/jk/java/org/apache/ajp/tomcat4/config/BaseJkConfig.java Index: BaseJkConfig.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/ajp/tomcat4/config/BaseJkConfig.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- BaseJkConfig.java 14 Dec 2001 04:27:05 -0000 1.3 +++ BaseJkConfig.java 30 Sep 2003 07:39:59 -0000 1.4 @@ -58,8 +58,18 @@ */ package org.apache.ajp.tomcat4.config; -import org.apache.catalina.*; -import java.io.*; +import java.io.File; +import java.io.IOException; +import java.io.PrintWriter; + +import org.apache.catalina.Container; +import org.apache.catalina.Context; +import org.apache.catalina.Engine; +import org.apache.catalina.Host; +import org.apache.catalina.Lifecycle; +import org.apache.catalina.LifecycleEvent; +import org.apache.catalina.LifecycleListener; +import org.apache.catalina.Server; /** 1.4 +7 -3 jakarta-tomcat-connectors/jk/java/org/apache/ajp/tomcat4/config/IISConfig.java Index: IISConfig.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/ajp/tomcat4/config/IISConfig.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- IISConfig.java 12 Dec 2001 04:09:35 -0000 1.3 +++ IISConfig.java 30 Sep 2003 07:39:59 -0000 1.4 @@ -58,9 +58,13 @@ */ package org.apache.ajp.tomcat4.config; -import org.apache.catalina.*; -import java.io.*; -import java.util.*; +import java.io.File; +import java.io.FileWriter; +import java.io.IOException; +import java.io.PrintWriter; +import java.util.Date; + +import org.apache.catalina.Context; /** 1.13 +5 -4 jakarta-tomcat-connectors/jk/java/org/apache/jk/core/JkHandler.java Index: JkHandler.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/core/JkHandler.java,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- JkHandler.java 19 Apr 2003 21:02:05 -0000 1.12 +++ JkHandler.java 30 Sep 2003 07:39:59 -0000 1.13 @@ -58,14 +58,15 @@ */ package org.apache.jk.core; -import java.io.*; -import java.util.*; +import java.io.IOException; +import java.util.Properties; -import javax.management.Notification; import javax.management.MBeanRegistration; -import javax.management.ObjectName; import javax.management.MBeanServer; +import javax.management.Notification; import javax.management.NotificationListener; +import javax.management.ObjectName; + import org.apache.commons.modeler.Registry; /** 1.3 +2 -1 jakarta-tomcat-connectors/jk/java/org/apache/ajp/tomcat4/Ajp13OutputStream.java Index: Ajp13OutputStream.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/ajp/tomcat4/Ajp13OutputStream.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Ajp13OutputStream.java 15 May 2001 15:22:45 -0000 1.2 +++ Ajp13OutputStream.java 30 Sep 2003 07:39:59 -0000 1.3 @@ -58,7 +58,8 @@ */ package org.apache.ajp.tomcat4; -import java.io.*; +import java.io.IOException; +import java.io.OutputStream; import org.apache.ajp.Ajp13; 1.3 +1 -1 jakarta-tomcat-connectors/jk/java/org/apache/ajp/tomcat4/Ajp13InputStream.java Index: Ajp13InputStream.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/ajp/tomcat4/Ajp13InputStream.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Ajp13InputStream.java 15 May 2001 15:22:44 -0000 1.2 +++ Ajp13InputStream.java 30 Sep 2003 07:39:59 -0000 1.3 @@ -59,7 +59,7 @@ package org.apache.ajp.tomcat4; -import java.io.*; +import java.io.IOException; import javax.servlet.ServletInputStream;
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]