accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e..@apache.org
Subject git commit: ACCUMULO-3162 make the log4j members more consistent throughout the source tree
Date Tue, 23 Sep 2014 14:29:28 GMT
Repository: accumulo
Updated Branches:
  refs/heads/master ef1944938 -> 5810dfbe9


ACCUMULO-3162 make the log4j members more consistent throughout the source tree


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5810dfbe
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5810dfbe
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/5810dfbe

Branch: refs/heads/master
Commit: 5810dfbe9417cf41752a99c0c36168f3345347a5
Parents: ef19449
Author: Eric C. Newton <eric.newton@gmail.com>
Authored: Tue Sep 23 10:29:11 2014 -0400
Committer: Eric C. Newton <eric.newton@gmail.com>
Committed: Tue Sep 23 10:29:11 2014 -0400

----------------------------------------------------------------------
 .../core/client/impl/MultiTableBatchWriterImpl.java   |  2 +-
 .../core/client/impl/TabletServerBatchReader.java     |  2 +-
 .../accumulo/core/conf/ConfigurationDocGen.java       |  2 +-
 .../java/org/apache/accumulo/core/conf/Property.java  |  2 +-
 .../org/apache/accumulo/core/iterators/Combiner.java  |  7 ++-----
 .../apache/accumulo/core/iterators/OrIterator.java    |  3 ---
 .../core/iterators/user/IndexedDocIterator.java       |  3 +++
 .../core/iterators/user/IntersectingIterator.java     |  3 ---
 .../core/security/crypto/CryptoModuleFactory.java     |  6 +++---
 .../core/security/crypto/DefaultCryptoModule.java     |  2 +-
 .../accumulo/examples/simple/dirlist/CountTest.java   |  2 +-
 .../fate/zookeeper/DistributedReadWriteLock.java      |  2 +-
 .../org/apache/accumulo/fate/zookeeper/ZooLock.java   |  2 +-
 .../java/org/apache/accumulo/proxy/ProxyServer.java   |  2 +-
 .../server/iterators/MetadataBulkLoadFilter.java      |  2 +-
 .../server/master/recovery/HadoopLogCloser.java       |  2 +-
 .../server/master/recovery/MapRLogCloser.java         |  2 +-
 .../server/security/handler/ZKAuthenticator.java      |  2 +-
 .../server/util/AddFilesWithMissingEntries.java       |  2 +-
 .../java/org/apache/accumulo/server/util/Halt.java    |  2 +-
 .../accumulo/master/recovery/RecoveryManager.java     |  2 +-
 .../org/apache/accumulo/tserver/WriteTracker.java     |  2 +-
 .../org/apache/accumulo/tserver/log/DfsLogger.java    |  2 +-
 .../apache/accumulo/tserver/scan/NextBatchTask.java   |  2 +-
 .../accumulo/tserver/tablet/MinorCompactionTask.java  |  2 +-
 .../org/apache/accumulo/tserver/tablet/RootFiles.java |  2 +-
 .../org/apache/accumulo/shell/ShellOptionsJC.java     | 14 +++++---------
 .../start/classloader/AccumuloClassLoader.java        |  2 +-
 .../start/classloader/vfs/AccumuloVFSClassLoader.java |  2 +-
 .../accumulo/test/functional/ZombieTServer.java       |  2 +-
 .../test/randomwalk/security/SecurityHelper.java      |  2 +-
 .../test/randomwalk/security/WalkingSecurity.java     |  2 +-
 .../accumulo/test/functional/AbstractMacIT.java       |  2 +-
 .../accumulo/test/functional/ConfigurableMacIT.java   |  2 +-
 .../accumulo/test/functional/MonitorLoggingIT.java    |  2 +-
 .../apache/accumulo/test/functional/SimpleMacIT.java  |  2 +-
 36 files changed, 43 insertions(+), 53 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/5810dfbe/core/src/main/java/org/apache/accumulo/core/client/impl/MultiTableBatchWriterImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/MultiTableBatchWriterImpl.java
