From e54075176615dd61835ec7784931cc2aa40304c8 Mon Sep 17 00:00:00 2001 From: Michael Stack Date: Fri, 24 Feb 2012 23:59:37 +0000 Subject: [PATCH] HBASE-5350 Fix jamon generated package names git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1293485 13f79535-47bb-0310-9956-ffa450edef68 --- .../hbase/tmpl/common/TaskMonitorTmpl.jamon | 0 .../master/AssignmentManagerStatusTmpl.jamon | 0 .../hbase/tmpl/master/MasterStatusTmpl.jamon | 0 .../tmpl/regionserver/RSStatusTmpl.jamon | 0 .../hbase/master/MasterStatusServlet.java | 2 +- .../hbase/regionserver/RSStatusServlet.java | 2 +- .../hbase/master/TestMasterStatusServlet.java | 5 ++--- .../regionserver/TestRSStatusServlet.java | 21 ++++++++++++------- 8 files changed, 17 insertions(+), 13 deletions(-) rename src/main/jamon/org/apache/{ => hadoop}/hbase/tmpl/common/TaskMonitorTmpl.jamon (100%) rename src/main/jamon/org/apache/{ => hadoop}/hbase/tmpl/master/AssignmentManagerStatusTmpl.jamon (100%) rename src/main/jamon/org/apache/{ => hadoop}/hbase/tmpl/master/MasterStatusTmpl.jamon (100%) rename src/main/jamon/org/apache/{ => hadoop}/hbase/tmpl/regionserver/RSStatusTmpl.jamon (100%) diff --git a/src/main/jamon/org/apache/hbase/tmpl/common/TaskMonitorTmpl.jamon b/src/main/jamon/org/apache/hadoop/hbase/tmpl/common/TaskMonitorTmpl.jamon similarity index 100% rename from src/main/jamon/org/apache/hbase/tmpl/common/TaskMonitorTmpl.jamon rename to src/main/jamon/org/apache/hadoop/hbase/tmpl/common/TaskMonitorTmpl.jamon diff --git a/src/main/jamon/org/apache/hbase/tmpl/master/AssignmentManagerStatusTmpl.jamon b/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/AssignmentManagerStatusTmpl.jamon similarity index 100% rename from src/main/jamon/org/apache/hbase/tmpl/master/AssignmentManagerStatusTmpl.jamon rename to src/main/jamon/org/apache/hadoop/hbase/tmpl/master/AssignmentManagerStatusTmpl.jamon diff --git a/src/main/jamon/org/apache/hbase/tmpl/master/MasterStatusTmpl.jamon b/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon similarity index 100% rename from src/main/jamon/org/apache/hbase/tmpl/master/MasterStatusTmpl.jamon rename to src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon diff --git a/src/main/jamon/org/apache/hbase/tmpl/regionserver/RSStatusTmpl.jamon b/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.jamon similarity index 100% rename from src/main/jamon/org/apache/hbase/tmpl/regionserver/RSStatusTmpl.jamon rename to src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.jamon diff --git a/src/main/java/org/apache/hadoop/hbase/master/MasterStatusServlet.java b/src/main/java/org/apache/hadoop/hbase/master/MasterStatusServlet.java index ef3e28b6d42..862db2e6826 100644 --- a/src/main/java/org/apache/hadoop/hbase/master/MasterStatusServlet.java +++ b/src/main/java/org/apache/hadoop/hbase/master/MasterStatusServlet.java @@ -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 diff --git a/src/main/java/org/apache/hadoop/hbase/regionserver/RSStatusServlet.java b/src/main/java/org/apache/hadoop/hbase/regionserver/RSStatusServlet.java index 0f1fd0481ae..7521cd4c6e1 100644 --- a/src/main/java/org/apache/hadoop/hbase/regionserver/RSStatusServlet.java +++ b/src/main/java/org/apache/hadoop/hbase/regionserver/RSStatusServlet.java @@ -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; diff --git a/src/test/java/org/apache/hadoop/hbase/master/TestMasterStatusServlet.java b/src/test/java/org/apache/hadoop/hbase/master/TestMasterStatusServlet.java index 30ae515aafc..be5dea526e9 100644 --- a/src/test/java/org/apache/hadoop/hbase/master/TestMasterStatusServlet.java +++ b/src/test/java/org/apache/hadoop/hbase/master/TestMasterStatusServlet.java @@ -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; diff --git a/src/test/java/org/apache/hadoop/hbase/regionserver/TestRSStatusServlet.java b/src/test/java/org/apache/hadoop/hbase/regionserver/TestRSStatusServlet.java index 9f5e769b966..84782601f20 100644 --- a/src/test/java/org/apache/hadoop/hbase/regionserver/TestRSStatusServlet.java +++ b/src/test/java/org/apache/hadoop/hbase/regionserver/TestRSStatusServlet.java @@ -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")