accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject [4/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:26 GMT
http://git-wip-us.apache.org/repos/asf/accumulo/blob/e4583eb3/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/TracingExample.java
----------------------------------------------------------------------
diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/TracingExample.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/TracingExample.java
index 6214f29..3ee0a27 100644
--- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/TracingExample.java
+++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/TracingExample.java
@@ -38,7 +38,8 @@ import org.apache.accumulo.core.trace.DistributedTrace;
 import org.apache.htrace.Sampler;
 import org.apache.htrace.Trace;
 import org.apache.htrace.TraceScope;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.beust.jcommander.Parameter;
 
@@ -47,7 +48,7 @@ import com.beust.jcommander.Parameter;
  *
  */
 public class TracingExample {
-  private static final Logger log = Logger.getLogger(TracingExample.class);
+  private static final Logger log = LoggerFactory.getLogger(TracingExample.class);
   private static final String DEFAULT_TABLE_NAME = "test";
 
   static class Opts extends ClientOnDefaultTable {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e4583eb3/examples/simple/src/main/java/org/apache/accumulo/examples/simple/dirlist/Viewer.java
----------------------------------------------------------------------
diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/dirlist/Viewer.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/dirlist/Viewer.java
index 03c8252..2648a48 100644
--- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/dirlist/Viewer.java
+++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/dirlist/Viewer.java
@@ -37,7 +37,8 @@ import javax.swing.tree.TreePath;
 
 import org.apache.accumulo.core.client.TableNotFoundException;
 import org.apache.accumulo.examples.simple.filedata.FileDataQuery;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.beust.jcommander.Parameter;
 
@@ -46,7 +47,7 @@ import com.beust.jcommander.Parameter;
  */
 @SuppressWarnings("serial")
 public class Viewer extends JFrame implements TreeSelectionListener, TreeExpansionListener {
-  private static final Logger log = Logger.getLogger(Viewer.class);
+  private static final Logger log = LoggerFactory.getLogger(Viewer.class);
 
   JTree tree;
   DefaultTreeModel treeModel;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e4583eb3/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/ChunkInputStream.java
----------------------------------------------------------------------
diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/ChunkInputStream.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/ChunkInputStream.java
index c902271..002c1ab 100644
--- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/ChunkInputStream.java
+++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/ChunkInputStream.java
@@ -27,13 +27,15 @@ import org.apache.accumulo.core.data.PartialKey;
 import org.apache.accumulo.core.data.Value;
 import org.apache.accumulo.core.util.PeekingIterator;
 import org.apache.hadoop.io.Text;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 
 /**
  * An input stream that reads file data stored in one or more Accumulo values. Used by {@link ChunkInputFormat} to present input streams to a mapper.
  */
 public class ChunkInputStream extends InputStream {
-  private static final Logger log = Logger.getLogger(ChunkInputStream.class);
+  private static final Logger log = LoggerFactory.getLogger(ChunkInputStream.class);
 
   protected PeekingIterator<Entry<Key,Value>> source;
   protected Key currentKey;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e4583eb3/examples/simple/src/main/java/org/apache/accumulo/examples/simple/helloworld/ReadData.java
----------------------------------------------------------------------
diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/helloworld/ReadData.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/helloworld/ReadData.java
index 041c15f..c8c984d 100644
--- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/helloworld/ReadData.java
+++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/helloworld/ReadData.java
@@ -30,7 +30,8 @@ import org.apache.accumulo.core.data.Key;
 import org.apache.accumulo.core.data.Range;
 import org.apache.accumulo.core.data.Value;
 import org.apache.hadoop.io.Text;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.beust.jcommander.Parameter;
 
@@ -39,7 +40,7 @@ import com.beust.jcommander.Parameter;
  */
 public class ReadData {
 
-  private static final Logger log = Logger.getLogger(ReadData.class);
+  private static final Logger log = LoggerFactory.getLogger(ReadData.class);
 
   static class Opts extends ClientOnRequiredTable {
     @Parameter(names = "--startKey")

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e4583eb3/examples/simple/src/main/java/org/apache/accumulo/examples/simple/isolation/InterferenceTest.java
----------------------------------------------------------------------
diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/isolation/InterferenceTest.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/isolation/InterferenceTest.java
index bbfca48..9fe6857 100644
--- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/isolation/InterferenceTest.java
+++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/isolation/InterferenceTest.java
@@ -31,7 +31,8 @@ import org.apache.accumulo.core.data.Key;
 import org.apache.accumulo.core.data.Mutation;
 import org.apache.accumulo.core.data.Value;
 import org.apache.hadoop.io.Text;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.beust.jcommander.Parameter;
 
@@ -49,7 +50,7 @@ public class InterferenceTest {
 
   private static final int NUM_ROWS = 500;
   private static final int NUM_COLUMNS = 113; // scanner batches 1000 by default, so make num columns not a multiple of 10
-  private static final Logger log = Logger.getLogger(InterferenceTest.class);
+  private static final Logger log = LoggerFactory.getLogger(InterferenceTest.class);
 
   static class Writer implements Runnable {
 
@@ -85,7 +86,7 @@ public class InterferenceTest {
       try {
         bw.close();
       } catch (MutationsRejectedException e) {
-        log.error(e, e);
+        log.error("Mutation was rejected on BatchWriter close.", e);
       }
     }
   }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e4583eb3/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/NGramIngest.java
----------------------------------------------------------------------
diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/NGramIngest.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/NGramIngest.java
index 6cf0be5..441f6ad 100644
--- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/NGramIngest.java
+++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/NGramIngest.java
@@ -34,7 +34,8 @@ import org.apache.hadoop.mapreduce.Mapper;
 import org.apache.hadoop.mapreduce.lib.input.TextInputFormat;
 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;
 
@@ -43,7 +44,7 @@ import com.beust.jcommander.Parameter;
  */
 public class NGramIngest extends Configured implements Tool {
 
-  private static final Logger log = Logger.getLogger(NGramIngest.class);
+  private static final Logger log = LoggerFactory.getLogger(NGramIngest.class);
 
   static class Opts extends MapReduceClientOnRequiredTable {
     @Parameter(names = "--input", required = true)

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e4583eb3/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TokenFileWordCount.java
----------------------------------------------------------------------
diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TokenFileWordCount.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TokenFileWordCount.java
index 49e1f50..9c1abd9 100644
--- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TokenFileWordCount.java
+++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TokenFileWordCount.java
@@ -31,7 +31,9 @@ import org.apache.hadoop.mapreduce.Mapper;
 import org.apache.hadoop.mapreduce.lib.input.TextInputFormat;
 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;
+
 
 /**
  * A simple map reduce job that inserts word counts into accumulo. See the README for instructions on how to run this. This version does not use the ClientOpts
@@ -40,7 +42,7 @@ import org.apache.log4j.Logger;
  */
 public class TokenFileWordCount extends Configured implements Tool {
 
-  private static final Logger log = Logger.getLogger(TokenFileWordCount.class);
+  private static final Logger log = LoggerFactory.getLogger(TokenFileWordCount.class);
 
   public static class MapClass extends Mapper<LongWritable,Text,Text,Mutation> {
     @Override

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e4583eb3/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/WordCount.java
----------------------------------------------------------------------
diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/WordCount.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/WordCount.java
index 04df4c8..604d05d 100644
--- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/WordCount.java
+++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/WordCount.java
@@ -32,7 +32,8 @@ import org.apache.hadoop.mapreduce.Mapper;
 import org.apache.hadoop.mapreduce.lib.input.TextInputFormat;
 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;
 
@@ -42,7 +43,7 @@ import com.beust.jcommander.Parameter;
  */
 public class WordCount extends Configured implements Tool {
 
-  private static final Logger log = Logger.getLogger(WordCount.class);
+  private static final Logger log = LoggerFactory.getLogger(WordCount.class);
 
   static class Opts extends MapReduceClientOnRequiredTable {
     @Parameter(names = "--input", description = "input directory")

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e4583eb3/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/bulk/VerifyIngest.java
----------------------------------------------------------------------
diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/bulk/VerifyIngest.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/bulk/VerifyIngest.java
index fd54058..546b1ca 100644
--- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/bulk/VerifyIngest.java
+++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/bulk/VerifyIngest.java
@@ -29,12 +29,13 @@ import org.apache.accumulo.core.data.Key;
 import org.apache.accumulo.core.data.Range;
 import org.apache.accumulo.core.data.Value;
 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);
 
   static class Opts extends ClientOnRequiredTable {
     @Parameter(names = "--start-row")

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e4583eb3/examples/simple/src/main/java/org/apache/accumulo/examples/simple/reservations/ARS.java
----------------------------------------------------------------------
diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/reservations/ARS.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/reservations/ARS.java
index 6f47abd..0915e17 100644
--- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/reservations/ARS.java
+++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/reservations/ARS.java
@@ -38,7 +38,9 @@ import org.apache.accumulo.core.data.Range;
 import org.apache.accumulo.core.data.Value;
 import org.apache.accumulo.core.security.Authorizations;
 import org.apache.hadoop.io.Text;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 
 /**
  * Accumulo Reservation System : An example reservation system using Accumulo. Supports atomic reservations of a resource at a date. Wait list are also
@@ -53,7 +55,7 @@ import org.apache.log4j.Logger;
 
 public class ARS {
 
-  private static final Logger log = Logger.getLogger(ARS.class);
+  private static final Logger log = LoggerFactory.getLogger(ARS.class);
 
   private Connector conn;
   private String rTable;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e4583eb3/examples/simple/src/test/java/org/apache/accumulo/examples/simple/dirlist/CountTest.java
----------------------------------------------------------------------
diff --git a/examples/simple/src/test/java/org/apache/accumulo/examples/simple/dirlist/CountTest.java b/examples/simple/src/test/java/org/apache/accumulo/examples/simple/dirlist/CountTest.java
index a8aabeb..e4887aa 100644
--- a/examples/simple/src/test/java/org/apache/accumulo/examples/simple/dirlist/CountTest.java
+++ b/examples/simple/src/test/java/org/apache/accumulo/examples/simple/dirlist/CountTest.java
@@ -37,11 +37,13 @@ import org.apache.accumulo.core.security.ColumnVisibility;
 import org.apache.accumulo.core.util.Pair;
 import org.apache.accumulo.examples.simple.dirlist.FileCount.Opts;
 import org.apache.hadoop.io.Text;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 
 public class CountTest extends TestCase {
 
-  private static final Logger log = Logger.getLogger(CountTest.class);
+  private static final Logger log = LoggerFactory.getLogger(CountTest.class);
 
   {
     try {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e4583eb3/examples/simple/src/test/java/org/apache/accumulo/examples/simple/filedata/ChunkInputStreamTest.java
----------------------------------------------------------------------
diff --git a/examples/simple/src/test/java/org/apache/accumulo/examples/simple/filedata/ChunkInputStreamTest.java b/examples/simple/src/test/java/org/apache/accumulo/examples/simple/filedata/ChunkInputStreamTest.java
index 2cf5332..a9b5032 100644
--- a/examples/simple/src/test/java/org/apache/accumulo/examples/simple/filedata/ChunkInputStreamTest.java
+++ b/examples/simple/src/test/java/org/apache/accumulo/examples/simple/filedata/ChunkInputStreamTest.java
@@ -16,17 +16,13 @@
  */
 package org.apache.accumulo.examples.simple.filedata;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.fail;
-
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map.Entry;
 
+import junit.framework.TestCase;
+
 import org.apache.accumulo.core.client.AccumuloException;
 import org.apache.accumulo.core.client.AccumuloSecurityException;
 import org.apache.accumulo.core.client.BatchWriter;
@@ -45,11 +41,12 @@ import org.apache.accumulo.core.security.Authorizations;
 import org.apache.accumulo.core.security.ColumnVisibility;
 import org.apache.accumulo.core.util.PeekingIterator;
 import org.apache.hadoop.io.Text;
-import org.apache.log4j.Logger;
 import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
-public class ChunkInputStreamTest {
-  private static final Logger log = Logger.getLogger(ChunkInputStream.class);
+public class ChunkInputStreamTest extends TestCase {
+  private static final Logger log = LoggerFactory.getLogger(ChunkInputStream.class);
   List<Entry<Key,Value>> data;
   List<Entry<Key,Value>> baddata;
   List<Entry<Key,Value>> multidata;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e4583eb3/fate/src/main/java/org/apache/accumulo/fate/AdminUtil.java
----------------------------------------------------------------------
diff --git a/fate/src/main/java/org/apache/accumulo/fate/AdminUtil.java b/fate/src/main/java/org/apache/accumulo/fate/AdminUtil.java
index c12efb5..dca35ed 100644
--- a/fate/src/main/java/org/apache/accumulo/fate/AdminUtil.java
+++ b/fate/src/main/java/org/apache/accumulo/fate/AdminUtil.java
@@ -32,14 +32,15 @@ import org.apache.accumulo.fate.ReadOnlyTStore.TStatus;
 import org.apache.accumulo.fate.zookeeper.IZooReaderWriter;
 import org.apache.accumulo.fate.zookeeper.ZooLock;
 import org.apache.accumulo.fate.zookeeper.ZooUtil.NodeMissingPolicy;
-import org.apache.log4j.Logger;
 import org.apache.zookeeper.KeeperException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * A utility to administer FATE operations
  */
 public class AdminUtil<T> {
-  private static final Logger log = Logger.getLogger(AdminUtil.class);
+  private static final Logger log = LoggerFactory.getLogger(AdminUtil.class);
 
   private boolean exitOnError = false;
 
@@ -110,7 +111,7 @@ public class AdminUtil<T> {
             tables.add(lda[0].charAt(0) + ":" + id);
 
           } catch (Exception e) {
-            log.error(e);
+            log.error(e.getMessage(),e);
           }
           pos++;
         }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e4583eb3/fate/src/main/java/org/apache/accumulo/fate/AgeOffStore.java
----------------------------------------------------------------------
diff --git a/fate/src/main/java/org/apache/accumulo/fate/AgeOffStore.java b/fate/src/main/java/org/apache/accumulo/fate/AgeOffStore.java
index 3c88f48..87ef5ab 100644
--- a/fate/src/main/java/org/apache/accumulo/fate/AgeOffStore.java
+++ b/fate/src/main/java/org/apache/accumulo/fate/AgeOffStore.java
@@ -24,7 +24,9 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 
 /**
  * This store removes Repos, in the store it wraps, that are in a finished or new state for more than a configurable time period.
@@ -38,7 +40,7 @@ public class AgeOffStore<T> implements TStore<T> {
     long currentTimeMillis();
   }
 
-  final private static Logger log = Logger.getLogger(AgeOffStore.class);
+  final private static Logger log = LoggerFactory.getLogger(AgeOffStore.class);
 
   private TStore<T> store;
   private Map<Long,Long> candidates;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e4583eb3/fate/src/main/java/org/apache/accumulo/fate/Fate.java
----------------------------------------------------------------------
diff --git a/fate/src/main/java/org/apache/accumulo/fate/Fate.java b/fate/src/main/java/org/apache/accumulo/fate/Fate.java
index aa9c456..34d2206 100644
--- a/fate/src/main/java/org/apache/accumulo/fate/Fate.java
+++ b/fate/src/main/java/org/apache/accumulo/fate/Fate.java
@@ -25,7 +25,9 @@ import java.util.concurrent.atomic.AtomicInteger;
 
 import org.apache.accumulo.fate.ReadOnlyTStore.TStatus;
 import org.apache.accumulo.fate.util.LoggingRunnable;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 
 /**
  * Fault tolerant executor
@@ -40,7 +42,7 @@ public class Fate<T> {
   private static final String EXCEPTION_PROP = "exception";
   private static final String RETURN_PROP = "return";
 
-  final private static Logger log = Logger.getLogger(Fate.class);
+  final private static Logger log = LoggerFactory.getLogger(Fate.class);
 
   private TStore<T> store;
   private T environment;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e4583eb3/fate/src/main/java/org/apache/accumulo/fate/util/AddressUtil.java
----------------------------------------------------------------------
diff --git a/fate/src/main/java/org/apache/accumulo/fate/util/AddressUtil.java b/fate/src/main/java/org/apache/accumulo/fate/util/AddressUtil.java
index 33e84cf..c9a8224 100644
--- a/fate/src/main/java/org/apache/accumulo/fate/util/AddressUtil.java
+++ b/fate/src/main/java/org/apache/accumulo/fate/util/AddressUtil.java
@@ -20,11 +20,13 @@ import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.security.Security;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 
 public class AddressUtil {
 
-  private static final Logger log = Logger.getLogger(AddressUtil.class);
+  private static final Logger log = LoggerFactory.getLogger(AddressUtil.class);
 
   /**
    * Fetch the security value that determines how long DNS failures are cached. Looks up the security property 'networkaddress.cache.negative.ttl'. Should that

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e4583eb3/fate/src/main/java/org/apache/accumulo/fate/util/LoggingRunnable.java
----------------------------------------------------------------------
diff --git a/fate/src/main/java/org/apache/accumulo/fate/util/LoggingRunnable.java b/fate/src/main/java/org/apache/accumulo/fate/util/LoggingRunnable.java
index ba45488..6f1b20e 100644
--- a/fate/src/main/java/org/apache/accumulo/fate/util/LoggingRunnable.java
+++ b/fate/src/main/java/org/apache/accumulo/fate/util/LoggingRunnable.java
@@ -18,7 +18,8 @@ package org.apache.accumulo.fate.util;
 
 import java.util.Date;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+
 
 public class LoggingRunnable implements Runnable {
   private Runnable runnable;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e4583eb3/fate/src/main/java/org/apache/accumulo/fate/util/UtilWaitThread.java
----------------------------------------------------------------------
diff --git a/fate/src/main/java/org/apache/accumulo/fate/util/UtilWaitThread.java b/fate/src/main/java/org/apache/accumulo/fate/util/UtilWaitThread.java
index fb5701a..da9cc5d 100644
--- a/fate/src/main/java/org/apache/accumulo/fate/util/UtilWaitThread.java
+++ b/fate/src/main/java/org/apache/accumulo/fate/util/UtilWaitThread.java
@@ -16,10 +16,12 @@
  */
 package org.apache.accumulo.fate.util;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 
 public class UtilWaitThread {
-  private static final Logger log = Logger.getLogger(UtilWaitThread.class);
+  private static final Logger log = LoggerFactory.getLogger(UtilWaitThread.class);
 
   public static void sleep(long millis) {
     try {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e4583eb3/fate/src/main/java/org/apache/accumulo/fate/zookeeper/DistributedReadWriteLock.java
----------------------------------------------------------------------
diff --git a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/DistributedReadWriteLock.java b/fate/src/main/java/org/apache/accumulo/fate/zookeeper/DistributedReadWriteLock.java
index fc94ff4..2c6446d 100644
--- a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/DistributedReadWriteLock.java
+++ b/fate/src/main/java/org/apache/accumulo/fate/zookeeper/DistributedReadWriteLock.java
@@ -28,7 +28,9 @@ import java.util.concurrent.locks.Lock;
 
 import org.apache.accumulo.fate.util.UtilWaitThread;
 import org.apache.commons.lang.NotImplementedException;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 
 // A ReadWriteLock that can be implemented in ZooKeeper.  Features the ability to store data
 // with the lock, and recover the lock using that data to find the lock.
@@ -96,7 +98,7 @@ public class DistributedReadWriteLock implements java.util.concurrent.locks.Read
     long addEntry(byte[] data);
   }
 
-  private static final Logger log = Logger.getLogger(DistributedReadWriteLock.class);
+  private static final Logger log = LoggerFactory.getLogger(DistributedReadWriteLock.class);
 
   static class ReadLock implements Lock {
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e4583eb3/fate/src/main/java/org/apache/accumulo/fate/zookeeper/Retry.java
----------------------------------------------------------------------
diff --git a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/Retry.java b/fate/src/main/java/org/apache/accumulo/fate/zookeeper/Retry.java
index 64e7811..f5a57a6 100644
--- a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/Retry.java
+++ b/fate/src/main/java/org/apache/accumulo/fate/zookeeper/Retry.java
@@ -16,13 +16,15 @@
  */
 package org.apache.accumulo.fate.zookeeper;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 
 /**
  * Encapsulates the retrying implementation for some operation. Provides bounded retry attempts with a bounded, linear backoff.
  */
 public class Retry {
-  private static final Logger log = Logger.getLogger(Retry.class);
+  private static final Logger log = LoggerFactory.getLogger(Retry.class);
 
   private long maxRetries, maxWait, waitIncrement;
   private long retriesDone, currentWait;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e4583eb3/fate/src/main/java/org/apache/accumulo/fate/zookeeper/TransactionWatcher.java
----------------------------------------------------------------------
diff --git a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/TransactionWatcher.java b/fate/src/main/java/org/apache/accumulo/fate/zookeeper/TransactionWatcher.java
index bd27fb9..2fcb7a9 100644
--- a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/TransactionWatcher.java
+++ b/fate/src/main/java/org/apache/accumulo/fate/zookeeper/TransactionWatcher.java
@@ -21,7 +21,9 @@ import java.util.Map;
 import java.util.concurrent.Callable;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 
 public class TransactionWatcher {
 
@@ -31,7 +33,7 @@ public class TransactionWatcher {
     boolean transactionComplete(String type, long tid) throws Exception;
   }
 
-  private static final Logger log = Logger.getLogger(TransactionWatcher.class);
+  private static final Logger log = LoggerFactory.getLogger(TransactionWatcher.class);
   final private Map<Long,AtomicInteger> counts = new HashMap<Long,AtomicInteger>();
   final private Arbitrator arbitrator;
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e4583eb3/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooCache.java
----------------------------------------------------------------------
diff --git a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooCache.java b/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooCache.java
index 5cfdbb8..1fade84 100644
--- a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooCache.java
+++ b/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooCache.java
@@ -29,13 +29,14 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 
-import org.apache.log4j.Logger;
 import org.apache.zookeeper.KeeperException;
 import org.apache.zookeeper.KeeperException.Code;
 import org.apache.zookeeper.WatchedEvent;
 import org.apache.zookeeper.Watcher;
 import org.apache.zookeeper.ZooKeeper;
 import org.apache.zookeeper.data.Stat;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.google.common.annotations.VisibleForTesting;
 
@@ -43,7 +44,7 @@ import com.google.common.annotations.VisibleForTesting;
  * A cache for values stored in ZooKeeper. Values are kept up to date as they change.
  */
 public class ZooCache {
-  private static final Logger log = Logger.getLogger(ZooCache.class);
+  private static final Logger log = LoggerFactory.getLogger(ZooCache.class);
 
   private ZCacheWatcher watcher = new ZCacheWatcher();
   private Watcher externalWatcher = null;
@@ -63,7 +64,7 @@ public class ZooCache {
     public void process(WatchedEvent event) {
 
       if (log.isTraceEnabled())
-        log.trace(event);
+        log.trace("{}", event);
 
       switch (event.getType()) {
         case NodeDataChanged:

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e4583eb3/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooLock.java
----------------------------------------------------------------------
diff --git a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooLock.java b/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooLock.java
index a0100b2..76181a7 100644
--- a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooLock.java
+++ b/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooLock.java
@@ -24,7 +24,6 @@ import java.util.List;
 
 import org.apache.accumulo.fate.zookeeper.ZooUtil.LockID;
 import org.apache.accumulo.fate.zookeeper.ZooUtil.NodeMissingPolicy;
-import org.apache.log4j.Logger;
 import org.apache.zookeeper.KeeperException;
 import org.apache.zookeeper.WatchedEvent;
 import org.apache.zookeeper.Watcher;
@@ -32,9 +31,11 @@ import org.apache.zookeeper.Watcher.Event.EventType;
 import org.apache.zookeeper.Watcher.Event.KeeperState;
 import org.apache.zookeeper.ZooKeeper;
 import org.apache.zookeeper.data.Stat;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class ZooLock implements Watcher {
-  private static final Logger log = Logger.getLogger(ZooLock.class);
+  private static final Logger log = LoggerFactory.getLogger(ZooLock.class);
 
   public static final String LOCK_PREFIX = "zlock-";
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e4583eb3/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooReader.java
----------------------------------------------------------------------
diff --git a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooReader.java b/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooReader.java
index cec54f5..bda8307 100644
--- a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooReader.java
+++ b/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooReader.java
@@ -21,7 +21,6 @@ import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.atomic.AtomicInteger;
 
 import org.apache.accumulo.fate.zookeeper.ZooUtil.ZooKeeperConnectionInfo;
-import org.apache.log4j.Logger;
 import org.apache.zookeeper.AsyncCallback.VoidCallback;
 import org.apache.zookeeper.KeeperException;
 import org.apache.zookeeper.KeeperException.Code;
@@ -29,9 +28,11 @@ import org.apache.zookeeper.Watcher;
 import org.apache.zookeeper.ZooKeeper;
 import org.apache.zookeeper.data.ACL;
 import org.apache.zookeeper.data.Stat;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class ZooReader implements IZooReader {
-  private static final Logger log = Logger.getLogger(ZooReader.class);
+  private static final Logger log = LoggerFactory.getLogger(ZooReader.class);
 
   protected String keepers;
   protected int timeout;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e4583eb3/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooReaderWriter.java
----------------------------------------------------------------------
diff --git a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooReaderWriter.java b/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooReaderWriter.java
index 2786c4f..1286c01 100644
--- a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooReaderWriter.java
+++ b/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooReaderWriter.java
@@ -23,16 +23,17 @@ import java.util.List;
 import org.apache.accumulo.fate.zookeeper.ZooUtil.NodeExistsPolicy;
 import org.apache.accumulo.fate.zookeeper.ZooUtil.NodeMissingPolicy;
 import org.apache.accumulo.fate.zookeeper.ZooUtil.ZooKeeperConnectionInfo;
-import org.apache.log4j.Logger;
 import org.apache.zookeeper.CreateMode;
 import org.apache.zookeeper.KeeperException;
 import org.apache.zookeeper.KeeperException.Code;
 import org.apache.zookeeper.ZooKeeper;
 import org.apache.zookeeper.data.ACL;
 import org.apache.zookeeper.data.Stat;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class ZooReaderWriter extends ZooReader implements IZooReaderWriter {
-  private static final Logger log = Logger.getLogger(ZooReaderWriter.class);
+  private static final Logger log = LoggerFactory.getLogger(ZooReaderWriter.class);
 
   private static SecurityPermission ZOOWRITER_PERMISSION = new SecurityPermission("zookeeperWriterPermission");
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e4583eb3/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooReservation.java
----------------------------------------------------------------------
diff --git a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooReservation.java b/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooReservation.java
index c5a0ce3..5cc2be1 100644
--- a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooReservation.java
+++ b/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooReservation.java
@@ -20,11 +20,11 @@ import static java.nio.charset.StandardCharsets.UTF_8;
 
 import org.apache.accumulo.fate.zookeeper.ZooUtil.NodeExistsPolicy;
 import org.apache.accumulo.fate.zookeeper.ZooUtil.NodeMissingPolicy;
-import org.apache.log4j.Logger;
 import org.apache.zookeeper.KeeperException;
 import org.apache.zookeeper.KeeperException.NoNodeException;
 import org.apache.zookeeper.KeeperException.NodeExistsException;
 import org.apache.zookeeper.data.Stat;
+import org.slf4j.LoggerFactory;
 
 public class ZooReservation {
 
@@ -60,7 +60,7 @@ public class ZooReservation {
       zooData = zk.getData(path, null);
     } catch (NoNodeException e) {
       // Just logging a warning, if data is gone then our work here is done.
-      Logger.getLogger(ZooReservation.class).debug("Node does not exist " + path);
+      LoggerFactory.getLogger(ZooReservation.class).debug("Node does not exist " + path);
       return;
     }
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e4583eb3/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
----------------------------------------------------------------------
diff --git a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java b/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
index 6b5ec43..811f035 100644
--- a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
+++ b/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
@@ -25,12 +25,13 @@ import java.util.Map;
 
 import org.apache.accumulo.fate.util.AddressUtil;
 import org.apache.accumulo.fate.util.UtilWaitThread;
-import org.apache.log4j.Logger;
 import org.apache.zookeeper.WatchedEvent;
 import org.apache.zookeeper.Watcher;
 import org.apache.zookeeper.Watcher.Event.KeeperState;
 import org.apache.zookeeper.ZooKeeper;
 import org.apache.zookeeper.ZooKeeper.States;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class ZooSession {
 
@@ -40,7 +41,7 @@ public class ZooSession {
 
   }
 
-  private static final Logger log = Logger.getLogger(ZooSession.class);
+  private static final Logger log = LoggerFactory.getLogger(ZooSession.class);
 
   private static class ZooSessionInfo {
     public ZooSessionInfo(ZooKeeper zooKeeper, ZooWatcher watcher) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e4583eb3/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooUtil.java
----------------------------------------------------------------------
diff --git a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooUtil.java b/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooUtil.java
index abb1aeb..2262184 100644
--- a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooUtil.java
+++ b/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooUtil.java
@@ -23,7 +23,6 @@ import java.util.Collections;
 import java.util.List;
 
 import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.log4j.Logger;
 import org.apache.zookeeper.CreateMode;
 import org.apache.zookeeper.KeeperException;
 import org.apache.zookeeper.KeeperException.Code;
@@ -33,11 +32,13 @@ import org.apache.zookeeper.ZooDefs.Perms;
 import org.apache.zookeeper.ZooKeeper;
 import org.apache.zookeeper.data.ACL;
 import org.apache.zookeeper.data.Stat;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.google.common.base.Preconditions;
 
 public class ZooUtil {
-  private static final Logger log = Logger.getLogger(ZooUtil.class);
+  private static final Logger log = LoggerFactory.getLogger(ZooUtil.class);
 
   public enum NodeExistsPolicy {
     SKIP, OVERWRITE, FAIL

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e4583eb3/fate/src/test/java/org/apache/accumulo/fate/util/AddressUtilTest.java
----------------------------------------------------------------------
diff --git a/fate/src/test/java/org/apache/accumulo/fate/util/AddressUtilTest.java b/fate/src/test/java/org/apache/accumulo/fate/util/AddressUtilTest.java
index ab9032d..6c7c1d6 100644
--- a/fate/src/test/java/org/apache/accumulo/fate/util/AddressUtilTest.java
+++ b/fate/src/test/java/org/apache/accumulo/fate/util/AddressUtilTest.java
@@ -20,7 +20,9 @@ import java.security.Security;
 
 import junit.framework.TestCase;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 
 /**
  * Test the AddressUtil class.
@@ -28,7 +30,7 @@ import org.apache.log4j.Logger;
  */
 public class AddressUtilTest extends TestCase {
 
-  private static final Logger log = Logger.getLogger(AddressUtilTest.class);
+  private static final Logger log = LoggerFactory.getLogger(AddressUtilTest.class);
 
   public void testGetNegativeTtl() {
     log.info("Checking that we can get the ttl on dns failures.");

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e4583eb3/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloRunner.java
----------------------------------------------------------------------
diff --git a/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloRunner.java b/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloRunner.java
index b727f14..13a75b5 100644
--- a/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloRunner.java
+++ b/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloRunner.java
@@ -30,7 +30,8 @@ import java.util.regex.Pattern;
 import org.apache.accumulo.core.cli.Help;
 import org.apache.accumulo.core.util.Pair;
 import org.apache.commons.io.FileUtils;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.beust.jcommander.IStringConverter;
 import com.beust.jcommander.Parameter;
@@ -60,7 +61,7 @@ import com.google.common.io.Files;
  * @since 1.6.0
  */
 public class MiniAccumuloRunner {
-  private static final Logger log = Logger.getLogger(MiniAccumuloRunner.class);
+  private static final Logger log = LoggerFactory.getLogger(MiniAccumuloRunner.class);
 
   private static final String ROOT_PASSWORD_PROP = "rootPassword";
   private static final String SHUTDOWN_PORT_PROP = "shutdownPort";

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e4583eb3/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterControl.java
----------------------------------------------------------------------
diff --git a/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterControl.java b/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterControl.java
index 839285a..0c1995a 100644
--- a/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterControl.java
+++ b/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterControl.java
@@ -36,8 +36,9 @@ import org.apache.accumulo.monitor.Monitor;
 import org.apache.accumulo.server.util.Admin;
 import org.apache.accumulo.tracer.TraceServer;
 import org.apache.accumulo.tserver.TabletServer;
-import org.apache.log4j.Logger;
 import org.apache.zookeeper.server.ZooKeeperServerMain;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Maps;
@@ -46,7 +47,7 @@ import com.google.common.collect.Maps;
  *
  */
 public class MiniAccumuloClusterControl implements ClusterControl {
-  private static final Logger log = Logger.getLogger(MiniAccumuloClusterControl.class);
+  private static final Logger log = LoggerFactory.getLogger(MiniAccumuloClusterControl.class);
 
   protected MiniAccumuloClusterImpl cluster;
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e4583eb3/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImpl.java
----------------------------------------------------------------------
diff --git a/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImpl.java b/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImpl.java
index 6d674f3..eab82ba 100644
--- a/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImpl.java
+++ b/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImpl.java
@@ -31,7 +31,8 @@ import org.apache.accumulo.minicluster.MemoryUnit;
 import org.apache.accumulo.minicluster.ServerType;
 import org.apache.accumulo.server.util.PortUtils;
 import org.apache.hadoop.conf.Configuration;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Holds configuration for {@link MiniAccumuloClusterImpl}. Required configurations must be passed to constructor(s) and all other configurations are optional.
@@ -39,7 +40,7 @@ import org.apache.log4j.Logger;
  * @since 1.6.0
  */
 public class MiniAccumuloConfigImpl {
-  private static final Logger log = Logger.getLogger(MiniAccumuloConfigImpl.class);
+  private static final Logger log = LoggerFactory.getLogger(MiniAccumuloConfigImpl.class);
   private static final String DEFAULT_INSTANCE_SECRET = "DONTTELL";
 
   private File dir = null;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e4583eb3/minicluster/src/test/java/org/apache/accumulo/minicluster/MiniAccumuloClusterStartStopTest.java
----------------------------------------------------------------------
diff --git a/minicluster/src/test/java/org/apache/accumulo/minicluster/MiniAccumuloClusterStartStopTest.java b/minicluster/src/test/java/org/apache/accumulo/minicluster/MiniAccumuloClusterStartStopTest.java
index 5ca7bc8..37a169b 100644
--- a/minicluster/src/test/java/org/apache/accumulo/minicluster/MiniAccumuloClusterStartStopTest.java
+++ b/minicluster/src/test/java/org/apache/accumulo/minicluster/MiniAccumuloClusterStartStopTest.java
@@ -23,16 +23,17 @@ import java.io.IOException;
 
 import org.apache.accumulo.core.client.Connector;
 import org.apache.commons.io.FileUtils;
-import org.apache.log4j.Logger;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TestName;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class MiniAccumuloClusterStartStopTest {
 
-  private static final Logger log = Logger.getLogger(MiniAccumuloClusterStartStopTest.class);
+  private static final Logger log = LoggerFactory.getLogger(MiniAccumuloClusterStartStopTest.class);
   private File baseDir = new File(System.getProperty("user.dir") + "/target/mini-tests/" + this.getClass().getName());
   private MiniAccumuloCluster accumulo;
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e4583eb3/proxy/src/main/java/org/apache/accumulo/proxy/Proxy.java
----------------------------------------------------------------------
diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/Proxy.java b/proxy/src/main/java/org/apache/accumulo/proxy/Proxy.java
index e97481c..187d408 100644
--- a/proxy/src/main/java/org/apache/accumulo/proxy/Proxy.java
+++ b/proxy/src/main/java/org/apache/accumulo/proxy/Proxy.java
@@ -44,10 +44,11 @@ import org.apache.accumulo.server.rpc.UGIAssumingProcessor;
 import org.apache.accumulo.start.spi.KeywordExecutable;
 import org.apache.commons.lang.StringUtils;
 import org.apache.hadoop.security.UserGroupInformation;
-import org.apache.log4j.Logger;
 import org.apache.thrift.TProcessor;
 import org.apache.thrift.protocol.TCompactProtocol;
 import org.apache.thrift.protocol.TProtocolFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.beust.jcommander.IStringConverter;
 import com.beust.jcommander.Parameter;
@@ -58,7 +59,7 @@ import com.google.common.net.HostAndPort;
 @AutoService(KeywordExecutable.class)
 public class Proxy implements KeywordExecutable {
 
-  private static final Logger log = Logger.getLogger(Proxy.class);
+  private static final Logger log = LoggerFactory.getLogger(Proxy.class);
 
   public static final String USE_MINI_ACCUMULO_KEY = "useMiniAccumulo";
   public static final String USE_MINI_ACCUMULO_DEFAULT = "false";
@@ -213,13 +214,15 @@ public class Proxy implements KeywordExecutable {
         break;
       case SASL:
         if (!clientConf.getBoolean(ClientProperty.INSTANCE_RPC_SASL_ENABLED.getKey())) {
-          log.fatal("SASL thrift server was requested but it is disabled in client configuration");
+          // ACCUMULO-3651 Changed level to error and added FATAL to message for slf4j capability
+          log.error("FATAL: SASL thrift server was requested but it is disabled in client configuration");
           throw new RuntimeException("SASL is not enabled in configuration");
         }
 
         // Kerberos needs to be enabled to use it
         if (!UserGroupInformation.isSecurityEnabled()) {
-          log.fatal("Hadoop security is not enabled");
+          // ACCUMULO-3651 Changed level to error and added FATAL to message for slf4j capability
+          log.error("FATAL: Hadoop security is not enabled");
           throw new RuntimeException();
         }
 
@@ -227,7 +230,8 @@ public class Proxy implements KeywordExecutable {
         final String kerberosPrincipal = properties.getProperty(KERBEROS_PRINCIPAL, ""),
         kerberosKeytab = properties.getProperty(KERBEROS_KEYTAB, "");
         if (StringUtils.isBlank(kerberosPrincipal) || StringUtils.isBlank(kerberosKeytab)) {
-          log.fatal("Kerberos principal and keytab must be provided");
+          // ACCUMULO-3651 Changed level to error and added FATAL to message for slf4j capability
+          log.error("FATAL: Kerberos principal and keytab must be provided");
           throw new RuntimeException();
         }
         UserGroupInformation.loginUserFromKeytab(kerberosPrincipal, kerberosKeytab);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e4583eb3/proxy/src/main/java/org/apache/accumulo/proxy/ProxyServer.java
----------------------------------------------------------------------
diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/ProxyServer.java b/proxy/src/main/java/org/apache/accumulo/proxy/ProxyServer.java
index 7abf178..680268e 100644
--- a/proxy/src/main/java/org/apache/accumulo/proxy/ProxyServer.java
+++ b/proxy/src/main/java/org/apache/accumulo/proxy/ProxyServer.java
@@ -109,8 +109,9 @@ import org.apache.accumulo.server.rpc.UGIAssumingProcessor;
 import org.apache.commons.configuration.ConfigurationException;
 import org.apache.commons.configuration.PropertiesConfiguration;
 import org.apache.hadoop.io.Text;
-import org.apache.log4j.Logger;
 import org.apache.thrift.TException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
@@ -124,7 +125,7 @@ import com.google.common.cache.RemovalNotification;
  */
 public class ProxyServer implements AccumuloProxy.Iface {
 
-  public static final Logger logger = Logger.getLogger(ProxyServer.class);
+  public static final Logger logger = LoggerFactory.getLogger(ProxyServer.class);
   public static final String RPC_ACCUMULO_PRINCIPAL_MISMATCH_MSG = "RPC principal did not match requested Accumulo principal";
   protected Instance instance;
 
@@ -149,7 +150,7 @@ public class ProxyServer implements AccumuloProxy.Iface {
           throw value.exception;
         notification.getValue().writer.close();
       } catch (MutationsRejectedException e) {
-        logger.warn(e, e);
+        logger.warn("MutationsRejectedException", e);
       }
     }
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e4583eb3/server/base/src/main/java/org/apache/accumulo/server/client/ClientServiceHandler.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/client/ClientServiceHandler.java b/server/base/src/main/java/org/apache/accumulo/server/client/ClientServiceHandler.java
index 830178d..aabda72 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/client/ClientServiceHandler.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/client/ClientServiceHandler.java
@@ -64,11 +64,12 @@ import org.apache.accumulo.server.security.SecurityOperation;
 import org.apache.accumulo.server.util.TableDiskUsage;
 import org.apache.accumulo.server.zookeeper.TransactionWatcher;
 import org.apache.accumulo.start.classloader.vfs.AccumuloVFSClassLoader;
-import org.apache.log4j.Logger;
 import org.apache.thrift.TException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class ClientServiceHandler implements ClientService.Iface {
-  private static final Logger log = Logger.getLogger(ClientServiceHandler.class);
+  private static final Logger log = LoggerFactory.getLogger(ClientServiceHandler.class);
   protected final TransactionWatcher transactionWatcher;
   private final AccumuloServerContext context;
   private final Instance instance;
@@ -133,7 +134,7 @@ public class ClientServiceHandler implements ClientService.Iface {
     try {
       return security.authenticateUser(credentials, credentials);
     } catch (ThriftSecurityException e) {
-      log.error(e);
+      log.error("ThriftSecurityException",e);
       throw e;
     }
   }
@@ -143,7 +144,7 @@ public class ClientServiceHandler implements ClientService.Iface {
     try {
       return security.authenticateUser(credentials, toAuth);
     } catch (ThriftSecurityException e) {
-      log.error(e);
+      log.error("ThriftSecurityException",e);
       throw e;
     }
   }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e4583eb3/server/base/src/main/java/org/apache/accumulo/server/conf/NamespaceConfiguration.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/conf/NamespaceConfiguration.java b/server/base/src/main/java/org/apache/accumulo/server/conf/NamespaceConfiguration.java
index 30cffb7..170fe27 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/conf/NamespaceConfiguration.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/conf/NamespaceConfiguration.java
@@ -30,10 +30,11 @@ import org.apache.accumulo.fate.zookeeper.ZooCache;
 import org.apache.accumulo.fate.zookeeper.ZooCacheFactory;
 import org.apache.accumulo.server.client.HdfsZooInstance;
 import org.apache.accumulo.server.conf.ZooCachePropertyAccessor.PropCacheKey;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class NamespaceConfiguration extends ObservableConfiguration {
-  private static final Logger log = Logger.getLogger(NamespaceConfiguration.class);
+  private static final Logger log = LoggerFactory.getLogger(NamespaceConfiguration.class);
 
   private static final Map<PropCacheKey,ZooCache> propCaches = new java.util.HashMap<PropCacheKey,ZooCache>();
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e4583eb3/server/base/src/main/java/org/apache/accumulo/server/conf/TableConfiguration.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/conf/TableConfiguration.java b/server/base/src/main/java/org/apache/accumulo/server/conf/TableConfiguration.java
index 7dced80..53d1e47 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/conf/TableConfiguration.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/conf/TableConfiguration.java
@@ -27,10 +27,11 @@ import org.apache.accumulo.core.zookeeper.ZooUtil;
 import org.apache.accumulo.fate.zookeeper.ZooCache;
 import org.apache.accumulo.fate.zookeeper.ZooCacheFactory;
 import org.apache.accumulo.server.conf.ZooCachePropertyAccessor.PropCacheKey;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class TableConfiguration extends ObservableConfiguration {
-  private static final Logger log = Logger.getLogger(TableConfiguration.class);
+  private static final Logger log = LoggerFactory.getLogger(TableConfiguration.class);
 
   private static final Map<PropCacheKey,ZooCache> propCaches = new java.util.HashMap<PropCacheKey,ZooCache>();
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e4583eb3/server/base/src/main/java/org/apache/accumulo/server/conf/ZooCachePropertyAccessor.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/conf/ZooCachePropertyAccessor.java b/server/base/src/main/java/org/apache/accumulo/server/conf/ZooCachePropertyAccessor.java
index 2ad1c3d..bec30d2 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/conf/ZooCachePropertyAccessor.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/conf/ZooCachePropertyAccessor.java
@@ -25,13 +25,14 @@ import org.apache.accumulo.core.conf.AccumuloConfiguration;
 import org.apache.accumulo.core.conf.AccumuloConfiguration.PropertyFilter;
 import org.apache.accumulo.core.conf.Property;
 import org.apache.accumulo.fate.zookeeper.ZooCache;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * A helper object for accessing properties in a {@link ZooCache}.
  */
 public class ZooCachePropertyAccessor {
-  private static final Logger log = Logger.getLogger(ZooCachePropertyAccessor.class);
+  private static final Logger log = LoggerFactory.getLogger(ZooCachePropertyAccessor.class);
 
   static class PropCacheKey {
     final String instanceId;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e4583eb3/server/base/src/main/java/org/apache/accumulo/server/conf/ZooConfiguration.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/conf/ZooConfiguration.java b/server/base/src/main/java/org/apache/accumulo/server/conf/ZooConfiguration.java
index c472581..69c9af8 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/conf/ZooConfiguration.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/conf/ZooConfiguration.java
@@ -28,10 +28,11 @@ import org.apache.accumulo.core.conf.AccumuloConfiguration;
 import org.apache.accumulo.core.conf.Property;
 import org.apache.accumulo.core.zookeeper.ZooUtil;
 import org.apache.accumulo.fate.zookeeper.ZooCache;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class ZooConfiguration extends AccumuloConfiguration {
-  private static final Logger log = Logger.getLogger(ZooConfiguration.class);
+  private static final Logger log = LoggerFactory.getLogger(ZooConfiguration.class);
 
   private final String instanceId;
   private final ZooCache propCache;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e4583eb3/server/base/src/main/java/org/apache/accumulo/server/constraints/MetadataConstraints.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/constraints/MetadataConstraints.java b/server/base/src/main/java/org/apache/accumulo/server/constraints/MetadataConstraints.java
index 153dc79..1aad06b 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/constraints/MetadataConstraints.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/constraints/MetadataConstraints.java
@@ -46,14 +46,15 @@ import org.apache.accumulo.server.zookeeper.TransactionWatcher.ZooArbitrator;
 import org.apache.accumulo.server.zookeeper.ZooCache;
 import org.apache.accumulo.server.zookeeper.ZooLock;
 import org.apache.hadoop.io.Text;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class MetadataConstraints implements Constraint {
 
   private ZooCache zooCache = null;
   private String zooRoot = null;
 
-  private static final Logger log = Logger.getLogger(MetadataConstraints.class);
+  private static final Logger log = LoggerFactory.getLogger(MetadataConstraints.class);
 
   private static boolean[] validTableNameChars = new boolean[256];
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e4583eb3/server/base/src/main/java/org/apache/accumulo/server/fs/PreferredVolumeChooser.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/fs/PreferredVolumeChooser.java b/server/base/src/main/java/org/apache/accumulo/server/fs/PreferredVolumeChooser.java
index 68621fb..77026e6 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/fs/PreferredVolumeChooser.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/fs/PreferredVolumeChooser.java
@@ -34,7 +34,8 @@ import org.apache.accumulo.server.conf.ServerConfigurationFactory;
 import org.apache.accumulo.server.conf.TableConfiguration;
 import org.apache.commons.collections.map.LRUMap;
 import org.apache.commons.lang.StringUtils;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * A {@link RandomVolumeChooser} that limits its choices from a given set of options to the subset of those options preferred for a particular table. Defaults
@@ -42,7 +43,7 @@ import org.apache.log4j.Logger;
  * separated list of {@link Volume} URIs. Note that both the property name and the format of its value are specific to this particular implementation.
  */
 public class PreferredVolumeChooser extends RandomVolumeChooser implements VolumeChooser {
-  private static final Logger log = Logger.getLogger(PreferredVolumeChooser.class);
+  private static final Logger log = LoggerFactory.getLogger(PreferredVolumeChooser.class);
 
   public static final String PREFERRED_VOLUMES_CUSTOM_KEY = Property.TABLE_ARBITRARY_PROP_PREFIX.getKey() + "preferredVolumes";
   // TODO ACCUMULO-3417 replace this with the ability to retrieve by String key.

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e4583eb3/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeManagerImpl.java b/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeManagerImpl.java
index 17b9816..e047383 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeManagerImpl.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeManagerImpl.java
@@ -54,7 +54,8 @@ import org.apache.hadoop.fs.Trash;
 import org.apache.hadoop.fs.permission.FsPermission;
 import org.apache.hadoop.hdfs.DistributedFileSystem;
 import org.apache.hadoop.hdfs.protocol.HdfsConstants.SafeModeAction;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.google.common.base.Optional;
 import com.google.common.collect.HashMultimap;
@@ -62,7 +63,7 @@ import com.google.common.collect.Multimap;
 
 public class VolumeManagerImpl implements VolumeManager {
 
-  private static final Logger log = Logger.getLogger(VolumeManagerImpl.class);
+  private static final Logger log = LoggerFactory.getLogger(VolumeManagerImpl.class);
 
   private static final HashSet<String> WARNED_ABOUT_SYNCONCLOSE = new HashSet<String>();
 
@@ -177,7 +178,7 @@ public class VolumeManagerImpl implements VolumeManager {
     try {
       return fs.create(logPath, FsPermission.getDefault(), set, bufferSize, replication, blockSize, null);
     } catch (Exception ex) {
-      log.debug(ex, ex);
+      log.debug("Exception", ex);
       return fs.create(logPath, true, bufferSize, replication, blockSize);
     }
   }
@@ -205,7 +206,8 @@ public class VolumeManagerImpl implements VolumeManager {
         // This is a sign that someone is writing bad configuration.
         if (!fs.getConf().getBoolean(DFS_SUPPORT_APPEND, true)) {
           String msg = "Accumulo requires that " + DFS_SUPPORT_APPEND + " not be configured as false. " + ticketMessage;
-          log.fatal(msg);
+          // ACCUMULO-3651 Changed level to error and added FATAL to message for slf4j compatibility
+          log.error("FATAL {}", msg);
           throw new RuntimeException(msg);
         }
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e4583eb3/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeUtil.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeUtil.java b/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeUtil.java
index 36938b7..fc26ca4 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeUtil.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeUtil.java
@@ -47,7 +47,8 @@ import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.FileUtil;
 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;
 
@@ -57,7 +58,7 @@ import com.google.common.base.Optional;
 
 public class VolumeUtil {
 
-  private static final Logger log = Logger.getLogger(VolumeUtil.class);
+  private static final Logger log = LoggerFactory.getLogger(VolumeUtil.class);
   private static final SecureRandom rand = new SecureRandom();
 
   private static boolean isActiveVolume(Path dir) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e4583eb3/server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java b/server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java
index aad6fc2..e5bdded 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java
@@ -105,9 +105,10 @@ import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.io.Text;
 import org.apache.hadoop.security.UserGroupInformation;
-import org.apache.log4j.Logger;
 import org.apache.zookeeper.KeeperException;
 import org.apache.zookeeper.ZooDefs.Ids;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.beust.jcommander.Parameter;
 import com.google.auto.service.AutoService;
@@ -120,7 +121,7 @@ import com.google.common.base.Optional;
  */
 @AutoService(KeywordExecutable.class)
 public class Initialize implements KeywordExecutable {
-  private static final Logger log = Logger.getLogger(Initialize.class);
+  private static final Logger log = LoggerFactory.getLogger(Initialize.class);
   private static final String DEFAULT_ROOT_USER = "root";
   private static final String TABLE_TABLETS_TABLET_DIR = "/table_info";
 
@@ -221,7 +222,8 @@ public class Initialize implements KeywordExecutable {
     log.info("Zookeeper server is " + sconf.get(Property.INSTANCE_ZK_HOST));
     log.info("Checking if Zookeeper is available. If this hangs, then you need to make sure zookeeper is running");
     if (!zookeeperAvailable()) {
-      log.fatal("Zookeeper needs to be up and running in order to init. Exiting ...");
+      // ACCUMULO-3651 Changed level to error and added FATAL to message for slf4j compatibility
+      log.error("FATAL Zookeeper needs to be up and running in order to init. Exiting ...");
       return false;
     }
     if (sconf.get(Property.INSTANCE_SECRET).equals(Property.INSTANCE_SECRET.getDefaultValue())) {
@@ -255,22 +257,25 @@ public class Initialize implements KeywordExecutable {
     @SuppressWarnings("deprecation")
     Property INSTANCE_DFS_URI = Property.INSTANCE_DFS_URI;
     String instanceDfsDir = sconf.get(INSTANCE_DFS_DIR);
-    log.fatal("It appears the directories " + Arrays.asList(VolumeConfiguration.getVolumeUris(SiteConfiguration.getInstance()))
+    // ACCUMULO-3651 Changed level to error and added FATAL to message for slf4j compatibility
+    log.error("FATAL It appears the directories " + Arrays.asList(VolumeConfiguration.getVolumeUris(SiteConfiguration.getInstance()))
         + " were previously initialized.");
     String instanceVolumes = sconf.get(Property.INSTANCE_VOLUMES);
     String instanceDfsUri = sconf.get(INSTANCE_DFS_URI);
 
+    // ACCUMULO-3651 Changed level to error and added FATAL to message for slf4j compatibility
+
     if (!instanceVolumes.isEmpty()) {
-      log.fatal("Change the property " + Property.INSTANCE_VOLUMES + " to use different filesystems,");
+      log.error("FATAL: Change the property " + Property.INSTANCE_VOLUMES + " to use different filesystems,");
     } else if (!instanceDfsDir.isEmpty()) {
-      log.fatal("Change the property " + INSTANCE_DFS_URI + " to use a different filesystem,");
+      log.error("FATAL: Change the property " + INSTANCE_DFS_URI + " to use a different filesystem,");
     } else {
-      log.fatal("You are using the default URI for the filesystem. Set the property " + Property.INSTANCE_VOLUMES + " to use a different filesystem,");
+      log.error("FATAL: You are using the default URI for the filesystem. Set the property " + Property.INSTANCE_VOLUMES + " to use a different filesystem,");
     }
-    log.fatal("or change the property " + INSTANCE_DFS_DIR + " to use a different directory.");
-    log.fatal("The current value of " + INSTANCE_DFS_URI + " is |" + instanceDfsUri + "|");
-    log.fatal("The current value of " + INSTANCE_DFS_DIR + " is |" + instanceDfsDir + "|");
-    log.fatal("The current value of " + Property.INSTANCE_VOLUMES + " is |" + instanceVolumes + "|");
+    log.error("FATAL: or change the property " + INSTANCE_DFS_DIR + " to use a different directory.");
+    log.error("FATAL: The current value of " + INSTANCE_DFS_URI + " is |" + instanceDfsUri + "|");
+    log.error("FATAL: The current value of " + INSTANCE_DFS_DIR + " is |" + instanceDfsDir + "|");
+    log.error("FATAL: The current value of " + Property.INSTANCE_VOLUMES + " is |" + instanceVolumes + "|");
   }
 
   public boolean doInit(Opts opts, Configuration conf, VolumeManager fs) throws IOException {
@@ -284,7 +289,7 @@ public class Initialize implements KeywordExecutable {
     try {
       instanceNamePath = getInstanceNamePath(opts);
     } catch (Exception e) {
-      log.fatal("Failed to talk to zookeeper", e);
+      log.error("FATAL: Failed to talk to zookeeper", e);
       return false;
     }
 
@@ -292,7 +297,7 @@ public class Initialize implements KeywordExecutable {
     try {
       rootUser = getRootUserName(opts);
     } catch (Exception e) {
-      log.fatal("Failed to obtain user for administrative privileges");
+      log.error("FATAL: Failed to obtain user for administrative privileges");
       return false;
     }
 
@@ -318,14 +323,14 @@ public class Initialize implements KeywordExecutable {
     try {
       initZooKeeper(opts, uuid.toString(), instanceNamePath, rootTabletDir);
     } catch (Exception e) {
-      log.fatal("Failed to initialize zookeeper", e);
+      log.error("FATAL: Failed to initialize zookeeper", e);
       return false;
     }
 
     try {
       initFileSystem(opts, fs, uuid, rootTabletDir);
     } catch (Exception e) {
-      log.fatal("Failed to initialize filesystem", e);
+      log.error("FATAL Failed to initialize filesystem", e);
 
       if (SiteConfiguration.getInstance().get(Property.INSTANCE_VOLUMES).trim().equals("")) {
         Configuration fsConf = CachedConfiguration.getInstance();
@@ -335,8 +340,8 @@ public class Initialize implements KeywordExecutable {
 
         // Try to determine when we couldn't find an appropriate core-site.xml on the classpath
         if (defaultFsUri.equals(fsDefaultName) && defaultFsUri.equals(fsDefaultFS)) {
-          log.fatal("Default filesystem value ('fs.defaultFS' or 'fs.default.name') of '" + defaultFsUri + "' was found in the Hadoop configuration");
-          log.fatal("Please ensure that the Hadoop core-site.xml is on the classpath using 'general.classpaths' in accumulo-site.xml");
+          log.error("FATAL: Default filesystem value ('fs.defaultFS' or 'fs.default.name') of '" + defaultFsUri + "' was found in the Hadoop configuration");
+          log.error("FATAL: Please ensure that the Hadoop core-site.xml is on the classpath using 'general.classpaths' in accumulo-site.xml");
         }
       }
 
@@ -357,7 +362,7 @@ public class Initialize implements KeywordExecutable {
 
           // Fail if the site configuration doesn't contain appropriate credentials to login as servers
           if (StringUtils.isBlank(accumuloKeytab) || StringUtils.isBlank(accumuloPrincipal)) {
-            log.fatal("No Kerberos credentials provided, and Accumulo is not properly configured for server login");
+            log.error("FATAL: No Kerberos credentials provided, and Accumulo is not properly configured for server login");
             return false;
           }
 
@@ -368,7 +373,7 @@ public class Initialize implements KeywordExecutable {
         }
       }
     } catch (IOException e) {
-      log.fatal("Failed to get the Kerberos user", e);
+      log.error("FATAL: Failed to get the Kerberos user", e);
       return false;
     }
 
@@ -376,7 +381,7 @@ public class Initialize implements KeywordExecutable {
       AccumuloServerContext context = new AccumuloServerContext(confFactory);
       initSecurity(context, opts, uuid.toString(), rootUser);
     } catch (Exception e) {
-      log.fatal("Failed to initialize security", e);
+      log.error("FATAL: Failed to initialize security", e);
       return false;
     }
     return true;
@@ -488,13 +493,13 @@ public class Initialize implements KeywordExecutable {
       try {
         FileStatus fstat = fs.getFileStatus(dir);
         if (!fstat.isDirectory()) {
-          log.fatal("location " + dir + " exists but is not a directory");
+          log.error("FATAL: location " + dir + " exists but is not a directory");
           return;
         }
       } catch (FileNotFoundException fnfe) {
         // attempt to create directory, since it doesn't exist
         if (!fs.mkdirs(dir)) {
-          log.fatal("unable to create directory " + dir);
+          log.error("FATAL: unable to create directory " + dir);
           return;
         }
       }
@@ -655,7 +660,7 @@ public class Initialize implements KeywordExecutable {
           throw new IOException("Cannot create per-table property " + entry.getKey());
       }
     } catch (Exception e) {
-      log.fatal("Error talking to ZooKeeper", e);
+      log.error("FATAL: Error talking to ZooKeeper", e);
       throw new IOException(e);
     }
   }
@@ -751,7 +756,7 @@ public class Initialize implements KeywordExecutable {
           opts.rootpass = getRootPassword(opts, rootUser);
           initSecurity(context, opts, HdfsZooInstance.getInstance().getInstanceID(), rootUser);
         } else {
-          log.fatal("Attempted to reset security on accumulo before it was initialized");
+          log.error("FATAL: Attempted to reset security on accumulo before it was initialized");
         }
       }
 
@@ -763,7 +768,7 @@ public class Initialize implements KeywordExecutable {
         if (!doInit(opts, conf, fs))
           System.exit(-1);
     } catch (Exception e) {
-      log.fatal(e, e);
+      log.error("Fatal exception", e);
       throw new RuntimeException(e);
     }
   }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e4583eb3/server/base/src/main/java/org/apache/accumulo/server/iterators/MetadataBulkLoadFilter.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/iterators/MetadataBulkLoadFilter.java b/server/base/src/main/java/org/apache/accumulo/server/iterators/MetadataBulkLoadFilter.java
index eb9716c..57ebc5e 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/iterators/MetadataBulkLoadFilter.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/iterators/MetadataBulkLoadFilter.java
@@ -30,14 +30,15 @@ import org.apache.accumulo.core.iterators.SortedKeyValueIterator;
 import org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection;
 import org.apache.accumulo.fate.zookeeper.TransactionWatcher.Arbitrator;
 import org.apache.accumulo.server.zookeeper.TransactionWatcher.ZooArbitrator;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * A special iterator for the metadata table that removes inactive bulk load flags
  *
  */
 public class MetadataBulkLoadFilter extends Filter {
-  private static final Logger log = Logger.getLogger(MetadataBulkLoadFilter.class);
+  private static final Logger log = LoggerFactory.getLogger(MetadataBulkLoadFilter.class);
 
   enum Status {
     ACTIVE, INACTIVE
@@ -61,7 +62,7 @@ public class MetadataBulkLoadFilter extends Filter {
           }
         } catch (Exception e) {
           status = Status.ACTIVE;
-          log.error(e, e);
+          log.error(e.getMessage(), e);
         }
 
         bulkTxStatusCache.put(txid, status);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e4583eb3/server/base/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java b/server/base/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java
index c31951f..47e54fa 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java
@@ -45,7 +45,6 @@ import org.apache.accumulo.server.zookeeper.ZooCache;
 import org.apache.accumulo.server.zookeeper.ZooLock;
 import org.apache.accumulo.server.zookeeper.ZooReaderWriter;
 import org.apache.hadoop.io.Text;
-import org.apache.log4j.Logger;
 import org.apache.thrift.TException;
 import org.apache.thrift.transport.TTransport;
 import org.apache.zookeeper.KeeperException;
@@ -54,6 +53,8 @@ import org.apache.zookeeper.KeeperException.NotEmptyException;
 import org.apache.zookeeper.WatchedEvent;
 import org.apache.zookeeper.Watcher;
 import org.apache.zookeeper.data.Stat;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.google.common.net.HostAndPort;
 
@@ -63,7 +64,7 @@ public class LiveTServerSet implements Watcher {
     void update(LiveTServerSet current, Set<TServerInstance> deleted, Set<TServerInstance> added);
   }
 
-  private static final Logger log = Logger.getLogger(LiveTServerSet.class);
+  private static final Logger log = LoggerFactory.getLogger(LiveTServerSet.class);
 
   private final Listener cback;
   private final ClientContext context;
@@ -264,7 +265,7 @@ public class LiveTServerSet implements Watcher {
       if (!doomed.isEmpty() || !updates.isEmpty())
         this.cback.update(this, doomed, updates);
     } catch (Exception ex) {
-      log.error(ex, ex);
+      log.error(ex.getMessage(), ex);
     }
   }
 
@@ -350,7 +351,7 @@ public class LiveTServerSet implements Watcher {
             if (!doomed.isEmpty() || !updates.isEmpty())
               this.cback.update(this, doomed, updates);
           } catch (Exception ex) {
-            log.error(ex, ex);
+            log.error("Exception", ex);
           }
         }
       }
@@ -402,7 +403,8 @@ public class LiveTServerSet implements Watcher {
       ZooReaderWriter.getInstance().recursiveDelete(fullpath, SKIP);
     } catch (Exception e) {
       String msg = "error removing tablet server lock";
-      log.fatal(msg, e);
+      // ACCUMULO-3651 Changed level to error and added FATAL to message for slf4j compatibility
+      log.error("FATAL: {}", msg, e);
       Halt.halt(msg, -1);
     }
     getZooCache().clear(fullpath);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e4583eb3/server/base/src/main/java/org/apache/accumulo/server/master/balancer/ChaoticLoadBalancer.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/master/balancer/ChaoticLoadBalancer.java b/server/base/src/main/java/org/apache/accumulo/server/master/balancer/ChaoticLoadBalancer.java
index 7d11066..4290bd5 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/master/balancer/ChaoticLoadBalancer.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/master/balancer/ChaoticLoadBalancer.java
@@ -36,15 +36,16 @@ import org.apache.accumulo.server.conf.ServerConfigurationFactory;
 import org.apache.accumulo.server.master.state.TServerInstance;
 import org.apache.accumulo.server.master.state.TabletMigration;
 import org.apache.commons.lang.NotImplementedException;
-import org.apache.log4j.Logger;
 import org.apache.thrift.TException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * A chaotic load balancer used for testing. It constantly shuffles tablets, preventing them from resting in a single location for very long. This is not
  * designed for performance, do not use on production systems. I'm calling it the LokiLoadBalancer.
  */
 public class ChaoticLoadBalancer extends TabletBalancer {
-  private static final Logger log = Logger.getLogger(ChaoticLoadBalancer.class);
+  private static final Logger log = LoggerFactory.getLogger(ChaoticLoadBalancer.class);
 
   Random r = new Random();
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e4583eb3/server/base/src/main/java/org/apache/accumulo/server/master/balancer/DefaultLoadBalancer.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/master/balancer/DefaultLoadBalancer.java b/server/base/src/main/java/org/apache/accumulo/server/master/balancer/DefaultLoadBalancer.java
index 1955dce..810dd25 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/master/balancer/DefaultLoadBalancer.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/master/balancer/DefaultLoadBalancer.java
@@ -33,11 +33,12 @@ import org.apache.accumulo.core.master.thrift.TabletServerStatus;
 import org.apache.accumulo.core.tabletserver.thrift.TabletStats;
 import org.apache.accumulo.server.master.state.TServerInstance;
 import org.apache.accumulo.server.master.state.TabletMigration;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class DefaultLoadBalancer extends TabletBalancer {
 
-  private static final Logger log = Logger.getLogger(DefaultLoadBalancer.class);
+  private static final Logger log = LoggerFactory.getLogger(DefaultLoadBalancer.class);
 
   Iterator<TServerInstance> assignments;
   // if tableToBalance is set, then only balance the given table

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e4583eb3/server/base/src/main/java/org/apache/accumulo/server/master/balancer/TableLoadBalancer.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/master/balancer/TableLoadBalancer.java b/server/base/src/main/java/org/apache/accumulo/server/master/balancer/TableLoadBalancer.java
index ade59e3..dfce953 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/master/balancer/TableLoadBalancer.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/master/balancer/TableLoadBalancer.java
@@ -36,11 +36,12 @@ import org.apache.accumulo.server.master.state.TServerInstance;
 import org.apache.accumulo.server.master.state.TabletMigration;
 import org.apache.accumulo.server.tables.TableManager;
 import org.apache.accumulo.start.classloader.vfs.AccumuloVFSClassLoader;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class TableLoadBalancer extends TabletBalancer {
 
-  private static final Logger log = Logger.getLogger(TableLoadBalancer.class);
+  private static final Logger log = LoggerFactory.getLogger(TableLoadBalancer.class);
 
   Map<String,TabletBalancer> perTableBalancers = new HashMap<String,TabletBalancer>();
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e4583eb3/server/base/src/main/java/org/apache/accumulo/server/master/balancer/TabletBalancer.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/master/balancer/TabletBalancer.java b/server/base/src/main/java/org/apache/accumulo/server/master/balancer/TabletBalancer.java
index ecf59b3..02d5ffb 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/master/balancer/TabletBalancer.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/master/balancer/TabletBalancer.java
@@ -36,15 +36,16 @@ import org.apache.accumulo.server.conf.ServerConfiguration;
 import org.apache.accumulo.server.conf.ServerConfigurationFactory;
 import org.apache.accumulo.server.master.state.TServerInstance;
 import org.apache.accumulo.server.master.state.TabletMigration;
-import org.apache.log4j.Logger;
 import org.apache.thrift.TException;
 import org.apache.thrift.transport.TTransportException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.google.common.collect.Iterables;
 
 public abstract class TabletBalancer {
 
-  private static final Logger log = Logger.getLogger(TabletBalancer.class);
+  private static final Logger log = LoggerFactory.getLogger(TabletBalancer.class);
 
   protected ServerConfigurationFactory configuration;
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e4583eb3/server/base/src/main/java/org/apache/accumulo/server/master/recovery/HadoopLogCloser.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/master/recovery/HadoopLogCloser.java b/server/base/src/main/java/org/apache/accumulo/server/master/recovery/HadoopLogCloser.java
index e7ef77f..ba57dcc 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/master/recovery/HadoopLogCloser.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/master/recovery/HadoopLogCloser.java
@@ -29,11 +29,12 @@ import org.apache.hadoop.fs.LocalFileSystem;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.fs.RawLocalFileSystem;
 import org.apache.hadoop.hdfs.DistributedFileSystem;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class HadoopLogCloser implements LogCloser {
 
-  private static final Logger log = Logger.getLogger(HadoopLogCloser.class);
+  private static final Logger log = LoggerFactory.getLogger(HadoopLogCloser.class);
 
   @Override
   public long close(AccumuloConfiguration conf, VolumeManager fs, Path source) throws IOException {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e4583eb3/server/base/src/main/java/org/apache/accumulo/server/master/recovery/MapRLogCloser.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/master/recovery/MapRLogCloser.java b/server/base/src/main/java/org/apache/accumulo/server/master/recovery/MapRLogCloser.java
index 0dad944..5d6ab48 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/master/recovery/MapRLogCloser.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/master/recovery/MapRLogCloser.java
@@ -23,11 +23,12 @@ import org.apache.accumulo.server.fs.VolumeManager;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.fs.permission.FsPermission;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class MapRLogCloser implements LogCloser {
 
-  private static final Logger log = Logger.getLogger(MapRLogCloser.class);
+  private static final Logger log = LoggerFactory.getLogger(MapRLogCloser.class);
 
   @Override
   public long close(AccumuloConfiguration conf, VolumeManager fs, Path path) throws IOException {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e4583eb3/server/base/src/main/java/org/apache/accumulo/server/master/state/DeadServerList.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/master/state/DeadServerList.java b/server/base/src/main/java/org/apache/accumulo/server/master/state/DeadServerList.java
index 9a2441b..3ea7238 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/master/state/DeadServerList.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/master/state/DeadServerList.java
@@ -26,12 +26,13 @@ import org.apache.accumulo.fate.zookeeper.IZooReaderWriter;
 import org.apache.accumulo.fate.zookeeper.ZooUtil.NodeExistsPolicy;
 import org.apache.accumulo.fate.zookeeper.ZooUtil.NodeMissingPolicy;
 import org.apache.accumulo.server.zookeeper.ZooReaderWriter;
-import org.apache.log4j.Logger;
 import org.apache.zookeeper.KeeperException.NoNodeException;
 import org.apache.zookeeper.data.Stat;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class DeadServerList {
-  private static final Logger log = Logger.getLogger(DeadServerList.class);
+  private static final Logger log = LoggerFactory.getLogger(DeadServerList.class);
   private final String path;
 
   public DeadServerList(String path) {
@@ -66,7 +67,7 @@ public class DeadServerList {
         }
       }
     } catch (Exception ex) {
-      log.error(ex, ex);
+      log.error(ex.getMessage(), ex);
     }
     return result;
   }
@@ -76,7 +77,7 @@ public class DeadServerList {
     try {
       zoo.recursiveDelete(path + "/" + server, NodeMissingPolicy.SKIP);
     } catch (Exception ex) {
-      log.error(ex, ex);
+      log.error("delete failed with exception", ex);
     }
   }
 
@@ -85,7 +86,7 @@ public class DeadServerList {
     try {
       zoo.putPersistentData(path + "/" + server, cause.getBytes(UTF_8), NodeExistsPolicy.SKIP);
     } catch (Exception ex) {
-      log.error(ex, ex);
+      log.error("post failed with exception", ex);
     }
   }
 }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e4583eb3/server/base/src/main/java/org/apache/accumulo/server/master/state/MetaDataTableScanner.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/master/state/MetaDataTableScanner.java b/server/base/src/main/java/org/apache/accumulo/server/master/state/MetaDataTableScanner.java
index 615e5d3..9be5a67 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/master/state/MetaDataTableScanner.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/master/state/MetaDataTableScanner.java
@@ -43,10 +43,11 @@ import org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.Lo
 import org.apache.accumulo.core.security.Authorizations;
 import org.apache.accumulo.server.master.state.TabletLocationState.BadLocationStateException;
 import org.apache.hadoop.io.Text;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class MetaDataTableScanner implements ClosableIterator<TabletLocationState> {
-  private static final Logger log = Logger.getLogger(MetaDataTableScanner.class);
+  private static final Logger log = LoggerFactory.getLogger(MetaDataTableScanner.class);
 
   BatchScanner mdScanner = null;
   Iterator<Entry<Key,Value>> iter = null;


Mime
View raw message