b/core/src/main/java/org/apache/accumulo/core/client/impl/MultiTableBatchWriterImpl.java
index 4312131..b09582a 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/MultiTableBatchWriterImpl.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/MultiTableBatchWriterImpl.java
@@ -46,7 +46,7 @@ public class MultiTableBatchWriterImpl implements MultiTableBatchWriter
{
   public static final long DEFAULT_CACHE_TIME = 200;
   public static final TimeUnit DEFAULT_CACHE_TIME_UNIT = TimeUnit.MILLISECONDS;
 
-  static final Logger log = Logger.getLogger(MultiTableBatchWriterImpl.class);
+  private static final Logger log = Logger.getLogger(MultiTableBatchWriterImpl.class);
   private AtomicBoolean closed;
   private AtomicLong cacheLastState;
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/5810dfbe/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReader.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReader.java
b/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReader.java
index 379ee80..c6f3a70 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReader.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReader.java
@@ -34,7 +34,7 @@ import org.apache.accumulo.core.util.SimpleThreadPool;
 import org.apache.log4j.Logger;
 
 public class TabletServerBatchReader extends ScannerOptions implements BatchScanner {
-  public static final Logger log = Logger.getLogger(TabletServerBatchReader.class);
+  private static final Logger log = Logger.getLogger(TabletServerBatchReader.class);
   
   private String table;
   private int numThreads;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/5810dfbe/core/src/main/java/org/apache/accumulo/core/conf/ConfigurationDocGen.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/conf/ConfigurationDocGen.java b/core/src/main/java/org/apache/accumulo/core/conf/ConfigurationDocGen.java
index d8d788b..51fef69 100644
--- a/core/src/main/java/org/apache/accumulo/core/conf/ConfigurationDocGen.java
+++ b/core/src/main/java/org/apache/accumulo/core/conf/ConfigurationDocGen.java
@@ -293,7 +293,7 @@ class ConfigurationDocGen {
     }
   }
 
-  private static Logger log = Logger.getLogger(ConfigurationDocGen.class);
+  private static final Logger log = Logger.getLogger(ConfigurationDocGen.class);
 
   private PrintStream doc;
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/5810dfbe/core/src/main/java/org/apache/accumulo/core/conf/Property.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/conf/Property.java b/core/src/main/java/org/apache/accumulo/core/conf/Property.java
index f6d6b50..19f1961 100644
--- a/core/src/main/java/org/apache/accumulo/core/conf/Property.java
+++ b/core/src/main/java/org/apache/accumulo/core/conf/Property.java
@@ -495,7 +495,7 @@ public enum Property {
 
   private String key, defaultValue, description;
   private PropertyType type;
-  static Logger log = Logger.getLogger(Property.class);
+  private static final Logger log = Logger.getLogger(Property.class);
 
   private Property(String name, String defaultValue, PropertyType type, String description)
{
     this.key = name;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/5810dfbe/core/src/main/java/org/apache/accumulo/core/iterators/Combiner.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/Combiner.java b/core/src/main/java/org/apache/accumulo/core/iterators/Combiner.java
index 6773747..683e3f7 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/Combiner.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/Combiner.java
@@ -23,6 +23,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.NoSuchElementException;
 
+import com.google.common.base.Splitter;
+import com.google.common.collect.Lists;
 import org.apache.accumulo.core.client.IteratorSetting;
 import org.apache.accumulo.core.client.IteratorSetting.Column;
 import org.apache.accumulo.core.client.ScannerBase;
@@ -33,10 +35,6 @@ import org.apache.accumulo.core.data.Range;
 import org.apache.accumulo.core.data.Value;
 import org.apache.accumulo.core.iterators.conf.ColumnSet;
 import org.apache.hadoop.io.Text;
-import org.apache.log4j.Logger;
-
-import com.google.common.base.Splitter;
-import com.google.common.collect.Lists;
 
 /**
  * A SortedKeyValueIterator that combines the Values for different versions (timestamp) of
a Key within a row into a single Value. Combiner will replace one or
@@ -54,7 +52,6 @@ import com.google.common.collect.Lists;
  * {@link Combiner} implementation with the {@link ScannerBase#fetchColumnFamily(Text)} or
{@link ScannerBase#fetchColumn(Text, Text)} methods.
  */
 public abstract class Combiner extends WrappingIterator implements OptionDescriber {
-  static final Logger log = Logger.getLogger(Combiner.class);
   protected static final String COLUMNS_OPTION = "columns";
   protected static final String ALL_OPTION = "all";
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/5810dfbe/core/src/main/java/org/apache/accumulo/core/iterators/OrIterator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/OrIterator.java b/core/src/main/java/org/apache/accumulo/core/iterators/OrIterator.java
index f92767f..361c494 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/OrIterator.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/OrIterator.java
@@ -30,7 +30,6 @@ 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;
 
 /**
  * An iterator that handles "OR" query constructs on the server side. This code has been
adapted/merged from Heap and Multi Iterators.
@@ -44,8 +43,6 @@ public class OrIterator implements SortedKeyValueIterator<Key,Value>
{
   private static final Text nullText = new Text();
   private static final Key nullKey = new Key();
   
-  protected static final Logger log = Logger.getLogger(OrIterator.class);
-  
   protected static class TermSource implements Comparable<TermSource> {
     public SortedKeyValueIterator<Key,Value> iter;
     public Text term;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/5810dfbe/core/src/main/java/org/apache/accumulo/core/iterators/user/IndexedDocIterator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/user/IndexedDocIterator.java
b/core/src/main/java/org/apache/accumulo/core/iterators/user/IndexedDocIterator.java
index e72f522..2e9f049 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/user/IndexedDocIterator.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/user/IndexedDocIterator.java
@@ -32,6 +32,8 @@ import org.apache.accumulo.core.data.Value;
 import org.apache.accumulo.core.iterators.IteratorEnvironment;
 import org.apache.accumulo.core.iterators.SortedKeyValueIterator;
 import org.apache.hadoop.io.Text;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * This iterator facilitates document-partitioned indexing. It is an example of extending
the IntersectingIterator to customize the placement of the term and
@@ -53,6 +55,7 @@ import org.apache.hadoop.io.Text;
  * This iterator is commonly used with BatchScanner or AccumuloInputFormat, to parallelize
the search over all shardIDs.
  */
 public class IndexedDocIterator extends IntersectingIterator {
+  private static final Logger log = LoggerFactory.getLogger(IndexedDocIterator.class);
   public static final Text DEFAULT_INDEX_COLF = new Text("i");
   public static final Text DEFAULT_DOC_COLF = new Text("e");
   

http://git-wip-us.apache.org/repos/asf/accumulo/blob/5810dfbe/core/src/main/java/org/apache/accumulo/core/iterators/user/IntersectingIterator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/user/IntersectingIterator.java
b/core/src/main/java/org/apache/accumulo/core/iterators/user/IntersectingIterator.java
index b4a5195..66d0ac8 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/user/IntersectingIterator.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/user/IntersectingIterator.java
@@ -34,7 +34,6 @@ import org.apache.accumulo.core.iterators.SortedKeyValueIterator;
 import org.apache.accumulo.core.util.Base64;
 import org.apache.accumulo.core.util.TextUtil;
 import org.apache.hadoop.io.Text;
-import org.apache.log4j.Logger;
 
 /**
  * This iterator facilitates document-partitioned indexing. It involves grouping a set of
documents together and indexing those documents into a single row of
@@ -84,8 +83,6 @@ public class IntersectingIterator implements SortedKeyValueIterator<Key,Value>
{
     return key.followingKey(PartialKey.ROW);
   }
   
-  protected static final Logger log = Logger.getLogger(IntersectingIterator.class);
-  
   public static class TermSource {
     public SortedKeyValueIterator<Key,Value> iter;
     public Text term;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/5810dfbe/core/src/main/java/org/apache/accumulo/core/security/crypto/CryptoModuleFactory.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/security/crypto/CryptoModuleFactory.java
b/core/src/main/java/org/apache/accumulo/core/security/crypto/CryptoModuleFactory.java
index 4d04125..bca42c9 100644
--- a/core/src/main/java/org/apache/accumulo/core/security/crypto/CryptoModuleFactory.java
+++ b/core/src/main/java/org/apache/accumulo/core/security/crypto/CryptoModuleFactory.java
@@ -32,9 +32,9 @@ import org.apache.log4j.Logger;
  */
 public class CryptoModuleFactory {
 
-  private static Logger log = Logger.getLogger(CryptoModuleFactory.class);
-  private static Map<String,CryptoModule> cryptoModulesCache = new HashMap<String,CryptoModule>();
-  private static Map<String,SecretKeyEncryptionStrategy> secretKeyEncryptionStrategyCache
= new HashMap<String,SecretKeyEncryptionStrategy>();
+  private static final Logger log = Logger.getLogger(CryptoModuleFactory.class);
+  private static final Map<String,CryptoModule> cryptoModulesCache = new HashMap<String,CryptoModule>();
+  private static final Map<String,SecretKeyEncryptionStrategy> secretKeyEncryptionStrategyCache
= new HashMap<String,SecretKeyEncryptionStrategy>();
 
   /**
    * This method returns a crypto module based on settings in the given configuration parameter.

http://git-wip-us.apache.org/repos/asf/accumulo/blob/5810dfbe/core/src/main/java/org/apache/accumulo/core/security/crypto/DefaultCryptoModule.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/security/crypto/DefaultCryptoModule.java
b/core/src/main/java/org/apache/accumulo/core/security/crypto/DefaultCryptoModule.java
index dfad05e..0cf9652 100644
--- a/core/src/main/java/org/apache/accumulo/core/security/crypto/DefaultCryptoModule.java
+++ b/core/src/main/java/org/apache/accumulo/core/security/crypto/DefaultCryptoModule.java
@@ -51,7 +51,7 @@ public class DefaultCryptoModule implements CryptoModule {
   
   private static final String ENCRYPTION_HEADER_MARKER_V1 = "---Log File Encrypted (v1)---";
   private static final String ENCRYPTION_HEADER_MARKER_V2 = "---Log File Encrypted (v2)---";
-  private static Logger log = Logger.getLogger(DefaultCryptoModule.class);
+  private static final Logger log = Logger.getLogger(DefaultCryptoModule.class);
   
   public DefaultCryptoModule() {}
   

http://git-wip-us.apache.org/repos/asf/accumulo/blob/5810dfbe/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 8bc363c..0addc77 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
@@ -41,7 +41,7 @@ import org.apache.log4j.Logger;
 
 public class CountTest extends TestCase {
   
-  private static Logger log = Logger.getLogger(CountTest.class);
+  private static final Logger log = Logger.getLogger(CountTest.class);
   
   {
     try {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/5810dfbe/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 54c57af..ea7f02c 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
@@ -96,7 +96,7 @@ public class DistributedReadWriteLock implements java.util.concurrent.locks.Read
     long addEntry(byte[] data);
   }
   
-  public static final Logger log = Logger.getLogger(DistributedReadWriteLock.class);
+  private static final Logger log = Logger.getLogger(DistributedReadWriteLock.class);
   
   static class ReadLock implements Lock {
     

http://git-wip-us.apache.org/repos/asf/accumulo/blob/5810dfbe/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 c4f3489..17c6c2f 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
@@ -34,7 +34,7 @@ import org.apache.zookeeper.data.Stat;
 
 public class ZooLock implements Watcher {
   private static final Charset UTF8 = Charset.forName("UTF-8");
-  protected static final Logger log = Logger.getLogger(ZooLock.class);
+  private static final Logger log = Logger.getLogger(ZooLock.class);
   
   public static final String LOCK_PREFIX = "zlock-";
   

http://git-wip-us.apache.org/repos/asf/accumulo/blob/5810dfbe/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 e2b52a5..a778add 100644
--- a/proxy/src/main/java/org/apache/accumulo/proxy/ProxyServer.java
+++ b/proxy/src/main/java/org/apache/accumulo/proxy/ProxyServer.java
@@ -116,7 +116,7 @@ import com.google.common.cache.RemovalNotification;
  */
 public class ProxyServer implements AccumuloProxy.Iface {
   
-  public static final Logger logger = Logger.getLogger(ProxyServer.class);
+  private static final Logger logger = Logger.getLogger(ProxyServer.class);
   protected Instance instance;
   
   protected Class<? extends AuthenticationToken> tokenClass;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/5810dfbe/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 d8bcebe..536c617 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
@@ -37,7 +37,7 @@ import org.apache.log4j.Logger;
  * 
  */
 public class MetadataBulkLoadFilter extends Filter {
-  private static Logger log = Logger.getLogger(MetadataBulkLoadFilter.class);
+  private static final Logger log = Logger.getLogger(MetadataBulkLoadFilter.class);
   
   enum Status {
     ACTIVE, INACTIVE

http://git-wip-us.apache.org/repos/asf/accumulo/blob/5810dfbe/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 0e7f83a..64ab011 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
@@ -33,7 +33,7 @@ import org.apache.log4j.Logger;
 
 public class HadoopLogCloser implements LogCloser {
 
-  private static Logger log = Logger.getLogger(HadoopLogCloser.class);
+  private static final Logger log = Logger.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/5810dfbe/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 d737109..0dad944 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
@@ -27,7 +27,7 @@ import org.apache.log4j.Logger;
 
 public class MapRLogCloser implements LogCloser {
 
-  private static Logger log = Logger.getLogger(MapRLogCloser.class);
+  private static final Logger log = Logger.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/5810dfbe/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKAuthenticator.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKAuthenticator.java
b/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKAuthenticator.java
index 8fd26e2..61c9991 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKAuthenticator.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKAuthenticator.java
@@ -38,7 +38,7 @@ import org.apache.zookeeper.KeeperException;
 
 // Utility class for adding all authentication info into ZK
 public final class ZKAuthenticator implements Authenticator {
-  static final Logger log = Logger.getLogger(ZKAuthenticator.class);
+  private static final Logger log = Logger.getLogger(ZKAuthenticator.class);
   private static Authenticator zkAuthenticatorInstance = null;
   
   private String ZKUserPath;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/5810dfbe/server/base/src/main/java/org/apache/accumulo/server/util/AddFilesWithMissingEntries.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/AddFilesWithMissingEntries.java
b/server/base/src/main/java/org/apache/accumulo/server/util/AddFilesWithMissingEntries.java
index bd5d31c..7a77879 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/AddFilesWithMissingEntries.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/AddFilesWithMissingEntries.java
@@ -46,7 +46,7 @@ import com.beust.jcommander.Parameter;
 
 public class AddFilesWithMissingEntries {
   
-  static final Logger log = Logger.getLogger(AddFilesWithMissingEntries.class);
+  private static final Logger log = Logger.getLogger(AddFilesWithMissingEntries.class);
   
   public static class Opts extends ClientOpts {
     @Parameter(names = "-update", description = "Make changes to the " + MetadataTable.NAME
+ " table to include missing files")

http://git-wip-us.apache.org/repos/asf/accumulo/blob/5810dfbe/server/base/src/main/java/org/apache/accumulo/server/util/Halt.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/Halt.java b/server/base/src/main/java/org/apache/accumulo/server/util/Halt.java
index 6e3027f..82eb639 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/Halt.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/Halt.java
@@ -21,7 +21,7 @@ import org.apache.accumulo.core.util.UtilWaitThread;
 import org.apache.log4j.Logger;
 
 public class Halt {
-  static private Logger log = Logger.getLogger(Halt.class);
+  static private final Logger log = Logger.getLogger(Halt.class);
   
   public static void halt(final String msg) {
     halt(0, new Runnable() {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/5810dfbe/server/master/src/main/java/org/apache/accumulo/master/recovery/RecoveryManager.java
----------------------------------------------------------------------
diff --git a/server/master/src/main/java/org/apache/accumulo/master/recovery/RecoveryManager.java
b/server/master/src/main/java/org/apache/accumulo/master/recovery/RecoveryManager.java
index 7df40a4..791aec8 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/recovery/RecoveryManager.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/recovery/RecoveryManager.java
@@ -50,7 +50,7 @@ import org.apache.zookeeper.KeeperException;
 
 public class RecoveryManager {
 
-  private static Logger log = Logger.getLogger(RecoveryManager.class);
+  private static final Logger log = Logger.getLogger(RecoveryManager.class);
 
   private Map<String,Long> recoveryDelay = new HashMap<String,Long>();
   private Set<String> closeTasksQueued = new HashSet<String>();

http://git-wip-us.apache.org/repos/asf/accumulo/blob/5810dfbe/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 0a50c97..84b5cd0 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
@@ -35,7 +35,7 @@ import org.apache.log4j.Logger;
  *
  */
 class WriteTracker {
-  private static Logger log = Logger.getLogger(WriteTracker.class);
+  private static final Logger log = Logger.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);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/5810dfbe/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java
index 6747c14..6260ec7 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java
@@ -76,7 +76,7 @@ public class DfsLogger {
   static final String LOG_FILE_HEADER_V2 = "--- Log File Header (v2) ---";
   static final String LOG_FILE_HEADER_V3 = "--- Log File Header (v3) ---";
 
-  private static Logger log = Logger.getLogger(DfsLogger.class);
+  private static final Logger log = Logger.getLogger(DfsLogger.class);
 
   public static class LogClosedException extends IOException {
     private static final long serialVersionUID = 1L;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/5810dfbe/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 5248ecc..da11f14 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
@@ -29,7 +29,7 @@ import org.apache.log4j.Logger;
 
 public class NextBatchTask extends ScanTask<ScanBatch> {
 
-  static final Logger log = Logger.getLogger(TabletServer.class);
+  private static final Logger log = Logger.getLogger(TabletServer.class);
   
   private final long scanID;
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/5810dfbe/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 6183824..5e5f31f 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
@@ -28,7 +28,7 @@ import org.apache.log4j.Logger;
 
 class MinorCompactionTask implements Runnable {
 
-  private static Logger log = Logger.getLogger(MinorCompactionTask.class);
+  private static final Logger log = Logger.getLogger(MinorCompactionTask.class);
 
   private final Tablet tablet;
   private long queued;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/5810dfbe/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 3a8bb08..efdfab4 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
@@ -36,7 +36,7 @@ import org.apache.log4j.Logger;
  */
 public class RootFiles {
 
-  private static Logger log = Logger.getLogger(RootFiles.class);
+  private static final Logger log = Logger.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/5810dfbe/shell/src/main/java/org/apache/accumulo/shell/ShellOptionsJC.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/accumulo/shell/ShellOptionsJC.java b/shell/src/main/java/org/apache/accumulo/shell/ShellOptionsJC.java
index 35cef9f..40d8a7e 100644
--- a/shell/src/main/java/org/apache/accumulo/shell/ShellOptionsJC.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/ShellOptionsJC.java
@@ -24,22 +24,18 @@ import java.util.Map;
 import java.util.Scanner;
 import java.util.TreeMap;
 
-import org.apache.accumulo.core.client.ClientConfiguration;
-import org.apache.accumulo.core.client.ClientConfiguration.ClientProperty;
-import org.apache.accumulo.core.client.security.tokens.AuthenticationToken;
-import org.apache.commons.configuration.ConfigurationException;
-import org.apache.commons.configuration.PropertiesConfiguration;
-import org.apache.log4j.Logger;
-
 import com.beust.jcommander.DynamicParameter;
 import com.beust.jcommander.IStringConverter;
 import com.beust.jcommander.Parameter;
 import com.beust.jcommander.ParameterException;
 import com.beust.jcommander.converters.FileConverter;
+import org.apache.accumulo.core.client.ClientConfiguration;
+import org.apache.accumulo.core.client.ClientConfiguration.ClientProperty;
+import org.apache.accumulo.core.client.security.tokens.AuthenticationToken;
+import org.apache.commons.configuration.ConfigurationException;
+import org.apache.commons.configuration.PropertiesConfiguration;
 
 public class ShellOptionsJC {
-  // Use the Shell logger because this is really just an extension.
-  public static final Logger log = Logger.getLogger(Shell.class);
 
   @Parameter(names = {"-u", "--user"}, description = "username (defaults to your OS user)")
   private String username = System.getProperty("user.name", "root");

http://git-wip-us.apache.org/repos/asf/accumulo/blob/5810dfbe/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 f17147f..2db8a5d 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
@@ -75,7 +75,7 @@ public class AccumuloClassLoader {
   
   private static URLClassLoader classloader;
   
-  private static Logger log = Logger.getLogger(AccumuloClassLoader.class);
+  private static final Logger log = Logger.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/5810dfbe/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 983ad7c..5155f07 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
@@ -100,7 +100,7 @@ public class AccumuloVFSClassLoader {
 
   private static ContextManager contextManager;
 
-  private static Logger log = Logger.getLogger(AccumuloVFSClassLoader.class);
+  private static final Logger log = Logger.getLogger(AccumuloVFSClassLoader.class);
 
   static {
     // Register the shutdown hook

http://git-wip-us.apache.org/repos/asf/accumulo/blob/5810dfbe/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 cda7399..3b1aeaf 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
@@ -89,9 +89,9 @@ public class ZombieTServer {
     }
     
   }
+  private static final Logger log = Logger.getLogger(ZombieTServer.class);
   
   public static void main(String[] args) throws Exception {
-    final Logger log = Logger.getLogger(ZombieTServer.class);
     Random random = new Random(System.currentTimeMillis() % 1000);
     int port = random.nextInt(30000) + 2000;
     Instance instance = HdfsZooInstance.getInstance();

http://git-wip-us.apache.org/repos/asf/accumulo/blob/5810dfbe/test/src/main/java/org/apache/accumulo/test/randomwalk/security/SecurityHelper.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/security/SecurityHelper.java
b/test/src/main/java/org/apache/accumulo/test/randomwalk/security/SecurityHelper.java
index 6955327..f9ba5ba 100644
--- a/test/src/main/java/org/apache/accumulo/test/randomwalk/security/SecurityHelper.java
+++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/security/SecurityHelper.java
@@ -30,7 +30,7 @@ import org.apache.hadoop.fs.FileSystem;
 import org.apache.log4j.Logger;
 
 public class SecurityHelper {
-  protected final static Logger log = Logger.getLogger(SecurityHelper.class);
+  private static final Logger log = Logger.getLogger(SecurityHelper.class);
   
   private static final String tableName = "secTableName";
   private static final String masterName = "sysUserName";

http://git-wip-us.apache.org/repos/asf/accumulo/blob/5810dfbe/test/src/main/java/org/apache/accumulo/test/randomwalk/security/WalkingSecurity.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/security/WalkingSecurity.java
b/test/src/main/java/org/apache/accumulo/test/randomwalk/security/WalkingSecurity.java
index 5b112e2..8a66951 100644
--- a/test/src/main/java/org/apache/accumulo/test/randomwalk/security/WalkingSecurity.java
+++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/security/WalkingSecurity.java
@@ -55,7 +55,7 @@ import org.apache.log4j.Logger;
 public class WalkingSecurity extends SecurityOperation implements Authorizor, Authenticator,
PermissionHandler {
   State state = null;
   Environment env = null;
-  protected final static Logger log = Logger.getLogger(WalkingSecurity.class);
+  private static final Logger log = Logger.getLogger(WalkingSecurity.class);
 
   private static final String tableName = "SecurityTableName";
   private static final String namespaceName = "SecurityNamespaceName";

http://git-wip-us.apache.org/repos/asf/accumulo/blob/5810dfbe/test/src/test/java/org/apache/accumulo/test/functional/AbstractMacIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/AbstractMacIT.java b/test/src/test/java/org/apache/accumulo/test/functional/AbstractMacIT.java
index 9872019..644b05e 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/AbstractMacIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/AbstractMacIT.java
@@ -36,7 +36,7 @@ import org.junit.rules.TestName;
 import org.junit.rules.Timeout;
 
 public abstract class AbstractMacIT {
-  public static final Logger log = Logger.getLogger(AbstractMacIT.class);
+  private static final Logger log = Logger.getLogger(AbstractMacIT.class);
 
   public static final String ROOT_PASSWORD = "testRootPassword1";
   public static final ScannerOpts SOPTS = new ScannerOpts();

http://git-wip-us.apache.org/repos/asf/accumulo/blob/5810dfbe/test/src/test/java/org/apache/accumulo/test/functional/ConfigurableMacIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/ConfigurableMacIT.java
b/test/src/test/java/org/apache/accumulo/test/functional/ConfigurableMacIT.java
index 67869e9..eab14f5 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/ConfigurableMacIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/ConfigurableMacIT.java
@@ -38,7 +38,7 @@ import org.junit.After;
 import org.junit.Before;
 
 public class ConfigurableMacIT extends AbstractMacIT {
-  public static final Logger log = Logger.getLogger(ConfigurableMacIT.class);
+  protected static final Logger log = Logger.getLogger(ConfigurableMacIT.class);
 
   public MiniAccumuloClusterImpl cluster;
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/5810dfbe/test/src/test/java/org/apache/accumulo/test/functional/MonitorLoggingIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/MonitorLoggingIT.java
b/test/src/test/java/org/apache/accumulo/test/functional/MonitorLoggingIT.java
index 1787898..803c6c3 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/MonitorLoggingIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/MonitorLoggingIT.java
@@ -35,7 +35,7 @@ import org.apache.zookeeper.KeeperException;
 import org.junit.Test;
 
 public class MonitorLoggingIT extends ConfigurableMacIT {
-  public static final Logger log = Logger.getLogger(MonitorLoggingIT.class);
+  private static final Logger log = Logger.getLogger(MonitorLoggingIT.class);
 
   @Override
   public void beforeClusterStart(MiniAccumuloConfigImpl cfg) throws Exception {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/5810dfbe/test/src/test/java/org/apache/accumulo/test/functional/SimpleMacIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/SimpleMacIT.java b/test/src/test/java/org/apache/accumulo/test/functional/SimpleMacIT.java
index 3e11653..01f77d0 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/SimpleMacIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/SimpleMacIT.java
@@ -38,7 +38,7 @@ import org.junit.BeforeClass;
  * this class should be runnable on any instance of Accumulo, given a root connector.
  */
 public class SimpleMacIT extends AbstractMacIT {
-  public static final Logger log = Logger.getLogger(SimpleMacIT.class);
+  protected static final Logger log = Logger.getLogger(SimpleMacIT.class);
 
   private static File folder;
   private static MiniAccumuloClusterImpl cluster = null;


Mime
View raw message