HBASE-7187 Revert Dirty commit.

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1416671 13f79535-47bb-0310-9956-ffa450edef68

hbase-common/pom.xml

@@ -109,6 +109,10 @@
           <groupId>org.apache.hadoop</groupId>
           <artifactId>hadoop-core</artifactId>
         </dependency>
+        <dependency>
+          <groupId>org.apache.hadoop</groupId>
+          <artifactId>hadoop-test</artifactId>
+        </dependency>
       </dependencies>
     </profile>
 
@@ -133,6 +137,10 @@
           <groupId>org.apache.hadoop</groupId>
           <artifactId>hadoop-annotations</artifactId>
         </dependency>
+        <dependency>
+          <groupId>org.apache.hadoop</groupId>
+          <artifactId>hadoop-minicluster</artifactId>
+        </dependency>
       </dependencies>
       <build>
         <plugins>
@@ -183,6 +191,10 @@
           <groupId>org.apache.hadoop</groupId>
           <artifactId>hadoop-annotations</artifactId>
         </dependency>
+        <dependency>
+          <groupId>org.apache.hadoop</groupId>
+          <artifactId>hadoop-minicluster</artifactId>
+        </dependency>
       </dependencies>
       <build>
         <plugins>

hbase-server/pom.xml

@@ -274,10 +274,6 @@
       <groupId>org.apache.hbase</groupId>
       <artifactId>hbase-protocol</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.hbase</groupId>
-      <artifactId>hbase-client</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.apache.hbase</groupId>
       <artifactId>hbase-common</artifactId>
@@ -481,6 +477,7 @@
     <dependency>
       <groupId>org.cloudera.htrace</groupId>
       <artifactId>htrace</artifactId>
+      <version>1.49</version>
    </dependency>
   </dependencies>
   <profiles>

hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/BackupMasterListTmpl.jamon

@@ -1,69 +0,0 @@
-<%doc>
-Copyright 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;
-</%args>
-
-<%import>
-        java.util.*;
-        org.apache.hadoop.util.StringUtils;
-        org.apache.hadoop.hbase.util.Bytes;
-        org.apache.hadoop.hbase.master.HMaster;
-        org.apache.hadoop.hbase.HConstants;
-        org.apache.hadoop.hbase.ServerName;
-        org.apache.hadoop.hbase.ClusterStatus;
-</%import>
-
-<%java>
-Collection<ServerName> backupMasters = null;
-if (master.isActiveMaster()) {
-    ClusterStatus status = master.getClusterStatus();
-    backupMasters = status.getBackupMasters();
-}
-</%java>
-
-<table class="table table-striped">
-<%if (backupMasters != null && backupMasters.size() > 0)%>
-<tr>
-    <th>ServerName</th>
-    <th>Port</th>
-    <th>Start time</th>
-</tr>
-<%java>
-    ServerName [] serverNames = backupMasters.toArray(new ServerName[backupMasters.size()]);
-    Arrays.sort(serverNames);
-    for (ServerName serverName: serverNames) {
-</%java>
-<tr>
-    <td><% serverName.getHostname() %></td>
-    <td><% serverName.getPort() %></td>
-    <td><% new Date(serverName.getStartcode()) %></td>
-</tr>
-<%java>
-    }
-</%java>
-</%if>
-<tr><td>Total:<% (backupMasters != null) ? backupMasters.size() : 0 %></td>
-</table>
-
-
-
-

hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon

@@ -126,8 +126,6 @@ org.apache.hadoop.hbase.HBaseConfiguration;
           </div>
         </%if>
 
-        <h2>Backup Masters</h2>
-        <& BackupMasterListTmpl; master = master &>
 
         <h2>Region Servers</h2>
         <& RegionServerListTmpl; master= master; servers = servers &>

pom.xml

@@ -51,7 +51,6 @@
   <modules>
     <module>hbase-server</module>
     <module>hbase-protocol</module>
-    <module>hbase-client</module>
     <module>hbase-hadoop2-compat</module>
     <module>hbase-hadoop1-compat</module>
     <module>hbase-hadoop-compat</module>
@@ -848,7 +847,6 @@
     <jersey.version>1.8</jersey.version>
     <jruby.version>1.6.8</jruby.version>
     <junit.version>4.10-HBASE-1</junit.version>
-    <htrace.version>1.49</htrace.version>
     <slf4j.version>1.4.3</slf4j.version>
     <log4j.version>1.2.17</log4j.version>
     <mockito-all.version>1.9.0</mockito-all.version>
@@ -972,11 +970,6 @@
         <type>test-jar</type>
         <scope>test</scope>
       </dependency>
-      <dependency>
-        <artifactId>hbase-client</artifactId>
-        <groupId>org.apache.hbase</groupId>
-        <version>${project.version}</version>
-      </dependency>
       <!-- General dependencies -->
       <dependency>
         <groupId>io.netty</groupId>
@@ -1228,11 +1221,6 @@
         <!-- FIXME: the following needs to go away once HBASE-4955 is fixed -->
         <optional>true</optional>
       </dependency>
-      <dependency>
-        <groupId>org.cloudera.htrace</groupId>
-        <artifactId>htrace</artifactId>
-        <version>${htrace.version}</version>
-      </dependency>
       <dependency>
         <groupId>org.mockito</groupId>
         <artifactId>mockito-all</artifactId>