svn commit: r1001936 - in /hbase/trunk: CHANGES.txt src/main/java/org/apache/hadoop/hbase/mapreduce/Export.java src/test/java/org/apache/hadoop/hbase/client/TestHCM.java

[stack]

Author: stack
Date: Mon Sep 27 22:18:28 2010
New Revision: 1001936

URL: http://svn.apache.org/viewvc?rev=1001936&view=rev
Log:
HBASE-2995 Incorrect dependency on Log class from Jetty

Modified:
    hbase/trunk/CHANGES.txt
    hbase/trunk/src/main/java/org/apache/hadoop/hbase/mapreduce/Export.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/client/TestHCM.java

Modified: hbase/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hbase/trunk/CHANGES.txt?rev=1001936&r1=1001935&r2=1001936&view=diff
==============================================================================
--- hbase/trunk/CHANGES.txt (original)
+++ hbase/trunk/CHANGES.txt Mon Sep 27 22:18:28 2010
@@ -549,6 +549,7 @@ Release 0.21.0 - Unreleased
                time as a split
    HBASE-3042  Use LO4J in SequenceFileLogReader
                (Nicolas Spiegelberg via Stack)
+   HBASE-2995  Incorrect dependency on Log class from Jetty
 
   IMPROVEMENTS
    HBASE-1760  Cleanup TODOs in HTable

Modified: 
hbase/trunk/src/main/java/org/apache/hadoop/hbase/mapreduce/Export.java
URL: 
http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/mapreduce/Export.java?rev=1001936&r1=1001935&r2=1001936&view=diff
==============================================================================
--- hbase/trunk/src/main/java/org/apache/hadoop/hbase/mapreduce/Export.java 
(original)
+++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/mapreduce/Export.java Mon 
Sep 27 22:18:28 2010
@@ -31,7 +31,8 @@ import org.apache.hadoop.mapreduce.Job;
 import org.apache.hadoop.mapreduce.lib.output.FileOutputFormat;
 import org.apache.hadoop.mapreduce.lib.output.SequenceFileOutputFormat;
 import org.apache.hadoop.util.GenericOptionsParser;
-import org.mortbay.log.Log;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 /**
  * Export an HBase table.
@@ -39,6 +40,7 @@ import org.mortbay.log.Log;
  * back in again.
  */
 public class Export {
+  private static final Log LOG = LogFactory.getLog(Export.class);
   final static String NAME = "export";
 
   /**
@@ -89,7 +91,7 @@ public class Export {
     long startTime = args.length > 3? Long.parseLong(args[3]): 0L;
     long endTime = args.length > 4? Long.parseLong(args[4]): Long.MAX_VALUE;
     s.setTimeRange(startTime, endTime);
-    Log.info("verisons=" + versions + ", starttime=" + startTime +
+    LOG.info("verisons=" + versions + ", starttime=" + startTime +
       ", endtime=" + endTime);
     TableMapReduceUtil.initTableMapperJob(tableName, s, Exporter.class, null,
       null, job);

Modified: hbase/trunk/src/test/java/org/apache/hadoop/hbase/client/TestHCM.java
URL: 
http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/client/TestHCM.java?rev=1001936&r1=1001935&r2=1001936&view=diff
==============================================================================
--- hbase/trunk/src/test/java/org/apache/hadoop/hbase/client/TestHCM.java 
(original)
+++ hbase/trunk/src/test/java/org/apache/hadoop/hbase/client/TestHCM.java Mon 
Sep 27 22:18:28 2010
@@ -37,7 +37,8 @@ import org.junit.AfterClass;
 import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
-import org.mortbay.log.Log;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertNotNull;
@@ -46,6 +47,7 @@ import static org.junit.Assert.assertNot
  * This class is for testing HCM features
  */
 public class TestHCM {
+  private static final Log LOG = LogFactory.getLog(TestHCM.class);
   private final static HBaseTestingUtility TEST_UTIL = new 
HBaseTestingUtility();
   private static final byte[] TABLE_NAME = Bytes.toBytes("test");
   private static final byte[] FAM_NAM = Bytes.toBytes("f");
@@ -99,7 +101,7 @@ public class TestHCM {
       //      to remove them, so the LRU strategy does not work.
       configuration.set("someotherkey", String.valueOf(_randy.nextInt()));
       last = connection;
-      Log.info("Cache Size: "
+      LOG.info("Cache Size: "
           + getHConnectionManagerCacheSize() + ", Valid Keys: "
           + getValidKeyCount());
       Thread.sleep(100);
@@ -154,4 +156,4 @@ public class TestHCM {
     HRegionLocation rl = conn.getCachedLocation(TABLE_NAME, ROW);
     assertNull("What is this location?? " + rl, rl);
   }
-}
\ No newline at end of file
+}