HBASE-5350 Fix jamon generated package names
git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1293485 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
3544e1c5f7
commit
e540751766
|
@ -35,7 +35,7 @@ import org.apache.hadoop.conf.Configuration;
|
|||
import org.apache.hadoop.hbase.ServerName;
|
||||
import org.apache.hadoop.hbase.client.HBaseAdmin;
|
||||
import org.apache.hadoop.hbase.util.FSUtils;
|
||||
import org.apache.hbase.tmpl.master.MasterStatusTmpl;
|
||||
import org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl;
|
||||
|
||||
/**
|
||||
* The servlet responsible for rendering the index page of the
|
||||
|
|
|
@ -26,7 +26,7 @@ import javax.servlet.http.HttpServlet;
|
|||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
|
||||
import org.apache.hbase.tmpl.regionserver.RSStatusTmpl;
|
||||
import org.apache.hadoop.hbase.tmpl.regionserver.RSStatusTmpl;
|
||||
|
||||
public class RSStatusServlet extends HttpServlet {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
|
|
@ -36,11 +36,10 @@ import org.apache.hadoop.hbase.client.HBaseAdmin;
|
|||
import org.apache.hadoop.hbase.master.AssignmentManager.RegionState;
|
||||
import org.apache.hadoop.hbase.master.HMaster;
|
||||
import org.apache.hadoop.hbase.master.ServerManager;
|
||||
import org.apache.hadoop.hbase.regionserver.HRegion;
|
||||
import org.apache.hadoop.hbase.util.Bytes;
|
||||
import org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher;
|
||||
import org.apache.hbase.tmpl.master.AssignmentManagerStatusTmpl;
|
||||
import org.apache.hbase.tmpl.master.MasterStatusTmpl;
|
||||
import org.apache.hadoop.hbase.tmpl.master.AssignmentManagerStatusTmpl;
|
||||
import org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl;
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import org.junit.experimental.categories.Category;
|
||||
|
|
|
@ -19,17 +19,22 @@
|
|||
*/
|
||||
package org.apache.hadoop.hbase.regionserver;
|
||||
|
||||
import static org.junit.Assert.*;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.io.StringWriter;
|
||||
import java.util.List;
|
||||
|
||||
import org.apache.hadoop.hbase.*;
|
||||
import org.apache.hadoop.hbase.HBaseConfiguration;
|
||||
import org.apache.hadoop.hbase.HRegionInfo;
|
||||
import org.apache.hadoop.hbase.HServerAddress;
|
||||
import org.apache.hadoop.hbase.HServerInfo;
|
||||
import org.apache.hadoop.hbase.HTableDescriptor;
|
||||
import org.apache.hadoop.hbase.MasterAddressTracker;
|
||||
import org.apache.hadoop.hbase.ServerName;
|
||||
import org.apache.hadoop.hbase.SmallTests;
|
||||
import org.apache.hadoop.hbase.regionserver.metrics.RegionServerMetrics;
|
||||
import org.apache.hadoop.hbase.tmpl.regionserver.RSStatusTmpl;
|
||||
import org.apache.hadoop.hbase.util.Bytes;
|
||||
import org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher;
|
||||
import org.apache.hbase.tmpl.regionserver.RSStatusTmpl;
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import org.junit.experimental.categories.Category;
|
||||
|
@ -48,14 +53,14 @@ public class TestRSStatusServlet {
|
|||
static final int FAKE_WEB_PORT = 1586;
|
||||
|
||||
@SuppressWarnings("deprecation")
|
||||
private HServerAddress fakeAddress =
|
||||
private final HServerAddress fakeAddress =
|
||||
new HServerAddress("localhost", FAKE_IPC_PORT);
|
||||
@SuppressWarnings("deprecation")
|
||||
private HServerInfo fakeInfo =
|
||||
private final HServerInfo fakeInfo =
|
||||
new HServerInfo(fakeAddress, FAKE_WEB_PORT);
|
||||
private RegionServerMetrics metrics =
|
||||
private final RegionServerMetrics metrics =
|
||||
new RegionServerMetrics();
|
||||
private ServerName fakeMasterAddress =
|
||||
private final ServerName fakeMasterAddress =
|
||||
new ServerName("localhost", 60010, 1212121212);
|
||||
|
||||
@SuppressWarnings("deprecation")
|
||||
|
|
Loading…
Reference in New Issue