Apache/hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-5350 Fix jamon generated package names

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1293485 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael Stack 2012-02-24 23:59:37 +00:00
parent 3544e1c5f7
commit e540751766
8 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
src/main/jamon/org/apache/hbase/tmpl/common/TaskMonitorTmpl.jamon → src/main/jamon/org/apache/hadoop/hbase/tmpl/common/TaskMonitorTmpl.jamon
View File

0
src/main/jamon/org/apache/hbase/tmpl/master/AssignmentManagerStatusTmpl.jamon → src/main/jamon/org/apache/hadoop/hbase/tmpl/master/AssignmentManagerStatusTmpl.jamon
View File

0
src/main/jamon/org/apache/hbase/tmpl/master/MasterStatusTmpl.jamon → src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon
View File

0
src/main/jamon/org/apache/hbase/tmpl/regionserver/RSStatusTmpl.jamon → src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.jamon
View File

2
src/main/java/org/apache/hadoop/hbase/master/MasterStatusServlet.java
View File

@ -35,7 +35,7 @@ import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.ServerName; import org.apache.hadoop.hbase.ServerName;
import org.apache.hadoop.hbase.client.HBaseAdmin; import org.apache.hadoop.hbase.client.HBaseAdmin;
import org.apache.hadoop.hbase.util.FSUtils; 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 * The servlet responsible for rendering the index page of the

2
src/main/java/org/apache/hadoop/hbase/regionserver/RSStatusServlet.java
View File

@ -26,7 +26,7 @@ import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; 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 { public class RSStatusServlet extends HttpServlet {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;

5
src/test/java/org/apache/hadoop/hbase/master/TestMasterStatusServlet.java
View File

@ -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.AssignmentManager.RegionState;
import org.apache.hadoop.hbase.master.HMaster; import org.apache.hadoop.hbase.master.HMaster;
import org.apache.hadoop.hbase.master.ServerManager; 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.util.Bytes;
import org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher; import org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher;
import org.apache.hbase.tmpl.master.AssignmentManagerStatusTmpl; import org.apache.hadoop.hbase.tmpl.master.AssignmentManagerStatusTmpl;
import org.apache.hbase.tmpl.master.MasterStatusTmpl; import org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.junit.experimental.categories.Category; import org.junit.experimental.categories.Category;

21
src/test/java/org/apache/hadoop/hbase/regionserver/TestRSStatusServlet.java
View File

@ -19,17 +19,22 @@
*/ */
package org.apache.hadoop.hbase.regionserver; package org.apache.hadoop.hbase.regionserver;
import static org.junit.Assert.*;
import java.io.IOException; import java.io.IOException;
import java.io.StringWriter; import java.io.StringWriter;
import java.util.List; 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.regionserver.metrics.RegionServerMetrics;
import org.apache.hadoop.hbase.tmpl.regionserver.RSStatusTmpl;
import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.Bytes;
import org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher; import org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher;
import org.apache.hbase.tmpl.regionserver.RSStatusTmpl;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.junit.experimental.categories.Category; import org.junit.experimental.categories.Category;
@ -48,14 +53,14 @@ public class TestRSStatusServlet {
static final int FAKE_WEB_PORT = 1586; static final int FAKE_WEB_PORT = 1586;
@SuppressWarnings("deprecation") @SuppressWarnings("deprecation")
private HServerAddress fakeAddress = private final HServerAddress fakeAddress =
new HServerAddress("localhost", FAKE_IPC_PORT); new HServerAddress("localhost", FAKE_IPC_PORT);
@SuppressWarnings("deprecation") @SuppressWarnings("deprecation")
private HServerInfo fakeInfo = private final HServerInfo fakeInfo =
new HServerInfo(fakeAddress, FAKE_WEB_PORT); new HServerInfo(fakeAddress, FAKE_WEB_PORT);
private RegionServerMetrics metrics = private final RegionServerMetrics metrics =
new RegionServerMetrics(); new RegionServerMetrics();
private ServerName fakeMasterAddress = private final ServerName fakeMasterAddress =
new ServerName("localhost", 60010, 1212121212); new ServerName("localhost", 60010, 1212121212);
@SuppressWarnings("deprecation") @SuppressWarnings("deprecation")