svn commit: r1051639 [3/3] - in /hbase/trunk: ./ src/main/java/org/apache/hadoop/hbase/coprocessor/ src/main/java/org/apache/hadoop/hbase/master/ src/main/java/org/apache/hadoop/hbase/regionserver/ src/main/resources/ src/test/java/org/apache/hadoop/hb...

[ga...@apache.org]

Modified: hbase/trunk/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionObserverStacking.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionObserverStacking.java?rev=1051639&r1=1051638&r2=1051639&view=diff
==============================================================================
--- hbase/trunk/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionObserverStacking.java (original)
+++ hbase/trunk/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionObserverStacking.java Tue Dec 21 20:39:26 2010
@@ -33,8 +33,7 @@ import org.apache.hadoop.hbase.HTableDes
 import org.apache.hadoop.hbase.KeyValue;
 import org.apache.hadoop.hbase.client.Put;
 import org.apache.hadoop.hbase.coprocessor.Coprocessor.Priority;
-import org.apache.hadoop.hbase.coprocessor.CoprocessorEnvironment;
-import org.apache.hadoop.hbase.regionserver.CoprocessorHost;
+import org.apache.hadoop.hbase.regionserver.RegionCoprocessorHost;
 import org.apache.hadoop.hbase.regionserver.HRegion;
 import org.apache.hadoop.hbase.util.Bytes;
 
@@ -46,7 +45,7 @@ public class TestRegionObserverStacking 
   public static class ObserverA extends BaseRegionObserverCoprocessor {
     long id;
     @Override
-    public void postPut(final CoprocessorEnvironment e, final Map<byte[],
+    public void postPut(final RegionCoprocessorEnvironment e, final Map<byte[],
         List<KeyValue>> familyMap, final boolean writeToWAL)
         throws IOException {
       id = System.currentTimeMillis();
@@ -60,7 +59,7 @@ public class TestRegionObserverStacking 
   public static class ObserverB extends BaseRegionObserverCoprocessor {
     long id;
     @Override
-    public void postPut(final CoprocessorEnvironment e, final Map<byte[],
+    public void postPut(final RegionCoprocessorEnvironment e, final Map<byte[],
         List<KeyValue>> familyMap, final boolean writeToWAL)
         throws IOException {
       id = System.currentTimeMillis();
@@ -75,7 +74,7 @@ public class TestRegionObserverStacking 
     long id;
 
     @Override
-    public void postPut(final CoprocessorEnvironment e, final Map<byte[],
+    public void postPut(final RegionCoprocessorEnvironment e, final Map<byte[],
         List<KeyValue>> familyMap, final boolean writeToWAL)
         throws IOException {
       id = System.currentTimeMillis();
@@ -99,7 +98,7 @@ public class TestRegionObserverStacking 
     // is secretly loaded at OpenRegionHandler. we don't really
     // start a region server here, so just manually create cphost
     // and set it to region.
-    CoprocessorHost host = new CoprocessorHost(r, null, conf);
+    RegionCoprocessorHost host = new RegionCoprocessorHost(r, null, conf);
     r.setCoprocessorHost(host);
     return r;
   }
@@ -112,7 +111,7 @@ public class TestRegionObserverStacking 
 
     HRegion region = initHRegion(TABLE, getClass().getName(),
       HBaseConfiguration.create(), FAMILIES);
-    CoprocessorHost h = region.getCoprocessorHost();
+    RegionCoprocessorHost h = region.getCoprocessorHost();
     h.load(ObserverA.class, Priority.HIGHEST);
     h.load(ObserverB.class, Priority.USER);
     h.load(ObserverC.class, Priority.LOWEST);

Modified: hbase/trunk/src/test/java/org/apache/hadoop/hbase/master/TestCatalogJanitor.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/master/TestCatalogJanitor.java?rev=1051639&r1=1051638&r2=1051639&view=diff
==============================================================================
--- hbase/trunk/src/test/java/org/apache/hadoop/hbase/master/TestCatalogJanitor.java (original)
+++ hbase/trunk/src/test/java/org/apache/hadoop/hbase/master/TestCatalogJanitor.java Tue Dec 21 20:39:26 2010
@@ -150,7 +150,16 @@ public class TestCatalogJanitor {
       // TODO Auto-generated method stub
       return null;
     }
-    
+
+    @Override
+    public ZooKeeperWatcher getZooKeeperWatcher() {
+      return null;
+    }
+
+    @Override
+    public CatalogTracker getCatalogTracker() {
+      return null;
+    }
   }
 
   @Test