diff --git src/main/jamon/org/apache/hadoop/hbase/tmpl/common/TaskMonitorTmpl.jamon src/main/jamon/org/apache/hadoop/hbase/tmpl/common/TaskMonitorTmpl.jamon
new file mode 100644
index 0000000..4379ef5
--- /dev/null
+++ src/main/jamon/org/apache/hadoop/hbase/tmpl/common/TaskMonitorTmpl.jamon
@@ -0,0 +1,93 @@
+<%doc>
+Copyright 2011 The Apache Software Foundation
+
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+%doc>
+<%import>
+java.util.*;
+org.apache.hadoop.hbase.monitoring.*;
+org.apache.hadoop.util.StringUtils;
+%import>
+<%args>
+TaskMonitor taskMonitor = TaskMonitor.get();
+String filter = "general";
+String format = "html";
+%args>
+<%java>
+List extends MonitoredTask> tasks = taskMonitor.getTasks();
+Iterator extends MonitoredTask> iter = tasks.iterator();
+// apply requested filter
+while (iter.hasNext()) {
+ MonitoredTask t = iter.next();
+ if (filter.equals("general")) {
+ if (t instanceof MonitoredRPCHandler)
+ iter.remove();
+ } else if (filter.equals("handler")) {
+ if (!(t instanceof MonitoredRPCHandler))
+ iter.remove();
+ } else if (filter.equals("rpc")) {
+ if (!(t instanceof MonitoredRPCHandler) ||
+ !((MonitoredRPCHandler) t).isRPCRunning())
+ iter.remove();
+ } else if (filter.equals("operation")) {
+ if (!(t instanceof MonitoredRPCHandler) ||
+ !((MonitoredRPCHandler) t).isOperationRunning())
+ iter.remove();
+ }
+}
+long now = System.currentTimeMillis();
+Collections.reverse(tasks);
+boolean first = true;
+%java>
+<%if format.equals("json")%>
+[<%for MonitoredTask task : tasks%><%if first%><%java>first = false;%java><%else>,%if><% task.toJSON() %>%for>]
+<%else>
+
+
+ %if>
+%if>
diff --git src/main/jamon/org/apache/hadoop/hbase/tmpl/master/AssignmentManagerStatusTmpl.jamon src/main/jamon/org/apache/hadoop/hbase/tmpl/master/AssignmentManagerStatusTmpl.jamon
new file mode 100644
index 0000000..0dc0691
--- /dev/null
+++ src/main/jamon/org/apache/hadoop/hbase/tmpl/master/AssignmentManagerStatusTmpl.jamon
@@ -0,0 +1,70 @@
+<%doc>
+Copyright 2011 The Apache Software Foundation
+
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+%doc>
+<%import>
+org.apache.hadoop.hbase.HRegionInfo;
+org.apache.hadoop.hbase.master.AssignmentManager;
+org.apache.hadoop.hbase.master.AssignmentManager.RegionState;
+java.util.Iterator;
+java.util.Map;
+%import>
+<%args>
+AssignmentManager assignmentManager;
+int limit = 100;
+%args>
+<%java>
+Map rit = assignmentManager.getRegionsInTransition();
+
+int toRemove = rit.size() - limit;
+int removed = 0;
+if (toRemove > 0) {
+ // getRegionsInTransition returned a copy, so we can mutate it
+ for (Iterator> it = rit.entrySet().iterator();
+ it.hasNext() && toRemove > 0;
+ ) {
+ Map.Entry e = it.next();
+ if (HRegionInfo.FIRST_META_REGIONINFO.getEncodedName().equals(
+ e.getKey()) ||
+ HRegionInfo.ROOT_REGIONINFO.getEncodedName().equals(
+ e.getKey())) {
+ // don't remove the meta regions, they're too interesting!
+ continue;
+ }
+ it.remove();
+ toRemove--;
+ removed++;
+ }
+}
+
+%java>
+
+
Regions in Transition
+<%if rit.isEmpty() %>
+No regions in transition.
+<%else>
+
+
Region
State
+ <%for Map.Entry entry : rit.entrySet() %>
+
<% entry.getKey() %>
<% entry.getValue().toDescriptiveString() %>
+ %for>
+
+ <%if removed > 0 %>
+ (<% removed %> more regions in transition not shown)
+ %if>
+%if>
\ No newline at end of file
diff --git src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon
new file mode 100644
index 0000000..69434f7
--- /dev/null
+++ src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon
@@ -0,0 +1,254 @@
+<%doc>
+Copyright 2011 The Apache Software Foundation
+
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+%doc>
+<%args>
+HMaster master;
+HBaseAdmin admin;
+Map frags = null;
+ServerName rootLocation = null;
+ServerName metaLocation = null;
+List servers = null;
+Set deadServers = null;
+boolean showAppendWarning = false;
+String filter = "general";
+String format = "html";
+%args>
+<%import>
+java.util.*;
+org.apache.hadoop.util.StringUtils;
+org.apache.hadoop.hbase.util.Bytes;
+org.apache.hadoop.hbase.util.JvmVersion;
+org.apache.hadoop.hbase.util.FSUtils;
+org.apache.hadoop.hbase.master.HMaster;
+org.apache.hadoop.hbase.HConstants;
+org.apache.hadoop.hbase.HServerLoad;
+org.apache.hadoop.hbase.ServerName;
+org.apache.hadoop.hbase.client.HBaseAdmin;
+org.apache.hadoop.hbase.client.HConnectionManager;
+org.apache.hadoop.hbase.HTableDescriptor;
+org.apache.hadoop.hbase.HBaseConfiguration;
+%import>
+<%if format.equals("json") %>
+ <& ../common/TaskMonitorTmpl; filter = filter; format = "json" &>
+ <%java return; %>
+%if>
+
+
+
+
+HBase Master: <% master.getServerName() %>
+
+
+
+
+
+ Your current JVM version <% System.getProperty("java.version") %> is known to be
+ unstable with HBase. Please see the
+ HBase wiki
+ for details.
+
+%if>
+<%if showAppendWarning %>
+
+ You are currently running the HMaster without HDFS append support enabled.
+ This may result in data loss.
+ Please see the HBase wiki
+ for details.
+
+%if>
+%def>
diff --git src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.jamon src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.jamon
new file mode 100644
index 0000000..ae76204
--- /dev/null
+++ src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.jamon
@@ -0,0 +1,150 @@
+<%doc>
+Copyright 2011 The Apache Software Foundation
+
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+%doc>
+<%args>
+HRegionServer regionServer;
+String filter = "general";
+String format = "html";
+%args>
+<%import>
+java.util.*;
+java.io.IOException;
+org.apache.hadoop.io.Text;
+org.apache.hadoop.hbase.regionserver.HRegionServer;
+org.apache.hadoop.hbase.regionserver.HRegion;
+org.apache.hadoop.hbase.regionserver.metrics.RegionServerMetrics;
+org.apache.hadoop.hbase.util.Bytes;
+org.apache.hadoop.hbase.HConstants;
+org.apache.hadoop.hbase.HServerInfo;
+org.apache.hadoop.hbase.HServerLoad;
+org.apache.hadoop.hbase.HRegionInfo;
+org.apache.hadoop.hbase.ServerName;
+org.apache.hadoop.hbase.HBaseConfiguration;
+%import>
+<%if format.equals("json") %>
+ <& ../common/TaskMonitorTmpl; filter = filter; format = "json" &>
+ <%java return; %>
+%if>
+<%java>
+ HServerInfo serverInfo = null;
+ ServerName serverName = null;
+ try {
+ serverInfo = regionServer.getHServerInfo();
+ serverName = regionServer.getServerName();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ RegionServerMetrics metrics = regionServer.getMetrics();
+ List onlineRegions = regionServer.getOnlineRegions();
+ int interval = regionServer.getConfiguration().getInt("hbase.regionserver.msginterval", 3000)/1000;
+ int masterInfoPort = regionServer.getConfiguration().getInt("hbase.master.info.port", 60010);
+%java>
+
+
+
+
+HBase Region Server: <% serverName %>:<% serverInfo.getServerAddress().getPort() %>
+
+
+
+
+
+
Region names are made of the containing table's name, a comma,
+the start key, a comma, and a randomly generated region id. To illustrate,
+the region named
+domains,apache.org,5464829424211263407 is party to the table
+domains, has an id of 5464829424211263407 and the first key
+in the region is apache.org. The -ROOT-
+and .META. 'tables' are internal sytem tables (or 'catalog' tables in db-speak).
+The -ROOT- keeps a list of all regions in the .META. table. The .META. table
+keeps a list of all regions in the system. The empty key is used to denote
+table start and table end. A region with an empty start key is the first region in a table.
+If region has both an empty start and an empty end key, its the only region in the table. See
+HBase Home for further explication.
+<%else>
+
Not serving regions
+%if>
+
+
diff --git src/main/jamon/org/apache/hbase/tmpl/common/TaskMonitorTmpl.jamon src/main/jamon/org/apache/hbase/tmpl/common/TaskMonitorTmpl.jamon
deleted file mode 100644
index 4379ef5..0000000
--- src/main/jamon/org/apache/hbase/tmpl/common/TaskMonitorTmpl.jamon
+++ /dev/null
@@ -1,93 +0,0 @@
-<%doc>
-Copyright 2011 The Apache Software Foundation
-
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-%doc>
-<%import>
-java.util.*;
-org.apache.hadoop.hbase.monitoring.*;
-org.apache.hadoop.util.StringUtils;
-%import>
-<%args>
-TaskMonitor taskMonitor = TaskMonitor.get();
-String filter = "general";
-String format = "html";
-%args>
-<%java>
-List extends MonitoredTask> tasks = taskMonitor.getTasks();
-Iterator extends MonitoredTask> iter = tasks.iterator();
-// apply requested filter
-while (iter.hasNext()) {
- MonitoredTask t = iter.next();
- if (filter.equals("general")) {
- if (t instanceof MonitoredRPCHandler)
- iter.remove();
- } else if (filter.equals("handler")) {
- if (!(t instanceof MonitoredRPCHandler))
- iter.remove();
- } else if (filter.equals("rpc")) {
- if (!(t instanceof MonitoredRPCHandler) ||
- !((MonitoredRPCHandler) t).isRPCRunning())
- iter.remove();
- } else if (filter.equals("operation")) {
- if (!(t instanceof MonitoredRPCHandler) ||
- !((MonitoredRPCHandler) t).isOperationRunning())
- iter.remove();
- }
-}
-long now = System.currentTimeMillis();
-Collections.reverse(tasks);
-boolean first = true;
-%java>
-<%if format.equals("json")%>
-[<%for MonitoredTask task : tasks%><%if first%><%java>first = false;%java><%else>,%if><% task.toJSON() %>%for>]
-<%else>
-
-
- %if>
-%if>
diff --git src/main/jamon/org/apache/hbase/tmpl/master/AssignmentManagerStatusTmpl.jamon src/main/jamon/org/apache/hbase/tmpl/master/AssignmentManagerStatusTmpl.jamon
deleted file mode 100644
index 0dc0691..0000000
--- src/main/jamon/org/apache/hbase/tmpl/master/AssignmentManagerStatusTmpl.jamon
+++ /dev/null
@@ -1,70 +0,0 @@
-<%doc>
-Copyright 2011 The Apache Software Foundation
-
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-%doc>
-<%import>
-org.apache.hadoop.hbase.HRegionInfo;
-org.apache.hadoop.hbase.master.AssignmentManager;
-org.apache.hadoop.hbase.master.AssignmentManager.RegionState;
-java.util.Iterator;
-java.util.Map;
-%import>
-<%args>
-AssignmentManager assignmentManager;
-int limit = 100;
-%args>
-<%java>
-Map rit = assignmentManager.getRegionsInTransition();
-
-int toRemove = rit.size() - limit;
-int removed = 0;
-if (toRemove > 0) {
- // getRegionsInTransition returned a copy, so we can mutate it
- for (Iterator> it = rit.entrySet().iterator();
- it.hasNext() && toRemove > 0;
- ) {
- Map.Entry e = it.next();
- if (HRegionInfo.FIRST_META_REGIONINFO.getEncodedName().equals(
- e.getKey()) ||
- HRegionInfo.ROOT_REGIONINFO.getEncodedName().equals(
- e.getKey())) {
- // don't remove the meta regions, they're too interesting!
- continue;
- }
- it.remove();
- toRemove--;
- removed++;
- }
-}
-
-%java>
-
-
Regions in Transition
-<%if rit.isEmpty() %>
-No regions in transition.
-<%else>
-
-
Region
State
- <%for Map.Entry entry : rit.entrySet() %>
-
<% entry.getKey() %>
<% entry.getValue().toDescriptiveString() %>
- %for>
-
- <%if removed > 0 %>
- (<% removed %> more regions in transition not shown)
- %if>
-%if>
\ No newline at end of file
diff --git src/main/jamon/org/apache/hbase/tmpl/master/MasterStatusTmpl.jamon src/main/jamon/org/apache/hbase/tmpl/master/MasterStatusTmpl.jamon
deleted file mode 100644
index 69434f7..0000000
--- src/main/jamon/org/apache/hbase/tmpl/master/MasterStatusTmpl.jamon
+++ /dev/null
@@ -1,254 +0,0 @@
-<%doc>
-Copyright 2011 The Apache Software Foundation
-
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-%doc>
-<%args>
-HMaster master;
-HBaseAdmin admin;
-Map frags = null;
-ServerName rootLocation = null;
-ServerName metaLocation = null;
-List servers = null;
-Set deadServers = null;
-boolean showAppendWarning = false;
-String filter = "general";
-String format = "html";
-%args>
-<%import>
-java.util.*;
-org.apache.hadoop.util.StringUtils;
-org.apache.hadoop.hbase.util.Bytes;
-org.apache.hadoop.hbase.util.JvmVersion;
-org.apache.hadoop.hbase.util.FSUtils;
-org.apache.hadoop.hbase.master.HMaster;
-org.apache.hadoop.hbase.HConstants;
-org.apache.hadoop.hbase.HServerLoad;
-org.apache.hadoop.hbase.ServerName;
-org.apache.hadoop.hbase.client.HBaseAdmin;
-org.apache.hadoop.hbase.client.HConnectionManager;
-org.apache.hadoop.hbase.HTableDescriptor;
-org.apache.hadoop.hbase.HBaseConfiguration;
-%import>
-<%if format.equals("json") %>
- <& ../common/TaskMonitorTmpl; filter = filter; format = "json" &>
- <%java return; %>
-%if>
-
-
-
-
-HBase Master: <% master.getServerName() %>
-
-
-
-
-
- Your current JVM version <% System.getProperty("java.version") %> is known to be
- unstable with HBase. Please see the
- HBase wiki
- for details.
-
-%if>
-<%if showAppendWarning %>
-
- You are currently running the HMaster without HDFS append support enabled.
- This may result in data loss.
- Please see the HBase wiki
- for details.
-
-%if>
-%def>
diff --git src/main/jamon/org/apache/hbase/tmpl/regionserver/RSStatusTmpl.jamon src/main/jamon/org/apache/hbase/tmpl/regionserver/RSStatusTmpl.jamon
deleted file mode 100644
index ae76204..0000000
--- src/main/jamon/org/apache/hbase/tmpl/regionserver/RSStatusTmpl.jamon
+++ /dev/null
@@ -1,150 +0,0 @@
-<%doc>
-Copyright 2011 The Apache Software Foundation
-
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-%doc>
-<%args>
-HRegionServer regionServer;
-String filter = "general";
-String format = "html";
-%args>
-<%import>
-java.util.*;
-java.io.IOException;
-org.apache.hadoop.io.Text;
-org.apache.hadoop.hbase.regionserver.HRegionServer;
-org.apache.hadoop.hbase.regionserver.HRegion;
-org.apache.hadoop.hbase.regionserver.metrics.RegionServerMetrics;
-org.apache.hadoop.hbase.util.Bytes;
-org.apache.hadoop.hbase.HConstants;
-org.apache.hadoop.hbase.HServerInfo;
-org.apache.hadoop.hbase.HServerLoad;
-org.apache.hadoop.hbase.HRegionInfo;
-org.apache.hadoop.hbase.ServerName;
-org.apache.hadoop.hbase.HBaseConfiguration;
-%import>
-<%if format.equals("json") %>
- <& ../common/TaskMonitorTmpl; filter = filter; format = "json" &>
- <%java return; %>
-%if>
-<%java>
- HServerInfo serverInfo = null;
- ServerName serverName = null;
- try {
- serverInfo = regionServer.getHServerInfo();
- serverName = regionServer.getServerName();
- } catch (IOException e) {
- e.printStackTrace();
- }
- RegionServerMetrics metrics = regionServer.getMetrics();
- List onlineRegions = regionServer.getOnlineRegions();
- int interval = regionServer.getConfiguration().getInt("hbase.regionserver.msginterval", 3000)/1000;
- int masterInfoPort = regionServer.getConfiguration().getInt("hbase.master.info.port", 60010);
-%java>
-
-
-
-
-HBase Region Server: <% serverName %>:<% serverInfo.getServerAddress().getPort() %>
-
-
-
-
-
-
Region names are made of the containing table's name, a comma,
-the start key, a comma, and a randomly generated region id. To illustrate,
-the region named
-domains,apache.org,5464829424211263407 is party to the table
-domains, has an id of 5464829424211263407 and the first key
-in the region is apache.org. The -ROOT-
-and .META. 'tables' are internal sytem tables (or 'catalog' tables in db-speak).
-The -ROOT- keeps a list of all regions in the .META. table. The .META. table
-keeps a list of all regions in the system. The empty key is used to denote
-table start and table end. A region with an empty start key is the first region in a table.
-If region has both an empty start and an empty end key, its the only region in the table. See
-HBase Home for further explication.
-<%else>
-
Not serving regions
-%if>
-
-
diff --git src/main/java/org/apache/hadoop/hbase/master/MasterStatusServlet.java src/main/java/org/apache/hadoop/hbase/master/MasterStatusServlet.java
index ef3e28b..862db2e 100644
--- src/main/java/org/apache/hadoop/hbase/master/MasterStatusServlet.java
+++ 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 src/main/java/org/apache/hadoop/hbase/regionserver/RSStatusServlet.java src/main/java/org/apache/hadoop/hbase/regionserver/RSStatusServlet.java
index 0f1fd04..7521cd4 100644
--- src/main/java/org/apache/hadoop/hbase/regionserver/RSStatusServlet.java
+++ 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 src/test/java/org/apache/hadoop/hbase/master/TestMasterStatusServlet.java src/test/java/org/apache/hadoop/hbase/master/TestMasterStatusServlet.java
index 30ae515..be5dea5 100644
--- src/test/java/org/apache/hadoop/hbase/master/TestMasterStatusServlet.java
+++ 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 src/test/java/org/apache/hadoop/hbase/regionserver/TestRSStatusServlet.java src/test/java/org/apache/hadoop/hbase/regionserver/TestRSStatusServlet.java
index 9f5e769..8478260 100644
--- src/test/java/org/apache/hadoop/hbase/regionserver/TestRSStatusServlet.java
+++ 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")