From 40cd31728f941dda402e1ef651b41ce3b1cfd532 Mon Sep 17 00:00:00 2001 From: remm Date: Sun, 8 Oct 2006 15:27:16 +0000 Subject: [PATCH] - Package rename the commons-logging impl that was in sandbox. - Thanks to the package renaming feature of IDEs, it's possible to revert that in 2 minutes :) git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk@454158 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/catalina/CometEvent.java | 5 +- java/org/apache/catalina/Container.java | 2 +- .../catalina/authenticator/AuthenticatorBase.java | 4 +- .../catalina/authenticator/BasicAuthenticator.java | 4 +- .../authenticator/DigestAuthenticator.java | 4 +- .../catalina/authenticator/FormAuthenticator.java | 4 +- java/org/apache/catalina/connector/Connector.java | 4 +- .../apache/catalina/connector/CoyoteAdapter.java | 4 +- .../apache/catalina/connector/MapperListener.java | 4 +- .../catalina/core/ApplicationDispatcher.java | 4 +- .../apache/catalina/core/AprLifecycleListener.java | 4 +- java/org/apache/catalina/core/ContainerBase.java | 8 +- java/org/apache/catalina/core/JasperListener.java | 4 +- .../catalina/core/NamingContextListener.java | 4 +- java/org/apache/catalina/core/StandardContext.java | 4 +- java/org/apache/catalina/core/StandardEngine.java | 4 +- java/org/apache/catalina/core/StandardHost.java | 4 +- .../apache/catalina/core/StandardHostValve.java | 4 +- .../org/apache/catalina/core/StandardPipeline.java | 4 +- java/org/apache/catalina/core/StandardServer.java | 4 +- java/org/apache/catalina/core/StandardService.java | 4 +- java/org/apache/catalina/core/StandardWrapper.java | 4 +- .../apache/catalina/core/StandardWrapperValve.java | 4 +- .../apache/catalina/deploy/SecurityCollection.java | 4 +- java/org/apache/catalina/ha/CatalinaCluster.java | 2 +- java/org/apache/catalina/ha/ClusterListener.java | 2 +- .../catalina/ha/context/ReplicatedContext.java | 2 +- .../apache/catalina/ha/deploy/FarmWarDeployer.java | 2 +- .../catalina/ha/deploy/FileMessageFactory.java | 2 +- java/org/apache/catalina/ha/deploy/WarWatcher.java | 2 +- .../apache/catalina/ha/session/BackupManager.java | 2 +- .../apache/catalina/ha/session/DeltaManager.java | 2 +- .../apache/catalina/ha/session/DeltaRequest.java | 4 +- .../apache/catalina/ha/session/DeltaSession.java | 2 +- .../catalina/ha/session/JvmRouteBinderValve.java | 2 +- .../JvmRouteSessionIDBinderLifecycleListener.java | 4 +- .../ha/session/SimpleTcpReplicationManager.java | 2 +- .../apache/catalina/ha/tcp/ReplicationValve.java | 4 +- .../apache/catalina/ha/tcp/SimpleTcpCluster.java | 4 +- .../apache/catalina/loader/WebappClassLoader.java | 6 +- java/org/apache/catalina/loader/WebappLoader.java | 4 +- .../mbeans/GlobalResourcesLifecycleListener.java | 4 +- java/org/apache/catalina/mbeans/MBeanFactory.java | 4 +- java/org/apache/catalina/mbeans/MBeanUtils.java | 4 +- .../catalina/mbeans/ServerLifecycleListener.java | 4 +- .../apache/catalina/realm/JAASCallbackHandler.java | 4 +- .../catalina/realm/JAASMemoryLoginModule.java | 4 +- java/org/apache/catalina/realm/JAASRealm.java | 4 +- java/org/apache/catalina/realm/MemoryRealm.java | 4 +- java/org/apache/catalina/realm/RealmBase.java | 4 +- .../apache/catalina/security/SecurityConfig.java | 4 +- .../org/apache/catalina/security/SecurityUtil.java | 4 +- java/org/apache/catalina/session/ManagerBase.java | 4 +- .../catalina/session/PersistentManagerBase.java | 4 +- java/org/apache/catalina/startup/Bootstrap.java | 4 +- java/org/apache/catalina/startup/Catalina.java | 4 +- .../catalina/startup/CatalinaProperties.java | 4 +- .../catalina/startup/ClassLoaderFactory.java | 4 +- .../catalina/startup/ClusterRuleSetFactory.java | 6 +- .../org/apache/catalina/startup/ContextConfig.java | 4 +- .../apache/catalina/startup/DigesterFactory.java | 4 +- java/org/apache/catalina/startup/Embedded.java | 4 +- java/org/apache/catalina/startup/EngineConfig.java | 4 +- java/org/apache/catalina/startup/ExpandWar.java | 4 +- java/org/apache/catalina/startup/HostConfig.java | 4 +- java/org/apache/catalina/startup/TldConfig.java | 4 +- java/org/apache/catalina/startup/Tool.java | 4 +- java/org/apache/catalina/startup/UserConfig.java | 4 +- .../tribes/group/ChannelInterceptorBase.java | 2 +- .../apache/catalina/tribes/group/GroupChannel.java | 2 +- .../apache/catalina/tribes/group/RpcChannel.java | 2 +- .../interceptors/DomainFilterInterceptor.java | 2 +- .../interceptors/FragmentationInterceptor.java | 2 +- .../interceptors/MessageDispatchInterceptor.java | 2 +- .../group/interceptors/TcpFailureDetector.java | 2 +- .../group/interceptors/ThroughputInterceptor.java | 2 +- .../interceptors/TwoPhaseCommitInterceptor.java | 2 +- java/org/apache/catalina/tribes/io/BufferPool.java | 4 +- .../apache/catalina/tribes/io/ObjectReader.java | 2 +- .../org/apache/catalina/tribes/io/XByteBuffer.java | 4 +- .../catalina/tribes/membership/McastService.java | 4 +- .../tribes/membership/McastServiceImpl.java | 4 +- .../tribes/tipis/AbstractReplicatedMap.java | 5 +- .../catalina/tribes/tipis/LazyReplicatedMap.java | 2 +- .../catalina/tribes/tipis/ReplicatedMap.java | 2 +- .../catalina/tribes/transport/ReceiverBase.java | 4 +- .../tribes/transport/ReplicationTransmitter.java | 2 +- .../catalina/tribes/transport/bio/BioReceiver.java | 2 +- .../tribes/transport/bio/BioReplicationThread.java | 2 +- .../catalina/tribes/transport/bio/BioSender.java | 2 +- .../tribes/transport/bio/util/FastQueue.java | 2 +- .../catalina/tribes/transport/nio/NioReceiver.java | 2 +- .../tribes/transport/nio/NioReplicationThread.java | 2 +- .../catalina/tribes/transport/nio/NioSender.java | 2 +- .../tribes/transport/nio/ParallelNioSender.java | 2 +- java/org/apache/catalina/tribes/util/Logs.java | 4 +- .../apache/catalina/tribes/util/StringManager.java | 4 +- .../apache/catalina/users/MemoryUserDatabase.java | 4 +- .../apache/catalina/util/ExtensionValidator.java | 4 +- java/org/apache/catalina/util/StringManager.java | 4 +- .../catalina/valves/ExtendedAccessLogValve.java | 4 +- .../apache/catalina/valves/RequestDumperValve.java | 2 +- java/org/apache/catalina/valves/ValveBase.java | 4 +- java/org/apache/coyote/ajp/AjpAprProcessor.java | 4 +- java/org/apache/coyote/ajp/AjpAprProtocol.java | 4 +- java/org/apache/coyote/ajp/AjpMessage.java | 4 +- java/org/apache/coyote/ajp/AjpProcessor.java | 4 +- java/org/apache/coyote/ajp/AjpProtocol.java | 4 +- .../apache/coyote/http11/Http11AprProcessor.java | 4 +- .../apache/coyote/http11/Http11AprProtocol.java | 4 +- .../apache/coyote/http11/Http11NioProcessor.java | 4 +- .../apache/coyote/http11/Http11NioProtocol.java | 4 +- java/org/apache/coyote/http11/Http11Processor.java | 12 +- java/org/apache/coyote/http11/Http11Protocol.java | 4 +- java/org/apache/jasper/EmbeddedServletOptions.java | 4 +- java/org/apache/jasper/JspC.java | 4 +- java/org/apache/jasper/JspCompilationContext.java | 4 +- java/org/apache/jasper/compiler/Compiler.java | 2 +- java/org/apache/jasper/compiler/JspConfig.java | 4 +- java/org/apache/jasper/compiler/JspReader.java | 4 +- .../apache/jasper/compiler/JspRuntimeContext.java | 4 +- java/org/apache/jasper/compiler/SmapUtil.java | 8 +- .../apache/jasper/compiler/TagLibraryInfoImpl.java | 4 +- .../apache/jasper/compiler/TldLocationsCache.java | 4 +- java/org/apache/jasper/runtime/HttpJspBase.java | 2 +- java/org/apache/jasper/runtime/JspFactoryImpl.java | 4 +- .../org/apache/jasper/runtime/PageContextImpl.java | 4 +- java/org/apache/jasper/runtime/TagHandlerPool.java | 4 +- .../apache/jasper/security/SecurityClassLoad.java | 4 +- java/org/apache/jasper/servlet/JspServlet.java | 4 +- .../apache/jasper/servlet/JspServletWrapper.java | 4 +- java/org/apache/jasper/xmlparser/ParserUtils.java | 4 +- java/org/apache/jasper/xmlparser/UCSReader.java | 4 +- java/org/apache/jasper/xmlparser/UTF8Reader.java | 4 +- java/org/apache/jk/apr/AprImpl.java | 4 +- java/org/apache/jk/common/ChannelJni.java | 4 +- java/org/apache/jk/common/ChannelNioSocket.java | 4 +- java/org/apache/jk/common/ChannelSocket.java | 4 +- java/org/apache/jk/common/ChannelUn.java | 4 +- java/org/apache/jk/common/HandlerDispatch.java | 4 +- java/org/apache/jk/common/HandlerRequest.java | 4 +- java/org/apache/jk/common/JkInputStream.java | 4 +- java/org/apache/jk/common/JkMX.java | 4 +- java/org/apache/jk/common/JniHandler.java | 4 +- java/org/apache/jk/common/MsgAjp.java | 4 +- java/org/apache/jk/common/Shm.java | 4 +- java/org/apache/jk/common/Shm14.java | 4 +- java/org/apache/jk/config/ApacheConfig.java | 4 +- java/org/apache/jk/config/BaseJkConfig.java | 4 +- java/org/apache/jk/config/IISConfig.java | 4 +- java/org/apache/jk/config/NSConfig.java | 4 +- java/org/apache/jk/config/WebXml2Jk.java | 4 +- java/org/apache/jk/core/MsgContext.java | 8 +- java/org/apache/jk/server/JkCoyoteHandler.java | 4 +- java/org/apache/jk/server/JkMain.java | 4 +- java/org/apache/juli/logging/DirectJDKLog.java | 182 +++++++++++ java/org/apache/juli/logging/Log.java | 233 +++++++++++++ .../juli/logging/LogConfigurationException.java | 91 ++++++ java/org/apache/juli/logging/LogFactory.java | 361 +++++++++++++++++++++ java/org/apache/juli/logging/package.html | 21 ++ java/org/apache/naming/NamingContext.java | 4 +- .../apache/naming/resources/FileDirContext.java | 4 +- .../org/apache/naming/resources/WARDirContext.java | 4 +- java/org/apache/tomcat/util/DomUtil.java | 4 +- .../org/apache/tomcat/util/IntrospectionUtils.java | 4 +- java/org/apache/tomcat/util/buf/B2CConverter.java | 4 +- java/org/apache/tomcat/util/buf/Base64.java | 4 +- java/org/apache/tomcat/util/buf/C2BConverter.java | 4 +- java/org/apache/tomcat/util/buf/StringCache.java | 4 +- java/org/apache/tomcat/util/buf/UDecoder.java | 4 +- java/org/apache/tomcat/util/buf/UEncoder.java | 4 +- java/org/apache/tomcat/util/buf/UTF8Decoder.java | 4 +- .../tomcat/util/collections/SimpleHashtable.java | 4 +- .../apache/tomcat/util/collections/SimplePool.java | 4 +- java/org/apache/tomcat/util/digester/Digester.java | 4 +- .../apache/tomcat/util/digester/GenericParser.java | 4 +- .../apache/tomcat/util/digester/XercesParser.java | 4 +- java/org/apache/tomcat/util/http/Cookies.java | 4 +- java/org/apache/tomcat/util/http/Parameters.java | 4 +- java/org/apache/tomcat/util/http/ServerCookie.java | 4 +- .../org/apache/tomcat/util/http/mapper/Mapper.java | 4 +- .../apache/tomcat/util/modeler/BaseModelMBean.java | 4 +- java/org/apache/tomcat/util/modeler/Registry.java | 4 +- .../modules/MbeansDescriptorsDOMSource.java | 4 +- .../modules/MbeansDescriptorsDigesterSource.java | 4 +- .../MbeansDescriptorsIntrospectionSource.java | 4 +- .../modules/MbeansDescriptorsSerSource.java | 4 +- .../tomcat/util/modeler/modules/MbeansSource.java | 4 +- java/org/apache/tomcat/util/net/AprEndpoint.java | 4 +- java/org/apache/tomcat/util/net/BaseEndpoint.java | 4 +- java/org/apache/tomcat/util/net/JIoEndpoint.java | 4 +- java/org/apache/tomcat/util/net/NioEndpoint.java | 4 +- .../apache/tomcat/util/net/PoolTcpEndpoint.java | 4 +- .../apache/tomcat/util/net/SSLImplementation.java | 4 +- .../tomcat/util/net/jsse/JSSEImplementation.java | 4 +- .../tomcat/util/net/jsse/JSSESocketFactory.java | 4 +- .../apache/tomcat/util/net/jsse/JSSESupport.java | 4 +- .../org/apache/tomcat/util/threads/ThreadPool.java | 5 +- 198 files changed, 1251 insertions(+), 364 deletions(-) create mode 100644 java/org/apache/juli/logging/DirectJDKLog.java create mode 100644 java/org/apache/juli/logging/Log.java create mode 100644 java/org/apache/juli/logging/LogConfigurationException.java create mode 100644 java/org/apache/juli/logging/LogFactory.java create mode 100644 java/org/apache/juli/logging/package.html diff --git a/java/org/apache/catalina/CometEvent.java b/java/org/apache/catalina/CometEvent.java index 2cc9dc1a5..c38baade6 100644 --- a/java/org/apache/catalina/CometEvent.java +++ b/java/org/apache/catalina/CometEvent.java @@ -34,7 +34,7 @@ public interface CometEvent { /** * Enumeration describing the major events that the container can invoke * the CometProcessors event() method with - * BEGIN - will be called by the main service method of the servlet at the beginning + * BEGIN - will be called at the beginning * of the processing of the connection. It can be used to initialize any relevant * fields using the request and response objects. Between the end of the processing * of this event, and the beginning of the processing of the end or error events, @@ -67,7 +67,8 @@ public interface CometEvent { /** * Event details - * TIMEOUT - the connection timed out (sub type of ERROR) + * TIMEOUT - the connection timed out (sub type of ERROR); note that this ERROR type is not fatal, and + * the connection will not be closed unless the servlet uses the close method of the event * CLIENT_DISCONNECT - the client connection was closed (sub type of ERROR) * IOEXCEPTION - an IO exception occurred, such as invalid content, for example, an invalid chunk block (sub type of ERROR) * WEBAPP_RELOAD - the webapplication is being reloaded (sub type of END) diff --git a/java/org/apache/catalina/Container.java b/java/org/apache/catalina/Container.java index df2a7506d..f2e334bf6 100644 --- a/java/org/apache/catalina/Container.java +++ b/java/org/apache/catalina/Container.java @@ -23,9 +23,9 @@ import java.io.IOException; import javax.servlet.ServletException; import javax.naming.directory.DirContext; -import org.apache.commons.logging.Log; import org.apache.catalina.connector.Request; import org.apache.catalina.connector.Response; +import org.apache.juli.logging.Log; /** diff --git a/java/org/apache/catalina/authenticator/AuthenticatorBase.java b/java/org/apache/catalina/authenticator/AuthenticatorBase.java index 80c24aaed..a8a71c6e9 100644 --- a/java/org/apache/catalina/authenticator/AuthenticatorBase.java +++ b/java/org/apache/catalina/authenticator/AuthenticatorBase.java @@ -48,8 +48,8 @@ import org.apache.catalina.util.DateTool; import org.apache.catalina.util.LifecycleSupport; import org.apache.catalina.util.StringManager; import org.apache.catalina.valves.ValveBase; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.juli.logging.Log; +import org.apache.juli.logging.LogFactory; /** diff --git a/java/org/apache/catalina/authenticator/BasicAuthenticator.java b/java/org/apache/catalina/authenticator/BasicAuthenticator.java index 45f15c923..a8ce22447 100644 --- a/java/org/apache/catalina/authenticator/BasicAuthenticator.java +++ b/java/org/apache/catalina/authenticator/BasicAuthenticator.java @@ -27,8 +27,8 @@ import org.apache.catalina.connector.Request; import org.apache.catalina.connector.Response; import org.apache.catalina.deploy.LoginConfig; import org.apache.catalina.util.Base64; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.juli.logging.Log; +import org.apache.juli.logging.LogFactory; import org.apache.tomcat.util.buf.ByteChunk; import org.apache.tomcat.util.buf.CharChunk; import org.apache.tomcat.util.buf.MessageBytes; diff --git a/java/org/apache/catalina/authenticator/DigestAuthenticator.java b/java/org/apache/catalina/authenticator/DigestAuthenticator.java index 78822a095..c834e8c3f 100644 --- a/java/org/apache/catalina/authenticator/DigestAuthenticator.java +++ b/java/org/apache/catalina/authenticator/DigestAuthenticator.java @@ -26,14 +26,14 @@ import java.util.StringTokenizer; import javax.servlet.http.HttpServletResponse; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.catalina.Realm; import org.apache.catalina.connector.Request; import org.apache.catalina.connector.Response; import org.apache.catalina.deploy.LoginConfig; import org.apache.catalina.util.MD5Encoder; +import org.apache.juli.logging.Log; +import org.apache.juli.logging.LogFactory; diff --git a/java/org/apache/catalina/authenticator/FormAuthenticator.java b/java/org/apache/catalina/authenticator/FormAuthenticator.java index e4dd68f85..e7ed472dd 100644 --- a/java/org/apache/catalina/authenticator/FormAuthenticator.java +++ b/java/org/apache/catalina/authenticator/FormAuthenticator.java @@ -34,9 +34,9 @@ import org.apache.catalina.Session; import org.apache.catalina.connector.Request; import org.apache.catalina.connector.Response; import org.apache.catalina.deploy.LoginConfig; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.coyote.ActionCode; +import org.apache.juli.logging.Log; +import org.apache.juli.logging.LogFactory; import org.apache.tomcat.util.buf.ByteChunk; import org.apache.tomcat.util.buf.CharChunk; import org.apache.tomcat.util.buf.MessageBytes; diff --git a/java/org/apache/catalina/connector/Connector.java b/java/org/apache/catalina/connector/Connector.java index 4c748ea30..b9ad616eb 100644 --- a/java/org/apache/catalina/connector/Connector.java +++ b/java/org/apache/catalina/connector/Connector.java @@ -34,10 +34,10 @@ import org.apache.catalina.Service; import org.apache.catalina.core.StandardEngine; import org.apache.catalina.util.LifecycleSupport; import org.apache.catalina.util.StringManager; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.coyote.Adapter; import org.apache.coyote.ProtocolHandler; +import org.apache.juli.logging.Log; +import org.apache.juli.logging.LogFactory; import org.apache.tomcat.util.IntrospectionUtils; import org.apache.tomcat.util.http.mapper.Mapper; import org.apache.tomcat.util.modeler.Registry; diff --git a/java/org/apache/catalina/connector/CoyoteAdapter.java b/java/org/apache/catalina/connector/CoyoteAdapter.java index 8203e26eb..eb89e1e04 100644 --- a/java/org/apache/catalina/connector/CoyoteAdapter.java +++ b/java/org/apache/catalina/connector/CoyoteAdapter.java @@ -24,10 +24,10 @@ import org.apache.catalina.Context; import org.apache.catalina.Globals; import org.apache.catalina.Wrapper; import org.apache.catalina.util.StringManager; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.coyote.ActionCode; import org.apache.coyote.Adapter; +import org.apache.juli.logging.Log; +import org.apache.juli.logging.LogFactory; import org.apache.tomcat.util.buf.B2CConverter; import org.apache.tomcat.util.buf.ByteChunk; import org.apache.tomcat.util.buf.CharChunk; diff --git a/java/org/apache/catalina/connector/MapperListener.java b/java/org/apache/catalina/connector/MapperListener.java index f07af9d8b..730e345f4 100644 --- a/java/org/apache/catalina/connector/MapperListener.java +++ b/java/org/apache/catalina/connector/MapperListener.java @@ -25,8 +25,8 @@ import javax.management.NotificationListener; import javax.management.ObjectInstance; import javax.management.ObjectName; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.juli.logging.Log; +import org.apache.juli.logging.LogFactory; import org.apache.tomcat.util.http.mapper.Mapper; diff --git a/java/org/apache/catalina/core/ApplicationDispatcher.java b/java/org/apache/catalina/core/ApplicationDispatcher.java index eaffefb86..c8fee93d9 100644 --- a/java/org/apache/catalina/core/ApplicationDispatcher.java +++ b/java/org/apache/catalina/core/ApplicationDispatcher.java @@ -46,8 +46,8 @@ import org.apache.catalina.connector.Response; import org.apache.catalina.connector.ResponseFacade; import org.apache.catalina.util.InstanceSupport; import org.apache.catalina.util.StringManager; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.juli.logging.Log; +import org.apache.juli.logging.LogFactory; /** * Standard implementation of RequestDispatcher that allows a diff --git a/java/org/apache/catalina/core/AprLifecycleListener.java b/java/org/apache/catalina/core/AprLifecycleListener.java index 0805f35a1..a456fe843 100644 --- a/java/org/apache/catalina/core/AprLifecycleListener.java +++ b/java/org/apache/catalina/core/AprLifecycleListener.java @@ -22,8 +22,8 @@ import org.apache.catalina.Lifecycle; import org.apache.catalina.LifecycleEvent; import org.apache.catalina.LifecycleListener; import org.apache.catalina.util.StringManager; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.juli.logging.Log; +import org.apache.juli.logging.LogFactory; /** diff --git a/java/org/apache/catalina/core/ContainerBase.java b/java/org/apache/catalina/core/ContainerBase.java index 74ce013eb..6a67bb2d1 100644 --- a/java/org/apache/catalina/core/ContainerBase.java +++ b/java/org/apache/catalina/core/ContainerBase.java @@ -52,8 +52,8 @@ import org.apache.catalina.connector.Request; import org.apache.catalina.connector.Response; import org.apache.catalina.util.LifecycleSupport; import org.apache.catalina.util.StringManager; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.juli.logging.Log; +import org.apache.juli.logging.LogFactory; import org.apache.naming.resources.ProxyDirContext; import org.apache.tomcat.util.modeler.Registry; @@ -121,8 +121,8 @@ import org.apache.tomcat.util.modeler.Registry; public abstract class ContainerBase implements Container, Lifecycle, Pipeline, MBeanRegistration, Serializable { - private static org.apache.commons.logging.Log log= - org.apache.commons.logging.LogFactory.getLog( ContainerBase.class ); + private static org.apache.juli.logging.Log log= + org.apache.juli.logging.LogFactory.getLog( ContainerBase.class ); /** * Perform addChild with the permissions of this class. diff --git a/java/org/apache/catalina/core/JasperListener.java b/java/org/apache/catalina/core/JasperListener.java index 766ba1112..3756c1373 100644 --- a/java/org/apache/catalina/core/JasperListener.java +++ b/java/org/apache/catalina/core/JasperListener.java @@ -21,8 +21,8 @@ import org.apache.catalina.Lifecycle; import org.apache.catalina.LifecycleEvent; import org.apache.catalina.LifecycleListener; import org.apache.catalina.util.StringManager; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.juli.logging.Log; +import org.apache.juli.logging.LogFactory; /** diff --git a/java/org/apache/catalina/core/NamingContextListener.java b/java/org/apache/catalina/core/NamingContextListener.java index fe9249748..60abf52b3 100644 --- a/java/org/apache/catalina/core/NamingContextListener.java +++ b/java/org/apache/catalina/core/NamingContextListener.java @@ -52,8 +52,8 @@ import org.apache.catalina.deploy.ContextResourceLink; import org.apache.catalina.deploy.ContextTransaction; import org.apache.catalina.deploy.NamingResources; import org.apache.catalina.util.StringManager; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.juli.logging.Log; +import org.apache.juli.logging.LogFactory; import org.apache.naming.ContextAccessController; import org.apache.naming.ContextBindings; import org.apache.naming.EjbRef; diff --git a/java/org/apache/catalina/core/StandardContext.java b/java/org/apache/catalina/core/StandardContext.java index f4bd9b661..afac9f312 100644 --- a/java/org/apache/catalina/core/StandardContext.java +++ b/java/org/apache/catalina/core/StandardContext.java @@ -91,8 +91,8 @@ import org.apache.catalina.util.DefaultAnnotationProcessor; import org.apache.catalina.util.ExtensionValidator; import org.apache.catalina.util.RequestUtil; import org.apache.catalina.util.URLEncoder; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.juli.logging.Log; +import org.apache.juli.logging.LogFactory; import org.apache.naming.ContextBindings; import org.apache.naming.resources.BaseDirContext; import org.apache.naming.resources.DirContextURLStreamHandler; diff --git a/java/org/apache/catalina/core/StandardEngine.java b/java/org/apache/catalina/core/StandardEngine.java index a85a6e9be..4c000a940 100644 --- a/java/org/apache/catalina/core/StandardEngine.java +++ b/java/org/apache/catalina/core/StandardEngine.java @@ -33,8 +33,8 @@ import org.apache.catalina.Realm; import org.apache.catalina.Service; import org.apache.catalina.realm.JAASRealm; import org.apache.catalina.util.ServerInfo; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.juli.logging.Log; +import org.apache.juli.logging.LogFactory; import org.apache.tomcat.util.modeler.Registry; import org.apache.tomcat.util.modeler.modules.MbeansSource; diff --git a/java/org/apache/catalina/core/StandardHost.java b/java/org/apache/catalina/core/StandardHost.java index c7f4daf2c..71f053985 100644 --- a/java/org/apache/catalina/core/StandardHost.java +++ b/java/org/apache/catalina/core/StandardHost.java @@ -47,8 +47,8 @@ public class StandardHost { /* Why do we implement deployer and delegate to deployer ??? */ - private static org.apache.commons.logging.Log log= - org.apache.commons.logging.LogFactory.getLog( StandardHost.class ); + private static org.apache.juli.logging.Log log= + org.apache.juli.logging.LogFactory.getLog( StandardHost.class ); // ----------------------------------------------------------- Constructors diff --git a/java/org/apache/catalina/core/StandardHostValve.java b/java/org/apache/catalina/core/StandardHostValve.java index 64813215a..e367512fc 100644 --- a/java/org/apache/catalina/core/StandardHostValve.java +++ b/java/org/apache/catalina/core/StandardHostValve.java @@ -36,8 +36,8 @@ import org.apache.catalina.deploy.ErrorPage; import org.apache.catalina.util.RequestUtil; import org.apache.catalina.util.StringManager; import org.apache.catalina.valves.ValveBase; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.juli.logging.Log; +import org.apache.juli.logging.LogFactory; /** diff --git a/java/org/apache/catalina/core/StandardPipeline.java b/java/org/apache/catalina/core/StandardPipeline.java index c953d1e57..388cbdb4c 100644 --- a/java/org/apache/catalina/core/StandardPipeline.java +++ b/java/org/apache/catalina/core/StandardPipeline.java @@ -32,8 +32,8 @@ import org.apache.catalina.Valve; import org.apache.catalina.util.LifecycleSupport; import org.apache.catalina.util.StringManager; import org.apache.catalina.valves.ValveBase; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.juli.logging.Log; +import org.apache.juli.logging.LogFactory; import org.apache.tomcat.util.modeler.Registry; diff --git a/java/org/apache/catalina/core/StandardServer.java b/java/org/apache/catalina/core/StandardServer.java index 09a1d10aa..1232600be 100644 --- a/java/org/apache/catalina/core/StandardServer.java +++ b/java/org/apache/catalina/core/StandardServer.java @@ -43,8 +43,8 @@ import org.apache.catalina.deploy.NamingResources; import org.apache.catalina.util.LifecycleSupport; import org.apache.catalina.util.StringManager; import org.apache.catalina.util.ServerInfo; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.juli.logging.Log; +import org.apache.juli.logging.LogFactory; import org.apache.tomcat.util.buf.StringCache; import org.apache.tomcat.util.modeler.Registry; diff --git a/java/org/apache/catalina/core/StandardService.java b/java/org/apache/catalina/core/StandardService.java index 7b17adb43..1c46a2a11 100644 --- a/java/org/apache/catalina/core/StandardService.java +++ b/java/org/apache/catalina/core/StandardService.java @@ -34,8 +34,8 @@ import org.apache.catalina.ServerFactory; import org.apache.catalina.connector.Connector; import org.apache.catalina.util.LifecycleSupport; import org.apache.catalina.util.StringManager; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.juli.logging.Log; +import org.apache.juli.logging.LogFactory; import org.apache.tomcat.util.modeler.Registry; diff --git a/java/org/apache/catalina/core/StandardWrapper.java b/java/org/apache/catalina/core/StandardWrapper.java index b0756ffd7..ad68a131a 100644 --- a/java/org/apache/catalina/core/StandardWrapper.java +++ b/java/org/apache/catalina/core/StandardWrapper.java @@ -76,8 +76,8 @@ public class StandardWrapper extends ContainerBase implements ServletConfig, Wrapper, NotificationEmitter { - protected static org.apache.commons.logging.Log log= - org.apache.commons.logging.LogFactory.getLog( StandardWrapper.class ); + protected static org.apache.juli.logging.Log log= + org.apache.juli.logging.LogFactory.getLog( StandardWrapper.class ); protected static final String[] DEFAULT_SERVLET_METHODS = new String[] { "GET", "HEAD", "POST" }; diff --git a/java/org/apache/catalina/core/StandardWrapperValve.java b/java/org/apache/catalina/core/StandardWrapperValve.java index f18019455..25a335a6d 100644 --- a/java/org/apache/catalina/core/StandardWrapperValve.java +++ b/java/org/apache/catalina/core/StandardWrapperValve.java @@ -36,8 +36,8 @@ import org.apache.catalina.connector.Request; import org.apache.catalina.connector.Response; import org.apache.catalina.util.StringManager; import org.apache.catalina.valves.ValveBase; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.juli.logging.Log; +import org.apache.juli.logging.LogFactory; import org.apache.tomcat.util.buf.MessageBytes; import org.apache.tomcat.util.log.SystemLogHandler; diff --git a/java/org/apache/catalina/deploy/SecurityCollection.java b/java/org/apache/catalina/deploy/SecurityCollection.java index b3d9874c9..482793d4b 100644 --- a/java/org/apache/catalina/deploy/SecurityCollection.java +++ b/java/org/apache/catalina/deploy/SecurityCollection.java @@ -20,8 +20,8 @@ package org.apache.catalina.deploy; import org.apache.catalina.util.RequestUtil; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.juli.logging.Log; +import org.apache.juli.logging.LogFactory; import java.io.Serializable; diff --git a/java/org/apache/catalina/ha/CatalinaCluster.java b/java/org/apache/catalina/ha/CatalinaCluster.java index 52bac116f..c4dd07a09 100644 --- a/java/org/apache/catalina/ha/CatalinaCluster.java +++ b/java/org/apache/catalina/ha/CatalinaCluster.java @@ -24,7 +24,7 @@ import org.apache.catalina.Manager; import org.apache.catalina.Valve; import org.apache.catalina.tribes.Channel; import org.apache.catalina.tribes.Member; -import org.apache.commons.logging.Log; +import org.apache.juli.logging.Log; diff --git a/java/org/apache/catalina/ha/ClusterListener.java b/java/org/apache/catalina/ha/ClusterListener.java index 6d7aa6087..8661e4b08 100644 --- a/java/org/apache/catalina/ha/ClusterListener.java +++ b/java/org/apache/catalina/ha/ClusterListener.java @@ -36,7 +36,7 @@ import org.apache.catalina.tribes.Member; */ public abstract class ClusterListener implements ChannelListener { - public static org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory.getLog(ClusterListener.class); + public static org.apache.juli.logging.Log log = org.apache.juli.logging.LogFactory.getLog(ClusterListener.class); //--Instance Variables-------------------------------------- diff --git a/java/org/apache/catalina/ha/context/ReplicatedContext.java b/java/org/apache/catalina/ha/context/ReplicatedContext.java index 680fae0f9..eb9c1ec83 100644 --- a/java/org/apache/catalina/ha/context/ReplicatedContext.java +++ b/java/org/apache/catalina/ha/context/ReplicatedContext.java @@ -33,7 +33,7 @@ import org.apache.catalina.tribes.tipis.LazyReplicatedMap; */ public class ReplicatedContext extends StandardContext { private int mapSendOptions = Channel.SEND_OPTIONS_DEFAULT; - public static org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory.getLog( ReplicatedContext.class ); + public static org.apache.juli.logging.Log log = org.apache.juli.logging.LogFactory.getLog( ReplicatedContext.class ); protected static long DEFAULT_REPL_TIMEOUT = 15000;//15 seconds diff --git a/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java b/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java index 11ec1f282..78d88cb07 100644 --- a/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java +++ b/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java @@ -57,7 +57,7 @@ import org.apache.tomcat.util.modeler.Registry; */ public class FarmWarDeployer extends ClusterListener implements ClusterDeployer, FileChangeListener { /*--Static Variables----------------------------------------*/ - public static org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory + public static org.apache.juli.logging.Log log = org.apache.juli.logging.LogFactory .getLog(FarmWarDeployer.class); /** * The descriptive information about this implementation. diff --git a/java/org/apache/catalina/ha/deploy/FileMessageFactory.java b/java/org/apache/catalina/ha/deploy/FileMessageFactory.java index 43354eaa5..21d9643c7 100644 --- a/java/org/apache/catalina/ha/deploy/FileMessageFactory.java +++ b/java/org/apache/catalina/ha/deploy/FileMessageFactory.java @@ -38,7 +38,7 @@ import java.io.FileNotFoundException; */ public class FileMessageFactory { /*--Static Variables----------------------------------------*/ - public static org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory + public static org.apache.juli.logging.Log log = org.apache.juli.logging.LogFactory .getLog(FileMessageFactory.class); /** diff --git a/java/org/apache/catalina/ha/deploy/WarWatcher.java b/java/org/apache/catalina/ha/deploy/WarWatcher.java index f7aaa4ce0..1249448bd 100644 --- a/java/org/apache/catalina/ha/deploy/WarWatcher.java +++ b/java/org/apache/catalina/ha/deploy/WarWatcher.java @@ -36,7 +36,7 @@ import java.util.Iterator; public class WarWatcher { /*--Static Variables----------------------------------------*/ - public static org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory + public static org.apache.juli.logging.Log log = org.apache.juli.logging.LogFactory .getLog(WarWatcher.class); /*--Instance Variables--------------------------------------*/ diff --git a/java/org/apache/catalina/ha/session/BackupManager.java b/java/org/apache/catalina/ha/session/BackupManager.java index 879c1098b..5461a5275 100644 --- a/java/org/apache/catalina/ha/session/BackupManager.java +++ b/java/org/apache/catalina/ha/session/BackupManager.java @@ -34,7 +34,7 @@ import org.apache.catalina.tribes.tipis.LazyReplicatedMap; */ public class BackupManager extends StandardManager implements ClusterManager { - public static org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory.getLog( BackupManager.class ); + public static org.apache.juli.logging.Log log = org.apache.juli.logging.LogFactory.getLog( BackupManager.class ); protected static long DEFAULT_REPL_TIMEOUT = 15000;//15 seconds diff --git a/java/org/apache/catalina/ha/session/DeltaManager.java b/java/org/apache/catalina/ha/session/DeltaManager.java index 600e25a6b..708296300 100644 --- a/java/org/apache/catalina/ha/session/DeltaManager.java +++ b/java/org/apache/catalina/ha/session/DeltaManager.java @@ -67,7 +67,7 @@ import org.apache.catalina.ha.ClusterManager; public class DeltaManager extends ClusterManagerBase{ // ---------------------------------------------------- Security Classes - public static org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory.getLog(DeltaManager.class); + public static org.apache.juli.logging.Log log = org.apache.juli.logging.LogFactory.getLog(DeltaManager.class); /** * The string manager for this package. diff --git a/java/org/apache/catalina/ha/session/DeltaRequest.java b/java/org/apache/catalina/ha/session/DeltaRequest.java index e81c07f3a..9a2c37861 100644 --- a/java/org/apache/catalina/ha/session/DeltaRequest.java +++ b/java/org/apache/catalina/ha/session/DeltaRequest.java @@ -39,8 +39,8 @@ import java.io.ObjectOutputStream; public class DeltaRequest implements Externalizable { - public static org.apache.commons.logging.Log log = - org.apache.commons.logging.LogFactory.getLog( DeltaRequest.class ); + public static org.apache.juli.logging.Log log = + org.apache.juli.logging.LogFactory.getLog( DeltaRequest.class ); /** * The string manager for this package. diff --git a/java/org/apache/catalina/ha/session/DeltaSession.java b/java/org/apache/catalina/ha/session/DeltaSession.java index 1f1b49417..8f5d7dfbf 100644 --- a/java/org/apache/catalina/ha/session/DeltaSession.java +++ b/java/org/apache/catalina/ha/session/DeltaSession.java @@ -56,7 +56,7 @@ import java.util.concurrent.atomic.AtomicInteger; public class DeltaSession extends StandardSession implements Externalizable,ClusterSession,ReplicatedMapEntry { - public static org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory.getLog(DeltaSession.class); + public static org.apache.juli.logging.Log log = org.apache.juli.logging.LogFactory.getLog(DeltaSession.class); /** * The string manager for this package. diff --git a/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java b/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java index e77c3b322..f35845182 100644 --- a/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java +++ b/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java @@ -84,7 +84,7 @@ import org.apache.catalina.valves.ValveBase; public class JvmRouteBinderValve extends ValveBase implements ClusterValve, Lifecycle { /*--Static Variables----------------------------------------*/ - public static org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory + public static org.apache.juli.logging.Log log = org.apache.juli.logging.LogFactory .getLog(JvmRouteBinderValve.class); /** diff --git a/java/org/apache/catalina/ha/session/JvmRouteSessionIDBinderLifecycleListener.java b/java/org/apache/catalina/ha/session/JvmRouteSessionIDBinderLifecycleListener.java index 316238be2..998654d2b 100644 --- a/java/org/apache/catalina/ha/session/JvmRouteSessionIDBinderLifecycleListener.java +++ b/java/org/apache/catalina/ha/session/JvmRouteSessionIDBinderLifecycleListener.java @@ -28,8 +28,8 @@ import org.apache.catalina.core.StandardHost; import org.apache.catalina.ha.CatalinaCluster; import org.apache.catalina.ha.ClusterListener; import org.apache.catalina.util.StringManager; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.juli.logging.Log; +import org.apache.juli.logging.LogFactory; import org.apache.tomcat.util.modeler.ManagedBean; import org.apache.tomcat.util.modeler.Registry; diff --git a/java/org/apache/catalina/ha/session/SimpleTcpReplicationManager.java b/java/org/apache/catalina/ha/session/SimpleTcpReplicationManager.java index 9f3bb330e..36cabe185 100644 --- a/java/org/apache/catalina/ha/session/SimpleTcpReplicationManager.java +++ b/java/org/apache/catalina/ha/session/SimpleTcpReplicationManager.java @@ -58,7 +58,7 @@ import org.apache.catalina.Loader; */ public class SimpleTcpReplicationManager extends StandardManager implements ClusterManager { - public static org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory.getLog( SimpleTcpReplicationManager.class ); + public static org.apache.juli.logging.Log log = org.apache.juli.logging.LogFactory.getLog( SimpleTcpReplicationManager.class ); //the channel configuration protected String mChannelConfig = null; diff --git a/java/org/apache/catalina/ha/tcp/ReplicationValve.java b/java/org/apache/catalina/ha/tcp/ReplicationValve.java index 198204dee..b00f76a01 100644 --- a/java/org/apache/catalina/ha/tcp/ReplicationValve.java +++ b/java/org/apache/catalina/ha/tcp/ReplicationValve.java @@ -62,8 +62,8 @@ import org.apache.catalina.valves.ValveBase; public class ReplicationValve extends ValveBase implements ClusterValve { - private static org.apache.commons.logging.Log log = - org.apache.commons.logging.LogFactory.getLog( ReplicationValve.class ); + private static org.apache.juli.logging.Log log = + org.apache.juli.logging.LogFactory.getLog( ReplicationValve.class ); // ----------------------------------------------------- Instance Variables diff --git a/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java b/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java index 832e3eadb..71037f76a 100644 --- a/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java +++ b/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java @@ -50,8 +50,8 @@ import org.apache.catalina.tribes.MembershipListener; import org.apache.catalina.tribes.group.GroupChannel; import org.apache.catalina.util.LifecycleSupport; import org.apache.catalina.util.StringManager; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.juli.logging.Log; +import org.apache.juli.logging.LogFactory; import org.apache.tomcat.util.IntrospectionUtils; /** diff --git a/java/org/apache/catalina/loader/WebappClassLoader.java b/java/org/apache/catalina/loader/WebappClassLoader.java index fb839a7d3..b7983aab0 100644 --- a/java/org/apache/catalina/loader/WebappClassLoader.java +++ b/java/org/apache/catalina/loader/WebappClassLoader.java @@ -105,8 +105,8 @@ public class WebappClassLoader implements Reloader, Lifecycle { - protected static org.apache.commons.logging.Log log= - org.apache.commons.logging.LogFactory.getLog( WebappClassLoader.class ); + protected static org.apache.juli.logging.Log log= + org.apache.juli.logging.LogFactory.getLog( WebappClassLoader.class ); protected class PrivilegedFindResource implements PrivilegedAction { @@ -1633,7 +1633,7 @@ public class WebappClassLoader IntrospectionUtils.clear(); // Clear the classloader reference in common-logging - org.apache.commons.logging.LogFactory.release(this); + org.apache.juli.logging.LogFactory.release(this); // Clear the classloader reference in the VM's bean introspector java.beans.Introspector.flushCaches(); diff --git a/java/org/apache/catalina/loader/WebappLoader.java b/java/org/apache/catalina/loader/WebappLoader.java index b7db51fdc..07b08880c 100644 --- a/java/org/apache/catalina/loader/WebappLoader.java +++ b/java/org/apache/catalina/loader/WebappLoader.java @@ -1190,8 +1190,8 @@ public class WebappLoader } - private static org.apache.commons.logging.Log log= - org.apache.commons.logging.LogFactory.getLog( WebappLoader.class ); + private static org.apache.juli.logging.Log log= + org.apache.juli.logging.LogFactory.getLog( WebappLoader.class ); private ObjectName oname; private MBeanServer mserver; diff --git a/java/org/apache/catalina/mbeans/GlobalResourcesLifecycleListener.java b/java/org/apache/catalina/mbeans/GlobalResourcesLifecycleListener.java index d98fd1e24..53737bb0d 100644 --- a/java/org/apache/catalina/mbeans/GlobalResourcesLifecycleListener.java +++ b/java/org/apache/catalina/mbeans/GlobalResourcesLifecycleListener.java @@ -31,8 +31,8 @@ import org.apache.catalina.LifecycleListener; import org.apache.catalina.Role; import org.apache.catalina.User; import org.apache.catalina.UserDatabase; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.juli.logging.Log; +import org.apache.juli.logging.LogFactory; import org.apache.tomcat.util.modeler.Registry; diff --git a/java/org/apache/catalina/mbeans/MBeanFactory.java b/java/org/apache/catalina/mbeans/MBeanFactory.java index 9e6855af6..2e00f9e9d 100644 --- a/java/org/apache/catalina/mbeans/MBeanFactory.java +++ b/java/org/apache/catalina/mbeans/MBeanFactory.java @@ -66,8 +66,8 @@ import org.apache.tomcat.util.modeler.Registry; public class MBeanFactory extends BaseModelMBean { - private static org.apache.commons.logging.Log log = - org.apache.commons.logging.LogFactory.getLog(MBeanFactory.class); + private static org.apache.juli.logging.Log log = + org.apache.juli.logging.LogFactory.getLog(MBeanFactory.class); /** * The MBeanServer for this application. diff --git a/java/org/apache/catalina/mbeans/MBeanUtils.java b/java/org/apache/catalina/mbeans/MBeanUtils.java index 71ae2a8cf..e042e79de 100644 --- a/java/org/apache/catalina/mbeans/MBeanUtils.java +++ b/java/org/apache/catalina/mbeans/MBeanUtils.java @@ -47,8 +47,8 @@ import org.apache.catalina.deploy.ContextResource; import org.apache.catalina.deploy.ContextResourceLink; import org.apache.catalina.deploy.NamingResources; import org.apache.catalina.valves.ValveBase; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.juli.logging.Log; +import org.apache.juli.logging.LogFactory; import org.apache.tomcat.util.IntrospectionUtils; import org.apache.tomcat.util.modeler.ManagedBean; import org.apache.tomcat.util.modeler.Registry; diff --git a/java/org/apache/catalina/mbeans/ServerLifecycleListener.java b/java/org/apache/catalina/mbeans/ServerLifecycleListener.java index c8bdcaec1..4d694e8d6 100644 --- a/java/org/apache/catalina/mbeans/ServerLifecycleListener.java +++ b/java/org/apache/catalina/mbeans/ServerLifecycleListener.java @@ -47,8 +47,8 @@ import org.apache.catalina.deploy.ContextEnvironment; import org.apache.catalina.deploy.ContextResource; import org.apache.catalina.deploy.ContextResourceLink; import org.apache.catalina.deploy.NamingResources; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.juli.logging.Log; +import org.apache.juli.logging.LogFactory; /** diff --git a/java/org/apache/catalina/realm/JAASCallbackHandler.java b/java/org/apache/catalina/realm/JAASCallbackHandler.java index 6b7d30222..2ec00f30c 100644 --- a/java/org/apache/catalina/realm/JAASCallbackHandler.java +++ b/java/org/apache/catalina/realm/JAASCallbackHandler.java @@ -26,8 +26,8 @@ import javax.security.auth.callback.PasswordCallback; import javax.security.auth.callback.UnsupportedCallbackException; import org.apache.catalina.util.StringManager; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.juli.logging.Log; +import org.apache.juli.logging.LogFactory; /** *

Implementation of the JAAS CallbackHandler interface, diff --git a/java/org/apache/catalina/realm/JAASMemoryLoginModule.java b/java/org/apache/catalina/realm/JAASMemoryLoginModule.java index 2794fb2f6..d1311a177 100644 --- a/java/org/apache/catalina/realm/JAASMemoryLoginModule.java +++ b/java/org/apache/catalina/realm/JAASMemoryLoginModule.java @@ -41,8 +41,8 @@ import org.apache.catalina.connector.Request; import org.apache.catalina.deploy.SecurityConstraint; import org.apache.catalina.util.RequestUtil; import org.apache.catalina.util.StringManager; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.juli.logging.Log; +import org.apache.juli.logging.LogFactory; import org.apache.tomcat.util.digester.Digester; diff --git a/java/org/apache/catalina/realm/JAASRealm.java b/java/org/apache/catalina/realm/JAASRealm.java index 5b57a903a..45755598b 100644 --- a/java/org/apache/catalina/realm/JAASRealm.java +++ b/java/org/apache/catalina/realm/JAASRealm.java @@ -33,8 +33,8 @@ import javax.security.auth.login.LoginException; import org.apache.catalina.Container; import org.apache.catalina.LifecycleException; import org.apache.catalina.util.StringManager; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.juli.logging.Log; +import org.apache.juli.logging.LogFactory; /** diff --git a/java/org/apache/catalina/realm/MemoryRealm.java b/java/org/apache/catalina/realm/MemoryRealm.java index 5a924af32..f67a14ca8 100644 --- a/java/org/apache/catalina/realm/MemoryRealm.java +++ b/java/org/apache/catalina/realm/MemoryRealm.java @@ -26,8 +26,8 @@ import java.util.Map; import org.apache.catalina.Container; import org.apache.catalina.LifecycleException; import org.apache.catalina.util.StringManager; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.juli.logging.Log; +import org.apache.juli.logging.LogFactory; import org.apache.tomcat.util.digester.Digester; diff --git a/java/org/apache/catalina/realm/RealmBase.java b/java/org/apache/catalina/realm/RealmBase.java index f70d94a2e..501420c8e 100644 --- a/java/org/apache/catalina/realm/RealmBase.java +++ b/java/org/apache/catalina/realm/RealmBase.java @@ -50,8 +50,8 @@ import org.apache.catalina.util.HexUtils; import org.apache.catalina.util.LifecycleSupport; import org.apache.catalina.util.MD5Encoder; import org.apache.catalina.util.StringManager; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.juli.logging.Log; +import org.apache.juli.logging.LogFactory; import org.apache.tomcat.util.modeler.Registry; /** diff --git a/java/org/apache/catalina/security/SecurityConfig.java b/java/org/apache/catalina/security/SecurityConfig.java index b066acd23..5f151fa09 100644 --- a/java/org/apache/catalina/security/SecurityConfig.java +++ b/java/org/apache/catalina/security/SecurityConfig.java @@ -27,8 +27,8 @@ import org.apache.catalina.startup.CatalinaProperties; public final class SecurityConfig{ private static SecurityConfig singleton = null; - private static org.apache.commons.logging.Log log= - org.apache.commons.logging.LogFactory.getLog( SecurityConfig.class ); + private static org.apache.juli.logging.Log log= + org.apache.juli.logging.LogFactory.getLog( SecurityConfig.class ); private final static String PACKAGE_ACCESS = "sun.," diff --git a/java/org/apache/catalina/security/SecurityUtil.java b/java/org/apache/catalina/security/SecurityUtil.java index a2870514c..902aa29c2 100644 --- a/java/org/apache/catalina/security/SecurityUtil.java +++ b/java/org/apache/catalina/security/SecurityUtil.java @@ -63,8 +63,8 @@ public final class SecurityUtil{ */ private static HashMap objectCache = new HashMap(); - private static org.apache.commons.logging.Log log= - org.apache.commons.logging.LogFactory.getLog( SecurityUtil.class ); + private static org.apache.juli.logging.Log log= + org.apache.juli.logging.LogFactory.getLog( SecurityUtil.class ); private static String PACKAGE = "org.apache.catalina.security"; diff --git a/java/org/apache/catalina/session/ManagerBase.java b/java/org/apache/catalina/session/ManagerBase.java index a5bad5790..cf74cb2c3 100644 --- a/java/org/apache/catalina/session/ManagerBase.java +++ b/java/org/apache/catalina/session/ManagerBase.java @@ -48,8 +48,8 @@ import org.apache.catalina.Session; import org.apache.catalina.core.StandardContext; import org.apache.catalina.core.StandardHost; import org.apache.catalina.util.StringManager; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.juli.logging.Log; +import org.apache.juli.logging.LogFactory; import org.apache.tomcat.util.modeler.Registry; diff --git a/java/org/apache/catalina/session/PersistentManagerBase.java b/java/org/apache/catalina/session/PersistentManagerBase.java index ae73a5d95..51264d066 100644 --- a/java/org/apache/catalina/session/PersistentManagerBase.java +++ b/java/org/apache/catalina/session/PersistentManagerBase.java @@ -31,10 +31,10 @@ import org.apache.catalina.LifecycleListener; import org.apache.catalina.Session; import org.apache.catalina.Store; import org.apache.catalina.util.LifecycleSupport; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.catalina.security.SecurityUtil; +import org.apache.juli.logging.Log; +import org.apache.juli.logging.LogFactory; /** * Extends the ManagerBase class to implement most of the * functionality required by a Manager which supports any kind of diff --git a/java/org/apache/catalina/startup/Bootstrap.java b/java/org/apache/catalina/startup/Bootstrap.java index 09f658bf9..bb8cfea54 100644 --- a/java/org/apache/catalina/startup/Bootstrap.java +++ b/java/org/apache/catalina/startup/Bootstrap.java @@ -30,8 +30,8 @@ import javax.management.MBeanServerFactory; import javax.management.ObjectName; import org.apache.catalina.security.SecurityClassLoad; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.juli.logging.Log; +import org.apache.juli.logging.LogFactory; /** diff --git a/java/org/apache/catalina/startup/Catalina.java b/java/org/apache/catalina/startup/Catalina.java index 8d5fa7439..974dab631 100644 --- a/java/org/apache/catalina/startup/Catalina.java +++ b/java/org/apache/catalina/startup/Catalina.java @@ -649,8 +649,8 @@ public class Catalina extends Embedded { } - private static org.apache.commons.logging.Log log= - org.apache.commons.logging.LogFactory.getLog( Catalina.class ); + private static org.apache.juli.logging.Log log= + org.apache.juli.logging.LogFactory.getLog( Catalina.class ); } diff --git a/java/org/apache/catalina/startup/CatalinaProperties.java b/java/org/apache/catalina/startup/CatalinaProperties.java index 6720d6a12..296f59bff 100644 --- a/java/org/apache/catalina/startup/CatalinaProperties.java +++ b/java/org/apache/catalina/startup/CatalinaProperties.java @@ -37,8 +37,8 @@ public class CatalinaProperties { // ------------------------------------------------------- Static Variables - private static org.apache.commons.logging.Log log= - org.apache.commons.logging.LogFactory.getLog( CatalinaProperties.class ); + private static org.apache.juli.logging.Log log= + org.apache.juli.logging.LogFactory.getLog( CatalinaProperties.class ); private static Properties properties = null; diff --git a/java/org/apache/catalina/startup/ClassLoaderFactory.java b/java/org/apache/catalina/startup/ClassLoaderFactory.java index 1d7a297dc..243d9f622 100644 --- a/java/org/apache/catalina/startup/ClassLoaderFactory.java +++ b/java/org/apache/catalina/startup/ClassLoaderFactory.java @@ -23,8 +23,8 @@ import java.net.URL; import java.util.ArrayList; import org.apache.catalina.loader.StandardClassLoader; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.juli.logging.Log; +import org.apache.juli.logging.LogFactory; /** diff --git a/java/org/apache/catalina/startup/ClusterRuleSetFactory.java b/java/org/apache/catalina/startup/ClusterRuleSetFactory.java index 4ea91e82f..64dddb66a 100644 --- a/java/org/apache/catalina/startup/ClusterRuleSetFactory.java +++ b/java/org/apache/catalina/startup/ClusterRuleSetFactory.java @@ -21,8 +21,10 @@ package org.apache.catalina.startup; import org.apache.tomcat.util.digester.Digester; import org.apache.tomcat.util.digester.RuleSetBase; import java.lang.reflect.Constructor; -import org.apache.commons.logging.LogFactory; -import org.apache.commons.logging.Log; + +import org.apache.juli.logging.Log; +import org.apache.juli.logging.LogFactory; + import java.lang.reflect.InvocationTargetException; public class ClusterRuleSetFactory { diff --git a/java/org/apache/catalina/startup/ContextConfig.java b/java/org/apache/catalina/startup/ContextConfig.java index f9145bbd6..62f0e54ac 100644 --- a/java/org/apache/catalina/startup/ContextConfig.java +++ b/java/org/apache/catalina/startup/ContextConfig.java @@ -69,8 +69,8 @@ import org.xml.sax.SAXParseException; public class ContextConfig implements LifecycleListener { - protected static org.apache.commons.logging.Log log= - org.apache.commons.logging.LogFactory.getLog( ContextConfig.class ); + protected static org.apache.juli.logging.Log log= + org.apache.juli.logging.LogFactory.getLog( ContextConfig.class ); // ----------------------------------------------------- Instance Variables diff --git a/java/org/apache/catalina/startup/DigesterFactory.java b/java/org/apache/catalina/startup/DigesterFactory.java index 048d182d1..6e319fb01 100644 --- a/java/org/apache/catalina/startup/DigesterFactory.java +++ b/java/org/apache/catalina/startup/DigesterFactory.java @@ -32,8 +32,8 @@ public class DigesterFactory { /** * The log. */ - protected static org.apache.commons.logging.Log log = - org.apache.commons.logging.LogFactory.getLog(DigesterFactory.class); + protected static org.apache.juli.logging.Log log = + org.apache.juli.logging.LogFactory.getLog(DigesterFactory.class); /** * The XML entiry resolver used by the Digester. diff --git a/java/org/apache/catalina/startup/Embedded.java b/java/org/apache/catalina/startup/Embedded.java index cd177031c..efb440fff 100644 --- a/java/org/apache/catalina/startup/Embedded.java +++ b/java/org/apache/catalina/startup/Embedded.java @@ -43,8 +43,8 @@ import org.apache.catalina.loader.WebappLoader; import org.apache.catalina.security.SecurityConfig; import org.apache.catalina.util.LifecycleSupport; import org.apache.catalina.util.StringManager; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.juli.logging.Log; +import org.apache.juli.logging.LogFactory; import org.apache.tomcat.util.IntrospectionUtils; import org.apache.tomcat.util.log.SystemLogHandler; diff --git a/java/org/apache/catalina/startup/EngineConfig.java b/java/org/apache/catalina/startup/EngineConfig.java index 19e3375ba..d8ffc8e4e 100644 --- a/java/org/apache/catalina/startup/EngineConfig.java +++ b/java/org/apache/catalina/startup/EngineConfig.java @@ -37,8 +37,8 @@ public class EngineConfig implements LifecycleListener { - protected static org.apache.commons.logging.Log log= - org.apache.commons.logging.LogFactory.getLog( EngineConfig.class ); + protected static org.apache.juli.logging.Log log= + org.apache.juli.logging.LogFactory.getLog( EngineConfig.class ); // ----------------------------------------------------- Instance Variables diff --git a/java/org/apache/catalina/startup/ExpandWar.java b/java/org/apache/catalina/startup/ExpandWar.java index fbf12a430..da35c76e1 100644 --- a/java/org/apache/catalina/startup/ExpandWar.java +++ b/java/org/apache/catalina/startup/ExpandWar.java @@ -32,8 +32,8 @@ import java.util.jar.JarFile; import org.apache.catalina.Host; import org.apache.catalina.util.StringManager; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.juli.logging.Log; +import org.apache.juli.logging.LogFactory; /** * Expand out a WAR in a Host's appBase. diff --git a/java/org/apache/catalina/startup/HostConfig.java b/java/org/apache/catalina/startup/HostConfig.java index 189f1582a..504694573 100644 --- a/java/org/apache/catalina/startup/HostConfig.java +++ b/java/org/apache/catalina/startup/HostConfig.java @@ -56,8 +56,8 @@ import org.apache.tomcat.util.modeler.Registry; public class HostConfig implements LifecycleListener { - protected static org.apache.commons.logging.Log log= - org.apache.commons.logging.LogFactory.getLog( HostConfig.class ); + protected static org.apache.juli.logging.Log log= + org.apache.juli.logging.LogFactory.getLog( HostConfig.class ); // ----------------------------------------------------- Instance Variables diff --git a/java/org/apache/catalina/startup/TldConfig.java b/java/org/apache/catalina/startup/TldConfig.java index 04dc2f450..fc20acccd 100644 --- a/java/org/apache/catalina/startup/TldConfig.java +++ b/java/org/apache/catalina/startup/TldConfig.java @@ -64,8 +64,8 @@ public final class TldConfig { // Names of JARs that are known not to contain any TLDs private static HashSet noTldJars; - private static org.apache.commons.logging.Log log= - org.apache.commons.logging.LogFactory.getLog( TldConfig.class ); + private static org.apache.juli.logging.Log log= + org.apache.juli.logging.LogFactory.getLog( TldConfig.class ); private static final String FILE_URL_PREFIX = "file:"; private static final int FILE_URL_PREFIX_LEN = FILE_URL_PREFIX.length(); diff --git a/java/org/apache/catalina/startup/Tool.java b/java/org/apache/catalina/startup/Tool.java index 2fc50e6d6..f54bd8192 100644 --- a/java/org/apache/catalina/startup/Tool.java +++ b/java/org/apache/catalina/startup/Tool.java @@ -22,8 +22,8 @@ import java.io.File; import java.lang.reflect.Method; import java.util.ArrayList; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.juli.logging.Log; +import org.apache.juli.logging.LogFactory; /** diff --git a/java/org/apache/catalina/startup/UserConfig.java b/java/org/apache/catalina/startup/UserConfig.java index 4319cdce0..240c3607a 100644 --- a/java/org/apache/catalina/startup/UserConfig.java +++ b/java/org/apache/catalina/startup/UserConfig.java @@ -44,8 +44,8 @@ public final class UserConfig implements LifecycleListener { - private static org.apache.commons.logging.Log log= - org.apache.commons.logging.LogFactory.getLog( UserConfig.class ); + private static org.apache.juli.logging.Log log= + org.apache.juli.logging.LogFactory.getLog( UserConfig.class ); // ----------------------------------------------------- Instance Variables diff --git a/java/org/apache/catalina/tribes/group/ChannelInterceptorBase.java b/java/org/apache/catalina/tribes/group/ChannelInterceptorBase.java index e67199ccd..d23829a3d 100644 --- a/java/org/apache/catalina/tribes/group/ChannelInterceptorBase.java +++ b/java/org/apache/catalina/tribes/group/ChannelInterceptorBase.java @@ -28,7 +28,7 @@ import org.apache.catalina.tribes.Member; public abstract class ChannelInterceptorBase implements ChannelInterceptor { - protected static org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory.getLog( + protected static org.apache.juli.logging.Log log = org.apache.juli.logging.LogFactory.getLog( ChannelInterceptorBase.class); private ChannelInterceptor next; diff --git a/java/org/apache/catalina/tribes/group/GroupChannel.java b/java/org/apache/catalina/tribes/group/GroupChannel.java index 69f7f1d06..161144fad 100644 --- a/java/org/apache/catalina/tribes/group/GroupChannel.java +++ b/java/org/apache/catalina/tribes/group/GroupChannel.java @@ -625,7 +625,7 @@ public class GroupChannel extends ChannelInterceptorBase implements ManagedChann * @version 1.0 */ public static class HeartbeatThread extends Thread { - protected static org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory.getLog(HeartbeatThread.class); + protected static org.apache.juli.logging.Log log = org.apache.juli.logging.LogFactory.getLog(HeartbeatThread.class); protected static int counter = 1; protected static synchronized int inc() { return counter++; diff --git a/java/org/apache/catalina/tribes/group/RpcChannel.java b/java/org/apache/catalina/tribes/group/RpcChannel.java index e73dcb662..873a961c7 100644 --- a/java/org/apache/catalina/tribes/group/RpcChannel.java +++ b/java/org/apache/catalina/tribes/group/RpcChannel.java @@ -31,7 +31,7 @@ import org.apache.catalina.tribes.util.UUIDGenerator; * @author Filip Hanik */ public class RpcChannel implements ChannelListener{ - protected static org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory.getLog(RpcChannel.class); + protected static org.apache.juli.logging.Log log = org.apache.juli.logging.LogFactory.getLog(RpcChannel.class); public static final int FIRST_REPLY = 1; public static final int MAJORITY_REPLY = 2; diff --git a/java/org/apache/catalina/tribes/group/interceptors/DomainFilterInterceptor.java b/java/org/apache/catalina/tribes/group/interceptors/DomainFilterInterceptor.java index ebe4e94e9..395bd0af9 100644 --- a/java/org/apache/catalina/tribes/group/interceptors/DomainFilterInterceptor.java +++ b/java/org/apache/catalina/tribes/group/interceptors/DomainFilterInterceptor.java @@ -32,7 +32,7 @@ import java.util.Arrays; */ public class DomainFilterInterceptor extends ChannelInterceptorBase { - private static org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory.getLog( DomainFilterInterceptor.class ); + private static org.apache.juli.logging.Log log = org.apache.juli.logging.LogFactory.getLog( DomainFilterInterceptor.class ); protected Membership membership = null; diff --git a/java/org/apache/catalina/tribes/group/interceptors/FragmentationInterceptor.java b/java/org/apache/catalina/tribes/group/interceptors/FragmentationInterceptor.java index cdd615bab..bbf15ab86 100644 --- a/java/org/apache/catalina/tribes/group/interceptors/FragmentationInterceptor.java +++ b/java/org/apache/catalina/tribes/group/interceptors/FragmentationInterceptor.java @@ -40,7 +40,7 @@ import org.apache.catalina.tribes.io.XByteBuffer; * @version 1.0 */ public class FragmentationInterceptor extends ChannelInterceptorBase { - private static org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory.getLog( FragmentationInterceptor.class ); + private static org.apache.juli.logging.Log log = org.apache.juli.logging.LogFactory.getLog( FragmentationInterceptor.class ); protected HashMap fragpieces = new HashMap(); private int maxSize = 1024*100; diff --git a/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java b/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java index a9eb91715..781920864 100644 --- a/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java +++ b/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java @@ -37,7 +37,7 @@ import org.apache.catalina.tribes.UniqueId; * @version 1.0 */ public class MessageDispatchInterceptor extends ChannelInterceptorBase implements Runnable { - protected static org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory.getLog(MessageDispatchInterceptor.class); + protected static org.apache.juli.logging.Log log = org.apache.juli.logging.LogFactory.getLog(MessageDispatchInterceptor.class); protected long maxQueueSize = 1024*1024*64; //64MB protected FastQueue queue = new FastQueue(); diff --git a/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java b/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java index 10418e75a..f9da96f9a 100644 --- a/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java +++ b/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java @@ -57,7 +57,7 @@ import java.net.ConnectException; */ public class TcpFailureDetector extends ChannelInterceptorBase { - private static org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory.getLog( TcpFailureDetector.class ); + private static org.apache.juli.logging.Log log = org.apache.juli.logging.LogFactory.getLog( TcpFailureDetector.class ); protected static byte[] TCP_FAIL_DETECT = new byte[] { 79, -89, 115, 72, 121, -126, 67, -55, -97, 111, -119, -128, -95, 91, 7, 20, diff --git a/java/org/apache/catalina/tribes/group/interceptors/ThroughputInterceptor.java b/java/org/apache/catalina/tribes/group/interceptors/ThroughputInterceptor.java index 972a7c569..fe99d4996 100644 --- a/java/org/apache/catalina/tribes/group/interceptors/ThroughputInterceptor.java +++ b/java/org/apache/catalina/tribes/group/interceptors/ThroughputInterceptor.java @@ -36,7 +36,7 @@ import java.util.concurrent.atomic.AtomicLong; * @version 1.0 */ public class ThroughputInterceptor extends ChannelInterceptorBase { - protected static org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory.getLog(ThroughputInterceptor.class); + protected static org.apache.juli.logging.Log log = org.apache.juli.logging.LogFactory.getLog(ThroughputInterceptor.class); double mbTx = 0; double mbAppTx = 0; diff --git a/java/org/apache/catalina/tribes/group/interceptors/TwoPhaseCommitInterceptor.java b/java/org/apache/catalina/tribes/group/interceptors/TwoPhaseCommitInterceptor.java index bb531493f..5d2b9f4e1 100644 --- a/java/org/apache/catalina/tribes/group/interceptors/TwoPhaseCommitInterceptor.java +++ b/java/org/apache/catalina/tribes/group/interceptors/TwoPhaseCommitInterceptor.java @@ -43,7 +43,7 @@ public class TwoPhaseCommitInterceptor extends ChannelInterceptorBase { public static final byte[] START_DATA = new byte[] {113, 1, -58, 2, -34, -60, 75, -78, -101, -12, 32, -29, 32, 111, -40, 4}; public static final byte[] END_DATA = new byte[] {54, -13, 90, 110, 47, -31, 75, -24, -81, -29, 36, 52, -58, 77, -110, 56}; - private static org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory.getLog(TwoPhaseCommitInterceptor.class); + private static org.apache.juli.logging.Log log = org.apache.juli.logging.LogFactory.getLog(TwoPhaseCommitInterceptor.class); protected HashMap messages = new HashMap(); protected long expire = 1000 * 60; //one minute expiration diff --git a/java/org/apache/catalina/tribes/io/BufferPool.java b/java/org/apache/catalina/tribes/io/BufferPool.java index 48b5e8b91..b3dc19290 100644 --- a/java/org/apache/catalina/tribes/io/BufferPool.java +++ b/java/org/apache/catalina/tribes/io/BufferPool.java @@ -15,9 +15,9 @@ */ package org.apache.catalina.tribes.io; -import org.apache.commons.logging.LogFactory; -import org.apache.commons.logging.Log; +import org.apache.juli.logging.Log; +import org.apache.juli.logging.LogFactory; /** * diff --git a/java/org/apache/catalina/tribes/io/ObjectReader.java b/java/org/apache/catalina/tribes/io/ObjectReader.java index c69e8d23e..fd6dbc060 100644 --- a/java/org/apache/catalina/tribes/io/ObjectReader.java +++ b/java/org/apache/catalina/tribes/io/ObjectReader.java @@ -36,7 +36,7 @@ import org.apache.catalina.tribes.ChannelMessage; */ public class ObjectReader { - protected static org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory.getLog(ObjectReader.class); + protected static org.apache.juli.logging.Log log = org.apache.juli.logging.LogFactory.getLog(ObjectReader.class); private XByteBuffer buffer; diff --git a/java/org/apache/catalina/tribes/io/XByteBuffer.java b/java/org/apache/catalina/tribes/io/XByteBuffer.java index 609965cc9..0b493fa3f 100644 --- a/java/org/apache/catalina/tribes/io/XByteBuffer.java +++ b/java/org/apache/catalina/tribes/io/XByteBuffer.java @@ -46,8 +46,8 @@ import java.nio.ByteBuffer; public class XByteBuffer { - public static org.apache.commons.logging.Log log = - org.apache.commons.logging.LogFactory.getLog( XByteBuffer.class ); + public static org.apache.juli.logging.Log log = + org.apache.juli.logging.LogFactory.getLog( XByteBuffer.class ); /** * This is a package header, 7 bytes (FLT2002) diff --git a/java/org/apache/catalina/tribes/membership/McastService.java b/java/org/apache/catalina/tribes/membership/McastService.java index 4a7aeb962..fa42b8986 100644 --- a/java/org/apache/catalina/tribes/membership/McastService.java +++ b/java/org/apache/catalina/tribes/membership/McastService.java @@ -38,8 +38,8 @@ import java.io.IOException; public class McastService implements MembershipService,MembershipListener { - private static org.apache.commons.logging.Log log = - org.apache.commons.logging.LogFactory.getLog( McastService.class ); + private static org.apache.juli.logging.Log log = + org.apache.juli.logging.LogFactory.getLog( McastService.class ); /** * The string manager for this package. diff --git a/java/org/apache/catalina/tribes/membership/McastServiceImpl.java b/java/org/apache/catalina/tribes/membership/McastServiceImpl.java index 999b1f012..cbab1eedd 100644 --- a/java/org/apache/catalina/tribes/membership/McastServiceImpl.java +++ b/java/org/apache/catalina/tribes/membership/McastServiceImpl.java @@ -42,8 +42,8 @@ import java.net.InetSocketAddress; */ public class McastServiceImpl { - private static org.apache.commons.logging.Log log = - org.apache.commons.logging.LogFactory.getLog( McastService.class ); + private static org.apache.juli.logging.Log log = + org.apache.juli.logging.LogFactory.getLog( McastService.class ); protected static int MAX_PACKET_SIZE = 65535; /** diff --git a/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java b/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java index 2ac75e9df..8460e85d0 100644 --- a/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java +++ b/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java @@ -42,9 +42,10 @@ import org.apache.catalina.tribes.group.RpcCallback; import org.apache.catalina.tribes.group.RpcChannel; import org.apache.catalina.tribes.io.XByteBuffer; import org.apache.catalina.tribes.membership.MemberImpl; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.catalina.tribes.util.Arrays; +import org.apache.juli.logging.Log; +import org.apache.juli.logging.LogFactory; + import java.util.ConcurrentModificationException; /** diff --git a/java/org/apache/catalina/tribes/tipis/LazyReplicatedMap.java b/java/org/apache/catalina/tribes/tipis/LazyReplicatedMap.java index ccfc1d42e..badd99cd9 100644 --- a/java/org/apache/catalina/tribes/tipis/LazyReplicatedMap.java +++ b/java/org/apache/catalina/tribes/tipis/LazyReplicatedMap.java @@ -65,7 +65,7 @@ import org.apache.catalina.tribes.UniqueId; */ public class LazyReplicatedMap extends AbstractReplicatedMap implements RpcCallback, ChannelListener, MembershipListener { - protected static org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory.getLog(LazyReplicatedMap.class); + protected static org.apache.juli.logging.Log log = org.apache.juli.logging.LogFactory.getLog(LazyReplicatedMap.class); diff --git a/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java b/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java index 01bb3ba61..c0cfbb955 100644 --- a/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java +++ b/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java @@ -50,7 +50,7 @@ import org.apache.catalina.tribes.group.RpcCallback; */ public class ReplicatedMap extends AbstractReplicatedMap implements RpcCallback, ChannelListener, MembershipListener { - protected static org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory.getLog(ReplicatedMap.class); + protected static org.apache.juli.logging.Log log = org.apache.juli.logging.LogFactory.getLog(ReplicatedMap.class); //------------------------------------------------------------------------------ // CONSTRUCTORS / DESTRUCTORS diff --git a/java/org/apache/catalina/tribes/transport/ReceiverBase.java b/java/org/apache/catalina/tribes/transport/ReceiverBase.java index 091bb9320..1d6872f7a 100644 --- a/java/org/apache/catalina/tribes/transport/ReceiverBase.java +++ b/java/org/apache/catalina/tribes/transport/ReceiverBase.java @@ -24,7 +24,7 @@ import org.apache.catalina.tribes.ChannelMessage; import org.apache.catalina.tribes.ChannelReceiver; import org.apache.catalina.tribes.MessageListener; import org.apache.catalina.tribes.io.ListenCallback; -import org.apache.commons.logging.Log; +import org.apache.juli.logging.Log; /** *

Title:

@@ -43,7 +43,7 @@ public abstract class ReceiverBase implements ChannelReceiver, ListenCallback, T public static final int OPTION_DIRECT_BUFFER = 0x0004; - protected static org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory.getLog(ReceiverBase.class); + protected static org.apache.juli.logging.Log log = org.apache.juli.logging.LogFactory.getLog(ReceiverBase.class); private MessageListener listener; private String host = "auto"; diff --git a/java/org/apache/catalina/tribes/transport/ReplicationTransmitter.java b/java/org/apache/catalina/tribes/transport/ReplicationTransmitter.java index 6b3b18a46..d2f33b52c 100644 --- a/java/org/apache/catalina/tribes/transport/ReplicationTransmitter.java +++ b/java/org/apache/catalina/tribes/transport/ReplicationTransmitter.java @@ -32,7 +32,7 @@ import org.apache.catalina.tribes.transport.nio.PooledParallelSender; * @version $Revision: 379956 $ $Date: 2006-02-22 16:57:35 -0600 (Wed, 22 Feb 2006) $ */ public class ReplicationTransmitter implements ChannelSender { - private static org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory.getLog(ReplicationTransmitter.class); + private static org.apache.juli.logging.Log log = org.apache.juli.logging.LogFactory.getLog(ReplicationTransmitter.class); /** * The descriptive information about this implementation. diff --git a/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java b/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java index ab4b67b03..ac083dd7c 100644 --- a/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java +++ b/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java @@ -40,7 +40,7 @@ import org.apache.catalina.tribes.transport.WorkerThread; */ public class BioReceiver extends ReceiverBase implements Runnable, ChannelReceiver, ListenCallback { - protected static org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory.getLog(BioReceiver.class); + protected static org.apache.juli.logging.Log log = org.apache.juli.logging.LogFactory.getLog(BioReceiver.class); protected ServerSocket serverSocket; diff --git a/java/org/apache/catalina/tribes/transport/bio/BioReplicationThread.java b/java/org/apache/catalina/tribes/transport/bio/BioReplicationThread.java index eacf6eb48..80c8fff47 100644 --- a/java/org/apache/catalina/tribes/transport/bio/BioReplicationThread.java +++ b/java/org/apache/catalina/tribes/transport/bio/BioReplicationThread.java @@ -46,7 +46,7 @@ import org.apache.catalina.tribes.io.BufferPool; public class BioReplicationThread extends WorkerThread { - protected static org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory.getLog( BioReplicationThread.class ); + protected static org.apache.juli.logging.Log log = org.apache.juli.logging.LogFactory.getLog( BioReplicationThread.class ); protected Socket socket; protected ObjectReader reader; diff --git a/java/org/apache/catalina/tribes/transport/bio/BioSender.java b/java/org/apache/catalina/tribes/transport/bio/BioSender.java index 8a1aead8e..2b9762401 100644 --- a/java/org/apache/catalina/tribes/transport/bio/BioSender.java +++ b/java/org/apache/catalina/tribes/transport/bio/BioSender.java @@ -44,7 +44,7 @@ import org.apache.catalina.tribes.util.StringManager; */ public class BioSender extends AbstractSender implements DataSender { - private static org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory.getLog(BioSender.class); + private static org.apache.juli.logging.Log log = org.apache.juli.logging.LogFactory.getLog(BioSender.class); /** * The string manager for this package. 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 0c34e3c39..439c530c2 100644 --- a/java/org/apache/catalina/tribes/transport/bio/util/FastQueue.java +++ b/java/org/apache/catalina/tribes/transport/bio/util/FastQueue.java @@ -34,7 +34,7 @@ import org.apache.catalina.tribes.group.InterceptorPayload; */ public class FastQueue { - private static org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory.getLog(FastQueue.class); + private static org.apache.juli.logging.Log log = org.apache.juli.logging.LogFactory.getLog(FastQueue.class); /** * This is the actual queue diff --git a/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java b/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java index 7cf5e2843..6b391665c 100644 --- a/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java +++ b/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java @@ -43,7 +43,7 @@ import java.nio.channels.CancelledKeyException; */ public class NioReceiver extends ReceiverBase implements Runnable, ChannelReceiver, ListenCallback { - protected static org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory.getLog(NioReceiver.class); + protected static org.apache.juli.logging.Log log = org.apache.juli.logging.LogFactory.getLog(NioReceiver.class); /** * The string manager for this package. diff --git a/java/org/apache/catalina/tribes/transport/nio/NioReplicationThread.java b/java/org/apache/catalina/tribes/transport/nio/NioReplicationThread.java index d19f13145..49bcc3574 100644 --- a/java/org/apache/catalina/tribes/transport/nio/NioReplicationThread.java +++ b/java/org/apache/catalina/tribes/transport/nio/NioReplicationThread.java @@ -48,7 +48,7 @@ import org.apache.catalina.tribes.util.Logs; */ public class NioReplicationThread extends WorkerThread { - private static org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory.getLog( NioReplicationThread.class ); + private static org.apache.juli.logging.Log log = org.apache.juli.logging.LogFactory.getLog( NioReplicationThread.class ); private ByteBuffer buffer = null; private SelectionKey key; diff --git a/java/org/apache/catalina/tribes/transport/nio/NioSender.java b/java/org/apache/catalina/tribes/transport/nio/NioSender.java index 906b8a2a9..c133fe6e6 100644 --- a/java/org/apache/catalina/tribes/transport/nio/NioSender.java +++ b/java/org/apache/catalina/tribes/transport/nio/NioSender.java @@ -47,7 +47,7 @@ import org.apache.catalina.tribes.RemoteProcessException; */ public class NioSender extends AbstractSender implements DataSender{ - protected static org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory.getLog(NioSender.class); + protected static org.apache.juli.logging.Log log = org.apache.juli.logging.LogFactory.getLog(NioSender.class); diff --git a/java/org/apache/catalina/tribes/transport/nio/ParallelNioSender.java b/java/org/apache/catalina/tribes/transport/nio/ParallelNioSender.java index 5e92c5e6d..b444451dd 100644 --- a/java/org/apache/catalina/tribes/transport/nio/ParallelNioSender.java +++ b/java/org/apache/catalina/tribes/transport/nio/ParallelNioSender.java @@ -51,7 +51,7 @@ import org.apache.catalina.tribes.UniqueId; */ public class ParallelNioSender extends AbstractSender implements MultiPointSender { - protected static org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory.getLog(ParallelNioSender.class); + protected static org.apache.juli.logging.Log log = org.apache.juli.logging.LogFactory.getLog(ParallelNioSender.class); protected long selectTimeout = 5000; //default 5 seconds, same as send timeout protected Selector selector; protected HashMap nioSenders = new HashMap(); diff --git a/java/org/apache/catalina/tribes/util/Logs.java b/java/org/apache/catalina/tribes/util/Logs.java index 248589458..05a50de22 100644 --- a/java/org/apache/catalina/tribes/util/Logs.java +++ b/java/org/apache/catalina/tribes/util/Logs.java @@ -15,8 +15,8 @@ */ package org.apache.catalina.tribes.util; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.juli.logging.Log; +import org.apache.juli.logging.LogFactory; /** * * Simple class that holds references to global loggers diff --git a/java/org/apache/catalina/tribes/util/StringManager.java b/java/org/apache/catalina/tribes/util/StringManager.java index 77f112218..5eb32757f 100644 --- a/java/org/apache/catalina/tribes/util/StringManager.java +++ b/java/org/apache/catalina/tribes/util/StringManager.java @@ -55,8 +55,8 @@ public class StringManager { private ResourceBundle bundle; - private static org.apache.commons.logging.Log log= - org.apache.commons.logging.LogFactory.getLog( StringManager.class ); + private static org.apache.juli.logging.Log log= + org.apache.juli.logging.LogFactory.getLog( StringManager.class ); /** * Creates a new StringManager for a given package. This is a diff --git a/java/org/apache/catalina/users/MemoryUserDatabase.java b/java/org/apache/catalina/users/MemoryUserDatabase.java index 22256ce2c..ead544cd6 100644 --- a/java/org/apache/catalina/users/MemoryUserDatabase.java +++ b/java/org/apache/catalina/users/MemoryUserDatabase.java @@ -31,8 +31,8 @@ import org.apache.catalina.Role; import org.apache.catalina.User; import org.apache.catalina.UserDatabase; import org.apache.catalina.util.StringManager; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.juli.logging.Log; +import org.apache.juli.logging.LogFactory; import org.apache.tomcat.util.digester.Digester; import org.apache.tomcat.util.digester.ObjectCreationFactory; import org.xml.sax.Attributes; diff --git a/java/org/apache/catalina/util/ExtensionValidator.java b/java/org/apache/catalina/util/ExtensionValidator.java index 04c886d20..4b01cc787 100644 --- a/java/org/apache/catalina/util/ExtensionValidator.java +++ b/java/org/apache/catalina/util/ExtensionValidator.java @@ -51,8 +51,8 @@ import org.apache.naming.resources.Resource; */ public final class ExtensionValidator { - private static org.apache.commons.logging.Log log= - org.apache.commons.logging.LogFactory.getLog(ExtensionValidator.class); + private static org.apache.juli.logging.Log log= + org.apache.juli.logging.LogFactory.getLog(ExtensionValidator.class); /** * The string resources for this package. diff --git a/java/org/apache/catalina/util/StringManager.java b/java/org/apache/catalina/util/StringManager.java index 386381e63..c5d10d312 100644 --- a/java/org/apache/catalina/util/StringManager.java +++ b/java/org/apache/catalina/util/StringManager.java @@ -55,8 +55,8 @@ public class StringManager { private ResourceBundle bundle; - private static org.apache.commons.logging.Log log= - org.apache.commons.logging.LogFactory.getLog( StringManager.class ); + private static org.apache.juli.logging.Log log= + org.apache.juli.logging.LogFactory.getLog( StringManager.class ); /** * Creates a new StringManager for a given package. This is a diff --git a/java/org/apache/catalina/valves/ExtendedAccessLogValve.java b/java/org/apache/catalina/valves/ExtendedAccessLogValve.java index ea1dfc12f..fd07af27c 100644 --- a/java/org/apache/catalina/valves/ExtendedAccessLogValve.java +++ b/java/org/apache/catalina/valves/ExtendedAccessLogValve.java @@ -43,8 +43,8 @@ import org.apache.catalina.connector.Response; import org.apache.catalina.util.LifecycleSupport; import org.apache.catalina.util.ServerInfo; import org.apache.catalina.util.StringManager; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.juli.logging.Log; +import org.apache.juli.logging.LogFactory; diff --git a/java/org/apache/catalina/valves/RequestDumperValve.java b/java/org/apache/catalina/valves/RequestDumperValve.java index c5b5041fd..d1f596866 100644 --- a/java/org/apache/catalina/valves/RequestDumperValve.java +++ b/java/org/apache/catalina/valves/RequestDumperValve.java @@ -27,7 +27,7 @@ import javax.servlet.http.Cookie; import org.apache.catalina.connector.Request; import org.apache.catalina.connector.Response; import org.apache.catalina.util.StringManager; -import org.apache.commons.logging.Log; +import org.apache.juli.logging.Log; /** diff --git a/java/org/apache/catalina/valves/ValveBase.java b/java/org/apache/catalina/valves/ValveBase.java index 9d45284e9..79762c8d0 100644 --- a/java/org/apache/catalina/valves/ValveBase.java +++ b/java/org/apache/catalina/valves/ValveBase.java @@ -39,8 +39,8 @@ import org.apache.catalina.connector.Request; import org.apache.catalina.connector.Response; import org.apache.catalina.core.ContainerBase; import org.apache.catalina.util.StringManager; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.juli.logging.Log; +import org.apache.juli.logging.LogFactory; /** diff --git a/java/org/apache/coyote/ajp/AjpAprProcessor.java b/java/org/apache/coyote/ajp/AjpAprProcessor.java index 04d4bc8a8..21ea657ed 100644 --- a/java/org/apache/coyote/ajp/AjpAprProcessor.java +++ b/java/org/apache/coyote/ajp/AjpAprProcessor.java @@ -60,8 +60,8 @@ public class AjpAprProcessor implements ActionHook { /** * Logger. */ - protected static org.apache.commons.logging.Log log - = org.apache.commons.logging.LogFactory.getLog(AjpAprProcessor.class); + protected static org.apache.juli.logging.Log log + = org.apache.juli.logging.LogFactory.getLog(AjpAprProcessor.class); /** * The string manager for this package. diff --git a/java/org/apache/coyote/ajp/AjpAprProtocol.java b/java/org/apache/coyote/ajp/AjpAprProtocol.java index 9a3f0387e..48c47771b 100644 --- a/java/org/apache/coyote/ajp/AjpAprProtocol.java +++ b/java/org/apache/coyote/ajp/AjpAprProtocol.java @@ -51,8 +51,8 @@ public class AjpAprProtocol implements ProtocolHandler, MBeanRegistration { - protected static org.apache.commons.logging.Log log = - org.apache.commons.logging.LogFactory.getLog(AjpAprProtocol.class); + protected static org.apache.juli.logging.Log log = + org.apache.juli.logging.LogFactory.getLog(AjpAprProtocol.class); /** * The string manager for this package. diff --git a/java/org/apache/coyote/ajp/AjpMessage.java b/java/org/apache/coyote/ajp/AjpMessage.java index e0283182d..ec5e69ea0 100644 --- a/java/org/apache/coyote/ajp/AjpMessage.java +++ b/java/org/apache/coyote/ajp/AjpMessage.java @@ -37,8 +37,8 @@ import org.apache.tomcat.util.res.StringManager; public class AjpMessage { - protected static org.apache.commons.logging.Log log = - org.apache.commons.logging.LogFactory.getLog(AjpMessage.class); + protected static org.apache.juli.logging.Log log = + org.apache.juli.logging.LogFactory.getLog(AjpMessage.class); /** * The string manager for this package. diff --git a/java/org/apache/coyote/ajp/AjpProcessor.java b/java/org/apache/coyote/ajp/AjpProcessor.java index 10dcf036e..8c224d8c3 100644 --- a/java/org/apache/coyote/ajp/AjpProcessor.java +++ b/java/org/apache/coyote/ajp/AjpProcessor.java @@ -60,8 +60,8 @@ public class AjpProcessor implements ActionHook { /** * Logger. */ - protected static org.apache.commons.logging.Log log - = org.apache.commons.logging.LogFactory.getLog(AjpProcessor.class); + protected static org.apache.juli.logging.Log log + = org.apache.juli.logging.LogFactory.getLog(AjpProcessor.class); /** * The string manager for this package. diff --git a/java/org/apache/coyote/ajp/AjpProtocol.java b/java/org/apache/coyote/ajp/AjpProtocol.java index 75e5aac19..bbb28318d 100644 --- a/java/org/apache/coyote/ajp/AjpProtocol.java +++ b/java/org/apache/coyote/ajp/AjpProtocol.java @@ -51,8 +51,8 @@ public class AjpProtocol implements ProtocolHandler, MBeanRegistration { - protected static org.apache.commons.logging.Log log = - org.apache.commons.logging.LogFactory.getLog(AjpProtocol.class); + protected static org.apache.juli.logging.Log log = + org.apache.juli.logging.LogFactory.getLog(AjpProtocol.class); /** * The string manager for this package. diff --git a/java/org/apache/coyote/http11/Http11AprProcessor.java b/java/org/apache/coyote/http11/Http11AprProcessor.java index 3b3daf4ee..21e96df6d 100644 --- a/java/org/apache/coyote/http11/Http11AprProcessor.java +++ b/java/org/apache/coyote/http11/Http11AprProcessor.java @@ -68,8 +68,8 @@ public class Http11AprProcessor implements ActionHook { /** * Logger. */ - protected static org.apache.commons.logging.Log log - = org.apache.commons.logging.LogFactory.getLog(Http11AprProcessor.class); + protected static org.apache.juli.logging.Log log + = org.apache.juli.logging.LogFactory.getLog(Http11AprProcessor.class); /** * The string manager for this package. diff --git a/java/org/apache/coyote/http11/Http11AprProtocol.java b/java/org/apache/coyote/http11/Http11AprProtocol.java index fd2718405..359672ef4 100644 --- a/java/org/apache/coyote/http11/Http11AprProtocol.java +++ b/java/org/apache/coyote/http11/Http11AprProtocol.java @@ -738,8 +738,8 @@ public class Http11AprProtocol implements ProtocolHandler, MBeanRegistration } } - protected static org.apache.commons.logging.Log log - = org.apache.commons.logging.LogFactory.getLog(Http11AprProtocol.class); + protected static org.apache.juli.logging.Log log + = org.apache.juli.logging.LogFactory.getLog(Http11AprProtocol.class); // -------------------- Various implementation classes -------------------- diff --git a/java/org/apache/coyote/http11/Http11NioProcessor.java b/java/org/apache/coyote/http11/Http11NioProcessor.java index b9d535c81..19700de97 100644 --- a/java/org/apache/coyote/http11/Http11NioProcessor.java +++ b/java/org/apache/coyote/http11/Http11NioProcessor.java @@ -65,8 +65,8 @@ public class Http11NioProcessor implements ActionHook { /** * Logger. */ - protected static org.apache.commons.logging.Log log - = org.apache.commons.logging.LogFactory.getLog(Http11NioProcessor.class); + protected static org.apache.juli.logging.Log log + = org.apache.juli.logging.LogFactory.getLog(Http11NioProcessor.class); /** * The string manager for this package. diff --git a/java/org/apache/coyote/http11/Http11NioProtocol.java b/java/org/apache/coyote/http11/Http11NioProtocol.java index fb2b12d35..84c14c0e1 100644 --- a/java/org/apache/coyote/http11/Http11NioProtocol.java +++ b/java/org/apache/coyote/http11/Http11NioProtocol.java @@ -692,8 +692,8 @@ public class Http11NioProtocol implements ProtocolHandler, MBeanRegistration } } - protected static org.apache.commons.logging.Log log - = org.apache.commons.logging.LogFactory.getLog(Http11NioProtocol.class); + protected static org.apache.juli.logging.Log log + = org.apache.juli.logging.LogFactory.getLog(Http11NioProtocol.class); // -------------------- Various implementation classes -------------------- diff --git a/java/org/apache/coyote/http11/Http11Processor.java b/java/org/apache/coyote/http11/Http11Processor.java index 58c823071..f90212be4 100644 --- a/java/org/apache/coyote/http11/Http11Processor.java +++ b/java/org/apache/coyote/http11/Http11Processor.java @@ -63,8 +63,8 @@ public class Http11Processor implements ActionHook { /** * Logger. */ - protected static org.apache.commons.logging.Log log - = org.apache.commons.logging.LogFactory.getLog(Http11Processor.class); + protected static org.apache.juli.logging.Log log + = org.apache.juli.logging.LogFactory.getLog(Http11Processor.class); /** * The string manager for this package. @@ -753,13 +753,7 @@ public class Http11Processor implements ActionHook { int threadRatio = (endpoint.getCurrentThreadsBusy() * 100) / endpoint.getMaxThreads(); - if ((threadRatio > 33) && (threadRatio <= 66)) { - soTimeout = soTimeout / 2; - } else if ((threadRatio > 66) && (threadRatio <= 90)) { - soTimeout = soTimeout / 3; - keepAliveLeft = 1; - } else if (threadRatio > 90) { - soTimeout = soTimeout / 20; + if (threadRatio > 75) { keepAliveLeft = 1; } diff --git a/java/org/apache/coyote/http11/Http11Protocol.java b/java/org/apache/coyote/http11/Http11Protocol.java index a1a92abed..ca219d04c 100644 --- a/java/org/apache/coyote/http11/Http11Protocol.java +++ b/java/org/apache/coyote/http11/Http11Protocol.java @@ -54,8 +54,8 @@ public class Http11Protocol implements ProtocolHandler, MBeanRegistration { - protected static org.apache.commons.logging.Log log - = org.apache.commons.logging.LogFactory.getLog(Http11Protocol.class); + protected static org.apache.juli.logging.Log log + = org.apache.juli.logging.LogFactory.getLog(Http11Protocol.class); /** * The string manager for this package. diff --git a/java/org/apache/jasper/EmbeddedServletOptions.java b/java/org/apache/jasper/EmbeddedServletOptions.java index 9904d4876..e4f2da1fc 100644 --- a/java/org/apache/jasper/EmbeddedServletOptions.java +++ b/java/org/apache/jasper/EmbeddedServletOptions.java @@ -27,8 +27,8 @@ import org.apache.jasper.compiler.JspConfig; import org.apache.jasper.compiler.TagPluginManager; import org.apache.jasper.compiler.Localizer; import org.apache.jasper.xmlparser.ParserUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.juli.logging.Log; +import org.apache.juli.logging.LogFactory; /** * A class to hold all init parameters specific to the JSP engine. diff --git a/java/org/apache/jasper/JspC.java b/java/org/apache/jasper/JspC.java index 5f667bf48..1a22a240d 100644 --- a/java/org/apache/jasper/JspC.java +++ b/java/org/apache/jasper/JspC.java @@ -39,8 +39,6 @@ import java.util.Stack; import java.util.StringTokenizer; import java.util.Vector; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.jasper.compiler.Compiler; import org.apache.jasper.compiler.JspConfig; import org.apache.jasper.compiler.JspRuntimeContext; @@ -48,6 +46,8 @@ import org.apache.jasper.compiler.Localizer; import org.apache.jasper.compiler.TagPluginManager; import org.apache.jasper.compiler.TldLocationsCache; import org.apache.jasper.servlet.JspCServletContext; +import org.apache.juli.logging.Log; +import org.apache.juli.logging.LogFactory; import org.apache.tools.ant.AntClassLoader; import org.apache.tools.ant.Project; diff --git a/java/org/apache/jasper/JspCompilationContext.java b/java/org/apache/jasper/JspCompilationContext.java index a72a72eda..87b758119 100644 --- a/java/org/apache/jasper/JspCompilationContext.java +++ b/java/org/apache/jasper/JspCompilationContext.java @@ -52,8 +52,8 @@ import org.apache.jasper.servlet.JspServletWrapper; */ public class JspCompilationContext { - protected org.apache.commons.logging.Log log = - org.apache.commons.logging.LogFactory.getLog(JspCompilationContext.class); + protected org.apache.juli.logging.Log log = + org.apache.juli.logging.LogFactory.getLog(JspCompilationContext.class); protected Map tagFileJarUrls; protected boolean isPackagedTagFile; diff --git a/java/org/apache/jasper/compiler/Compiler.java b/java/org/apache/jasper/compiler/Compiler.java index 4b1b43d6a..66cd1e61b 100644 --- a/java/org/apache/jasper/compiler/Compiler.java +++ b/java/org/apache/jasper/compiler/Compiler.java @@ -44,7 +44,7 @@ import org.apache.jasper.servlet.JspServletWrapper; */ public abstract class Compiler { - protected org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory + protected org.apache.juli.logging.Log log = org.apache.juli.logging.LogFactory .getLog(Compiler.class); // ----------------------------------------------------- Instance Variables diff --git a/java/org/apache/jasper/compiler/JspConfig.java b/java/org/apache/jasper/compiler/JspConfig.java index c5ca8dc12..e501ebc4b 100644 --- a/java/org/apache/jasper/compiler/JspConfig.java +++ b/java/org/apache/jasper/compiler/JspConfig.java @@ -23,11 +23,11 @@ import java.net.URL; import javax.servlet.ServletContext; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.jasper.JasperException; import org.apache.jasper.xmlparser.ParserUtils; import org.apache.jasper.xmlparser.TreeNode; +import org.apache.juli.logging.Log; +import org.apache.juli.logging.LogFactory; import org.xml.sax.InputSource; /** diff --git a/java/org/apache/jasper/compiler/JspReader.java b/java/org/apache/jasper/compiler/JspReader.java index 324d1977b..cb4285579 100644 --- a/java/org/apache/jasper/compiler/JspReader.java +++ b/java/org/apache/jasper/compiler/JspReader.java @@ -26,10 +26,10 @@ import java.util.jar.JarFile; import java.net.URL; import java.net.MalformedURLException; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.jasper.JasperException; import org.apache.jasper.JspCompilationContext; +import org.apache.juli.logging.Log; +import org.apache.juli.logging.LogFactory; /** * JspReader is an input buffer for the JSP parser. It should allow diff --git a/java/org/apache/jasper/compiler/JspRuntimeContext.java b/java/org/apache/jasper/compiler/JspRuntimeContext.java index f8e091151..4d6a08083 100644 --- a/java/org/apache/jasper/compiler/JspRuntimeContext.java +++ b/java/org/apache/jasper/compiler/JspRuntimeContext.java @@ -32,14 +32,14 @@ import java.util.concurrent.ConcurrentHashMap; import javax.servlet.ServletContext; import javax.servlet.jsp.JspFactory; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.jasper.Constants; import org.apache.jasper.JspCompilationContext; import org.apache.jasper.Options; import org.apache.jasper.runtime.JspFactoryImpl; import org.apache.jasper.security.SecurityClassLoad; import org.apache.jasper.servlet.JspServletWrapper; +import org.apache.juli.logging.Log; +import org.apache.juli.logging.LogFactory; /** * Class for tracking JSP compile time file dependencies when the diff --git a/java/org/apache/jasper/compiler/SmapUtil.java b/java/org/apache/jasper/compiler/SmapUtil.java index 8ff4a38f4..789d58e4b 100644 --- a/java/org/apache/jasper/compiler/SmapUtil.java +++ b/java/org/apache/jasper/compiler/SmapUtil.java @@ -43,8 +43,8 @@ import org.apache.jasper.JspCompilationContext; */ public class SmapUtil { - private org.apache.commons.logging.Log log= - org.apache.commons.logging.LogFactory.getLog( SmapUtil.class ); + private org.apache.juli.logging.Log log= + org.apache.juli.logging.LogFactory.getLog( SmapUtil.class ); //********************************************************************* // Constants @@ -188,8 +188,8 @@ public class SmapUtil { // Installation logic (from Robert Field, JSR-045 spec lead) private static class SDEInstaller { - private org.apache.commons.logging.Log log= - org.apache.commons.logging.LogFactory.getLog( SDEInstaller.class ); + private org.apache.juli.logging.Log log= + org.apache.juli.logging.LogFactory.getLog( SDEInstaller.class ); static final String nameSDE = "SourceDebugExtension"; diff --git a/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java b/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java index 3726e3716..e4f91af7e 100644 --- a/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java +++ b/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java @@ -44,12 +44,12 @@ import javax.servlet.jsp.tagext.TagVariableInfo; import javax.servlet.jsp.tagext.ValidationMessage; import javax.servlet.jsp.tagext.VariableInfo; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.jasper.JasperException; import org.apache.jasper.JspCompilationContext; import org.apache.jasper.xmlparser.ParserUtils; import org.apache.jasper.xmlparser.TreeNode; +import org.apache.juli.logging.Log; +import org.apache.juli.logging.LogFactory; /** * Implementation of the TagLibraryInfo class from the JSP spec. diff --git a/java/org/apache/jasper/compiler/TldLocationsCache.java b/java/org/apache/jasper/compiler/TldLocationsCache.java index f8b8b1a3b..e3b86e204 100644 --- a/java/org/apache/jasper/compiler/TldLocationsCache.java +++ b/java/org/apache/jasper/compiler/TldLocationsCache.java @@ -35,12 +35,12 @@ import org.xml.sax.InputSource; import javax.servlet.ServletContext; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.jasper.Constants; import org.apache.jasper.JasperException; import org.apache.jasper.xmlparser.ParserUtils; import org.apache.jasper.xmlparser.TreeNode; +import org.apache.juli.logging.Log; +import org.apache.juli.logging.LogFactory; /** * A container for all tag libraries that are defined "globally" diff --git a/java/org/apache/jasper/runtime/HttpJspBase.java b/java/org/apache/jasper/runtime/HttpJspBase.java index 71efd1a55..ce9803c1c 100644 --- a/java/org/apache/jasper/runtime/HttpJspBase.java +++ b/java/org/apache/jasper/runtime/HttpJspBase.java @@ -59,7 +59,7 @@ public abstract class HttpJspBase factory.getClass().getClassLoader().loadClass( basePackage + "servlet.JspServletWrapper"); } catch (ClassNotFoundException ex) { - org.apache.commons.logging.LogFactory.getLog( HttpJspBase.class ) + org.apache.juli.logging.LogFactory.getLog( HttpJspBase.class ) .error("Jasper JspRuntimeContext preload of class failed: " + ex.getMessage(), ex); } diff --git a/java/org/apache/jasper/runtime/JspFactoryImpl.java b/java/org/apache/jasper/runtime/JspFactoryImpl.java index e1293b27e..92891b4d4 100644 --- a/java/org/apache/jasper/runtime/JspFactoryImpl.java +++ b/java/org/apache/jasper/runtime/JspFactoryImpl.java @@ -28,8 +28,8 @@ import javax.servlet.jsp.JspEngineInfo; import javax.servlet.jsp.PageContext; import org.apache.jasper.util.SimplePool; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.juli.logging.Log; +import org.apache.juli.logging.LogFactory; /** * Implementation of JspFactory. diff --git a/java/org/apache/jasper/runtime/PageContextImpl.java b/java/org/apache/jasper/runtime/PageContextImpl.java index 6610da7bf..722345d88 100644 --- a/java/org/apache/jasper/runtime/PageContextImpl.java +++ b/java/org/apache/jasper/runtime/PageContextImpl.java @@ -46,8 +46,6 @@ import javax.servlet.jsp.el.ExpressionEvaluator; import javax.servlet.jsp.el.VariableResolver; import javax.servlet.jsp.tagext.BodyContent; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.jasper.Constants; import org.apache.jasper.compiler.Localizer; import org.apache.jasper.el.ELContextImpl; @@ -56,6 +54,8 @@ import org.apache.jasper.el.FunctionMapperImpl; import org.apache.jasper.el.VariableResolverImpl; import org.apache.jasper.security.SecurityUtil; import org.apache.jasper.util.Enumerator; +import org.apache.juli.logging.Log; +import org.apache.juli.logging.LogFactory; /** * Implementation of the PageContext class from the JSP spec. Also doubles as a diff --git a/java/org/apache/jasper/runtime/TagHandlerPool.java b/java/org/apache/jasper/runtime/TagHandlerPool.java index 45729273a..7003c73e4 100644 --- a/java/org/apache/jasper/runtime/TagHandlerPool.java +++ b/java/org/apache/jasper/runtime/TagHandlerPool.java @@ -21,9 +21,9 @@ import javax.servlet.jsp.JspException; import javax.servlet.jsp.tagext.Tag; import org.apache.AnnotationProcessor; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.jasper.Constants; +import org.apache.juli.logging.Log; +import org.apache.juli.logging.LogFactory; /** * Pool of tag handlers that can be reused. diff --git a/java/org/apache/jasper/security/SecurityClassLoad.java b/java/org/apache/jasper/security/SecurityClassLoad.java index fb48df59f..4a70abcae 100644 --- a/java/org/apache/jasper/security/SecurityClassLoad.java +++ b/java/org/apache/jasper/security/SecurityClassLoad.java @@ -27,8 +27,8 @@ package org.apache.jasper.security; public final class SecurityClassLoad { - private static org.apache.commons.logging.Log log= - org.apache.commons.logging.LogFactory.getLog( SecurityClassLoad.class ); + private static org.apache.juli.logging.Log log= + org.apache.juli.logging.LogFactory.getLog( SecurityClassLoad.class ); public static void securityClassLoad(ClassLoader loader){ diff --git a/java/org/apache/jasper/servlet/JspServlet.java b/java/org/apache/jasper/servlet/JspServlet.java index b9acb4310..15d6f584d 100644 --- a/java/org/apache/jasper/servlet/JspServlet.java +++ b/java/org/apache/jasper/servlet/JspServlet.java @@ -28,14 +28,14 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.apache.PeriodicEventListener; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.jasper.Constants; import org.apache.jasper.EmbeddedServletOptions; import org.apache.jasper.Options; import org.apache.jasper.compiler.JspRuntimeContext; import org.apache.jasper.compiler.Localizer; +import org.apache.juli.logging.Log; +import org.apache.juli.logging.LogFactory; /** * The JSP engine (a.k.a Jasper). diff --git a/java/org/apache/jasper/servlet/JspServletWrapper.java b/java/org/apache/jasper/servlet/JspServletWrapper.java index 8e9ac2219..b0d9d6430 100644 --- a/java/org/apache/jasper/servlet/JspServletWrapper.java +++ b/java/org/apache/jasper/servlet/JspServletWrapper.java @@ -37,8 +37,6 @@ import javax.servlet.http.HttpServletResponse; import javax.servlet.jsp.tagext.TagInfo; import org.apache.AnnotationProcessor; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.jasper.JasperException; import org.apache.jasper.JspCompilationContext; import org.apache.jasper.Options; @@ -47,6 +45,8 @@ import org.apache.jasper.compiler.JavacErrorDetail; import org.apache.jasper.compiler.JspRuntimeContext; import org.apache.jasper.compiler.Localizer; import org.apache.jasper.runtime.JspSourceDependent; +import org.apache.juli.logging.Log; +import org.apache.juli.logging.LogFactory; /** * The JSP engine (a.k.a Jasper). diff --git a/java/org/apache/jasper/xmlparser/ParserUtils.java b/java/org/apache/jasper/xmlparser/ParserUtils.java index e897b2761..f7ca0aaf4 100644 --- a/java/org/apache/jasper/xmlparser/ParserUtils.java +++ b/java/org/apache/jasper/xmlparser/ParserUtils.java @@ -23,11 +23,11 @@ import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.jasper.Constants; import org.apache.jasper.JasperException; import org.apache.jasper.compiler.Localizer; +import org.apache.juli.logging.Log; +import org.apache.juli.logging.LogFactory; import org.w3c.dom.Comment; import org.w3c.dom.Document; import org.w3c.dom.NamedNodeMap; diff --git a/java/org/apache/jasper/xmlparser/UCSReader.java b/java/org/apache/jasper/xmlparser/UCSReader.java index 192545040..e2c702320 100644 --- a/java/org/apache/jasper/xmlparser/UCSReader.java +++ b/java/org/apache/jasper/xmlparser/UCSReader.java @@ -30,8 +30,8 @@ import java.io.Reader; */ public class UCSReader extends Reader { - private org.apache.commons.logging.Log log= - org.apache.commons.logging.LogFactory.getLog( UCSReader.class ); + private org.apache.juli.logging.Log log= + org.apache.juli.logging.LogFactory.getLog( UCSReader.class ); // // Constants diff --git a/java/org/apache/jasper/xmlparser/UTF8Reader.java b/java/org/apache/jasper/xmlparser/UTF8Reader.java index 5a9f6e6b1..83477529b 100644 --- a/java/org/apache/jasper/xmlparser/UTF8Reader.java +++ b/java/org/apache/jasper/xmlparser/UTF8Reader.java @@ -30,8 +30,8 @@ import org.apache.jasper.compiler.Localizer; public class UTF8Reader extends Reader { - private org.apache.commons.logging.Log log= - org.apache.commons.logging.LogFactory.getLog( UTF8Reader.class ); + private org.apache.juli.logging.Log log= + org.apache.juli.logging.LogFactory.getLog( UTF8Reader.class ); // // Constants diff --git a/java/org/apache/jk/apr/AprImpl.java b/java/org/apache/jk/apr/AprImpl.java index f6294811c..74b7f7571 100644 --- a/java/org/apache/jk/apr/AprImpl.java +++ b/java/org/apache/jk/apr/AprImpl.java @@ -311,6 +311,6 @@ public class AprImpl extends JkHandler { // This will be o.a.t.util.handler.TcHa log.debug( "Error loading native library ", ex); } } - private static org.apache.commons.logging.Log log= - org.apache.commons.logging.LogFactory.getLog( AprImpl.class ); + private static org.apache.juli.logging.Log log= + org.apache.juli.logging.LogFactory.getLog( AprImpl.class ); } diff --git a/java/org/apache/jk/common/ChannelJni.java b/java/org/apache/jk/common/ChannelJni.java index 5836f8b11..1a05afe64 100644 --- a/java/org/apache/jk/common/ChannelJni.java +++ b/java/org/apache/jk/common/ChannelJni.java @@ -185,7 +185,7 @@ public class ChannelJni extends JniHandler implements JkChannel { return 0; } - private static org.apache.commons.logging.Log log= - org.apache.commons.logging.LogFactory.getLog( ChannelJni.class ); + private static org.apache.juli.logging.Log log= + org.apache.juli.logging.LogFactory.getLog( ChannelJni.class ); } diff --git a/java/org/apache/jk/common/ChannelNioSocket.java b/java/org/apache/jk/common/ChannelNioSocket.java index 037df5379..ac620d4e4 100644 --- a/java/org/apache/jk/common/ChannelNioSocket.java +++ b/java/org/apache/jk/common/ChannelNioSocket.java @@ -84,8 +84,8 @@ import org.apache.tomcat.util.threads.ThreadPoolRunnable; */ public class ChannelNioSocket extends JkHandler implements NotificationBroadcaster, JkChannel { - private static org.apache.commons.logging.Log log = - org.apache.commons.logging.LogFactory.getLog( ChannelNioSocket.class ); + private static org.apache.juli.logging.Log log = + org.apache.juli.logging.LogFactory.getLog( ChannelNioSocket.class ); private int startPort=8009; private int maxPort=8019; // 0 for backward compat. diff --git a/java/org/apache/jk/common/ChannelSocket.java b/java/org/apache/jk/common/ChannelSocket.java index 184abd337..331c740c8 100644 --- a/java/org/apache/jk/common/ChannelSocket.java +++ b/java/org/apache/jk/common/ChannelSocket.java @@ -75,8 +75,8 @@ import org.apache.tomcat.util.threads.ThreadPoolRunnable; */ public class ChannelSocket extends JkHandler implements NotificationBroadcaster, JkChannel { - private static org.apache.commons.logging.Log log = - org.apache.commons.logging.LogFactory.getLog( ChannelSocket.class ); + private static org.apache.juli.logging.Log log = + org.apache.juli.logging.LogFactory.getLog( ChannelSocket.class ); private int startPort=8009; private int maxPort=8019; // 0 for backward compat. diff --git a/java/org/apache/jk/common/ChannelUn.java b/java/org/apache/jk/common/ChannelUn.java index 3248f8437..9232fcd79 100644 --- a/java/org/apache/jk/common/ChannelUn.java +++ b/java/org/apache/jk/common/ChannelUn.java @@ -354,8 +354,8 @@ public class ChannelUn extends JniHandler implements JkChannel { return ("jk-" + encodedAddr); } - private static org.apache.commons.logging.Log log= - org.apache.commons.logging.LogFactory.getLog( ChannelUn.class ); + private static org.apache.juli.logging.Log log= + org.apache.juli.logging.LogFactory.getLog( ChannelUn.class ); } class AprAcceptor implements ThreadPoolRunnable { diff --git a/java/org/apache/jk/common/HandlerDispatch.java b/java/org/apache/jk/common/HandlerDispatch.java index d40b14c15..c50b31d80 100644 --- a/java/org/apache/jk/common/HandlerDispatch.java +++ b/java/org/apache/jk/common/HandlerDispatch.java @@ -33,8 +33,8 @@ import org.apache.jk.core.MsgContext; */ public class HandlerDispatch extends JkHandler { - private static org.apache.commons.logging.Log log= - org.apache.commons.logging.LogFactory.getLog( HandlerDispatch.class ); + private static org.apache.juli.logging.Log log= + org.apache.juli.logging.LogFactory.getLog( HandlerDispatch.class ); public HandlerDispatch() { diff --git a/java/org/apache/jk/common/HandlerRequest.java b/java/org/apache/jk/common/HandlerRequest.java index 482a868c0..88a81072e 100644 --- a/java/org/apache/jk/common/HandlerRequest.java +++ b/java/org/apache/jk/common/HandlerRequest.java @@ -62,8 +62,8 @@ import org.apache.tomcat.util.threads.ThreadWithAttributes; */ public class HandlerRequest extends JkHandler { - private static org.apache.commons.logging.Log log= - org.apache.commons.logging.LogFactory.getLog( HandlerRequest.class ); + private static org.apache.juli.logging.Log log= + org.apache.juli.logging.LogFactory.getLog( HandlerRequest.class ); /* * Note for Host parsing. diff --git a/java/org/apache/jk/common/JkInputStream.java b/java/org/apache/jk/common/JkInputStream.java index 7d59a4ff0..1b619e203 100644 --- a/java/org/apache/jk/common/JkInputStream.java +++ b/java/org/apache/jk/common/JkInputStream.java @@ -35,8 +35,8 @@ import org.apache.tomcat.util.http.MimeHeaders; /** Generic input stream impl on top of ajp */ public class JkInputStream implements InputBuffer, OutputBuffer { - private static org.apache.commons.logging.Log log= - org.apache.commons.logging.LogFactory.getLog( JkInputStream.class ); + private static org.apache.juli.logging.Log log= + org.apache.juli.logging.LogFactory.getLog( JkInputStream.class ); private Msg bodyMsg = new MsgAjp(); private Msg outputMsg = new MsgAjp(); diff --git a/java/org/apache/jk/common/JkMX.java b/java/org/apache/jk/common/JkMX.java index e1c7d6af6..07c3ee2bc 100644 --- a/java/org/apache/jk/common/JkMX.java +++ b/java/org/apache/jk/common/JkMX.java @@ -386,8 +386,8 @@ public class JkMX extends JkHandler return objN; } - private static org.apache.commons.logging.Log log= - org.apache.commons.logging.LogFactory.getLog( JkMX.class ); + private static org.apache.juli.logging.Log log= + org.apache.juli.logging.LogFactory.getLog( JkMX.class ); } diff --git a/java/org/apache/jk/common/JniHandler.java b/java/org/apache/jk/common/JniHandler.java index 28120164f..eb7859cbb 100644 --- a/java/org/apache/jk/common/JniHandler.java +++ b/java/org/apache/jk/common/JniHandler.java @@ -312,6 +312,6 @@ public class JniHandler extends JkHandler { return status; } - private static org.apache.commons.logging.Log log= - org.apache.commons.logging.LogFactory.getLog( JniHandler.class ); + private static org.apache.juli.logging.Log log= + org.apache.juli.logging.LogFactory.getLog( JniHandler.class ); } diff --git a/java/org/apache/jk/common/MsgAjp.java b/java/org/apache/jk/common/MsgAjp.java index b1436a380..86baac3f5 100644 --- a/java/org/apache/jk/common/MsgAjp.java +++ b/java/org/apache/jk/common/MsgAjp.java @@ -38,8 +38,8 @@ import org.apache.tomcat.util.buf.MessageBytes; * @author Costin Manolache */ public class MsgAjp extends Msg { - private static org.apache.commons.logging.Log log= - org.apache.commons.logging.LogFactory.getLog( MsgAjp.class ); + private static org.apache.juli.logging.Log log= + org.apache.juli.logging.LogFactory.getLog( MsgAjp.class ); // that's the original buffer size in ajp13 - otherwise we'll get interoperability problems. private byte buf[]=new byte[8*1024]; diff --git a/java/org/apache/jk/common/Shm.java b/java/org/apache/jk/common/Shm.java index 7571b9647..dcc0fac35 100644 --- a/java/org/apache/jk/common/Shm.java +++ b/java/org/apache/jk/common/Shm.java @@ -253,8 +253,8 @@ public class Shm extends JniHandler { return 0; } - private static org.apache.commons.logging.Log log= - org.apache.commons.logging.LogFactory.getLog( Shm.class ); + private static org.apache.juli.logging.Log log= + org.apache.juli.logging.LogFactory.getLog( Shm.class ); //-------------------- Main - use the shm functions from ant or CLI ------ diff --git a/java/org/apache/jk/common/Shm14.java b/java/org/apache/jk/common/Shm14.java index 085d3d9f6..21f757efd 100644 --- a/java/org/apache/jk/common/Shm14.java +++ b/java/org/apache/jk/common/Shm14.java @@ -35,8 +35,8 @@ public class Shm14 extends Shm { // Not ready yet. - private static org.apache.commons.logging.Log log= - org.apache.commons.logging.LogFactory.getLog( Shm14.class ); + private static org.apache.juli.logging.Log log= + org.apache.juli.logging.LogFactory.getLog( Shm14.class ); MappedByteBuffer bb; diff --git a/java/org/apache/jk/config/ApacheConfig.java b/java/org/apache/jk/config/ApacheConfig.java index 533f109c6..d8aaa32fe 100644 --- a/java/org/apache/jk/config/ApacheConfig.java +++ b/java/org/apache/jk/config/ApacheConfig.java @@ -116,8 +116,8 @@ import org.apache.catalina.Host; */ public class ApacheConfig extends BaseJkConfig { - private static org.apache.commons.logging.Log log = - org.apache.commons.logging.LogFactory.getLog(ApacheConfig.class); + private static org.apache.juli.logging.Log log = + org.apache.juli.logging.LogFactory.getLog(ApacheConfig.class); /** default path to mod_jk .conf location */ public static final String MOD_JK_CONFIG = "conf/auto/mod_jk.conf"; diff --git a/java/org/apache/jk/config/BaseJkConfig.java b/java/org/apache/jk/config/BaseJkConfig.java index 8cefe21e4..6552de2b5 100644 --- a/java/org/apache/jk/config/BaseJkConfig.java +++ b/java/org/apache/jk/config/BaseJkConfig.java @@ -91,8 +91,8 @@ import org.apache.catalina.Server; @version $Revision: 299988 $ */ public class BaseJkConfig implements LifecycleListener { - private static org.apache.commons.logging.Log log = - org.apache.commons.logging.LogFactory.getLog(BaseJkConfig.class); + private static org.apache.juli.logging.Log log = + org.apache.juli.logging.LogFactory.getLog(BaseJkConfig.class); protected File configHome = null; protected File workersConfig = null; diff --git a/java/org/apache/jk/config/IISConfig.java b/java/org/apache/jk/config/IISConfig.java index fd9b9e46a..e737a2b87 100644 --- a/java/org/apache/jk/config/IISConfig.java +++ b/java/org/apache/jk/config/IISConfig.java @@ -93,8 +93,8 @@ import org.apache.catalina.Context; @author Bill Barker */ public class IISConfig extends BaseJkConfig { - private static org.apache.commons.logging.Log log = - org.apache.commons.logging.LogFactory.getLog(IISConfig.class); + private static org.apache.juli.logging.Log log = + org.apache.juli.logging.LogFactory.getLog(IISConfig.class); public static final String WORKERS_CONFIG = "/conf/jk/workers.properties"; public static final String URI_WORKERS_MAP_CONFIG = "/conf/auto/uriworkermap.properties"; diff --git a/java/org/apache/jk/config/NSConfig.java b/java/org/apache/jk/config/NSConfig.java index 885de8bd6..9c0c8eb9c 100644 --- a/java/org/apache/jk/config/NSConfig.java +++ b/java/org/apache/jk/config/NSConfig.java @@ -96,8 +96,8 @@ import org.apache.catalina.Context; @author Bill Barker */ public class NSConfig extends BaseJkConfig { - private static org.apache.commons.logging.Log log = - org.apache.commons.logging.LogFactory.getLog(NSConfig.class); + private static org.apache.juli.logging.Log log = + org.apache.juli.logging.LogFactory.getLog(NSConfig.class); public static final String WORKERS_CONFIG = "/conf/jk/workers.properties"; public static final String NS_CONFIG = "/conf/auto/obj.conf"; diff --git a/java/org/apache/jk/config/WebXml2Jk.java b/java/org/apache/jk/config/WebXml2Jk.java index 1ab15772a..835f41f57 100644 --- a/java/org/apache/jk/config/WebXml2Jk.java +++ b/java/org/apache/jk/config/WebXml2Jk.java @@ -347,8 +347,8 @@ public class WebXml2Jk { } - private static org.apache.commons.logging.Log log= - org.apache.commons.logging.LogFactory.getLog( WebXml2Jk.class ); + private static org.apache.juli.logging.Log log= + org.apache.juli.logging.LogFactory.getLog( WebXml2Jk.class ); // -------------------- DOM utils -------------------- diff --git a/java/org/apache/jk/core/MsgContext.java b/java/org/apache/jk/core/MsgContext.java index da2eaaeb8..1a4bc315a 100644 --- a/java/org/apache/jk/core/MsgContext.java +++ b/java/org/apache/jk/core/MsgContext.java @@ -43,10 +43,10 @@ import org.apache.jk.common.JkInputStream; * @author Costin Manolache */ public class MsgContext implements ActionHook { - private static org.apache.commons.logging.Log log = - org.apache.commons.logging.LogFactory.getLog(MsgContext.class); - private static org.apache.commons.logging.Log logTime= - org.apache.commons.logging.LogFactory.getLog( "org.apache.jk.REQ_TIME" ); + private static org.apache.juli.logging.Log log = + org.apache.juli.logging.LogFactory.getLog(MsgContext.class); + private static org.apache.juli.logging.Log logTime= + org.apache.juli.logging.LogFactory.getLog( "org.apache.jk.REQ_TIME" ); private int type; private Object notes[]=new Object[32]; diff --git a/java/org/apache/jk/server/JkCoyoteHandler.java b/java/org/apache/jk/server/JkCoyoteHandler.java index 684b4d6a6..cf22609dd 100644 --- a/java/org/apache/jk/server/JkCoyoteHandler.java +++ b/java/org/apache/jk/server/JkCoyoteHandler.java @@ -49,8 +49,8 @@ import org.apache.tomcat.util.net.SSLSupport; * jmx:notification-handler name="org.apache.coyote.ACTION_COMMIT */ public class JkCoyoteHandler extends JkHandler implements ProtocolHandler { - protected static org.apache.commons.logging.Log log - = org.apache.commons.logging.LogFactory.getLog(JkCoyoteHandler.class); + protected static org.apache.juli.logging.Log log + = org.apache.juli.logging.LogFactory.getLog(JkCoyoteHandler.class); // Set debug on this logger to see the container request time // ----------------------------------------------------------- DoPrivileged diff --git a/java/org/apache/jk/server/JkMain.java b/java/org/apache/jk/server/JkMain.java index 1f80e5151..7a21947a6 100644 --- a/java/org/apache/jk/server/JkMain.java +++ b/java/org/apache/jk/server/JkMain.java @@ -641,8 +641,8 @@ public class JkMain implements MBeanRegistration } } - static org.apache.commons.logging.Log log= - org.apache.commons.logging.LogFactory.getLog( JkMain.class ); + static org.apache.juli.logging.Log log= + org.apache.juli.logging.LogFactory.getLog( JkMain.class ); protected String domain; protected ObjectName oname; diff --git a/java/org/apache/juli/logging/DirectJDKLog.java b/java/org/apache/juli/logging/DirectJDKLog.java new file mode 100644 index 000000000..6c0ce9aff --- /dev/null +++ b/java/org/apache/juli/logging/DirectJDKLog.java @@ -0,0 +1,182 @@ +/* + * Copyright 2001-2004 The Apache Software Foundation. + * Copyright 2004 Costin Manolache + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.juli.logging; + +import java.util.logging.ConsoleHandler; +import java.util.logging.Formatter; +import java.util.logging.Handler; +import java.util.logging.Level; +import java.util.logging.Logger; + + +/** + * Hardcoded java.util.logging commons-logging implementation. + * + * In addition, it curr + * + */ +class DirectJDKLog implements Log { + // no reason to hide this - but good reasons to not hide + public Logger logger; + + /** Alternate config reader and console format + */ + private static final String SIMPLE_FMT="org.apache.tomcat.util.log.JdkLoggerFormatter"; + private static final String SIMPLE_CFG="org.apache.tomcat.util.log.JdkLoggerConfig"; + + static { + if( System.getProperty("java.util.logging.config.class") ==null && + System.getProperty("java.util.logging.config.file") ==null ) { + // default configuration - it sucks. Let's override at least the + // formatter for the console + try { + Class.forName(SIMPLE_CFG).newInstance(); + } catch( Throwable t ) { + } + try { + Formatter fmt=(Formatter)Class.forName(SIMPLE_FMT).newInstance(); + // it is also possible that the user modifed jre/lib/logging.properties - + // but that's really stupid in most cases + Logger root=Logger.getLogger(""); + Handler handlers[]=root.getHandlers(); + for( int i=0; i< handlers.length; i++ ) { + // I only care about console - that's what's used in default config anyway + if( handlers[i] instanceof ConsoleHandler ) { + handlers[i].setFormatter(fmt); + } + } + } catch( Throwable t ) { + // maybe it wasn't included - the ugly default will be used. + } + + } + } + + public DirectJDKLog(String name ) { + logger=Logger.getLogger(name); + } + + public final boolean isErrorEnabled() { + return logger.isLoggable(Level.SEVERE); + } + + public final boolean isWarnEnabled() { + return logger.isLoggable(Level.WARNING); + } + + public final boolean isInfoEnabled() { + return logger.isLoggable(Level.INFO); + } + + public final boolean isDebugEnabled() { + return logger.isLoggable(Level.FINE); + } + + public final boolean isFatalEnabled() { + return logger.isLoggable(Level.SEVERE); + } + + public final boolean isTraceEnabled() { + return logger.isLoggable(Level.FINER); + } + + public final void debug(Object message) { + log(Level.FINE, String.valueOf(message), null); + } + + public final void debug(Object message, Throwable t) { + log(Level.FINE, String.valueOf(message), t); + } + + public final void trace(Object message) { + log(Level.FINER, String.valueOf(message), null); + } + + public final void trace(Object message, Throwable t) { + log(Level.FINER, String.valueOf(message), t); + } + + public final void info(Object message) { + log(Level.INFO, String.valueOf(message), null); + } + + public final void info(Object message, Throwable t) { + log(Level.INFO, String.valueOf(message), t); + } + + public final void warn(Object message) { + log(Level.WARNING, String.valueOf(message), null); + } + + public final void warn(Object message, Throwable t) { + log(Level.WARNING, String.valueOf(message), t); + } + + public final void error(Object message) { + log(Level.SEVERE, String.valueOf(message), null); + } + + public final void error(Object message, Throwable t) { + log(Level.SEVERE, String.valueOf(message), t); + } + + public final void fatal(Object message) { + log(Level.SEVERE, String.valueOf(message), null); + } + + public final void fatal(Object message, Throwable t) { + log(Level.SEVERE, String.valueOf(message), t); + } + + // from commons logging. This would be my number one reason why java.util.logging + // is bad - design by comitee can be really bad ! The impact on performance of + // using java.util.logging - and the ugliness if you need to wrap it - is far + // worse than the unfriendly and uncommon default format for logs. + + private void log( Level level, String msg, Throwable ex ) { + if (logger.isLoggable(level)) { + // Hack (?) to get the stack trace. + Throwable dummyException=new Throwable(); + StackTraceElement locations[]=dummyException.getStackTrace(); + // Caller will be the third element + String cname="unknown"; + String method="unknown"; + if( locations!=null && locations.length >2 ) { + StackTraceElement caller=locations[2]; + cname=caller.getClassName(); + method=caller.getMethodName(); + } + if( ex==null ) { + logger.logp( level, cname, method, msg ); + } else { + logger.logp( level, cname, method, msg, ex ); + } + } + } + + // for LogFactory + static void release() { + + } + + static Log getInstance(String name) { + return new DirectJDKLog( name ); + } +} + + diff --git a/java/org/apache/juli/logging/Log.java b/java/org/apache/juli/logging/Log.java new file mode 100644 index 000000000..4ba99ac6a --- /dev/null +++ b/java/org/apache/juli/logging/Log.java @@ -0,0 +1,233 @@ +/* + * Copyright 2001-2004 The Apache Software Foundation. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + + +package org.apache.juli.logging; + +/** + *

A simple logging interface abstracting logging APIs. In order to be + * instantiated successfully by {@link LogFactory}, classes that implement + * this interface must have a constructor that takes a single String + * parameter representing the "name" of this Log.

+ * + *

The six logging levels used by Log are (in order): + *

    + *
  1. trace (the least serious)
    2. + *
  2. debug
    3. + *
  3. info
    4. + *
  4. warn
    5. + *
  5. error
    6. + *
  6. fatal (the most serious)
    7. + *
+ * The mapping of these log levels to the concepts used by the underlying + * logging system is implementation dependent. + * The implemention should ensure, though, that this ordering behaves + * as expected.

+ * + *

Performance is often a logging concern. + * By examining the appropriate property, + * a component can avoid expensive operations (producing information + * to be logged).

+ * + *

For example, + * 

+ *    if (log.isDebugEnabled()) {
+ *        ... do something expensive ...
+ *        log.debug(theResult);
+ *    }
+ *
+ *

+ * + *

Configuration of the underlying logging system will generally be done + * external to the Logging APIs, through whatever mechanism is supported by + * that system.

+ * + * @author Scott Sanders + * @author Rod Waldhoff + * @version $Id: Log.java 155426 2005-02-26 13:10:49Z dirkv $ + */ +public interface Log { + + + // ----------------------------------------------------- Logging Properties + + + /** + *

Is debug logging currently enabled?

+ * + *

Call this method to prevent having to perform expensive operations + * (for example, String concatenation) + * when the log level is more than debug.

+ */ + public boolean isDebugEnabled(); + + + /** + *

Is error logging currently enabled?

+ * + *

Call this method to prevent having to perform expensive operations + * (for example, String concatenation) + * when the log level is more than error.

+ */ + public boolean isErrorEnabled(); + + + /** + *

Is fatal logging currently enabled?

+ * + *

Call this method to prevent having to perform expensive operations + * (for example, String concatenation) + * when the log level is more than fatal.

+ */ + public boolean isFatalEnabled(); + + + /** + *

Is info logging currently enabled?

+ * + *

Call this method to prevent having to perform expensive operations + * (for example, String concatenation) + * when the log level is more than info.

+ */ + public boolean isInfoEnabled(); + + + /** + *

Is trace logging currently enabled?

+ * + *

Call this method to prevent having to perform expensive operations + * (for example, String concatenation) + * when the log level is more than trace.

+ */ + public boolean isTraceEnabled(); + + + /** + *

Is warn logging currently enabled?

+ * + *

Call this method to prevent having to perform expensive operations + * (for example, String concatenation) + * when the log level is more than warn.

+ */ + public boolean isWarnEnabled(); + + + // -------------------------------------------------------- Logging Methods + + + /** + *

Log a message with trace log level.

+ * + * @param message log this message + */ + public void trace(Object message); + + + /** + *

Log an error with trace log level.

+ * + * @param message log this message + * @param t log this cause + */ + public void trace(Object message, Throwable t); + + + /** + *

Log a message with debug log level.

+ * + * @param message log this message + */ + public void debug(Object message); + + + /** + *

Log an error with debug log level.

+ * + * @param message log this message + * @param t log this cause + */ + public void debug(Object message, Throwable t); + + + /** + *

Log a message with info log level.

+ * + * @param message log this message + */ + public void info(Object message); + + + /** + *

Log an error with info log level.

+ * + * @param message log this message + * @param t log this cause + */ + public void info(Object message, Throwable t); + + + /** + *

Log a message with warn log level.

+ * + * @param message log this message + */ + public void warn(Object message); + + + /** + *

Log an error with warn log level.

+ * + * @param message log this message + * @param t log this cause + */ + public void warn(Object message, Throwable t); + + + /** + *

Log a message with error log level.

+ * + * @param message log this message + */ + public void error(Object message); + + + /** + *

Log an error with error log level.

+ * + * @param message log this message + * @param t log this cause + */ + public void error(Object message, Throwable t); + + + /** + *

Log a message with fatal log level.

+ * + * @param message log this message + */ + public void fatal(Object message); + + + /** + *

Log an error with fatal log level.

+ * + * @param message log this message + * @param t log this cause + */ + public void fatal(Object message, Throwable t); + + +} diff --git a/java/org/apache/juli/logging/LogConfigurationException.java b/java/org/apache/juli/logging/LogConfigurationException.java new file mode 100644 index 000000000..70dff4160 --- /dev/null +++ b/java/org/apache/juli/logging/LogConfigurationException.java @@ -0,0 +1,91 @@ +/* + * Copyright 2001-2004 The Apache Software Foundation. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.juli.logging; + + +/** + *

An exception that is thrown only if a suitable LogFactory + * or Log instance cannot be created by the corresponding + * factory methods.

+ * + * @author Craig R. McClanahan + * @version $Revision: 155426 $ $Date: 2005-02-26 05:10:49 -0800 (Sat, 26 Feb 2005) $ + */ + +public class LogConfigurationException extends RuntimeException { + + + /** + * Construct a new exception with null as its detail message. + */ + public LogConfigurationException() { + super(); + } + + + /** + * Construct a new exception with the specified detail message. + * + * @param message The detail message + */ + public LogConfigurationException(String message) { + super(message); + } + + + /** + * Construct a new exception with the specified cause and a derived + * detail message. + * + * @param cause The underlying cause + */ + public LogConfigurationException(Throwable cause) { + this( ((cause == null) ? null : cause.toString()), cause); + } + + + /** + * Construct a new exception with the specified detail message and cause. + * + * @param message The detail message + * @param cause The underlying cause + */ + public LogConfigurationException(String message, Throwable cause) { + + super(message); + this.cause = cause; // Two-argument version requires JDK 1.4 or later + + } + + + /** + * The underlying cause of this exception. + */ + protected Throwable cause = null; + + + /** + * Return the underlying cause of this exception (if any). + */ + public Throwable getCause() { + + return (this.cause); + + } + + +} diff --git a/java/org/apache/juli/logging/LogFactory.java b/java/org/apache/juli/logging/LogFactory.java new file mode 100644 index 000000000..d42b2728f --- /dev/null +++ b/java/org/apache/juli/logging/LogFactory.java @@ -0,0 +1,361 @@ +/* + * Copyright 2001-2004 The Apache Software Foundation. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.juli.logging; + + +import java.util.Properties; + + + +/** + * Modified LogFactory: removed all discovery, hardcode a specific implementation + * If you like a different logging implementation - use either the discovery-based + * commons-logging, or better - another implementation hardcoded to your favourite + * logging impl. + * + * Why ? Each application and deployment can choose a logging implementation - + * that involves configuration, installing the logger jar and optional plugins, etc. + * As part of this process - they can as well install the commons-logging implementation + * that corresponds to their logger of choice. This completely avoids any discovery + * problem, while still allowing the user to switch. + * + * Note that this implementation is not just a wrapper arround JDK logging ( like + * the original commons-logging impl ). It adds 2 features - a simpler configuration + * ( which is in fact a subset of log4j.properties ) and a formatter that is + * less ugly. + * + * The removal of 'abstract' preserves binary backward compatibility. It is possible + * to preserve the abstract - and introduce another ( hardcoded ) factory - but I + * see no benefit. + * + * Since this class is not intended to be extended - and provides + * no plugin for other LogFactory implementation - all protected methods are removed. + * This can be changed - but again, there is little value in keeping dead code. + * Just take a quick look at the removed code ( and it's complexity) + * + * -------------- + * + * Original comment: + *

Factory for creating {@link Log} instances, with discovery and + * configuration features similar to that employed by standard Java APIs + * such as JAXP.

+ * + *

IMPLEMENTATION NOTE - This implementation is heavily + * based on the SAXParserFactory and DocumentBuilderFactory implementations + * (corresponding to the JAXP pluggability APIs) found in Apache Xerces.

+ * + * + * @author Craig R. McClanahan + * @author Costin Manolache + * @author Richard A. Sitze + * @version $Revision: 209449 $ $Date: 2005-07-06 05:06:32 -0700 (Wed, 06 Jul 2005) $ + */ +public /* abstract */ class LogFactory { + + // ----------------------------------------------------- Manifest Constants + + /** + * The name of the property used to identify the LogFactory implementation + * class name. + */ + public static final String FACTORY_PROPERTY = + "org.apache.commons.logging.LogFactory"; + + /** + * The fully qualified class name of the fallback LogFactory + * implementation class to use, if no other can be found. + */ + public static final String FACTORY_DEFAULT = + "org.apache.commons.logging.impl.LogFactoryImpl"; + + /** + * The name of the properties file to search for. + */ + public static final String FACTORY_PROPERTIES = + "commons-logging.properties"; + + /** + *

Setting this system property value allows the Hashtable used to store + * classloaders to be substituted by an alternative implementation. + *

+ *

+ * Note: LogFactory will print: + * 

+     * [ERROR] LogFactory: Load of custom hashtable failed
+     *
+ * to system error and then continue using a standard Hashtable. + *

+ *

+ * Usage: Set this property when Java is invoked + * and LogFactory will attempt to load a new instance + * of the given implementation class. + * For example, running the following ant scriplet: + * 

+     *  <java classname="${test.runner}" fork="yes" failonerror="${test.failonerror}">
+     *     ...
+     *     <sysproperty 
+     *        key="org.apache.commons.logging.LogFactory.HashtableImpl"
+     *        value="org.apache.commons.logging.AltHashtable"/>
+     *  </java>
+     *
+ * will mean that LogFactory will load an instance of + * org.apache.commons.logging.AltHashtable. + *

+ *

+ * A typical use case is to allow a custom + * Hashtable implementation using weak references to be substituted. + * This will allow classloaders to be garbage collected without + * the need to release them (on 1.3+ JVMs only, of course ;) + *

+ */ + public static final String HASHTABLE_IMPLEMENTATION_PROPERTY = + "org.apache.commons.logging.LogFactory.HashtableImpl"; + + private static LogFactory singleton=new LogFactory(); + + Properties logConfig; + + // ----------------------------------------------------------- Constructors + + + /** + * Protected constructor that is not available for public use. + */ + private LogFactory() { + logConfig=new Properties(); + } + + // hook for syserr logger - class level + void setLogConfig( Properties p ) { + this.logConfig=p; + } + // --------------------------------------------------------- Public Methods + + // only those 2 methods need to change to use a different direct logger. + + /** + *

Construct (if necessary) and return a Log instance, + * using the factory's current set of configuration attributes.

+ * + *

NOTE - Depending upon the implementation of + * the LogFactory you are using, the Log + * instance you are returned may or may not be local to the current + * application, and may or may not be returned again on a subsequent + * call with the same name argument.

+ * + * @param name Logical name of the Log instance to be + * returned (the meaning of this name is only known to the underlying + * logging implementation that is being wrapped) + * + * @exception LogConfigurationException if a suitable Log + * instance cannot be returned + */ + public Log getInstance(String name) + throws LogConfigurationException { + return DirectJDKLog.getInstance(name); + } + + + /** + * Release any internal references to previously created {@link Log} + * instances returned by this factory. This is useful in environments + * like servlet containers, which implement application reloading by + * throwing away a ClassLoader. Dangling references to objects in that + * class loader would prevent garbage collection. + */ + public void release() { + DirectJDKLog.release(); + } + + /** + * Return the configuration attribute with the specified name (if any), + * or null if there is no such attribute. + * + * @param name Name of the attribute to return + */ + public Object getAttribute(String name) { + return logConfig.get(name); + } + + + /** + * Return an array containing the names of all currently defined + * configuration attributes. If there are no such attributes, a zero + * length array is returned. + */ + public String[] getAttributeNames() { + return (String[])logConfig.keySet().toArray(); + } + + /** + * Remove any configuration attribute associated with the specified name. + * If there is no such attribute, no action is taken. + * + * @param name Name of the attribute to remove + */ + public void removeAttribute(String name) { + logConfig.remove(name); + } + + + /** + * Set the configuration attribute with the specified name. Calling + * this with a null value is equivalent to calling + * removeAttribute(name). + * + * @param name Name of the attribute to set + * @param value Value of the attribute to set, or null + * to remove any setting for this attribute + */ + public void setAttribute(String name, Object value) { + logConfig.put(name, value); + } + + + /** + * Convenience method to derive a name from the specified class and + * call getInstance(String) with it. + * + * @param clazz Class for which a suitable Log name will be derived + * + * @exception LogConfigurationException if a suitable Log + * instance cannot be returned + */ + public Log getInstance(Class clazz) + throws LogConfigurationException { + return getInstance( clazz.getName()); + } + + + + + + // ------------------------------------------------------- Static Variables + + + + // --------------------------------------------------------- Static Methods + + + /** + *

Construct (if necessary) and return a LogFactory + * instance, using the following ordered lookup procedure to determine + * the name of the implementation class to be loaded.

+ * + * + *

NOTE - If the properties file method of identifying the + * LogFactory implementation class is utilized, all of the + * properties defined in this file will be set as configuration attributes + * on the corresponding LogFactory instance.

+ * + * @exception LogConfigurationException if the implementation class is not + * available or cannot be instantiated. + */ + public static LogFactory getFactory() throws LogConfigurationException { + return singleton; + } + + + /** + * Convenience method to return a named logger, without the application + * having to care about factories. + * + * @param clazz Class from which a log name will be derived + * + * @exception LogConfigurationException if a suitable Log + * instance cannot be returned + */ + public static Log getLog(Class clazz) + throws LogConfigurationException { + return (getFactory().getInstance(clazz)); + + } + + + /** + * Convenience method to return a named logger, without the application + * having to care about factories. + * + * @param name Logical name of the Log instance to be + * returned (the meaning of this name is only known to the underlying + * logging implementation that is being wrapped) + * + * @exception LogConfigurationException if a suitable Log + * instance cannot be returned + */ + public static Log getLog(String name) + throws LogConfigurationException { + return (getFactory().getInstance(name)); + + } + + + /** + * Release any internal references to previously created {@link LogFactory} + * instances that have been associated with the specified class loader + * (if any), after calling the instance method release() on + * each of them. + * + * @param classLoader ClassLoader for which to release the LogFactory + */ + public static void release(ClassLoader classLoader) { + // nothing - we don't use any class loaders + } + + + /** + * Release any internal references to previously created {@link LogFactory} + * instances, after calling the instance method release() on + * each of them. This is useful in environments like servlet containers, + * which implement application reloading by throwing away a ClassLoader. + * Dangling references to objects in that class loader would prevent + * garbage collection. + */ + public static void releaseAll() { + singleton.release(); + } + + /** + * Returns a string that uniquely identifies the specified object, including + * its class. + *

+ * The returned string is of form "classname@hashcode", ie is the same as + * the return value of the Object.toString() method, but works even when + * the specified object's class has overidden the toString method. + * + * @param o may be null. + * @return a string of form classname@hashcode, or "null" if param o is null. + */ + public static String objectId(Object o) { + if (o == null) { + return "null"; + } else { + return o.getClass().getName() + "@" + System.identityHashCode(o); + } + } +} diff --git a/java/org/apache/juli/logging/package.html b/java/org/apache/juli/logging/package.html new file mode 100644 index 000000000..d185fc0d4 --- /dev/null +++ b/java/org/apache/juli/logging/package.html @@ -0,0 +1,21 @@ + + +

Overview

+ + +

This implementation of commons-logging uses a commons-logging.jar + specific to a particular logging framework, instead of discovery. This takes +out the guessing, is simpler, faster and more robust. Just like you chose a +logging implementation, you should also use a matching commons-logging - for +example you download log4j.jar and commons-logging-log4j.jar, or use jdk +logging and use commons-logging-jdk.jar.

+ +

A similar packaging is used by Eclipse SWT - they provide a common widget API, + but each platform uses a different implementation jar - instead of using a complex + discovery/plugin mechanism. +

+ +

This package generates commons-logging-jdk14.jar - i.e. the java.util implementation +of commons-logging api.

+ + diff --git a/java/org/apache/naming/NamingContext.java b/java/org/apache/naming/NamingContext.java index f7a47e3db..a9875c011 100644 --- a/java/org/apache/naming/NamingContext.java +++ b/java/org/apache/naming/NamingContext.java @@ -54,8 +54,8 @@ public class NamingContext implements Context { protected static final NameParser nameParser = new NameParserImpl(); - private static org.apache.commons.logging.Log log = - org.apache.commons.logging.LogFactory.getLog(NamingContext.class); + private static org.apache.juli.logging.Log log = + org.apache.juli.logging.LogFactory.getLog(NamingContext.class); // ----------------------------------------------------------- Constructors diff --git a/java/org/apache/naming/resources/FileDirContext.java b/java/org/apache/naming/resources/FileDirContext.java index 4dd80ee9a..d55aa1494 100644 --- a/java/org/apache/naming/resources/FileDirContext.java +++ b/java/org/apache/naming/resources/FileDirContext.java @@ -49,8 +49,8 @@ import org.apache.naming.NamingEntry; public class FileDirContext extends BaseDirContext { - private static org.apache.commons.logging.Log log= - org.apache.commons.logging.LogFactory.getLog( FileDirContext.class ); + private static org.apache.juli.logging.Log log= + org.apache.juli.logging.LogFactory.getLog( FileDirContext.class ); // -------------------------------------------------------------- Constants diff --git a/java/org/apache/naming/resources/WARDirContext.java b/java/org/apache/naming/resources/WARDirContext.java index 20ccd87bf..32a8f14a4 100644 --- a/java/org/apache/naming/resources/WARDirContext.java +++ b/java/org/apache/naming/resources/WARDirContext.java @@ -52,8 +52,8 @@ import org.apache.naming.NamingEntry; public class WARDirContext extends BaseDirContext { - private static org.apache.commons.logging.Log log= - org.apache.commons.logging.LogFactory.getLog( WARDirContext.class ); + private static org.apache.juli.logging.Log log= + org.apache.juli.logging.LogFactory.getLog( WARDirContext.class ); // ----------------------------------------------------------- Constructors diff --git a/java/org/apache/tomcat/util/DomUtil.java b/java/org/apache/tomcat/util/DomUtil.java index 402952da5..8b0f0a190 100644 --- a/java/org/apache/tomcat/util/DomUtil.java +++ b/java/org/apache/tomcat/util/DomUtil.java @@ -44,8 +44,8 @@ import org.xml.sax.SAXException; * @author Costin Manolache */ public class DomUtil { - private static org.apache.commons.logging.Log log= - org.apache.commons.logging.LogFactory.getLog( DomUtil.class ); + private static org.apache.juli.logging.Log log= + org.apache.juli.logging.LogFactory.getLog( DomUtil.class ); // -------------------- DOM utils -------------------- diff --git a/java/org/apache/tomcat/util/IntrospectionUtils.java b/java/org/apache/tomcat/util/IntrospectionUtils.java index c8774f100..1dd2ee3d9 100644 --- a/java/org/apache/tomcat/util/IntrospectionUtils.java +++ b/java/org/apache/tomcat/util/IntrospectionUtils.java @@ -37,8 +37,8 @@ import java.util.Vector; public final class IntrospectionUtils { - private static org.apache.commons.logging.Log log= - org.apache.commons.logging.LogFactory.getLog( IntrospectionUtils.class ); + private static org.apache.juli.logging.Log log= + org.apache.juli.logging.LogFactory.getLog( IntrospectionUtils.class ); /** * Call execute() - any ant-like task should work diff --git a/java/org/apache/tomcat/util/buf/B2CConverter.java b/java/org/apache/tomcat/util/buf/B2CConverter.java index dd2cb3370..52d1caa1b 100644 --- a/java/org/apache/tomcat/util/buf/B2CConverter.java +++ b/java/org/apache/tomcat/util/buf/B2CConverter.java @@ -36,8 +36,8 @@ import java.io.UnsupportedEncodingException; public class B2CConverter { - private static org.apache.commons.logging.Log log= - org.apache.commons.logging.LogFactory.getLog( B2CConverter.class ); + private static org.apache.juli.logging.Log log= + org.apache.juli.logging.LogFactory.getLog( B2CConverter.class ); private IntermediateInputStream iis; private ReadConvertor conv; diff --git a/java/org/apache/tomcat/util/buf/Base64.java b/java/org/apache/tomcat/util/buf/Base64.java index 6a3433617..ae3b00309 100644 --- a/java/org/apache/tomcat/util/buf/Base64.java +++ b/java/org/apache/tomcat/util/buf/Base64.java @@ -33,8 +33,8 @@ package org.apache.tomcat.util.buf; public final class Base64 { - private static org.apache.commons.logging.Log log= - org.apache.commons.logging.LogFactory.getLog( Base64.class ); + private static org.apache.juli.logging.Log log= + org.apache.juli.logging.LogFactory.getLog( Base64.class ); static private final int BASELENGTH = 255; static private final int LOOKUPLENGTH = 63; diff --git a/java/org/apache/tomcat/util/buf/C2BConverter.java b/java/org/apache/tomcat/util/buf/C2BConverter.java index 1d372165c..10daa93fb 100644 --- a/java/org/apache/tomcat/util/buf/C2BConverter.java +++ b/java/org/apache/tomcat/util/buf/C2BConverter.java @@ -30,8 +30,8 @@ import java.io.UnsupportedEncodingException; */ public final class C2BConverter { - private static org.apache.commons.logging.Log log= - org.apache.commons.logging.LogFactory.getLog(C2BConverter.class ); + private static org.apache.juli.logging.Log log= + org.apache.juli.logging.LogFactory.getLog(C2BConverter.class ); private IntermediateOutputStream ios; private WriteConvertor conv; diff --git a/java/org/apache/tomcat/util/buf/StringCache.java b/java/org/apache/tomcat/util/buf/StringCache.java index 0ee27aa2c..0dd6b2d77 100644 --- a/java/org/apache/tomcat/util/buf/StringCache.java +++ b/java/org/apache/tomcat/util/buf/StringCache.java @@ -29,8 +29,8 @@ import java.util.TreeMap; public class StringCache { - private static org.apache.commons.logging.Log log= - org.apache.commons.logging.LogFactory.getLog( StringCache.class ); + private static org.apache.juli.logging.Log log= + org.apache.juli.logging.LogFactory.getLog( StringCache.class ); // ------------------------------------------------------- Static Variables diff --git a/java/org/apache/tomcat/util/buf/UDecoder.java b/java/org/apache/tomcat/util/buf/UDecoder.java index 950d0771e..2d4d5d468 100644 --- a/java/org/apache/tomcat/util/buf/UDecoder.java +++ b/java/org/apache/tomcat/util/buf/UDecoder.java @@ -29,8 +29,8 @@ import java.io.IOException; */ public final class UDecoder { - private static org.apache.commons.logging.Log log= - org.apache.commons.logging.LogFactory.getLog(UDecoder.class ); + private static org.apache.juli.logging.Log log= + org.apache.juli.logging.LogFactory.getLog(UDecoder.class ); public UDecoder() { diff --git a/java/org/apache/tomcat/util/buf/UEncoder.java b/java/org/apache/tomcat/util/buf/UEncoder.java index 627bc96f6..b15a73a2f 100644 --- a/java/org/apache/tomcat/util/buf/UEncoder.java +++ b/java/org/apache/tomcat/util/buf/UEncoder.java @@ -33,8 +33,8 @@ import java.util.BitSet; */ public final class UEncoder { - private static org.apache.commons.logging.Log log= - org.apache.commons.logging.LogFactory.getLog(UEncoder.class ); + private static org.apache.juli.logging.Log log= + org.apache.juli.logging.LogFactory.getLog(UEncoder.class ); // Not static - the set may differ ( it's better than adding // an extra check for "/", "+", etc diff --git a/java/org/apache/tomcat/util/buf/UTF8Decoder.java b/java/org/apache/tomcat/util/buf/UTF8Decoder.java index f189176ae..b6a1e960e 100644 --- a/java/org/apache/tomcat/util/buf/UTF8Decoder.java +++ b/java/org/apache/tomcat/util/buf/UTF8Decoder.java @@ -33,8 +33,8 @@ import java.io.IOException; public final class UTF8Decoder extends B2CConverter { - private static org.apache.commons.logging.Log log= - org.apache.commons.logging.LogFactory.getLog(UTF8Decoder.class ); + private static org.apache.juli.logging.Log log= + org.apache.juli.logging.LogFactory.getLog(UTF8Decoder.class ); // may have state !! diff --git a/java/org/apache/tomcat/util/collections/SimpleHashtable.java b/java/org/apache/tomcat/util/collections/SimpleHashtable.java index eb07fd9ad..c55ee298f 100644 --- a/java/org/apache/tomcat/util/collections/SimpleHashtable.java +++ b/java/org/apache/tomcat/util/collections/SimpleHashtable.java @@ -58,8 +58,8 @@ import java.util.Enumeration; public final class SimpleHashtable implements Enumeration { - private static org.apache.commons.logging.Log log= - org.apache.commons.logging.LogFactory.getLog( SimpleHashtable.class ); + private static org.apache.juli.logging.Log log= + org.apache.juli.logging.LogFactory.getLog( SimpleHashtable.class ); // entries ... private Entry table[]; diff --git a/java/org/apache/tomcat/util/collections/SimplePool.java b/java/org/apache/tomcat/util/collections/SimplePool.java index fcd621262..91720628c 100644 --- a/java/org/apache/tomcat/util/collections/SimplePool.java +++ b/java/org/apache/tomcat/util/collections/SimplePool.java @@ -27,8 +27,8 @@ package org.apache.tomcat.util.collections; public final class SimplePool { - private static org.apache.commons.logging.Log log= - org.apache.commons.logging.LogFactory.getLog(SimplePool.class ); + private static org.apache.juli.logging.Log log= + org.apache.juli.logging.LogFactory.getLog(SimplePool.class ); /* * Where the threads are held. diff --git a/java/org/apache/tomcat/util/digester/Digester.java b/java/org/apache/tomcat/util/digester/Digester.java index 2b857a787..055ead376 100644 --- a/java/org/apache/tomcat/util/digester/Digester.java +++ b/java/org/apache/tomcat/util/digester/Digester.java @@ -35,8 +35,8 @@ import javax.xml.parsers.ParserConfigurationException; import javax.xml.parsers.SAXParser; import javax.xml.parsers.SAXParserFactory; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.juli.logging.Log; +import org.apache.juli.logging.LogFactory; import org.apache.tomcat.util.IntrospectionUtils; import org.xml.sax.Attributes; import org.xml.sax.EntityResolver; diff --git a/java/org/apache/tomcat/util/digester/GenericParser.java b/java/org/apache/tomcat/util/digester/GenericParser.java index 6b29afb09..227323206 100644 --- a/java/org/apache/tomcat/util/digester/GenericParser.java +++ b/java/org/apache/tomcat/util/digester/GenericParser.java @@ -24,8 +24,8 @@ import javax.xml.parsers.ParserConfigurationException; import javax.xml.parsers.SAXParser; import javax.xml.parsers.SAXParserFactory; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.juli.logging.Log; +import org.apache.juli.logging.LogFactory; import org.xml.sax.SAXException; import org.xml.sax.SAXNotRecognizedException; diff --git a/java/org/apache/tomcat/util/digester/XercesParser.java b/java/org/apache/tomcat/util/digester/XercesParser.java index d4eff02af..9b1efd584 100644 --- a/java/org/apache/tomcat/util/digester/XercesParser.java +++ b/java/org/apache/tomcat/util/digester/XercesParser.java @@ -25,8 +25,8 @@ import javax.xml.parsers.ParserConfigurationException; import javax.xml.parsers.SAXParser; import javax.xml.parsers.SAXParserFactory; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.juli.logging.Log; +import org.apache.juli.logging.LogFactory; import org.xml.sax.SAXException; import org.xml.sax.SAXNotRecognizedException; import org.xml.sax.SAXNotSupportedException; diff --git a/java/org/apache/tomcat/util/http/Cookies.java b/java/org/apache/tomcat/util/http/Cookies.java index 83253b81c..64a3d6958 100644 --- a/java/org/apache/tomcat/util/http/Cookies.java +++ b/java/org/apache/tomcat/util/http/Cookies.java @@ -34,8 +34,8 @@ import org.apache.tomcat.util.buf.MessageBytes; */ public final class Cookies { // extends MultiMap { - private static org.apache.commons.logging.Log log= - org.apache.commons.logging.LogFactory.getLog(Cookies.class ); + private static org.apache.juli.logging.Log log= + org.apache.juli.logging.LogFactory.getLog(Cookies.class ); // expected average number of cookies per request public static final int INITIAL_SIZE=4; diff --git a/java/org/apache/tomcat/util/http/Parameters.java b/java/org/apache/tomcat/util/http/Parameters.java index f11d44bfb..f43d194dd 100644 --- a/java/org/apache/tomcat/util/http/Parameters.java +++ b/java/org/apache/tomcat/util/http/Parameters.java @@ -33,8 +33,8 @@ import org.apache.tomcat.util.collections.MultiMap; public final class Parameters extends MultiMap { - private static org.apache.commons.logging.Log log= - org.apache.commons.logging.LogFactory.getLog(Parameters.class ); + private static org.apache.juli.logging.Log log= + org.apache.juli.logging.LogFactory.getLog(Parameters.class ); // Transition: we'll use the same Hashtable( String->String[] ) // for the beginning. When we are sure all accesses happen through diff --git a/java/org/apache/tomcat/util/http/ServerCookie.java b/java/org/apache/tomcat/util/http/ServerCookie.java index 39bb88d37..d3668e32d 100644 --- a/java/org/apache/tomcat/util/http/ServerCookie.java +++ b/java/org/apache/tomcat/util/http/ServerCookie.java @@ -36,8 +36,8 @@ import org.apache.tomcat.util.buf.MessageBytes; public class ServerCookie implements Serializable { - private static org.apache.commons.logging.Log log= - org.apache.commons.logging.LogFactory.getLog(ServerCookie.class ); + private static org.apache.juli.logging.Log log= + org.apache.juli.logging.LogFactory.getLog(ServerCookie.class ); private MessageBytes name=MessageBytes.newInstance(); private MessageBytes value=MessageBytes.newInstance(); diff --git a/java/org/apache/tomcat/util/http/mapper/Mapper.java b/java/org/apache/tomcat/util/http/mapper/Mapper.java index 0a253e80f..7ee3bd43a 100644 --- a/java/org/apache/tomcat/util/http/mapper/Mapper.java +++ b/java/org/apache/tomcat/util/http/mapper/Mapper.java @@ -34,8 +34,8 @@ import java.util.ArrayList; public final class Mapper { - private static org.apache.commons.logging.Log logger = - org.apache.commons.logging.LogFactory.getLog(Mapper.class); + private static org.apache.juli.logging.Log logger = + org.apache.juli.logging.LogFactory.getLog(Mapper.class); // ----------------------------------------------------- Instance Variables diff --git a/java/org/apache/tomcat/util/modeler/BaseModelMBean.java b/java/org/apache/tomcat/util/modeler/BaseModelMBean.java index f5284e5e7..17f744cee 100644 --- a/java/org/apache/tomcat/util/modeler/BaseModelMBean.java +++ b/java/org/apache/tomcat/util/modeler/BaseModelMBean.java @@ -45,8 +45,8 @@ import javax.management.RuntimeOperationsException; import javax.management.modelmbean.InvalidTargetObjectTypeException; import javax.management.modelmbean.ModelMBeanNotificationBroadcaster; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.juli.logging.Log; +import org.apache.juli.logging.LogFactory; /* * Changes from commons.modeler: diff --git a/java/org/apache/tomcat/util/modeler/Registry.java b/java/org/apache/tomcat/util/modeler/Registry.java index 42b896f1d..755f3e78d 100644 --- a/java/org/apache/tomcat/util/modeler/Registry.java +++ b/java/org/apache/tomcat/util/modeler/Registry.java @@ -38,8 +38,8 @@ import javax.management.MBeanServerFactory; import javax.management.MalformedObjectNameException; import javax.management.ObjectName; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.juli.logging.Log; +import org.apache.juli.logging.LogFactory; import org.apache.tomcat.util.modeler.modules.ModelerSource; /* diff --git a/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsDOMSource.java b/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsDOMSource.java index 1228a7b44..de8ee7d6a 100644 --- a/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsDOMSource.java +++ b/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsDOMSource.java @@ -21,8 +21,8 @@ import java.io.InputStream; import java.util.ArrayList; import java.util.List; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.juli.logging.Log; +import org.apache.juli.logging.LogFactory; import org.apache.tomcat.util.DomUtil; import org.apache.tomcat.util.modeler.AttributeInfo; import org.apache.tomcat.util.modeler.ManagedBean; diff --git a/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsDigesterSource.java b/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsDigesterSource.java index ce760922e..05364318c 100644 --- a/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsDigesterSource.java +++ b/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsDigesterSource.java @@ -24,8 +24,8 @@ import java.util.List; import org.apache.tomcat.util.digester.Digester; import org.apache.tomcat.util.modeler.Registry; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.juli.logging.Log; +import org.apache.juli.logging.LogFactory; public class MbeansDescriptorsDigesterSource extends ModelerSource { diff --git a/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsIntrospectionSource.java b/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsIntrospectionSource.java index ca70ba6fd..8d4a882bc 100644 --- a/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsIntrospectionSource.java +++ b/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsIntrospectionSource.java @@ -27,8 +27,8 @@ import java.util.List; import javax.management.ObjectName; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.juli.logging.Log; +import org.apache.juli.logging.LogFactory; import org.apache.tomcat.util.modeler.AttributeInfo; import org.apache.tomcat.util.modeler.ManagedBean; import org.apache.tomcat.util.modeler.OperationInfo; diff --git a/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsSerSource.java b/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsSerSource.java index f8bc07a58..894c33efd 100644 --- a/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsSerSource.java +++ b/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsSerSource.java @@ -6,8 +6,8 @@ import java.net.URL; import java.util.ArrayList; import java.util.List; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.juli.logging.Log; +import org.apache.juli.logging.LogFactory; import org.apache.tomcat.util.modeler.ManagedBean; import org.apache.tomcat.util.modeler.Registry; diff --git a/java/org/apache/tomcat/util/modeler/modules/MbeansSource.java b/java/org/apache/tomcat/util/modeler/modules/MbeansSource.java index 1686e96c3..a564df865 100644 --- a/java/org/apache/tomcat/util/modeler/modules/MbeansSource.java +++ b/java/org/apache/tomcat/util/modeler/modules/MbeansSource.java @@ -14,8 +14,8 @@ import javax.management.ObjectName; import javax.management.loading.MLet; import javax.xml.transform.TransformerException; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.juli.logging.Log; +import org.apache.juli.logging.LogFactory; import org.apache.tomcat.util.DomUtil; import org.apache.tomcat.util.modeler.AttributeInfo; import org.apache.tomcat.util.modeler.BaseModelMBean; diff --git a/java/org/apache/tomcat/util/net/AprEndpoint.java b/java/org/apache/tomcat/util/net/AprEndpoint.java index 617f9a016..bda77e543 100644 --- a/java/org/apache/tomcat/util/net/AprEndpoint.java +++ b/java/org/apache/tomcat/util/net/AprEndpoint.java @@ -21,8 +21,8 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.concurrent.Executor; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.juli.logging.Log; +import org.apache.juli.logging.LogFactory; import org.apache.tomcat.jni.Address; import org.apache.tomcat.jni.Error; import org.apache.tomcat.jni.File; diff --git a/java/org/apache/tomcat/util/net/BaseEndpoint.java b/java/org/apache/tomcat/util/net/BaseEndpoint.java index aac6a83f6..e19eba081 100644 --- a/java/org/apache/tomcat/util/net/BaseEndpoint.java +++ b/java/org/apache/tomcat/util/net/BaseEndpoint.java @@ -19,8 +19,8 @@ package org.apache.tomcat.util.net; import java.net.InetAddress; import java.util.concurrent.Executor; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.juli.logging.Log; +import org.apache.juli.logging.LogFactory; import org.apache.tomcat.util.res.StringManager; /** diff --git a/java/org/apache/tomcat/util/net/JIoEndpoint.java b/java/org/apache/tomcat/util/net/JIoEndpoint.java index d7f0c5c7e..4a5b74b83 100644 --- a/java/org/apache/tomcat/util/net/JIoEndpoint.java +++ b/java/org/apache/tomcat/util/net/JIoEndpoint.java @@ -23,8 +23,8 @@ import java.net.ServerSocket; import java.net.Socket; import java.util.concurrent.Executor; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.juli.logging.Log; +import org.apache.juli.logging.LogFactory; import org.apache.tomcat.util.res.StringManager; /** diff --git a/java/org/apache/tomcat/util/net/NioEndpoint.java b/java/org/apache/tomcat/util/net/NioEndpoint.java index b2c8bae75..9c994f58c 100644 --- a/java/org/apache/tomcat/util/net/NioEndpoint.java +++ b/java/org/apache/tomcat/util/net/NioEndpoint.java @@ -40,8 +40,8 @@ import javax.net.ssl.SSLContext; import javax.net.ssl.SSLEngine; import javax.net.ssl.TrustManagerFactory; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.juli.logging.Log; +import org.apache.juli.logging.LogFactory; import org.apache.tomcat.util.net.SecureNioChannel.ApplicationBufferHandler; import org.apache.tomcat.util.res.StringManager; diff --git a/java/org/apache/tomcat/util/net/PoolTcpEndpoint.java b/java/org/apache/tomcat/util/net/PoolTcpEndpoint.java index d56f63391..b7084db1f 100644 --- a/java/org/apache/tomcat/util/net/PoolTcpEndpoint.java +++ b/java/org/apache/tomcat/util/net/PoolTcpEndpoint.java @@ -27,8 +27,8 @@ import java.security.AccessControlException; import java.util.Stack; import java.util.Vector; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.juli.logging.Log; +import org.apache.juli.logging.LogFactory; import org.apache.tomcat.util.res.StringManager; import org.apache.tomcat.util.threads.ThreadPool; import org.apache.tomcat.util.threads.ThreadPoolRunnable; diff --git a/java/org/apache/tomcat/util/net/SSLImplementation.java b/java/org/apache/tomcat/util/net/SSLImplementation.java index 4d9169b37..3dfb916b9 100644 --- a/java/org/apache/tomcat/util/net/SSLImplementation.java +++ b/java/org/apache/tomcat/util/net/SSLImplementation.java @@ -26,8 +26,8 @@ import javax.net.ssl.SSLSession; @author EKR */ abstract public class SSLImplementation { - private static org.apache.commons.logging.Log logger = - org.apache.commons.logging.LogFactory.getLog(SSLImplementation.class); + private static org.apache.juli.logging.Log logger = + org.apache.juli.logging.LogFactory.getLog(SSLImplementation.class); // The default implementations in our search path private static final String PureTLSImplementationClass= diff --git a/java/org/apache/tomcat/util/net/jsse/JSSEImplementation.java b/java/org/apache/tomcat/util/net/jsse/JSSEImplementation.java index 5b7d3b3ce..2a0c8cb33 100644 --- a/java/org/apache/tomcat/util/net/jsse/JSSEImplementation.java +++ b/java/org/apache/tomcat/util/net/jsse/JSSEImplementation.java @@ -34,8 +34,8 @@ public class JSSEImplementation extends SSLImplementation { static final String SSLSocketClass = "javax.net.ssl.SSLSocket"; - static org.apache.commons.logging.Log logger = - org.apache.commons.logging.LogFactory.getLog(JSSEImplementation.class); + static org.apache.juli.logging.Log logger = + org.apache.juli.logging.LogFactory.getLog(JSSEImplementation.class); private JSSEFactory factory = null; diff --git a/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java b/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java index 8d0faaef4..6566a10bb 100644 --- a/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java +++ b/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java @@ -87,8 +87,8 @@ public class JSSESocketFactory private static final String defaultKeystoreFile = System.getProperty("user.home") + "/.keystore"; private static final String defaultKeyPass = "changeit"; - static org.apache.commons.logging.Log log = - org.apache.commons.logging.LogFactory.getLog(JSSESocketFactory.class); + static org.apache.juli.logging.Log log = + org.apache.juli.logging.LogFactory.getLog(JSSESocketFactory.class); protected boolean initialized; protected String clientAuth = "false"; diff --git a/java/org/apache/tomcat/util/net/jsse/JSSESupport.java b/java/org/apache/tomcat/util/net/jsse/JSSESupport.java index b61f170e0..f009a3918 100644 --- a/java/org/apache/tomcat/util/net/jsse/JSSESupport.java +++ b/java/org/apache/tomcat/util/net/jsse/JSSESupport.java @@ -49,8 +49,8 @@ import org.apache.tomcat.util.net.SSLSupport; class JSSESupport implements SSLSupport { - private static org.apache.commons.logging.Log log = - org.apache.commons.logging.LogFactory.getLog(JSSESupport.class); + private static org.apache.juli.logging.Log log = + org.apache.juli.logging.LogFactory.getLog(JSSESupport.class); protected SSLSocket ssl; protected SSLSession session; diff --git a/java/org/apache/tomcat/util/threads/ThreadPool.java b/java/org/apache/tomcat/util/threads/ThreadPool.java index b742e6983..3715dcdc0 100644 --- a/java/org/apache/tomcat/util/threads/ThreadPool.java +++ b/java/org/apache/tomcat/util/threads/ThreadPool.java @@ -17,8 +17,9 @@ package org.apache.tomcat.util.threads; import java.util.*; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; + +import org.apache.juli.logging.Log; +import org.apache.juli.logging.LogFactory; import org.apache.tomcat.util.res.StringManager; /** -- 2.11.0