cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gdusba...@apache.org
Subject svn commit: r922409 [1/2] - in /incubator/cassandra/trunk: ./ contrib/mutex/src/org/apache/cassandra/mutex/ contrib/property_snitch/src/java/org/apache/cassandra/locator/ contrib/word_count/src/ src/java/org/apache/cassandra/avro/ src/java/org/apache/c...
Date Fri, 12 Mar 2010 20:01:09 GMT
Author: gdusbabek
Date: Fri Mar 12 20:01:07 2010
New Revision: 922409

URL: http://svn.apache.org/viewvc?rev=922409&view=rev
Log:
CASSANDRA-625 switch to slf4j logging. Patch by Gabriele Renzi, reviewed by Gary Dusbabek.

Modified:
    incubator/cassandra/trunk/CHANGES.txt
    incubator/cassandra/trunk/contrib/mutex/src/org/apache/cassandra/mutex/ClusterMutex.java
    incubator/cassandra/trunk/contrib/property_snitch/src/java/org/apache/cassandra/locator/PropertyFileEndPointSnitch.java
    incubator/cassandra/trunk/contrib/word_count/src/WordCount.java
    incubator/cassandra/trunk/contrib/word_count/src/WordCountSetup.java
    incubator/cassandra/trunk/src/java/org/apache/cassandra/avro/CassandraDaemon.java
    incubator/cassandra/trunk/src/java/org/apache/cassandra/avro/CassandraServer.java
    incubator/cassandra/trunk/src/java/org/apache/cassandra/client/RingCache.java
    incubator/cassandra/trunk/src/java/org/apache/cassandra/concurrent/DebuggableThreadPoolExecutor.java
    incubator/cassandra/trunk/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
    incubator/cassandra/trunk/src/java/org/apache/cassandra/db/BinaryMemtable.java
    incubator/cassandra/trunk/src/java/org/apache/cassandra/db/BinaryVerbHandler.java
    incubator/cassandra/trunk/src/java/org/apache/cassandra/db/Column.java
    incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamily.java
    incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
    incubator/cassandra/trunk/src/java/org/apache/cassandra/db/CompactionManager.java
    incubator/cassandra/trunk/src/java/org/apache/cassandra/db/HintedHandOffManager.java
    incubator/cassandra/trunk/src/java/org/apache/cassandra/db/Memtable.java
    incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ReadRepairVerbHandler.java
    incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ReadVerbHandler.java
    incubator/cassandra/trunk/src/java/org/apache/cassandra/db/Row.java
    incubator/cassandra/trunk/src/java/org/apache/cassandra/db/RowMutationVerbHandler.java
    incubator/cassandra/trunk/src/java/org/apache/cassandra/db/SuperColumn.java
    incubator/cassandra/trunk/src/java/org/apache/cassandra/db/SystemTable.java
    incubator/cassandra/trunk/src/java/org/apache/cassandra/db/Table.java
    incubator/cassandra/trunk/src/java/org/apache/cassandra/db/commitlog/CommitLog.java
    incubator/cassandra/trunk/src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java
    incubator/cassandra/trunk/src/java/org/apache/cassandra/db/filter/SliceQueryFilter.java
    incubator/cassandra/trunk/src/java/org/apache/cassandra/dht/BootStrapper.java
    incubator/cassandra/trunk/src/java/org/apache/cassandra/gms/EndPointState.java
    incubator/cassandra/trunk/src/java/org/apache/cassandra/gms/FailureDetector.java
    incubator/cassandra/trunk/src/java/org/apache/cassandra/gms/GossipDigestSynMessage.java
    incubator/cassandra/trunk/src/java/org/apache/cassandra/gms/Gossiper.java
    incubator/cassandra/trunk/src/java/org/apache/cassandra/hadoop/ColumnFamilyInputFormat.java
    incubator/cassandra/trunk/src/java/org/apache/cassandra/io/CompactionIterator.java
    incubator/cassandra/trunk/src/java/org/apache/cassandra/io/sstable/RowIndexedReader.java
    incubator/cassandra/trunk/src/java/org/apache/cassandra/io/sstable/RowIndexedScanner.java
    incubator/cassandra/trunk/src/java/org/apache/cassandra/io/sstable/SSTable.java
    incubator/cassandra/trunk/src/java/org/apache/cassandra/io/sstable/SSTableDeletingReference.java
    incubator/cassandra/trunk/src/java/org/apache/cassandra/io/sstable/SSTableReader.java
    incubator/cassandra/trunk/src/java/org/apache/cassandra/io/sstable/SSTableScanner.java
    incubator/cassandra/trunk/src/java/org/apache/cassandra/io/sstable/SSTableTracker.java
    incubator/cassandra/trunk/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java
    incubator/cassandra/trunk/src/java/org/apache/cassandra/io/util/FileUtils.java
    incubator/cassandra/trunk/src/java/org/apache/cassandra/locator/AbstractReplicationStrategy.java
    incubator/cassandra/trunk/src/java/org/apache/cassandra/locator/DatacenterEndPointSnitch.java
    incubator/cassandra/trunk/src/java/org/apache/cassandra/net/AsyncResult.java
    incubator/cassandra/trunk/src/java/org/apache/cassandra/net/FileStreamTask.java
    incubator/cassandra/trunk/src/java/org/apache/cassandra/net/IncomingTcpConnection.java
    incubator/cassandra/trunk/src/java/org/apache/cassandra/net/MessageDeliveryTask.java
    incubator/cassandra/trunk/src/java/org/apache/cassandra/net/MessageDeserializationTask.java
    incubator/cassandra/trunk/src/java/org/apache/cassandra/net/MessagingService.java
    incubator/cassandra/trunk/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
    incubator/cassandra/trunk/src/java/org/apache/cassandra/net/OutboundTcpConnectionPool.java
    incubator/cassandra/trunk/src/java/org/apache/cassandra/net/ResponseVerbHandler.java
    incubator/cassandra/trunk/src/java/org/apache/cassandra/service/AntiEntropyService.java
    incubator/cassandra/trunk/src/java/org/apache/cassandra/service/ConsistencyManager.java
    incubator/cassandra/trunk/src/java/org/apache/cassandra/service/GCInspector.java
    incubator/cassandra/trunk/src/java/org/apache/cassandra/service/LoadDisseminator.java
    incubator/cassandra/trunk/src/java/org/apache/cassandra/service/QuorumResponseHandler.java
    incubator/cassandra/trunk/src/java/org/apache/cassandra/service/RangeSliceResponseResolver.java
    incubator/cassandra/trunk/src/java/org/apache/cassandra/service/RangeSliceVerbHandler.java
    incubator/cassandra/trunk/src/java/org/apache/cassandra/service/ReadRepairManager.java
    incubator/cassandra/trunk/src/java/org/apache/cassandra/service/ReadResponseResolver.java
    incubator/cassandra/trunk/src/java/org/apache/cassandra/service/StorageLoadBalancer.java
    incubator/cassandra/trunk/src/java/org/apache/cassandra/service/StorageProxy.java
    incubator/cassandra/trunk/src/java/org/apache/cassandra/service/StorageService.java
    incubator/cassandra/trunk/src/java/org/apache/cassandra/service/WriteResponseHandler.java
    incubator/cassandra/trunk/src/java/org/apache/cassandra/streaming/IncomingStreamReader.java
    incubator/cassandra/trunk/src/java/org/apache/cassandra/streaming/StreamCompletionHandler.java
    incubator/cassandra/trunk/src/java/org/apache/cassandra/streaming/StreamFinishedVerbHandler.java
    incubator/cassandra/trunk/src/java/org/apache/cassandra/streaming/StreamIn.java
    incubator/cassandra/trunk/src/java/org/apache/cassandra/streaming/StreamInManager.java
    incubator/cassandra/trunk/src/java/org/apache/cassandra/streaming/StreamInitiateDoneVerbHandler.java
    incubator/cassandra/trunk/src/java/org/apache/cassandra/streaming/StreamInitiateVerbHandler.java
    incubator/cassandra/trunk/src/java/org/apache/cassandra/streaming/StreamOut.java
    incubator/cassandra/trunk/src/java/org/apache/cassandra/streaming/StreamOutManager.java
    incubator/cassandra/trunk/src/java/org/apache/cassandra/streaming/StreamRequestVerbHandler.java
    incubator/cassandra/trunk/src/java/org/apache/cassandra/streaming/StreamingService.java
    incubator/cassandra/trunk/src/java/org/apache/cassandra/thrift/CassandraDaemon.java
    incubator/cassandra/trunk/src/java/org/apache/cassandra/thrift/CassandraServer.java
    incubator/cassandra/trunk/src/java/org/apache/cassandra/utils/BloomFilter.java
    incubator/cassandra/trunk/src/java/org/apache/cassandra/utils/ExpiringMap.java
    incubator/cassandra/trunk/src/java/org/apache/cassandra/utils/FBUtilities.java
    incubator/cassandra/trunk/src/java/org/apache/cassandra/utils/GuidGenerator.java
    incubator/cassandra/trunk/test/unit/org/apache/cassandra/CleanupHelper.java
    incubator/cassandra/trunk/test/unit/org/apache/cassandra/utils/MerkleTreeTest.java

