You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by re...@apache.org on 2006/10/08 17:27:22 UTC
svn commit: r454158 [1/3] - in /tomcat/tc6.0.x/trunk/java/org/apache:
catalina/ catalina/authenticator/ catalina/connector/ catalina/core/
catalina/deploy/ catalina/ha/ catalina/ha/context/ catalina/ha/deploy/
catalina/ha/session/ catalina/ha/tcp/ cata...
Author: remm
Date: Sun Oct 8 08:27:16 2006
New Revision: 454158
URL: http://svn.apache.org/viewvc?view=rev&rev=454158
Log:
- 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 :)
Added:
tomcat/tc6.0.x/trunk/java/org/apache/juli/logging/
tomcat/tc6.0.x/trunk/java/org/apache/juli/logging/DirectJDKLog.java (with props)
tomcat/tc6.0.x/trunk/java/org/apache/juli/logging/Log.java (with props)
tomcat/tc6.0.x/trunk/java/org/apache/juli/logging/LogConfigurationException.java (with props)
tomcat/tc6.0.x/trunk/java/org/apache/juli/logging/LogFactory.java (with props)
tomcat/tc6.0.x/trunk/java/org/apache/juli/logging/package.html (with props)
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/CometEvent.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/Container.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/authenticator/BasicAuthenticator.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/authenticator/DigestAuthenticator.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/Connector.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/MapperListener.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/ContainerBase.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/JasperListener.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/NamingContextListener.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardEngine.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardHost.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardHostValve.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardPipeline.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardServer.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardService.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardWrapper.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardWrapperValve.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/deploy/SecurityCollection.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/CatalinaCluster.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/ClusterListener.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/context/ReplicatedContext.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/deploy/FileMessageFactory.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/deploy/WarWatcher.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/BackupManager.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaRequest.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaSession.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/JvmRouteSessionIDBinderLifecycleListener.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/SimpleTcpReplicationManager.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/tcp/ReplicationValve.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/WebappLoader.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/mbeans/GlobalResourcesLifecycleListener.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/mbeans/MBeanFactory.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/mbeans/MBeanUtils.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/mbeans/ServerLifecycleListener.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/JAASCallbackHandler.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/JAASMemoryLoginModule.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/JAASRealm.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/MemoryRealm.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/RealmBase.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/security/SecurityConfig.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/security/SecurityUtil.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/ManagerBase.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/PersistentManagerBase.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/Bootstrap.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/Catalina.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/CatalinaProperties.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/ClassLoaderFactory.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/ClusterRuleSetFactory.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/DigesterFactory.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/Embedded.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/EngineConfig.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/ExpandWar.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/TldConfig.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/Tool.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/UserConfig.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/group/ChannelInterceptorBase.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/group/RpcChannel.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/DomainFilterInterceptor.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/FragmentationInterceptor.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/ThroughputInterceptor.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/TwoPhaseCommitInterceptor.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/io/BufferPool.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/io/ObjectReader.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/io/XByteBuffer.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/membership/McastService.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/tipis/LazyReplicatedMap.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/ReceiverBase.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/ReplicationTransmitter.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/bio/BioReplicationThread.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/bio/BioSender.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/bio/util/FastQueue.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/nio/NioReplicationThread.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/nio/NioSender.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/nio/ParallelNioSender.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/util/Logs.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/util/StringManager.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/users/MemoryUserDatabase.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/util/ExtensionValidator.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/util/StringManager.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/ExtendedAccessLogValve.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/RequestDumperValve.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/ValveBase.java
tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java
tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java
tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpMessage.java
tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpProtocol.java
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11Processor.java
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11Protocol.java
tomcat/tc6.0.x/trunk/java/org/apache/jasper/EmbeddedServletOptions.java
tomcat/tc6.0.x/trunk/java/org/apache/jasper/JspC.java
tomcat/tc6.0.x/trunk/java/org/apache/jasper/JspCompilationContext.java
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Compiler.java
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/JspConfig.java
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/JspReader.java
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/SmapUtil.java
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/TldLocationsCache.java
tomcat/tc6.0.x/trunk/java/org/apache/jasper/runtime/HttpJspBase.java
tomcat/tc6.0.x/trunk/java/org/apache/jasper/runtime/JspFactoryImpl.java
tomcat/tc6.0.x/trunk/java/org/apache/jasper/runtime/PageContextImpl.java
tomcat/tc6.0.x/trunk/java/org/apache/jasper/runtime/TagHandlerPool.java
tomcat/tc6.0.x/trunk/java/org/apache/jasper/security/SecurityClassLoad.java
tomcat/tc6.0.x/trunk/java/org/apache/jasper/servlet/JspServlet.java
tomcat/tc6.0.x/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java
tomcat/tc6.0.x/trunk/java/org/apache/jasper/xmlparser/ParserUtils.java
tomcat/tc6.0.x/trunk/java/org/apache/jasper/xmlparser/UCSReader.java
tomcat/tc6.0.x/trunk/java/org/apache/jasper/xmlparser/UTF8Reader.java
tomcat/tc6.0.x/trunk/java/org/apache/jk/apr/AprImpl.java
tomcat/tc6.0.x/trunk/java/org/apache/jk/common/ChannelJni.java
tomcat/tc6.0.x/trunk/java/org/apache/jk/common/ChannelNioSocket.java
tomcat/tc6.0.x/trunk/java/org/apache/jk/common/ChannelSocket.java
tomcat/tc6.0.x/trunk/java/org/apache/jk/common/ChannelUn.java
tomcat/tc6.0.x/trunk/java/org/apache/jk/common/HandlerDispatch.java
tomcat/tc6.0.x/trunk/java/org/apache/jk/common/HandlerRequest.java
tomcat/tc6.0.x/trunk/java/org/apache/jk/common/JkInputStream.java
tomcat/tc6.0.x/trunk/java/org/apache/jk/common/JkMX.java
tomcat/tc6.0.x/trunk/java/org/apache/jk/common/JniHandler.java
tomcat/tc6.0.x/trunk/java/org/apache/jk/common/MsgAjp.java
tomcat/tc6.0.x/trunk/java/org/apache/jk/common/Shm.java
tomcat/tc6.0.x/trunk/java/org/apache/jk/common/Shm14.java
tomcat/tc6.0.x/trunk/java/org/apache/jk/config/ApacheConfig.java
tomcat/tc6.0.x/trunk/java/org/apache/jk/config/BaseJkConfig.java
tomcat/tc6.0.x/trunk/java/org/apache/jk/config/IISConfig.java
tomcat/tc6.0.x/trunk/java/org/apache/jk/config/NSConfig.java
tomcat/tc6.0.x/trunk/java/org/apache/jk/config/WebXml2Jk.java
tomcat/tc6.0.x/trunk/java/org/apache/jk/core/MsgContext.java
tomcat/tc6.0.x/trunk/java/org/apache/jk/server/JkCoyoteHandler.java
tomcat/tc6.0.x/trunk/java/org/apache/jk/server/JkMain.java
tomcat/tc6.0.x/trunk/java/org/apache/naming/NamingContext.java
tomcat/tc6.0.x/trunk/java/org/apache/naming/resources/FileDirContext.java
tomcat/tc6.0.x/trunk/java/org/apache/naming/resources/WARDirContext.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/DomUtil.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/IntrospectionUtils.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/buf/B2CConverter.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/buf/Base64.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/buf/C2BConverter.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/buf/StringCache.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/buf/UDecoder.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/buf/UEncoder.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/buf/UTF8Decoder.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/collections/SimpleHashtable.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/collections/SimplePool.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/digester/Digester.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/digester/GenericParser.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/digester/XercesParser.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/Cookies.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/Parameters.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/ServerCookie.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/mapper/Mapper.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/BaseModelMBean.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/Registry.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsDOMSource.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsDigesterSource.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsIntrospectionSource.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsSerSource.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansSource.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/BaseEndpoint.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/PoolTcpEndpoint.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/SSLImplementation.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSEImplementation.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSESupport.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/threads/ThreadPool.java
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/CometEvent.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/CometEvent.java?view=diff&rev=454158&r1=454157&r2=454158
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/CometEvent.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/CometEvent.java Sun Oct 8 08:27:16 2006
@@ -34,7 +34,7 @@
/**
* 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 @@
/**
* 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)
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/Container.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/Container.java?view=diff&rev=454158&r1=454157&r2=454158
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/Container.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/Container.java Sun Oct 8 08:27:16 2006
@@ -23,9 +23,9 @@
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;
/**
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java?view=diff&rev=454158&r1=454157&r2=454158
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java Sun Oct 8 08:27:16 2006
@@ -48,8 +48,8 @@
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;
/**
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/authenticator/BasicAuthenticator.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/authenticator/BasicAuthenticator.java?view=diff&rev=454158&r1=454157&r2=454158
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/authenticator/BasicAuthenticator.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/authenticator/BasicAuthenticator.java Sun Oct 8 08:27:16 2006
@@ -27,8 +27,8 @@
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;
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/authenticator/DigestAuthenticator.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/authenticator/DigestAuthenticator.java?view=diff&rev=454158&r1=454157&r2=454158
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/authenticator/DigestAuthenticator.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/authenticator/DigestAuthenticator.java Sun Oct 8 08:27:16 2006
@@ -26,14 +26,14 @@
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;
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java?view=diff&rev=454158&r1=454157&r2=454158
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java Sun Oct 8 08:27:16 2006
@@ -34,9 +34,9 @@
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;
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/Connector.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/Connector.java?view=diff&rev=454158&r1=454157&r2=454158
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/Connector.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/Connector.java Sun Oct 8 08:27:16 2006
@@ -34,10 +34,10 @@
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;
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java?view=diff&rev=454158&r1=454157&r2=454158
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java Sun Oct 8 08:27:16 2006
@@ -24,10 +24,10 @@
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;
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/MapperListener.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/MapperListener.java?view=diff&rev=454158&r1=454157&r2=454158
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/MapperListener.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/MapperListener.java Sun Oct 8 08:27:16 2006
@@ -25,8 +25,8 @@
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;
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java?view=diff&rev=454158&r1=454157&r2=454158
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java Sun Oct 8 08:27:16 2006
@@ -46,8 +46,8 @@
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 <code>RequestDispatcher</code> that allows a
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/AprLifecycleListener.java?view=diff&rev=454158&r1=454157&r2=454158
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/AprLifecycleListener.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/AprLifecycleListener.java Sun Oct 8 08:27:16 2006
@@ -22,8 +22,8 @@
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;
/**
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/ContainerBase.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/ContainerBase.java?view=diff&rev=454158&r1=454157&r2=454158
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/ContainerBase.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/ContainerBase.java Sun Oct 8 08:27:16 2006
@@ -52,8 +52,8 @@
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 @@
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.
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/JasperListener.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/JasperListener.java?view=diff&rev=454158&r1=454157&r2=454158
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/JasperListener.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/JasperListener.java Sun Oct 8 08:27:16 2006
@@ -21,8 +21,8 @@
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;
/**
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/NamingContextListener.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/NamingContextListener.java?view=diff&rev=454158&r1=454157&r2=454158
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/NamingContextListener.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/NamingContextListener.java Sun Oct 8 08:27:16 2006
@@ -52,8 +52,8 @@
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;
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java?view=diff&rev=454158&r1=454157&r2=454158
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java Sun Oct 8 08:27:16 2006
@@ -91,8 +91,8 @@
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;
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardEngine.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardEngine.java?view=diff&rev=454158&r1=454157&r2=454158
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardEngine.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardEngine.java Sun Oct 8 08:27:16 2006
@@ -33,8 +33,8 @@
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;
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardHost.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardHost.java?view=diff&rev=454158&r1=454157&r2=454158
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardHost.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardHost.java Sun Oct 8 08:27:16 2006
@@ -47,8 +47,8 @@
{
/* 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
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardHostValve.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardHostValve.java?view=diff&rev=454158&r1=454157&r2=454158
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardHostValve.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardHostValve.java Sun Oct 8 08:27:16 2006
@@ -36,8 +36,8 @@
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;
/**
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardPipeline.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardPipeline.java?view=diff&rev=454158&r1=454157&r2=454158
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardPipeline.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardPipeline.java Sun Oct 8 08:27:16 2006
@@ -32,8 +32,8 @@
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;
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardServer.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardServer.java?view=diff&rev=454158&r1=454157&r2=454158
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardServer.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardServer.java Sun Oct 8 08:27:16 2006
@@ -43,8 +43,8 @@
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;
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardService.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardService.java?view=diff&rev=454158&r1=454157&r2=454158
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardService.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardService.java Sun Oct 8 08:27:16 2006
@@ -34,8 +34,8 @@
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;
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardWrapper.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardWrapper.java?view=diff&rev=454158&r1=454157&r2=454158
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardWrapper.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardWrapper.java Sun Oct 8 08:27:16 2006
@@ -76,8 +76,8 @@
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" };
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardWrapperValve.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardWrapperValve.java?view=diff&rev=454158&r1=454157&r2=454158
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardWrapperValve.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardWrapperValve.java Sun Oct 8 08:27:16 2006
@@ -36,8 +36,8 @@
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;
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/deploy/SecurityCollection.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/deploy/SecurityCollection.java?view=diff&rev=454158&r1=454157&r2=454158
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/deploy/SecurityCollection.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/deploy/SecurityCollection.java Sun Oct 8 08:27:16 2006
@@ -20,8 +20,8 @@
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;
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/CatalinaCluster.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/CatalinaCluster.java?view=diff&rev=454158&r1=454157&r2=454158
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/CatalinaCluster.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/CatalinaCluster.java Sun Oct 8 08:27:16 2006
@@ -24,7 +24,7 @@
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;
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/ClusterListener.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/ClusterListener.java?view=diff&rev=454158&r1=454157&r2=454158
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/ClusterListener.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/ClusterListener.java Sun Oct 8 08:27:16 2006
@@ -36,7 +36,7 @@
*/
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--------------------------------------
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/context/ReplicatedContext.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/context/ReplicatedContext.java?view=diff&rev=454158&r1=454157&r2=454158
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/context/ReplicatedContext.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/context/ReplicatedContext.java Sun Oct 8 08:27:16 2006
@@ -33,7 +33,7 @@
*/
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
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java?view=diff&rev=454158&r1=454157&r2=454158
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java Sun Oct 8 08:27:16 2006
@@ -57,7 +57,7 @@
*/
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.
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/deploy/FileMessageFactory.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/deploy/FileMessageFactory.java?view=diff&rev=454158&r1=454157&r2=454158
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/deploy/FileMessageFactory.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/deploy/FileMessageFactory.java Sun Oct 8 08:27:16 2006
@@ -38,7 +38,7 @@
*/
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);
/**
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/deploy/WarWatcher.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/deploy/WarWatcher.java?view=diff&rev=454158&r1=454157&r2=454158
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/deploy/WarWatcher.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/deploy/WarWatcher.java Sun Oct 8 08:27:16 2006
@@ -36,7 +36,7 @@
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--------------------------------------*/
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/BackupManager.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/BackupManager.java?view=diff&rev=454158&r1=454157&r2=454158
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/BackupManager.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/BackupManager.java Sun Oct 8 08:27:16 2006
@@ -34,7 +34,7 @@
*/
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
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java?view=diff&rev=454158&r1=454157&r2=454158
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java Sun Oct 8 08:27:16 2006
@@ -67,7 +67,7 @@
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.
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaRequest.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaRequest.java?view=diff&rev=454158&r1=454157&r2=454158
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaRequest.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaRequest.java Sun Oct 8 08:27:16 2006
@@ -39,8 +39,8 @@
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.
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaSession.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaSession.java?view=diff&rev=454158&r1=454157&r2=454158
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaSession.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaSession.java Sun Oct 8 08:27:16 2006
@@ -56,7 +56,7 @@
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.
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java?view=diff&rev=454158&r1=454157&r2=454158
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java Sun Oct 8 08:27:16 2006
@@ -84,7 +84,7 @@
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);
/**
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/JvmRouteSessionIDBinderLifecycleListener.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/JvmRouteSessionIDBinderLifecycleListener.java?view=diff&rev=454158&r1=454157&r2=454158
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/JvmRouteSessionIDBinderLifecycleListener.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/JvmRouteSessionIDBinderLifecycleListener.java Sun Oct 8 08:27:16 2006
@@ -28,8 +28,8 @@
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;
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/SimpleTcpReplicationManager.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/SimpleTcpReplicationManager.java?view=diff&rev=454158&r1=454157&r2=454158
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/SimpleTcpReplicationManager.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/SimpleTcpReplicationManager.java Sun Oct 8 08:27:16 2006
@@ -58,7 +58,7 @@
*/
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;
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/tcp/ReplicationValve.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/tcp/ReplicationValve.java?view=diff&rev=454158&r1=454157&r2=454158
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/tcp/ReplicationValve.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/tcp/ReplicationValve.java Sun Oct 8 08:27:16 2006
@@ -62,8 +62,8 @@
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
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java?view=diff&rev=454158&r1=454157&r2=454158
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java Sun Oct 8 08:27:16 2006
@@ -50,8 +50,8 @@
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;
/**
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java?view=diff&rev=454158&r1=454157&r2=454158
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java Sun Oct 8 08:27:16 2006
@@ -105,8 +105,8 @@
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 @@
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();
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/WebappLoader.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/WebappLoader.java?view=diff&rev=454158&r1=454157&r2=454158
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/WebappLoader.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/WebappLoader.java Sun Oct 8 08:27:16 2006
@@ -1190,8 +1190,8 @@
}
- 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;
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/mbeans/GlobalResourcesLifecycleListener.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/mbeans/GlobalResourcesLifecycleListener.java?view=diff&rev=454158&r1=454157&r2=454158
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/mbeans/GlobalResourcesLifecycleListener.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/mbeans/GlobalResourcesLifecycleListener.java Sun Oct 8 08:27:16 2006
@@ -31,8 +31,8 @@
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;
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/mbeans/MBeanFactory.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/mbeans/MBeanFactory.java?view=diff&rev=454158&r1=454157&r2=454158
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/mbeans/MBeanFactory.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/mbeans/MBeanFactory.java Sun Oct 8 08:27:16 2006
@@ -66,8 +66,8 @@
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 <code>MBeanServer</code> for this application.
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/mbeans/MBeanUtils.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/mbeans/MBeanUtils.java?view=diff&rev=454158&r1=454157&r2=454158
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/mbeans/MBeanUtils.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/mbeans/MBeanUtils.java Sun Oct 8 08:27:16 2006
@@ -47,8 +47,8 @@
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;
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/mbeans/ServerLifecycleListener.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/mbeans/ServerLifecycleListener.java?view=diff&rev=454158&r1=454157&r2=454158
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/mbeans/ServerLifecycleListener.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/mbeans/ServerLifecycleListener.java Sun Oct 8 08:27:16 2006
@@ -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.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
/**
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/JAASCallbackHandler.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/JAASCallbackHandler.java?view=diff&rev=454158&r1=454157&r2=454158
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/JAASCallbackHandler.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/JAASCallbackHandler.java Sun Oct 8 08:27:16 2006
@@ -26,8 +26,8 @@
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;
/**
* <p>Implementation of the JAAS <code>CallbackHandler</code> interface,
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/JAASMemoryLoginModule.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/JAASMemoryLoginModule.java?view=diff&rev=454158&r1=454157&r2=454158
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/JAASMemoryLoginModule.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/JAASMemoryLoginModule.java Sun Oct 8 08:27:16 2006
@@ -41,8 +41,8 @@
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;
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/JAASRealm.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/JAASRealm.java?view=diff&rev=454158&r1=454157&r2=454158
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/JAASRealm.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/JAASRealm.java Sun Oct 8 08:27:16 2006
@@ -33,8 +33,8 @@
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;
/**
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/MemoryRealm.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/MemoryRealm.java?view=diff&rev=454158&r1=454157&r2=454158
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/MemoryRealm.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/MemoryRealm.java Sun Oct 8 08:27:16 2006
@@ -26,8 +26,8 @@
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;
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/RealmBase.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/RealmBase.java?view=diff&rev=454158&r1=454157&r2=454158
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/RealmBase.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/RealmBase.java Sun Oct 8 08:27:16 2006
@@ -50,8 +50,8 @@
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;
/**
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/security/SecurityConfig.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/security/SecurityConfig.java?view=diff&rev=454158&r1=454157&r2=454158
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/security/SecurityConfig.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/security/SecurityConfig.java Sun Oct 8 08:27:16 2006
@@ -27,8 +27,8 @@
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.,"
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/security/SecurityUtil.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/security/SecurityUtil.java?view=diff&rev=454158&r1=454157&r2=454158
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/security/SecurityUtil.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/security/SecurityUtil.java Sun Oct 8 08:27:16 2006
@@ -63,8 +63,8 @@
*/
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";
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/ManagerBase.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/ManagerBase.java?view=diff&rev=454158&r1=454157&r2=454158
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/ManagerBase.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/ManagerBase.java Sun Oct 8 08:27:16 2006
@@ -48,8 +48,8 @@
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;
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/PersistentManagerBase.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/PersistentManagerBase.java?view=diff&rev=454158&r1=454157&r2=454158
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/PersistentManagerBase.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/PersistentManagerBase.java Sun Oct 8 08:27:16 2006
@@ -31,10 +31,10 @@
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 <b>ManagerBase</b> class to implement most of the
* functionality required by a Manager which supports any kind of
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/Bootstrap.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/Bootstrap.java?view=diff&rev=454158&r1=454157&r2=454158
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/Bootstrap.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/Bootstrap.java Sun Oct 8 08:27:16 2006
@@ -30,8 +30,8 @@
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;
/**
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/Catalina.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/Catalina.java?view=diff&rev=454158&r1=454157&r2=454158
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/Catalina.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/Catalina.java Sun Oct 8 08:27:16 2006
@@ -649,8 +649,8 @@
}
- 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 );
}
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/CatalinaProperties.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/CatalinaProperties.java?view=diff&rev=454158&r1=454157&r2=454158
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/CatalinaProperties.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/CatalinaProperties.java Sun Oct 8 08:27:16 2006
@@ -37,8 +37,8 @@
// ------------------------------------------------------- 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;
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/ClassLoaderFactory.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/ClassLoaderFactory.java?view=diff&rev=454158&r1=454157&r2=454158
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/ClassLoaderFactory.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/ClassLoaderFactory.java Sun Oct 8 08:27:16 2006
@@ -23,8 +23,8 @@
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;
/**
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/ClusterRuleSetFactory.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/ClusterRuleSetFactory.java?view=diff&rev=454158&r1=454157&r2=454158
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/ClusterRuleSetFactory.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/ClusterRuleSetFactory.java Sun Oct 8 08:27:16 2006
@@ -21,8 +21,10 @@
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 {
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java?view=diff&rev=454158&r1=454157&r2=454158
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java Sun Oct 8 08:27:16 2006
@@ -69,8 +69,8 @@
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
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/DigesterFactory.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/DigesterFactory.java?view=diff&rev=454158&r1=454157&r2=454158
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/DigesterFactory.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/DigesterFactory.java Sun Oct 8 08:27:16 2006
@@ -32,8 +32,8 @@
/**
* 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.
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/Embedded.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/Embedded.java?view=diff&rev=454158&r1=454157&r2=454158
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/Embedded.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/Embedded.java Sun Oct 8 08:27:16 2006
@@ -43,8 +43,8 @@
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;
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/EngineConfig.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/EngineConfig.java?view=diff&rev=454158&r1=454157&r2=454158
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/EngineConfig.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/EngineConfig.java Sun Oct 8 08:27:16 2006
@@ -37,8 +37,8 @@
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
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/ExpandWar.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/ExpandWar.java?view=diff&rev=454158&r1=454157&r2=454158
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/ExpandWar.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/ExpandWar.java Sun Oct 8 08:27:16 2006
@@ -32,8 +32,8 @@
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.
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java?view=diff&rev=454158&r1=454157&r2=454158
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java Sun Oct 8 08:27:16 2006
@@ -56,8 +56,8 @@
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
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/TldConfig.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/TldConfig.java?view=diff&rev=454158&r1=454157&r2=454158
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/TldConfig.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/TldConfig.java Sun Oct 8 08:27:16 2006
@@ -64,8 +64,8 @@
// 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();
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/Tool.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/Tool.java?view=diff&rev=454158&r1=454157&r2=454158
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/Tool.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/Tool.java Sun Oct 8 08:27:16 2006
@@ -22,8 +22,8 @@
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;
/**
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/UserConfig.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/UserConfig.java?view=diff&rev=454158&r1=454157&r2=454158
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/UserConfig.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/UserConfig.java Sun Oct 8 08:27:16 2006
@@ -44,8 +44,8 @@
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
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/group/ChannelInterceptorBase.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/group/ChannelInterceptorBase.java?view=diff&rev=454158&r1=454157&r2=454158
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/group/ChannelInterceptorBase.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/group/ChannelInterceptorBase.java Sun Oct 8 08:27:16 2006
@@ -28,7 +28,7 @@
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;
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java?view=diff&rev=454158&r1=454157&r2=454158
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java Sun Oct 8 08:27:16 2006
@@ -625,7 +625,7 @@
* @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++;
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/group/RpcChannel.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/group/RpcChannel.java?view=diff&rev=454158&r1=454157&r2=454158
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/group/RpcChannel.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/group/RpcChannel.java Sun Oct 8 08:27:16 2006
@@ -31,7 +31,7 @@
* @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;
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/DomainFilterInterceptor.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/DomainFilterInterceptor.java?view=diff&rev=454158&r1=454157&r2=454158
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/DomainFilterInterceptor.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/DomainFilterInterceptor.java Sun Oct 8 08:27:16 2006
@@ -32,7 +32,7 @@
*/
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;
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/FragmentationInterceptor.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/FragmentationInterceptor.java?view=diff&rev=454158&r1=454157&r2=454158
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/FragmentationInterceptor.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/FragmentationInterceptor.java Sun Oct 8 08:27:16 2006
@@ -40,7 +40,7 @@
* @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;
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java?view=diff&rev=454158&r1=454157&r2=454158
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java Sun Oct 8 08:27:16 2006
@@ -37,7 +37,7 @@
* @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();
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java?view=diff&rev=454158&r1=454157&r2=454158
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java Sun Oct 8 08:27:16 2006
@@ -57,7 +57,7 @@
*/
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,
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/ThroughputInterceptor.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/ThroughputInterceptor.java?view=diff&rev=454158&r1=454157&r2=454158
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/ThroughputInterceptor.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/ThroughputInterceptor.java Sun Oct 8 08:27:16 2006
@@ -36,7 +36,7 @@
* @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;
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/TwoPhaseCommitInterceptor.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/TwoPhaseCommitInterceptor.java?view=diff&rev=454158&r1=454157&r2=454158
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/TwoPhaseCommitInterceptor.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/TwoPhaseCommitInterceptor.java Sun Oct 8 08:27:16 2006
@@ -43,7 +43,7 @@
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
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/io/BufferPool.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/io/BufferPool.java?view=diff&rev=454158&r1=454157&r2=454158
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/io/BufferPool.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/io/BufferPool.java Sun Oct 8 08:27:16 2006
@@ -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;
/**
*
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org