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 [1/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...
Author: chirino
Date: Mon Nov 1 16:54:07 2010
New Revision: 1029743
URL: http://svn.apache.org/viewvc?rev=1029743&view=rev
Log:
s/commons-logging/slf4j-api/g
Modified:
activemq/activemq-apollo/trunk/apollo-bdb/pom.xml
activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/jaxb/PropertiesReader.java
activemq/activemq-apollo/trunk/apollo-cassandra/pom.xml
activemq/activemq-apollo/trunk/apollo-selector/pom.xml
activemq/activemq-apollo/trunk/apollo-selector/src/main/java/org/apache/activemq/apollo/filter/XPathExpression.java
activemq/activemq-apollo/trunk/apollo-selector/src/test/java/org/apache/activemq/apollo/selector/SelectorParserTest.java
activemq/activemq-apollo/trunk/apollo-tcp/src/main/java/org/apache/activemq/apollo/transport/tcp/TcpTransport.java
activemq/activemq-apollo/trunk/apollo-tcp/src/main/java/org/apache/activemq/apollo/transport/tcp/TcpTransportFactory.java
activemq/activemq-apollo/trunk/apollo-transport/pom.xml
activemq/activemq-apollo/trunk/apollo-util/pom.xml
activemq/activemq-apollo/trunk/apollo-util/src/main/scala/org/apache/activemq/apollo/util/Logging.scala
activemq/activemq-apollo/trunk/apollo-util/src/main/scala/org/apache/activemq/apollo/util/ServiceStopper.java
activemq/activemq-apollo/trunk/apollo-util/src/main/scala/org/apache/activemq/apollo/util/ServiceSupport.java
activemq/activemq-apollo/trunk/apollo-util/src/main/scala/org/apache/activemq/apollo/util/jndi/JNDIReferenceFactory.java
activemq/activemq-apollo/trunk/apollo-util/src/test/scala/org/apache/activemq/apollo/util/AutoFailTestSupport.java
activemq/activemq-apollo/trunk/apollo-util/src/test/scala/org/apache/activemq/apollo/util/CombinationTestSupport.java
activemq/activemq-apollo/trunk/apollo-util/src/test/scala/org/apache/activemq/apollo/util/MessageIdList.java
activemq/activemq-apollo/trunk/apollo-util/src/test/scala/org/apache/activemq/apollo/util/SocketProxy.java
activemq/activemq-apollo/trunk/apollo-website/pom.xml
activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/jaxb/JAXBComplexConfigTest.java
activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/ActiveMQInputStreamTest.java
activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/LargeStreamletTest.java
activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/MessageListenerRedeliveryTest.java
activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/SpringTest.java
activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/SpringTestSupport.java
activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/AMQ1866.java
activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/AMQ2021Test.java
activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/AMQ2102Test.java
activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/ConnectionPerMessageTest.java
activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/DurableConsumerTest.java
activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/JmsDurableTopicSlowReceiveTest.java
activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/MissingDataFileTest.java
activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/QueueWorkerPrefetchTest.java
activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/SlowConsumerTest.java
activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/TransactionNotStartedErrorTest.java
activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/VerifySteadyEnqueueRate.java
activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/test4/ReconnectWithSameClientIDTest.java
activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/test4/TemporaryDestinationToFromNameTest.java
activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/test4/ZeroPrefetchConsumerTest.java
activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/test4/rollback/CloseRollbackRedeliveryQueueTest.java
activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/test4/rollback/DelegatingTransactionalMessageListener.java
activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/test4/rollback/RollbacksWhileConsumingLargeQueueTest.java
activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/test5/LargeMessageTestSupport.java
activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/TopicClusterTest.java
activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/discovery/DiscoveryTransportNoBrokerTest.java
activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/failover/BadConnectionTest.java
activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/failover/ReconnectTest.java
activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/peer/PeerTransportTest.java
activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/tcp/InactivityMonitorTest.java
activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/tcp/SslContextNBrokerServiceTest.java
activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/tcp/SslTransportFactoryTest.java
activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/tcp/TransportUriTest.java
activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/tcp/WireformatNegociationTest.java
activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/CompositeConsumeTest.java
activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/CompositePublishTest.java
activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/ConsumeTopicPrefetchTest.java
activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/CreateLotsOfTemporaryQueuesTest.java
activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/DispatchMultipleConsumersTest.java
activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/DurableConsumerCloseAndReconnectTest.java
activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/MessageGroupNewConsumerTest.java
activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/NewConsumerCreatesDestinationTest.java
activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/NoDuplicateOnTopicNetworkTest.java
activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/PublishOnQueueConsumedMessageInTransactionTest.java
activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/PublishOnQueueConsumedMessageUsingActivemqXMLTest.java
activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/PublishOnTopicConsumedMessageTest.java
activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/PublishOnTopicConsumerMessageUsingActivemqXMLTest.java
activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/QueueDuplicatesTest.java
activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/QueueRepeaterTest.java
activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/SubscribeClosePublishThenConsumeTest.java
activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/TestSupport.java
activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/TransactionRollbackOrderTest.java
activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/TransactionTest.java
activemq/activemq-apollo/trunk/sandbox/activemq-client/src/main/java/org/apache/activemq/ActiveMQConnection.java
activemq/activemq-apollo/trunk/sandbox/activemq-client/src/main/java/org/apache/activemq/ActiveMQMessageConsumer.java
activemq/activemq-apollo/trunk/sandbox/activemq-client/src/main/java/org/apache/activemq/ActiveMQPrefetchPolicy.java
activemq/activemq-apollo/trunk/sandbox/activemq-client/src/main/java/org/apache/activemq/ActiveMQSession.java
activemq/activemq-apollo/trunk/sandbox/activemq-client/src/main/java/org/apache/activemq/ActiveMQSessionExecutor.java
activemq/activemq-apollo/trunk/sandbox/activemq-client/src/main/java/org/apache/activemq/AdvisoryConsumer.java
activemq/activemq-apollo/trunk/sandbox/activemq-client/src/main/java/org/apache/activemq/TransactionContext.java
activemq/activemq-apollo/trunk/sandbox/activemq-client/src/main/java/org/apache/activemq/advisory/ConsumerEventSource.java
activemq/activemq-apollo/trunk/sandbox/activemq-client/src/main/java/org/apache/activemq/advisory/DestinationSource.java
activemq/activemq-apollo/trunk/sandbox/activemq-client/src/main/java/org/apache/activemq/advisory/ProducerEventSource.java
activemq/activemq-apollo/trunk/sandbox/activemq-client/src/main/java/org/apache/activemq/management/JMSEndpointStatsImpl.java
activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/apollo/ActiveMQConnectionFactoryTest.java
activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/apollo/demo/DefaultQueueSender.java
activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/apollo/demo/SimpleProducer.java
activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/apollo/demo/SimpleQueueReceiver.java
activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/apollo/demo/SimpleQueueSender.java
activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/apollo/test1/JMSConsumerTest.java
activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/apollo/test1/perf/LoadTestBurnIn.java
activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/apollo/test2/JMSDurableTopicRedeliverTest.java
activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/apollo/test2/JmsSendReceiveTestSupport.java
activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/apollo/test2/JmsSendReceiveWithMessageExpirationTest.java
activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/apollo/test2/JmsTopicRedeliverTest.java
activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/apollo/test2/JmsTopicSelectorTest.java
activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/apollo/test2/JmsTopicSendReceiveTest.java
activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/apollo/test3/CreateConsumerButDontStartConnectionWarningTest.java
activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/apollo/test3/JmsQueueSendReceiveTwoConnectionsTest.java
activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/apollo/test3/JmsSendReceiveTestSupport.java
activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/apollo/test3/JmsTopicRequestReplyTest.java
activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/apollo/test3/JmsTopicSendReceiveTest.java
activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/apollo/test3/JmsTopicSendReceiveWithTwoConnectionsTest.java
activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/apollo/test3/JmsTransactionTestSupport.java
activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/apollo/test3/TestSupport.java
activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/legacy/ActiveMQXAConnectionFactoryTest.java
activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/legacy/JmsRollbackRedeliveryTest.java
activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/legacy/test1/JmsBenchmark.java
activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/legacy/test1/MessageGroupDelayedTest.java
activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/legacy/test1/MessageGroupTest.java
activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/legacy/test2/JmsDurableTopicSendReceiveTest.java
activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsQueueSendReceiveTwoConnectionsStartBeforeBrokerTest.java
activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsQueueTransactionTest.java
activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/legacy/test3/JmsTopicSendReceiveWithEmbeddedBrokerAndUserIDTest.java
activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/legacy/test6/NioQueueSubscriptionTest.java
activemq/activemq-apollo/trunk/sandbox/activemq-jmx/src/main/java/org/apache/activemq/broker/jmx/ManagementContext.java
activemq/activemq-apollo/trunk/sandbox/activemq-network/src/main/java/org/apache/activemq/network/CompositeDemandForwardingBridge.java
activemq/activemq-apollo/trunk/sandbox/activemq-network/src/main/java/org/apache/activemq/network/ConduitBridge.java
activemq/activemq-apollo/trunk/sandbox/activemq-network/src/main/java/org/apache/activemq/network/DemandForwardingBridge.java
activemq/activemq-apollo/trunk/sandbox/activemq-network/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java
activemq/activemq-apollo/trunk/sandbox/activemq-network/src/main/java/org/apache/activemq/network/DiscoveryNetworkConnector.java
activemq/activemq-apollo/trunk/sandbox/activemq-network/src/main/java/org/apache/activemq/network/DurableConduitBridge.java
activemq/activemq-apollo/trunk/sandbox/activemq-network/src/main/java/org/apache/activemq/network/ForwardingBridge.java
activemq/activemq-apollo/trunk/sandbox/activemq-network/src/main/java/org/apache/activemq/network/LdapNetworkConnector.java
activemq/activemq-apollo/trunk/sandbox/activemq-network/src/main/java/org/apache/activemq/network/NetworkConnector.java
activemq/activemq-apollo/trunk/sandbox/activemq-network/src/main/java/org/apache/activemq/network/jms/DestinationBridge.java
activemq/activemq-apollo/trunk/sandbox/activemq-network/src/main/java/org/apache/activemq/network/jms/JmsConnector.java
activemq/activemq-apollo/trunk/sandbox/activemq-network/src/main/java/org/apache/activemq/network/jms/JmsQueueConnector.java
activemq/activemq-apollo/trunk/sandbox/activemq-network/src/main/java/org/apache/activemq/network/jms/JmsTopicConnector.java
activemq/activemq-apollo/trunk/sandbox/activemq-network/src/test/java/org/apache/activemq/network/jms/QueueBridgeTest.java
activemq/activemq-apollo/trunk/sandbox/activemq-network/src/test/java/org/apache/activemq/network/jms/TopicBridgeSpringTest.java
activemq/activemq-apollo/trunk/sandbox/activemq-openwire/src/main/java/org/apache/activemq/command/ActiveMQTempDestination.java
activemq/activemq-apollo/trunk/sandbox/activemq-openwire/src/main/java/org/apache/activemq/command/NetworkBridgeFilter.java
activemq/activemq-apollo/trunk/sandbox/activemq-openwire/src/main/java/org/apache/activemq/state/ConnectionStateTracker.java
activemq/activemq-apollo/trunk/sandbox/activemq-openwire/src/main/java/org/apache/activemq/transport/ResponseCorrelator.java
activemq/activemq-apollo/trunk/sandbox/activemq-openwire/src/main/java/org/apache/activemq/transport/WireFormatNegotiator.java
activemq/activemq-apollo/trunk/sandbox/activemq-openwire/src/test/java/org/apache/activemq/legacy/openwireprotocol/BrokerBenchmark.java
activemq/activemq-apollo/trunk/sandbox/activemq-openwire/src/test/java/org/apache/activemq/openwire/DataFileGeneratorTestSupport.java
activemq/activemq-apollo/trunk/sandbox/activemq-openwire/src/test/java/org/apache/activemq/openwire/NumberRangesWhileMarshallingTest.java
activemq/activemq-apollo/trunk/sandbox/activemq-spring/src/main/java/org/apache/activemq/xbean/XBeanBrokerFactory.java
activemq/activemq-apollo/trunk/sandbox/activemq-spring/src/test/java/org/apache/activemq/spring/ActiveMQConnectionFactoryFactoryBeanTest.java
activemq/activemq-apollo/trunk/sandbox/activemq-spring/src/test/java/org/apache/activemq/spring/ConsumerBean.java
activemq/activemq-apollo/trunk/sandbox/activemq-spring/src/test/java/org/apache/activemq/spring/SpringConsumer.java
activemq/activemq-apollo/trunk/sandbox/activemq-spring/src/test/java/org/apache/activemq/spring/SpringProducer.java
activemq/activemq-apollo/trunk/sandbox/activemq-spring/src/test/java/org/apache/activemq/spring/SpringTestSupport.java
activemq/activemq-apollo/trunk/sandbox/hawtdb/pom.xml
activemq/activemq-apollo/trunk/sandbox/hawtdb/src/main/java/org/apache/hawtdb/internal/index/HashIndex.java
activemq/activemq-apollo/trunk/sandbox/hawtdb/src/main/java/org/apache/hawtdb/internal/journal/Journal.java
activemq/activemq-apollo/trunk/sandbox/kahadb/pom.xml
activemq/activemq-apollo/trunk/sandbox/kahadb/src/main/java/org/apache/kahadb/index/BTreeIndex.java
activemq/activemq-apollo/trunk/sandbox/kahadb/src/main/java/org/apache/kahadb/index/HashIndex.java
activemq/activemq-apollo/trunk/sandbox/kahadb/src/main/java/org/apache/kahadb/journal/Journal.java
activemq/activemq-apollo/trunk/sandbox/kahadb/src/main/java/org/apache/kahadb/page/PageFile.java
Modified: activemq/activemq-apollo/trunk/apollo-bdb/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-bdb/pom.xml?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-bdb/pom.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-bdb/pom.xml Mon Nov 1 16:54:07 2010
@@ -53,9 +53,9 @@
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>${commons-logging-version}</version>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>${slf4j-version}</version>
</dependency>
<!-- Scala Support -->
@@ -102,10 +102,10 @@
<version>${junit-version}</version>
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>${slf4j-version}</version>
<scope>test</scope>
- <version>${log4j-version}</version>
</dependency>
</dependencies>
Modified: activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/jaxb/PropertiesReader.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/jaxb/PropertiesReader.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/jaxb/PropertiesReader.java (original)
+++ activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/jaxb/PropertiesReader.java Mon Nov 1 16:54:07 2010
@@ -22,8 +22,8 @@ import java.util.regex.Pattern;
import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.util.StreamReaderDelegate;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
*
@@ -32,7 +32,7 @@ import org.apache.commons.logging.LogFac
*/
public class PropertiesReader extends StreamReaderDelegate {
- Log LOG = LogFactory.getLog(PropertiesReader.class);
+ Logger LOG = LoggerFactory.getLogger(PropertiesReader.class);
Pattern pattern = Pattern.compile("\\$\\{([a-zA-Z0-9\\.]*)\\}");
Modified: activemq/activemq-apollo/trunk/apollo-cassandra/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-cassandra/pom.xml?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-cassandra/pom.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-cassandra/pom.xml Mon Nov 1 16:54:07 2010
@@ -58,6 +58,12 @@
<artifactId>hawtbuf-proto</artifactId>
<version>${hawtbuf-version}</version>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>${slf4j-version}</version>
+ </dependency>
+
<!-- Scala Support -->
<dependency>
@@ -102,32 +108,14 @@
<scope>test</scope>
<version>${junit-version}</version>
</dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>${slf4j-version}</version>
- <scope>test</scope>
- </dependency>
+
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
<version>${slf4j-version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- <version>${slf4j-version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
<scope>test</scope>
- <version>${log4j-version}</version>
</dependency>
-
+
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
Modified: activemq/activemq-apollo/trunk/apollo-selector/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-selector/pom.xml?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-selector/pom.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-selector/pom.xml Mon Nov 1 16:54:07 2010
@@ -45,6 +45,12 @@
<version>${hawtbuf-version}</version>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>${slf4j-version}</version>
+ </dependency>
+
<!-- TODO: try to remove this dependency -->
<dependency>
<groupId>org.springframework</groupId>
@@ -67,10 +73,10 @@
<version>${junit-version}</version>
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>${slf4j-version}</version>
<scope>test</scope>
- <version>${log4j-version}</version>
</dependency>
</dependencies>
Modified: activemq/activemq-apollo/trunk/apollo-selector/src/main/java/org/apache/activemq/apollo/filter/XPathExpression.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-selector/src/main/java/org/apache/activemq/apollo/filter/XPathExpression.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-selector/src/main/java/org/apache/activemq/apollo/filter/XPathExpression.java (original)
+++ activemq/activemq-apollo/trunk/apollo-selector/src/main/java/org/apache/activemq/apollo/filter/XPathExpression.java Mon Nov 1 16:54:07 2010
@@ -19,8 +19,8 @@ package org.apache.activemq.apollo.filte
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -28,7 +28,7 @@ import org.apache.commons.logging.LogFac
*/
public final class XPathExpression implements BooleanExpression {
- private static final Log LOG = LogFactory.getLog(XPathExpression.class);
+ private static final Logger LOG = LoggerFactory.getLogger(XPathExpression.class);
private static final String EVALUATOR_SYSTEM_PROPERTY = "org.apache.activemq.XPathEvaluatorClassName";
private static final String DEFAULT_EVALUATOR_CLASS_NAME = XalanXPathEvaluator.class.getName();
Modified: activemq/activemq-apollo/trunk/apollo-selector/src/test/java/org/apache/activemq/apollo/selector/SelectorParserTest.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-selector/src/test/java/org/apache/activemq/apollo/selector/SelectorParserTest.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-selector/src/test/java/org/apache/activemq/apollo/selector/SelectorParserTest.java (original)
+++ activemq/activemq-apollo/trunk/apollo-selector/src/test/java/org/apache/activemq/apollo/selector/SelectorParserTest.java Mon Nov 1 16:54:07 2010
@@ -24,14 +24,14 @@ import org.apache.activemq.apollo.filter
import org.apache.activemq.apollo.filter.LogicExpression;
import org.apache.activemq.apollo.filter.PropertyExpression;
import org.apache.activemq.apollo.filter.XPathExpression;
-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 SelectorParserTest extends TestCase {
- private static final Log LOG = LogFactory.getLog(SelectorParserTest.class);
+ private static final Logger LOG = LoggerFactory.getLogger(SelectorParserTest.class);
public void testParseXPath() throws Exception {
BooleanExpression filter = parse("XPATH '//title[@lang=''eng'']'");
Modified: activemq/activemq-apollo/trunk/apollo-tcp/src/main/java/org/apache/activemq/apollo/transport/tcp/TcpTransport.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-tcp/src/main/java/org/apache/activemq/apollo/transport/tcp/TcpTransport.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-tcp/src/main/java/org/apache/activemq/apollo/transport/tcp/TcpTransport.java (original)
+++ activemq/activemq-apollo/trunk/apollo-tcp/src/main/java/org/apache/activemq/apollo/transport/tcp/TcpTransport.java Mon Nov 1 16:54:07 2010
@@ -20,8 +20,8 @@ import org.apache.activemq.apollo.transp
import org.apache.activemq.apollo.transport.TransportListener;
import org.apache.activemq.apollo.util.JavaBaseService;
import org.apache.activemq.apollo.transport.Transport;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.fusesource.hawtdispatch.Dispatch;
import org.fusesource.hawtdispatch.DispatchQueue;
import org.fusesource.hawtdispatch.DispatchSource;
@@ -41,7 +41,7 @@ import java.util.Map;
*/
public class TcpTransport extends JavaBaseService implements Transport {
- private static final Log LOG = LogFactory.getLog(TcpTransport.class);
+ private static final Logger LOG = LoggerFactory.getLogger(TcpTransport.class);
private Map<String, Object> socketOptions;
Modified: activemq/activemq-apollo/trunk/apollo-tcp/src/main/java/org/apache/activemq/apollo/transport/tcp/TcpTransportFactory.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-tcp/src/main/java/org/apache/activemq/apollo/transport/tcp/TcpTransportFactory.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-tcp/src/main/java/org/apache/activemq/apollo/transport/tcp/TcpTransportFactory.java (original)
+++ activemq/activemq-apollo/trunk/apollo-tcp/src/main/java/org/apache/activemq/apollo/transport/tcp/TcpTransportFactory.java Mon Nov 1 16:54:07 2010
@@ -28,8 +28,8 @@ import org.apache.activemq.apollo.transp
import org.apache.activemq.apollo.transport.TransportServer;
import org.apache.activemq.apollo.util.IntrospectionSupport;
import org.apache.activemq.apollo.util.URISupport;
-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.apollo.transport.TransportFactorySupport.configure;
import static org.apache.activemq.apollo.transport.TransportFactorySupport.verify;
@@ -39,7 +39,7 @@ import static org.apache.activemq.apollo
* @author David Martin Clavo david(dot)martin(dot)clavo(at)gmail.com (logging improvement modifications)
*/
public class TcpTransportFactory implements TransportFactory.Provider {
- private static final Log LOG = LogFactory.getLog(TcpTransportFactory.class);
+ private static final Logger LOG = LoggerFactory.getLogger(TcpTransportFactory.class);
public TransportServer bind(String location) throws Exception {
if( !location.startsWith("tcp:") ) {
Modified: activemq/activemq-apollo/trunk/apollo-transport/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-transport/pom.xml?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-transport/pom.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-transport/pom.xml Mon Nov 1 16:54:07 2010
@@ -34,9 +34,9 @@
<dependencies>
<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>
@@ -65,10 +65,10 @@
<version>${junit-version}</version>
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>${slf4j-version}</version>
<scope>test</scope>
- <version>${log4j-version}</version>
</dependency>
</dependencies>
Modified: activemq/activemq-apollo/trunk/apollo-util/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-util/pom.xml?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-util/pom.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-util/pom.xml Mon Nov 1 16:54:07 2010
@@ -70,10 +70,9 @@
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>${commons-logging-version}</version>
- <optional>true</optional>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>${slf4j-version}</version>
</dependency>
<dependency>
@@ -94,6 +93,10 @@
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -126,10 +129,10 @@
<version>${junit-version}</version>
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>${slf4j-version}</version>
<scope>test</scope>
- <version>${log4j-version}</version>
</dependency>
</dependencies>
Modified: activemq/activemq-apollo/trunk/apollo-util/src/main/scala/org/apache/activemq/apollo/util/Logging.scala
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-util/src/main/scala/org/apache/activemq/apollo/util/Logging.scala?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-util/src/main/scala/org/apache/activemq/apollo/util/Logging.scala (original)
+++ activemq/activemq-apollo/trunk/apollo-util/src/main/scala/org/apache/activemq/apollo/util/Logging.scala Mon Nov 1 16:54:07 2010
@@ -18,15 +18,15 @@ package org.apache.activemq.apollo.util
import _root_.java.util.{LinkedHashMap, HashMap}
import _root_.java.lang.{Throwable, String}
-import _root_.org.apache.commons.logging.LogFactory
-import _root_.org.apache.commons.logging.{Log => Logger}
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.util.concurrent.atomic.AtomicLong
/**
* @author <a href="http://hiramchirino.com">Hiram Chirino</a>
*/
trait Log {
- val log = LogFactory.getLog(getClass.getName.stripSuffix("$"))
+ val log = LoggerFactory.getLogger(getClass.getName.stripSuffix("$"))
}
@@ -35,7 +35,7 @@ trait Log {
*/
class NamedLog(name:String) extends Log {
def this(clazz:Class[_]) = this(clazz.getName.stripSuffix("$"))
- override val log = LogFactory.getLog(name)
+ override val log = LoggerFactory.getLogger(name)
}
/**
Modified: activemq/activemq-apollo/trunk/apollo-util/src/main/scala/org/apache/activemq/apollo/util/ServiceStopper.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-util/src/main/scala/org/apache/activemq/apollo/util/ServiceStopper.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-util/src/main/scala/org/apache/activemq/apollo/util/ServiceStopper.java (original)
+++ activemq/activemq-apollo/trunk/apollo-util/src/main/scala/org/apache/activemq/apollo/util/ServiceStopper.java Mon Nov 1 16:54:07 2010
@@ -19,8 +19,8 @@ package org.apache.activemq.apollo.util;
import java.util.Iterator;
import java.util.List;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* A helper class used to stop a bunch of services, catching and logging any
@@ -91,7 +91,7 @@ public class ServiceStopper {
}
protected void logError(Object service, Throwable e) {
- Log log = LogFactory.getLog(service.getClass());
+ Logger log = LoggerFactory.getLogger(service.getClass());
log.error("Could not stop service: " + service + ". Reason: " + e, e);
}
Modified: activemq/activemq-apollo/trunk/apollo-util/src/main/scala/org/apache/activemq/apollo/util/ServiceSupport.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-util/src/main/scala/org/apache/activemq/apollo/util/ServiceSupport.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-util/src/main/scala/org/apache/activemq/apollo/util/ServiceSupport.java (original)
+++ activemq/activemq-apollo/trunk/apollo-util/src/main/scala/org/apache/activemq/apollo/util/ServiceSupport.java Mon Nov 1 16:54:07 2010
@@ -20,8 +20,8 @@ import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.atomic.AtomicBoolean;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* A helper class for working with services together with a useful base class
@@ -30,7 +30,7 @@ import org.apache.commons.logging.LogFac
* @version $Revision: 1.1 $
*/
public abstract class ServiceSupport implements Service {
- private static final Log LOG = LogFactory.getLog(ServiceSupport.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ServiceSupport.class);
private AtomicBoolean started = new AtomicBoolean(false);
private AtomicBoolean stopping = new AtomicBoolean(false);
Modified: activemq/activemq-apollo/trunk/apollo-util/src/main/scala/org/apache/activemq/apollo/util/jndi/JNDIReferenceFactory.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-util/src/main/scala/org/apache/activemq/apollo/util/jndi/JNDIReferenceFactory.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-util/src/main/scala/org/apache/activemq/apollo/util/jndi/JNDIReferenceFactory.java (original)
+++ activemq/activemq-apollo/trunk/apollo-util/src/main/scala/org/apache/activemq/apollo/util/jndi/JNDIReferenceFactory.java Mon Nov 1 16:54:07 2010
@@ -27,8 +27,8 @@ import javax.naming.Reference;
import javax.naming.StringRefAddr;
import javax.naming.spi.ObjectFactory;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Converts objects implementing JNDIStorable into a property fields so they can
@@ -36,7 +36,7 @@ import org.apache.commons.logging.LogFac
*/
public class JNDIReferenceFactory implements ObjectFactory {
- static Log log = LogFactory.getLog(JNDIReferenceFactory.class);
+ static Logger log = LoggerFactory.getLogger(JNDIReferenceFactory.class);
/**
* This will be called by a JNDIprovider when a Reference is retrieved from
Modified: activemq/activemq-apollo/trunk/apollo-util/src/test/scala/org/apache/activemq/apollo/util/AutoFailTestSupport.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-util/src/test/scala/org/apache/activemq/apollo/util/AutoFailTestSupport.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-util/src/test/scala/org/apache/activemq/apollo/util/AutoFailTestSupport.java (original)
+++ activemq/activemq-apollo/trunk/apollo-util/src/test/scala/org/apache/activemq/apollo/util/AutoFailTestSupport.java Mon Nov 1 16:54:07 2010
@@ -19,8 +19,8 @@ package org.apache.activemq.apollo.util;
import java.util.concurrent.atomic.AtomicBoolean;
import junit.framework.TestCase;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Enforces a test case to run for only an allotted time to prevent them from
@@ -32,7 +32,7 @@ import org.apache.commons.logging.LogFac
public abstract class AutoFailTestSupport extends TestCase {
public static final int EXIT_SUCCESS = 0;
public static final int EXIT_ERROR = 1;
- private static final Log LOG = LogFactory.getLog(AutoFailTestSupport.class);
+ private static final Logger LOG = LoggerFactory.getLogger(AutoFailTestSupport.class);
private long maxTestTime = 5 * 60 * 1000; // 5 mins by default
private Thread autoFailThread;
@@ -77,7 +77,6 @@ public abstract class AutoFailTestSuppor
// which usually means, it has finished its run.
if (!isTestSuccess.get()) {
LOG.error("Test case has exceeded the maximum allotted time to run of: " + getMaxTestTime() + " ms.");
- LOG.fatal("Test case has exceeded the maximum allotted time to run of: " + getMaxTestTime() + " ms.");
System.exit(EXIT_ERROR);
}
}
Modified: activemq/activemq-apollo/trunk/apollo-util/src/test/scala/org/apache/activemq/apollo/util/CombinationTestSupport.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-util/src/test/scala/org/apache/activemq/apollo/util/CombinationTestSupport.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-util/src/test/scala/org/apache/activemq/apollo/util/CombinationTestSupport.java (original)
+++ activemq/activemq-apollo/trunk/apollo-util/src/test/scala/org/apache/activemq/apollo/util/CombinationTestSupport.java Mon Nov 1 16:54:07 2010
@@ -32,8 +32,8 @@ import java.util.Map;
import junit.framework.Test;
import junit.framework.TestSuite;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Poor mans way of getting JUnit to run a test case through a few different
@@ -60,7 +60,7 @@ import org.apache.commons.logging.LogFac
*/
public abstract class CombinationTestSupport extends AutoFailTestSupport {
- private static final Log LOG = LogFactory.getLog(CombinationTestSupport.class);
+ private static final Logger LOG = LoggerFactory.getLogger(CombinationTestSupport.class);
private HashMap<String, ComboOption> comboOptions = new HashMap<String, ComboOption>();
private boolean combosEvaluated;
Modified: activemq/activemq-apollo/trunk/apollo-util/src/test/scala/org/apache/activemq/apollo/util/MessageIdList.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-util/src/test/scala/org/apache/activemq/apollo/util/MessageIdList.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-util/src/test/scala/org/apache/activemq/apollo/util/MessageIdList.java (original)
+++ activemq/activemq-apollo/trunk/apollo-util/src/test/scala/org/apache/activemq/apollo/util/MessageIdList.java Mon Nov 1 16:54:07 2010
@@ -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/activemq-apollo/trunk/apollo-util/src/test/scala/org/apache/activemq/apollo/util/SocketProxy.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-util/src/test/scala/org/apache/activemq/apollo/util/SocketProxy.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-util/src/test/scala/org/apache/activemq/apollo/util/SocketProxy.java (original)
+++ activemq/activemq-apollo/trunk/apollo-util/src/test/scala/org/apache/activemq/apollo/util/SocketProxy.java Mon Nov 1 16:54:07 2010
@@ -31,12 +31,12 @@ import java.util.List;
import java.util.concurrent.CountDownLatch;
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 = 1000;
Modified: activemq/activemq-apollo/trunk/apollo-website/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-website/pom.xml?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-website/pom.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-website/pom.xml Mon Nov 1 16:54:07 2010
@@ -61,7 +61,6 @@
<artifactId>scalamd</artifactId>
<version>${scalamd-version}</version>
</dependency>
-
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
@@ -75,6 +74,7 @@
<version>${scalate-version}</version>
<scope>test</scope>
</dependency>
+
</dependencies>
<build>
Modified: activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/jaxb/JAXBComplexConfigTest.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/jaxb/JAXBComplexConfigTest.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/jaxb/JAXBComplexConfigTest.java (original)
+++ activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/jaxb/JAXBComplexConfigTest.java Mon Nov 1 16:54:07 2010
@@ -24,15 +24,15 @@ import junit.framework.TestCase;
import org.apache.activemq.apollo.broker.Broker;
import org.apache.activemq.apollo.broker.BrokerFactory;
import org.apache.activemq.broker.store.kahadb.KahaDBStore;
-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;
public class JAXBComplexConfigTest extends TestCase {
- private static final Log LOG = LogFactory.getLog(JAXBComplexConfigTest.class);
+ private static final Logger LOG = LoggerFactory.getLogger(JAXBComplexConfigTest.class);
Broker broker;
Modified: activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/ActiveMQInputStreamTest.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/ActiveMQInputStreamTest.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/ActiveMQInputStreamTest.java (original)
+++ activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/ActiveMQInputStreamTest.java Mon Nov 1 16:54:07 2010
@@ -1,89 +1,89 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.activemq.legacy;
-
-import java.io.InputStream;
-import java.io.OutputStream;
-
-import javax.jms.Queue;
-import javax.jms.Session;
-
-import junit.framework.TestCase;
-
-import org.apache.activemq.ActiveMQConnection;
-import org.apache.activemq.ActiveMQConnectionFactory;
-import org.apache.activemq.command.ActiveMQDestination;
-import org.apache.activemq.legacy.broker.BrokerService;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-public class ActiveMQInputStreamTest extends TestCase {
-
- private static final Log LOG = LogFactory.getLog(ActiveMQInputStreamTest.class);
-
- private static final String BROKER_URL = "tcp://localhost:61616";
- private static final String DESTINATION = "destination";
- private static final int STREAM_LENGTH = 64 * 1024 + 0; // change 0 to 1 to make it not crash
-
- public void testInputStreamMatchesDefaultChuckSize() throws Exception {
- BrokerService broker = new BrokerService();
- broker.setUseJmx(false);
- broker.setPersistent(false);
- broker.setDestinations(new ActiveMQDestination[] {
- ActiveMQDestination.createDestination(DESTINATION, ActiveMQDestination.QUEUE_TYPE),
- });
- broker.addConnector(BROKER_URL);
- broker.start();
-
- ActiveMQConnectionFactory connectionFactory = new ActiveMQConnectionFactory(BROKER_URL);
- ActiveMQConnection connection = (ActiveMQConnection) connectionFactory.createConnection();
- Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
- Queue destination = session.createQueue(DESTINATION);
-
- OutputStream out = null;
- try {
- out = connection.createOutputStream(destination);
- LOG.debug("writing...");
- for (int i = 0; i < STREAM_LENGTH; ++i) {
- out.write(0);
- }
- LOG.debug("wrote " + STREAM_LENGTH + " bytes");
- } finally {
- if (out != null) {
- out.close();
- }
- }
-
- InputStream in = null;
- try {
- in = connection.createInputStream(destination);
- LOG.debug("reading...");
- int count = 0;
- while (-1 != in.read()) {
- ++count;
- }
- LOG.debug("read " + count + " bytes");
- } finally {
- if (in != null) {
- in.close();
- }
- }
-
- connection.close();
- broker.stop();
- }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.legacy;
+
+import java.io.InputStream;
+import java.io.OutputStream;
+
+import javax.jms.Queue;
+import javax.jms.Session;
+
+import junit.framework.TestCase;
+
+import org.apache.activemq.ActiveMQConnection;
+import org.apache.activemq.ActiveMQConnectionFactory;
+import org.apache.activemq.command.ActiveMQDestination;
+import org.apache.activemq.legacy.broker.BrokerService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class ActiveMQInputStreamTest extends TestCase {
+
+ private static final Logger LOG = LoggerFactory.getLogger(ActiveMQInputStreamTest.class);
+
+ private static final String BROKER_URL = "tcp://localhost:61616";
+ private static final String DESTINATION = "destination";
+ private static final int STREAM_LENGTH = 64 * 1024 + 0; // change 0 to 1 to make it not crash
+
+ public void testInputStreamMatchesDefaultChuckSize() throws Exception {
+ BrokerService broker = new BrokerService();
+ broker.setUseJmx(false);
+ broker.setPersistent(false);
+ broker.setDestinations(new ActiveMQDestination[] {
+ ActiveMQDestination.createDestination(DESTINATION, ActiveMQDestination.QUEUE_TYPE),
+ });
+ broker.addConnector(BROKER_URL);
+ broker.start();
+
+ ActiveMQConnectionFactory connectionFactory = new ActiveMQConnectionFactory(BROKER_URL);
+ ActiveMQConnection connection = (ActiveMQConnection) connectionFactory.createConnection();
+ Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
+ Queue destination = session.createQueue(DESTINATION);
+
+ OutputStream out = null;
+ try {
+ out = connection.createOutputStream(destination);
+ LOG.debug("writing...");
+ for (int i = 0; i < STREAM_LENGTH; ++i) {
+ out.write(0);
+ }
+ LOG.debug("wrote " + STREAM_LENGTH + " bytes");
+ } finally {
+ if (out != null) {
+ out.close();
+ }
+ }
+
+ InputStream in = null;
+ try {
+ in = connection.createInputStream(destination);
+ LOG.debug("reading...");
+ int count = 0;
+ while (-1 != in.read()) {
+ ++count;
+ }
+ LOG.debug("read " + count + " bytes");
+ } finally {
+ if (in != null) {
+ in.close();
+ }
+ }
+
+ connection.close();
+ broker.stop();
+ }
+}
Modified: activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/LargeStreamletTest.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/LargeStreamletTest.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/LargeStreamletTest.java (original)
+++ activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/LargeStreamletTest.java Mon Nov 1 16:54:07 2010
@@ -47,15 +47,15 @@ import junit.framework.TestCase;
import org.apache.activemq.ActiveMQConnection;
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;
/**
* @author rnewson
*/
public final class LargeStreamletTest extends TestCase {
- private static final Log LOG = LogFactory.getLog(LargeStreamletTest.class);
+ private static final Logger LOG = LoggerFactory.getLogger(LargeStreamletTest.class);
private static final String BROKER_URL = "vm://localhost?broker.persistent=false";
private static final int BUFFER_SIZE = 1 * 1024;
private static final int MESSAGE_COUNT = 10 * 1024;
Modified: activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/MessageListenerRedeliveryTest.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/MessageListenerRedeliveryTest.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/MessageListenerRedeliveryTest.java (original)
+++ activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/MessageListenerRedeliveryTest.java Mon Nov 1 16:54:07 2010
@@ -33,12 +33,12 @@ import junit.framework.TestCase;
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.activemq.ActiveMQMessageConsumer;
import org.apache.activemq.RedeliveryPolicy;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class MessageListenerRedeliveryTest extends TestCase {
- private static final Log LOG = LogFactory.getLog(MessageListenerRedeliveryTest.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MessageListenerRedeliveryTest.class);
private Connection connection;
Modified: activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/SpringTest.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/SpringTest.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/SpringTest.java (original)
+++ activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/SpringTest.java Mon Nov 1 16:54:07 2010
@@ -24,14 +24,14 @@ import junit.framework.TestCase;
import org.apache.activemq.spring.SpringConsumer;
import org.apache.activemq.spring.SpringProducer;
-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 SpringTest 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;
Modified: activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/SpringTestSupport.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/SpringTestSupport.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/SpringTestSupport.java (original)
+++ activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/SpringTestSupport.java Mon Nov 1 16:54:07 2010
@@ -22,8 +22,8 @@ import java.util.HashSet;
import java.util.Set;
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;
/**
Modified: activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/AMQ1866.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/AMQ1866.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/AMQ1866.java (original)
+++ activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/AMQ1866.java Mon Nov 1 16:54:07 2010
@@ -33,8 +33,8 @@ import org.apache.activemq.command.Activ
import org.apache.activemq.legacy.broker.BrokerService;
import org.apache.activemq.legacy.broker.region.policy.PolicyEntry;
import org.apache.activemq.legacy.broker.region.policy.PolicyMap;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* This is a test case for the issue reported at:
@@ -46,7 +46,7 @@ import org.apache.commons.logging.LogFac
*/
public class AMQ1866 extends TestCase {
- private static final Log log = LogFactory.getLog(ConsumerThread.class);
+ private static final Logger log = LoggerFactory.getLogger(ConsumerThread.class);
private BrokerService brokerService;
private ArrayList<Thread> threads = new ArrayList<Thread>();
Modified: activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/AMQ2021Test.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/AMQ2021Test.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/AMQ2021Test.java (original)
+++ activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/AMQ2021Test.java Mon Nov 1 16:54:07 2010
@@ -38,8 +38,8 @@ import org.apache.activemq.ActiveMQConne
import org.apache.activemq.command.ActiveMQQueue;
import org.apache.activemq.command.ActiveMQTopic;
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;
/**
* This is a test case for the issue reported at:
@@ -49,7 +49,7 @@ import org.apache.commons.logging.LogFac
*/
public class AMQ2021Test extends TestCase implements ExceptionListener, UncaughtExceptionHandler {
- private static final Log log = LogFactory.getLog(AMQ2021Test.class);
+ private static final Logger log = LoggerFactory.getLogger(AMQ2021Test.class);
BrokerService brokerService;
ArrayList<Thread> threads = new ArrayList<Thread>();
Vector<Throwable> exceptions;
Modified: activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/AMQ2102Test.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/AMQ2102Test.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/AMQ2102Test.java (original)
+++ activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/AMQ2102Test.java Mon Nov 1 16:54:07 2010
@@ -43,8 +43,8 @@ import org.apache.activemq.ActiveMQConne
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.activemq.RedeliveryPolicy;
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 AMQ2102Test extends TestCase implements UncaughtExceptionHandler {
@@ -53,7 +53,7 @@ public class AMQ2102Test extends TestCas
final static int CONSUME_ALL = -1;
- private static final Log LOG = LogFactory.getLog(AMQ2102Test.class);
+ private static final Logger LOG = LoggerFactory.getLogger(AMQ2102Test.class);
private final static Map<Thread, Throwable> exceptions = new ConcurrentHashMap<Thread, Throwable>();
Modified: activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/ConnectionPerMessageTest.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/ConnectionPerMessageTest.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/ConnectionPerMessageTest.java (original)
+++ activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/ConnectionPerMessageTest.java Mon Nov 1 16:54:07 2010
@@ -29,12 +29,12 @@ import javax.jms.Topic;
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.activemq.legacy.broker.BrokerService;
import org.apache.activemq.legacy.test4.EmbeddedBrokerTestSupport;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class ConnectionPerMessageTest extends EmbeddedBrokerTestSupport {
- private static final Log LOG = LogFactory.getLog(ConnectionPerMessageTest.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ConnectionPerMessageTest.class);
private static final int COUNT = 20000;
protected String bindAddress;
Modified: activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/DurableConsumerTest.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/DurableConsumerTest.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/DurableConsumerTest.java (original)
+++ activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/DurableConsumerTest.java Mon Nov 1 16:54:07 2010
@@ -38,15 +38,15 @@ import junit.framework.TestCase;
import org.apache.activemq.ActiveMQConnection;
import org.apache.activemq.ActiveMQConnectionFactory;
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;
/**
* @version $Revision: 1.5 $
* A Test case for AMQ-1479
*/
public class DurableConsumerTest extends TestCase {
- private static final Log LOG = LogFactory.getLog(DurableConsumerTest.class);
+ private static final Logger LOG = LoggerFactory.getLogger(DurableConsumerTest.class);
private static int COUNT = 1024*10;
private static String CONSUMER_NAME = "DURABLE_TEST";
protected BrokerService broker;
Modified: activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/JmsDurableTopicSlowReceiveTest.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/JmsDurableTopicSlowReceiveTest.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/JmsDurableTopicSlowReceiveTest.java (original)
+++ activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/JmsDurableTopicSlowReceiveTest.java Mon Nov 1 16:54:07 2010
@@ -31,8 +31,8 @@ import javax.jms.TopicSubscriber;
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.activemq.apollo.test3.JmsTopicSendReceiveTest;
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;
/**
* @version $Revision: 1.5 $
@@ -41,7 +41,7 @@ public class JmsDurableTopicSlowReceiveT
static final int NMSG = 200;
static final int MSIZE = 256000;
- private static final transient Log LOG = LogFactory.getLog(JmsDurableTopicSlowReceiveTest.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(JmsDurableTopicSlowReceiveTest.class);
private static final String COUNT_PROPERY_NAME = "count";
protected Connection connection2;
Modified: activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/MissingDataFileTest.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/MissingDataFileTest.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/MissingDataFileTest.java (original)
+++ activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/MissingDataFileTest.java Mon Nov 1 16:54:07 2010
@@ -29,8 +29,8 @@ import junit.framework.TestCase;
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.activemq.legacy.broker.BrokerService;
import org.apache.activemq.legacy.usage.SystemUsage;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/*
* Try and replicate:
@@ -42,7 +42,7 @@ import org.apache.commons.logging.LogFac
public class MissingDataFileTest extends TestCase {
- private static final Log LOG = LogFactory.getLog(MissingDataFileTest.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MissingDataFileTest.class);
private static int counter = 300;
Modified: activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/QueueWorkerPrefetchTest.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/QueueWorkerPrefetchTest.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/QueueWorkerPrefetchTest.java (original)
+++ activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/QueueWorkerPrefetchTest.java Mon Nov 1 16:54:07 2010
@@ -37,15 +37,15 @@ import junit.framework.TestCase;
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.activemq.ActiveMQPrefetchPolicy;
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;
/**
* Test case demonstrating situation where messages are not delivered to consumers.
*/
public class QueueWorkerPrefetchTest extends TestCase implements MessageListener
{
- private static final Log LOG = LogFactory.getLog(QueueWorkerPrefetchTest.class);
+ private static final Logger LOG = LoggerFactory.getLogger(QueueWorkerPrefetchTest.class);
private static final int BATCH_SIZE = 10;
private static final long WAIT_TIMEOUT = 1000*10;
Modified: activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/SlowConsumerTest.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/SlowConsumerTest.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/SlowConsumerTest.java (original)
+++ activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/SlowConsumerTest.java Mon Nov 1 16:54:07 2010
@@ -33,12 +33,12 @@ import junit.framework.TestCase;
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.activemq.command.ActiveMQQueue;
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 SlowConsumerTest extends TestCase {
- private static final Log LOG = LogFactory.getLog(SlowConsumerTest.class);
+ private static final Logger LOG = LoggerFactory.getLogger(SlowConsumerTest.class);
private static final int MESSAGES_COUNT = 10000;
protected int messageLogFrequency = 2500;
Modified: activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/TransactionNotStartedErrorTest.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/TransactionNotStartedErrorTest.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/TransactionNotStartedErrorTest.java (original)
+++ activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/TransactionNotStartedErrorTest.java Mon Nov 1 16:54:07 2010
@@ -27,8 +27,8 @@ import javax.jms.Session;
import junit.framework.TestCase;
import org.apache.activemq.ActiveMQConnectionFactory;
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;
/*
* simulate message flow which cause the following exception in the broker
@@ -42,7 +42,7 @@ import org.apache.commons.logging.LogFac
*/
public class TransactionNotStartedErrorTest extends TestCase {
- private static final Log LOG = LogFactory.getLog(TransactionNotStartedErrorTest.class);
+ private static final Logger LOG = LoggerFactory.getLogger(TransactionNotStartedErrorTest.class);
private static int counter = 500;
Modified: activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/VerifySteadyEnqueueRate.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/VerifySteadyEnqueueRate.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/VerifySteadyEnqueueRate.java (original)
+++ activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/bugs/VerifySteadyEnqueueRate.java Mon Nov 1 16:54:07 2010
@@ -29,12 +29,12 @@ import junit.framework.TestCase;
import org.apache.activemq.ActiveMQConnectionFactory;
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 VerifySteadyEnqueueRate extends TestCase {
- private static final Log LOG = LogFactory
+ private static final Logger LOG = LogFactory
.getLog(VerifySteadyEnqueueRate.class);
private static int max_messages = 1000000;
Modified: activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/test4/ReconnectWithSameClientIDTest.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/test4/ReconnectWithSameClientIDTest.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/test4/ReconnectWithSameClientIDTest.java (original)
+++ activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/test4/ReconnectWithSameClientIDTest.java Mon Nov 1 16:54:07 2010
@@ -21,14 +21,14 @@ import javax.jms.InvalidClientIDExceptio
import javax.jms.JMSException;
import javax.jms.Session;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
*
*/
public class ReconnectWithSameClientIDTest extends EmbeddedBrokerTestSupport {
- private static final Log LOG = LogFactory.getLog(ReconnectWithSameClientIDTest.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ReconnectWithSameClientIDTest.class);
protected Connection connection;
protected boolean transacted;
Modified: activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/test4/TemporaryDestinationToFromNameTest.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/test4/TemporaryDestinationToFromNameTest.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/test4/TemporaryDestinationToFromNameTest.java (original)
+++ activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/test4/TemporaryDestinationToFromNameTest.java Mon Nov 1 16:54:07 2010
@@ -20,15 +20,15 @@ import javax.jms.Queue;
import javax.jms.Session;
import javax.jms.Topic;
-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 TemporaryDestinationToFromNameTest extends EmbeddedBrokerAndConnectionTestSupport {
- private static final Log LOG = LogFactory.getLog(TemporaryDestinationToFromNameTest.class);
+ private static final Logger LOG = LoggerFactory.getLogger(TemporaryDestinationToFromNameTest.class);
public void testCreateTemporaryQueueThenCreateAQueueFromItsName() throws Exception {
Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
Modified: activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/test4/ZeroPrefetchConsumerTest.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/test4/ZeroPrefetchConsumerTest.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/test4/ZeroPrefetchConsumerTest.java (original)
+++ activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/test4/ZeroPrefetchConsumerTest.java Mon Nov 1 16:54:07 2010
@@ -28,14 +28,14 @@ import javax.jms.TextMessage;
import org.apache.activemq.command.ActiveMQQueue;
import org.apache.activemq.spring.SpringConsumer;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
*/
public class ZeroPrefetchConsumerTest extends EmbeddedBrokerTestSupport {
- private static final Log LOG = LogFactory.getLog(ZeroPrefetchConsumerTest.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ZeroPrefetchConsumerTest.class);
protected Connection connection;
protected Queue queue;
Modified: activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/test4/rollback/CloseRollbackRedeliveryQueueTest.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/test4/rollback/CloseRollbackRedeliveryQueueTest.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/test4/rollback/CloseRollbackRedeliveryQueueTest.java (original)
+++ activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/test4/rollback/CloseRollbackRedeliveryQueueTest.java Mon Nov 1 16:54:07 2010
@@ -26,13 +26,13 @@ import javax.jms.TextMessage;
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.activemq.legacy.test4.EmbeddedBrokerTestSupport;
-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.MessageCreator;
public class CloseRollbackRedeliveryQueueTest extends EmbeddedBrokerTestSupport {
- private static final transient Log LOG = LogFactory.getLog(CloseRollbackRedeliveryQueueTest.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(CloseRollbackRedeliveryQueueTest.class);
protected int numberOfMessagesOnQueue = 1;
private Connection connection;
Modified: activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/test4/rollback/DelegatingTransactionalMessageListener.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/test4/rollback/DelegatingTransactionalMessageListener.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/test4/rollback/DelegatingTransactionalMessageListener.java (original)
+++ activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/test4/rollback/DelegatingTransactionalMessageListener.java Mon Nov 1 16:54:07 2010
@@ -24,11 +24,11 @@ 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;
public class DelegatingTransactionalMessageListener implements MessageListener {
- private static final transient Log LOG = LogFactory.getLog(DelegatingTransactionalMessageListener.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(DelegatingTransactionalMessageListener.class);
private final MessageListener underlyingListener;
private boolean transacted = true;
Modified: activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/test4/rollback/RollbacksWhileConsumingLargeQueueTest.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/test4/rollback/RollbacksWhileConsumingLargeQueueTest.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/test4/rollback/RollbacksWhileConsumingLargeQueueTest.java (original)
+++ activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/test4/rollback/RollbacksWhileConsumingLargeQueueTest.java Mon Nov 1 16:54:07 2010
@@ -29,15 +29,15 @@ import javax.jms.Session;
import javax.jms.TextMessage;
import org.apache.activemq.legacy.test4.EmbeddedBrokerTestSupport;
-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.MessageCreator;
/**
*/
public class RollbacksWhileConsumingLargeQueueTest extends EmbeddedBrokerTestSupport implements MessageListener {
- private static final transient Log LOG = LogFactory.getLog(RollbacksWhileConsumingLargeQueueTest.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(RollbacksWhileConsumingLargeQueueTest.class);
protected int numberOfMessagesOnQueue = 650;
private Connection connection;
Modified: activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/test5/LargeMessageTestSupport.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/test5/LargeMessageTestSupport.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/test5/LargeMessageTestSupport.java (original)
+++ activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/test5/LargeMessageTestSupport.java Mon Nov 1 16:54:07 2010
@@ -37,8 +37,8 @@ import org.apache.activemq.command.Activ
import org.apache.activemq.command.ActiveMQQueue;
import org.apache.activemq.command.ActiveMQTopic;
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.4 $
@@ -48,7 +48,7 @@ public class LargeMessageTestSupport ext
protected static final int LARGE_MESSAGE_SIZE = 128 * 1024;
protected static final int MESSAGE_COUNT = 100;
- private static final Log LOG = LogFactory.getLog(LargeMessageTestSupport.class);
+ private static final Logger LOG = LoggerFactory.getLogger(LargeMessageTestSupport.class);
protected Connection producerConnection;
protected Connection consumerConnection;
Modified: activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/TopicClusterTest.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/TopicClusterTest.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/TopicClusterTest.java (original)
+++ activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/TopicClusterTest.java Mon Nov 1 16:54:07 2010
@@ -41,8 +41,8 @@ import org.apache.activemq.command.Activ
import org.apache.activemq.legacy.broker.BrokerService;
import org.apache.activemq.legacy.broker.TransportConnector;
import org.apache.activemq.util.ServiceStopper;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
*/
@@ -50,7 +50,7 @@ public class TopicClusterTest extends Te
protected static final int MESSAGE_COUNT = 50;
protected static final int NUMBER_IN_CLUSTER = 3;
- private static final Log LOG = LogFactory.getLog(TopicClusterTest.class);
+ private static final Logger LOG = LoggerFactory.getLogger(TopicClusterTest.class);
protected Destination destination;
protected boolean topic = true;