Modified: incubator/cassandra/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/CHANGES.txt?rev=922409&r1=922408&r2=922409&view=diff
==============================================================================
--- incubator/cassandra/trunk/CHANGES.txt (original)
+++ incubator/cassandra/trunk/CHANGES.txt Fri Mar 12 20:01:07 2010
@@ -1,6 +1,7 @@
 dev
  * sstable versioning (CASSANDRA-389)
  * bitmask matching in SliceRange queries (CASSANDRA-764)
+ * switched to slf4j logging (CASSANDRA-625)
 
 
 0.6.0-RC1

Modified: incubator/cassandra/trunk/contrib/mutex/src/org/apache/cassandra/mutex/ClusterMutex.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/contrib/mutex/src/org/apache/cassandra/mutex/ClusterMutex.java?rev=922409&r1=922408&r2=922409&view=diff
==============================================================================
--- incubator/cassandra/trunk/contrib/mutex/src/org/apache/cassandra/mutex/ClusterMutex.java (original)
+++ incubator/cassandra/trunk/contrib/mutex/src/org/apache/cassandra/mutex/ClusterMutex.java Fri Mar 12 20:01:07 2010
@@ -23,7 +23,8 @@ import java.io.IOException;
 
 import org.apache.cassandra.config.DatabaseDescriptor;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.apache.zookeeper.ZooKeeper;
 import org.apache.zookeeper.Watcher;
