You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by de...@apache.org on 2011/02/10 15:24:21 UTC
svn commit: r1069405 [9/11] - in /activemq/trunk: ./ activemq-all/
activemq-camel/
activemq-camel/src/main/java/org/apache/activemq/camel/component/
activemq-camel/src/test/java/org/apache/activemq/camel/
activemq-camel/src/test/java/org/apache/activem...
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/tcp/SslContextNBrokerServiceTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/tcp/SslContextNBrokerServiceTest.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/tcp/SslContextNBrokerServiceTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/tcp/SslContextNBrokerServiceTest.java Thu Feb 10 14:24:01 2011
@@ -32,13 +32,13 @@ import junit.framework.TestCase;
import org.apache.activemq.broker.BrokerService;
import org.apache.activemq.broker.TransportConnector;
-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.ClassPathXmlApplicationContext;
public class SslContextNBrokerServiceTest extends TestCase {
- private static final transient Log LOG = LogFactory.getLog(SslContextNBrokerServiceTest.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(SslContextNBrokerServiceTest.class);
private ClassPathXmlApplicationContext context;
Map beansOfType;
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/tcp/SslTransportFactoryTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/tcp/SslTransportFactoryTest.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/tcp/SslTransportFactoryTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/tcp/SslTransportFactoryTest.java Thu Feb 10 14:24:01 2011
@@ -24,11 +24,11 @@ import java.util.Map;
import junit.framework.TestCase;
import org.apache.activemq.openwire.OpenWireFormat;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class SslTransportFactoryTest extends TestCase {
- private static final Log LOG = LogFactory.getLog(SslTransportFactoryTest.class);
+ private static final Logger LOG = LoggerFactory.getLogger(SslTransportFactoryTest.class);
private SslTransportFactory factory;
private boolean verbose;
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/tcp/TcpFaultyTransportFactory.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/tcp/TcpFaultyTransportFactory.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/tcp/TcpFaultyTransportFactory.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/tcp/TcpFaultyTransportFactory.java Thu Feb 10 14:24:01 2011
@@ -37,8 +37,8 @@ import org.apache.activemq.util.IOExcept
import org.apache.activemq.util.IntrospectionSupport;
import org.apache.activemq.util.URISupport;
import org.apache.activemq.wireformat.WireFormat;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.net.Socket;
import java.net.ServerSocket;
@@ -50,7 +50,7 @@ import org.apache.activemq.transport.tcp
* Automatically generated socket.close() calls to simulate network faults
*/
public class TcpFaultyTransportFactory extends TcpTransportFactory {
- private static final Log LOG = LogFactory.getLog(TcpFaultyTransportFactory.class);
+ private static final Logger LOG = LoggerFactory.getLogger(TcpFaultyTransportFactory.class);
protected TcpFaultyTransport createTcpFaultyTransport(WireFormat wf, SocketFactory socketFactory, URI location, URI localLocation) throws UnknownHostException, IOException {
return new TcpFaultyTransport(wf, socketFactory, location, localLocation);
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/tcp/TransportUriTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/tcp/TransportUriTest.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/tcp/TransportUriTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/tcp/TransportUriTest.java Thu Feb 10 14:24:01 2011
@@ -22,15 +22,15 @@ import junit.framework.Test;
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.activemq.EmbeddedBrokerTestSupport;
import org.apache.activemq.broker.BrokerService;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* @version $Revision$
*/
public class TransportUriTest extends EmbeddedBrokerTestSupport {
- private static final Log LOG = LogFactory.getLog(TransportUriTest.class);
+ private static final Logger LOG = LoggerFactory.getLogger(TransportUriTest.class);
private static final String DIFF_SERV = "&diffServ=";
private static final String TOS = "&typeOfService=";
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/tcp/WireformatNegociationTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/tcp/WireformatNegociationTest.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/tcp/WireformatNegociationTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/tcp/WireformatNegociationTest.java Thu Feb 10 14:24:01 2011
@@ -32,11 +32,11 @@ import org.apache.activemq.transport.Tra
import org.apache.activemq.transport.TransportFactory;
import org.apache.activemq.transport.TransportListener;
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 WireformatNegociationTest extends CombinationTestSupport {
- private static final Log LOG = LogFactory.getLog(WireformatNegociationTest.class);
+ private static final Logger LOG = LoggerFactory.getLogger(WireformatNegociationTest.class);
private TransportServer server;
private Transport clientTransport;
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/udp/UdpTestSupport.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/udp/UdpTestSupport.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/udp/UdpTestSupport.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/udp/UdpTestSupport.java Thu Feb 10 14:24:01 2011
@@ -33,15 +33,15 @@ import org.apache.activemq.transport.Tra
import org.apache.activemq.transport.TransportAcceptListener;
import org.apache.activemq.transport.TransportListener;
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;
/**
* @version $Revision$
*/
public abstract class UdpTestSupport extends TestCase implements TransportListener {
- private static final Log LOG = LogFactory.getLog(UdpTestSupport.class);
+ private static final Logger LOG = LoggerFactory.getLogger(UdpTestSupport.class);
protected Transport producer;
protected Transport consumer;
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/udp/UdpTransportTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/udp/UdpTransportTest.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/udp/UdpTransportTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/udp/UdpTransportTest.java Thu Feb 10 14:24:01 2011
@@ -22,8 +22,8 @@ import org.apache.activemq.openwire.Open
import org.apache.activemq.transport.CommandJoiner;
import org.apache.activemq.transport.Transport;
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;
/**
*
@@ -31,7 +31,7 @@ import org.apache.commons.logging.LogFac
*/
public class UdpTransportTest extends UdpTestSupport {
- private static final Log LOG = LogFactory.getLog(UdpTransportTest.class);
+ private static final Logger LOG = LoggerFactory.getLogger(UdpTransportTest.class);
protected int consumerPort = 9123;
protected String producerURI = "udp://localhost:" + consumerPort;
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/udp/UdpTransportUsingServerTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/udp/UdpTransportUsingServerTest.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/udp/UdpTransportUsingServerTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/udp/UdpTransportUsingServerTest.java Thu Feb 10 14:24:01 2011
@@ -24,15 +24,15 @@ import org.apache.activemq.transport.Tra
import org.apache.activemq.transport.TransportFactory;
import org.apache.activemq.transport.TransportServer;
import org.apache.activemq.transport.tcp.WireformatNegociationTest;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
*
* @version $Revision$
*/
public class UdpTransportUsingServerTest extends UdpTestSupport {
- private static final Log LOG = LogFactory.getLog(UdpTransportUsingServerTest.class);
+ private static final Logger LOG = LoggerFactory.getLogger(UdpTransportUsingServerTest.class);
protected int consumerPort = 9123;
protected String producerURI = "udp://localhost:" + consumerPort;
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/AMQ2927Test.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/AMQ2927Test.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/AMQ2927Test.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/AMQ2927Test.java Thu Feb 10 14:24:01 2011
@@ -21,8 +21,8 @@ import org.apache.activemq.broker.Broker
import org.apache.activemq.command.ActiveMQQueue;
import org.apache.activemq.network.NetworkConnector;
import org.apache.activemq.util.MessageIdList;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import javax.jms.MessageConsumer;
@@ -31,7 +31,7 @@ import java.net.URI;
public class AMQ2927Test extends JmsMultipleBrokersTestSupport {
- private static final Log LOG = LogFactory.getLog(AMQ2927Test.class);
+ private static final Logger LOG = LoggerFactory.getLogger(AMQ2927Test.class);
ActiveMQQueue queue = new ActiveMQQueue("TEST");
@@ -132,4 +132,4 @@ public class AMQ2927Test extends JmsMult
waitForBridgeFormation();
}
-}
\ No newline at end of file
+}
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/AdvisoryTopicDeletionTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/AdvisoryTopicDeletionTest.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/AdvisoryTopicDeletionTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/AdvisoryTopicDeletionTest.java Thu Feb 10 14:24:01 2011
@@ -29,11 +29,11 @@ import org.apache.activemq.broker.Broker
import org.apache.activemq.broker.BrokerService;
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 AdvisoryTopicDeletionTest extends TestSupport {
- private static final Log LOG = LogFactory.getLog(AdvisoryTopicDeletionTest.class);
+ private static final Logger LOG = LoggerFactory.getLogger(AdvisoryTopicDeletionTest.class);
private BrokerService broker;
private Connection connection;
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/BrowseOverNetworkTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/BrowseOverNetworkTest.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/BrowseOverNetworkTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/BrowseOverNetworkTest.java Thu Feb 10 14:24:01 2011
@@ -30,12 +30,12 @@ import org.apache.activemq.command.Activ
import org.apache.activemq.command.ActiveMQTextMessage;
import org.apache.activemq.network.NetworkConnector;
import org.apache.activemq.util.MessageIdList;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.core.io.ClassPathResource;
public class BrowseOverNetworkTest extends JmsMultipleBrokersTestSupport {
- private static final Log LOG = LogFactory.getLog(QueueSubscription.class);
+ private static final Logger LOG = LoggerFactory.getLogger(QueueSubscription.class);
protected static final int MESSAGE_COUNT = 10;
public void testBrowse() throws Exception {
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/CompositeConsumeTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/CompositeConsumeTest.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/CompositeConsumeTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/CompositeConsumeTest.java Thu Feb 10 14:24:01 2011
@@ -22,14 +22,14 @@ import javax.jms.Message;
import org.apache.activemq.command.ActiveMQTopic;
import org.apache.activemq.test.JmsTopicSendReceiveWithTwoConnectionsTest;
import org.apache.activemq.transport.udp.UdpTransportUsingServerTest;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* @version $Revision: 1.1.1.1 $
*/
public class CompositeConsumeTest extends JmsTopicSendReceiveWithTwoConnectionsTest {
- private static final Log LOG = LogFactory.getLog(CompositeConsumeTest.class);
+ private static final Logger LOG = LoggerFactory.getLogger(CompositeConsumeTest.class);
public void testSendReceive() throws Exception {
messages.clear();
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/CompositePublishTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/CompositePublishTest.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/CompositePublishTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/CompositePublishTest.java Thu Feb 10 14:24:01 2011
@@ -30,14 +30,14 @@ import org.apache.activemq.ActiveMQConne
import org.apache.activemq.command.ActiveMQTopic;
import org.apache.activemq.test.JmsSendReceiveTestSupport;
import org.apache.activemq.test.retroactive.RetroactiveConsumerTestWithSimpleMessageListTest;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* @version $Revision: 1.1.1.1 $
*/
public class CompositePublishTest extends JmsSendReceiveTestSupport {
- private static final Log LOG = LogFactory.getLog(CompositePublishTest.class);
+ private static final Logger LOG = LoggerFactory.getLogger(CompositePublishTest.class);
protected Connection sendConnection;
protected Connection receiveConnection;
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/ConcurrentProducerDurableConsumerTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/ConcurrentProducerDurableConsumerTest.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/ConcurrentProducerDurableConsumerTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/ConcurrentProducerDurableConsumerTest.java Thu Feb 10 14:24:01 2011
@@ -48,11 +48,11 @@ import org.apache.activemq.command.Activ
import org.apache.activemq.command.ActiveMQTopic;
import org.apache.activemq.util.MessageIdList;
import org.apache.activemq.util.Wait;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class ConcurrentProducerDurableConsumerTest extends TestSupport {
- private static final Log LOG = LogFactory.getLog(ConcurrentProducerDurableConsumerTest.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ConcurrentProducerDurableConsumerTest.class);
private int consumerCount = 1;
BrokerService broker;
protected List<Connection> connections = Collections.synchronizedList(new ArrayList<Connection>());
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/ConsumeQueuePrefetchTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/ConsumeQueuePrefetchTest.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/ConsumeQueuePrefetchTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/ConsumeQueuePrefetchTest.java Thu Feb 10 14:24:01 2011
@@ -19,11 +19,11 @@ package org.apache.activemq.usecases;
import javax.jms.JMSException;
import javax.jms.Message;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class ConsumeQueuePrefetchTest extends ConsumeTopicPrefetchTest {
- private static final Log LOG = LogFactory.getLog(ConsumeQueuePrefetchTest.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ConsumeQueuePrefetchTest.class);
protected void setUp() throws Exception {
topic = false;
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/ConsumeTopicPrefetchTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/ConsumeTopicPrefetchTest.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/ConsumeTopicPrefetchTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/ConsumeTopicPrefetchTest.java Thu Feb 10 14:24:01 2011
@@ -28,14 +28,14 @@ import org.apache.activemq.broker.region
import org.apache.activemq.broker.region.RegionBroker;
import org.apache.activemq.util.Wait;
import org.apache.activemq.util.Wait.Condition;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* @version $Revision: 1.1.1.1 $
*/
public class ConsumeTopicPrefetchTest extends ProducerConsumerTestSupport {
- private static final Log LOG = LogFactory.getLog(ConsumeTopicPrefetchTest.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ConsumeTopicPrefetchTest.class);
protected int prefetchSize = 100;
protected String[] messageTexts;
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/CreateLotsOfTemporaryQueuesTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/CreateLotsOfTemporaryQueuesTest.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/CreateLotsOfTemporaryQueuesTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/CreateLotsOfTemporaryQueuesTest.java Thu Feb 10 14:24:01 2011
@@ -23,14 +23,14 @@ import junit.framework.Test;
import junit.framework.TestSuite;
import junit.textui.TestRunner;
import org.apache.activemq.EmbeddedBrokerAndConnectionTestSupport;
-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 CreateLotsOfTemporaryQueuesTest extends EmbeddedBrokerAndConnectionTestSupport {
- private static final Log LOG = LogFactory.getLog(CreateLotsOfTemporaryQueuesTest.class);
+ private static final Logger LOG = LoggerFactory.getLogger(CreateLotsOfTemporaryQueuesTest.class);
private static int numberToCreate = 500;
private static long sleep = 20;
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/DispatchMultipleConsumersTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/DispatchMultipleConsumersTest.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/DispatchMultipleConsumersTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/DispatchMultipleConsumersTest.java Thu Feb 10 14:24:01 2011
@@ -29,8 +29,8 @@ import junit.framework.TestCase;
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.activemq.broker.BrokerService;
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;
/**
@@ -38,7 +38,7 @@ import org.apache.commons.logging.LogFac
*
*/
public class DispatchMultipleConsumersTest extends TestCase {
- private final static Log logger = LogFactory.getLog(DispatchMultipleConsumersTest.class);
+ private final static Logger logger = LoggerFactory.getLogger(DispatchMultipleConsumersTest.class);
BrokerService broker;
Destination dest;
String destinationName = "TEST.Q";
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/DurableConsumerCloseAndReconnectTcpTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/DurableConsumerCloseAndReconnectTcpTest.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/DurableConsumerCloseAndReconnectTcpTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/DurableConsumerCloseAndReconnectTcpTest.java Thu Feb 10 14:24:01 2011
@@ -35,12 +35,12 @@ import org.apache.activemq.transport.Tra
import org.apache.activemq.transport.TransportListener;
import org.apache.activemq.transport.tcp.TcpTransportFactory;
import org.apache.activemq.util.URISupport;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class DurableConsumerCloseAndReconnectTcpTest extends DurableConsumerCloseAndReconnectTest
implements ExceptionListener, TransportListener {
- private static final Log LOG = LogFactory.getLog(DurableConsumerCloseAndReconnectTcpTest.class);
+ private static final Logger LOG = LoggerFactory.getLogger(DurableConsumerCloseAndReconnectTcpTest.class);
private BrokerService broker;
private TransportConnector connector;
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/DurableConsumerCloseAndReconnectTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/DurableConsumerCloseAndReconnectTest.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/DurableConsumerCloseAndReconnectTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/DurableConsumerCloseAndReconnectTest.java Thu Feb 10 14:24:01 2011
@@ -29,15 +29,15 @@ import javax.jms.Topic;
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.activemq.test.TestSupport;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* @version $Revision: 1.1.1.1 $
*/
public class DurableConsumerCloseAndReconnectTest extends TestSupport {
protected static final long RECEIVE_TIMEOUT = 5000L;
- private static final Log LOG = LogFactory.getLog(DurableConsumerCloseAndReconnectTest.class);
+ private static final Logger LOG = LoggerFactory.getLogger(DurableConsumerCloseAndReconnectTest.class);
protected Connection connection;
private Session session;
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/DurableSubProcessTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/DurableSubProcessTest.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/DurableSubProcessTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/DurableSubProcessTest.java Thu Feb 10 14:24:01 2011
@@ -21,8 +21,8 @@ import org.apache.activemq.broker.Broker
import org.apache.activemq.broker.BrokerService;
import org.apache.activemq.command.ActiveMQTopic;
import org.apache.activemq.store.kahadb.KahaDBPersistenceAdapter;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.junit.Test;
import javax.jms.*;
@@ -39,7 +39,7 @@ import java.util.concurrent.CopyOnWriteA
// see https://issues.apache.org/activemq/browse/AMQ-2985
// this demonstrated receiving old messages eventually along with validating order receipt
public class DurableSubProcessTest extends org.apache.activemq.TestSupport {
- private static final Log LOG = LogFactory.getLog(DurableSubProcessTest.class);
+ private static final Logger LOG = LoggerFactory.getLogger(DurableSubProcessTest.class);
public static final long RUNTIME = 4 * 60 * 1000;
public static final int SERVER_SLEEP = 2 * 1000; // max
@@ -675,4 +675,4 @@ public class DurableSubProcessTest exten
broker.stop();
broker = null;
}
-}
\ No newline at end of file
+}
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/DurableSubscriptionOfflineTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/DurableSubscriptionOfflineTest.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/DurableSubscriptionOfflineTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/DurableSubscriptionOfflineTest.java Thu Feb 10 14:24:01 2011
@@ -27,14 +27,14 @@ import org.apache.activemq.store.jdbc.JD
import org.apache.activemq.store.kahadb.KahaDBPersistenceAdapter;
import javax.jms.*;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.io.File;
import java.util.Vector;
public class DurableSubscriptionOfflineTest extends org.apache.activemq.TestSupport {
- private static final Log LOG = LogFactory.getLog(DurableSubscriptionOfflineTest.class);
+ private static final Logger LOG = LoggerFactory.getLogger(DurableSubscriptionOfflineTest.class);
public Boolean usePrioritySupport = Boolean.TRUE;
private BrokerService broker;
private ActiveMQTopic topic;
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/ExpiredMessagesTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/ExpiredMessagesTest.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/ExpiredMessagesTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/ExpiredMessagesTest.java Thu Feb 10 14:24:01 2011
@@ -41,15 +41,15 @@ import org.apache.activemq.command.Activ
import org.apache.activemq.command.ActiveMQQueue;
import org.apache.activemq.store.amq.AMQPersistenceAdapter;
import org.apache.activemq.util.Wait;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import static org.apache.activemq.TestSupport.getDestination;
import static org.apache.activemq.TestSupport.getDestinationStatistics;
public class ExpiredMessagesTest extends CombinationTestSupport {
- private static final Log LOG = LogFactory.getLog(ExpiredMessagesTest.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ExpiredMessagesTest.class);
BrokerService broker;
Connection connection;
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/ExpiredMessagesWithNoConsumerTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/ExpiredMessagesWithNoConsumerTest.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/ExpiredMessagesWithNoConsumerTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/ExpiredMessagesWithNoConsumerTest.java Thu Feb 10 14:24:01 2011
@@ -42,13 +42,13 @@ import org.apache.activemq.broker.region
import org.apache.activemq.command.ActiveMQDestination;
import org.apache.activemq.command.ActiveMQQueue;
import org.apache.activemq.util.Wait;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class ExpiredMessagesWithNoConsumerTest extends CombinationTestSupport {
- private static final Log LOG = LogFactory.getLog(ExpiredMessagesWithNoConsumerTest.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ExpiredMessagesWithNoConsumerTest.class);
BrokerService broker;
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/JdbcDurableSubDupTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/JdbcDurableSubDupTest.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/JdbcDurableSubDupTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/JdbcDurableSubDupTest.java Thu Feb 10 14:24:01 2011
@@ -37,8 +37,8 @@ import org.apache.activemq.broker.region
import org.apache.activemq.broker.region.policy.PolicyMap;
import org.apache.activemq.broker.region.policy.StorePendingDurableSubscriberMessageStoragePolicy;
import org.apache.activemq.store.jdbc.JDBCPersistenceAdapter;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -48,7 +48,7 @@ import static org.junit.Assert.assertTru
public class JdbcDurableSubDupTest {
- private static final Log LOG = LogFactory.getLog(JdbcDurableSubDupTest.class);
+ private static final Logger LOG = LoggerFactory.getLogger(JdbcDurableSubDupTest.class);
final int prefetchVal = 150;
String urlOptions = "jms.watchTopicAdvisories=false";
String url = null;
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/MessageGroupCloseTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/MessageGroupCloseTest.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/MessageGroupCloseTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/MessageGroupCloseTest.java Thu Feb 10 14:24:01 2011
@@ -18,8 +18,8 @@ package org.apache.activemq.usecases;
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 javax.jms.*;
import javax.jms.Queue;
@@ -35,7 +35,7 @@ import java.util.concurrent.CountDownLat
* 1 and 6 have the JMSXGroupFirstForConsumer property set to true.
*/
public class MessageGroupCloseTest extends TestCase {
- private static final Log LOG = LogFactory.getLog(MessageGroupNewConsumerTest.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MessageGroupNewConsumerTest.class);
private Connection connection;
// Released after all messages are created
private CountDownLatch latchMessagesCreated = new CountDownLatch(1);
@@ -219,4 +219,4 @@ public class MessageGroupCloseTest exten
messageGroups.put(groupId, count + 1);
}
}
-}
\ No newline at end of file
+}
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/MessageGroupDelayedTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/MessageGroupDelayedTest.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/MessageGroupDelayedTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/MessageGroupDelayedTest.java Thu Feb 10 14:24:01 2011
@@ -37,13 +37,13 @@ import org.apache.activemq.broker.Transp
import org.apache.activemq.broker.region.policy.PolicyEntry;
import org.apache.activemq.broker.region.policy.PolicyMap;
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 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/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/MessageGroupNewConsumerTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/MessageGroupNewConsumerTest.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/MessageGroupNewConsumerTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/MessageGroupNewConsumerTest.java Thu Feb 10 14:24:01 2011
@@ -28,8 +28,8 @@ import javax.jms.Session;
import javax.jms.TextMessage;
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 junit.framework.TestCase;
/*
@@ -42,7 +42,7 @@ import junit.framework.TestCase;
* See bug AMQ-2016: Message grouping fails when consumers are added
*/
public class MessageGroupNewConsumerTest extends TestCase {
- private static final Log LOG = LogFactory.getLog(MessageGroupNewConsumerTest.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MessageGroupNewConsumerTest.class);
private Connection connection;
// Released after the messages are created
private CountDownLatch latchMessagesCreated = new CountDownLatch(1);
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/MessageReroutingTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/MessageReroutingTest.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/MessageReroutingTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/MessageReroutingTest.java Thu Feb 10 14:24:01 2011
@@ -25,12 +25,12 @@ import org.apache.activemq.JmsMultipleBr
import org.apache.activemq.command.ActiveMQQueue;
import org.apache.activemq.command.ActiveMQTopic;
import org.apache.activemq.util.MessageIdList;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.core.io.ClassPathResource;
public class MessageReroutingTest extends JmsMultipleBrokersTestSupport {
- private static final transient Log LOG = LogFactory.getLog(MessageReroutingTest.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(MessageReroutingTest.class);
public Destination dest;
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/MultiBrokersMultiClientsTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/MultiBrokersMultiClientsTest.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/MultiBrokersMultiClientsTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/MultiBrokersMultiClientsTest.java Thu Feb 10 14:24:01 2011
@@ -29,8 +29,8 @@ import javax.jms.MessageConsumer;
import org.apache.activemq.JmsMultipleBrokersTestSupport;
import org.apache.activemq.util.MessageIdList;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* @version $Revision: 1.1.1.1 $
@@ -41,7 +41,7 @@ public class MultiBrokersMultiClientsTes
public static final int PRODUCER_COUNT = 3; // producers per broker
public static final int MESSAGE_COUNT = 20; // messages per producer
- private static final Log LOG = LogFactory.getLog(MultiBrokersMultiClientsTest.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MultiBrokersMultiClientsTest.class);
protected Map<String, MessageConsumer> consumerMap;
Map<Thread, Throwable> unhandeledExceptions = new HashMap<Thread, Throwable>();
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/NetworkOfTwentyBrokersTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/NetworkOfTwentyBrokersTest.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/NetworkOfTwentyBrokersTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/NetworkOfTwentyBrokersTest.java Thu Feb 10 14:24:01 2011
@@ -27,11 +27,11 @@ import org.apache.activemq.broker.region
import org.apache.activemq.command.BrokerInfo;
import org.apache.activemq.network.NetworkConnector;
import org.apache.activemq.util.ThreadTracker;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class NetworkOfTwentyBrokersTest extends JmsMultipleBrokersTestSupport {
- private static final Log LOG = LogFactory.getLog(NetworkOfTwentyBrokersTest.class);
+ private static final Logger LOG = LoggerFactory.getLogger(NetworkOfTwentyBrokersTest.class);
// This will interconnect all brokers using multicast
protected void bridgeAllBrokers() throws Exception {
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/NewConsumerCreatesDestinationTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/NewConsumerCreatesDestinationTest.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/NewConsumerCreatesDestinationTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/NewConsumerCreatesDestinationTest.java Thu Feb 10 14:24:01 2011
@@ -24,15 +24,15 @@ import javax.jms.Session;
import org.apache.activemq.EmbeddedBrokerAndConnectionTestSupport;
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;
/**
*
* @version $Revision: $
*/
public class NewConsumerCreatesDestinationTest extends EmbeddedBrokerAndConnectionTestSupport {
- private static final Log LOG = LogFactory.getLog(NewConsumerCreatesDestinationTest.class);
+ private static final Logger LOG = LoggerFactory.getLogger(NewConsumerCreatesDestinationTest.class);
private ActiveMQQueue wildcard;
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/NoDuplicateOnTopicNetworkTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/NoDuplicateOnTopicNetworkTest.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/NoDuplicateOnTopicNetworkTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/NoDuplicateOnTopicNetworkTest.java Thu Feb 10 14:24:01 2011
@@ -48,12 +48,12 @@ import org.apache.activemq.broker.region
import org.apache.activemq.command.ActiveMQTopic;
import org.apache.activemq.network.NetworkConnector;
import org.apache.activemq.util.Wait;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class NoDuplicateOnTopicNetworkTest extends CombinationTestSupport {
- private static final Log LOG = LogFactory
- .getLog(NoDuplicateOnTopicNetworkTest.class);
+ private static final Logger LOG = LoggerFactory
+ .getLogger(NoDuplicateOnTopicNetworkTest.class);
private static final String MULTICAST_DEFAULT = "multicast://default";
private static final String BROKER_1 = "tcp://localhost:61626";
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/ObjectMessageNotSerializableTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/ObjectMessageNotSerializableTest.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/ObjectMessageNotSerializableTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/ObjectMessageNotSerializableTest.java Thu Feb 10 14:24:01 2011
@@ -35,13 +35,13 @@ import org.apache.activemq.command.Activ
import org.apache.activemq.command.ActiveMQObjectMessage;
import org.apache.activemq.command.ActiveMQQueue;
import org.apache.activemq.command.ActiveMQTopic;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class ObjectMessageNotSerializableTest extends CombinationTestSupport {
- private static final Log LOG = LogFactory.getLog(ObjectMessageNotSerializableTest.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ObjectMessageNotSerializableTest.class);
BrokerService broker;
AtomicInteger numReceived = new AtomicInteger(0);
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/PublishOnQueueConsumedMessageInTransactionTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/PublishOnQueueConsumedMessageInTransactionTest.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/PublishOnQueueConsumedMessageInTransactionTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/PublishOnQueueConsumedMessageInTransactionTest.java Thu Feb 10 14:24:01 2011
@@ -35,12 +35,12 @@ import junit.framework.TestCase;
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.activemq.command.ActiveMQQueue;
import org.apache.activemq.util.IOHelper;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public final class PublishOnQueueConsumedMessageInTransactionTest extends TestCase implements MessageListener {
- private static final Log LOG = LogFactory.getLog(PublishOnQueueConsumedMessageInTransactionTest.class);
+ private static final Logger LOG = LoggerFactory.getLogger(PublishOnQueueConsumedMessageInTransactionTest.class);
private Session producerSession;
private Session consumerSession;
@@ -126,10 +126,10 @@ public final class PublishOnQueueConsume
consumerSession.rollback();
LOG.info("rolled back transaction");
} catch (JMSException e1) {
- LOG.info(e1);
+ LOG.info(e1.toString());
e1.printStackTrace();
}
- LOG.info(e);
+ LOG.info(e.toString());
e.printStackTrace();
}
}
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/PublishOnQueueConsumedMessageUsingActivemqXMLTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/PublishOnQueueConsumedMessageUsingActivemqXMLTest.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/PublishOnQueueConsumedMessageUsingActivemqXMLTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/PublishOnQueueConsumedMessageUsingActivemqXMLTest.java Thu Feb 10 14:24:01 2011
@@ -21,8 +21,8 @@ import java.io.File;
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.activemq.broker.BrokerService;
import org.apache.activemq.xbean.BrokerFactoryBean;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.core.io.ClassPathResource;
import org.springframework.core.io.Resource;
@@ -33,7 +33,7 @@ import org.springframework.core.io.Resou
*/
public class PublishOnQueueConsumedMessageUsingActivemqXMLTest extends PublishOnTopicConsumedMessageTest {
protected static final String JOURNAL_ROOT = "../data/";
- private static final transient Log LOG = LogFactory.getLog(PublishOnQueueConsumedMessageUsingActivemqXMLTest.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(PublishOnQueueConsumedMessageUsingActivemqXMLTest.class);
BrokerService broker;
/**
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/PublishOnTopicConsumedMessageTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/PublishOnTopicConsumedMessageTest.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/PublishOnTopicConsumedMessageTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/PublishOnTopicConsumedMessageTest.java Thu Feb 10 14:24:01 2011
@@ -22,15 +22,15 @@ import javax.jms.Message;
import javax.jms.MessageProducer;
import org.apache.activemq.test.JmsTopicSendReceiveWithTwoConnectionsTest;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* @version $Revision: 1.1.1.1 $
*/
public class PublishOnTopicConsumedMessageTest extends JmsTopicSendReceiveWithTwoConnectionsTest {
- private static final Log LOG = LogFactory.getLog(PublishOnTopicConsumedMessageTest.class);
+ private static final Logger LOG = LoggerFactory.getLogger(PublishOnTopicConsumedMessageTest.class);
private MessageProducer replyProducer;
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/PublishOnTopicConsumerMessageUsingActivemqXMLTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/PublishOnTopicConsumerMessageUsingActivemqXMLTest.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/PublishOnTopicConsumerMessageUsingActivemqXMLTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/PublishOnTopicConsumerMessageUsingActivemqXMLTest.java Thu Feb 10 14:24:01 2011
@@ -21,8 +21,8 @@ import java.io.File;
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.activemq.broker.BrokerService;
import org.apache.activemq.xbean.BrokerFactoryBean;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.core.io.ClassPathResource;
import org.springframework.core.io.Resource;
@@ -33,7 +33,7 @@ import org.springframework.core.io.Resou
*/
public class PublishOnTopicConsumerMessageUsingActivemqXMLTest extends PublishOnTopicConsumedMessageTest {
protected static final String JOURNAL_ROOT = "../data/";
- private static final transient Log LOG = LogFactory.getLog(PublishOnTopicConsumerMessageUsingActivemqXMLTest.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(PublishOnTopicConsumerMessageUsingActivemqXMLTest.class);
BrokerService broker;
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/QueueDuplicatesTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/QueueDuplicatesTest.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/QueueDuplicatesTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/QueueDuplicatesTest.java Thu Feb 10 14:24:01 2011
@@ -37,12 +37,12 @@ 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;
public class QueueDuplicatesTest extends TestCase {
- private static final Log LOG = LogFactory.getLog(QueueDuplicatesTest.class);
+ private static final Logger LOG = LoggerFactory.getLogger(QueueDuplicatesTest.class);
private static DateFormat formatter = new SimpleDateFormat("HH:mm:ss SSS");
private String brokerUrl;
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/QueueRepeaterTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/QueueRepeaterTest.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/QueueRepeaterTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/QueueRepeaterTest.java Thu Feb 10 14:24:01 2011
@@ -33,8 +33,8 @@ import javax.jms.TextMessage;
import junit.framework.TestCase;
import org.apache.activemq.ActiveMQConnectionFactory;
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;
/**
* @author pragmasoft
@@ -42,7 +42,7 @@ import org.apache.commons.logging.LogFac
*/
public final class QueueRepeaterTest extends TestCase {
- private static final Log LOG = LogFactory.getLog(QueueRepeaterTest.class);
+ private static final Logger LOG = LoggerFactory.getLogger(QueueRepeaterTest.class);
private volatile String receivedText;
@@ -83,10 +83,10 @@ public final class QueueRepeaterTest ext
consumerSession.rollback();
LOG.info("rolled back transaction");
} catch (JMSException e1) {
- LOG.info(e1);
+ LOG.info(e1.toString());
e1.printStackTrace();
}
- LOG.info(e);
+ LOG.info(e.toString());
e.printStackTrace();
}
}
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/SubscribeClosePublishThenConsumeTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/SubscribeClosePublishThenConsumeTest.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/SubscribeClosePublishThenConsumeTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/SubscribeClosePublishThenConsumeTest.java Thu Feb 10 14:24:01 2011
@@ -27,15 +27,15 @@ import javax.jms.TopicSubscriber;
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.activemq.test.TestSupport;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* @author Paul Smith
* @version $Revision: 1.1.1.1 $
*/
public class SubscribeClosePublishThenConsumeTest extends TestSupport {
- private static final Log LOG = LogFactory.getLog(SubscribeClosePublishThenConsumeTest.class);
+ private static final Logger LOG = LoggerFactory.getLogger(SubscribeClosePublishThenConsumeTest.class);
public void testDurableTopic() throws Exception {
ActiveMQConnectionFactory connectionFactory = new ActiveMQConnectionFactory("vm://locahost");
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TestSupport.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TestSupport.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TestSupport.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TestSupport.java Thu Feb 10 14:24:01 2011
@@ -27,8 +27,8 @@ import org.apache.activemq.ActiveMQConne
import org.apache.activemq.command.ActiveMQMessage;
import org.apache.activemq.command.ActiveMQQueue;
import org.apache.activemq.command.ActiveMQTopic;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Useful base class for unit test cases
@@ -37,7 +37,7 @@ import org.apache.commons.logging.LogFac
*/
public class TestSupport extends TestCase {
- private static final Log LOG = LogFactory.getLog(TestSupport.class);
+ private static final Logger LOG = LoggerFactory.getLogger(TestSupport.class);
protected ActiveMQConnectionFactory connectionFactory;
protected boolean topic = true;
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/ThreeBrokerQueueNetworkTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/ThreeBrokerQueueNetworkTest.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/ThreeBrokerQueueNetworkTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/ThreeBrokerQueueNetworkTest.java Thu Feb 10 14:24:01 2011
@@ -37,14 +37,14 @@ import org.apache.activemq.command.Activ
import org.apache.activemq.command.ConsumerInfo;
import org.apache.activemq.command.MessageDispatch;
import org.apache.activemq.util.MessageIdList;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* @version $Revision: 1.1.1.1 $
*/
public class ThreeBrokerQueueNetworkTest extends JmsMultipleBrokersTestSupport {
- private static final Log LOG = LogFactory.getLog(ThreeBrokerQueueNetworkTest.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ThreeBrokerQueueNetworkTest.class);
protected static final int MESSAGE_COUNT = 100;
private static final long MAX_WAIT_MILLIS = 10000;
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/ThreeBrokerStompTemporaryQueueTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/ThreeBrokerStompTemporaryQueueTest.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/ThreeBrokerStompTemporaryQueueTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/ThreeBrokerStompTemporaryQueueTest.java Thu Feb 10 14:24:01 2011
@@ -30,12 +30,12 @@ import org.apache.activemq.store.kahadb.
import org.apache.activemq.transport.stomp.Stomp;
import org.apache.activemq.transport.stomp.StompConnection;
import org.apache.activemq.transport.stomp.StompFrame;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class ThreeBrokerStompTemporaryQueueTest extends JmsMultipleBrokersTestSupport {
- private static final Log LOG = LogFactory.getLog(ThreeBrokerStompTemporaryQueueTest.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ThreeBrokerStompTemporaryQueueTest.class);
private StompConnection stompConnection;
protected NetworkConnector bridgeBrokers(BrokerService localBroker, BrokerService remoteBroker, boolean dynamicOnly, int networkTTL, boolean conduit, boolean failover) throws Exception {
@@ -177,4 +177,4 @@ public class ThreeBrokerStompTemporaryQu
broker.setPersistenceAdapter(kaha);
}
-}
\ No newline at end of file
+}
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/ThreeBrokerVirtualTopicNetworkTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/ThreeBrokerVirtualTopicNetworkTest.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/ThreeBrokerVirtualTopicNetworkTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/ThreeBrokerVirtualTopicNetworkTest.java Thu Feb 10 14:24:01 2011
@@ -32,12 +32,12 @@ import org.apache.activemq.broker.region
import org.apache.activemq.network.NetworkConnector;
import org.apache.activemq.store.kahadb.KahaDBStore;
import org.apache.activemq.util.MessageIdList;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class ThreeBrokerVirtualTopicNetworkTest extends JmsMultipleBrokersTestSupport {
- private static final Log LOG = LogFactory.getLog(ThreeBrokerVirtualTopicNetworkTest.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ThreeBrokerVirtualTopicNetworkTest.class);
protected static final int MESSAGE_COUNT = 1;
public boolean dynamicOnly = false;
@@ -183,4 +183,4 @@ public class ThreeBrokerVirtualTopicNetw
broker.setPersistenceAdapter(kaha);
}
-}
\ No newline at end of file
+}
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TopicProducerFlowControlTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TopicProducerFlowControlTest.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TopicProducerFlowControlTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TopicProducerFlowControlTest.java Thu Feb 10 14:24:01 2011
@@ -33,11 +33,11 @@ import org.apache.activemq.broker.region
import org.apache.activemq.broker.region.policy.PolicyMap;
import org.apache.activemq.command.ActiveMQTopic;
import org.apache.activemq.util.Wait;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class TopicProducerFlowControlTest extends TestCase implements MessageListener {
- private static final Log LOG = LogFactory.getLog(TopicProducerFlowControlTest.class);
+ private static final Logger LOG = LoggerFactory.getLogger(TopicProducerFlowControlTest.class);
private static final String brokerName = "testBroker";
private static final String brokerUrl = "vm://" + brokerName;
private static final int destinationMemLimit = 2097152; // 2MB
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TopicRedeliverTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TopicRedeliverTest.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TopicRedeliverTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TopicRedeliverTest.java Thu Feb 10 14:24:01 2011
@@ -31,15 +31,15 @@ import javax.jms.Topic;
import org.apache.activemq.test.TestSupport;
import org.apache.activemq.util.IdGenerator;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* @version $Revision: 1.1.1.1 $
*/
public class TopicRedeliverTest extends TestSupport {
- private static final Log LOG = LogFactory.getLog(TopicRedeliverTest.class);
+ private static final Logger LOG = LoggerFactory.getLogger(TopicRedeliverTest.class);
private static final int RECEIVE_TIMEOUT = 10000;
protected int deliveryMode = DeliveryMode.PERSISTENT;
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TransactionRollbackOrderTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TransactionRollbackOrderTest.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TransactionRollbackOrderTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TransactionRollbackOrderTest.java Thu Feb 10 14:24:01 2011
@@ -33,8 +33,8 @@ import javax.jms.TextMessage;
import junit.framework.TestCase;
import org.apache.activemq.ActiveMQConnectionFactory;
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;
/**
* Test case for AMQ-268
@@ -43,7 +43,7 @@ import org.apache.commons.logging.LogFac
* @version $Revision: 1.1 $
*/
public final class TransactionRollbackOrderTest extends TestCase {
- private static final Log LOG = LogFactory.getLog(TransactionRollbackOrderTest.class);
+ private static final Logger LOG = LoggerFactory.getLogger(TransactionRollbackOrderTest.class);
private volatile String receivedText;
@@ -108,10 +108,10 @@ public final class TransactionRollbackOr
consumerSession.rollback();
LOG.info("rolled back transaction");
} catch (JMSException e1) {
- LOG.info(e1);
+ LOG.info(e1.toString());
e1.printStackTrace();
}
- LOG.info(e);
+ LOG.info(e.toString());
e.printStackTrace();
}
}
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TransactionTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TransactionTest.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TransactionTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TransactionTest.java Thu Feb 10 14:24:01 2011
@@ -34,8 +34,8 @@ import javax.jms.TextMessage;
import junit.framework.TestCase;
import org.apache.activemq.ActiveMQConnectionFactory;
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;
/**
* @author pragmasoft
@@ -43,7 +43,7 @@ import org.apache.commons.logging.LogFac
*/
public final class TransactionTest extends TestCase {
- private static final Log LOG = LogFactory.getLog(TransactionTest.class);
+ private static final Logger LOG = LoggerFactory.getLogger(TransactionTest.class);
private volatile String receivedText;
@@ -84,10 +84,10 @@ public final class TransactionTest exten
consumerSession.rollback();
LOG.info("rolled back transaction");
} catch (JMSException e1) {
- LOG.info(e1);
+ LOG.info(e1.toString());
e1.printStackTrace();
}
- LOG.info(e);
+ LOG.info(e.toString());
e.printStackTrace();
}
}
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TwoBrokerNetworkLoadBalanceTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TwoBrokerNetworkLoadBalanceTest.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TwoBrokerNetworkLoadBalanceTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TwoBrokerNetworkLoadBalanceTest.java Thu Feb 10 14:24:01 2011
@@ -24,11 +24,11 @@ import javax.jms.MessageConsumer;
import org.apache.activemq.JmsMultipleBrokersTestSupport;
import org.apache.activemq.util.MessageIdList;
import org.apache.activemq.util.Wait;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class TwoBrokerNetworkLoadBalanceTest extends JmsMultipleBrokersTestSupport {
- protected static final Log LOG = LogFactory.getLog(TwoBrokerNetworkLoadBalanceTest.class);
+ protected static final Logger LOG = LoggerFactory.getLogger(TwoBrokerNetworkLoadBalanceTest.class);
public void testLoadBalancing() throws Exception {
bridgeBrokers("BrokerA", "BrokerB");
bridgeBrokers("BrokerB", "BrokerA");
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TwoBrokerQueueClientsReconnectTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TwoBrokerQueueClientsReconnectTest.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TwoBrokerQueueClientsReconnectTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TwoBrokerQueueClientsReconnectTest.java Thu Feb 10 14:24:01 2011
@@ -27,8 +27,8 @@ import javax.jms.Session;
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.activemq.ActiveMQPrefetchPolicy;
import org.apache.activemq.JmsMultipleBrokersTestSupport;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* @version $Revision: 1.1.1.1 $
@@ -36,7 +36,7 @@ import org.apache.commons.logging.LogFac
public class TwoBrokerQueueClientsReconnectTest extends JmsMultipleBrokersTestSupport {
protected static final int MESSAGE_COUNT = 100; // Best if a factor of 100
protected static final int PREFETCH_COUNT = 1;
- private static final Log LOG = LogFactory.getLog(TwoBrokerQueueClientsReconnectTest.class);
+ private static final Logger LOG = LoggerFactory.getLogger(TwoBrokerQueueClientsReconnectTest.class);
protected int msgsClient1;
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TwoBrokerTopicSendReceiveTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TwoBrokerTopicSendReceiveTest.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TwoBrokerTopicSendReceiveTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TwoBrokerTopicSendReceiveTest.java Thu Feb 10 14:24:01 2011
@@ -27,15 +27,15 @@ import org.apache.activemq.broker.Broker
import org.apache.activemq.test.JmsTopicSendReceiveWithTwoConnectionsTest;
import org.apache.activemq.util.ServiceSupport;
import org.apache.activemq.xbean.BrokerFactoryBean;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.core.io.ClassPathResource;
/**
* @version $Revision: 1.1.1.1 $
*/
public class TwoBrokerTopicSendReceiveTest extends JmsTopicSendReceiveWithTwoConnectionsTest {
- private static final Log LOG = LogFactory.getLog(TwoBrokerTopicSendReceiveTest.class);
+ private static final Logger LOG = LoggerFactory.getLogger(TwoBrokerTopicSendReceiveTest.class);
protected ActiveMQConnectionFactory sendFactory;
protected ActiveMQConnectionFactory receiveFactory;
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/util/ConsumerThread.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/util/ConsumerThread.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/util/ConsumerThread.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/util/ConsumerThread.java Thu Feb 10 14:24:01 2011
@@ -16,14 +16,14 @@
*/
package org.apache.activemq.util;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import javax.jms.*;
public class ConsumerThread extends Thread {
- private static final Log LOG = LogFactory.getLog(ConsumerThread.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ConsumerThread.class);
int messageCount = 1000;
int received = 0;
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/util/LRUCacheTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/util/LRUCacheTest.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/util/LRUCacheTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/util/LRUCacheTest.java Thu Feb 10 14:24:01 2011
@@ -18,12 +18,12 @@ package org.apache.activemq.util;
import static org.junit.Assert.assertEquals;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.junit.Test;
public class LRUCacheTest {
- protected static final Log LOG = LogFactory.getLog(LRUCacheTest.class);
+ protected static final Logger LOG = LoggerFactory.getLogger(LRUCacheTest.class);
@Test
public void testResize() throws Exception {
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/util/MessageIdList.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/util/MessageIdList.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/util/MessageIdList.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/util/MessageIdList.java Thu Feb 10 14:24:01 2011
@@ -26,8 +26,8 @@ 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;
/**
* A simple container of messages for performing testing and rendezvous style
@@ -42,7 +42,7 @@ import org.apache.commons.logging.LogFac
*/
public class MessageIdList extends Assert implements MessageListener {
- private static final Log LOG = LogFactory.getLog(MessageIdList.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MessageIdList.class);
private List<String> messageIds = new ArrayList<String>();
private Object semaphore;
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/util/ProducerThread.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/util/ProducerThread.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/util/ProducerThread.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/util/ProducerThread.java Thu Feb 10 14:24:01 2011
@@ -16,14 +16,14 @@
*/
package org.apache.activemq.util;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import javax.jms.*;
public class ProducerThread extends Thread {
- private static final Log LOG = LogFactory.getLog(ProducerThread.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ProducerThread.class);
int messageCount = 1000;
Destination dest;
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/util/SocketProxy.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/util/SocketProxy.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/util/SocketProxy.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/util/SocketProxy.java Thu Feb 10 14:24:01 2011
@@ -33,12 +33,12 @@ import java.util.concurrent.CountDownLat
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicReference;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class SocketProxy {
- private static final transient Log LOG = LogFactory.getLog(SocketProxy.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(SocketProxy.class);
public static final int ACCEPT_TIMEOUT_MILLIS = 100;
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/xbean/ConnectorXBeanConfigTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/xbean/ConnectorXBeanConfigTest.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/xbean/ConnectorXBeanConfigTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/xbean/ConnectorXBeanConfigTest.java Thu Feb 10 14:24:01 2011
@@ -35,15 +35,15 @@ import org.apache.activemq.broker.Transp
import org.apache.activemq.command.ActiveMQQueue;
import org.apache.activemq.command.ActiveMQTopic;
import org.apache.activemq.network.NetworkConnector;
-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 ConnectorXBeanConfigTest extends TestCase {
- private static final Log LOG = LogFactory.getLog(ConnectorXBeanConfigTest.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ConnectorXBeanConfigTest.class);
protected BrokerService brokerService;
public void testConnectorConfiguredCorrectly() throws Exception {
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/xbean/ManagementContextXBeanConfigTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/xbean/ManagementContextXBeanConfigTest.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/xbean/ManagementContextXBeanConfigTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/xbean/ManagementContextXBeanConfigTest.java Thu Feb 10 14:24:01 2011
@@ -32,8 +32,8 @@ import javax.management.remote.JMXConnec
import javax.management.remote.JMXServiceURL;
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 $
@@ -41,7 +41,7 @@ import org.apache.commons.logging.LogFac
public class ManagementContextXBeanConfigTest extends TestCase {
protected BrokerService brokerService;
- private static final transient Log LOG = LogFactory.getLog(ManagementContextXBeanConfigTest.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(ManagementContextXBeanConfigTest.class);
public void testManagmentContextConfiguredCorrectly() throws Exception {
assertEquals(2011, brokerService.getManagementContext().getConnectorPort());
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/xbean/MultipleTestsWithEmbeddedBrokerTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/xbean/MultipleTestsWithEmbeddedBrokerTest.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/xbean/MultipleTestsWithEmbeddedBrokerTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/xbean/MultipleTestsWithEmbeddedBrokerTest.java Thu Feb 10 14:24:01 2011
@@ -20,8 +20,8 @@ import javax.jms.Connection;
import org.apache.activemq.EmbeddedBrokerTestSupport;
import org.apache.activemq.test.retroactive.RetroactiveConsumerWithMessageQueryTest;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
*
@@ -29,7 +29,7 @@ import org.apache.commons.logging.LogFac
* @version $Revision$
*/
public class MultipleTestsWithEmbeddedBrokerTest extends EmbeddedBrokerTestSupport {
- private static final Log LOG = LogFactory.getLog(MultipleTestsWithEmbeddedBrokerTest.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MultipleTestsWithEmbeddedBrokerTest.class);
protected Connection connection;
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/xbean/MultipleTestsWithSpringFactoryBeanTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/xbean/MultipleTestsWithSpringFactoryBeanTest.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/xbean/MultipleTestsWithSpringFactoryBeanTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/xbean/MultipleTestsWithSpringFactoryBeanTest.java Thu Feb 10 14:24:01 2011
@@ -23,8 +23,8 @@ import junit.framework.TestCase;
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.activemq.broker.BrokerService;
-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;
@@ -35,7 +35,7 @@ import org.springframework.context.suppo
*/
public class MultipleTestsWithSpringFactoryBeanTest extends TestCase {
- private static final Log LOG = LogFactory.getLog(MultipleTestsWithSpringFactoryBeanTest.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MultipleTestsWithSpringFactoryBeanTest.class);
protected AbstractApplicationContext context;
protected BrokerService service;
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/xbean/XBeanConfigTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/xbean/XBeanConfigTest.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/xbean/XBeanConfigTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/xbean/XBeanConfigTest.java Thu Feb 10 14:24:01 2011
@@ -32,15 +32,15 @@ import org.apache.activemq.broker.region
import org.apache.activemq.command.ActiveMQTopic;
import org.apache.activemq.command.ConnectionId;
import org.apache.activemq.command.ConnectionInfo;
-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 XBeanConfigTest extends TestCase {
- private static final Log LOG = LogFactory.getLog(XBeanConfigTest.class);
+ private static final Logger LOG = LoggerFactory.getLogger(XBeanConfigTest.class);
protected BrokerService brokerService;
protected Broker broker;