Index: src/test/org/apache/hadoop/hbase/HBaseTestingUtility.java =================================================================== --- src/test/org/apache/hadoop/hbase/HBaseTestingUtility.java (revision 895567) +++ src/test/org/apache/hadoop/hbase/HBaseTestingUtility.java (working copy) @@ -63,7 +63,7 @@ private final Log LOG = LogFactory.getLog(getClass()); - private final HBaseConfiguration conf = new HBaseConfiguration(); + private final Configuration conf = HBaseConfiguration.create(); private MiniZooKeeperCluster zkCluster = null; private MiniDFSCluster dfsCluster = null; private MiniHBaseCluster hbaseCluster = null; @@ -76,9 +76,9 @@ public static final String TEST_DIRECTORY_KEY = "test.build.data"; /** - * @return Instance of HBaseConfiguration. + * @return Instance of Configuration. */ - public HBaseConfiguration getConfiguration() { + public Configuration getConfiguration() { return this.conf; } @@ -351,7 +351,7 @@ Bytes.toBytes("xxx"), Bytes.toBytes("yyy") }; - HBaseConfiguration c = getConfiguration(); + Configuration c = getConfiguration(); HTable meta = new HTable(c, HConstants.META_TABLE_NAME); HTableDescriptor htd = table.getTableDescriptor(); if(!htd.hasFamily(columnFamily)) { Index: src/test/org/apache/hadoop/hbase/regionserver/TestStoreReconstruction.java =================================================================== --- src/test/org/apache/hadoop/hbase/regionserver/TestStoreReconstruction.java (revision 895567) +++ src/test/org/apache/hadoop/hbase/regionserver/TestStoreReconstruction.java (working copy) @@ -19,6 +19,7 @@ */ package org.apache.hadoop.hbase.regionserver; +import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.Path; import org.apache.hadoop.hbase.*; import org.apache.hadoop.hbase.client.Get; @@ -42,7 +43,7 @@ private MiniDFSCluster cluster; private final String TABLE = "testtable"; private final int TOTAL_EDITS = 10000; - private HBaseConfiguration conf; + private Configuration conf; /** * @throws java.lang.Exception Index: src/test/org/apache/hadoop/hbase/MiniHBaseCluster.java =================================================================== --- src/test/org/apache/hadoop/hbase/MiniHBaseCluster.java (revision 895567) +++ src/test/org/apache/hadoop/hbase/MiniHBaseCluster.java (working copy) @@ -26,6 +26,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.client.HConnectionManager; import org.apache.hadoop.hbase.master.HMaster; import org.apache.hadoop.hbase.regionserver.HRegionServer; @@ -40,7 +41,7 @@ */ public class MiniHBaseCluster implements HConstants { static final Log LOG = LogFactory.getLog(MiniHBaseCluster.class.getName()); - private HBaseConfiguration conf; + private Configuration conf; public LocalHBaseCluster hbaseCluster; /** @@ -49,7 +50,7 @@ * @param numRegionServers initial number of region servers to start. * @throws IOException */ - public MiniHBaseCluster(HBaseConfiguration conf, int numRegionServers) + public MiniHBaseCluster(Configuration conf, int numRegionServers) throws IOException { this.conf = conf; init(numRegionServers); Index: src/test/org/apache/hadoop/hbase/TestZooKeeper.java =================================================================== --- src/test/org/apache/hadoop/hbase/TestZooKeeper.java (revision 895567) +++ src/test/org/apache/hadoop/hbase/TestZooKeeper.java (working copy) @@ -19,6 +19,7 @@ */ package org.apache.hadoop.hbase; +import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.client.*; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.zookeeper.ZooKeeperWrapper; @@ -34,7 +35,7 @@ private final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); - private HBaseConfiguration conf; + private Configuration conf; private MiniHBaseCluster cluster; /** Index: src/test/org/apache/hadoop/hbase/TestFullLogReconstruction.java =================================================================== --- src/test/org/apache/hadoop/hbase/TestFullLogReconstruction.java (revision 895567) +++ src/test/org/apache/hadoop/hbase/TestFullLogReconstruction.java (working copy) @@ -22,6 +22,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.client.HTable; import org.apache.hadoop.hbase.client.Result; import org.apache.hadoop.hbase.client.ResultScanner; @@ -38,7 +39,7 @@ private final static byte[] TABLE_NAME = Bytes.toBytes("tabletest"); private final static byte[] FAMILY = Bytes.toBytes("family"); - private HBaseConfiguration conf; + private Configuration conf; /** * @throws java.lang.Exception Index: src/test/org/apache/hadoop/hbase/client/TestFromClientSide.java =================================================================== --- src/test/org/apache/hadoop/hbase/client/TestFromClientSide.java (revision 895567) +++ src/test/org/apache/hadoop/hbase/client/TestFromClientSide.java (working copy) @@ -33,6 +33,7 @@ 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.HBaseTestingUtility; import org.apache.hadoop.hbase.HColumnDescriptor; @@ -403,7 +404,7 @@ @Test public void testMaxKeyValueSize() throws Exception { byte [] TABLE = Bytes.toBytes("testMaxKeyValueSize"); - HBaseConfiguration conf = TEST_UTIL.getConfiguration(); + Configuration conf = TEST_UTIL.getConfiguration(); String oldMaxSize = conf.get("hbase.client.keyvalue.maxsize"); HTable ht = TEST_UTIL.createTable(TABLE, FAMILY); byte[] value = new byte[4 * 1024 * 1024];