@@ -38,7 +39,7 @@ import org.apache.zookeeper.Watcher.Even
 
 public class ClusterMutex implements Watcher
 {
-    private static Logger logger = Logger.getLogger(ClusterMutex.class);
+    private static Logger logger = LoggerFactory.getLogger(ClusterMutex.class);
 
     private static ClusterMutex instance;
 

Modified: incubator/cassandra/trunk/contrib/property_snitch/src/java/org/apache/cassandra/locator/PropertyFileEndPointSnitch.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/contrib/property_snitch/src/java/org/apache/cassandra/locator/PropertyFileEndPointSnitch.java?rev=922409&r1=922408&r2=922409&view=diff
==============================================================================
--- incubator/cassandra/trunk/contrib/property_snitch/src/java/org/apache/cassandra/locator/PropertyFileEndPointSnitch.java (original)
+++ incubator/cassandra/trunk/contrib/property_snitch/src/java/org/apache/cassandra/locator/PropertyFileEndPointSnitch.java Fri Mar 12 20:01:07 2010
@@ -31,7 +31,8 @@ import javax.management.ObjectName;
 
 import org.apache.cassandra.locator.EndPointSnitch;
 import java.net.InetAddress;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * PropertyFileEndPointSnitch
@@ -61,7 +62,7 @@ public class PropertyFileEndPointSnitch 
     /**
      * Reference to the logger.
      */
-    private static Logger logger_ = Logger.getLogger(PropertyFileEndPointSnitch.class);     
+    private static Logger logger_ = LoggerFactory.getLogger(PropertyFileEndPointSnitch.class);     
 
     public PropertyFileEndPointSnitch() throws IOException {
         reloadConfiguration();
@@ -88,7 +89,7 @@ public class PropertyFileEndPointSnitch 
         String value = hostProperties.getProperty(key);
         if (value == null)
         {
-            logger_.error("Could not find end point information for " + key + ", will use default.");
+            logger_.error("Could not find end point information for {}, will use default.", key);
             value = hostProperties.getProperty("default");
         }
         StringTokenizer st = new StringTokenizer(value, ":");

Modified: incubator/cassandra/trunk/contrib/word_count/src/WordCount.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/contrib/word_count/src/WordCount.java?rev=922409&r1=922408&r2=922409&view=diff
==============================================================================
--- incubator/cassandra/trunk/contrib/word_count/src/WordCount.java (original)
+++ incubator/cassandra/trunk/contrib/word_count/src/WordCount.java Fri Mar 12 20:01:07 2010
@@ -21,7 +21,8 @@ import java.util.Arrays;
 import java.util.SortedMap;
 import java.util.StringTokenizer;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.apache.cassandra.db.IColumn;
 import org.apache.cassandra.hadoop.ColumnFamilyInputFormat;
@@ -47,7 +48,7 @@ import org.apache.hadoop.util.ToolRunner
  */
 public class WordCount extends Configured implements Tool
 {
-    private static final Logger logger = Logger.getLogger(WordCount.class);
+    private static final Logger logger = LoggerFactory.getLogger(WordCount.class);
 
     static final String KEYSPACE = "Keyspace1";
     static final String COLUMN_FAMILY = "Standard1";

Modified: incubator/cassandra/trunk/contrib/word_count/src/WordCountSetup.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/contrib/word_count/src/WordCountSetup.java?rev=922409&r1=922408&r2=922409&view=diff
==============================================================================
--- incubator/cassandra/trunk/contrib/word_count/src/WordCountSetup.java (original)
+++ incubator/cassandra/trunk/contrib/word_count/src/WordCountSetup.java Fri Mar 12 20:01:07 2010
@@ -18,7 +18,8 @@
 
 import java.util.Arrays;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.apache.cassandra.db.*;
 import org.apache.cassandra.service.StorageProxy;
@@ -27,7 +28,7 @@ import org.apache.cassandra.thrift.Consi
 
 public class WordCountSetup
 {
-    private static final Logger logger = Logger.getLogger(WordCountSetup.class);
+    private static final Logger logger = LoggerFactory.getLogger(WordCountSetup.class);
 
     public static final int TEST_COUNT = 4;
 

Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/avro/CassandraDaemon.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/avro/CassandraDaemon.java?rev=922409&r1=922408&r2=922409&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/avro/CassandraDaemon.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/avro/CassandraDaemon.java Fri Mar 12 20:01:07 2010
@@ -32,7 +32,10 @@ import org.apache.cassandra.db.Table;
 import org.apache.cassandra.db.commitlog.CommitLog;
 import org.apache.cassandra.service.StorageService;
 import org.apache.cassandra.utils.FBUtilities;
-import org.apache.log4j.Logger;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import org.apache.log4j.PropertyConfigurator;
 
 /**
@@ -40,7 +43,7 @@ import org.apache.log4j.PropertyConfigur
  *
  */
 public class CassandraDaemon {
-    private static Logger logger = Logger.getLogger(CassandraDaemon.class);
+    private static Logger logger = LoggerFactory.getLogger(CassandraDaemon.class);
     private HttpServer server;
     private InetAddress listenAddr;
     private int listenPort;

Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/avro/CassandraServer.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/avro/CassandraServer.java?rev=922409&r1=922408&r2=922409&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/avro/CassandraServer.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/avro/CassandraServer.java Fri Mar 12 20:01:07 2010
@@ -45,12 +45,13 @@ import org.apache.cassandra.db.SliceByNa
 import org.apache.cassandra.db.filter.QueryPath;
 import org.apache.cassandra.db.marshal.MarshalException;
 import org.apache.cassandra.service.StorageProxy;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import static org.apache.cassandra.avro.AvroRecordFactory.*;
 import static org.apache.cassandra.avro.ErrorFactory.*;
 
 public class CassandraServer implements Cassandra {
-    private static Logger logger = Logger.getLogger(CassandraServer.class);
+    private static Logger logger = LoggerFactory.getLogger(CassandraServer.class);
 
     private final static GenericArray<Column> EMPTY_SUBCOLUMNS = new GenericData.Array<Column>(0, Schema.parse("{\"type\":\"array\",\"items\":" + Column.SCHEMA$ + "}"));
     private final static Utf8 API_VERSION = new Utf8("0.0.0");

Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/client/RingCache.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/client/RingCache.java?rev=922409&r1=922408&r2=922409&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/client/RingCache.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/client/RingCache.java Fri Mar 12 20:01:07 2010
@@ -30,7 +30,8 @@ import java.net.UnknownHostException;
 import org.apache.cassandra.service.StorageService;
 import org.apache.cassandra.thrift.Cassandra;
 import org.apache.cassandra.thrift.CassandraServer;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.thrift.TException;
 import org.apache.thrift.protocol.TBinaryProtocol;
 import org.apache.thrift.transport.TSocket;
@@ -45,7 +46,7 @@ import com.google.common.collect.HashBiM
  */
 public class RingCache
 {
-    final private static Logger logger_ = Logger.getLogger(RingCache.class);
+    final private static Logger logger_ = LoggerFactory.getLogger(RingCache.class);
 
     private Set<String> seeds_ = new HashSet<String>();
     final private int port_= DatabaseDescriptor.getRpcPort();

Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/concurrent/DebuggableThreadPoolExecutor.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/concurrent/DebuggableThreadPoolExecutor.java?rev=922409&r1=922408&r2=922409&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/concurrent/DebuggableThreadPoolExecutor.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/concurrent/DebuggableThreadPoolExecutor.java Fri Mar 12 20:01:07 2010
@@ -23,11 +23,12 @@ package org.apache.cassandra.concurrent;
 
 import java.util.concurrent.*;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class DebuggableThreadPoolExecutor extends ThreadPoolExecutor
 {
-    protected static Logger logger = Logger.getLogger(JMXEnabledThreadPoolExecutor.class);
+    protected static Logger logger = LoggerFactory.getLogger(JMXEnabledThreadPoolExecutor.class);
 
     public DebuggableThreadPoolExecutor(String threadPoolName)
     {

Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/config/DatabaseDescriptor.java?rev=922409&r1=922408&r2=922409&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/config/DatabaseDescriptor.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/config/DatabaseDescriptor.java Fri Mar 12 20:01:07 2010
@@ -32,7 +32,8 @@ import org.apache.cassandra.locator.Abst
 import org.apache.cassandra.io.util.FileUtils;
 import org.apache.cassandra.utils.FBUtilities;
 import org.apache.cassandra.utils.XMLUtils;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 import org.xml.sax.SAXException;
@@ -50,7 +51,7 @@ import java.net.URL;
 
 public class DatabaseDescriptor
 {
-    private static Logger logger = Logger.getLogger(DatabaseDescriptor.class);
+    private static Logger logger = LoggerFactory.getLogger(DatabaseDescriptor.class);
 
     // don't capitalize these; we need them to match what's in the config file for CLS.valueOf to parse
     public static enum CommitLogSync {

Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/db/BinaryMemtable.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/db/BinaryMemtable.java?rev=922409&r1=922408&r2=922409&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/db/BinaryMemtable.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/db/BinaryMemtable.java Fri Mar 12 20:01:07 2010
@@ -26,7 +26,8 @@ import java.util.concurrent.locks.Condit
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.apache.cassandra.config.DatabaseDescriptor;
 import org.apache.cassandra.dht.IPartitioner;
@@ -38,7 +39,7 @@ import org.cliffc.high_scale_lib.NonBloc
 
 public class BinaryMemtable implements IFlushable
 {
-    private static final Logger logger = Logger.getLogger(BinaryMemtable.class);
+    private static final Logger logger = LoggerFactory.getLogger(BinaryMemtable.class);
     private final int threshold = DatabaseDescriptor.getBMTThreshold() * 1024 * 1024;
     private final AtomicInteger currentSize = new AtomicInteger(0);
 

Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/db/BinaryVerbHandler.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/db/BinaryVerbHandler.java?rev=922409&r1=922408&r2=922409&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/db/BinaryVerbHandler.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/db/BinaryVerbHandler.java Fri Mar 12 20:01:07 2010
@@ -24,11 +24,12 @@ import java.io.DataInputStream;
 import org.apache.cassandra.net.IVerbHandler;
 import org.apache.cassandra.net.Message;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class BinaryVerbHandler implements IVerbHandler
 {
-    private static Logger logger_ = Logger.getLogger(BinaryVerbHandler.class);
+    private static Logger logger_ = LoggerFactory.getLogger(BinaryVerbHandler.class);
 
     public void doVerb(Message message)
     { 

Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/db/Column.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/db/Column.java?rev=922409&r1=922408&r2=922409&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/db/Column.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/db/Column.java Fri Mar 12 20:01:07 2010
@@ -23,7 +23,8 @@ import java.nio.ByteBuffer;
 import java.security.MessageDigest;
 import java.io.IOException;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.commons.lang.ArrayUtils;
 
 import org.apache.cassandra.db.marshal.AbstractType;
@@ -38,7 +39,7 @@ import org.apache.cassandra.io.util.Data
 
 public class Column implements IColumn
 {
-    private static Logger logger_ = Logger.getLogger(Column.class);
+    private static Logger logger_ = LoggerFactory.getLogger(Column.class);
 
     private static ColumnSerializer serializer_ = new ColumnSerializer();
 

Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamily.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamily.java?rev=922409&r1=922408&r2=922409&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamily.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamily.java Fri Mar 12 20:01:07 2010
@@ -29,7 +29,8 @@ import java.security.NoSuchAlgorithmExce
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicLong;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.apache.cassandra.config.DatabaseDescriptor;
 import org.apache.cassandra.io.ICompactSerializer2;
@@ -43,7 +44,7 @@ public class ColumnFamily implements ICo
     /* The column serializer for this Column Family. Create based on config. */
     private static ColumnFamilySerializer serializer_ = new ColumnFamilySerializer();
 
-    private static Logger logger_ = Logger.getLogger( ColumnFamily.class );
+    private static Logger logger_ = LoggerFactory.getLogger( ColumnFamily.class );
     private static Map<String, String> columnTypes_ = new HashMap<String, String>();
     String type_;
 

Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java?rev=922409&r1=922408&r2=922409&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java Fri Mar 12 20:01:07 2010
@@ -32,7 +32,8 @@ import java.util.regex.Pattern;
 import javax.management.MBeanServer;
 import javax.management.ObjectName;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.commons.collections.IteratorUtils;
 
 import com.google.common.base.Predicate;
@@ -61,7 +62,7 @@ import org.apache.cassandra.utils.*;
 
 public class ColumnFamilyStore implements ColumnFamilyStoreMBean
 {
-    private static Logger logger_ = Logger.getLogger(ColumnFamilyStore.class);
+    private static Logger logger_ = LoggerFactory.getLogger(ColumnFamilyStore.class);
 
     /*
      * submitFlush first puts [Binary]Memtable.getSortedContents on the flushSorter executor,
@@ -129,7 +130,7 @@ public class ColumnFamilyStore implement
         binaryMemtable_ = new AtomicReference<BinaryMemtable>(new BinaryMemtable(this));
 
         if (logger_.isDebugEnabled())
-            logger_.debug("Starting CFS " + columnFamily_);
+            logger_.debug("Starting CFS {}", columnFamily_);
         // scan for data files corresponding to this CF
         List<File> sstableFiles = new ArrayList<File>();
         Pattern auxFilePattern = Pattern.compile("(.*)(-Filter\\.db$|-Index\\.db$)");
@@ -563,7 +564,7 @@ public class ColumnFamilyStore implement
      */
     Condition submitFlush(IFlushable flushable)
     {
-        logger_.info("Enqueuing flush of " + flushable);
+        logger_.info("Enqueuing flush of {}", flushable);
         final Condition condition = new SimpleCondition();
         flushable.flushAndSignal(condition, flushSorter_, flushWriter_);
         return condition;

Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/db/CompactionManager.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/db/CompactionManager.java?rev=922409&r1=922408&r2=922409&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/db/CompactionManager.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/db/CompactionManager.java Fri Mar 12 20:01:07 2010
@@ -30,7 +30,10 @@ import javax.management.*;
 
 import org.apache.cassandra.db.filter.QueryPath;
 import org.apache.cassandra.db.filter.SliceQueryFilter;
-import org.apache.log4j.Logger;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 
 import org.apache.cassandra.concurrent.DebuggableThreadPoolExecutor;
 import org.apache.cassandra.dht.Range;
@@ -53,7 +56,7 @@ import org.apache.commons.collections.Pr
 public class CompactionManager implements CompactionManagerMBean
 {
     public static final String MBEAN_OBJECT_NAME = "org.apache.cassandra.db:type=CompactionManager";
-    private static final Logger logger = Logger.getLogger(CompactionManager.class);
+    private static final Logger logger = LoggerFactory.getLogger(CompactionManager.class);
     public static final CompactionManager instance;
 
     private int minimumCompactionThreshold = 4; // compact this many sstables min at a time

Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/db/HintedHandOffManager.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/db/HintedHandOffManager.java?rev=922409&r1=922408&r2=922409&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/db/HintedHandOffManager.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/db/HintedHandOffManager.java Fri Mar 12 20:01:07 2010
@@ -24,7 +24,8 @@ import java.util.concurrent.TimeoutExcep
 import java.util.concurrent.ExecutorService;
 import java.io.IOException;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.apache.cassandra.concurrent.JMXEnabledThreadPoolExecutor;
 import org.apache.cassandra.config.DatabaseDescriptor;
@@ -81,7 +82,7 @@ public class HintedHandOffManager
 {
     public static final HintedHandOffManager instance = new HintedHandOffManager();
 
-    private static final Logger logger_ = Logger.getLogger(HintedHandOffManager.class);
+    private static final Logger logger_ = LoggerFactory.getLogger(HintedHandOffManager.class);
     final static long INTERVAL_IN_MS = 3600 * 1000; // check for ability to deliver hints this often
     public static final String HINTS_CF = "HintsColumnFamily";
     private static final int PAGE_SIZE = 10000;

Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/db/Memtable.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/db/Memtable.java?rev=922409&r1=922408&r2=922409&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/db/Memtable.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/db/Memtable.java Fri Mar 12 20:01:07 2010
@@ -26,7 +26,8 @@ import java.util.concurrent.ExecutorServ
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.locks.Condition;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.commons.lang.ArrayUtils;
 
 import org.apache.cassandra.config.DatabaseDescriptor;
@@ -41,7 +42,7 @@ import org.apache.cassandra.utils.Wrappe
 
 public class Memtable implements Comparable<Memtable>, IFlushable
 {
-    private static final Logger logger = Logger.getLogger(Memtable.class);
+    private static final Logger logger = LoggerFactory.getLogger(Memtable.class);
 
     private boolean isFrozen;
 

Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ReadRepairVerbHandler.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ReadRepairVerbHandler.java?rev=922409&r1=922408&r2=922409&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ReadRepairVerbHandler.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ReadRepairVerbHandler.java Fri Mar 12 20:01:07 2010
@@ -23,11 +23,12 @@ import java.io.*;
 import org.apache.cassandra.net.IVerbHandler;
 import org.apache.cassandra.net.Message;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class ReadRepairVerbHandler implements IVerbHandler
 {
-    private static Logger logger_ = Logger.getLogger(ReadRepairVerbHandler.class);    
+    private static Logger logger_ = LoggerFactory.getLogger(ReadRepairVerbHandler.class);    
     
     public void doVerb(Message message)
     {          

Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ReadVerbHandler.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ReadVerbHandler.java?rev=922409&r1=922408&r2=922409&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ReadVerbHandler.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ReadVerbHandler.java Fri Mar 12 20:01:07 2010
@@ -32,7 +32,8 @@ import org.apache.cassandra.net.Messagin
 import org.apache.cassandra.service.StorageService;
 import org.apache.cassandra.utils.FBUtilities;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class ReadVerbHandler implements IVerbHandler
 {
@@ -42,7 +43,7 @@ public class ReadVerbHandler implements 
         protected DataOutputBuffer bufOut_ = new DataOutputBuffer();
     }
 
-    private static Logger logger_ = Logger.getLogger( ReadVerbHandler.class );
+    private static Logger logger_ = LoggerFactory.getLogger( ReadVerbHandler.class );
     /* We use this so that we can reuse the same row mutation context for the mutation. */
     private static ThreadLocal<ReadVerbHandler.ReadContext> tls_ = new InheritableThreadLocal<ReadVerbHandler.ReadContext>();
     

Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/db/Row.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/db/Row.java?rev=922409&r1=922408&r2=922409&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/db/Row.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/db/Row.java Fri Mar 12 20:01:07 2010
@@ -25,13 +25,14 @@ import java.util.Collection;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.apache.cassandra.io.ICompactSerializer;
 
 public class Row
 {
-    private static Logger logger_ = Logger.getLogger(Row.class);
+    private static Logger logger_ = LoggerFactory.getLogger(Row.class);
     private static RowSerializer serializer = new RowSerializer();
 
     static RowSerializer serializer()

Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/db/RowMutationVerbHandler.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/db/RowMutationVerbHandler.java?rev=922409&r1=922408&r2=922409&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/db/RowMutationVerbHandler.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/db/RowMutationVerbHandler.java Fri Mar 12 20:01:07 2010
@@ -26,14 +26,15 @@ import java.nio.ByteBuffer;
 import org.apache.cassandra.net.IVerbHandler;
 import org.apache.cassandra.net.Message;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.apache.cassandra.net.*;
 import org.apache.cassandra.utils.FBUtilities;
 
 public class RowMutationVerbHandler implements IVerbHandler
 {
-    private static Logger logger_ = Logger.getLogger(RowMutationVerbHandler.class);
+    private static Logger logger_ = LoggerFactory.getLogger(RowMutationVerbHandler.class);
 
     public void doVerb(Message message)
     {

Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/db/SuperColumn.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/db/SuperColumn.java?rev=922409&r1=922408&r2=922409&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/db/SuperColumn.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/db/SuperColumn.java Fri Mar 12 20:01:07 2010
@@ -25,7 +25,8 @@ import java.security.MessageDigest;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicLong;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.apache.cassandra.io.ICompactSerializer2;
 import org.apache.cassandra.io.util.DataOutputBuffer;
@@ -35,7 +36,7 @@ import org.apache.cassandra.utils.FBUtil
 
 public class SuperColumn implements IColumn, IColumnContainer
 {
-	private static Logger logger_ = Logger.getLogger(SuperColumn.class);
+	private static Logger logger_ = LoggerFactory.getLogger(SuperColumn.class);
 
     public static SuperColumnSerializer serializer(AbstractType comparator)
     {

Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/db/SystemTable.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/db/SystemTable.java?rev=922409&r1=922408&r2=922409&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/db/SystemTable.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/db/SystemTable.java Fri Mar 12 20:01:07 2010
@@ -25,8 +25,10 @@ import java.io.IOError;
 import org.apache.cassandra.config.CFMetaData;
 import org.apache.cassandra.db.filter.SliceQueryFilter;
 import org.apache.cassandra.utils.FBUtilities;
+
 import org.apache.commons.lang.ArrayUtils;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.apache.cassandra.service.StorageService;
 import org.apache.cassandra.dht.Token;
@@ -44,7 +46,7 @@ import java.util.TreeSet;
 
 public class SystemTable
 {
-    private static Logger logger = Logger.getLogger(SystemTable.class);
+    private static Logger logger = LoggerFactory.getLogger(SystemTable.class);
     public static final String STATUS_CF = "LocationInfo"; // keep the old CF string for backwards-compatibility
     private static final String LOCATION_KEY = "L";
     private static final String BOOTSTRAP_KEY = "Bootstrap";

Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/db/Table.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/db/Table.java?rev=922409&r1=922408&r2=922409&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/db/Table.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/db/Table.java Fri Mar 12 20:01:07 2010
@@ -44,14 +44,15 @@ import org.apache.cassandra.utils.*;
 import org.apache.cassandra.db.filter.*;
 import org.cliffc.high_scale_lib.NonBlockingHashMap;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class Table 
 {
     public static final String SYSTEM_TABLE = "system";
     public static final String DEFINITIONS = "definitions";
 
-    private static final Logger logger = Logger.getLogger(Table.class);
+    private static final Logger logger = LoggerFactory.getLogger(Table.class);
     private static final String SNAPSHOT_SUBDIR_NAME = "snapshots";
     /* we use this lock to drain updaters before calling a flush. */
     static final ReentrantReadWriteLock flusherLock = new ReentrantReadWriteLock(true);

Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/db/commitlog/CommitLog.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/db/commitlog/CommitLog.java?rev=922409&r1=922408&r2=922409&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/db/commitlog/CommitLog.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/db/commitlog/CommitLog.java Fri Mar 12 20:01:07 2010
@@ -34,7 +34,8 @@ import org.apache.cassandra.utils.Wrappe
 import org.apache.cassandra.concurrent.StageManager;
 
 import org.apache.commons.lang.StringUtils;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.*;
 import java.util.*;
@@ -77,7 +78,7 @@ public class CommitLog
 {
     private static volatile int SEGMENT_SIZE = 128*1024*1024; // roll after log gets this big
 
-    static final Logger logger = Logger.getLogger(CommitLog.class);
+    static final Logger logger = LoggerFactory.getLogger(CommitLog.class);
 
     public static CommitLog instance()
     {

Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java?rev=922409&r1=922408&r2=922409&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java Fri Mar 12 20:01:07 2010
@@ -28,7 +28,9 @@ import java.util.zip.CRC32;
 import java.util.zip.Checksum;
 
 import org.apache.cassandra.config.CFMetaData;
-import org.apache.log4j.Logger;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.apache.cassandra.config.DatabaseDescriptor;
 import org.apache.cassandra.db.ColumnFamily;
@@ -39,7 +41,7 @@ import org.apache.cassandra.io.util.Data
 
 public class CommitLogSegment
 {
-    private static final Logger logger = Logger.getLogger(CommitLogSegment.class);
+    private static final Logger logger = LoggerFactory.getLogger(CommitLogSegment.class);
 
     private final BufferedRandomAccessFile logWriter;
     private final CommitLogHeader header;

Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/db/filter/SliceQueryFilter.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/db/filter/SliceQueryFilter.java?rev=922409&r1=922408&r2=922409&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/db/filter/SliceQueryFilter.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/db/filter/SliceQueryFilter.java Fri Mar 12 20:01:07 2010
@@ -24,7 +24,8 @@ package org.apache.cassandra.db.filter;
 import java.io.IOException;
 import java.util.*;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.commons.collections.comparators.ReverseComparator;
 import org.apache.commons.collections.iterators.ReverseListIterator;
 import org.apache.commons.collections.IteratorUtils;
@@ -40,7 +41,7 @@ import com.google.common.collect.Iterato
 
 public class SliceQueryFilter extends QueryFilter
 {
-    private static Logger logger = Logger.getLogger(SliceQueryFilter.class);
+    private static Logger logger = LoggerFactory.getLogger(SliceQueryFilter.class);
 
     public final byte[] start, finish;
     public final List<byte[]> bitmasks;

Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/dht/BootStrapper.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/dht/BootStrapper.java?rev=922409&r1=922408&r2=922409&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/dht/BootStrapper.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/dht/BootStrapper.java Fri Mar 12 20:01:07 2010
@@ -25,7 +25,8 @@ package org.apache.cassandra.dht;
  import java.net.InetAddress;
 
  import org.apache.commons.lang.StringUtils;
- import org.apache.log4j.Logger;
+ import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
  import org.apache.commons.lang.ArrayUtils;
 
@@ -45,7 +46,7 @@ package org.apache.cassandra.dht;
 
 public class BootStrapper
 {
-    private static final Logger logger = Logger.getLogger(BootStrapper.class);
+    private static final Logger logger = LoggerFactory.getLogger(BootStrapper.class);
 
     /* endpoints that need to be bootstrapped */
     protected final InetAddress address;

Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/gms/EndPointState.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/gms/EndPointState.java?rev=922409&r1=922408&r2=922409&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/gms/EndPointState.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/gms/EndPointState.java Fri Mar 12 20:01:07 2010
@@ -25,7 +25,8 @@ import java.util.*;
 import org.apache.cassandra.io.ICompactSerializer;
 import org.apache.cassandra.service.StorageService;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * This abstraction represents both the HeartBeatState and the ApplicationState in an EndPointState
@@ -156,7 +157,7 @@ public class EndPointState
 
 class EndPointStateSerializer implements ICompactSerializer<EndPointState>
 {
-    private static Logger logger_ = Logger.getLogger(EndPointStateSerializer.class);
+    private static Logger logger_ = LoggerFactory.getLogger(EndPointStateSerializer.class);
     
     public void serialize(EndPointState epState, DataOutputStream dos) throws IOException
     {
@@ -177,7 +178,7 @@ class EndPointStateSerializer implements
             {
                 if ( Gossiper.MAX_GOSSIP_PACKET_SIZE - dos.size() < estimate )
                 {
-                    logger_.info("@@@@ Breaking out to respect the MTU size in EndPointState serializer. Estimate is " + estimate + " @@@@");
+                    logger_.info("@@@@ Breaking out to respect the MTU size in EndPointState serializer. Estimate is {} @@@@", estimate);;
                     break;
                 }
             

Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/gms/FailureDetector.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/gms/FailureDetector.java?rev=922409&r1=922408&r2=922409&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/gms/FailureDetector.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/gms/FailureDetector.java Fri Mar 12 20:01:07 2010
@@ -33,7 +33,8 @@ import org.apache.commons.lang.StringUti
 import java.net.InetAddress;
 import org.apache.cassandra.utils.FBUtilities;
 import org.apache.cassandra.utils.BoundedStatsDeque;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * This FailureDetector is an implementation of the paper titled
@@ -43,7 +44,7 @@ import org.apache.log4j.Logger;
 public class FailureDetector implements IFailureDetector, FailureDetectorMBean
 {
     public static final IFailureDetector instance = new FailureDetector();
-    private static Logger logger_ = Logger.getLogger(FailureDetector.class);
+    private static Logger logger_ = LoggerFactory.getLogger(FailureDetector.class);
     private static final int sampleSize_ = 1000;
     private static final int phiConvictThreshold_ = 8;
     /* The Failure Detector has to have been up for at least 1 min. */
@@ -126,7 +127,7 @@ public class FailureDetector implements 
     public void report(InetAddress ep)
     {
         if (logger_.isTraceEnabled())
-            logger_.trace("reporting " + ep);
+            logger_.trace("reporting {}", ep);
         long now = System.currentTimeMillis();
         ArrivalWindow heartbeatWindow = arrivalSamples_.get(ep);
         if ( heartbeatWindow == null )
@@ -197,7 +198,7 @@ public class FailureDetector implements 
 
 class ArrivalWindow
 {
-    private static Logger logger_ = Logger.getLogger(ArrivalWindow.class);
+    private static Logger logger_ = LoggerFactory.getLogger(ArrivalWindow.class);
     private double tLast_ = 0L;
     private BoundedStatsDeque arrivalIntervals_;
 

Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/gms/GossipDigestSynMessage.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/gms/GossipDigestSynMessage.java?rev=922409&r1=922408&r2=922409&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/gms/GossipDigestSynMessage.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/gms/GossipDigestSynMessage.java Fri Mar 12 20:01:07 2010
@@ -27,7 +27,8 @@ import java.util.Map.Entry;
 import org.apache.cassandra.io.ICompactSerializer;
 import org.apache.cassandra.net.CompactEndPointSerializationHelper;
 import java.net.InetAddress;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 
 /**
@@ -65,7 +66,7 @@ class GossipDigestSynMessage
 
 class GossipDigestSerializationHelper
 {
-    private static Logger logger_ = Logger.getLogger(GossipDigestSerializationHelper.class);
+    private static Logger logger_ = LoggerFactory.getLogger(GossipDigestSerializationHelper.class);
     
     static boolean serialize(List<GossipDigest> gDigestList, DataOutputStream dos) throws IOException
     {
@@ -112,7 +113,7 @@ class GossipDigestSerializationHelper
 
 class EndPointStatesSerializationHelper
 {
-    private static final Logger logger_ = Logger.getLogger(EndPointStatesSerializationHelper.class);
+    private static final Logger logger_ = LoggerFactory.getLogger(EndPointStatesSerializationHelper.class);
 
     static boolean serialize(Map<InetAddress, EndPointState> epStateMap, DataOutputStream dos) throws IOException
     {

Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/gms/Gossiper.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/gms/Gossiper.java?rev=922409&r1=922408&r2=922409&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/gms/Gossiper.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/gms/Gossiper.java Fri Mar 12 20:01:07 2010
@@ -30,7 +30,8 @@ import org.apache.cassandra.net.Message;
 import org.apache.cassandra.net.MessagingService;
 import org.apache.cassandra.service.StorageService;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * This module is responsible for Gossiping information for the local endpoint. This abstraction
@@ -101,7 +102,7 @@ public class Gossiper implements IFailur
 
     final static int MAX_GOSSIP_PACKET_SIZE = 1428;
     public final static int intervalInMillis_ = 1000;
-    private static Logger logger_ = Logger.getLogger(Gossiper.class);
+    private static Logger logger_ = LoggerFactory.getLogger(Gossiper.class);
     public static final Gossiper instance = new Gossiper();
 
     private Timer gossipTimer_;
@@ -176,7 +177,7 @@ public class Gossiper implements IFailur
         EndPointState epState = endPointStateMap_.get(endpoint);
         if (epState.isAlive())
         {
-            logger_.info("InetAddress " + endpoint + " is now dead.");
+            logger_.info("InetAddress {} is now dead.", endpoint);;
             isAlive(endpoint, epState, false);
         }
     }
@@ -317,7 +318,7 @@ public class Gossiper implements IFailur
         int index = (size == 1) ? 0 : random_.nextInt(size);
         InetAddress to = liveEndPoints.get(index);
         if (logger_.isTraceEnabled())
-            logger_.trace("Sending a GossipDigestSynMessage to " + to + " ...");
+            logger_.trace("Sending a GossipDigestSynMessage to {} ...", to);;
         MessagingService.instance.sendOneWay(message, to);
         return seeds_.contains(to);
     }
@@ -561,11 +562,11 @@ public class Gossiper implements IFailur
     void markAlive(InetAddress addr, EndPointState localState)
     {
         if (logger_.isTraceEnabled())
-            logger_.trace("marking as alive " + addr);
+            logger_.trace("marking as alive {}", addr);
         if ( !localState.isAlive() )
         {
             isAlive(addr, localState, true);
-            logger_.info("InetAddress " + addr + " is now UP");
+            logger_.info("InetAddress {} is now UP", addr);;
         }
     }
 
@@ -573,13 +574,13 @@ public class Gossiper implements IFailur
     {
         if (justRemovedEndPoints_.containsKey(ep))
             return;
-    	logger_.info("Node " + ep + " is now part of the cluster");
+    	logger_.info("Node {} is now part of the cluster", ep);;
         handleMajorStateChange(ep, epState, false);
     }
 
     private void handleGenerationChange(InetAddress ep, EndPointState epState)
     {
-        logger_.info("Node " + ep + " has restarted, now UP again");
+        logger_.info("Node {} has restarted, now UP again", ep);;
         handleMajorStateChange(ep, epState, true);
     }
 
@@ -867,13 +868,13 @@ public class Gossiper implements IFailur
 
     public static class JoinVerbHandler implements IVerbHandler
     {
-        private static Logger logger_ = Logger.getLogger( JoinVerbHandler.class);
+        private static Logger logger_ = LoggerFactory.getLogger( JoinVerbHandler.class);
 
         public void doVerb(Message message)
         {
             InetAddress from = message.getFrom();
             if (logger_.isDebugEnabled())
-              logger_.debug("Received a JoinMessage from " + from);
+              logger_.debug("Received a JoinMessage from {}", from);
 
             byte[] bytes = message.getMessageBody();
             DataInputStream dis = new DataInputStream( new ByteArrayInputStream(bytes) );
@@ -896,13 +897,13 @@ public class Gossiper implements IFailur
 
     public static class GossipDigestSynVerbHandler implements IVerbHandler
     {
-        private static Logger logger_ = Logger.getLogger( GossipDigestSynVerbHandler.class);
+        private static Logger logger_ = LoggerFactory.getLogger( GossipDigestSynVerbHandler.class);
 
         public void doVerb(Message message)
         {
             InetAddress from = message.getFrom();
             if (logger_.isTraceEnabled())
-                logger_.trace("Received a GossipDigestSynMessage from " + from);
+                logger_.trace("Received a GossipDigestSynMessage from {}", from);
 
             byte[] bytes = message.getMessageBody();
             DataInputStream dis = new DataInputStream( new ByteArrayInputStream(bytes) );
@@ -927,7 +928,7 @@ public class Gossiper implements IFailur
                 GossipDigestAckMessage gDigestAck = new GossipDigestAckMessage(deltaGossipDigestList, deltaEpStateMap);
                 Message gDigestAckMessage = Gossiper.instance.makeGossipDigestAckMessage(gDigestAck);
                 if (logger_.isTraceEnabled())
-                    logger_.trace("Sending a GossipDigestAckMessage to " + from);
+                    logger_.trace("Sending a GossipDigestAckMessage to {}", from);
                 MessagingService.instance.sendOneWay(gDigestAckMessage, from);
             }
             catch (IOException e)
@@ -982,13 +983,13 @@ public class Gossiper implements IFailur
 
     public static class GossipDigestAckVerbHandler implements IVerbHandler
     {
-        private static Logger logger_ = Logger.getLogger(GossipDigestAckVerbHandler.class);
+        private static Logger logger_ = LoggerFactory.getLogger(GossipDigestAckVerbHandler.class);
 
         public void doVerb(Message message)
         {
             InetAddress from = message.getFrom();
             if (logger_.isTraceEnabled())
-                logger_.trace("Received a GossipDigestAckMessage from " + from);
+                logger_.trace("Received a GossipDigestAckMessage from {}", from);
 
             byte[] bytes = message.getMessageBody();
             DataInputStream dis = new DataInputStream( new ByteArrayInputStream(bytes) );
@@ -1019,7 +1020,7 @@ public class Gossiper implements IFailur
                 GossipDigestAck2Message gDigestAck2 = new GossipDigestAck2Message(deltaEpStateMap);
                 Message gDigestAck2Message = Gossiper.instance.makeGossipDigestAck2Message(gDigestAck2);
                 if (logger_.isTraceEnabled())
-                    logger_.trace("Sending a GossipDigestAck2Message to " + from);
+                    logger_.trace("Sending a GossipDigestAck2Message to {}", from);
                 MessagingService.instance.sendOneWay(gDigestAck2Message, from);
             }
             catch ( IOException e )
@@ -1031,13 +1032,13 @@ public class Gossiper implements IFailur
 
     public static class GossipDigestAck2VerbHandler implements IVerbHandler
     {
-        private static Logger logger_ = Logger.getLogger(GossipDigestAck2VerbHandler.class);
+        private static Logger logger_ = LoggerFactory.getLogger(GossipDigestAck2VerbHandler.class);
 
         public void doVerb(Message message)
         {
             InetAddress from = message.getFrom();
             if (logger_.isTraceEnabled())
-                logger_.trace("Received a GossipDigestAck2Message from " + from);
+                logger_.trace("Received a GossipDigestAck2Message from {}", from);
 
             byte[] bytes = message.getMessageBody();
             DataInputStream dis = new DataInputStream( new ByteArrayInputStream(bytes) );
@@ -1056,4 +1057,4 @@ public class Gossiper implements IFailur
             Gossiper.instance.applyStateLocally(remoteEpStateMap);
         }
     }
-}
\ No newline at end of file
+}

Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/hadoop/ColumnFamilyInputFormat.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/hadoop/ColumnFamilyInputFormat.java?rev=922409&r1=922408&r2=922409&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/hadoop/ColumnFamilyInputFormat.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/hadoop/ColumnFamilyInputFormat.java Fri Mar 12 20:01:07 2010
@@ -24,7 +24,8 @@ package org.apache.cassandra.hadoop;
 import java.io.IOException;
 import java.util.*;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.apache.cassandra.config.DatabaseDescriptor;
 import org.apache.cassandra.db.IColumn;
@@ -58,7 +59,7 @@ import org.apache.thrift.transport.TTran
 public class ColumnFamilyInputFormat extends InputFormat<String, SortedMap<byte[], IColumn>>
 {
 
-    private static final Logger logger = Logger.getLogger(StorageService.class);
+    private static final Logger logger = LoggerFactory.getLogger(StorageService.class);
 
     private void validateConfiguration(Configuration conf)
     {

Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/io/CompactionIterator.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/io/CompactionIterator.java?rev=922409&r1=922408&r2=922409&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/io/CompactionIterator.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/io/CompactionIterator.java Fri Mar 12 20:01:07 2010
@@ -28,7 +28,8 @@ import java.util.List;
 import java.util.ArrayList;
 import java.util.Iterator;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.commons.collections.iterators.CollatingIterator;
 
 import org.apache.cassandra.utils.ReducingIterator;
@@ -42,7 +43,7 @@ import org.apache.cassandra.io.util.Data
 
 public class CompactionIterator extends ReducingIterator<IteratingRow, CompactionIterator.CompactedRow> implements Closeable
 {
-    private static Logger logger = Logger.getLogger(CompactionIterator.class);
+    private static Logger logger = LoggerFactory.getLogger(CompactionIterator.class);
 
     protected static final int FILE_BUFFER_SIZE = 1024 * 1024;
 

Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/io/sstable/RowIndexedReader.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/io/sstable/RowIndexedReader.java?rev=922409&r1=922408&r2=922409&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/io/sstable/RowIndexedReader.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/io/sstable/RowIndexedReader.java Fri Mar 12 20:01:07 2010
@@ -26,7 +26,8 @@ import java.lang.ref.Reference;
 import java.nio.channels.FileChannel;
 import java.nio.MappedByteBuffer;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.apache.cassandra.cache.InstrumentedCache;
 import org.apache.cassandra.dht.IPartitioner;
@@ -52,7 +53,7 @@ import com.google.common.collect.Collect
  */
 class RowIndexedReader extends SSTableReader
 {
-    private static final Logger logger = Logger.getLogger(RowIndexedReader.class);
+    private static final Logger logger = LoggerFactory.getLogger(RowIndexedReader.class);
 
     private static final long BUFFER_SIZE = Integer.MAX_VALUE;
 

Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/io/sstable/RowIndexedScanner.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/io/sstable/RowIndexedScanner.java?rev=922409&r1=922408&r2=922409&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/io/sstable/RowIndexedScanner.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/io/sstable/RowIndexedScanner.java Fri Mar 12 20:01:07 2010
@@ -30,12 +30,13 @@ import org.apache.cassandra.io.Iterating
 import org.apache.cassandra.io.util.BufferedRandomAccessFile;
 import org.apache.cassandra.io.util.FileDataInput;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 
 public class RowIndexedScanner extends SSTableScanner
 {
-    private static Logger logger = Logger.getLogger(RowIndexedScanner.class);
+    private static Logger logger = LoggerFactory.getLogger(RowIndexedScanner.class);
 
     private final BufferedRandomAccessFile file;
     private final SSTableReader sstable;

Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/io/sstable/SSTable.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/io/sstable/SSTable.java?rev=922409&r1=922408&r2=922409&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/io/sstable/SSTable.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/io/sstable/SSTable.java Fri Mar 12 20:01:07 2010
@@ -26,7 +26,8 @@ import java.util.Arrays;
 import java.util.Map;
 import java.util.StringTokenizer;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.commons.lang.StringUtils;
 
 import org.apache.cassandra.dht.IPartitioner;
@@ -50,7 +51,7 @@ import com.google.common.base.Objects;
  */
 public abstract class SSTable
 {
-    static final Logger logger = Logger.getLogger(SSTable.class);
+    static final Logger logger = LoggerFactory.getLogger(SSTable.class);
 
     public static final int FILES_ON_DISK = 3; // data, index, and bloom filter
     public static final String COMPONENT_DATA = "Data.db";

Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/io/sstable/SSTableDeletingReference.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/io/sstable/SSTableDeletingReference.java?rev=922409&r1=922408&r2=922409&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/io/sstable/SSTableDeletingReference.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/io/sstable/SSTableDeletingReference.java Fri Mar 12 20:01:07 2010
@@ -27,14 +27,15 @@ import java.lang.ref.ReferenceQueue;
 import java.util.Timer;
 import java.util.TimerTask;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.apache.cassandra.io.DeletionService;
 import org.apache.cassandra.io.util.FileUtils;
 
 public class SSTableDeletingReference extends PhantomReference<SSTableReader>
 {
-    private static final Logger logger = Logger.getLogger(SSTableDeletingReference.class);
+    private static final Logger logger = LoggerFactory.getLogger(SSTableDeletingReference.class);
 
     private static final Timer timer = new Timer("SSTABLE-CLEANUP-TIMER");
     public static final int RETRY_DELAY = 10000;

Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/io/sstable/SSTableReader.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/io/sstable/SSTableReader.java?rev=922409&r1=922408&r2=922409&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/io/sstable/SSTableReader.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/io/sstable/SSTableReader.java Fri Mar 12 20:01:07 2010
@@ -26,7 +26,8 @@ import java.lang.ref.Reference;
 import java.nio.channels.FileChannel;
 import java.nio.MappedByteBuffer;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.apache.cassandra.cache.InstrumentedCache;
 import org.apache.cassandra.dht.IPartitioner;
@@ -49,7 +50,7 @@ import org.cliffc.high_scale_lib.NonBloc
  */
 public abstract class SSTableReader extends SSTable implements Comparable<SSTableReader>
 {
-    private static final Logger logger = Logger.getLogger(SSTableReader.class);
+    private static final Logger logger = LoggerFactory.getLogger(SSTableReader.class);
 
     // `finalizers` is required to keep the PhantomReferences alive after the enclosing SSTR is itself
     // unreferenced.  otherwise they will never get enqueued.

Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/io/sstable/SSTableScanner.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/io/sstable/SSTableScanner.java?rev=922409&r1=922408&r2=922409&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/io/sstable/SSTableScanner.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/io/sstable/SSTableScanner.java Fri Mar 12 20:01:07 2010
@@ -30,8 +30,6 @@ import org.apache.cassandra.io.Iterating
 import org.apache.cassandra.io.util.BufferedRandomAccessFile;
 import org.apache.cassandra.io.util.FileDataInput;
 
-import org.apache.log4j.Logger;
-
 
 public abstract class SSTableScanner implements Iterator<IteratingRow>, Closeable
 {

Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/io/sstable/SSTableTracker.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/io/sstable/SSTableTracker.java?rev=922409&r1=922408&r2=922409&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/io/sstable/SSTableTracker.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/io/sstable/SSTableTracker.java Fri Mar 12 20:01:07 2010
@@ -29,11 +29,12 @@ import org.apache.cassandra.db.ColumnFam
 import org.apache.cassandra.db.DecoratedKey;
 import org.apache.cassandra.utils.Pair;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class SSTableTracker implements Iterable<SSTableReader>
 {
-    private static final Logger logger = Logger.getLogger(SSTableTracker.class);
+    private static final Logger logger = LoggerFactory.getLogger(SSTableTracker.class);
 
     private volatile Set<SSTableReader> sstables;
     private final AtomicLong liveSize = new AtomicLong();

Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java?rev=922409&r1=922408&r2=922409&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java Fri Mar 12 20:01:07 2010
@@ -26,7 +26,8 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashMap;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.apache.cassandra.config.DatabaseDescriptor;
 import org.apache.cassandra.db.DecoratedKey;
@@ -39,7 +40,7 @@ import org.apache.cassandra.utils.FBUtil
 
 public class SSTableWriter extends SSTable
 {
-    private static Logger logger = Logger.getLogger(SSTableWriter.class);
+    private static Logger logger = LoggerFactory.getLogger(SSTableWriter.class);
 
     private long keysWritten;
     private BufferedRandomAccessFile dataFile;

Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/io/util/FileUtils.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/io/util/FileUtils.java?rev=922409&r1=922408&r2=922409&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/io/util/FileUtils.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/io/util/FileUtils.java Fri Mar 12 20:01:07 2010
@@ -25,12 +25,13 @@ import java.util.concurrent.ExecutorServ
 
 import org.apache.cassandra.concurrent.JMXEnabledThreadPoolExecutor;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 
 public class FileUtils
 {
-    private static Logger logger_ = Logger.getLogger(FileUtils.class);
+    private static Logger logger_ = LoggerFactory.getLogger(FileUtils.class);
     private static final DecimalFormat df_ = new DecimalFormat("#.##");
     private static final double kb_ = 1024d;
     private static final double mb_ = 1024*1024d;
@@ -106,7 +107,7 @@ public class FileUtils
             if (bVal)
             {
             	if (logger_.isDebugEnabled())
-            	  logger_.debug("Deleted file " + file);
+            	  logger_.debug("Deleted file {}", file);
                 files.remove(i);
             }
         }

Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/locator/AbstractReplicationStrategy.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/locator/AbstractReplicationStrategy.java?rev=922409&r1=922408&r2=922409&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/locator/AbstractReplicationStrategy.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/locator/AbstractReplicationStrategy.java Fri Mar 12 20:01:07 2010
@@ -22,7 +22,8 @@ import java.net.InetAddress;
 import java.util.*;
 
 import org.apache.cassandra.config.DatabaseDescriptor;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.Multimap;
@@ -41,7 +42,7 @@ import org.apache.cassandra.utils.FBUtil
 */
 public abstract class AbstractReplicationStrategy
 {
-    protected static final Logger logger_ = Logger.getLogger(AbstractReplicationStrategy.class);
+    protected static final Logger logger_ = LoggerFactory.getLogger(AbstractReplicationStrategy.class);
 
     private TokenMetadata tokenMetadata_;
     protected final IEndPointSnitch snitch_;

Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/locator/DatacenterEndPointSnitch.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/locator/DatacenterEndPointSnitch.java?rev=922409&r1=922408&r2=922409&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/locator/DatacenterEndPointSnitch.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/locator/DatacenterEndPointSnitch.java Fri Mar 12 20:01:07 2010
@@ -27,7 +27,8 @@ import java.net.UnknownHostException;
 import java.util.*;
 import javax.xml.parsers.ParserConfigurationException;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.apache.cassandra.utils.XMLUtils;
 import org.xml.sax.SAXException;
@@ -60,7 +61,7 @@ public class DatacenterEndPointSnitch ex
     /**
      * Reference to the logger.
      */
-    private static Logger logger_ = Logger.getLogger(DatacenterEndPointSnitch.class);
+    private static Logger logger_ = LoggerFactory.getLogger(DatacenterEndPointSnitch.class);
 
     /**
      * Constructor, intialize XML config and read the config in...

Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/net/AsyncResult.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/net/AsyncResult.java?rev=922409&r1=922408&r2=922409&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/net/AsyncResult.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/net/AsyncResult.java Fri Mar 12 20:01:07 2010
@@ -25,11 +25,12 @@ import java.util.concurrent.locks.Condit
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 class AsyncResult implements IAsyncResult
 {
-    private static Logger logger_ = Logger.getLogger( AsyncResult.class );
+    private static Logger logger_ = LoggerFactory.getLogger( AsyncResult.class );
     private byte[] result_;
     private AtomicBoolean done_ = new AtomicBoolean(false);
     private Lock lock_ = new ReentrantLock();

Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/net/FileStreamTask.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/net/FileStreamTask.java?rev=922409&r1=922408&r2=922409&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/net/FileStreamTask.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/net/FileStreamTask.java Fri Mar 12 20:01:07 2010
@@ -27,14 +27,15 @@ import java.nio.channels.SocketChannel;
 
 import org.apache.cassandra.streaming.StreamOutManager;
 import org.apache.cassandra.utils.FBUtilities;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.apache.cassandra.config.DatabaseDescriptor;
 import org.apache.cassandra.utils.WrappedRunnable;
 
 public class FileStreamTask extends WrappedRunnable
 {
-    private static Logger logger = Logger.getLogger( FileStreamTask.class );
+    private static Logger logger = LoggerFactory.getLogger( FileStreamTask.class );
     
     public static final int CHUNK_SIZE = 32*1024*1024;
 

Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/net/IncomingTcpConnection.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/net/IncomingTcpConnection.java?rev=922409&r1=922408&r2=922409&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/net/IncomingTcpConnection.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/net/IncomingTcpConnection.java Fri Mar 12 20:01:07 2010
@@ -24,13 +24,14 @@ package org.apache.cassandra.net;
 import java.io.*;
 import java.net.Socket;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.apache.cassandra.streaming.IncomingStreamReader;
 
 public class IncomingTcpConnection extends Thread
 {
-    private static Logger logger = Logger.getLogger(IncomingTcpConnection.class);
+    private static Logger logger = LoggerFactory.getLogger(IncomingTcpConnection.class);
 
     private final DataInputStream input;
     private Socket socket;

Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/net/MessageDeliveryTask.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/net/MessageDeliveryTask.java?rev=922409&r1=922408&r2=922409&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/net/MessageDeliveryTask.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/net/MessageDeliveryTask.java Fri Mar 12 20:01:07 2010
@@ -18,14 +18,15 @@
 
 package org.apache.cassandra.net;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.apache.cassandra.service.StorageService;
 
 public class MessageDeliveryTask implements Runnable
 {
     private Message message_;
-    private static Logger logger_ = Logger.getLogger(MessageDeliveryTask.class);    
+    private static Logger logger_ = LoggerFactory.getLogger(MessageDeliveryTask.class);    
     
     public MessageDeliveryTask(Message message)
     {

Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/net/MessageDeserializationTask.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/net/MessageDeserializationTask.java?rev=922409&r1=922408&r2=922409&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/net/MessageDeserializationTask.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/net/MessageDeserializationTask.java Fri Mar 12 20:01:07 2010
@@ -24,11 +24,12 @@ import java.io.IOException;
 
 import org.apache.cassandra.net.sink.SinkManager;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 class MessageDeserializationTask implements Runnable
 {
-    private static Logger logger_ = Logger.getLogger(MessageDeserializationTask.class);
+    private static Logger logger_ = LoggerFactory.getLogger(MessageDeserializationTask.class);
     
     private ByteArrayInputStream bytes;
     

Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/net/MessagingService.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/net/MessagingService.java?rev=922409&r1=922408&r2=922409&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/net/MessagingService.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/net/MessagingService.java Fri Mar 12 20:01:07 2010
@@ -29,7 +29,8 @@ import org.apache.cassandra.service.Stor
 import org.apache.cassandra.utils.*;
 import org.cliffc.high_scale_lib.NonBlockingHashMap;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 import java.net.ServerSocket;
@@ -70,7 +71,7 @@ public class MessagingService implements
     
     private static NonBlockingHashMap<InetAddress, OutboundTcpConnectionPool> connectionManagers_ = new NonBlockingHashMap<InetAddress, OutboundTcpConnectionPool>();
     
-    private static Logger logger_ = Logger.getLogger(MessagingService.class);
+    private static Logger logger_ = LoggerFactory.getLogger(MessagingService.class);
     
     public static final MessagingService instance = new MessagingService();
 

Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/net/OutboundTcpConnection.java?rev=922409&r1=922408&r2=922409&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/net/OutboundTcpConnection.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/net/OutboundTcpConnection.java Fri Mar 12 20:01:07 2010
@@ -30,13 +30,14 @@ import java.util.concurrent.BlockingQueu
 import java.util.concurrent.LinkedBlockingQueue;
 
 import org.apache.cassandra.utils.FBUtilities;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.apache.cassandra.config.DatabaseDescriptor;
 
 public class OutboundTcpConnection extends Thread
 {
-    private static final Logger logger = Logger.getLogger(OutboundTcpConnection.class);
+    private static final Logger logger = LoggerFactory.getLogger(OutboundTcpConnection.class);
 
     private static final ByteBuffer CLOSE_SENTINEL = ByteBuffer.allocate(0);
     private static final int OPEN_RETRY_DELAY = 100; // ms between retries

Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/net/OutboundTcpConnectionPool.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/net/OutboundTcpConnectionPool.java?rev=922409&r1=922408&r2=922409&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/net/OutboundTcpConnectionPool.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/net/OutboundTcpConnectionPool.java Fri Mar 12 20:01:07 2010
@@ -21,8 +21,6 @@ package org.apache.cassandra.net;
 import java.io.IOException;
 import java.net.InetAddress;
 
-import org.apache.log4j.Logger;
-
 import org.apache.cassandra.concurrent.StageManager;
 
 class OutboundTcpConnectionPool

Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/net/ResponseVerbHandler.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/net/ResponseVerbHandler.java?rev=922409&r1=922408&r2=922409&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/net/ResponseVerbHandler.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/net/ResponseVerbHandler.java Fri Mar 12 20:01:07 2010
@@ -18,11 +18,12 @@
 
 package org.apache.cassandra.net;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class ResponseVerbHandler implements IVerbHandler
 {
-    private static final Logger logger_ = Logger.getLogger( ResponseVerbHandler.class );
+    private static final Logger logger_ = LoggerFactory.getLogger( ResponseVerbHandler.class );
     
     public void doVerb(Message message)
     {     

Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/service/AntiEntropyService.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/service/AntiEntropyService.java?rev=922409&r1=922408&r2=922409&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/service/AntiEntropyService.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/service/AntiEntropyService.java Fri Mar 12 20:01:07 2010
@@ -41,7 +41,8 @@ import org.apache.cassandra.net.Message;
 import org.apache.cassandra.net.MessagingService;
 import org.apache.cassandra.utils.*;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.google.common.collect.Collections2;
 import com.google.common.base.Predicate;
@@ -87,7 +88,7 @@ import com.google.common.base.Predicates
  */
 public class AntiEntropyService
 {
-    private static final Logger logger = Logger.getLogger(AntiEntropyService.class);
+    private static final Logger logger = LoggerFactory.getLogger(AntiEntropyService.class);
 
     // millisecond lifetime to store trees before they become stale
     public final static long TREE_STORE_TIMEOUT = 600000;

Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/service/ConsistencyManager.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/service/ConsistencyManager.java?rev=922409&r1=922408&r2=922409&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/service/ConsistencyManager.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/service/ConsistencyManager.java Fri Mar 12 20:01:07 2010
@@ -28,7 +28,6 @@ import java.util.Collection;
 import java.util.List;
 import java.util.concurrent.LinkedBlockingQueue;
 
-import org.apache.log4j.Logger;
 import org.apache.commons.lang.StringUtils;
 
 import org.apache.cassandra.cache.ICacheExpungeHook;
@@ -42,10 +41,12 @@ import org.apache.cassandra.net.Messagin
 import org.apache.cassandra.utils.ExpiringMap;
 import org.apache.cassandra.utils.FBUtilities;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 class ConsistencyManager implements Runnable
 {
-	private static Logger logger_ = Logger.getLogger(ConsistencyManager.class);
+	private static Logger logger_ = LoggerFactory.getLogger(ConsistencyManager.class);
     private final String table_;
 
     class DigestResponseHandler implements IAsyncCallback

Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/service/GCInspector.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/service/GCInspector.java?rev=922409&r1=922408&r2=922409&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/service/GCInspector.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/service/GCInspector.java Fri Mar 12 20:01:07 2010
@@ -1,6 +1,7 @@
 package org.apache.cassandra.service;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.util.*;
 import java.util.concurrent.ExecutorService;
@@ -18,7 +19,7 @@ public class GCInspector
 {
     public static final GCInspector instance = new GCInspector();
 
-    private static final Logger logger = Logger.getLogger(GCInspector.class);
+    private static final Logger logger = LoggerFactory.getLogger(GCInspector.class);
     final static long INTERVAL_IN_MS = 10 * 1000;
     final static long MIN_DURATION = 200;
 

Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/service/LoadDisseminator.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/service/LoadDisseminator.java?rev=922409&r1=922408&r2=922409&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/service/LoadDisseminator.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/service/LoadDisseminator.java Fri Mar 12 20:01:07 2010
@@ -22,11 +22,12 @@ import java.util.TimerTask;
 import org.apache.cassandra.gms.ApplicationState;
 import org.apache.cassandra.gms.Gossiper;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 class LoadDisseminator extends TimerTask
 {
-    private final static Logger logger_ = Logger.getLogger(LoadDisseminator.class);
+    private final static Logger logger_ = LoggerFactory.getLogger(LoadDisseminator.class);
     protected final static String loadInfo_= "LOAD-INFORMATION";
     
     public void run()



Mime
View raw message