accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject [2/5] accumulo git commit: ACCUMULO-3651 Replace log4j with slf4j where log4j specific features (like set level) are not used.
Date Tue, 17 Mar 2015 22:02:24 GMT
http://git-wip-us.apache.org/repos/asf/accumulo/blob/e4583eb3/server/master/src/main/java/org/apache/accumulo/master/tableOps/CompactRange.java
----------------------------------------------------------------------
diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/CompactRange.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/CompactRange.java
index e8dacaf..c7b5f0c 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/CompactRange.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/CompactRange.java
@@ -58,9 +58,9 @@ import org.apache.accumulo.server.zookeeper.ZooReaderWriter;
 import org.apache.commons.codec.binary.Hex;
 import org.apache.hadoop.io.Text;
 import org.apache.hadoop.io.WritableUtils;
-import org.apache.log4j.Logger;
 import org.apache.thrift.TException;
 import org.apache.zookeeper.KeeperException.NoNodeException;
+import org.slf4j.LoggerFactory;
 
 import com.google.common.base.Preconditions;
 
@@ -167,7 +167,7 @@ class CompactionDriver extends MasterRepo {
         if (server != null)
           server.compact(master.getMasterLock(), tableId, startRow, endRow);
       } catch (TException ex) {
-        Logger.getLogger(CompactionDriver.class).error(ex.toString());
+        LoggerFactory.getLogger(CompactionDriver.class).error(ex.toString());
       }
     }
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e4583eb3/server/master/src/main/java/org/apache/accumulo/master/tableOps/CreateNamespace.java
----------------------------------------------------------------------
diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/CreateNamespace.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/CreateNamespace.java
index 83ab379..4924e01 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/CreateNamespace.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/CreateNamespace.java
@@ -32,7 +32,7 @@ import org.apache.accumulo.server.security.AuditedSecurityOperation;
 import org.apache.accumulo.server.security.SecurityOperation;
 import org.apache.accumulo.server.tables.TableManager;
 import org.apache.accumulo.server.util.NamespacePropUtil;
