You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ch...@apache.org on 2010/11/01 17:54:12 UTC
svn commit: r1029743 [3/3] - in /activemq/activemq-apollo/trunk: apollo-bdb/
apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/jaxb/
apollo-cassandra/ apollo-selector/
apollo-selector/src/main/java/org/apache/activemq/apollo/filter/ apollo...
Modified: activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/legacy/ActiveMQXAConnectionFactoryTest.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/legacy/ActiveMQXAConnectionFactoryTest.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/legacy/ActiveMQXAConnectionFactoryTest.java (original)
+++ activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/legacy/ActiveMQXAConnectionFactoryTest.java Mon Nov 1 16:54:07 2010
@@ -47,11 +47,11 @@ import org.apache.activemq.command.Activ
import org.apache.activemq.command.ActiveMQTextMessage;
import org.apache.activemq.transport.TransportFactory;
import org.apache.activemq.transport.TransportServer;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class ActiveMQXAConnectionFactoryTest extends CombinationTestSupport {
- private static final Log LOG = LogFactory.getLog(ActiveMQXAConnectionFactoryTest.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ActiveMQXAConnectionFactoryTest.class);
long txGenerator = System.currentTimeMillis();
public void testCopy() throws URISyntaxException, JMSException {
Modified: activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/legacy/JmsRollbackRedeliveryTest.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/legacy/JmsRollbackRedeliveryTest.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/legacy/JmsRollbackRedeliveryTest.java (original)
+++ activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/legacy/JmsRollbackRedeliveryTest.java Mon Nov 1 16:54:07 2010
@@ -34,11 +34,11 @@ import org.apache.activemq.ActiveMQConne
import org.apache.activemq.RedeliveryPolicy;
import org.apache.activemq.apollo.AutoFailTestSupport;
import org.apache.activemq.legacy.broker.BrokerService;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class JmsRollbackRedeliveryTest extends AutoFailTestSupport {
- protected static final Log LOG = LogFactory.getLog(JmsRollbackRedeliveryTest.class);
+ protected static final Logger LOG = LoggerFactory.getLogger(JmsRollbackRedeliveryTest.class);
final int nbMessages = 10;
final String destinationName = "Destination";
final String brokerUrl = "vm://localhost?create=false";
Modified: activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/legacy/test1/JmsBenchmark.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/legacy/test1/JmsBenchmark.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/legacy/test1/JmsBenchmark.java (original)
+++ activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/legacy/test1/JmsBenchmark.java Mon Nov 1 16:54:07 2010
@@ -45,8 +45,8 @@ import org.apache.activemq.command.Activ
import org.apache.activemq.command.ActiveMQQueue;
import org.apache.activemq.transport.TransportFactory;
import org.apache.activemq.transport.TransportServer;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Benchmarks the broker by starting many consumer and producers against the
@@ -56,7 +56,7 @@ import org.apache.commons.logging.LogFac
*
*/
public class JmsBenchmark extends JmsTestSupport {
- private static final transient Log LOG = LogFactory.getLog(JmsBenchmark.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(JmsBenchmark.class);
private static final long SAMPLE_DELAY = Integer.parseInt(System.getProperty("SAMPLE_DELAY", "" + 1000 * 5));
private static final long SAMPLES = Integer.parseInt(System.getProperty("SAMPLES", "10"));
Modified: activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/legacy/test1/MessageGroupDelayedTest.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/legacy/test1/MessageGroupDelayedTest.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/legacy/test1/MessageGroupDelayedTest.java (original)
+++ activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/legacy/test1/MessageGroupDelayedTest.java Mon Nov 1 16:54:07 2010
@@ -37,13 +37,13 @@ import org.apache.activemq.apollo.test1.
import org.apache.activemq.command.ActiveMQQueue;
import org.apache.activemq.transport.TransportFactory;
import org.apache.activemq.transport.TransportServer;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class MessageGroupDelayedTest extends JmsTestSupport {
- public static final Log log = LogFactory.getLog(MessageGroupDelayedTest.class);
+ public static final Logger log = LoggerFactory.getLogger(MessageGroupDelayedTest.class);
protected Connection connection;
protected Session session;
protected MessageProducer producer;
Modified: activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/legacy/test1/MessageGroupTest.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/legacy/test1/MessageGroupTest.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/legacy/test1/MessageGroupTest.java (original)
+++ activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/legacy/test1/MessageGroupTest.java Mon Nov 1 16:54:07 2010
@@ -11,12 +11,12 @@ import org.apache.activemq.apollo.Combin
import org.apache.activemq.apollo.test1.JmsTestSupport;
import org.apache.activemq.command.ActiveMQDestination;
import org.apache.activemq.command.ActiveMQQueue;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class MessageGroupTest extends JmsTestSupport {
- private static final Log LOG = LogFactory.getLog(CombinationTestSupport.class);
+ private static final Logger LOG = LoggerFactory.getLogger(CombinationTestSupport.class);
public void testGroupedMessagesDeliveredToOnlyOneConsumer() throws Exception {
Modified: activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JmsDurableTopicSendReceiveTest.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JmsDurableTopicSendReceiveTest.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JmsDurableTopicSendReceiveTest.java (original)
+++ activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JmsDurableTopicSendReceiveTest.java Mon Nov 1 16:54:07 2010
@@ -26,14 +26,14 @@ import javax.jms.TextMessage;
import javax.jms.Topic;
import org.apache.activemq.apollo.test2.JmsTopicSendReceiveTest;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* @version $Revision: 1.5 $
*/
public class JmsDurableTopicSendReceiveTest extends JmsTopicSendReceiveTest {
- private static final Log LOG = LogFactory.getLog(JmsDurableTopicSendReceiveTest.class);
+ private static final Logger LOG = LoggerFactory.getLogger(JmsDurableTopicSendReceiveTest.class);
protected Connection connection2;
protected Session session2;
Modified: activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsQueueSendReceiveTwoConnectionsStartBeforeBrokerTest.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsQueueSendReceiveTwoConnectionsStartBeforeBrokerTest.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsQueueSendReceiveTwoConnectionsStartBeforeBrokerTest.java (original)
+++ activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsQueueSendReceiveTwoConnectionsStartBeforeBrokerTest.java Mon Nov 1 16:54:07 2010
@@ -25,13 +25,13 @@ import org.apache.activemq.apollo.broker
import org.apache.activemq.apollo.broker.BrokerFactory;
import org.apache.activemq.apollo.test3.JmsQueueSendReceiveTwoConnectionsTest;
import org.apache.activemq.transport.TransportFactory;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
*/
public class JmsQueueSendReceiveTwoConnectionsStartBeforeBrokerTest extends JmsQueueSendReceiveTwoConnectionsTest {
- private static final Log LOG = LogFactory.getLog(JmsQueueSendReceiveTwoConnectionsStartBeforeBrokerTest.class);
+ private static final Logger LOG = LoggerFactory.getLogger(JmsQueueSendReceiveTwoConnectionsStartBeforeBrokerTest.class);
private Queue<Exception> errors = new ConcurrentLinkedQueue<Exception>();
private int delayBeforeStartingBroker = 1000;
Modified: activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsQueueTransactionTest.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsQueueTransactionTest.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsQueueTransactionTest.java (original)
+++ activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsQueueTransactionTest.java Mon Nov 1 16:54:07 2010
@@ -29,14 +29,14 @@ import javax.jms.TextMessage;
import org.apache.activemq.apollo.test3.JmsResourceProvider;
import org.apache.activemq.apollo.test3.JmsTransactionTestSupport;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* @version $Revision: 1.2 $
*/
public class JmsQueueTransactionTest extends JmsTransactionTestSupport {
- private static final Log LOG = LogFactory.getLog(JmsQueueTransactionTest.class);
+ private static final Logger LOG = LoggerFactory.getLogger(JmsQueueTransactionTest.class);
/**
* @see org.apache.activemq.apollo.test3.JmsTransactionTestSupport#getJmsResourceProvider()
Modified: activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsTopicSendReceiveWithEmbeddedBrokerAndUserIDTest.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsTopicSendReceiveWithEmbeddedBrokerAndUserIDTest.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsTopicSendReceiveWithEmbeddedBrokerAndUserIDTest.java (original)
+++ activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsTopicSendReceiveWithEmbeddedBrokerAndUserIDTest.java Mon Nov 1 16:54:07 2010
@@ -25,14 +25,14 @@ import javax.jms.Message;
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.activemq.apollo.broker.Broker;
import org.apache.activemq.apollo.test3.JmsTopicSendReceiveWithTwoConnectionsAndEmbeddedBrokerTest;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* @version $Revision: 1.1 $
*/
public class JmsTopicSendReceiveWithEmbeddedBrokerAndUserIDTest extends JmsTopicSendReceiveWithTwoConnectionsAndEmbeddedBrokerTest {
- private static final Log LOG = LogFactory.getLog(JmsTopicSendReceiveWithEmbeddedBrokerAndUserIDTest.class);
+ private static final Logger LOG = LoggerFactory.getLogger(JmsTopicSendReceiveWithEmbeddedBrokerAndUserIDTest.class);
protected String userName = "James";
Modified: activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/legacy/test6/NioQueueSubscriptionTest.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/legacy/test6/NioQueueSubscriptionTest.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/legacy/test6/NioQueueSubscriptionTest.java (original)
+++ activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/legacy/test6/NioQueueSubscriptionTest.java Mon Nov 1 16:54:07 2010
@@ -34,14 +34,14 @@ import org.apache.activemq.apollo.broker
import org.apache.activemq.apollo.broker.BrokerFactory;
import org.apache.activemq.apollo.perf.QueueSubscriptionTest;
import org.apache.activemq.transport.TransportFactory;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
@SuppressWarnings("unchecked")
public class NioQueueSubscriptionTest extends QueueSubscriptionTest implements ExceptionListener {
- protected static final Log LOG = LogFactory.getLog(NioQueueSubscriptionTest.class);
+ protected static final Logger LOG = LoggerFactory.getLogger(NioQueueSubscriptionTest.class);
private Map<Thread, Throwable> exceptions = Collections.synchronizedMap(new HashMap<Thread, Throwable>());
Modified: activemq/activemq-apollo/trunk/sandbox/activemq-jmx/src/main/java/org/apache/activemq/broker/jmx/ManagementContext.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/sandbox/activemq-jmx/src/main/java/org/apache/activemq/broker/jmx/ManagementContext.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/sandbox/activemq-jmx/src/main/java/org/apache/activemq/broker/jmx/ManagementContext.java (original)
+++ activemq/activemq-apollo/trunk/sandbox/activemq-jmx/src/main/java/org/apache/activemq/broker/jmx/ManagementContext.java Mon Nov 1 16:54:07 2010
@@ -35,8 +35,8 @@ import javax.management.remote.JMXConnec
import javax.management.remote.JMXServiceURL;
import org.apache.activemq.Service;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* A Flow provides different dispatch policies within the NMR
@@ -48,7 +48,7 @@ public class ManagementContext implement
* Default activemq domain
*/
public static final String DEFAULT_DOMAIN = "org.apache.activemq";
- private static final Log LOG = LogFactory.getLog(ManagementContext.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ManagementContext.class);
private MBeanServer beanServer;
private String jmxDomainName = DEFAULT_DOMAIN;
private boolean useMBeanServer = true;
Modified: activemq/activemq-apollo/trunk/sandbox/activemq-network/src/main/java/org/apache/activemq/network/CompositeDemandForwardingBridge.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/sandbox/activemq-network/src/main/java/org/apache/activemq/network/CompositeDemandForwardingBridge.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/sandbox/activemq-network/src/main/java/org/apache/activemq/network/CompositeDemandForwardingBridge.java (original)
+++ activemq/activemq-apollo/trunk/sandbox/activemq-network/src/main/java/org/apache/activemq/network/CompositeDemandForwardingBridge.java Mon Nov 1 16:54:07 2010
@@ -26,8 +26,8 @@ import org.apache.activemq.command.Endpo
import org.apache.activemq.command.NetworkBridgeFilter;
import org.apache.activemq.transport.Transport;
import org.apache.activemq.util.ServiceSupport;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* A demand forwarding bridge which works with multicast style transports where
@@ -37,7 +37,7 @@ import org.apache.commons.logging.LogFac
*
*/
public class CompositeDemandForwardingBridge extends DemandForwardingBridgeSupport {
- private static final Log LOG = LogFactory.getLog(CompositeDemandForwardingBridge.class);
+ private static final Logger LOG = LoggerFactory.getLogger(CompositeDemandForwardingBridge.class);
protected final BrokerId remoteBrokerPath[] = new BrokerId[] {null};
protected Object brokerInfoMutex = new Object();
Modified: activemq/activemq-apollo/trunk/sandbox/activemq-network/src/main/java/org/apache/activemq/network/ConduitBridge.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/sandbox/activemq-network/src/main/java/org/apache/activemq/network/ConduitBridge.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/sandbox/activemq-network/src/main/java/org/apache/activemq/network/ConduitBridge.java (original)
+++ activemq/activemq-apollo/trunk/sandbox/activemq-network/src/main/java/org/apache/activemq/network/ConduitBridge.java Mon Nov 1 16:54:07 2010
@@ -25,8 +25,8 @@ import org.apache.activemq.apollo.broker
import org.apache.activemq.command.ConsumerId;
import org.apache.activemq.command.ConsumerInfo;
import org.apache.activemq.transport.Transport;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Consolidates subscriptions
@@ -34,7 +34,7 @@ import org.apache.commons.logging.LogFac
* @version $Revision: 1.1 $
*/
public class ConduitBridge extends DemandForwardingBridge {
- private static final Log LOG = LogFactory.getLog(ConduitBridge.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ConduitBridge.class);
/**
* Constructor
Modified: activemq/activemq-apollo/trunk/sandbox/activemq-network/src/main/java/org/apache/activemq/network/DemandForwardingBridge.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/sandbox/activemq-network/src/main/java/org/apache/activemq/network/DemandForwardingBridge.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/sandbox/activemq-network/src/main/java/org/apache/activemq/network/DemandForwardingBridge.java (original)
+++ activemq/activemq-apollo/trunk/sandbox/activemq-network/src/main/java/org/apache/activemq/network/DemandForwardingBridge.java Mon Nov 1 16:54:07 2010
@@ -25,8 +25,8 @@ import org.apache.activemq.command.Consu
import org.apache.activemq.command.NetworkBridgeFilter;
import org.apache.activemq.transport.Transport;
import org.apache.activemq.util.ServiceSupport;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Forwards messages from the local broker to the remote broker based on demand.
@@ -35,7 +35,7 @@ import org.apache.commons.logging.LogFac
*
*/
public class DemandForwardingBridge extends DemandForwardingBridgeSupport {
- private static final Log LOG = LogFactory.getLog(DemandForwardingBridge.class);
+ private static final Logger LOG = LoggerFactory.getLogger(DemandForwardingBridge.class);
protected final BrokerId remoteBrokerPath[] = new BrokerId[] {null};
protected Object brokerInfoMutex = new Object();
Modified: activemq/activemq-apollo/trunk/sandbox/activemq-network/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/sandbox/activemq-network/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/sandbox/activemq-network/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java (original)
+++ activemq/activemq-apollo/trunk/sandbox/activemq-network/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java Mon Nov 1 16:54:07 2010
@@ -74,8 +74,8 @@ import org.apache.activemq.util.LongSequ
import org.apache.activemq.util.MarshallingSupport;
import org.apache.activemq.util.ServiceStopper;
import org.apache.activemq.util.ServiceSupport;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* A useful base class for implementing demand forwarding bridges.
@@ -83,7 +83,7 @@ import org.apache.commons.logging.LogFac
*/
public abstract class DemandForwardingBridgeSupport implements NetworkBridge, BrokerServiceAware {
- private static final Log LOG = LogFactory.getLog(DemandForwardingBridge.class);
+ private static final Logger LOG = LoggerFactory.getLogger(DemandForwardingBridge.class);
private static final ThreadPoolExecutor ASYNC_TASKS;
protected final Transport localBroker;
protected final ResponseCorrelator remoteBroker;
Modified: activemq/activemq-apollo/trunk/sandbox/activemq-network/src/main/java/org/apache/activemq/network/DiscoveryNetworkConnector.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/sandbox/activemq-network/src/main/java/org/apache/activemq/network/DiscoveryNetworkConnector.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/sandbox/activemq-network/src/main/java/org/apache/activemq/network/DiscoveryNetworkConnector.java (original)
+++ activemq/activemq-apollo/trunk/sandbox/activemq-network/src/main/java/org/apache/activemq/network/DiscoveryNetworkConnector.java Mon Nov 1 16:54:07 2010
@@ -31,8 +31,8 @@ import org.apache.activemq.transport.dis
import org.apache.activemq.util.ServiceStopper;
import org.apache.activemq.util.ServiceSupport;
import org.apache.activemq.util.SslContext;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* A network connector which uses a discovery agent to detect the remote brokers
@@ -41,7 +41,7 @@ import org.apache.commons.logging.LogFac
* @org.apache.xbean.XBean element="networkConnector"
*/
public class DiscoveryNetworkConnector extends NetworkConnector implements DiscoveryListener {
- private static final Log LOG = LogFactory.getLog(DiscoveryNetworkConnector.class);
+ private static final Logger LOG = LoggerFactory.getLogger(DiscoveryNetworkConnector.class);
private DiscoveryAgent discoveryAgent;
private ConcurrentHashMap<URI, NetworkBridge> bridges = new ConcurrentHashMap<URI, NetworkBridge>();
Modified: activemq/activemq-apollo/trunk/sandbox/activemq-network/src/main/java/org/apache/activemq/network/DurableConduitBridge.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/sandbox/activemq-network/src/main/java/org/apache/activemq/network/DurableConduitBridge.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/sandbox/activemq-network/src/main/java/org/apache/activemq/network/DurableConduitBridge.java (original)
+++ activemq/activemq-apollo/trunk/sandbox/activemq-network/src/main/java/org/apache/activemq/network/DurableConduitBridge.java Mon Nov 1 16:54:07 2010
@@ -24,8 +24,8 @@ import org.apache.activemq.command.Activ
import org.apache.activemq.command.ConsumerId;
import org.apache.activemq.command.ConsumerInfo;
import org.apache.activemq.transport.Transport;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Consolidates subscriptions
@@ -33,7 +33,7 @@ import org.apache.commons.logging.LogFac
* @version $Revision: 1.1 $
*/
public class DurableConduitBridge extends ConduitBridge {
- private static final Log LOG = LogFactory.getLog(DurableConduitBridge.class);
+ private static final Logger LOG = LoggerFactory.getLogger(DurableConduitBridge.class);
/**
* Constructor
Modified: activemq/activemq-apollo/trunk/sandbox/activemq-network/src/main/java/org/apache/activemq/network/ForwardingBridge.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/sandbox/activemq-network/src/main/java/org/apache/activemq/network/ForwardingBridge.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/sandbox/activemq-network/src/main/java/org/apache/activemq/network/ForwardingBridge.java (original)
+++ activemq/activemq-apollo/trunk/sandbox/activemq-network/src/main/java/org/apache/activemq/network/ForwardingBridge.java Mon Nov 1 16:54:07 2010
@@ -40,8 +40,8 @@ import org.apache.activemq.transport.*;
import org.apache.activemq.util.IdGenerator;
import org.apache.activemq.util.ServiceStopper;
import org.apache.activemq.util.ServiceSupport;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Forwards all messages from the local broker to the remote broker.
@@ -52,7 +52,7 @@ import org.apache.commons.logging.LogFac
public class ForwardingBridge implements Service {
private static final IdGenerator ID_GENERATOR = new IdGenerator();
- private static final Log LOG = LogFactory.getLog(ForwardingBridge.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ForwardingBridge.class);
final AtomicLong enqueueCounter = new AtomicLong();
final AtomicLong dequeueCounter = new AtomicLong();
Modified: activemq/activemq-apollo/trunk/sandbox/activemq-network/src/main/java/org/apache/activemq/network/LdapNetworkConnector.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/sandbox/activemq-network/src/main/java/org/apache/activemq/network/LdapNetworkConnector.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/sandbox/activemq-network/src/main/java/org/apache/activemq/network/LdapNetworkConnector.java (original)
+++ activemq/activemq-apollo/trunk/sandbox/activemq-network/src/main/java/org/apache/activemq/network/LdapNetworkConnector.java Mon Nov 1 16:54:07 2010
@@ -40,8 +40,8 @@ import javax.naming.event.ObjectChangeLi
import org.apache.activemq.command.ActiveMQDestination;
import org.apache.activemq.util.URISupport;
import org.apache.activemq.util.URISupport.CompositeData;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* class to create dynamic network connectors listed in an directory
@@ -60,7 +60,7 @@ public class LdapNetworkConnector
implements NamespaceChangeListener,
ObjectChangeListener
{
- private static final Log LOG = LogFactory.getLog(LdapNetworkConnector.class);
+ private static final Logger LOG = LoggerFactory.getLogger(LdapNetworkConnector.class);
// force returned entries to implement the ipHost and ipService object classes (RFC 2307)
private static final String REQUIRED_OBJECT_CLASS_FILTER = "(&(objectClass=ipHost)(objectClass=ipService))";
Modified: activemq/activemq-apollo/trunk/sandbox/activemq-network/src/main/java/org/apache/activemq/network/NetworkConnector.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/sandbox/activemq-network/src/main/java/org/apache/activemq/network/NetworkConnector.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/sandbox/activemq-network/src/main/java/org/apache/activemq/network/NetworkConnector.java (original)
+++ activemq/activemq-apollo/trunk/sandbox/activemq-network/src/main/java/org/apache/activemq/network/NetworkConnector.java Mon Nov 1 16:54:07 2010
@@ -39,14 +39,14 @@ import org.apache.activemq.transport.Tra
import org.apache.activemq.util.JMXSupport;
import org.apache.activemq.util.ServiceStopper;
import org.apache.activemq.util.ServiceSupport;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
*/
public abstract class NetworkConnector extends NetworkBridgeConfiguration implements Service {
- private static final Log LOG = LogFactory.getLog(NetworkConnector.class);
+ private static final Logger LOG = LoggerFactory.getLogger(NetworkConnector.class);
protected URI localURI;
protected ConnectionFilter connectionFilter;
protected ServiceSupport serviceSupport = new ServiceSupport() {
Modified: activemq/activemq-apollo/trunk/sandbox/activemq-network/src/main/java/org/apache/activemq/network/jms/DestinationBridge.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/sandbox/activemq-network/src/main/java/org/apache/activemq/network/jms/DestinationBridge.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/sandbox/activemq-network/src/main/java/org/apache/activemq/network/jms/DestinationBridge.java (original)
+++ activemq/activemq-apollo/trunk/sandbox/activemq-network/src/main/java/org/apache/activemq/network/jms/DestinationBridge.java Mon Nov 1 16:54:07 2010
@@ -28,8 +28,8 @@ import javax.jms.MessageProducer;
import javax.naming.NamingException;
import org.apache.activemq.Service;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* A Destination bridge is used to bridge between to different JMS systems
@@ -37,7 +37,7 @@ import org.apache.commons.logging.LogFac
* @version $Revision: 1.1.1.1 $
*/
public abstract class DestinationBridge implements Service, MessageListener {
- private static final Log LOG = LogFactory.getLog(DestinationBridge.class);
+ private static final Logger LOG = LoggerFactory.getLogger(DestinationBridge.class);
protected MessageConsumer consumer;
protected AtomicBoolean started = new AtomicBoolean(false);
protected JmsMesageConvertor jmsMessageConvertor;
Modified: activemq/activemq-apollo/trunk/sandbox/activemq-network/src/main/java/org/apache/activemq/network/jms/JmsConnector.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/sandbox/activemq-network/src/main/java/org/apache/activemq/network/jms/JmsConnector.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/sandbox/activemq-network/src/main/java/org/apache/activemq/network/jms/JmsConnector.java (original)
+++ activemq/activemq-apollo/trunk/sandbox/activemq-network/src/main/java/org/apache/activemq/network/jms/JmsConnector.java Mon Nov 1 16:54:07 2010
@@ -31,8 +31,8 @@ import org.apache.activemq.ActiveMQConne
import org.apache.activemq.Service;
import org.apache.activemq.legacy.broker.BrokerService;
import org.apache.activemq.util.LRUCache;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.jndi.JndiTemplate;
/**
@@ -45,7 +45,7 @@ import org.springframework.jndi.JndiTemp
public abstract class JmsConnector implements Service {
private static int nextId;
- private static final Log LOG = LogFactory.getLog(JmsConnector.class);
+ private static final Logger LOG = LoggerFactory.getLogger(JmsConnector.class);
protected JndiTemplate jndiLocalTemplate;
protected JndiTemplate jndiOutboundTemplate;
Modified: activemq/activemq-apollo/trunk/sandbox/activemq-network/src/main/java/org/apache/activemq/network/jms/JmsQueueConnector.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/sandbox/activemq-network/src/main/java/org/apache/activemq/network/jms/JmsQueueConnector.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/sandbox/activemq-network/src/main/java/org/apache/activemq/network/jms/JmsQueueConnector.java (original)
+++ activemq/activemq-apollo/trunk/sandbox/activemq-network/src/main/java/org/apache/activemq/network/jms/JmsQueueConnector.java Mon Nov 1 16:54:07 2010
@@ -26,8 +26,8 @@ import javax.jms.QueueSession;
import javax.jms.Session;
import javax.naming.NamingException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* A Bridge to other JMS Queue providers
@@ -37,7 +37,7 @@ import org.apache.commons.logging.LogFac
* @version $Revision: 1.1.1.1 $
*/
public class JmsQueueConnector extends JmsConnector {
- private static final Log LOG = LogFactory.getLog(JmsQueueConnector.class);
+ private static final Logger LOG = LoggerFactory.getLogger(JmsQueueConnector.class);
private String outboundQueueConnectionFactoryName;
private String localConnectionFactoryName;
private QueueConnectionFactory outboundQueueConnectionFactory;
Modified: activemq/activemq-apollo/trunk/sandbox/activemq-network/src/main/java/org/apache/activemq/network/jms/JmsTopicConnector.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/sandbox/activemq-network/src/main/java/org/apache/activemq/network/jms/JmsTopicConnector.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/sandbox/activemq-network/src/main/java/org/apache/activemq/network/jms/JmsTopicConnector.java (original)
+++ activemq/activemq-apollo/trunk/sandbox/activemq-network/src/main/java/org/apache/activemq/network/jms/JmsTopicConnector.java Mon Nov 1 16:54:07 2010
@@ -26,8 +26,8 @@ import javax.jms.TopicConnectionFactory;
import javax.jms.TopicSession;
import javax.naming.NamingException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* A Bridge to other JMS Topic providers
@@ -37,7 +37,7 @@ import org.apache.commons.logging.LogFac
* @version $Revision: 1.1.1.1 $
*/
public class JmsTopicConnector extends JmsConnector {
- private static final Log LOG = LogFactory.getLog(JmsTopicConnector.class);
+ private static final Logger LOG = LoggerFactory.getLogger(JmsTopicConnector.class);
private String outboundTopicConnectionFactoryName;
private String localConnectionFactoryName;
private TopicConnectionFactory outboundTopicConnectionFactory;
Modified: activemq/activemq-apollo/trunk/sandbox/activemq-network/src/test/java/org/apache/activemq/network/jms/QueueBridgeTest.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/sandbox/activemq-network/src/test/java/org/apache/activemq/network/jms/QueueBridgeTest.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/sandbox/activemq-network/src/test/java/org/apache/activemq/network/jms/QueueBridgeTest.java (original)
+++ activemq/activemq-apollo/trunk/sandbox/activemq-network/src/test/java/org/apache/activemq/network/jms/QueueBridgeTest.java Mon Nov 1 16:54:07 2010
@@ -32,15 +32,15 @@ import javax.jms.TextMessage;
import junit.framework.TestCase;
import org.apache.activemq.ActiveMQConnectionFactory;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.context.support.AbstractApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
public class QueueBridgeTest extends TestCase implements MessageListener {
protected static final int MESSAGE_COUNT = 10;
- private static final Log LOG = LogFactory.getLog(QueueBridgeTest.class);
+ private static final Logger LOG = LoggerFactory.getLogger(QueueBridgeTest.class);
protected AbstractApplicationContext context;
protected QueueConnection localConnection;
Modified: activemq/activemq-apollo/trunk/sandbox/activemq-network/src/test/java/org/apache/activemq/network/jms/TopicBridgeSpringTest.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/sandbox/activemq-network/src/test/java/org/apache/activemq/network/jms/TopicBridgeSpringTest.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/sandbox/activemq-network/src/test/java/org/apache/activemq/network/jms/TopicBridgeSpringTest.java (original)
+++ activemq/activemq-apollo/trunk/sandbox/activemq-network/src/test/java/org/apache/activemq/network/jms/TopicBridgeSpringTest.java Mon Nov 1 16:54:07 2010
@@ -31,15 +31,15 @@ import javax.jms.TopicSession;
import junit.framework.TestCase;
import org.apache.activemq.ActiveMQConnectionFactory;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.context.support.AbstractApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
public class TopicBridgeSpringTest extends TestCase implements MessageListener {
protected static final int MESSAGE_COUNT = 10;
- private static final Log LOG = LogFactory.getLog(TopicBridgeSpringTest.class);
+ private static final Logger LOG = LoggerFactory.getLogger(TopicBridgeSpringTest.class);
protected AbstractApplicationContext context;
protected TopicConnection localConnection;
Modified: activemq/activemq-apollo/trunk/sandbox/activemq-openwire/src/main/java/org/apache/activemq/command/ActiveMQTempDestination.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/sandbox/activemq-openwire/src/main/java/org/apache/activemq/command/ActiveMQTempDestination.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/sandbox/activemq-openwire/src/main/java/org/apache/activemq/command/ActiveMQTempDestination.java (original)
+++ activemq/activemq-apollo/trunk/sandbox/activemq-openwire/src/main/java/org/apache/activemq/command/ActiveMQTempDestination.java Mon Nov 1 16:54:07 2010
@@ -18,8 +18,8 @@ package org.apache.activemq.command;
import javax.jms.JMSException;
import org.apache.activemq.IConnection;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* @openwire:marshaller
@@ -27,7 +27,7 @@ import org.apache.commons.logging.LogFac
*/
public abstract class ActiveMQTempDestination extends ActiveMQDestination {
- private static final Log LOG = LogFactory.getLog(ActiveMQTempDestination.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ActiveMQTempDestination.class);
protected transient IConnection connection;
protected transient String connectionId;
protected transient int sequenceId;
Modified: activemq/activemq-apollo/trunk/sandbox/activemq-openwire/src/main/java/org/apache/activemq/command/NetworkBridgeFilter.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/sandbox/activemq-openwire/src/main/java/org/apache/activemq/command/NetworkBridgeFilter.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/sandbox/activemq-openwire/src/main/java/org/apache/activemq/command/NetworkBridgeFilter.java (original)
+++ activemq/activemq-apollo/trunk/sandbox/activemq-openwire/src/main/java/org/apache/activemq/command/NetworkBridgeFilter.java Mon Nov 1 16:54:07 2010
@@ -21,8 +21,8 @@ import java.util.Arrays;
import org.apache.activemq.broker.openwire.OpenwireMessageEvaluationContext;
import org.apache.activemq.filter.BooleanExpression;
import org.apache.activemq.filter.MessageEvaluationContext;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* @openwire:marshaller code="91"
@@ -31,7 +31,7 @@ import org.apache.commons.logging.LogFac
public class NetworkBridgeFilter implements DataStructure, BooleanExpression {
public static final byte DATA_STRUCTURE_TYPE = CommandTypes.NETWORK_BRIDGE_FILTER;
- static final Log LOG = LogFactory.getLog(NetworkBridgeFilter.class);
+ static final Logger LOG = LoggerFactory.getLogger(NetworkBridgeFilter.class);
private BrokerId networkBrokerId;
private int networkTTL;
Modified: activemq/activemq-apollo/trunk/sandbox/activemq-openwire/src/main/java/org/apache/activemq/state/ConnectionStateTracker.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/sandbox/activemq-openwire/src/main/java/org/apache/activemq/state/ConnectionStateTracker.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/sandbox/activemq-openwire/src/main/java/org/apache/activemq/state/ConnectionStateTracker.java (original)
+++ activemq/activemq-apollo/trunk/sandbox/activemq-openwire/src/main/java/org/apache/activemq/state/ConnectionStateTracker.java Mon Nov 1 16:54:07 2010
@@ -39,8 +39,8 @@ import org.apache.activemq.command.Sessi
import org.apache.activemq.command.TransactionInfo;
import org.apache.activemq.transport.Transport;
import org.apache.activemq.util.IOExceptionSupport;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Tracks the state of a connection so a newly established transport can be
@@ -48,7 +48,7 @@ import org.apache.commons.logging.LogFac
*
*/
public class ConnectionStateTracker extends CommandVisitorAdapter {
- private static final Log LOG = LogFactory.getLog(ConnectionStateTracker.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ConnectionStateTracker.class);
private static final Tracked TRACKED_RESPONSE_MARKER = new Tracked(null);
Modified: activemq/activemq-apollo/trunk/sandbox/activemq-openwire/src/main/java/org/apache/activemq/transport/ResponseCorrelator.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/sandbox/activemq-openwire/src/main/java/org/apache/activemq/transport/ResponseCorrelator.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/sandbox/activemq-openwire/src/main/java/org/apache/activemq/transport/ResponseCorrelator.java (original)
+++ activemq/activemq-apollo/trunk/sandbox/activemq-openwire/src/main/java/org/apache/activemq/transport/ResponseCorrelator.java Mon Nov 1 16:54:07 2010
@@ -28,8 +28,8 @@ import org.apache.activemq.command.Comma
import org.apache.activemq.command.ExceptionResponse;
import org.apache.activemq.command.Response;
import org.apache.activemq.util.IntSequenceGenerator;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Adds the incrementing sequence number to commands along with performing the
@@ -40,7 +40,7 @@ import org.apache.commons.logging.LogFac
*/
public class ResponseCorrelator extends TransportFilter {
- private static final Log LOG = LogFactory.getLog(ResponseCorrelator.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ResponseCorrelator.class);
private final Map<Integer, RequestCallback> requestMap = new HashMap<Integer, RequestCallback>();
private IntSequenceGenerator sequenceGenerator;
private final boolean debug = LOG.isDebugEnabled();
Modified: activemq/activemq-apollo/trunk/sandbox/activemq-openwire/src/main/java/org/apache/activemq/transport/WireFormatNegotiator.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/sandbox/activemq-openwire/src/main/java/org/apache/activemq/transport/WireFormatNegotiator.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/sandbox/activemq-openwire/src/main/java/org/apache/activemq/transport/WireFormatNegotiator.java (original)
+++ activemq/activemq-apollo/trunk/sandbox/activemq-openwire/src/main/java/org/apache/activemq/transport/WireFormatNegotiator.java Mon Nov 1 16:54:07 2010
@@ -27,15 +27,15 @@ import org.apache.activemq.command.Comma
import org.apache.activemq.command.WireFormatInfo;
import org.apache.activemq.openwire.OpenWireFormat;
import org.apache.activemq.util.IOExceptionSupport;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Negotiates the wire format with a new connection
*/
public class WireFormatNegotiator extends TransportFilter {
- private static final Log LOG = LogFactory.getLog(WireFormatNegotiator.class);
+ private static final Logger LOG = LoggerFactory.getLogger(WireFormatNegotiator.class);
private OpenWireFormat wireFormat;
private final int minimumVersion;
Modified: activemq/activemq-apollo/trunk/sandbox/activemq-openwire/src/test/java/org/apache/activemq/legacy/openwireprotocol/BrokerBenchmark.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/sandbox/activemq-openwire/src/test/java/org/apache/activemq/legacy/openwireprotocol/BrokerBenchmark.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/sandbox/activemq-openwire/src/test/java/org/apache/activemq/legacy/openwireprotocol/BrokerBenchmark.java (original)
+++ activemq/activemq-apollo/trunk/sandbox/activemq-openwire/src/test/java/org/apache/activemq/legacy/openwireprotocol/BrokerBenchmark.java Mon Nov 1 16:54:07 2010
@@ -30,8 +30,8 @@ import org.apache.activemq.command.Messa
import org.apache.activemq.command.ProducerInfo;
import org.apache.activemq.command.SessionInfo;
import org.apache.activemq.openwire.BrokerTestSupport;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* BrokerBenchmark is used to get an idea of the raw performance of a broker.
@@ -46,7 +46,7 @@ import org.apache.commons.logging.LogFac
* @version $Revision: 1.9 $
*/
public class BrokerBenchmark extends BrokerTestSupport {
- private static final transient Log LOG = LogFactory.getLog(BrokerBenchmark.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(BrokerBenchmark.class);
public int produceCount = Integer.parseInt(System.getProperty("PRODUCE_COUNT", "10000"));
public ActiveMQDestination destination;
Modified: activemq/activemq-apollo/trunk/sandbox/activemq-openwire/src/test/java/org/apache/activemq/openwire/DataFileGeneratorTestSupport.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/sandbox/activemq-openwire/src/test/java/org/apache/activemq/openwire/DataFileGeneratorTestSupport.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/sandbox/activemq-openwire/src/test/java/org/apache/activemq/openwire/DataFileGeneratorTestSupport.java (original)
+++ activemq/activemq-apollo/trunk/sandbox/activemq-openwire/src/test/java/org/apache/activemq/openwire/DataFileGeneratorTestSupport.java Mon Nov 1 16:54:07 2010
@@ -58,13 +58,13 @@ import org.apache.activemq.openwire.v1.A
import org.apache.activemq.openwire.v1.BrokerInfoTest;
import org.apache.activemq.openwire.v1.MessageAckTest;
import org.fusesource.hawtbuf.Buffer;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public abstract class DataFileGeneratorTestSupport extends TestCase {
protected static final Object[] EMPTY_ARGUMENTS = {};
- private static final Log LOG = LogFactory.getLog(DataFileGeneratorTestSupport.class);
+ private static final Logger LOG = LoggerFactory.getLogger(DataFileGeneratorTestSupport.class);
private static final Throwable SINGLETON_EXCEPTION = new Exception("shared exception");
private static final File MODULE_BASE_DIR;
Modified: activemq/activemq-apollo/trunk/sandbox/activemq-openwire/src/test/java/org/apache/activemq/openwire/NumberRangesWhileMarshallingTest.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/sandbox/activemq-openwire/src/test/java/org/apache/activemq/openwire/NumberRangesWhileMarshallingTest.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/sandbox/activemq-openwire/src/test/java/org/apache/activemq/openwire/NumberRangesWhileMarshallingTest.java (original)
+++ activemq/activemq-apollo/trunk/sandbox/activemq-openwire/src/test/java/org/apache/activemq/openwire/NumberRangesWhileMarshallingTest.java Mon Nov 1 16:54:07 2010
@@ -24,14 +24,14 @@ import java.io.IOException;
import junit.framework.TestCase;
import org.apache.activemq.command.SessionId;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
*/
public class NumberRangesWhileMarshallingTest extends TestCase {
- private static final Log LOG = LogFactory.getLog(NumberRangesWhileMarshallingTest.class);
+ private static final Logger LOG = LoggerFactory.getLogger(NumberRangesWhileMarshallingTest.class);
protected String connectionId = "Cheese";
protected ByteArrayOutputStream buffer = new ByteArrayOutputStream();
Modified: activemq/activemq-apollo/trunk/sandbox/activemq-spring/src/main/java/org/apache/activemq/xbean/XBeanBrokerFactory.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/sandbox/activemq-spring/src/main/java/org/apache/activemq/xbean/XBeanBrokerFactory.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/sandbox/activemq-spring/src/main/java/org/apache/activemq/xbean/XBeanBrokerFactory.java (original)
+++ activemq/activemq-apollo/trunk/sandbox/activemq-spring/src/main/java/org/apache/activemq/xbean/XBeanBrokerFactory.java Mon Nov 1 16:54:07 2010
@@ -23,8 +23,8 @@ import java.net.URI;
import org.apache.activemq.legacy.broker.BrokerFactoryHandler;
import org.apache.activemq.legacy.broker.BrokerService;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.xbean.spring.context.ResourceXmlApplicationContext;
import org.apache.xbean.spring.context.impl.URIEditor;
import org.springframework.beans.BeansException;
@@ -39,7 +39,7 @@ import org.springframework.util.Resource
/**
*/
public class XBeanBrokerFactory implements BrokerFactoryHandler {
- private static final transient Log LOG = LogFactory.getLog(XBeanBrokerFactory.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(XBeanBrokerFactory.class);
static {
PropertyEditorManager.registerEditor(URI.class, URIEditor.class);
Modified: activemq/activemq-apollo/trunk/sandbox/activemq-spring/src/test/java/org/apache/activemq/spring/ActiveMQConnectionFactoryFactoryBeanTest.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/sandbox/activemq-spring/src/test/java/org/apache/activemq/spring/ActiveMQConnectionFactoryFactoryBeanTest.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/sandbox/activemq-spring/src/test/java/org/apache/activemq/spring/ActiveMQConnectionFactoryFactoryBeanTest.java (original)
+++ activemq/activemq-apollo/trunk/sandbox/activemq-spring/src/test/java/org/apache/activemq/spring/ActiveMQConnectionFactoryFactoryBeanTest.java Mon Nov 1 16:54:07 2010
@@ -20,14 +20,14 @@ package org.apache.activemq.spring;
import java.util.Arrays;
import junit.framework.TestCase;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* @version $Revision: 1.1 $
*/
public class ActiveMQConnectionFactoryFactoryBeanTest extends TestCase {
- private static final transient Log LOG = LogFactory.getLog(ActiveMQConnectionFactoryFactoryBeanTest.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(ActiveMQConnectionFactoryFactoryBeanTest.class);
private ActiveMQConnectionFactoryFactoryBean factory;
Modified: activemq/activemq-apollo/trunk/sandbox/activemq-spring/src/test/java/org/apache/activemq/spring/ConsumerBean.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/sandbox/activemq-spring/src/test/java/org/apache/activemq/spring/ConsumerBean.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/sandbox/activemq-spring/src/test/java/org/apache/activemq/spring/ConsumerBean.java (original)
+++ activemq/activemq-apollo/trunk/sandbox/activemq-spring/src/test/java/org/apache/activemq/spring/ConsumerBean.java Mon Nov 1 16:54:07 2010
@@ -23,11 +23,11 @@ import javax.jms.Message;
import javax.jms.MessageListener;
import junit.framework.Assert;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class ConsumerBean extends Assert implements MessageListener {
- private static final Log LOG = LogFactory.getLog(ConsumerBean.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ConsumerBean.class);
private List<Message> messages = new ArrayList<Message>();
private Object semaphore;
private boolean verbose;
Modified: activemq/activemq-apollo/trunk/sandbox/activemq-spring/src/test/java/org/apache/activemq/spring/SpringConsumer.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/sandbox/activemq-spring/src/test/java/org/apache/activemq/spring/SpringConsumer.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/sandbox/activemq-spring/src/test/java/org/apache/activemq/spring/SpringConsumer.java (original)
+++ activemq/activemq-apollo/trunk/sandbox/activemq-spring/src/test/java/org/apache/activemq/spring/SpringConsumer.java Mon Nov 1 16:54:07 2010
@@ -25,12 +25,12 @@ import javax.jms.MessageConsumer;
import javax.jms.MessageListener;
import javax.jms.Session;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.jms.core.JmsTemplate;
public class SpringConsumer extends ConsumerBean implements MessageListener {
- private static final Log LOG = LogFactory.getLog(SpringConsumer.class);
+ private static final Logger LOG = LoggerFactory.getLogger(SpringConsumer.class);
private JmsTemplate template;
private String myId = "foo";
private Destination destination;
Modified: activemq/activemq-apollo/trunk/sandbox/activemq-spring/src/test/java/org/apache/activemq/spring/SpringProducer.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/sandbox/activemq-spring/src/test/java/org/apache/activemq/spring/SpringProducer.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/sandbox/activemq-spring/src/test/java/org/apache/activemq/spring/SpringProducer.java (original)
+++ activemq/activemq-apollo/trunk/sandbox/activemq-spring/src/test/java/org/apache/activemq/spring/SpringProducer.java Mon Nov 1 16:54:07 2010
@@ -22,13 +22,13 @@ import javax.jms.Message;
import javax.jms.Session;
import javax.jms.TextMessage;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.jms.core.JmsTemplate;
import org.springframework.jms.core.MessageCreator;
public class SpringProducer {
- private static final Log LOG = LogFactory.getLog(SpringProducer.class);
+ private static final Logger LOG = LoggerFactory.getLogger(SpringProducer.class);
private JmsTemplate template;
private Destination destination;
private int messageCount = 10;
Modified: activemq/activemq-apollo/trunk/sandbox/activemq-spring/src/test/java/org/apache/activemq/spring/SpringTestSupport.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/sandbox/activemq-spring/src/test/java/org/apache/activemq/spring/SpringTestSupport.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/sandbox/activemq-spring/src/test/java/org/apache/activemq/spring/SpringTestSupport.java (original)
+++ activemq/activemq-apollo/trunk/sandbox/activemq-spring/src/test/java/org/apache/activemq/spring/SpringTestSupport.java Mon Nov 1 16:54:07 2010
@@ -21,8 +21,8 @@ import java.util.List;
import junit.framework.TestCase;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.context.support.AbstractApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -30,7 +30,7 @@ import org.springframework.context.suppo
* @version $Revision: 1.1 $
*/
public class SpringTestSupport extends TestCase {
- private static final Log LOG = LogFactory.getLog(SpringTest.class);
+ private static final Logger LOG = LoggerFactory.getLogger(SpringTest.class);
protected AbstractApplicationContext context;
protected SpringConsumer consumer;
protected SpringProducer producer;
Modified: activemq/activemq-apollo/trunk/sandbox/hawtdb/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/sandbox/hawtdb/pom.xml?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/sandbox/hawtdb/pom.xml (original)
+++ activemq/activemq-apollo/trunk/sandbox/hawtdb/pom.xml Mon Nov 1 16:54:07 2010
@@ -50,25 +50,24 @@
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>${slf4j-version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
+ <scope>test</scope>
</dependency>
+
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>${slf4j-version}</version>
+ <scope>test</scope>
</dependency>
- <dependency>
- <groupId>javolution</groupId>
- <artifactId>javolution</artifactId>
- <version>5.3.1</version>
- </dependency>
-
</dependencies>
<build>
Modified: activemq/activemq-apollo/trunk/sandbox/hawtdb/src/main/java/org/apache/hawtdb/internal/index/HashIndex.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/sandbox/hawtdb/src/main/java/org/apache/hawtdb/internal/index/HashIndex.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/sandbox/hawtdb/src/main/java/org/apache/hawtdb/internal/index/HashIndex.java (original)
+++ activemq/activemq-apollo/trunk/sandbox/hawtdb/src/main/java/org/apache/hawtdb/internal/index/HashIndex.java Mon Nov 1 16:54:07 2010
@@ -27,8 +27,8 @@ import java.util.Map.Entry;
import org.fusesource.hawtbuf.Buffer;
import org.fusesource.hawtbuf.DataByteArrayInputStream;
import org.fusesource.hawtbuf.DataByteArrayOutputStream;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.hawtdb.api.BTreeIndexFactory;
import org.apache.hawtdb.api.EncoderDecoder;
import org.apache.hawtdb.api.HashIndexFactory;
@@ -46,7 +46,7 @@ import org.apache.hawtdb.api.Paged;
*/
public class HashIndex<Key,Value> implements Index<Key,Value> {
- private static final Log LOG = LogFactory.getLog(HashIndex.class);
+ private static final Logger LOG = LoggerFactory.getLogger(HashIndex.class);
private final BTreeIndexFactory<Key, Value> BIN_FACTORY = new BTreeIndexFactory<Key, Value>();
private final Paged paged;
Modified: activemq/activemq-apollo/trunk/sandbox/hawtdb/src/main/java/org/apache/hawtdb/internal/journal/Journal.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/sandbox/hawtdb/src/main/java/org/apache/hawtdb/internal/journal/Journal.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/sandbox/hawtdb/src/main/java/org/apache/hawtdb/internal/journal/Journal.java (original)
+++ activemq/activemq-apollo/trunk/sandbox/hawtdb/src/main/java/org/apache/hawtdb/internal/journal/Journal.java Mon Nov 1 16:54:07 2010
@@ -39,8 +39,8 @@ import org.apache.activemq.util.Schedule
import org.fusesource.hawtbuf.Buffer;
import org.fusesource.hawtbuf.DataByteArrayInputStream;
import org.apache.activemq.util.list.LinkedNodeList;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.hawtdb.internal.journal.DataFileAppender.WriteCommand;
import org.apache.hawtdb.internal.journal.DataFileAppender.WriteKey;
@@ -70,7 +70,7 @@ public class Journal {
public static final int DEFAULT_CLEANUP_INTERVAL = 1000 * 30;
public static final int PREFERED_DIFF = 1024 * 512;
- private static final Log LOG = LogFactory.getLog(Journal.class);
+ private static final Logger LOG = LoggerFactory.getLogger(Journal.class);
protected final Map<WriteKey, WriteCommand> inflightWrites = new ConcurrentHashMap<WriteKey, WriteCommand>();
Modified: activemq/activemq-apollo/trunk/sandbox/kahadb/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/sandbox/kahadb/pom.xml?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/sandbox/kahadb/pom.xml (original)
+++ activemq/activemq-apollo/trunk/sandbox/kahadb/pom.xml Mon Nov 1 16:54:07 2010
@@ -48,11 +48,17 @@
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.1</version>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>${slf4j-version}</version>
</dependency>
-
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>${slf4j-version}</version>
+ <scope>test</scope>
+ </dependency>
+
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
Modified: activemq/activemq-apollo/trunk/sandbox/kahadb/src/main/java/org/apache/kahadb/index/BTreeIndex.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/sandbox/kahadb/src/main/java/org/apache/kahadb/index/BTreeIndex.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/sandbox/kahadb/src/main/java/org/apache/kahadb/index/BTreeIndex.java (original)
+++ activemq/activemq-apollo/trunk/sandbox/kahadb/src/main/java/org/apache/kahadb/index/BTreeIndex.java Mon Nov 1 16:54:07 2010
@@ -24,8 +24,8 @@ import java.util.Map;
import java.util.concurrent.atomic.AtomicBoolean;
import org.apache.activemq.util.marshaller.Marshaller;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.kahadb.page.Page;
import org.apache.kahadb.page.PageFile;
import org.apache.kahadb.page.Transaction;
@@ -58,7 +58,7 @@ import org.apache.kahadb.page.Transactio
*/
public class BTreeIndex<Key,Value> implements Index<Key,Value> {
- private static final Log LOG = LogFactory.getLog(BTreeIndex.class);
+ private static final Logger LOG = LoggerFactory.getLogger(BTreeIndex.class);
/**
* Interface used to determine the simple prefix of two keys.
Modified: activemq/activemq-apollo/trunk/sandbox/kahadb/src/main/java/org/apache/kahadb/index/HashIndex.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/sandbox/kahadb/src/main/java/org/apache/kahadb/index/HashIndex.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/sandbox/kahadb/src/main/java/org/apache/kahadb/index/HashIndex.java (original)
+++ activemq/activemq-apollo/trunk/sandbox/kahadb/src/main/java/org/apache/kahadb/index/HashIndex.java Mon Nov 1 16:54:07 2010
@@ -26,8 +26,8 @@ import java.util.concurrent.atomic.Atomi
import org.apache.activemq.util.marshaller.Marshaller;
import org.apache.activemq.util.marshaller.VariableMarshaller;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.kahadb.page.Page;
import org.apache.kahadb.page.PageFile;
import org.apache.kahadb.page.Transaction;
@@ -42,7 +42,7 @@ public class HashIndex<Key,Value> implem
public static final int OPEN_STATE = 2;
- private static final Log LOG = LogFactory.getLog(HashIndex.class);
+ private static final Logger LOG = LoggerFactory.getLogger(HashIndex.class);
public static final int DEFAULT_BIN_CAPACITY;
public static final int DEFAULT_MAXIMUM_BIN_CAPACITY;
Modified: activemq/activemq-apollo/trunk/sandbox/kahadb/src/main/java/org/apache/kahadb/journal/Journal.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/sandbox/kahadb/src/main/java/org/apache/kahadb/journal/Journal.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/sandbox/kahadb/src/main/java/org/apache/kahadb/journal/Journal.java (original)
+++ activemq/activemq-apollo/trunk/sandbox/kahadb/src/main/java/org/apache/kahadb/journal/Journal.java Mon Nov 1 16:54:07 2010
@@ -33,8 +33,8 @@ import org.fusesource.hawtbuf.DataByteAr
import org.fusesource.hawtbuf.DataByteArrayOutputStream;
import org.apache.activemq.util.list.LinkedNodeList;
import org.apache.activemq.util.list.Sequence;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.kahadb.journal.DataFileAppender.WriteCommand;
import org.apache.kahadb.journal.DataFileAppender.WriteKey;
@@ -76,7 +76,7 @@ public class Journal {
public static final int DEFAULT_CLEANUP_INTERVAL = 1000 * 30;
public static final int PREFERED_DIFF = 1024 * 512;
- private static final Log LOG = LogFactory.getLog(Journal.class);
+ private static final Logger LOG = LoggerFactory.getLogger(Journal.class);
protected final Map<WriteKey, WriteCommand> inflightWrites = new ConcurrentHashMap<WriteKey, WriteCommand>();
Modified: activemq/activemq-apollo/trunk/sandbox/kahadb/src/main/java/org/apache/kahadb/page/PageFile.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/sandbox/kahadb/src/main/java/org/apache/kahadb/page/PageFile.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/sandbox/kahadb/src/main/java/org/apache/kahadb/page/PageFile.java (original)
+++ activemq/activemq-apollo/trunk/sandbox/kahadb/src/main/java/org/apache/kahadb/page/PageFile.java Mon Nov 1 16:54:07 2010
@@ -47,8 +47,8 @@ import org.apache.activemq.util.LRUCache
import org.fusesource.hawtbuf.DataByteArrayOutputStream;
import org.apache.activemq.util.list.Sequence;
import org.apache.activemq.util.list.SequenceSet;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* A PageFile provides you random access to fixed sized disk pages. This object is not thread safe and therefore access to it should
@@ -73,7 +73,7 @@ public class PageFile {
private static final int PAGE_FILE_HEADER_SIZE=1024*4;
// Recovery header is (long offset)
- private static final Log LOG = LogFactory.getLog(PageFile.class);
+ private static final Logger LOG = LoggerFactory.getLogger(PageFile.class);
// A PageFile will use a couple of files in this directory
private File directory;