From 90136b080662c2d489fc59f6f2d2050f85c6bf01 Mon Sep 17 00:00:00 2001 From: markt Date: Sat, 27 Jan 2007 23:27:18 +0000 Subject: [PATCH] Clean up unused imports for the tc6 source tree git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk@500684 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/catalina/Cluster.java | 2 -- .../org/apache/catalina/ant/jmx/JMXAccessorUnregisterTask.java | 3 --- java/org/apache/catalina/core/StandardWrapper.java | 1 - .../apache/catalina/ha/authenticator/ClusterSingleSignOn.java | 2 -- .../catalina/ha/authenticator/ClusterSingleSignOnListener.java | 1 - java/org/apache/catalina/ha/context/ReplicatedContext.java | 2 -- java/org/apache/catalina/ha/session/SessionMessageImpl.java | 2 -- java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java | 2 -- java/org/apache/catalina/mbeans/MBeanUtils.java | 1 - java/org/apache/catalina/realm/UserDatabaseRealm.java | 1 - java/org/apache/catalina/ssi/SSIFilter.java | 1 - java/org/apache/catalina/startup/ContextRuleSet.java | 6 ------ java/org/apache/catalina/tribes/group/GroupChannel.java | 1 - .../tribes/group/interceptors/NonBlockingCoordinator.java | 1 - java/org/apache/catalina/tribes/io/BufferPool14Impl.java | 1 - java/org/apache/catalina/tribes/membership/Membership.java | 1 - java/org/apache/catalina/tribes/membership/StaticMember.java | 1 - .../apache/catalina/tribes/tipis/AbstractReplicatedMap.java | 2 -- .../catalina/tribes/transport/bio/BioReplicationTask.java | 2 -- java/org/apache/catalina/tribes/transport/bio/BioSender.java | 2 -- .../apache/catalina/tribes/transport/bio/util/FastQueue.java | 1 - java/org/apache/catalina/tribes/transport/nio/NioSender.java | 2 -- .../catalina/tribes/transport/nio/ParallelNioSender.java | 1 - java/org/apache/catalina/valves/ErrorReportValve.java | 1 - java/org/apache/coyote/http11/InternalNioOutputBuffer.java | 1 - java/org/apache/el/MethodExpressionImpl.java | 1 - java/org/apache/el/lang/ExpressionBuilder.java | 5 ----- java/org/apache/jasper/compiler/JspUtil.java | 2 -- java/org/apache/jasper/compiler/TagFileProcessor.java | 1 - java/org/apache/jasper/compiler/TldLocationsCache.java | 1 - java/org/apache/jasper/el/ExpressionImpl.java | 4 ---- java/org/apache/jk/server/JkCoyoteHandler.java | 10 ---------- java/org/apache/tomcat/util/http/FastHttpDateFormat.java | 1 - java/org/apache/tomcat/util/net/NioEndpoint.java | 2 -- java/org/apache/tomcat/util/net/NioSelectorPool.java | 2 -- 35 files changed, 70 deletions(-) diff --git a/java/org/apache/catalina/Cluster.java b/java/org/apache/catalina/Cluster.java index 1e0dfac14..20c37730e 100644 --- a/java/org/apache/catalina/Cluster.java +++ b/java/org/apache/catalina/Cluster.java @@ -17,8 +17,6 @@ package org.apache.catalina; -import java.io.IOException; -import java.net.URL; /** * A Cluster works as a Cluster client/server for the local host * Different Cluster implementations can be used to support different diff --git a/java/org/apache/catalina/ant/jmx/JMXAccessorUnregisterTask.java b/java/org/apache/catalina/ant/jmx/JMXAccessorUnregisterTask.java index 4e30d74ae..eb37de4b3 100644 --- a/java/org/apache/catalina/ant/jmx/JMXAccessorUnregisterTask.java +++ b/java/org/apache/catalina/ant/jmx/JMXAccessorUnregisterTask.java @@ -16,9 +16,6 @@ */ package org.apache.catalina.ant.jmx; -import java.util.ArrayList; -import java.util.List; - import javax.management.MBeanServerConnection; import javax.management.ObjectName; diff --git a/java/org/apache/catalina/core/StandardWrapper.java b/java/org/apache/catalina/core/StandardWrapper.java index 28e278cf2..ed0003ea3 100644 --- a/java/org/apache/catalina/core/StandardWrapper.java +++ b/java/org/apache/catalina/core/StandardWrapper.java @@ -60,7 +60,6 @@ import org.apache.catalina.Wrapper; import org.apache.catalina.security.SecurityUtil; import org.apache.catalina.util.Enumerator; import org.apache.catalina.util.InstanceSupport; -import org.apache.tomcat.util.IntrospectionUtils; import org.apache.tomcat.util.log.SystemLogHandler; import org.apache.tomcat.util.modeler.Registry; diff --git a/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOn.java b/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOn.java index c1332bc0f..e60162bb2 100644 --- a/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOn.java +++ b/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOn.java @@ -21,7 +21,6 @@ package org.apache.catalina.ha.authenticator; import java.security.Principal; import org.apache.catalina.Container; -import org.apache.catalina.Context; import org.apache.catalina.Cluster; import org.apache.catalina.Engine; import org.apache.catalina.Host; @@ -29,7 +28,6 @@ import org.apache.catalina.LifecycleException; import org.apache.catalina.Manager; import org.apache.catalina.Session; import org.apache.catalina.authenticator.SingleSignOn; -import org.apache.catalina.authenticator.SingleSignOnEntry; import org.apache.catalina.ha.CatalinaCluster; import org.apache.catalina.ha.ClusterManager; diff --git a/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOnListener.java b/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOnListener.java index 9eddee6ce..a910edb08 100644 --- a/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOnListener.java +++ b/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOnListener.java @@ -20,7 +20,6 @@ import java.util.Map; import java.io.IOException; import org.apache.catalina.Session; -import org.apache.catalina.authenticator.SingleSignOnEntry; import org.apache.catalina.ha.ClusterManager; import org.apache.catalina.ha.ClusterMessage; import org.apache.catalina.ha.ClusterListener; diff --git a/java/org/apache/catalina/ha/context/ReplicatedContext.java b/java/org/apache/catalina/ha/context/ReplicatedContext.java index d1ab8ca79..ee36b2e29 100644 --- a/java/org/apache/catalina/ha/context/ReplicatedContext.java +++ b/java/org/apache/catalina/ha/context/ReplicatedContext.java @@ -25,8 +25,6 @@ import org.apache.catalina.Loader; import org.apache.catalina.core.ApplicationContext; import org.apache.catalina.Globals; import javax.servlet.ServletContext; -import java.util.HashMap; -import org.apache.catalina.tribes.tipis.LazyReplicatedMap; import java.util.AbstractMap; /** diff --git a/java/org/apache/catalina/ha/session/SessionMessageImpl.java b/java/org/apache/catalina/ha/session/SessionMessageImpl.java index cf8966448..9fbbe1b36 100644 --- a/java/org/apache/catalina/ha/session/SessionMessageImpl.java +++ b/java/org/apache/catalina/ha/session/SessionMessageImpl.java @@ -17,8 +17,6 @@ package org.apache.catalina.ha.session; -import org.apache.catalina.ha.ClusterMessage; -import org.apache.catalina.tribes.Member; import org.apache.catalina.ha.ClusterMessageBase; /** diff --git a/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java b/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java index be435721a..3da502383 100644 --- a/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java +++ b/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java @@ -18,9 +18,7 @@ package org.apache.catalina.ha.tcp; import java.beans.PropertyChangeSupport; -import java.io.IOException; import java.io.Serializable; -import java.net.URL; import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; diff --git a/java/org/apache/catalina/mbeans/MBeanUtils.java b/java/org/apache/catalina/mbeans/MBeanUtils.java index 94501eec6..b722b32cd 100644 --- a/java/org/apache/catalina/mbeans/MBeanUtils.java +++ b/java/org/apache/catalina/mbeans/MBeanUtils.java @@ -25,7 +25,6 @@ import javax.management.MBeanException; import javax.management.MBeanServer; import javax.management.MalformedObjectNameException; import javax.management.ObjectName; -import javax.management.modelmbean.ModelMBean; import org.apache.catalina.Contained; import org.apache.catalina.Container; diff --git a/java/org/apache/catalina/realm/UserDatabaseRealm.java b/java/org/apache/catalina/realm/UserDatabaseRealm.java index 18a242d95..ef202d680 100644 --- a/java/org/apache/catalina/realm/UserDatabaseRealm.java +++ b/java/org/apache/catalina/realm/UserDatabaseRealm.java @@ -33,7 +33,6 @@ import org.apache.catalina.ServerFactory; import org.apache.catalina.User; import org.apache.catalina.UserDatabase; import org.apache.catalina.core.StandardServer; -import org.apache.catalina.users.MemoryUser; import org.apache.catalina.util.StringManager; diff --git a/java/org/apache/catalina/ssi/SSIFilter.java b/java/org/apache/catalina/ssi/SSIFilter.java index d4231fd2b..45e7c901e 100644 --- a/java/org/apache/catalina/ssi/SSIFilter.java +++ b/java/org/apache/catalina/ssi/SSIFilter.java @@ -19,7 +19,6 @@ import java.io.OutputStream; import java.io.OutputStreamWriter; import java.io.PrintWriter; import java.io.Reader; -import java.io.Writer; import java.util.regex.Matcher; import java.util.regex.Pattern; diff --git a/java/org/apache/catalina/startup/ContextRuleSet.java b/java/org/apache/catalina/startup/ContextRuleSet.java index 62edc9826..093baecae 100644 --- a/java/org/apache/catalina/startup/ContextRuleSet.java +++ b/java/org/apache/catalina/startup/ContextRuleSet.java @@ -19,14 +19,8 @@ package org.apache.catalina.startup; -import java.lang.reflect.Constructor; - -import org.apache.catalina.Container; -import org.apache.catalina.Loader; import org.apache.tomcat.util.digester.Digester; -import org.apache.tomcat.util.digester.Rule; import org.apache.tomcat.util.digester.RuleSetBase; -import org.xml.sax.Attributes; /** diff --git a/java/org/apache/catalina/tribes/group/GroupChannel.java b/java/org/apache/catalina/tribes/group/GroupChannel.java index 251f13a83..6569b3b6d 100644 --- a/java/org/apache/catalina/tribes/group/GroupChannel.java +++ b/java/org/apache/catalina/tribes/group/GroupChannel.java @@ -40,7 +40,6 @@ import org.apache.catalina.tribes.io.XByteBuffer; import org.apache.catalina.tribes.UniqueId; import org.apache.catalina.tribes.Heartbeat; import org.apache.catalina.tribes.io.BufferPool; -import java.io.IOException; import org.apache.catalina.tribes.RemoteProcessException; import org.apache.catalina.tribes.util.Logs; import org.apache.catalina.tribes.util.Arrays; diff --git a/java/org/apache/catalina/tribes/group/interceptors/NonBlockingCoordinator.java b/java/org/apache/catalina/tribes/group/interceptors/NonBlockingCoordinator.java index 8052842b3..0f9103e1d 100644 --- a/java/org/apache/catalina/tribes/group/interceptors/NonBlockingCoordinator.java +++ b/java/org/apache/catalina/tribes/group/interceptors/NonBlockingCoordinator.java @@ -20,7 +20,6 @@ import java.util.concurrent.atomic.AtomicBoolean; import org.apache.catalina.tribes.Channel; import org.apache.catalina.tribes.ChannelException; import org.apache.catalina.tribes.ChannelInterceptor; -import org.apache.catalina.tribes.ChannelInterceptor.InterceptorEvent; import org.apache.catalina.tribes.ChannelMessage; import org.apache.catalina.tribes.Member; import org.apache.catalina.tribes.UniqueId; diff --git a/java/org/apache/catalina/tribes/io/BufferPool14Impl.java b/java/org/apache/catalina/tribes/io/BufferPool14Impl.java index 55c696d55..d31254807 100644 --- a/java/org/apache/catalina/tribes/io/BufferPool14Impl.java +++ b/java/org/apache/catalina/tribes/io/BufferPool14Impl.java @@ -16,7 +16,6 @@ */ package org.apache.catalina.tribes.io; -import java.util.Queue; import java.util.LinkedList; diff --git a/java/org/apache/catalina/tribes/membership/Membership.java b/java/org/apache/catalina/tribes/membership/Membership.java index 355e8d939..aa66829f4 100644 --- a/java/org/apache/catalina/tribes/membership/Membership.java +++ b/java/org/apache/catalina/tribes/membership/Membership.java @@ -22,7 +22,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; import java.util.Iterator; -import java.util.Map; import org.apache.catalina.tribes.Member; import java.util.Comparator; diff --git a/java/org/apache/catalina/tribes/membership/StaticMember.java b/java/org/apache/catalina/tribes/membership/StaticMember.java index 933b36d17..8e85a9116 100644 --- a/java/org/apache/catalina/tribes/membership/StaticMember.java +++ b/java/org/apache/catalina/tribes/membership/StaticMember.java @@ -18,7 +18,6 @@ package org.apache.catalina.tribes.membership; import java.io.IOException; -import org.apache.catalina.tribes.util.UUIDGenerator; import org.apache.catalina.tribes.util.Arrays; /** diff --git a/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java b/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java index 737e13265..6ab41fe17 100644 --- a/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java +++ b/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java @@ -27,7 +27,6 @@ import java.util.Collection; import java.util.Collections; import java.util.HashMap; import java.util.Iterator; -import java.util.LinkedHashMap; import java.util.LinkedHashSet; import java.util.Map; import java.util.Set; @@ -46,7 +45,6 @@ import org.apache.catalina.tribes.membership.MemberImpl; import org.apache.catalina.tribes.util.Arrays; import org.apache.juli.logging.Log; import org.apache.juli.logging.LogFactory; -import java.util.ConcurrentModificationException; import java.util.concurrent.ConcurrentHashMap; /** diff --git a/java/org/apache/catalina/tribes/transport/bio/BioReplicationTask.java b/java/org/apache/catalina/tribes/transport/bio/BioReplicationTask.java index 116a124ab..b773fccfd 100644 --- a/java/org/apache/catalina/tribes/transport/bio/BioReplicationTask.java +++ b/java/org/apache/catalina/tribes/transport/bio/BioReplicationTask.java @@ -16,14 +16,12 @@ */ package org.apache.catalina.tribes.transport.bio; -import java.io.IOException; import org.apache.catalina.tribes.io.ObjectReader; import org.apache.catalina.tribes.transport.Constants; import org.apache.catalina.tribes.transport.AbstractRxTask; import java.net.Socket; import java.io.InputStream; -import org.apache.catalina.tribes.transport.ReceiverBase; import java.io.OutputStream; import org.apache.catalina.tribes.io.ListenCallback; import org.apache.catalina.tribes.ChannelMessage; diff --git a/java/org/apache/catalina/tribes/transport/bio/BioSender.java b/java/org/apache/catalina/tribes/transport/bio/BioSender.java index 496e069b6..faebb84e5 100644 --- a/java/org/apache/catalina/tribes/transport/bio/BioSender.java +++ b/java/org/apache/catalina/tribes/transport/bio/BioSender.java @@ -21,10 +21,8 @@ import java.io.InputStream; import java.io.OutputStream; import java.net.InetSocketAddress; import java.net.Socket; -import java.net.UnknownHostException; import java.util.Arrays; -import org.apache.catalina.tribes.Member; import org.apache.catalina.tribes.RemoteProcessException; import org.apache.catalina.tribes.io.XByteBuffer; import org.apache.catalina.tribes.transport.AbstractSender; diff --git a/java/org/apache/catalina/tribes/transport/bio/util/FastQueue.java b/java/org/apache/catalina/tribes/transport/bio/util/FastQueue.java index 39395adf8..452f78951 100644 --- a/java/org/apache/catalina/tribes/transport/bio/util/FastQueue.java +++ b/java/org/apache/catalina/tribes/transport/bio/util/FastQueue.java @@ -18,7 +18,6 @@ package org.apache.catalina.tribes.transport.bio.util; import org.apache.catalina.tribes.ChannelMessage; -import org.apache.catalina.tribes.ErrorHandler; import org.apache.catalina.tribes.Member; import org.apache.catalina.tribes.group.InterceptorPayload; diff --git a/java/org/apache/catalina/tribes/transport/nio/NioSender.java b/java/org/apache/catalina/tribes/transport/nio/NioSender.java index b295ef8ee..a536347f3 100644 --- a/java/org/apache/catalina/tribes/transport/nio/NioSender.java +++ b/java/org/apache/catalina/tribes/transport/nio/NioSender.java @@ -19,14 +19,12 @@ package org.apache.catalina.tribes.transport.nio; import java.io.IOException; import java.net.InetSocketAddress; -import java.net.UnknownHostException; import java.nio.ByteBuffer; import java.nio.channels.SelectionKey; import java.nio.channels.Selector; import java.nio.channels.SocketChannel; import java.util.Arrays; -import org.apache.catalina.tribes.Member; import org.apache.catalina.tribes.io.XByteBuffer; import org.apache.catalina.tribes.transport.AbstractSender; import org.apache.catalina.tribes.transport.DataSender; diff --git a/java/org/apache/catalina/tribes/transport/nio/ParallelNioSender.java b/java/org/apache/catalina/tribes/transport/nio/ParallelNioSender.java index e02e566d7..68ce9e9ec 100644 --- a/java/org/apache/catalina/tribes/transport/nio/ParallelNioSender.java +++ b/java/org/apache/catalina/tribes/transport/nio/ParallelNioSender.java @@ -34,7 +34,6 @@ import org.apache.catalina.tribes.transport.SenderState; import org.apache.catalina.tribes.transport.AbstractSender; import java.net.UnknownHostException; import org.apache.catalina.tribes.Channel; -import org.apache.catalina.tribes.group.RpcChannel; import org.apache.catalina.tribes.util.Logs; import org.apache.catalina.tribes.UniqueId; diff --git a/java/org/apache/catalina/valves/ErrorReportValve.java b/java/org/apache/catalina/valves/ErrorReportValve.java index 45780d9e7..a703addfb 100644 --- a/java/org/apache/catalina/valves/ErrorReportValve.java +++ b/java/org/apache/catalina/valves/ErrorReportValve.java @@ -33,7 +33,6 @@ import org.apache.catalina.connector.Response; import org.apache.catalina.util.RequestUtil; import org.apache.catalina.util.ServerInfo; import org.apache.catalina.util.StringManager; -import org.apache.tomcat.util.IntrospectionUtils; /** *

Implementation of a Valve that outputs HTML error pages.

diff --git a/java/org/apache/coyote/http11/InternalNioOutputBuffer.java b/java/org/apache/coyote/http11/InternalNioOutputBuffer.java index 1525dd89c..1366312e4 100644 --- a/java/org/apache/coyote/http11/InternalNioOutputBuffer.java +++ b/java/org/apache/coyote/http11/InternalNioOutputBuffer.java @@ -17,7 +17,6 @@ package org.apache.coyote.http11; -import java.io.EOFException; import java.io.IOException; import java.nio.ByteBuffer; import java.nio.channels.SelectionKey; diff --git a/java/org/apache/el/MethodExpressionImpl.java b/java/org/apache/el/MethodExpressionImpl.java index 12beb2d94..88bae6a74 100644 --- a/java/org/apache/el/MethodExpressionImpl.java +++ b/java/org/apache/el/MethodExpressionImpl.java @@ -34,7 +34,6 @@ import javax.el.MethodNotFoundException; import javax.el.PropertyNotFoundException; import javax.el.VariableMapper; -import org.apache.el.lang.ELSupport; import org.apache.el.lang.EvaluationContext; import org.apache.el.lang.ExpressionBuilder; import org.apache.el.parser.Node; diff --git a/java/org/apache/el/lang/ExpressionBuilder.java b/java/org/apache/el/lang/ExpressionBuilder.java index a8bca8f50..24eb75ad4 100644 --- a/java/org/apache/el/lang/ExpressionBuilder.java +++ b/java/org/apache/el/lang/ExpressionBuilder.java @@ -18,12 +18,7 @@ package org.apache.el.lang; import java.io.StringReader; -import java.lang.ref.SoftReference; import java.lang.reflect.Method; -import java.util.Map; -import java.util.WeakHashMap; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ConcurrentMap; import javax.el.ELContext; import javax.el.ELException; diff --git a/java/org/apache/jasper/compiler/JspUtil.java b/java/org/apache/jasper/compiler/JspUtil.java index e1d5471a4..4de0016fa 100644 --- a/java/org/apache/jasper/compiler/JspUtil.java +++ b/java/org/apache/jasper/compiler/JspUtil.java @@ -27,8 +27,6 @@ import java.util.jar.JarFile; import java.util.zip.ZipEntry; import javax.el.FunctionMapper; -import javax.servlet.jsp.el.ELException; -import javax.servlet.jsp.el.ELParseException; import javax.servlet.jsp.el.ExpressionEvaluator; diff --git a/java/org/apache/jasper/compiler/TagFileProcessor.java b/java/org/apache/jasper/compiler/TagFileProcessor.java index dcfac4dbe..9eb6890eb 100644 --- a/java/org/apache/jasper/compiler/TagFileProcessor.java +++ b/java/org/apache/jasper/compiler/TagFileProcessor.java @@ -19,7 +19,6 @@ package org.apache.jasper.compiler; import java.io.FileNotFoundException; import java.io.IOException; -import java.net.URL; import java.net.URLClassLoader; import java.util.Iterator; import java.util.List; diff --git a/java/org/apache/jasper/compiler/TldLocationsCache.java b/java/org/apache/jasper/compiler/TldLocationsCache.java index dd80cdc7e..023bb0c5b 100644 --- a/java/org/apache/jasper/compiler/TldLocationsCache.java +++ b/java/org/apache/jasper/compiler/TldLocationsCache.java @@ -18,7 +18,6 @@ package org.apache.jasper.compiler; import java.io.InputStream; -import java.io.IOException; import java.net.JarURLConnection; import java.net.MalformedURLException; import java.net.URL; diff --git a/java/org/apache/jasper/el/ExpressionImpl.java b/java/org/apache/jasper/el/ExpressionImpl.java index 3def627f5..107326dfb 100644 --- a/java/org/apache/jasper/el/ExpressionImpl.java +++ b/java/org/apache/jasper/el/ExpressionImpl.java @@ -16,16 +16,12 @@ */ package org.apache.jasper.el; -import javax.el.CompositeELResolver; import javax.el.ELContext; -import javax.el.ELResolver; import javax.el.ValueExpression; import javax.servlet.jsp.el.ELException; import javax.servlet.jsp.el.Expression; import javax.servlet.jsp.el.VariableResolver; -import org.apache.jasper.runtime.JspApplicationContextImpl; - public final class ExpressionImpl extends Expression { private final ValueExpression ve; diff --git a/java/org/apache/jk/server/JkCoyoteHandler.java b/java/org/apache/jk/server/JkCoyoteHandler.java index 23691e2d1..f4e9756f6 100644 --- a/java/org/apache/jk/server/JkCoyoteHandler.java +++ b/java/org/apache/jk/server/JkCoyoteHandler.java @@ -29,20 +29,10 @@ import org.apache.coyote.Request; import org.apache.coyote.Response; import org.apache.coyote.RequestInfo; import org.apache.coyote.Constants; -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.modeler.Registry; -import org.apache.tomcat.util.net.SSLSupport; /** Plugs Jk into Coyote. Must be named "type=JkHandler,name=container" * diff --git a/java/org/apache/tomcat/util/http/FastHttpDateFormat.java b/java/org/apache/tomcat/util/http/FastHttpDateFormat.java index 094970d8e..8fd124c96 100644 --- a/java/org/apache/tomcat/util/http/FastHttpDateFormat.java +++ b/java/org/apache/tomcat/util/http/FastHttpDateFormat.java @@ -22,7 +22,6 @@ import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Date; import java.util.Locale; -import java.util.Map; import java.util.TimeZone; import java.util.concurrent.ConcurrentHashMap; diff --git a/java/org/apache/tomcat/util/net/NioEndpoint.java b/java/org/apache/tomcat/util/net/NioEndpoint.java index e834d69b4..be95ec664 100644 --- a/java/org/apache/tomcat/util/net/NioEndpoint.java +++ b/java/org/apache/tomcat/util/net/NioEndpoint.java @@ -29,7 +29,6 @@ import java.nio.channels.Selector; import java.nio.channels.ServerSocketChannel; import java.nio.channels.SocketChannel; import java.security.KeyStore; -import java.util.HashMap; import java.util.Iterator; import java.util.Set; import java.util.StringTokenizer; @@ -46,7 +45,6 @@ import org.apache.juli.logging.LogFactory; import org.apache.tomcat.util.IntrospectionUtils; import org.apache.tomcat.util.net.SecureNioChannel.ApplicationBufferHandler; import org.apache.tomcat.util.res.StringManager; -import org.apache.tomcat.util.net.NioEndpoint.KeyAttachment; import java.util.concurrent.atomic.AtomicInteger; /** diff --git a/java/org/apache/tomcat/util/net/NioSelectorPool.java b/java/org/apache/tomcat/util/net/NioSelectorPool.java index 61b4a8bb4..fe6127c14 100644 --- a/java/org/apache/tomcat/util/net/NioSelectorPool.java +++ b/java/org/apache/tomcat/util/net/NioSelectorPool.java @@ -15,13 +15,11 @@ */ package org.apache.tomcat.util.net; -import java.util.LinkedList; import java.util.concurrent.atomic.AtomicInteger; import java.nio.channels.Selector; import java.io.IOException; import java.util.NoSuchElementException; import java.nio.ByteBuffer; -import java.nio.channels.SocketChannel; import java.nio.channels.SelectionKey; import java.io.EOFException; import java.net.SocketTimeoutException; -- 2.11.0