Author: rjung
Date: Wed Mar 26 04:04:54 2008
New Revision: 641253
URL: http://svn.apache.org/viewvc?rev=641253&view=rev
Log:
Refactor commons-logging -> juli logging.
Modified:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/CatalinaCluster.java
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/deploy/FarmWarDeployer.java
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/deploy/FileMessageFactory.java
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/deploy/WarWatcher.java
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/io/XByteBuffer.java
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/mcast/McastService.java
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/mcast/McastServiceImpl.java
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/ClusterListener.java
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaManager.java
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaRequest.java
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaSession.java
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/JvmRouteBinderValve.java
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/JvmRouteSessionIDBinderLifecycleListener.java
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/SimpleTcpReplicationManager.java
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/AsyncSocketSender.java
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/ClusterReceiverBase.java
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/DataSender.java
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/FastAsyncSocketSender.java
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/IDataSenderFactory.java
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/PooledSocketSender.java
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/ReplicationTransmitter.java
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/ReplicationValve.java
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/SimpleTcpCluster.java
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/SocketReplicationListener.java
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/SocketReplicationThread.java
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/TcpReplicationThread.java
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/util/FastQueue.java
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/util/SmartQueue.java
Modified:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/CatalinaCluster.java
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/CatalinaCluster.java?rev=641253&r1=641252&r2=641253&view=diff
==============================================================================
---
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/CatalinaCluster.java
(original)
+++
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/CatalinaCluster.java
Wed Mar 26 04:04:54 2008
@@ -23,7 +23,7 @@
import org.apache.catalina.LifecycleException;
import org.apache.catalina.Manager;
import org.apache.catalina.Valve;
-import org.apache.commons.logging.Log;
+import org.apache.juli.logging.Log;
/**
* A <b>CatalinaCluster</b> interface allows to plug in and out the
Modified:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/deploy/FarmWarDeployer.java
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/deploy/FarmWarDeployer.java?rev=641253&r1=641252&r2=641253&view=diff
==============================================================================
---
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/deploy/FarmWarDeployer.java
(original)
+++
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/deploy/FarmWarDeployer.java
Wed Mar 26 04:04:54 2008
@@ -58,7 +58,7 @@
*/
public class FarmWarDeployer 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/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/deploy/FileMessageFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/deploy/FileMessageFactory.java?rev=641253&r1=641252&r2=641253&view=diff
==============================================================================
---
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/deploy/FileMessageFactory.java
(original)
+++
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/deploy/FileMessageFactory.java
Wed Mar 26 04:04:54 2008
@@ -39,7 +39,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/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/deploy/WarWatcher.java
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/deploy/WarWatcher.java?rev=641253&r1=641252&r2=641253&view=diff
==============================================================================
---
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/deploy/WarWatcher.java
(original)
+++
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/deploy/WarWatcher.java
Wed Mar 26 04:04:54 2008
@@ -37,7 +37,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/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/io/XByteBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/io/XByteBuffer.java?rev=641253&r1=641252&r2=641253&view=diff
==============================================================================
---
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/io/XByteBuffer.java
(original)
+++
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/io/XByteBuffer.java
Wed Mar 26 04:04:54 2008
@@ -43,8 +43,8 @@
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)
Modified:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/mcast/McastService.java
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/mcast/McastService.java?rev=641253&r1=641252&r2=641253&view=diff
==============================================================================
---
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/mcast/McastService.java
(original)
+++
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/mcast/McastService.java
Wed Mar 26 04:04:54 2008
@@ -48,8 +48,8 @@
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.
Modified:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/mcast/McastServiceImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/mcast/McastServiceImpl.java?rev=641253&r1=641252&r2=641253&view=diff
==============================================================================
---
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/mcast/McastServiceImpl.java
(original)
+++
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/mcast/McastServiceImpl.java
Wed Mar 26 04:04:54 2008
@@ -40,8 +40,8 @@
*/
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 );
/**
* Internal flag used for the listen thread that listens to the
multicasting socket.
*/
Modified:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/ClusterListener.java
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/ClusterListener.java?rev=641253&r1=641252&r2=641253&view=diff
==============================================================================
---
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/ClusterListener.java
(original)
+++
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/ClusterListener.java
Wed Mar 26 04:04:54 2008
@@ -31,7 +31,7 @@
*/
public abstract class ClusterListener implements MessageListener {
- 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(ClusterListener.class);
Modified:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaManager.java
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaManager.java?rev=641253&r1=641252&r2=641253&view=diff
==============================================================================
---
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaManager.java
(original)
+++
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaManager.java
Wed Mar 26 04:04:54 2008
@@ -76,7 +76,7 @@
// ---------------------------------------------------- Security Classes
- 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(DeltaManager.class);
/**
Modified:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaRequest.java
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaRequest.java?rev=641253&r1=641252&r2=641253&view=diff
==============================================================================
---
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaRequest.java
(original)
+++
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaRequest.java
Wed Mar 26 04:04:54 2008
@@ -37,8 +37,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/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaSession.java
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaSession.java?rev=641253&r1=641252&r2=641253&view=diff
==============================================================================
---
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaSession.java
(original)
+++
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaSession.java
Wed Mar 26 04:04:54 2008
@@ -80,7 +80,7 @@
public class DeltaSession implements HttpSession, Session, Serializable,
ClusterSession {
- 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(DeltaManager.class);
/**
@@ -1385,7 +1385,7 @@
// setId((String) stream.readObject());
id = (String) stream.readObject();
- org.apache.commons.logging.Log managerLog =
manager.getContainer().getLogger() ;
+ org.apache.juli.logging.Log managerLog =
manager.getContainer().getLogger() ;
if (managerLog.isDebugEnabled())
managerLog.debug(smp.getString("deltaSession.readSession", id));
@@ -1453,7 +1453,7 @@
}
stream.writeObject(id);
- org.apache.commons.logging.Log managerLog =
manager.getContainer().getLogger() ;
+ org.apache.juli.logging.Log managerLog =
manager.getContainer().getLogger() ;
if (managerLog.isDebugEnabled())
managerLog.debug(smp.getString("deltaSession.writeSession",id));
Modified:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/JvmRouteBinderValve.java
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/JvmRouteBinderValve.java?rev=641253&r1=641252&r2=641253&view=diff
==============================================================================
---
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/JvmRouteBinderValve.java
(original)
+++
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/JvmRouteBinderValve.java
Wed Mar 26 04:04:54 2008
@@ -86,7 +86,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/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/JvmRouteSessionIDBinderLifecycleListener.java
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/JvmRouteSessionIDBinderLifecycleListener.java?rev=641253&r1=641252&r2=641253&view=diff
==============================================================================
---
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/JvmRouteSessionIDBinderLifecycleListener.java
(original)
+++
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/JvmRouteSessionIDBinderLifecycleListener.java
Wed Mar 26 04:04:54 2008
@@ -29,8 +29,8 @@
import org.apache.catalina.cluster.MessageListener;
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.commons.modeler.ManagedBean;
import org.apache.commons.modeler.Registry;
Modified:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/SimpleTcpReplicationManager.java
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/SimpleTcpReplicationManager.java?rev=641253&r1=641252&r2=641253&view=diff
==============================================================================
---
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/SimpleTcpReplicationManager.java
(original)
+++
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/SimpleTcpReplicationManager.java
Wed Mar 26 04:04:54 2008
@@ -60,8 +60,8 @@
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/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/AsyncSocketSender.java
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/AsyncSocketSender.java?rev=641253&r1=641252&r2=641253&view=diff
==============================================================================
---
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/AsyncSocketSender.java
(original)
+++
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/AsyncSocketSender.java
Wed Mar 26 04:04:54 2008
@@ -43,7 +43,7 @@
private static int threadCounter = 1;
- private static org.apache.commons.logging.Log log =
org.apache.commons.logging.LogFactory
+ private static org.apache.juli.logging.Log log =
org.apache.juli.logging.LogFactory
.getLog(AsyncSocketSender.class);
/**
Modified:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/ClusterReceiverBase.java
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/ClusterReceiverBase.java?rev=641253&r1=641252&r2=641253&view=diff
==============================================================================
---
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/ClusterReceiverBase.java
(original)
+++
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/ClusterReceiverBase.java
Wed Mar 26 04:04:54 2008
@@ -44,8 +44,8 @@
public abstract class ClusterReceiverBase implements Runnable,
ClusterReceiver,ListenCallback {
- protected static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(
ClusterReceiverBase.class );
+ protected static org.apache.juli.logging.Log log =
+ org.apache.juli.logging.LogFactory.getLog( ClusterReceiverBase.class );
/**
* The string manager for this package.
Modified:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/DataSender.java
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/DataSender.java?rev=641253&r1=641252&r2=641253&view=diff
==============================================================================
---
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/DataSender.java
(original)
+++
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/DataSender.java
Wed Mar 26 04:04:54 2008
@@ -41,7 +41,7 @@
*/
public class DataSender implements IDataSender {
- private static org.apache.commons.logging.Log log =
org.apache.commons.logging.LogFactory
+ private static org.apache.juli.logging.Log log =
org.apache.juli.logging.LogFactory
.getLog(DataSender.class);
/**
Modified:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/FastAsyncSocketSender.java
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/FastAsyncSocketSender.java?rev=641253&r1=641252&r2=641253&view=diff
==============================================================================
---
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/FastAsyncSocketSender.java
(original)
+++
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/FastAsyncSocketSender.java
Wed Mar 26 04:04:54 2008
@@ -49,7 +49,7 @@
private static int threadCounter = 1;
- private static org.apache.commons.logging.Log log =
org.apache.commons.logging.LogFactory
+ private static org.apache.juli.logging.Log log =
org.apache.juli.logging.LogFactory
.getLog(FastAsyncSocketSender.class);
/**
Modified:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/IDataSenderFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/IDataSenderFactory.java?rev=641253&r1=641252&r2=641253&view=diff
==============================================================================
---
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/IDataSenderFactory.java
(original)
+++
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/IDataSenderFactory.java
Wed Mar 26 04:04:54 2008
@@ -37,7 +37,7 @@
*/
public class IDataSenderFactory {
- private static org.apache.commons.logging.Log log =
org.apache.commons.logging.LogFactory
+ private static org.apache.juli.logging.Log log =
org.apache.juli.logging.LogFactory
.getLog(IDataSenderFactory.class);
private static final String DATASENDERS_PROPERTIES =
"org/apache/catalina/cluster/tcp/DataSenders.properties";
Modified:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/PooledSocketSender.java
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/PooledSocketSender.java?rev=641253&r1=641252&r2=641253&view=diff
==============================================================================
---
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/PooledSocketSender.java
(original)
+++
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/PooledSocketSender.java
Wed Mar 26 04:04:54 2008
@@ -33,7 +33,7 @@
public class PooledSocketSender extends DataSender {
- private static org.apache.commons.logging.Log log =
org.apache.commons.logging.LogFactory
+ private static org.apache.juli.logging.Log log =
org.apache.juli.logging.LogFactory
.getLog(org.apache.catalina.cluster.tcp.PooledSocketSender.class);
/**
Modified:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/ReplicationTransmitter.java
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/ReplicationTransmitter.java?rev=641253&r1=641252&r2=641253&view=diff
==============================================================================
---
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/ReplicationTransmitter.java
(original)
+++
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/ReplicationTransmitter.java
Wed Mar 26 04:04:54 2008
@@ -50,7 +50,7 @@
* @version $Revision$ $Date$
*/
public class ReplicationTransmitter implements ClusterSender,IDynamicProperty {
- private static org.apache.commons.logging.Log log =
org.apache.commons.logging.LogFactory
+ private static org.apache.juli.logging.Log log =
org.apache.juli.logging.LogFactory
.getLog(ReplicationTransmitter.class);
/**
Modified:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/ReplicationValve.java
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/ReplicationValve.java?rev=641253&r1=641252&r2=641253&view=diff
==============================================================================
---
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/ReplicationValve.java
(original)
+++
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/ReplicationValve.java
Wed Mar 26 04:04:54 2008
@@ -63,8 +63,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/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/SimpleTcpCluster.java
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/SimpleTcpCluster.java?rev=641253&r1=641252&r2=641253&view=diff
==============================================================================
---
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/SimpleTcpCluster.java
(original)
+++
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/SimpleTcpCluster.java
Wed Mar 26 04:04:54 2008
@@ -60,8 +60,8 @@
import org.apache.catalina.core.StandardHost;
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.commons.modeler.ManagedBean;
import org.apache.commons.modeler.Registry;
import org.apache.tomcat.util.IntrospectionUtils;
Modified:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/SocketReplicationListener.java
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/SocketReplicationListener.java?rev=641253&r1=641252&r2=641253&view=diff
==============================================================================
---
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/SocketReplicationListener.java
(original)
+++
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/SocketReplicationListener.java
Wed Mar 26 04:04:54 2008
@@ -32,7 +32,7 @@
// ---------------------------------------------------- Statics
- private static org.apache.commons.logging.Log log =
org.apache.commons.logging.LogFactory
+ private static org.apache.juli.logging.Log log =
org.apache.juli.logging.LogFactory
.getLog(SocketReplicationListener.class);
/**
Modified:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/SocketReplicationThread.java
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/SocketReplicationThread.java?rev=641253&r1=641252&r2=641253&view=diff
==============================================================================
---
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/SocketReplicationThread.java
(original)
+++
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/SocketReplicationThread.java
Wed Mar 26 04:04:54 2008
@@ -32,7 +32,7 @@
* @version $Revision$, $Date$
*/
public class SocketReplicationThread extends Thread implements ListenCallback {
- private static org.apache.commons.logging.Log log =
org.apache.commons.logging.LogFactory
+ private static org.apache.juli.logging.Log log =
org.apache.juli.logging.LogFactory
.getLog(SocketReplicationThread.class);
private static byte[] ACK_COMMAND = new byte[] { 6, 2, 3 };
Modified:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/TcpReplicationThread.java
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/TcpReplicationThread.java?rev=641253&r1=641252&r2=641253&view=diff
==============================================================================
---
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/TcpReplicationThread.java
(original)
+++
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/TcpReplicationThread.java
Wed Mar 26 04:04:54 2008
@@ -39,8 +39,8 @@
*/
public class TcpReplicationThread extends WorkerThread {
public static final byte[] ACK_COMMAND = new byte[] {6, 2, 3};
- private static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(
TcpReplicationThread.class );
+ private static org.apache.juli.logging.Log log =
+ org.apache.juli.logging.LogFactory.getLog( TcpReplicationThread.class
);
private ByteBuffer buffer = ByteBuffer.allocate (1024);
private SelectionKey key;
private boolean sendAck=true;
Modified:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/util/FastQueue.java
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/util/FastQueue.java?rev=641253&r1=641252&r2=641253&view=diff
==============================================================================
---
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/util/FastQueue.java
(original)
+++
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/util/FastQueue.java
Wed Mar 26 04:04:54 2008
@@ -28,7 +28,7 @@
*/
public class FastQueue implements IQueue {
- private static org.apache.commons.logging.Log log =
org.apache.commons.logging.LogFactory
+ private static org.apache.juli.logging.Log log =
org.apache.juli.logging.LogFactory
.getLog(FastQueue.class);
/**
Modified:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/util/SmartQueue.java
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/util/SmartQueue.java?rev=641253&r1=641252&r2=641253&view=diff
==============================================================================
---
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/util/SmartQueue.java
(original)
+++
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/util/SmartQueue.java
Wed Mar 26 04:04:54 2008
@@ -33,7 +33,7 @@
public class SmartQueue {
- 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(SmartQueue.class);
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
