svn commit: r1069405 [4/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...

[de...@apache.org]

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/JDBCTopicMessageStore.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/JDBCTopicMessageStore.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/JDBCTopicMessageStore.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/JDBCTopicMessageStore.java Thu Feb 10 14:24:01 2011
@@ -35,15 +35,15 @@ import org.apache.activemq.store.TopicMe
 import org.apache.activemq.util.ByteSequence;
 import org.apache.activemq.util.IOExceptionSupport;
 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;
 
 /**
  * @version $Revision: 1.6 $
  */
 public class JDBCTopicMessageStore extends JDBCMessageStore implements TopicMessageStore {
 
-    private static final Log LOG = LogFactory.getLog(JDBCTopicMessageStore.class);
+    private static final Logger LOG = LoggerFactory.getLogger(JDBCTopicMessageStore.class);
     private Map<String, LastRecovered> subscriberLastRecoveredMap = new ConcurrentHashMap<String, LastRecovered>();
 
     public JDBCTopicMessageStore(JDBCPersistenceAdapter persistenceAdapter, JDBCAdapter adapter, WireFormat wireFormat, ActiveMQTopic topic, ActiveMQMessageAudit audit) {

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/TransactionContext.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/TransactionContext.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/TransactionContext.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/TransactionContext.java Thu Feb 10 14:24:01 2011
@@ -25,8 +25,8 @@ import java.sql.Statement;
 import javax.sql.DataSource;
 
 import org.apache.activemq.util.IOExceptionSupport;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Helps keep track of the current transaction/JDBC connection.
@@ -35,7 +35,7 @@ import org.apache.commons.logging.LogFac
  */
 public class TransactionContext {
 
-    private static final Log LOG = LogFactory.getLog(TransactionContext.class);
+    private static final Logger LOG = LoggerFactory.getLogger(TransactionContext.class);
 
     private final DataSource dataSource;
     private Connection connection;

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/DefaultJDBCAdapter.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/DefaultJDBCAdapter.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/DefaultJDBCAdapter.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/DefaultJDBCAdapter.java Thu Feb 10 14:24:01 2011
@@ -38,8 +38,8 @@ import org.apache.activemq.store.jdbc.JD
 import org.apache.activemq.store.jdbc.JDBCPersistenceAdapter;
 import org.apache.activemq.store.jdbc.Statements;
 import org.apache.activemq.store.jdbc.TransactionContext;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Implements all the default JDBC operations that are used by the JDBCPersistenceAdapter. <p/> sub-classing is
@@ -55,7 +55,7 @@ import org.apache.commons.logging.LogFac
  * @version $Revision: 1.10 $
  */
 public class DefaultJDBCAdapter implements JDBCAdapter {
-    private static final Log LOG = LogFactory.getLog(DefaultJDBCAdapter.class);
+    private static final Logger LOG = LoggerFactory.getLogger(DefaultJDBCAdapter.class);
     public static final int MAX_ROWS = 10000;
     protected Statements statements;
     protected boolean batchStatments = true;

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/TransactDatabaseLocker.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/TransactDatabaseLocker.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/TransactDatabaseLocker.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/TransactDatabaseLocker.java Thu Feb 10 14:24:01 2011
@@ -23,8 +23,8 @@ import java.sql.SQLException;
 
 import org.apache.activemq.store.jdbc.DefaultDatabaseLocker;
 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;
 
 /**
  * Represents an exclusive lock on a database to avoid multiple brokers running
@@ -34,7 +34,7 @@ import org.apache.commons.logging.LogFac
  * @version $Revision$
  */
 public class TransactDatabaseLocker extends DefaultDatabaseLocker {
-    private static final Log LOG = LogFactory.getLog(TransactDatabaseLocker.class);
+    private static final Logger LOG = LoggerFactory.getLogger(TransactDatabaseLocker.class);
     
     public TransactDatabaseLocker() {
     }

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/journal/JournalMessageStore.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/journal/JournalMessageStore.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/journal/JournalMessageStore.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/journal/JournalMessageStore.java Thu Feb 10 14:24:01 2011
@@ -43,8 +43,8 @@ import org.apache.activemq.usage.MemoryU
 import org.apache.activemq.usage.SystemUsage;
 import org.apache.activemq.util.Callback;
 import org.apache.activemq.util.TransactionTemplate;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * A MessageStore that uses a Journal to store it's messages.
@@ -53,7 +53,7 @@ import org.apache.commons.logging.LogFac
  */
 public class JournalMessageStore extends AbstractMessageStore {
 
-    private static final Log LOG = LogFactory.getLog(JournalMessageStore.class);
+    private static final Logger LOG = LoggerFactory.getLogger(JournalMessageStore.class);
 
     protected final JournalPersistenceAdapter peristenceAdapter;
     protected final JournalTransactionStore transactionStore;

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/journal/JournalPersistenceAdapter.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/journal/JournalPersistenceAdapter.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/journal/JournalPersistenceAdapter.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/journal/JournalPersistenceAdapter.java Thu Feb 10 14:24:01 2011
@@ -70,8 +70,8 @@ import org.apache.activemq.usage.UsageLi
 import org.apache.activemq.util.ByteSequence;
 import org.apache.activemq.util.IOExceptionSupport;
 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;
 
 /**
  * An implementation of {@link PersistenceAdapter} designed for use with a
@@ -86,7 +86,7 @@ public class JournalPersistenceAdapter i
     private BrokerService brokerService;
 	
     protected Scheduler scheduler;
-    private static final Log LOG = LogFactory.getLog(JournalPersistenceAdapter.class);
+    private static final Logger LOG = LoggerFactory.getLogger(JournalPersistenceAdapter.class);
 
     private Journal journal;
     private PersistenceAdapter longTermPersistence;

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/journal/JournalPersistenceAdapterFactory.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/journal/JournalPersistenceAdapterFactory.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/journal/JournalPersistenceAdapterFactory.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/journal/JournalPersistenceAdapterFactory.java Thu Feb 10 14:24:01 2011
@@ -29,8 +29,8 @@ import org.apache.activemq.store.jdbc.JD
 import org.apache.activemq.store.jdbc.JDBCPersistenceAdapter;
 import org.apache.activemq.store.jdbc.Statements;
 import org.apache.activemq.thread.TaskRunnerFactory;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Factory class that can create PersistenceAdapter objects.
@@ -42,7 +42,7 @@ public class JournalPersistenceAdapterFa
 
     private static final int JOURNAL_LOCKED_WAIT_DELAY = 10 * 1000;
 
-    private static final Log LOG = LogFactory.getLog(JournalPersistenceAdapterFactory.class);
+    private static final Logger LOG = LoggerFactory.getLogger(JournalPersistenceAdapterFactory.class);
 
     private int journalLogFileSize = 1024 * 1024 * 20;
     private int journalLogFiles = 2;

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/journal/JournalTopicMessageStore.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/journal/JournalTopicMessageStore.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/journal/JournalTopicMessageStore.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/journal/JournalTopicMessageStore.java Thu Feb 10 14:24:01 2011
@@ -33,8 +33,8 @@ import org.apache.activemq.store.TopicMe
 import org.apache.activemq.transaction.Synchronization;
 import org.apache.activemq.util.Callback;
 import org.apache.activemq.util.SubscriptionKey;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * A MessageStore that uses a Journal to store it's messages.
@@ -43,7 +43,7 @@ import org.apache.commons.logging.LogFac
  */
 public class JournalTopicMessageStore extends JournalMessageStore implements TopicMessageStore {
 
-    private static final Log LOG = LogFactory.getLog(JournalTopicMessageStore.class);
+    private static final Logger LOG = LoggerFactory.getLogger(JournalTopicMessageStore.class);
 
     private TopicMessageStore longTermStore;
     private HashMap<SubscriptionKey, MessageId> ackedLastAckLocations = new HashMap<SubscriptionKey, MessageId>();

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadaptor/KahaPersistenceAdapter.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadaptor/KahaPersistenceAdapter.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadaptor/KahaPersistenceAdapter.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadaptor/KahaPersistenceAdapter.java Thu Feb 10 14:24:01 2011
@@ -50,8 +50,8 @@ import org.apache.activemq.store.TopicMe
 import org.apache.activemq.store.TransactionStore;
 import org.apache.activemq.usage.SystemUsage;
 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;
 
 /**
  * @org.apache.xbean.XBean
@@ -60,7 +60,7 @@ import org.apache.commons.logging.LogFac
 public class KahaPersistenceAdapter implements PersistenceAdapter, BrokerServiceAware {
 
     private static final int STORE_LOCKED_WAIT_DELAY = 10 * 1000;
-    private static final Log LOG = LogFactory.getLog(KahaPersistenceAdapter.class);
+    private static final Logger LOG = LoggerFactory.getLogger(KahaPersistenceAdapter.class);
     private static final String PREPARED_TRANSACTIONS_NAME = "PreparedTransactions";
 
     protected OpenWireFormat wireFormat = new OpenWireFormat();

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadaptor/KahaReferenceStore.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadaptor/KahaReferenceStore.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadaptor/KahaReferenceStore.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadaptor/KahaReferenceStore.java Thu Feb 10 14:24:01 2011
@@ -34,8 +34,8 @@ import org.apache.activemq.kaha.StoreEnt
 import org.apache.activemq.store.AbstractMessageStore;
 import org.apache.activemq.store.MessageRecoveryListener;
 import org.apache.activemq.store.ReferenceStore;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * @author rajdavies
@@ -43,7 +43,7 @@ import org.apache.commons.logging.LogFac
  */
 public class KahaReferenceStore extends AbstractMessageStore implements ReferenceStore {
 
-    private static final Log LOG = LogFactory.getLog(KahaReferenceStore.class);
+    private static final Logger LOG = LoggerFactory.getLogger(KahaReferenceStore.class);
     protected final MapContainer<MessageId, ReferenceRecord> messageContainer;
     protected KahaReferenceStoreAdapter adapter;
     // keep track of dispatched messages so that duplicate sends that follow a successful

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadaptor/KahaReferenceStoreAdapter.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadaptor/KahaReferenceStoreAdapter.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadaptor/KahaReferenceStoreAdapter.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadaptor/KahaReferenceStoreAdapter.java Thu Feb 10 14:24:01 2011
@@ -48,14 +48,14 @@ import org.apache.activemq.store.TopicMe
 import org.apache.activemq.store.TopicReferenceStore;
 import org.apache.activemq.store.amq.AMQTx;
 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 class KahaReferenceStoreAdapter extends KahaPersistenceAdapter implements ReferenceStoreAdapter {
 
     
 
-    private static final Log LOG = LogFactory.getLog(KahaReferenceStoreAdapter.class);
+    private static final Logger LOG = LoggerFactory.getLogger(KahaReferenceStoreAdapter.class);
     private static final String STORE_STATE = "store-state";
     private static final String QUEUE_DATA = "queue-data";
     private static final String INDEX_VERSION_NAME = "INDEX_VERSION";

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadaptor/KahaTopicReferenceStore.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadaptor/KahaTopicReferenceStore.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadaptor/KahaTopicReferenceStore.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadaptor/KahaTopicReferenceStore.java Thu Feb 10 14:24:01 2011
@@ -38,11 +38,11 @@ import org.apache.activemq.kaha.Store;
 import org.apache.activemq.kaha.StoreEntry;
 import org.apache.activemq.store.MessageRecoveryListener;
 import org.apache.activemq.store.TopicReferenceStore;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class KahaTopicReferenceStore extends KahaReferenceStore implements TopicReferenceStore {
-    private static final Log LOG = LogFactory.getLog(KahaTopicReferenceStore.class);
+    private static final Logger LOG = LoggerFactory.getLogger(KahaTopicReferenceStore.class);
     protected ListContainer<TopicSubAck> ackContainer;
     protected Map<String, TopicSubContainer> subscriberMessages = new ConcurrentHashMap<String, TopicSubContainer>();
     private MapContainer<String, SubscriptionInfo> subscriberContainer;

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadaptor/KahaTransaction.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadaptor/KahaTransaction.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadaptor/KahaTransaction.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadaptor/KahaTransaction.java Thu Feb 10 14:24:01 2011
@@ -24,8 +24,8 @@ import org.apache.activemq.command.BaseC
 import org.apache.activemq.command.Message;
 import org.apache.activemq.command.MessageAck;
 import org.apache.activemq.store.MessageStore;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Stores a messages/acknowledgements for a transaction

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadaptor/KahaTransactionStore.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadaptor/KahaTransactionStore.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadaptor/KahaTransactionStore.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadaptor/KahaTransactionStore.java Thu Feb 10 14:24:01 2011
@@ -36,8 +36,8 @@ import org.apache.activemq.store.ProxyTo
 import org.apache.activemq.store.TopicMessageStore;
 import org.apache.activemq.store.TransactionRecoveryListener;
 import org.apache.activemq.store.TransactionStore;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Provides a TransactionStore implementation that can create transaction aware
@@ -46,7 +46,7 @@ import org.apache.commons.logging.LogFac
  * @version $Revision: 1.4 $
  */
 public class KahaTransactionStore implements TransactionStore, BrokerServiceAware {	
-    private static final Log LOG = LogFactory.getLog(KahaTransactionStore.class);
+    private static final Logger LOG = LoggerFactory.getLogger(KahaTransactionStore.class);
 	
     private final Map transactions = new ConcurrentHashMap();
     private final Map prepared;

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/KahaDBStore.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/KahaDBStore.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/KahaDBStore.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/KahaDBStore.java Thu Feb 10 14:24:01 2011
@@ -78,13 +78,13 @@ import org.apache.activemq.usage.SystemU
 import org.apache.activemq.util.IOExceptionSupport;
 import org.apache.activemq.util.ServiceStopper;
 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 org.apache.kahadb.journal.Location;
 import org.apache.kahadb.page.Transaction;
 
 public class KahaDBStore extends MessageDatabase implements PersistenceAdapter {
-    static final Log LOG = LogFactory.getLog(KahaDBStore.class);
+    static final Logger LOG = LoggerFactory.getLogger(KahaDBStore.class);
     private static final int MAX_ASYNC_JOBS = 10000;
 
     public static final String PROPERTY_CANCELED_TASK_MOD_METRIC = "org.apache.activemq.store.kahadb.CANCELED_TASK_MOD_METRIC";

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/KahaDBTransactionStore.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/KahaDBTransactionStore.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/KahaDBTransactionStore.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/KahaDBTransactionStore.java Thu Feb 10 14:24:01 2011
@@ -49,8 +49,8 @@ import org.apache.activemq.store.kahadb.
 import org.apache.activemq.store.kahadb.data.KahaRollbackCommand;
 import org.apache.activemq.store.kahadb.data.KahaTransactionInfo;
 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;
 
 /**
  * Provides a TransactionStore implementation that can create transaction aware
@@ -59,7 +59,7 @@ import org.apache.commons.logging.LogFac
  * @version $Revision: 1.4 $
  */
 public class KahaDBTransactionStore implements TransactionStore {
-    static final Log LOG = LogFactory.getLog(KahaDBTransactionStore.class);
+    static final Logger LOG = LoggerFactory.getLogger(KahaDBTransactionStore.class);
     ConcurrentHashMap<Object, Tx> inflightTransactions = new ConcurrentHashMap<Object, Tx>();
     private final WireFormat wireFormat = new OpenWireFormat();
     private final KahaDBStore theStore;

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java Thu Feb 10 14:24:01 2011
@@ -61,8 +61,8 @@ import org.apache.activemq.util.Callback
 import org.apache.activemq.util.IOHelper;
 import org.apache.activemq.util.ServiceStopper;
 import org.apache.activemq.util.ServiceSupport;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.kahadb.index.BTreeIndex;
 import org.apache.kahadb.index.BTreeVisitor;
 import org.apache.kahadb.journal.DataFile;
@@ -93,7 +93,7 @@ public class MessageDatabase extends Ser
     static {
         UNMATCHED = new Buffer(new byte[]{});
     }
-    private static final Log LOG = LogFactory.getLog(MessageDatabase.class);
+    private static final Logger LOG = LoggerFactory.getLogger(MessageDatabase.class);
     private static final int DEFAULT_DATABASE_LOCKED_WAIT_DELAY = 10 * 1000;
 
     static final int CLOSED_STATE = 1;

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/TempMessageDatabase.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/TempMessageDatabase.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/TempMessageDatabase.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/TempMessageDatabase.java Thu Feb 10 14:24:01 2011
@@ -39,8 +39,8 @@ import org.apache.activemq.store.kahadb.
 import org.apache.activemq.store.kahadb.data.KahaRemoveMessageCommand;
 import org.apache.activemq.store.kahadb.data.KahaSubscriptionCommand;
 import org.apache.activemq.util.ByteSequence;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.kahadb.index.BTreeIndex;
 import org.apache.kahadb.page.PageFile;
 import org.apache.kahadb.page.Transaction;
@@ -51,7 +51,7 @@ import org.apache.kahadb.util.VariableMa
 
 public class TempMessageDatabase {
 
-    private static final Log LOG = LogFactory.getLog(TempMessageDatabase.class);
+    private static final Logger LOG = LoggerFactory.getLogger(TempMessageDatabase.class);
 
     public static final int CLOSED_STATE = 1;
     public static final int OPEN_STATE = 2;

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/plist/PListStore.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/plist/PListStore.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/plist/PListStore.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/plist/PListStore.java Thu Feb 10 14:24:01 2011
@@ -31,8 +31,8 @@ import java.util.Map.Entry;
 import org.apache.activemq.util.IOHelper;
 import org.apache.activemq.util.ServiceStopper;
 import org.apache.activemq.util.ServiceSupport;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.kahadb.index.BTreeIndex;
 import org.apache.kahadb.journal.Journal;
 import org.apache.kahadb.journal.Location;
@@ -49,7 +49,7 @@ import org.apache.kahadb.util.VariableMa
  * @org.apache.xbean.XBean
  */
 public class PListStore extends ServiceSupport {
-    static final Log LOG = LogFactory.getLog(PListStore.class);
+    static final Logger LOG = LoggerFactory.getLogger(PListStore.class);
     private static final int DATABASE_LOCKED_WAIT_DELAY = 10 * 1000;
 
     static final int CLOSED_STATE = 1;

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/memory/MemoryPersistenceAdapter.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/memory/MemoryPersistenceAdapter.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/memory/MemoryPersistenceAdapter.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/memory/MemoryPersistenceAdapter.java Thu Feb 10 14:24:01 2011
@@ -34,15 +34,15 @@ import org.apache.activemq.store.ProxyMe
 import org.apache.activemq.store.TopicMessageStore;
 import org.apache.activemq.store.TransactionStore;
 import org.apache.activemq.usage.SystemUsage;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * @org.apache.xbean.XBean
  * @version $Revision: 1.4 $
  */
 public class MemoryPersistenceAdapter implements PersistenceAdapter {
-    private static final Log LOG = LogFactory.getLog(MemoryPersistenceAdapter.class);
+    private static final Logger LOG = LoggerFactory.getLogger(MemoryPersistenceAdapter.class);
 
     MemoryTransactionStore transactionStore;
     ConcurrentHashMap<ActiveMQDestination, TopicMessageStore> topics = new ConcurrentHashMap<ActiveMQDestination, TopicMessageStore>();

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transaction/LocalTransaction.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transaction/LocalTransaction.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transaction/LocalTransaction.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transaction/LocalTransaction.java Thu Feb 10 14:24:01 2011
@@ -22,15 +22,15 @@ import org.apache.activemq.broker.Connec
 import org.apache.activemq.command.LocalTransactionId;
 import org.apache.activemq.command.TransactionId;
 import org.apache.activemq.store.TransactionStore;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * @version $Revision: 1.3 $
  */
 public class LocalTransaction extends Transaction {
 
-    private static final Log LOG = LogFactory.getLog(LocalTransaction.class);
+    private static final Logger LOG = LoggerFactory.getLogger(LocalTransaction.class);
 
     private final TransactionStore transactionStore;
     private final LocalTransactionId xid;
@@ -120,7 +120,7 @@ public class LocalTransaction extends Tr
     }
     
     @Override
-    public Log getLog() {
+    public Logger getLog() {
         return LOG;
     }
 }

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transaction/Transaction.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transaction/Transaction.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transaction/Transaction.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transaction/Transaction.java Thu Feb 10 14:24:01 2011
@@ -26,7 +26,7 @@ import java.util.concurrent.ExecutionExc
 import java.util.concurrent.FutureTask;
 import javax.transaction.xa.XAException;
 import org.apache.activemq.command.TransactionId;
-import org.apache.commons.logging.Log;
+import org.slf4j.Logger;
 
 /**
  * Keeps track of all the actions the need to be done when a transaction does a
@@ -131,7 +131,7 @@ public abstract class Transaction {
 
     public abstract TransactionId getTransactionId();
 
-    public abstract Log getLog();
+    public abstract Logger getLog();
     
     public boolean isPrepared() {
         return getState() == PREPARED_STATE;

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transaction/XATransaction.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transaction/XATransaction.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transaction/XATransaction.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transaction/XATransaction.java Thu Feb 10 14:24:01 2011
@@ -24,15 +24,15 @@ import org.apache.activemq.command.Conne
 import org.apache.activemq.command.TransactionId;
 import org.apache.activemq.command.XATransactionId;
 import org.apache.activemq.store.TransactionStore;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * @version $Revision: 1.4 $
  */
 public class XATransaction extends Transaction {
 
-    private static final Log LOG = LogFactory.getLog(XATransaction.class);
+    private static final Logger LOG = LoggerFactory.getLogger(XATransaction.class);
 
     private final TransactionStore transactionStore;
     private final XATransactionId xid;
@@ -212,7 +212,7 @@ public class XATransaction extends Trans
     }
     
     @Override
-    public Log getLog() {
+    public Logger getLog() {
         return LOG;
     }
 }

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/CommandJoiner.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/CommandJoiner.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/CommandJoiner.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/CommandJoiner.java Thu Feb 10 14:24:01 2011
@@ -25,8 +25,8 @@ import org.apache.activemq.command.LastP
 import org.apache.activemq.command.PartialCommand;
 import org.apache.activemq.openwire.OpenWireFormat;
 import org.apache.activemq.util.ByteArrayInputStream;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Joins together of partial commands which were split into individual chunks of
@@ -35,7 +35,7 @@ import org.apache.commons.logging.LogFac
  * @version $Revision$
  */
 public class CommandJoiner extends TransportFilter {
-    private static final Log LOG = LogFactory.getLog(CommandJoiner.class);
+    private static final Logger LOG = LoggerFactory.getLogger(CommandJoiner.class);
 
     private ByteArrayOutputStream out = new ByteArrayOutputStream();
     private OpenWireFormat wireFormat;

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/FutureResponse.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/FutureResponse.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/FutureResponse.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/FutureResponse.java Thu Feb 10 14:24:01 2011
@@ -22,11 +22,11 @@ import java.util.concurrent.ArrayBlockin
 import java.util.concurrent.TimeUnit;
 
 import org.apache.activemq.command.Response;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class FutureResponse {
-    private static final Log LOG = LogFactory.getLog(FutureResponse.class);
+    private static final Logger LOG = LoggerFactory.getLogger(FutureResponse.class);
 
     private final ResponseCallback responseCallback;
     private final ArrayBlockingQueue<Response> responseSlot = new ArrayBlockingQueue<Response>(1);

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/InactivityMonitor.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/InactivityMonitor.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/InactivityMonitor.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/InactivityMonitor.java Thu Feb 10 14:24:01 2011
@@ -29,8 +29,8 @@ import org.apache.activemq.command.KeepA
 import org.apache.activemq.command.WireFormatInfo;
 import org.apache.activemq.thread.SchedulerTimerTask;
 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;
 
 /**
  * Used to make sure that commands are arriving periodically from the peer of
@@ -40,7 +40,7 @@ import org.apache.commons.logging.LogFac
  */
 public class InactivityMonitor extends TransportFilter {
 
-    private static final Log LOG = LogFactory.getLog(InactivityMonitor.class);
+    private static final Logger LOG = LoggerFactory.getLogger(InactivityMonitor.class);
     private static ThreadPoolExecutor ASYNC_TASKS;
     private static int CHECKER_COUNTER;
     private static long DEFAULT_CHECK_TIME_MILLS = 30000;

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/LogWriter.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/LogWriter.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/LogWriter.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/LogWriter.java Thu Feb 10 14:24:01 2011
@@ -18,7 +18,7 @@ package org.apache.activemq.transport;
 
 import java.io.IOException;
 
-import org.apache.commons.logging.Log;
+import org.slf4j.Logger;
 
 /**
  * Interface for classes that will be called by the TransportLogger
@@ -38,48 +38,48 @@ public interface LogWriter {
      * Writes a header message to the log.
      * @param log The log to be written to.
      */
-    public void initialMessage(Log log);
+    public void initialMessage(Logger log);
     
     /**
      * Writes a message to a log when a request command is sent.
      * @param log The log to be written to.
      * @param command The command to be logged.
      */
-    public void logRequest (Log log, Object command);
+    public void logRequest (Logger log, Object command);
     
     /**
      * Writes a message to a log when a response command is received.
      * @param log The log to be written to.
      * @param command The command to be logged.
      */
-    public void logResponse (Log log, Object response);
+    public void logResponse (Logger log, Object response);
 
     /**
      * Writes a message to a log when an asynchronous equest command is sent.
      * @param log The log to be written to.
      * @param command The command to be logged.
      */
-    public void logAsyncRequest (Log log, Object command);
+    public void logAsyncRequest (Logger log, Object command);
     
     /**
      * Writes a message to a log when message is sent.
      * @param log The log to be written to.
      * @param command The command to be logged.
      */
-    public void logOneWay (Log log, Object command);
+    public void logOneWay (Logger log, Object command);
     
     /**
      * Writes a message to a log when message is received.
      * @param log The log to be written to.
      * @param command The command to be logged.
      */
-    public void logReceivedCommand (Log log, Object command);
+    public void logReceivedCommand (Logger log, Object command);
     
     /**
      * Writes a message to a log when an exception is received.
      * @param log The log to be written to.
      * @param command The command to be logged.
      */
-    public void logReceivedException (Log log, IOException error);
+    public void logReceivedException (Logger log, IOException error);
     
 }

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/ResponseCorrelator.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/ResponseCorrelator.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/ResponseCorrelator.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/ResponseCorrelator.java Thu Feb 10 14:24:01 2011
@@ -26,8 +26,8 @@ import org.apache.activemq.command.Comma
 import org.apache.activemq.command.ExceptionResponse;
 import org.apache.activemq.command.Response;
 import org.apache.activemq.util.IntSequenceGenerator;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Adds the incrementing sequence number to commands along with performing the
@@ -38,7 +38,7 @@ import org.apache.commons.logging.LogFac
  */
 public class ResponseCorrelator extends TransportFilter {
 
-    private static final Log LOG = LogFactory.getLog(ResponseCorrelator.class);
+    private static final Logger LOG = LoggerFactory.getLogger(ResponseCorrelator.class);
     private final Map<Integer, FutureResponse> requestMap = new HashMap<Integer, FutureResponse>();
     private IntSequenceGenerator sequenceGenerator;
     private final boolean debug = LOG.isDebugEnabled();

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/TransportLogger.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/TransportLogger.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/TransportLogger.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/TransportLogger.java Thu Feb 10 14:24:01 2011
@@ -18,7 +18,7 @@ package org.apache.activemq.transport;
 
 import java.io.IOException;
 
-import org.apache.commons.logging.Log;
+import org.slf4j.Logger;
 
 /**
  * This TransportFilter implementation writes output to a log
@@ -30,12 +30,12 @@ import org.apache.commons.logging.Log;
  */
 public class TransportLogger extends TransportFilter {
 
-    private final Log log;
+    private final Logger log;
     private boolean logging;
     private final LogWriter logWriter;
     private TransportLoggerView view;
 
-    public TransportLogger(Transport next, Log log, boolean startLogging, LogWriter logWriter) {
+    public TransportLogger(Transport next, Logger log, boolean startLogging, LogWriter logWriter) {
         // Changed constructor to pass the implementation of the LogWriter interface
         // that will be used to write the messages.
         super(next);

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/TransportLoggerFactory.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/TransportLoggerFactory.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/TransportLoggerFactory.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/TransportLoggerFactory.java Thu Feb 10 14:24:01 2011
@@ -20,8 +20,8 @@ import org.apache.activemq.broker.jmx.An
 import org.apache.activemq.broker.jmx.ManagementContext;
 import org.apache.activemq.util.IOExceptionSupport;
 import org.apache.activemq.util.LogWriterFinder;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import java.io.IOException;
 import javax.management.ObjectName;
 
@@ -38,7 +38,7 @@ import javax.management.ObjectName;
  */
 public class TransportLoggerFactory {
 
-    private static final Log LOG = LogFactory.getLog(TransportLoggerFactory.class);
+    private static final Logger LOG = LoggerFactory.getLogger(TransportLoggerFactory.class);
 
     private static TransportLoggerFactory instance;
     private static int lastId=0;
@@ -119,7 +119,7 @@ public class TransportLoggerFactory {
      * @return A TransportLogger object.
      * @throws IOException
      */
-    public TransportLogger createTransportLogger(Transport next, Log log) throws IOException {
+    public TransportLogger createTransportLogger(Transport next, Logger log) throws IOException {
         return createTransportLogger(next, getNextId(), log, defaultLogWriterName, defaultDynamicManagement, defaultInitialBehavior, defaultJmxPort);
     }
 
@@ -156,7 +156,7 @@ public class TransportLoggerFactory {
      * @return A TransportLogger object.
      * @throws IOException
      */
-    public TransportLogger createTransportLogger(Transport next, int id, Log log,
+    public TransportLogger createTransportLogger(Transport next, int id, Logger log,
             String logWriterName, boolean dynamicManagement, boolean startLogging, int jmxport) throws IOException {
         try {
             LogWriter logWriter = logWriterFinder.newInstance(logWriterName);
@@ -180,8 +180,8 @@ public class TransportLoggerFactory {
         return ++lastId;
     }
 
-    private static Log createLog(int id) {
-        return LogFactory.getLog(TransportLogger.class.getName()+".Connection:" + id);
+    private static Logger createLog(int id) {
+        return LoggerFactory.getLogger(TransportLogger.class.getName()+".Connection:" + id);
     }
     
     /**

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/TransportLoggerView.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/TransportLoggerView.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/TransportLoggerView.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/TransportLoggerView.java Thu Feb 10 14:24:01 2011
@@ -26,8 +26,8 @@ import javax.management.ObjectName;
 import org.apache.activemq.broker.jmx.AnnotatedMBean;
 import org.apache.activemq.broker.jmx.ManagementContext;
 import org.apache.activemq.util.JMXSupport;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Class implementing the TransportLoggerViewMBean interface.
@@ -42,7 +42,7 @@ import org.apache.commons.logging.LogFac
  */
 public class TransportLoggerView implements TransportLoggerViewMBean {
 
-    private static final Log log = LogFactory.getLog(TransportLoggerView.class);
+    private static final Logger log = LoggerFactory.getLogger(TransportLoggerView.class);
     
     /**
      * Set with the TransportLoggerViews objects created.

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/TransportServerThreadSupport.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/TransportServerThreadSupport.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/TransportServerThreadSupport.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/TransportServerThreadSupport.java Thu Feb 10 14:24:01 2011
@@ -20,8 +20,8 @@ import java.net.URI;
 
 import org.apache.activemq.ThreadPriorities;
 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;
 
 /**
  * A useful base class for implementations of {@link TransportServer} which uses
@@ -30,7 +30,7 @@ import org.apache.commons.logging.LogFac
  * @version $Revision: 1.1 $
  */
 public abstract class TransportServerThreadSupport extends TransportServerSupport implements Runnable {
-    private static final Log LOG = LogFactory.getLog(TransportServerThreadSupport.class);
+    private static final Logger LOG = LoggerFactory.getLogger(TransportServerThreadSupport.class);
 
     private boolean daemon = true;
     private boolean joinOnStop = true;

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/TransportSupport.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/TransportSupport.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/TransportSupport.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/TransportSupport.java Thu Feb 10 14:24:01 2011
@@ -19,8 +19,8 @@ package org.apache.activemq.transport;
 import java.io.IOException;
 import java.net.URI;
 import org.apache.activemq.util.ServiceSupport;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * A useful base class for transport implementations.
@@ -28,7 +28,7 @@ import org.apache.commons.logging.LogFac
  * @version $Revision: 1.1 $
  */
 public abstract class TransportSupport extends ServiceSupport implements Transport {
-    private static final Log LOG = LogFactory.getLog(TransportSupport.class);
+    private static final Logger LOG = LoggerFactory.getLogger(TransportSupport.class);
 
     TransportListener transportListener;
 

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/WireFormatNegotiator.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/WireFormatNegotiator.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/WireFormatNegotiator.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/WireFormatNegotiator.java Thu Feb 10 14:24:01 2011
@@ -27,15 +27,15 @@ import org.apache.activemq.command.Comma
 import org.apache.activemq.command.WireFormatInfo;
 import org.apache.activemq.openwire.OpenWireFormat;
 import org.apache.activemq.util.IOExceptionSupport;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Negotiates the wire format with a new connection
  */
 public class WireFormatNegotiator extends TransportFilter {
 
-    private static final Log LOG = LogFactory.getLog(WireFormatNegotiator.class);
+    private static final Logger LOG = LoggerFactory.getLogger(WireFormatNegotiator.class);
 
     private OpenWireFormat wireFormat;
     private final int minimumVersion;

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/WriteTimeoutFilter.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/WriteTimeoutFilter.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/WriteTimeoutFilter.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/WriteTimeoutFilter.java Thu Feb 10 14:24:01 2011
@@ -27,8 +27,8 @@ import java.util.concurrent.locks.Reentr
 
 import org.apache.activemq.transport.tcp.TcpBufferedOutputStream;
 import org.apache.activemq.transport.tcp.TimeStampStream;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * This filter implements write timeouts for socket write operations.
@@ -56,7 +56,7 @@ import org.apache.commons.logging.LogFac
  */
 public class WriteTimeoutFilter extends TransportFilter {
 
-    private static final Log LOG = LogFactory.getLog(WriteTimeoutFilter.class);
+    private static final Logger LOG = LoggerFactory.getLogger(WriteTimeoutFilter.class);
     protected static ConcurrentLinkedQueue<WriteTimeoutFilter> writers = new ConcurrentLinkedQueue<WriteTimeoutFilter>();
     protected static AtomicInteger messageCounter = new AtomicInteger(0);
     protected static TimeoutThread timeoutThread = new TimeoutThread(); 

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/discovery/DiscoveryTransport.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/discovery/DiscoveryTransport.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/discovery/DiscoveryTransport.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/discovery/DiscoveryTransport.java Thu Feb 10 14:24:01 2011
@@ -25,8 +25,8 @@ import org.apache.activemq.transport.Com
 import org.apache.activemq.transport.TransportFilter;
 import org.apache.activemq.util.ServiceStopper;
 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;
 
 /**
  * A {@link ReliableTransportChannel} which uses a {@link DiscoveryAgent} to
@@ -36,7 +36,7 @@ import org.apache.commons.logging.LogFac
  */
 public class DiscoveryTransport extends TransportFilter implements DiscoveryListener {
 
-    private static final Log LOG = LogFactory.getLog(DiscoveryTransport.class);
+    private static final Logger LOG = LoggerFactory.getLogger(DiscoveryTransport.class);
 
     private final CompositeTransport next;
     private DiscoveryAgent discoveryAgent;

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/discovery/multicast/MulticastDiscoveryAgent.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/discovery/multicast/MulticastDiscoveryAgent.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/discovery/multicast/MulticastDiscoveryAgent.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/discovery/multicast/MulticastDiscoveryAgent.java Thu Feb 10 14:24:01 2011
@@ -39,8 +39,8 @@ import java.util.concurrent.atomic.Atomi
 import org.apache.activemq.command.DiscoveryEvent;
 import org.apache.activemq.transport.discovery.DiscoveryAgent;
 import org.apache.activemq.transport.discovery.DiscoveryListener;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * A {@link DiscoveryAgent} using a multicast address and heartbeat packets
@@ -55,7 +55,7 @@ public class MulticastDiscoveryAgent imp
     public static final String DEFAULT_HOST_IP  = System.getProperty("activemq.partition.discovery", "239.255.2.3"); 
     public static final int    DEFAULT_PORT  = 6155; 
         
-    private static final Log LOG = LogFactory.getLog(MulticastDiscoveryAgent.class);
+    private static final Logger LOG = LoggerFactory.getLogger(MulticastDiscoveryAgent.class);
     private static final String TYPE_SUFFIX = "ActiveMQ-4.";
     private static final String ALIVE = "alive.";
     private static final String DEAD = "dead.";

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/discovery/multicast/MulticastDiscoveryAgentFactory.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/discovery/multicast/MulticastDiscoveryAgentFactory.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/discovery/multicast/MulticastDiscoveryAgentFactory.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/discovery/multicast/MulticastDiscoveryAgentFactory.java Thu Feb 10 14:24:01 2011
@@ -25,12 +25,12 @@ import org.apache.activemq.transport.dis
 import org.apache.activemq.util.IOExceptionSupport;
 import org.apache.activemq.util.IntrospectionSupport;
 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 MulticastDiscoveryAgentFactory extends DiscoveryAgentFactory {
 	
-	  private static final Log LOG = LogFactory.getLog(MulticastDiscoveryAgentFactory.class); 
+	  private static final Logger LOG = LoggerFactory.getLogger(MulticastDiscoveryAgentFactory.class); 
 
     
     protected DiscoveryAgent doCreateDiscoveryAgent(URI uri) throws IOException {

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/discovery/rendezvous/RendezvousDiscoveryAgent.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/discovery/rendezvous/RendezvousDiscoveryAgent.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/discovery/rendezvous/RendezvousDiscoveryAgent.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/discovery/rendezvous/RendezvousDiscoveryAgent.java Thu Feb 10 14:24:01 2011
@@ -34,8 +34,8 @@ import org.apache.activemq.transport.dis
 import org.apache.activemq.transport.discovery.DiscoveryListener;
 import org.apache.activemq.util.JMSExceptionSupport;
 import org.apache.activemq.util.MapHelper;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * A {@link DiscoveryAgent} using <a href="http://www.zeroconf.org/">Zeroconf</a>
@@ -44,7 +44,7 @@ import org.apache.commons.logging.LogFac
  * @version $Revision$
  */
 public class RendezvousDiscoveryAgent implements DiscoveryAgent, ServiceListener {
-    private static final Log LOG = LogFactory.getLog(RendezvousDiscoveryAgent.class);
+    private static final Logger LOG = LoggerFactory.getLogger(RendezvousDiscoveryAgent.class);
 
     private static final String TYPE_SUFFIX = "ActiveMQ-4.";
 

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/discovery/simple/SimpleDiscoveryAgent.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/discovery/simple/SimpleDiscoveryAgent.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/discovery/simple/SimpleDiscoveryAgent.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/discovery/simple/SimpleDiscoveryAgent.java Thu Feb 10 14:24:01 2011
@@ -28,8 +28,8 @@ import org.apache.activemq.command.Disco
 import org.apache.activemq.thread.DefaultThreadPools;
 import org.apache.activemq.transport.discovery.DiscoveryAgent;
 import org.apache.activemq.transport.discovery.DiscoveryListener;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * A simple DiscoveryAgent that allows static configuration of the discovered
@@ -39,7 +39,7 @@ import org.apache.commons.logging.LogFac
  */
 public class SimpleDiscoveryAgent implements DiscoveryAgent {
 
-    private final static Log LOG = LogFactory.getLog(SimpleDiscoveryAgent.class);
+    private final static Logger LOG = LoggerFactory.getLogger(SimpleDiscoveryAgent.class);
     private long initialReconnectDelay = 1000;
     private long maxReconnectDelay = 1000 * 30;
     private long backOffMultiplier = 2;

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/failover/FailoverTransport.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/failover/FailoverTransport.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/failover/FailoverTransport.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/failover/FailoverTransport.java Thu Feb 10 14:24:01 2011
@@ -57,8 +57,8 @@ import org.apache.activemq.transport.Tra
 import org.apache.activemq.transport.TransportListener;
 import org.apache.activemq.util.IOExceptionSupport;
 import org.apache.activemq.util.ServiceSupport;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 
 /**
@@ -69,7 +69,7 @@ import org.apache.commons.logging.LogFac
  */
 public class FailoverTransport implements CompositeTransport {
 
-    private static final Log LOG = LogFactory.getLog(FailoverTransport.class);
+    private static final Logger LOG = LoggerFactory.getLogger(FailoverTransport.class);
     private static final int DEFAULT_INITIAL_RECONNECT_DELAY = 10;
     private TransportListener transportListener;
     private boolean disposed;

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/fanout/FanoutTransport.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/fanout/FanoutTransport.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/fanout/FanoutTransport.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/fanout/FanoutTransport.java Thu Feb 10 14:24:01 2011
@@ -43,8 +43,8 @@ import org.apache.activemq.transport.Tra
 import org.apache.activemq.util.IOExceptionSupport;
 import org.apache.activemq.util.ServiceStopper;
 import org.apache.activemq.util.ServiceSupport;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * A Transport that fans out a connection to multiple brokers.
@@ -53,7 +53,7 @@ import org.apache.commons.logging.LogFac
  */
 public class FanoutTransport implements CompositeTransport {
 
-    private static final Log LOG = LogFactory.getLog(FanoutTransport.class);
+    private static final Logger LOG = LoggerFactory.getLogger(FanoutTransport.class);
 
     private TransportListener transportListener;
     private boolean disposed;

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/logwriters/CustomLogWriter.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/logwriters/CustomLogWriter.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/logwriters/CustomLogWriter.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/logwriters/CustomLogWriter.java Thu Feb 10 14:24:01 2011
@@ -27,7 +27,7 @@ import org.apache.activemq.command.Produ
 import org.apache.activemq.command.ProducerId;
 import org.apache.activemq.command.WireFormatInfo;
 import org.apache.activemq.transport.LogWriter;
-import org.apache.commons.logging.Log;
+import org.slf4j.Logger;
 
 /**
  * Custom implementation of LogWriter interface.
@@ -38,37 +38,37 @@ import org.apache.commons.logging.Log;
 public class CustomLogWriter implements LogWriter {
     
     // doc comment inherited from LogWriter
-    public void initialMessage(Log log) {
+    public void initialMessage(Logger log) {
         
     }
 
     // doc comment inherited from LogWriter
-    public void logRequest (Log log, Object command) {
+    public void logRequest (Logger log, Object command) {
         log.debug("$$ SENDREQ: " + CustomLogWriter.commandToString(command));
     }
     
     // doc comment inherited from LogWriter
-    public void logResponse (Log log, Object response) {
+    public void logResponse (Logger log, Object response) {
         log.debug("$$ GOT_RESPONSE: "+response);
     }
     
     // doc comment inherited from LogWriter
-    public void logAsyncRequest (Log log, Object command) {
+    public void logAsyncRequest (Logger log, Object command) {
         log.debug("$$ SENDING_ASNYC_REQUEST: "+command);
     }
     
     // doc comment inherited from LogWriter
-    public void logOneWay (Log log, Object command) {
+    public void logOneWay (Logger log, Object command) {
         log.debug("$$ SENDING: " + CustomLogWriter.commandToString(command));
     }
     
     // doc comment inherited from LogWriter
-    public void logReceivedCommand (Log log, Object command) {
+    public void logReceivedCommand (Logger log, Object command) {
         log.debug("$$ RECEIVED: " + CustomLogWriter.commandToString(command));
     }
     
     // doc comment inherited from LogWriter
-    public void logReceivedException (Log log, IOException error) {
+    public void logReceivedException (Logger log, IOException error) {
         log.debug("$$ RECEIVED_EXCEPTION: "+error, error);
     }
     

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/logwriters/DefaultLogWriter.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/logwriters/DefaultLogWriter.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/logwriters/DefaultLogWriter.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/logwriters/DefaultLogWriter.java Thu Feb 10 14:24:01 2011
@@ -19,7 +19,7 @@ package org.apache.activemq.transport.lo
 import java.io.IOException;
 
 import org.apache.activemq.transport.LogWriter;
-import org.apache.commons.logging.Log;
+import org.slf4j.Logger;
 
 /**
  * Implementation of LogWriter interface to keep ActiveMQ's
@@ -31,37 +31,37 @@ import org.apache.commons.logging.Log;
 public class DefaultLogWriter implements LogWriter {
 
     // doc comment inherited from LogWriter
-    public void initialMessage(Log log) {
+    public void initialMessage(Logger log) {
         // Default log writer does nothing here
     }
 
     // doc comment inherited from LogWriter
-    public void logRequest (Log log, Object command) {
+    public void logRequest (Logger log, Object command) {
         log.debug("SENDING REQUEST: "+command);
     }
 
     // doc comment inherited from LogWriter
-    public void logResponse (Log log, Object response) {
+    public void logResponse (Logger log, Object response) {
         log.debug("GOT RESPONSE: "+response);
     }
 
     // doc comment inherited from LogWriter
-    public void logAsyncRequest (Log log, Object command) {
+    public void logAsyncRequest (Logger log, Object command) {
         log.debug("SENDING ASNYC REQUEST: "+command);
     }
 
     // doc comment inherited from LogWriter
-    public void logOneWay (Log log, Object command) {
+    public void logOneWay (Logger log, Object command) {
         log.debug("SENDING: "+command);
     }
 
     // doc comment inherited from LogWriter
-    public void logReceivedCommand (Log log, Object command) {
+    public void logReceivedCommand (Logger log, Object command) {
         log.debug("RECEIVED: " + command);
     }
 
     // doc comment inherited from LogWriter
-    public void logReceivedException (Log log, IOException error) {
+    public void logReceivedException (Logger log, IOException error) {
         log.debug("RECEIVED Exception: "+error, error);
     }
 

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/multicast/MulticastTransport.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/multicast/MulticastTransport.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/multicast/MulticastTransport.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/multicast/MulticastTransport.java Thu Feb 10 14:24:01 2011
@@ -32,8 +32,8 @@ import org.apache.activemq.transport.udp
 import org.apache.activemq.transport.udp.DatagramHeaderMarshaller;
 import org.apache.activemq.transport.udp.UdpTransport;
 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;
 
 /**
  * A multicast based transport.
@@ -42,7 +42,7 @@ import org.apache.commons.logging.LogFac
  */
 public class MulticastTransport extends UdpTransport {
 
-    private static final Log LOG = LogFactory.getLog(MulticastTransport.class);
+    private static final Logger LOG = LoggerFactory.getLogger(MulticastTransport.class);
 
     private static final int DEFAULT_IDLE_TIME = 5000;
 

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/nio/NIOTransport.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/nio/NIOTransport.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/nio/NIOTransport.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/nio/NIOTransport.java Thu Feb 10 14:24:01 2011
@@ -43,7 +43,7 @@ import org.apache.activemq.wireformat.Wi
  */
 public class NIOTransport extends TcpTransport {
 
-    // private static final Log log = LogFactory.getLog(NIOTransport.class);
+    // private static final Logger log = LoggerFactory.getLogger(NIOTransport.class);
     private SocketChannel channel;
     private SelectorSelection selection;
     private ByteBuffer inputBuffer;

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/reliable/DefaultReplayBuffer.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/reliable/DefaultReplayBuffer.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/reliable/DefaultReplayBuffer.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/reliable/DefaultReplayBuffer.java Thu Feb 10 14:24:01 2011
@@ -20,8 +20,8 @@ import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
 
-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
  */
 public class DefaultReplayBuffer implements ReplayBuffer {
 
-    private static final Log LOG = LogFactory.getLog(DefaultReplayBuffer.class);
+    private static final Logger LOG = LoggerFactory.getLogger(DefaultReplayBuffer.class);
 
     private final int size;
     private ReplayBufferListener listener;

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/reliable/ReliableTransport.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/reliable/ReliableTransport.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/reliable/ReliableTransport.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/reliable/ReliableTransport.java Thu Feb 10 14:24:01 2011
@@ -28,8 +28,8 @@ import org.apache.activemq.transport.Fut
 import org.apache.activemq.transport.ResponseCorrelator;
 import org.apache.activemq.transport.Transport;
 import org.apache.activemq.transport.udp.UdpTransport;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * This interceptor deals with out of order commands together with being able to
@@ -38,7 +38,7 @@ import org.apache.commons.logging.LogFac
  * @version $Revision$
  */
 public class ReliableTransport extends ResponseCorrelator {
-    private static final Log LOG = LogFactory.getLog(ReliableTransport.class);
+    private static final Logger LOG = LoggerFactory.getLogger(ReliableTransport.class);
 
     private ReplayStrategy replayStrategy;
     private SortedSet<Command> commands = new TreeSet<Command>(new CommandIdComparator());

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp/ProtocolConverter.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp/ProtocolConverter.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp/ProtocolConverter.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp/ProtocolConverter.java Thu Feb 10 14:24:01 2011
@@ -60,8 +60,8 @@ import org.apache.activemq.util.IOExcept
 import org.apache.activemq.util.IdGenerator;
 import org.apache.activemq.util.IntrospectionSupport;
 import org.apache.activemq.util.LongSequenceGenerator;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.context.ApplicationContextAware;
 
 /**
@@ -69,7 +69,7 @@ import org.springframework.context.Appli
  */
 public class ProtocolConverter {
 
-    private static final Log LOG = LogFactory.getLog(ProtocolConverter.class);
+    private static final Logger LOG = LoggerFactory.getLogger(ProtocolConverter.class);
     
     private static final IdGenerator CONNECTION_ID_GENERATOR = new IdGenerator();
 

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp/StompTransportFilter.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp/StompTransportFilter.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp/StompTransportFilter.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp/StompTransportFilter.java Thu Feb 10 14:24:01 2011
@@ -28,8 +28,8 @@ import org.apache.activemq.transport.Tra
 import org.apache.activemq.transport.TransportListener;
 import org.apache.activemq.transport.tcp.SslTransport;
 import org.apache.activemq.util.IOExceptionSupport;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * The StompTransportFilter normally sits on top of a TcpTransport that has been
@@ -40,7 +40,7 @@ import org.apache.commons.logging.LogFac
  * @author <a href="http://hiramchirino.com">chirino</a>
  */
 public class StompTransportFilter extends TransportFilter implements StompTransport {
-    private static final Log LOG = LogFactory.getLog(StompTransportFilter.class);
+    private static final Logger LOG = LoggerFactory.getLogger(StompTransportFilter.class);
     private final ProtocolConverter protocolConverter;
     private final FrameTranslator frameTranslator;
 

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/tcp/SslTransportFactory.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/tcp/SslTransportFactory.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/tcp/SslTransportFactory.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/tcp/SslTransportFactory.java Thu Feb 10 14:24:01 2011
@@ -49,8 +49,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;
 
 /**
  * An implementation of the TcpTransportFactory using SSL. The major
@@ -64,7 +64,7 @@ import org.apache.commons.logging.LogFac
  */
 public class SslTransportFactory extends TcpTransportFactory {
     // The log this uses.,
-    private static final Log LOG = LogFactory.getLog(SslTransportFactory.class);
+    private static final Logger LOG = LoggerFactory.getLogger(SslTransportFactory.class);
     
     /**
      * Overriding to use SslTransportServer and allow for proper reflection.

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/tcp/TcpTransport.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/tcp/TcpTransport.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/tcp/TcpTransport.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/tcp/TcpTransport.java Thu Feb 10 14:24:01 2011
@@ -44,8 +44,8 @@ import org.apache.activemq.util.InetAddr
 import org.apache.activemq.util.IntrospectionSupport;
 import org.apache.activemq.util.ServiceStopper;
 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 static org.apache.activemq.thread.DefaultThreadPools.getDefaultTaskRunnerFactory;
@@ -57,7 +57,7 @@ import static org.apache.activemq.thread
  * @version $Revision$
  */
 public class TcpTransport extends TransportThreadSupport implements Transport, Service, Runnable {
-    private static final Log LOG = LogFactory.getLog(TcpTransport.class);
+    private static final Logger LOG = LoggerFactory.getLogger(TcpTransport.class);
     protected final URI remoteLocation;
     protected final URI localLocation;
     protected final WireFormat wireFormat;

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/tcp/TcpTransportFactory.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/tcp/TcpTransportFactory.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/tcp/TcpTransportFactory.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/tcp/TcpTransportFactory.java Thu Feb 10 14:24:01 2011
@@ -37,15 +37,15 @@ 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;
 
 /**
  * @author David Martin Clavo david(dot)martin(dot)clavo(at)gmail.com (logging improvement modifications)
  * @version $Revision$
  */
 public class TcpTransportFactory extends TransportFactory {
-    private static final Log LOG = LogFactory.getLog(TcpTransportFactory.class);
+    private static final Logger LOG = LoggerFactory.getLogger(TcpTransportFactory.class);
 
     public TransportServer doBind(final URI location) throws IOException {
         try {

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/tcp/TcpTransportServer.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/tcp/TcpTransportServer.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/tcp/TcpTransportServer.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/tcp/TcpTransportServer.java Thu Feb 10 14:24:01 2011
@@ -50,8 +50,8 @@ import org.apache.activemq.util.ServiceS
 import org.apache.activemq.util.ServiceSupport;
 import org.apache.activemq.wireformat.WireFormat;
 import org.apache.activemq.wireformat.WireFormatFactory;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * A TCP based implementation of {@link TransportServer}
@@ -62,7 +62,7 @@ import org.apache.commons.logging.LogFac
 
 public class TcpTransportServer extends TransportServerThreadSupport implements ServiceListener{
 
-    private static final Log LOG = LogFactory.getLog(TcpTransportServer.class);
+    private static final Logger LOG = LoggerFactory.getLogger(TcpTransportServer.class);
     protected ServerSocket serverSocket;
     protected int backlog = 5000;
     protected WireFormatFactory wireFormatFactory = new OpenWireFormatFactory();

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/udp/CommandDatagramChannel.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/udp/CommandDatagramChannel.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/udp/CommandDatagramChannel.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/udp/CommandDatagramChannel.java Thu Feb 10 14:24:01 2011
@@ -32,8 +32,8 @@ import org.apache.activemq.openwire.Open
 import org.apache.activemq.transport.reliable.ReplayBuffer;
 import org.apache.activemq.util.ByteArrayInputStream;
 import org.apache.activemq.util.ByteArrayOutputStream;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * A strategy for reading datagrams and de-fragmenting them together.
@@ -42,7 +42,7 @@ import org.apache.commons.logging.LogFac
  */
 public class CommandDatagramChannel extends CommandChannelSupport {
 
-    private static final Log LOG = LogFactory.getLog(CommandDatagramChannel.class);
+    private static final Logger LOG = LoggerFactory.getLogger(CommandDatagramChannel.class);
 
     private DatagramChannel channel;
     private ByteBufferPool bufferPool;

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/udp/CommandDatagramSocket.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/udp/CommandDatagramSocket.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/udp/CommandDatagramSocket.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/udp/CommandDatagramSocket.java Thu Feb 10 14:24:01 2011
@@ -32,8 +32,8 @@ import org.apache.activemq.openwire.Open
 import org.apache.activemq.transport.reliable.ReplayBuffer;
 import org.apache.activemq.util.ByteArrayInputStream;
 import org.apache.activemq.util.ByteArrayOutputStream;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * A strategy for reading datagrams and de-fragmenting them together.
@@ -42,7 +42,7 @@ import org.apache.commons.logging.LogFac
  */
 public class CommandDatagramSocket extends CommandChannelSupport {
 
-    private static final Log LOG = LogFactory.getLog(CommandDatagramSocket.class);
+    private static final Logger LOG = LoggerFactory.getLogger(CommandDatagramSocket.class);
 
     private DatagramSocket channel;
     private Object readLock = new Object();

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/udp/UdpTransport.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/udp/UdpTransport.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/udp/UdpTransport.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/udp/UdpTransport.java Thu Feb 10 14:24:01 2011
@@ -42,8 +42,8 @@ import org.apache.activemq.transport.rel
 import org.apache.activemq.util.InetAddressUtil;
 import org.apache.activemq.util.IntSequenceGenerator;
 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;
 
 /**
  * An implementation of the {@link Transport} interface using raw UDP
@@ -51,7 +51,7 @@ import org.apache.commons.logging.LogFac
  * @version $Revision$
  */
 public class UdpTransport extends TransportThreadSupport implements Transport, Service, Runnable {
-    private static final Log LOG = LogFactory.getLog(UdpTransport.class);
+    private static final Logger LOG = LoggerFactory.getLogger(UdpTransport.class);
 
     private static final int MAX_BIND_ATTEMPTS = 50;
     private static final long BIND_ATTEMPT_DELAY = 100;