svn commit: r1458001 - in /hbase/trunk: hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/builder/ hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/ hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/

[ap...@apache.org]

Author: apurtell
Date: Mon Mar 18 21:11:33 2013
New Revision: 1458001

URL: http://svn.apache.org/r1458001
Log:
HBASE-8141. Remove accidental uses of org.mortbay.log.Log

Modified:
    hbase/trunk/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/builder/TestTreeDepth.java
    hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileSeek.java
    hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/TestDelayedRpc.java

Modified: hbase/trunk/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/builder/TestTreeDepth.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/builder/TestTreeDepth.java?rev=1458001&r1=1458000&r2=1458001&view=diff
==============================================================================
--- hbase/trunk/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/builder/TestTreeDepth.java (original)
+++ hbase/trunk/hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/builder/TestTreeDepth.java Mon Mar 18 21:11:33 2013
@@ -25,7 +25,6 @@ import org.apache.hadoop.hbase.util.Byte
 import org.apache.hadoop.hbase.util.Bytes;
 import org.junit.Assert;
 import org.junit.Test;
-import org.mortbay.log.Log;
 
 import com.google.common.collect.Lists;
 
@@ -74,7 +73,6 @@ public class TestTreeDepth {
   }
 
   protected void testInternal(List<String> inputs, int expectedTreeDepth) {
-    Log.warn("init logger");
     Tokenizer builder = new Tokenizer();
     for (String s : inputs) {
       ByteRange b = new ByteRange(Bytes.toBytes(s));

Modified: hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileSeek.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileSeek.java?rev=1458001&r1=1458000&r2=1458001&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileSeek.java (original)
+++ hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileSeek.java Mon Mar 18 21:11:33 2013
@@ -32,6 +32,8 @@ import org.apache.commons.cli.Option;
 import org.apache.commons.cli.OptionBuilder;
 import org.apache.commons.cli.Options;
 import org.apache.commons.cli.ParseException;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.FSDataInputStream;
 import org.apache.hadoop.fs.FSDataOutputStream;
@@ -44,7 +46,6 @@ import org.apache.hadoop.hbase.io.hfile.
 import org.apache.hadoop.hbase.io.hfile.HFile.Writer;
 import org.apache.hadoop.io.BytesWritable;
 import org.junit.experimental.categories.Category;
-import org.mortbay.log.Log;
 
 /**
  * test the performance for seek.
@@ -66,6 +67,8 @@ public class TestHFileSeek extends TestC
   private RandomDistribution.DiscreteRNG keyLenGen;
   private KVGenerator kvGen;
 
+  private static final Log LOG = LogFactory.getLog(TestHFileSeek.class);
+
   private static final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
 
   @Override
@@ -531,7 +534,7 @@ public class TestHFileSeek extends TestC
 
     testCase.options = options;
     for (int i = 0; i < options.trialCount; i++) {
-      Log.info("Beginning trial " + (i+1));
+      LOG.info("Beginning trial " + (i+1));
       testCase.setUp();
       testCase.testSeeks();
       testCase.tearDown();

Modified: hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/TestDelayedRpc.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/TestDelayedRpc.java?rev=1458001&r1=1458000&r2=1458001&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/TestDelayedRpc.java (original)
+++ hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/TestDelayedRpc.java Mon Mar 18 21:11:33 2013
@@ -28,6 +28,8 @@ import java.net.InetSocketAddress;
 import java.util.ArrayList;
 import java.util.List;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hbase.HBaseConfiguration;
 import org.apache.hadoop.hbase.HConstants;
@@ -41,7 +43,6 @@ import org.apache.log4j.Logger;
 import org.apache.log4j.spi.LoggingEvent;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
-import org.mortbay.log.Log;
 
 /**
  * Test that delayed RPCs work. Fire up three calls, the first of which should
@@ -50,6 +51,8 @@ import org.mortbay.log.Log;
  */
 @Category(MediumTests.class) // Fails sometimes with small tests
 public class TestDelayedRpc {
+  private static final Log LOG = LogFactory.getLog(TestDelayedRpc.class);
+
   public static RpcServer rpcServer;
 
   public static final int UNDELAYED = 0;
@@ -287,7 +290,7 @@ public class TestDelayedRpc {
         if (e.getCause().getMessage().contains(
             "java.lang.Exception: Something went wrong"))
           caughtException = true;
-        Log.warn(e);
+        LOG.warn(e);
       }
       assertTrue(caughtException);
     } finally {