-import org.apache.log4j.Logger;
+import org.slf4j.LoggerFactory;
 
 class NamespaceInfo implements Serializable {
 
@@ -67,7 +67,7 @@ class FinishCreateNamespace extends MasterRepo {
 
     env.getEventCoordinator().event("Created namespace %s ", namespaceInfo.namespaceName);
 
-    Logger.getLogger(FinishCreateNamespace.class).debug("Created table " + namespaceInfo.namespaceId + " " + namespaceInfo.namespaceName);
+    LoggerFactory.getLogger(FinishCreateNamespace.class).debug("Created table " + namespaceInfo.namespaceId + " " + namespaceInfo.namespaceName);
 
     return null;
   }
@@ -146,7 +146,7 @@ class SetupNamespacePermissions extends MasterRepo {
       try {
         security.grantNamespacePermission(env.rpcCreds(), namespaceInfo.user, namespaceInfo.namespaceId, permission);
       } catch (ThriftSecurityException e) {
-        Logger.getLogger(FinishCreateNamespace.class).error(e.getMessage(), e);
+        LoggerFactory.getLogger(FinishCreateNamespace.class).error(e.getMessage(), e);
         throw e;
       }
     }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e4583eb3/server/master/src/main/java/org/apache/accumulo/master/tableOps/CreateTable.java
----------------------------------------------------------------------
diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/CreateTable.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/CreateTable.java
index 103eef8..ef43a70 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/CreateTable.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/CreateTable.java
@@ -42,7 +42,7 @@ import org.apache.accumulo.server.util.MetadataTableUtil;
 import org.apache.accumulo.server.util.TablePropUtil;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.io.Text;
-import org.apache.log4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.google.common.base.Optional;
 
@@ -85,7 +85,7 @@ class FinishCreateTable extends MasterRepo {
 
     env.getEventCoordinator().event("Created table %s ", tableInfo.tableName);
 
-    Logger.getLogger(FinishCreateTable.class).debug("Created table " + tableInfo.tableId + " " + tableInfo.tableName);
+    LoggerFactory.getLogger(FinishCreateTable.class).debug("Created table " + tableInfo.tableId + " " + tableInfo.tableName);
 
     return null;
   }
@@ -256,7 +256,7 @@ class SetupPermissions extends MasterRepo {
         try {
           security.grantTablePermission(env.rpcCreds(), tableInfo.user, tableInfo.tableId, permission, tableInfo.namespaceId);
         } catch (ThriftSecurityException e) {
-          Logger.getLogger(FinishCreateTable.class).error(e.getMessage(), e);
+          LoggerFactory.getLogger(FinishCreateTable.class).error(e.getMessage(), e);
           throw e;
         }
       }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e4583eb3/server/master/src/main/java/org/apache/accumulo/master/tableOps/DeleteNamespace.java
----------------------------------------------------------------------
diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/DeleteNamespace.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/DeleteNamespace.java
index a3da0d2..5729d38 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/DeleteNamespace.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/DeleteNamespace.java
@@ -23,11 +23,12 @@ import org.apache.accumulo.fate.Repo;
 import org.apache.accumulo.master.Master;
 import org.apache.accumulo.server.security.AuditedSecurityOperation;
 import org.apache.accumulo.server.tables.TableManager;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 class NamespaceCleanUp extends MasterRepo {
 
-  final private static Logger log = Logger.getLogger(CleanUp.class);
+  final private static Logger log = LoggerFactory.getLogger(CleanUp.class);
 
   private static final long serialVersionUID = 1L;
 
@@ -62,7 +63,7 @@ class NamespaceCleanUp extends MasterRepo {
 
     Utils.unreserveNamespace(namespaceId, id, true);
 
-    Logger.getLogger(CleanUp.class).debug("Deleted namespace " + namespaceId);
+    LoggerFactory.getLogger(CleanUp.class).debug("Deleted namespace " + namespaceId);
 
     return null;
   }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e4583eb3/server/master/src/main/java/org/apache/accumulo/master/tableOps/DeleteTable.java
----------------------------------------------------------------------
diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/DeleteTable.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/DeleteTable.java
index c878800..388911b 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/DeleteTable.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/DeleteTable.java
@@ -55,11 +55,12 @@ import org.apache.accumulo.server.util.MetadataTableUtil;
 import org.apache.hadoop.fs.FileStatus;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.io.Text;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 class CleanUp extends MasterRepo {
 
-  final private static Logger log = Logger.getLogger(CleanUp.class);
+  final private static Logger log = LoggerFactory.getLogger(CleanUp.class);
 
   private static final long serialVersionUID = 1L;
 
@@ -212,7 +213,7 @@ class CleanUp extends MasterRepo {
     Utils.unreserveTable(tableId, tid, true);
     Utils.unreserveNamespace(namespaceId, tid, false);
 
-    Logger.getLogger(CleanUp.class).debug("Deleted table " + tableId);
+    LoggerFactory.getLogger(CleanUp.class).debug("Deleted table " + tableId);
 
     return null;
   }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e4583eb3/server/master/src/main/java/org/apache/accumulo/master/tableOps/ImportTable.java
----------------------------------------------------------------------
diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/ImportTable.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/ImportTable.java
index c9b9673..1584fb0 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/ImportTable.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/ImportTable.java
@@ -70,7 +70,8 @@ import org.apache.hadoop.fs.FileStatus;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.io.Text;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.google.common.base.Optional;
 
@@ -118,7 +119,7 @@ class FinishImportTable extends MasterRepo {
 
     env.getEventCoordinator().event("Imported table %s ", tableInfo.tableName);
 
-    Logger.getLogger(FinishImportTable.class).debug("Imported table " + tableInfo.tableId + " " + tableInfo.tableName);
+    LoggerFactory.getLogger(FinishImportTable.class).debug("Imported table " + tableInfo.tableId + " " + tableInfo.tableName);
 
     return null;
   }
@@ -416,7 +417,7 @@ class MapImportFileNames extends MasterRepo {
 }
 
 class CreateImportDir extends MasterRepo {
-  private static final Logger log = Logger.getLogger(CreateImportDir.class);
+  private static final Logger log = LoggerFactory.getLogger(CreateImportDir.class);
   private static final long serialVersionUID = 1L;
 
   private ImportedTableInfo tableInfo;
@@ -537,7 +538,7 @@ class ImportSetupPermissions extends MasterRepo {
       try {
         security.grantTablePermission(env.rpcCreds(), tableInfo.user, tableInfo.tableId, permission, tableInfo.namespaceId);
       } catch (ThriftSecurityException e) {
-        Logger.getLogger(ImportSetupPermissions.class).error(e.getMessage(), e);
+        LoggerFactory.getLogger(ImportSetupPermissions.class).error(e.getMessage(), e);
         throw e;
       }
     }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e4583eb3/server/master/src/main/java/org/apache/accumulo/master/tableOps/MasterRepo.java
----------------------------------------------------------------------
diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/MasterRepo.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/MasterRepo.java
index 8f65fac..49e07a8 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/MasterRepo.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/MasterRepo.java
@@ -18,12 +18,13 @@ package org.apache.accumulo.master.tableOps;
 
 import org.apache.accumulo.fate.Repo;
 import org.apache.accumulo.master.Master;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public abstract class MasterRepo implements Repo<Master> {
 
   private static final long serialVersionUID = 1L;
-  protected static final Logger log = Logger.getLogger(MasterRepo.class);
+  protected static final Logger log = LoggerFactory.getLogger(MasterRepo.class);
 
   @Override
   public long isReady(long tid, Master environment) throws Exception {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e4583eb3/server/master/src/main/java/org/apache/accumulo/master/tableOps/RenameNamespace.java
----------------------------------------------------------------------
diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/RenameNamespace.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/RenameNamespace.java
index d69973b..1f09db0 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/RenameNamespace.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/RenameNamespace.java
@@ -28,7 +28,7 @@ import org.apache.accumulo.fate.zookeeper.IZooReaderWriter;
 import org.apache.accumulo.fate.zookeeper.IZooReaderWriter.Mutator;
 import org.apache.accumulo.master.Master;
 import org.apache.accumulo.server.zookeeper.ZooReaderWriter;
-import org.apache.log4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class RenameNamespace extends MasterRepo {
 
@@ -80,7 +80,7 @@ public class RenameNamespace extends MasterRepo {
       Utils.unreserveNamespace(namespaceId, id, true);
     }
 
-    Logger.getLogger(RenameNamespace.class).debug("Renamed namespace " + namespaceId + " " + oldName + " " + newName);
+    LoggerFactory.getLogger(RenameNamespace.class).debug("Renamed namespace " + namespaceId + " " + oldName + " " + newName);
 
     return null;
   }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e4583eb3/server/master/src/main/java/org/apache/accumulo/master/tableOps/RenameTable.java
----------------------------------------------------------------------
diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/RenameTable.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/RenameTable.java
index 90b764c..053749f 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/RenameTable.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/RenameTable.java
@@ -33,7 +33,7 @@ import org.apache.accumulo.fate.zookeeper.IZooReaderWriter;
 import org.apache.accumulo.fate.zookeeper.IZooReaderWriter.Mutator;
 import org.apache.accumulo.master.Master;
 import org.apache.accumulo.server.zookeeper.ZooReaderWriter;
-import org.apache.log4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class RenameTable extends MasterRepo {
 
@@ -97,7 +97,7 @@ public class RenameTable extends MasterRepo {
       Utils.unreserveNamespace(namespaceId, tid, false);
     }
 
-    Logger.getLogger(RenameTable.class).debug("Renamed table " + tableId + " " + oldTableName + " " + newTableName);
+    LoggerFactory.getLogger(RenameTable.class).debug("Renamed table " + tableId + " " + oldTableName + " " + newTableName);
 
     return null;
   }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e4583eb3/server/master/src/main/java/org/apache/accumulo/master/tableOps/Utils.java
----------------------------------------------------------------------
diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/Utils.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/Utils.java
index 0f6025a..c83d582 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/Utils.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/Utils.java
@@ -38,8 +38,9 @@ import org.apache.accumulo.fate.zookeeper.ZooReservation;
 import org.apache.accumulo.server.client.HdfsZooInstance;
 import org.apache.accumulo.server.zookeeper.ZooQueueLock;
 import org.apache.accumulo.server.zookeeper.ZooReaderWriter;
-import org.apache.log4j.Logger;
 import org.apache.zookeeper.KeeperException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class Utils {
   private static final byte[] ZERO_BYTE = new byte[] {'0'};
@@ -68,14 +69,14 @@ public class Utils {
       });
       return new String(nid, UTF_8);
     } catch (Exception e1) {
-      Logger.getLogger(CreateTable.class).error("Failed to assign tableId to " + tableName, e1);
+      LoggerFactory.getLogger(CreateTable.class).error("Failed to assign tableId to " + tableName, e1);
       throw new ThriftTableOperationException(tableId, tableName, TableOperation.CREATE, TableOperationExceptionType.OTHER, e1.getMessage());
     }
   }
 
   static final Lock tableNameLock = new ReentrantLock();
   static final Lock idLock = new ReentrantLock();
-  private static final Logger log = Logger.getLogger(Utils.class);
+  private static final Logger log = LoggerFactory.getLogger(Utils.class);
 
   public static long reserveTable(String tableId, long tid, boolean writeLock, boolean tableMustExist, TableOperation op) throws Exception {
     if (getLock(tableId, tid, writeLock).tryLock()) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e4583eb3/server/master/src/main/java/org/apache/accumulo/master/tserverOps/ShutdownTServer.java
----------------------------------------------------------------------
diff --git a/server/master/src/main/java/org/apache/accumulo/master/tserverOps/ShutdownTServer.java b/server/master/src/main/java/org/apache/accumulo/master/tserverOps/ShutdownTServer.java
index 6cce8ee..e3f0b8c 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/tserverOps/ShutdownTServer.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/tserverOps/ShutdownTServer.java
@@ -31,13 +31,14 @@ import org.apache.accumulo.server.master.LiveTServerSet.TServerConnection;
 import org.apache.accumulo.server.master.state.TServerInstance;
 import org.apache.accumulo.server.zookeeper.ZooLock;
 import org.apache.accumulo.server.zookeeper.ZooReaderWriter;
-import org.apache.log4j.Logger;
 import org.apache.thrift.transport.TTransportException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class ShutdownTServer extends MasterRepo {
 
   private static final long serialVersionUID = 1L;
-  private static final Logger log = Logger.getLogger(ShutdownTServer.class);
+  private static final Logger log = LoggerFactory.getLogger(ShutdownTServer.class);
   private TServerInstance server;
   private boolean force;
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e4583eb3/server/monitor/src/main/java/org/apache/accumulo/monitor/ZooKeeperStatus.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/ZooKeeperStatus.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/ZooKeeperStatus.java
index 436e0d3..1daf8f6 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/ZooKeeperStatus.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/ZooKeeperStatus.java
@@ -27,15 +27,16 @@ import org.apache.accumulo.core.conf.Property;
 import org.apache.accumulo.core.conf.SiteConfiguration;
 import org.apache.accumulo.core.rpc.TTimeoutTransport;
 import org.apache.accumulo.core.util.UtilWaitThread;
-import org.apache.log4j.Logger;
 import org.apache.thrift.transport.TTransport;
 import org.apache.thrift.transport.TTransportException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.google.common.net.HostAndPort;
 
 public class ZooKeeperStatus implements Runnable {
 
-  private static final Logger log = Logger.getLogger(ZooKeeperStatus.class);
+  private static final Logger log = LoggerFactory.getLogger(ZooKeeperStatus.class);
 
   private volatile boolean stop = false;
 
@@ -139,7 +140,7 @@ public class ZooKeeperStatus implements Runnable {
             try {
               transport.close();
             } catch (Exception ex) {
-              log.error(ex, ex);
+              log.error("Exception", ex);
             }
           }
         }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e4583eb3/server/tracer/src/main/java/org/apache/accumulo/tracer/AsyncSpanReceiver.java
----------------------------------------------------------------------
diff --git a/server/tracer/src/main/java/org/apache/accumulo/tracer/AsyncSpanReceiver.java b/server/tracer/src/main/java/org/apache/accumulo/tracer/AsyncSpanReceiver.java
index 59596a2..6df82ce 100644
--- a/server/tracer/src/main/java/org/apache/accumulo/tracer/AsyncSpanReceiver.java
+++ b/server/tracer/src/main/java/org/apache/accumulo/tracer/AsyncSpanReceiver.java
@@ -36,7 +36,8 @@ import org.apache.htrace.HTraceConfiguration;
 import org.apache.htrace.Span;
 import org.apache.htrace.SpanReceiver;
 import org.apache.htrace.TimelineAnnotation;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Deliver Span information periodically to a destination.
@@ -48,7 +49,7 @@ import org.apache.log4j.Logger;
  */
 public abstract class AsyncSpanReceiver<SpanKey,Destination> implements SpanReceiver {
 
-  private static final Logger log = Logger.getLogger(AsyncSpanReceiver.class);
+  private static final Logger log = LoggerFactory.getLogger(AsyncSpanReceiver.class);
 
   public static final String SEND_TIMER_MILLIS = "send.timer.millis";
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e4583eb3/server/tracer/src/main/java/org/apache/accumulo/tracer/SendSpansViaThrift.java
----------------------------------------------------------------------
diff --git a/server/tracer/src/main/java/org/apache/accumulo/tracer/SendSpansViaThrift.java b/server/tracer/src/main/java/org/apache/accumulo/tracer/SendSpansViaThrift.java
index c17d2c8..f24c7b9 100644
--- a/server/tracer/src/main/java/org/apache/accumulo/tracer/SendSpansViaThrift.java
+++ b/server/tracer/src/main/java/org/apache/accumulo/tracer/SendSpansViaThrift.java
@@ -36,7 +36,7 @@ import org.apache.thrift.transport.TTransport;
  */
 public class SendSpansViaThrift extends AsyncSpanReceiver<String,Client> {
 
-  private static final org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger(SendSpansViaThrift.class);
+  private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(SendSpansViaThrift.class);
 
   private static final String THRIFT = "thrift://";
 
@@ -63,7 +63,7 @@ public class SendSpansViaThrift extends AsyncSpanReceiver<String,Client> {
       TProtocol prot = new TBinaryProtocol(transport);
       return new Client(prot);
     } catch (Exception ex) {
-      log.error(ex, ex);
+      log.error(ex.getMessage(), ex);
       return null;
     }
   }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e4583eb3/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java
----------------------------------------------------------------------
diff --git a/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java b/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java
index 5e921d4..b37404d 100644
--- a/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java
+++ b/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java
@@ -59,7 +59,6 @@ import org.apache.accumulo.tracer.thrift.SpanReceiver.Iface;
 import org.apache.accumulo.tracer.thrift.SpanReceiver.Processor;
 import org.apache.hadoop.io.Text;
 import org.apache.htrace.Span;
-import org.apache.log4j.Logger;
 import org.apache.thrift.TByteArrayOutputStream;
 import org.apache.thrift.TException;
 import org.apache.thrift.protocol.TCompactProtocol;
@@ -73,10 +72,12 @@ import org.apache.zookeeper.WatchedEvent;
 import org.apache.zookeeper.Watcher;
 import org.apache.zookeeper.Watcher.Event.EventType;
 import org.apache.zookeeper.Watcher.Event.KeeperState;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class TraceServer implements Watcher {
 
-  final private static Logger log = Logger.getLogger(TraceServer.class);
+  final private static Logger log = LoggerFactory.getLogger(TraceServer.class);
   final private ServerConfigurationFactory serverConfiguration;
   final private TServer server;
   final private AtomicReference<BatchWriter> writer;
@@ -330,7 +331,7 @@ public class TraceServer implements Watcher {
         if (ZooReaderWriter.getInstance().exists(event.getPath(), this))
           return;
       } catch (Exception ex) {
-        log.error(ex, ex);
+        log.error(ex.getMessage(), ex);
       }
       log.warn("Trace server unable to reset watch on zookeeper registration");
       server.stop();

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e4583eb3/server/tracer/src/main/java/org/apache/accumulo/tracer/ZooTraceClient.java
----------------------------------------------------------------------
diff --git a/server/tracer/src/main/java/org/apache/accumulo/tracer/ZooTraceClient.java b/server/tracer/src/main/java/org/apache/accumulo/tracer/ZooTraceClient.java
index 1599534..4ba6309 100644
--- a/server/tracer/src/main/java/org/apache/accumulo/tracer/ZooTraceClient.java
+++ b/server/tracer/src/main/java/org/apache/accumulo/tracer/ZooTraceClient.java
@@ -31,10 +31,11 @@ import org.apache.accumulo.core.Constants;
 import org.apache.accumulo.core.trace.DistributedTrace;
 import org.apache.accumulo.fate.zookeeper.ZooReader;
 import org.apache.htrace.HTraceConfiguration;
-import org.apache.log4j.Logger;
 import org.apache.zookeeper.KeeperException;
 import org.apache.zookeeper.WatchedEvent;
 import org.apache.zookeeper.Watcher;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
 
@@ -42,7 +43,7 @@ import com.google.common.util.concurrent.ThreadFactoryBuilder;
  * Find a Span collector via zookeeper and push spans there via Thrift RPC
  */
 public class ZooTraceClient extends SendSpansViaThrift implements Watcher {
-  private static final Logger log = Logger.getLogger(ZooTraceClient.class);
+  private static final Logger log = LoggerFactory.getLogger(ZooTraceClient.class);
 
   private static final int DEFAULT_TIMEOUT = 30 * 1000;
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e4583eb3/server/tserver/src/main/java/org/apache/accumulo/server/GarbageCollectionLogger.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/server/GarbageCollectionLogger.java b/server/tserver/src/main/java/org/apache/accumulo/server/GarbageCollectionLogger.java
index 7d09fe3..8f3785e 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/server/GarbageCollectionLogger.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/server/GarbageCollectionLogger.java
@@ -24,10 +24,11 @@ import java.util.List;
 import org.apache.accumulo.core.conf.AccumuloConfiguration;
 import org.apache.accumulo.core.conf.Property;
 import org.apache.accumulo.server.util.Halt;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class GarbageCollectionLogger {
-  private static final Logger log = Logger.getLogger(GarbageCollectionLogger.class);
+  private static final Logger log = LoggerFactory.getLogger(GarbageCollectionLogger.class);
 
   private final HashMap<String,Long> prevGcTime = new HashMap<String,Long>();
   private long lastMemorySize = 0;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e4583eb3/server/tserver/src/main/java/org/apache/accumulo/tserver/BulkFailedCopyProcessor.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/BulkFailedCopyProcessor.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/BulkFailedCopyProcessor.java
index cfb5fb4..26fe8ba 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/BulkFailedCopyProcessor.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/BulkFailedCopyProcessor.java
@@ -28,14 +28,15 @@ import org.apache.accumulo.server.zookeeper.DistributedWorkQueue.Processor;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.FileUtil;
 import org.apache.hadoop.fs.Path;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Copy failed bulk imports.
  */
 public class BulkFailedCopyProcessor implements Processor {
 
-  private static final Logger log = Logger.getLogger(BulkFailedCopyProcessor.class);
+  private static final Logger log = LoggerFactory.getLogger(BulkFailedCopyProcessor.class);
 
   @Override
   public Processor newProcessor() {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e4583eb3/server/tserver/src/main/java/org/apache/accumulo/tserver/FileManager.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/FileManager.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/FileManager.java
index 0a7de95..f01313f 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/FileManager.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/FileManager.java
@@ -53,11 +53,12 @@ import org.apache.accumulo.server.problems.ProblemType;
 import org.apache.accumulo.server.util.time.SimpleTimer;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class FileManager {
 
-  private static final Logger log = Logger.getLogger(FileManager.class);
+  private static final Logger log = LoggerFactory.getLogger(FileManager.class);
 
   int maxOpen;
 
@@ -364,7 +365,7 @@ public class FileManager {
         try {
           reader.closeDeepCopies();
         } catch (IOException e) {
-          log.warn(e, e);
+          log.warn(e.getMessage(), e);
           sawIOException = true;
         }
       }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e4583eb3/server/tserver/src/main/java/org/apache/accumulo/tserver/InMemoryMap.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/InMemoryMap.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/InMemoryMap.java
index 8aa357b..652aa72 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/InMemoryMap.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/InMemoryMap.java
@@ -69,7 +69,8 @@ import org.apache.commons.lang.mutable.MutableLong;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 class MemKeyComparator implements Comparator<Key>, Serializable {
 
@@ -189,7 +190,7 @@ class MemKeyConversionIterator extends WrappingIterator implements Interruptible
 public class InMemoryMap {
   private SimpleMap map = null;
 
-  private static final Logger log = Logger.getLogger(InMemoryMap.class);
+  private static final Logger log = LoggerFactory.getLogger(InMemoryMap.class);
 
   private volatile String memDumpFile = null;
   private final String memDumpDir;
@@ -646,7 +647,7 @@ public class InMemoryMap {
             if (mds.reader != null)
               mds.reader.close();
           } catch (IOException e) {
-            log.warn(e, e);
+            log.warn(e.getMessage(), e);
           }
         }
       }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e4583eb3/server/tserver/src/main/java/org/apache/accumulo/tserver/NativeMap.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/NativeMap.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/NativeMap.java
index 2f44e13..2c47f07 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/NativeMap.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/NativeMap.java
@@ -45,7 +45,8 @@ import org.apache.accumulo.core.iterators.IteratorEnvironment;
 import org.apache.accumulo.core.iterators.SortedKeyValueIterator;
 import org.apache.accumulo.core.iterators.system.InterruptibleIterator;
 import org.apache.accumulo.core.util.PreAllocatedArray;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * This class stores data in a C++ map. Doing this allows us to store more in memory and avoid pauses caused by Java GC.
@@ -58,7 +59,7 @@ import org.apache.log4j.Logger;
 
 public class NativeMap implements Iterable<Map.Entry<Key,Value>> {
 
-  private static final Logger log = Logger.getLogger(NativeMap.class);
+  private static final Logger log = LoggerFactory.getLogger(NativeMap.class);
   private static AtomicBoolean loadedNativeLibraries = new AtomicBoolean(false);
 
   // Load native library

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e4583eb3/server/tserver/src/main/java/org/apache/accumulo/tserver/WriteTracker.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/WriteTracker.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/WriteTracker.java
index 9bf80b4..d9f2114 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/WriteTracker.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/WriteTracker.java
@@ -27,7 +27,8 @@ import java.util.concurrent.atomic.AtomicLong;
 import org.apache.accumulo.core.client.impl.TabletType;
 import org.apache.accumulo.core.data.KeyExtent;
 import org.apache.accumulo.tserver.tablet.Tablet;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * This little class keeps track of writes in progress and allows readers to wait for writes that started before the read. It assumes that the operation ids are
@@ -35,7 +36,7 @@ import org.apache.log4j.Logger;
  *
  */
 class WriteTracker {
-  private static final Logger log = Logger.getLogger(WriteTracker.class);
+  private static final Logger log = LoggerFactory.getLogger(WriteTracker.class);
 
   private static final AtomicLong operationCounter = new AtomicLong(1);
   private final Map<TabletType,TreeSet<Long>> inProgressWrites = new EnumMap<TabletType,TreeSet<Long>>(TabletType.class);
@@ -77,7 +78,7 @@ class WriteTracker {
       try {
         this.wait();
       } catch (InterruptedException e) {
-        log.error(e, e);
+        log.error(e.getMessage(), e);
       }
     }
   }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e4583eb3/server/tserver/src/main/java/org/apache/accumulo/tserver/constraints/ConstraintChecker.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/constraints/ConstraintChecker.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/constraints/ConstraintChecker.java
index fd9e521..6ef6709 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/constraints/ConstraintChecker.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/constraints/ConstraintChecker.java
@@ -31,14 +31,15 @@ import org.apache.accumulo.core.data.ConstraintViolationSummary;
 import org.apache.accumulo.core.data.Mutation;
 import org.apache.accumulo.server.conf.TableConfiguration;
 import org.apache.accumulo.start.classloader.vfs.AccumuloVFSClassLoader;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.google.common.annotations.VisibleForTesting;
 
 public class ConstraintChecker {
 
   private ArrayList<Constraint> constrains;
-  private static final Logger log = Logger.getLogger(ConstraintChecker.class);
+  private static final Logger log = LoggerFactory.getLogger(ConstraintChecker.class);
 
   private ClassLoader loader;
   private TableConfiguration conf;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e4583eb3/server/tserver/src/main/java/org/apache/accumulo/tserver/log/LocalWALRecovery.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/LocalWALRecovery.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/LocalWALRecovery.java
index ed4c3e7..60c8e8d 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/LocalWALRecovery.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/LocalWALRecovery.java
@@ -37,7 +37,8 @@ import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.io.SequenceFile;
 import org.apache.hadoop.io.SequenceFile.Reader;
 import org.apache.hadoop.io.WritableName;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.beust.jcommander.JCommander;
 import com.beust.jcommander.Parameter;
@@ -49,7 +50,7 @@ import com.google.common.annotations.VisibleForTesting;
  */
 @SuppressWarnings("deprecation")
 public class LocalWALRecovery implements Runnable {
-  private static final Logger log = Logger.getLogger(LocalWALRecovery.class);
+  private static final Logger log = LoggerFactory.getLogger(LocalWALRecovery.class);
 
   static {
     WritableName.addName(LogFileKey.class, "org.apache.accumulo.server.logger.LogFileKey");

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e4583eb3/server/tserver/src/main/java/org/apache/accumulo/tserver/log/LogSorter.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/LogSorter.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/LogSorter.java
index 589b777..f152f9c 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/LogSorter.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/LogSorter.java
@@ -48,15 +48,16 @@ import org.apache.hadoop.fs.FSDataInputStream;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.io.MapFile;
-import org.apache.log4j.Logger;
 import org.apache.zookeeper.KeeperException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  *
  */
 public class LogSorter {
 
-  private static final Logger log = Logger.getLogger(LogSorter.class);
+  private static final Logger log = LoggerFactory.getLogger(LogSorter.class);
   VolumeManager fs;
   AccumuloConfiguration conf;
 
@@ -158,7 +159,7 @@ public class LogSorter {
         } catch (IOException e) {
           log.error("Error creating failed flag file " + name, e);
         }
-        log.error(t, t);
+        log.error("Caught throwable", t);
       } finally {
         Thread.currentThread().setName(formerThreadName);
         try {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e4583eb3/server/tserver/src/main/java/org/apache/accumulo/tserver/log/SortedLogRecovery.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/SortedLogRecovery.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/SortedLogRecovery.java
index 405ec70..c4d9fab 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/SortedLogRecovery.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/SortedLogRecovery.java
@@ -35,14 +35,15 @@ import org.apache.accumulo.server.fs.VolumeManager;
 import org.apache.accumulo.tserver.logger.LogFileKey;
 import org.apache.accumulo.tserver.logger.LogFileValue;
 import org.apache.hadoop.fs.Path;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Extract Mutations for a tablet from a set of logs that have been sorted by operation and tablet.
  *
  */
 public class SortedLogRecovery {
-  private static final Logger log = Logger.getLogger(SortedLogRecovery.class);
+  private static final Logger log = LoggerFactory.getLogger(SortedLogRecovery.class);
 
   static class EmptyMapFileException extends Exception {
     private static final long serialVersionUID = 1L;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e4583eb3/server/tserver/src/main/java/org/apache/accumulo/tserver/log/TabletServerLogger.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/TabletServerLogger.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/TabletServerLogger.java
index 254e5d6..711c497 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/TabletServerLogger.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/TabletServerLogger.java
@@ -50,7 +50,8 @@ import org.apache.accumulo.tserver.TabletServer;
 import org.apache.accumulo.tserver.log.DfsLogger.LoggerOperation;
 import org.apache.accumulo.tserver.tablet.CommitSession;
 import org.apache.hadoop.fs.Path;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
@@ -64,7 +65,7 @@ import com.google.common.cache.CacheBuilder;
  */
 public class TabletServerLogger {
 
-  private static final Logger log = Logger.getLogger(TabletServerLogger.class);
+  private static final Logger log = LoggerFactory.getLogger(TabletServerLogger.class);
 
   private final AtomicLong logSizeEstimate = new AtomicLong();
   private final long maxSize;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e4583eb3/server/tserver/src/main/java/org/apache/accumulo/tserver/logger/LogReader.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/logger/LogReader.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/logger/LogReader.java
index df2f831..09bc705 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/logger/LogReader.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/logger/LogReader.java
@@ -40,13 +40,14 @@ import org.apache.accumulo.tserver.log.DfsLogger.LogHeaderIncompleteException;
 import org.apache.accumulo.tserver.log.MultiReader;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.io.Text;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.beust.jcommander.JCommander;
 import com.beust.jcommander.Parameter;
 
 public class LogReader {
-  private static final Logger log = Logger.getLogger(LogReader.class);
+  private static final Logger log = LoggerFactory.getLogger(LogReader.class);
 
   static class Opts extends Help {
     @Parameter(names = "-r", description = "print only mutations associated with the given row")

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e4583eb3/server/tserver/src/main/java/org/apache/accumulo/tserver/metrics/TabletServerMBeanImpl.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/metrics/TabletServerMBeanImpl.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/metrics/TabletServerMBeanImpl.java
index e6973fd..42b2a9c 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/metrics/TabletServerMBeanImpl.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/metrics/TabletServerMBeanImpl.java
@@ -22,10 +22,11 @@ import javax.management.StandardMBean;
 
 import org.apache.accumulo.server.metrics.AbstractMetricsImpl;
 import org.apache.accumulo.tserver.TabletServer;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class TabletServerMBeanImpl extends AbstractMetricsImpl implements TabletServerMBean {
-  private static final Logger log = Logger.getLogger(TabletServerMBeanImpl.class);
+  private static final Logger log = LoggerFactory.getLogger(TabletServerMBeanImpl.class);
   private static final String METRICS_PREFIX = "tserver";
   private ObjectName OBJECT_NAME = null;
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e4583eb3/server/tserver/src/main/java/org/apache/accumulo/tserver/metrics/TabletServerMinCMetrics.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/metrics/TabletServerMinCMetrics.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/metrics/TabletServerMinCMetrics.java
index 50fb6a0..435462b 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/metrics/TabletServerMinCMetrics.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/metrics/TabletServerMinCMetrics.java
@@ -22,7 +22,7 @@ import org.apache.accumulo.server.metrics.AbstractMetricsImpl;
 
 public class TabletServerMinCMetrics extends AbstractMetricsImpl implements TabletServerMinCMetricsMBean {
 
-  static final org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger(TabletServerMinCMetrics.class);
+  static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(TabletServerMinCMetrics.class);
 
   private static final String METRICS_PREFIX = "tserver.minc";
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e4583eb3/server/tserver/src/main/java/org/apache/accumulo/tserver/metrics/TabletServerScanMetrics.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/metrics/TabletServerScanMetrics.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/metrics/TabletServerScanMetrics.java
index 80ee71f..39da299 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/metrics/TabletServerScanMetrics.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/metrics/TabletServerScanMetrics.java
@@ -22,7 +22,7 @@ import org.apache.accumulo.server.metrics.AbstractMetricsImpl;
 
 public class TabletServerScanMetrics extends AbstractMetricsImpl implements TabletServerScanMetricsMBean {
 
-  static final org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger(TabletServerScanMetrics.class);
+  static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(TabletServerScanMetrics.class);
 
   public static final String METRICS_PREFIX = "tserver.scan";
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e4583eb3/server/tserver/src/main/java/org/apache/accumulo/tserver/metrics/TabletServerUpdateMetrics.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/metrics/TabletServerUpdateMetrics.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/metrics/TabletServerUpdateMetrics.java
index 746b393..eae1ef8 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/metrics/TabletServerUpdateMetrics.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/metrics/TabletServerUpdateMetrics.java
@@ -22,7 +22,7 @@ import org.apache.accumulo.server.metrics.AbstractMetricsImpl;
 
 public class TabletServerUpdateMetrics extends AbstractMetricsImpl implements TabletServerUpdateMetricsMBean {
 
-  static final org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger(TabletServerUpdateMetrics.class);
+  static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(TabletServerUpdateMetrics.class);
 
   private static final String METRICS_PREFIX = "tserver.update";
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e4583eb3/server/tserver/src/main/java/org/apache/accumulo/tserver/scan/LookupTask.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/scan/LookupTask.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/scan/LookupTask.java
index cb341bb..85b71b1 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/scan/LookupTask.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/scan/LookupTask.java
@@ -43,11 +43,12 @@ import org.apache.accumulo.tserver.session.MultiScanSession;
 import org.apache.accumulo.tserver.tablet.KVEntry;
 import org.apache.accumulo.tserver.tablet.Tablet;
 import org.apache.accumulo.tserver.tablet.Tablet.LookupResult;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class LookupTask extends ScanTask<MultiScanResult> {
 
-  private static final Logger log = Logger.getLogger(LookupTask.class);
+  private static final Logger log = LoggerFactory.getLogger(LookupTask.class);
 
   private final long scanID;
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e4583eb3/server/tserver/src/main/java/org/apache/accumulo/tserver/scan/NextBatchTask.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/scan/NextBatchTask.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/scan/NextBatchTask.java
index 22ea384..2e0608b 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/scan/NextBatchTask.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/scan/NextBatchTask.java
@@ -25,11 +25,12 @@ import org.apache.accumulo.tserver.session.ScanSession;
 import org.apache.accumulo.tserver.tablet.ScanBatch;
 import org.apache.accumulo.tserver.tablet.Tablet;
 import org.apache.accumulo.tserver.tablet.TabletClosedException;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class NextBatchTask extends ScanTask<ScanBatch> {
 
-  private static final Logger log = Logger.getLogger(TabletServer.class);
+  private static final Logger log = LoggerFactory.getLogger(TabletServer.class);
 
   private final long scanID;
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e4583eb3/server/tserver/src/main/java/org/apache/accumulo/tserver/session/SessionManager.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/session/SessionManager.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/session/SessionManager.java
index 51722d9..83d87b3 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/session/SessionManager.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/session/SessionManager.java
@@ -38,10 +38,11 @@ import org.apache.accumulo.server.util.time.SimpleTimer;
 import org.apache.accumulo.tserver.scan.ScanRunState;
 import org.apache.accumulo.tserver.scan.ScanTask;
 import org.apache.accumulo.tserver.tablet.ScanBatch;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class SessionManager {
-  private static final Logger log = Logger.getLogger(SessionManager.class);
+  private static final Logger log = LoggerFactory.getLogger(SessionManager.class);
 
   private final SecureRandom random = new SecureRandom();
   private final Map<Long,Session> sessions = new HashMap<Long,Session>();

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e4583eb3/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/CommitSession.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/CommitSession.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/CommitSession.java
index 17290c0..b4814e4 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/CommitSession.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/CommitSession.java
@@ -23,11 +23,12 @@ import org.apache.accumulo.core.data.KeyExtent;
 import org.apache.accumulo.core.data.Mutation;
 import org.apache.accumulo.tserver.InMemoryMap;
 import org.apache.accumulo.tserver.log.DfsLogger;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class CommitSession {
 
-  private static final Logger log = Logger.getLogger(CommitSession.class);
+  private static final Logger log = LoggerFactory.getLogger(CommitSession.class);
 
   private final int seq;
   private final InMemoryMap memTable;
@@ -68,7 +69,7 @@ public class CommitSession {
       try {
         committer.wait(50);
       } catch (InterruptedException e) {
-        log.warn(e, e);
+        log.warn("InterruptedException", e);
       }
     }
   }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e4583eb3/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/CompactionWatcher.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/CompactionWatcher.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/CompactionWatcher.java
index 94fbfdc..6ca4407 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/CompactionWatcher.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/CompactionWatcher.java
@@ -26,7 +26,7 @@ import java.util.Set;
 import org.apache.accumulo.core.conf.AccumuloConfiguration;
 import org.apache.accumulo.core.conf.Property;
 import org.apache.accumulo.server.util.time.SimpleTimer;
-import org.apache.log4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  *
@@ -74,7 +74,7 @@ public class CompactionWatcher implements Runnable {
 
     for (ObservedCompactionInfo oci : copy.values()) {
       if (oci.loggedWarning) {
-        Logger.getLogger(CompactionWatcher.class).info("Compaction of " + oci.compactionInfo.getExtent() + " is no longer stuck");
+        LoggerFactory.getLogger(CompactionWatcher.class).info("Compaction of " + oci.compactionInfo.getExtent() + " is no longer stuck");
       }
     }
 
@@ -91,7 +91,7 @@ public class CompactionWatcher implements Runnable {
           StackTraceElement[] trace = compactionThread.getStackTrace();
           Exception e = new Exception("Possible stack trace of compaction stuck on " + oci.compactionInfo.getExtent());
           e.setStackTrace(trace);
-          Logger.getLogger(CompactionWatcher.class).warn(
+          LoggerFactory.getLogger(CompactionWatcher.class).warn(
               "Compaction of " + oci.compactionInfo.getExtent() + " to " + oci.compactionInfo.getOutputFile() + " has not made progress for at least "
                   + (time - oci.firstSeen) + "ms", e);
           oci.loggedWarning = true;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e4583eb3/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Compactor.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Compactor.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Compactor.java
index 1c23293..1354b40 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Compactor.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Compactor.java
@@ -64,10 +64,11 @@ import org.apache.accumulo.tserver.MinorCompactionReason;
 import org.apache.accumulo.tserver.TabletIteratorEnvironment;
 import org.apache.accumulo.tserver.compaction.MajorCompactionReason;
 import org.apache.hadoop.fs.FileSystem;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class Compactor implements Callable<CompactionStats> {
-  private static final Logger log = Logger.getLogger(Compactor.class);
+  private static final Logger log = LoggerFactory.getLogger(Compactor.class);
   private static final AtomicLong nextCompactorID = new AtomicLong(0);
 
   public static class CompactionCanceledException extends Exception {
@@ -233,10 +234,10 @@ public class Compactor implements Callable<CompactionStats> {
       majCStats.setFileSize(fileFactory.getFileSize(outputFile.path().toString(), ns, ns.getConf(), acuTableConf));
       return majCStats;
     } catch (IOException e) {
-      log.error(e, e);
+      log.error(e.getMessage(), e);
       throw e;
     } catch (RuntimeException e) {
-      log.error(e, e);
+      log.error(e.getMessage(), e);
       throw e;
     } finally {
       Thread.currentThread().setName(oldThreadName);
@@ -257,9 +258,9 @@ public class Compactor implements Callable<CompactionStats> {
           }
         }
       } catch (IOException e) {
-        log.warn(e, e);
+        log.warn(e.getMessage(), e);
       } catch (RuntimeException exception) {
-        log.warn(exception, exception);
+        log.warn(exception.getMessage(), exception);
       }
     }
   }
@@ -368,7 +369,7 @@ public class Compactor implements Callable<CompactionStats> {
             try {
               mfw.close();
             } catch (IOException e) {
-              log.error(e, e);
+              log.error(e.getMessage(), e);
             }
             fs.deleteRecursively(outputFile.path());
           } catch (Exception e) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e4583eb3/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/MinorCompactionTask.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/MinorCompactionTask.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/MinorCompactionTask.java
index 8609a4b..5669133 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/MinorCompactionTask.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/MinorCompactionTask.java
@@ -24,11 +24,12 @@ import org.apache.accumulo.core.trace.Trace;
 import org.apache.accumulo.server.fs.FileRef;
 import org.apache.accumulo.tserver.MinorCompactionReason;
 import org.apache.accumulo.tserver.compaction.MajorCompactionReason;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 class MinorCompactionTask implements Runnable {
 
-  private static final Logger log = Logger.getLogger(MinorCompactionTask.class);
+  private static final Logger log = LoggerFactory.getLogger(MinorCompactionTask.class);
 
   private final Tablet tablet;
   private long queued;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e4583eb3/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/MinorCompactor.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/MinorCompactor.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/MinorCompactor.java
index a425aa1..9b67051 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/MinorCompactor.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/MinorCompactor.java
@@ -36,11 +36,12 @@ import org.apache.accumulo.tserver.InMemoryMap;
 import org.apache.accumulo.tserver.MinorCompactionReason;
 import org.apache.accumulo.tserver.TabletServer;
 import org.apache.hadoop.fs.Path;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class MinorCompactor extends Compactor {
 
-  private static final Logger log = Logger.getLogger(MinorCompactor.class);
+  private static final Logger log = LoggerFactory.getLogger(MinorCompactor.class);
 
   private static final Map<FileRef,DataFileValue> EMPTY_MAP = Collections.emptyMap();
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e4583eb3/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/RootFiles.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/RootFiles.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/RootFiles.java
index d0278f4..9ba8e38 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/RootFiles.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/RootFiles.java
@@ -29,14 +29,15 @@ import org.apache.accumulo.server.fs.FileRef;
 import org.apache.accumulo.server.fs.VolumeManager;
 import org.apache.hadoop.fs.FileStatus;
 import org.apache.hadoop.fs.Path;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  *
  */
 public class RootFiles {
 
-  private static final Logger log = Logger.getLogger(RootFiles.class);
+  private static final Logger log = LoggerFactory.getLogger(RootFiles.class);
 
   public static void prepareReplacement(VolumeManager fs, Path location, Set<FileRef> oldDatafiles, String compactName) throws IOException {
     for (FileRef ref : oldDatafiles) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e4583eb3/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Scanner.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Scanner.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Scanner.java
index 17ae729..790a352 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Scanner.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Scanner.java
@@ -25,10 +25,11 @@ import org.apache.accumulo.core.data.Value;
 import org.apache.accumulo.core.iterators.IterationInterruptedException;
 import org.apache.accumulo.core.iterators.SortedKeyValueIterator;
 import org.apache.accumulo.core.iterators.system.SourceSwitchingIterator;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class Scanner {
-  private static final Logger log = Logger.getLogger(Scanner.class);
+  private static final Logger log = LoggerFactory.getLogger(Scanner.class);
 
   private final Tablet tablet;
   private final ScanOptions options;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e4583eb3/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/TabletMemory.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/TabletMemory.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/TabletMemory.java
index 15cd50d..3d85871 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/TabletMemory.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/TabletMemory.java
@@ -25,10 +25,11 @@ import org.apache.accumulo.core.data.Mutation;
 import org.apache.accumulo.core.util.LocalityGroupUtil.LocalityGroupConfigurationError;
 import org.apache.accumulo.tserver.InMemoryMap;
 import org.apache.accumulo.tserver.InMemoryMap.MemoryIterator;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 class TabletMemory implements Closeable {
-  static private final Logger log = Logger.getLogger(TabletMemory.class);
+  static private final Logger log = LoggerFactory.getLogger(TabletMemory.class);
 
   private final TabletCommitter tablet;
   private InMemoryMap memTable;
@@ -136,7 +137,7 @@ class TabletMemory implements Closeable {
       try {
         tablet.wait(50);
       } catch (InterruptedException e) {
-        log.warn(e, e);
+        log.warn(e.getMessage(), e);
       }
     }
   }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e4583eb3/shell/src/main/java/org/apache/accumulo/shell/commands/MaxRowCommand.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/accumulo/shell/commands/MaxRowCommand.java b/shell/src/main/java/org/apache/accumulo/shell/commands/MaxRowCommand.java
index de62716..71a0338 100644
--- a/shell/src/main/java/org/apache/accumulo/shell/commands/MaxRowCommand.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/commands/MaxRowCommand.java
@@ -22,11 +22,12 @@ import org.apache.accumulo.core.util.interpret.ScanInterpreter;
 import org.apache.accumulo.shell.Shell;
 import org.apache.commons.cli.CommandLine;
 import org.apache.hadoop.io.Text;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class MaxRowCommand extends ScanCommand {
 
-  private static final Logger log = Logger.getLogger(MaxRowCommand.class);
+  private static final Logger log = LoggerFactory.getLogger(MaxRowCommand.class);
 
   public int execute(final String fullCommand, final CommandLine cl, final Shell shellState) throws Exception {
     final String tableName = OptUtil.getTableOpt(cl, shellState);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e4583eb3/shell/src/main/java/org/apache/accumulo/shell/commands/ShellPluginConfigurationCommand.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/accumulo/shell/commands/ShellPluginConfigurationCommand.java b/shell/src/main/java/org/apache/accumulo/shell/commands/ShellPluginConfigurationCommand.java
index 441de2a..e84dd0b 100644
--- a/shell/src/main/java/org/apache/accumulo/shell/commands/ShellPluginConfigurationCommand.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/commands/ShellPluginConfigurationCommand.java
@@ -32,7 +32,7 @@ import org.apache.commons.cli.Option;
 import org.apache.commons.cli.OptionGroup;
 import org.apache.commons.cli.Options;
 import org.apache.commons.cli.ParseException;
-import org.apache.log4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public abstract class ShellPluginConfigurationCommand extends Command {
   private Option removePluginOption, pluginClassOption, listPluginOption;
@@ -113,16 +113,16 @@ public abstract class ShellPluginConfigurationCommand extends Command {
           CommandLine cl = new BasicParser().parse(o, args);
           pluginClazz = shellState.getClassLoader(cl, shellState).loadClass(ent.getValue()).asSubclass(clazz);
         } catch (ClassNotFoundException e) {
-          Logger.getLogger(ShellPluginConfigurationCommand.class).error("Class not found" + e.getMessage());
+          LoggerFactory.getLogger(ShellPluginConfigurationCommand.class).error("Class not found" + e.getMessage());
           return null;
         } catch (ParseException e) {
-          Logger.getLogger(ShellPluginConfigurationCommand.class).error("Error parsing table: " + Arrays.toString(args) + e.getMessage());
+          LoggerFactory.getLogger(ShellPluginConfigurationCommand.class).error("Error parsing table: " + Arrays.toString(args) + e.getMessage());
           return null;
         } catch (TableNotFoundException e) {
-          Logger.getLogger(ShellPluginConfigurationCommand.class).error("Table not found: " + tableName + e.getMessage());
+          LoggerFactory.getLogger(ShellPluginConfigurationCommand.class).error("Table not found: " + tableName + e.getMessage());
           return null;
         } catch (Exception e) {
-          Logger.getLogger(ShellPluginConfigurationCommand.class).error("Error: " + e.getMessage());
+          LoggerFactory.getLogger(ShellPluginConfigurationCommand.class).error("Error: " + e.getMessage());
           return null;
         }
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e4583eb3/shell/src/main/java/org/apache/accumulo/shell/format/DeleterFormatter.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/accumulo/shell/format/DeleterFormatter.java b/shell/src/main/java/org/apache/accumulo/shell/format/DeleterFormatter.java
index a2a29d0..1dd2234 100644
--- a/shell/src/main/java/org/apache/accumulo/shell/format/DeleterFormatter.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/format/DeleterFormatter.java
@@ -28,11 +28,12 @@ import org.apache.accumulo.core.data.Value;
 import org.apache.accumulo.core.security.ColumnVisibility;
 import org.apache.accumulo.core.util.format.DefaultFormatter;
 import org.apache.accumulo.shell.Shell;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class DeleterFormatter extends DefaultFormatter {
 
-  private static final Logger log = Logger.getLogger(DeleterFormatter.class);
+  private static final Logger log = LoggerFactory.getLogger(DeleterFormatter.class);
   private BatchWriter writer;
   private Shell shellState;
   private boolean printTimestamps;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e4583eb3/start/src/main/java/org/apache/accumulo/start/Main.java
----------------------------------------------------------------------
diff --git a/start/src/main/java/org/apache/accumulo/start/Main.java b/start/src/main/java/org/apache/accumulo/start/Main.java
index 880e52e..abc0489 100644
--- a/start/src/main/java/org/apache/accumulo/start/Main.java
+++ b/start/src/main/java/org/apache/accumulo/start/Main.java
@@ -30,11 +30,12 @@ import java.util.jar.JarFile;
 
 import org.apache.accumulo.start.classloader.AccumuloClassLoader;
 import org.apache.accumulo.start.spi.KeywordExecutable;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class Main {
 
-  private static final Logger log = Logger.getLogger(Main.class);
+  private static final Logger log = LoggerFactory.getLogger(Main.class);
   private static ClassLoader classLoader;
   private static Class<?> vfsClassLoader;
   private static Map<String,KeywordExecutable> servicesMap;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e4583eb3/start/src/main/java/org/apache/accumulo/start/classloader/AccumuloClassLoader.java
----------------------------------------------------------------------
diff --git a/start/src/main/java/org/apache/accumulo/start/classloader/AccumuloClassLoader.java b/start/src/main/java/org/apache/accumulo/start/classloader/AccumuloClassLoader.java
index 860da06..df4437d 100644
--- a/start/src/main/java/org/apache/accumulo/start/classloader/AccumuloClassLoader.java
+++ b/start/src/main/java/org/apache/accumulo/start/classloader/AccumuloClassLoader.java
@@ -35,7 +35,8 @@ import java.util.regex.Pattern;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
@@ -85,7 +86,7 @@ public class AccumuloClassLoader {
 
   private static URLClassLoader classloader;
 
-  private static final Logger log = Logger.getLogger(AccumuloClassLoader.class);
+  private static final Logger log = LoggerFactory.getLogger(AccumuloClassLoader.class);
 
   static {
     String configFile = System.getProperty("org.apache.accumulo.config.file", "accumulo-site.xml");

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e4583eb3/start/src/main/java/org/apache/accumulo/start/classloader/vfs/AccumuloReloadingVFSClassLoader.java
----------------------------------------------------------------------
diff --git a/start/src/main/java/org/apache/accumulo/start/classloader/vfs/AccumuloReloadingVFSClassLoader.java b/start/src/main/java/org/apache/accumulo/start/classloader/vfs/AccumuloReloadingVFSClassLoader.java
index b84953e..a3e02a6 100644
--- a/start/src/main/java/org/apache/accumulo/start/classloader/vfs/AccumuloReloadingVFSClassLoader.java
+++ b/start/src/main/java/org/apache/accumulo/start/classloader/vfs/AccumuloReloadingVFSClassLoader.java
@@ -33,7 +33,8 @@ import org.apache.commons.vfs2.FileSystemException;
 import org.apache.commons.vfs2.FileSystemManager;
 import org.apache.commons.vfs2.impl.DefaultFileMonitor;
 import org.apache.commons.vfs2.impl.VFSClassLoader;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Classloader that delegates operations to a VFSClassLoader object. This class also listens for changes in any of the files/directories that are in the
@@ -42,7 +43,7 @@ import org.apache.log4j.Logger;
  */
 public class AccumuloReloadingVFSClassLoader implements FileListener, ReloadingClassLoader {
 
-  private static final Logger log = Logger.getLogger(AccumuloReloadingVFSClassLoader.class);
+  private static final Logger log = LoggerFactory.getLogger(AccumuloReloadingVFSClassLoader.class);
 
   // set to 5 mins. The rational behind this large time is to avoid a gazillion tservers all asking the name node for info too frequently.
   private static final int DEFAULT_TIMEOUT = 5 * 60 * 1000;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e4583eb3/start/src/main/java/org/apache/accumulo/start/classloader/vfs/AccumuloVFSClassLoader.java
----------------------------------------------------------------------
diff --git a/start/src/main/java/org/apache/accumulo/start/classloader/vfs/AccumuloVFSClassLoader.java b/start/src/main/java/org/apache/accumulo/start/classloader/vfs/AccumuloVFSClassLoader.java
index 1cee6d7..4df3f40 100644
--- a/start/src/main/java/org/apache/accumulo/start/classloader/vfs/AccumuloVFSClassLoader.java
+++ b/start/src/main/java/org/apache/accumulo/start/classloader/vfs/AccumuloVFSClassLoader.java
@@ -42,7 +42,8 @@ import org.apache.commons.vfs2.impl.VFSClassLoader;
 import org.apache.commons.vfs2.provider.FileReplicator;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.FileSystem;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * This class builds a hierarchy of Classloaders in the form of:
@@ -97,7 +98,7 @@ public class AccumuloVFSClassLoader {
 
   private static ContextManager contextManager;
 
-  private static final Logger log = Logger.getLogger(AccumuloVFSClassLoader.class);
+  private static final Logger log = LoggerFactory.getLogger(AccumuloVFSClassLoader.class);
 
   static {
     // Register the shutdown hook
@@ -396,7 +397,7 @@ public class AccumuloVFSClassLoader {
             ((UniqueFileReplicator) replicator).close();
           }
         } catch (FileSystemException e) {
-          log.error(e, e);
+          log.error("FileSystemException", e);
         }
         ref.close();
       }
@@ -404,7 +405,7 @@ public class AccumuloVFSClassLoader {
     try {
       FileUtils.deleteDirectory(computeTopCacheDir());
     } catch (IOException e) {
-      log.error(e, e);
+      log.error("IOException", e);
     }
   }
 }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e4583eb3/start/src/main/java/org/apache/accumulo/start/classloader/vfs/UniqueFileReplicator.java
----------------------------------------------------------------------
diff --git a/start/src/main/java/org/apache/accumulo/start/classloader/vfs/UniqueFileReplicator.java b/start/src/main/java/org/apache/accumulo/start/classloader/vfs/UniqueFileReplicator.java
index ff6e87c..641da8a 100644
--- a/start/src/main/java/org/apache/accumulo/start/classloader/vfs/UniqueFileReplicator.java
+++ b/start/src/main/java/org/apache/accumulo/start/classloader/vfs/UniqueFileReplicator.java
@@ -30,7 +30,8 @@ import org.apache.commons.vfs2.provider.FileReplicator;
 import org.apache.commons.vfs2.provider.UriParser;
 import org.apache.commons.vfs2.provider.VfsComponent;
 import org.apache.commons.vfs2.provider.VfsComponentContext;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  *
@@ -38,7 +39,7 @@ import org.apache.log4j.Logger;
 public class UniqueFileReplicator implements VfsComponent, FileReplicator {
 
   private static final char[] TMP_RESERVED_CHARS = new char[] {'?', '/', '\\', ' ', '&', '"', '\'', '*', '#', ';', ':', '<', '>', '|'};
-  private static final Logger log = Logger.getLogger(UniqueFileReplicator.class);
+  private static final Logger log = LoggerFactory.getLogger(UniqueFileReplicator.class);
 
   private File tempDir;
   private VfsComponentContext context;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e4583eb3/test/src/main/java/org/apache/accumulo/test/CreateRFiles.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/CreateRFiles.java b/test/src/main/java/org/apache/accumulo/test/CreateRFiles.java
index 9b99f39..0812328 100644
--- a/test/src/main/java/org/apache/accumulo/test/CreateRFiles.java
+++ b/test/src/main/java/org/apache/accumulo/test/CreateRFiles.java
@@ -21,13 +21,14 @@ import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 
 import org.apache.accumulo.core.cli.Help;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.beust.jcommander.Parameter;
 
 public class CreateRFiles {
 
-  private static final Logger log = Logger.getLogger(CreateRFiles.class);
+  private static final Logger log = LoggerFactory.getLogger(CreateRFiles.class);
 
   static class Opts extends Help {
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e4583eb3/test/src/main/java/org/apache/accumulo/test/NativeMapConcurrencyTest.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/NativeMapConcurrencyTest.java b/test/src/main/java/org/apache/accumulo/test/NativeMapConcurrencyTest.java
index 015cda4..616121d 100644
--- a/test/src/main/java/org/apache/accumulo/test/NativeMapConcurrencyTest.java
+++ b/test/src/main/java/org/apache/accumulo/test/NativeMapConcurrencyTest.java
@@ -27,14 +27,15 @@ import org.apache.accumulo.core.data.Value;
 import org.apache.accumulo.core.util.FastFormat;
 import org.apache.accumulo.tserver.NativeMap;
 import org.apache.hadoop.io.Text;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.beust.jcommander.JCommander;
 import com.beust.jcommander.Parameter;
 
 public class NativeMapConcurrencyTest {
 
-  private static final Logger log = Logger.getLogger(NativeMapConcurrencyTest.class);
+  private static final Logger log = LoggerFactory.getLogger(NativeMapConcurrencyTest.class);
 
   private static final byte ROW_PREFIX[] = new byte[] {'r'};
   private static final byte COL_PREFIX[] = new byte[] {'c'};

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e4583eb3/test/src/main/java/org/apache/accumulo/test/TestIngest.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/TestIngest.java b/test/src/main/java/org/apache/accumulo/test/TestIngest.java
index 3f3c4cc..d4346de 100644
--- a/test/src/main/java/org/apache/accumulo/test/TestIngest.java
+++ b/test/src/main/java/org/apache/accumulo/test/TestIngest.java
@@ -109,9 +109,6 @@ public class TestIngest {
     }
   }
 
-  @SuppressWarnings("unused")
-  private static final Logger log = Logger.getLogger(TestIngest.class);
-
   public static void createTable(Connector conn, Opts args) throws AccumuloException, AccumuloSecurityException, TableExistsException {
     if (args.createTable) {
       TreeSet<Text> splits = getSplitPoints(args.startRow, args.startRow + args.rows, args.numsplits);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e4583eb3/test/src/main/java/org/apache/accumulo/test/TestRandomDeletes.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/TestRandomDeletes.java b/test/src/main/java/org/apache/accumulo/test/TestRandomDeletes.java
index cd3299b..3b09b67 100644
--- a/test/src/main/java/org/apache/accumulo/test/TestRandomDeletes.java
+++ b/test/src/main/java/org/apache/accumulo/test/TestRandomDeletes.java
@@ -36,10 +36,11 @@ import org.apache.accumulo.core.security.Authorizations;
 import org.apache.accumulo.core.security.ColumnVisibility;
 import org.apache.accumulo.core.util.TextUtil;
 import org.apache.hadoop.io.Text;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class TestRandomDeletes {
-  private static final Logger log = Logger.getLogger(TestRandomDeletes.class);
+  private static final Logger log = LoggerFactory.getLogger(TestRandomDeletes.class);
   private static Authorizations auths = new Authorizations("L1", "L2", "G1", "GROUP2");
 
   static private class RowColumn implements Comparable<RowColumn> {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e4583eb3/test/src/main/java/org/apache/accumulo/test/VerifyIngest.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/VerifyIngest.java b/test/src/main/java/org/apache/accumulo/test/VerifyIngest.java
index 503ff1f..be14150 100644
--- a/test/src/main/java/org/apache/accumulo/test/VerifyIngest.java
+++ b/test/src/main/java/org/apache/accumulo/test/VerifyIngest.java
@@ -35,13 +35,14 @@ import org.apache.accumulo.core.security.Authorizations;
 import org.apache.accumulo.core.trace.DistributedTrace;
 import org.apache.accumulo.core.trace.Trace;
 import org.apache.hadoop.io.Text;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.beust.jcommander.Parameter;
 
 public class VerifyIngest {
 
-  private static final Logger log = Logger.getLogger(VerifyIngest.class);
+  private static final Logger log = LoggerFactory.getLogger(VerifyIngest.class);
 
   public static int getRow(Key k) {
     return Integer.parseInt(k.getRow().toString().split("_")[1]);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e4583eb3/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousStatsCollector.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousStatsCollector.java b/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousStatsCollector.java
index a332b25..d06df4c 100644
--- a/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousStatsCollector.java
+++ b/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousStatsCollector.java
@@ -55,11 +55,12 @@ import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.io.Text;
 import org.apache.hadoop.mapred.ClusterStatus;
 import org.apache.hadoop.mapred.JobClient;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class ContinuousStatsCollector {
 
-  private static final Logger log = Logger.getLogger(ContinuousStatsCollector.class);
+  private static final Logger log = LoggerFactory.getLogger(ContinuousStatsCollector.class);
 
   static class StatsCollectionTask extends TimerTask {
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e4583eb3/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousVerify.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousVerify.java b/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousVerify.java
index fccaeeb..8a8a9a2 100644
--- a/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousVerify.java
+++ b/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousVerify.java
@@ -44,7 +44,8 @@ import org.apache.hadoop.mapreduce.Reducer;
 import org.apache.hadoop.mapreduce.lib.output.TextOutputFormat;
 import org.apache.hadoop.util.Tool;
 import org.apache.hadoop.util.ToolRunner;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.beust.jcommander.Parameter;
 import com.beust.jcommander.validators.PositiveInteger;
@@ -59,7 +60,7 @@ public class ContinuousVerify extends Configured implements Tool {
 
   public static class CMapper extends Mapper<Key,Value,LongWritable,VLongWritable> {
 
-    private static final Logger log = Logger.getLogger(CMapper.class);
+    private static final Logger log = LoggerFactory.getLogger(CMapper.class);
     private LongWritable row = new LongWritable();
     private LongWritable ref = new LongWritable();
     private VLongWritable vrow = new VLongWritable();

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e4583eb3/test/src/main/java/org/apache/accumulo/test/continuous/PrintScanTimeHistogram.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/continuous/PrintScanTimeHistogram.java b/test/src/main/java/org/apache/accumulo/test/continuous/PrintScanTimeHistogram.java
index d77f427..8c39a7f 100644
--- a/test/src/main/java/org/apache/accumulo/test/continuous/PrintScanTimeHistogram.java
+++ b/test/src/main/java/org/apache/accumulo/test/continuous/PrintScanTimeHistogram.java
@@ -24,11 +24,12 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class PrintScanTimeHistogram {
 
-  private static final Logger log = Logger.getLogger(PrintScanTimeHistogram.class);
+  private static final Logger log = LoggerFactory.getLogger(PrintScanTimeHistogram.class);
 
   public static void main(String[] args) throws Exception {
     Histogram<String> srqHist = new Histogram<String>();
@@ -39,12 +40,12 @@ public class PrintScanTimeHistogram {
     StringBuilder report = new StringBuilder();
     report.append(String.format("%n *** Single row queries histogram *** %n"));
     srqHist.print(report);
-    log.info(report);
+    log.info("{}", report);
 
     report = new StringBuilder();
     report.append(String.format("%n *** Find start rows histogram *** %n"));
     fsrHist.print(report);
-    log.info(report);
+    log.info("{}",report);
   }
 
   private static void processFile(InputStream ins, Histogram<String> srqHist, Histogram<String> fsrHist) throws FileNotFoundException, IOException {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e4583eb3/test/src/main/java/org/apache/accumulo/test/functional/ZombieTServer.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/ZombieTServer.java b/test/src/main/java/org/apache/accumulo/test/functional/ZombieTServer.java
index 0b047cb..da9f1d6 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/ZombieTServer.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/ZombieTServer.java
@@ -46,8 +46,9 @@ import org.apache.accumulo.server.rpc.ThriftServerType;
 import org.apache.accumulo.server.zookeeper.TransactionWatcher;
 import org.apache.accumulo.server.zookeeper.ZooLock;
 import org.apache.accumulo.server.zookeeper.ZooReaderWriter;
-import org.apache.log4j.Logger;
 import org.apache.thrift.TException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.google.common.net.HostAndPort;
 
@@ -93,7 +94,7 @@ public class ZombieTServer {
 
   }
 
-  private static final Logger log = Logger.getLogger(ZombieTServer.class);
+  private static final Logger log = LoggerFactory.getLogger(ZombieTServer.class);
 
   public static void main(String[] args) throws Exception {
     Random random = new Random(System.currentTimeMillis() % 1000);
@@ -119,7 +120,7 @@ public class ZombieTServer {
         try {
           tch.halt(Tracer.traceInfo(), null, null);
         } catch (Exception ex) {
-          log.error(ex, ex);
+          log.error("Exception", ex);
           System.exit(1);
         }
       }
@@ -129,7 +130,7 @@ public class ZombieTServer {
         try {
           tch.halt(Tracer.traceInfo(), null, null);
         } catch (Exception ex) {
-          log.error(ex, ex);
+          log.error("Exception", ex);
           System.exit(1);
         }
       }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e4583eb3/test/src/main/java/org/apache/accumulo/test/performance/metadata/MetadataBatchScanTest.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/performance/metadata/MetadataBatchScanTest.java b/test/src/main/java/org/apache/accumulo/test/performance/metadata/MetadataBatchScanTest.java
index 6b43f49..a611829 100644
--- a/test/src/main/java/org/apache/accumulo/test/performance/metadata/MetadataBatchScanTest.java
+++ b/test/src/main/java/org/apache/accumulo/test/performance/metadata/MetadataBatchScanTest.java
@@ -47,7 +47,8 @@ import org.apache.accumulo.core.security.Authorizations;
 import org.apache.accumulo.core.util.Stat;
 import org.apache.accumulo.server.master.state.TServerInstance;
 import org.apache.hadoop.io.Text;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.google.common.net.HostAndPort;
 
@@ -60,7 +61,7 @@ import com.google.common.net.HostAndPort;
 
 public class MetadataBatchScanTest {
 
-  private static final Logger log = Logger.getLogger(MetadataBatchScanTest.class);
+  private static final Logger log = LoggerFactory.getLogger(MetadataBatchScanTest.class);
 
   public static void main(String[] args) throws Exception {
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e4583eb3/test/src/main/java/org/apache/accumulo/test/performance/scan/CollectTabletStats.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/performance/scan/CollectTabletStats.java b/test/src/main/java/org/apache/accumulo/test/performance/scan/CollectTabletStats.java
index 377a783..00ff6cf 100644
--- a/test/src/main/java/org/apache/accumulo/test/performance/scan/CollectTabletStats.java
+++ b/test/src/main/java/org/apache/accumulo/test/performance/scan/CollectTabletStats.java
@@ -75,13 +75,14 @@ import org.apache.hadoop.fs.FileStatus;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.io.Text;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.beust.jcommander.Parameter;
 import com.google.common.net.HostAndPort;
 
 public class CollectTabletStats {
-  private static final Logger log = Logger.getLogger(CollectTabletStats.class);
+  private static final Logger log = LoggerFactory.getLogger(CollectTabletStats.class);
 
   static class CollectOptions extends ClientOnRequiredTable {
     @Parameter(names = "--iterations", description = "number of iterations")


Mime
View raw message