diff --git a/hbase-rest/pom.xml b/hbase-rest/pom.xml new file mode 100644 index 00000000000..4daffa9c818 --- /dev/null +++ b/hbase-rest/pom.xml @@ -0,0 +1,296 @@ + + + + 4.0.0 + + hbase + org.apache.hbase + 0.99.1-SNAPSHOT + .. + + hbase-rest + HBase - Rest + HBase Rest Server + + + + + + + ${project.build.directory} + + hbase-webapps/** + + + + + + src/test/resources + + **/** + + + + + + org.apache.maven.plugins + maven-site-plugin + + true + + + + + maven-assembly-plugin + ${maven.assembly.version} + + true + + + + + org.apache.maven.plugins + maven-source-plugin + + + + + maven-antrun-plugin + + + + generate + generate-sources + + + + + + + + + + + + + + + + + + + + + run + + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + + jspcSource-packageInfo-source + generate-sources + + add-source + + + + ${project.build.directory}/generated-sources/java + + + + + + + + maven-surefire-plugin + + + + listener + org.apache.hadoop.hbase.ServerResourceCheckerJUnitListener + + + + target/test-classes/webapps + + + + + + + + + + org.apache.hbase + hbase-common + jar + + + org.apache.hbase + hbase-annotations + + + org.apache.hbase + hbase-client + + + org.apache.hbase + hbase-server + + + org.apache.hbase + hbase-hadoop-compat + + + org.apache.hbase + ${compat.module} + ${project.version} + + + org.apache.hbase + hbase-server + test-jar + test + + + org.apache.hbase + hbase-testing-util + test + + + org.apache.hbase + hbase-annotations + test-jar + test + + + org.mortbay.jetty + jsp-2.1 + compile + + + tomcat + jasper-compiler + compile + + + tomcat + jasper-runtime + + + + com.google.protobuf + protobuf-java + + + com.sun.jersey + jersey-core + + + com.sun.jersey + jersey-json + + + com.sun.jersey + jersey-server + + + javax.xml.bind + jaxb-api + + + + + + skipRestTets + + + skipRestTests + + + + true + true + + + + compile-protobuf + + + compile-protobuf + + + + + + org.apache.hadoop + hadoop-maven-plugins + + + compile-protoc + generate-sources + + protoc + + + + ${basedir}/src/main/resources/org/apache/hadoop/hbase/rest/protobuf + + + + + ${basedir}/src/main/resources/org/apache/hadoop/hbase/rest/protobuf + + + CellMessage.proto + CellSetMessage.proto + ColumnSchemaMessage.proto + ScannerMessage.proto + StorageClusterStatusMessage.proto + TableInfoMessage.proto + TableListMessage.proto + TableSchemaMessage.proto + VersionMessage.proto + + + ${basedir}/src/main/java/ + + + + + + + + + diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/Constants.java b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/Constants.java similarity index 100% rename from hbase-server/src/main/java/org/apache/hadoop/hbase/rest/Constants.java rename to hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/Constants.java diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/ExistsResource.java b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/ExistsResource.java similarity index 100% rename from hbase-server/src/main/java/org/apache/hadoop/hbase/rest/ExistsResource.java rename to hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/ExistsResource.java diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/MetricsREST.java b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/MetricsREST.java similarity index 100% rename from hbase-server/src/main/java/org/apache/hadoop/hbase/rest/MetricsREST.java rename to hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/MetricsREST.java diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/MultiRowResource.java b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/MultiRowResource.java similarity index 100% rename from hbase-server/src/main/java/org/apache/hadoop/hbase/rest/MultiRowResource.java rename to hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/MultiRowResource.java diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/ProtobufMessageHandler.java b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/ProtobufMessageHandler.java similarity index 100% rename from hbase-server/src/main/java/org/apache/hadoop/hbase/rest/ProtobufMessageHandler.java rename to hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/ProtobufMessageHandler.java diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/ProtobufStreamingUtil.java b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/ProtobufStreamingUtil.java similarity index 100% rename from hbase-server/src/main/java/org/apache/hadoop/hbase/rest/ProtobufStreamingUtil.java rename to hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/ProtobufStreamingUtil.java diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/RESTServer.java b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/RESTServer.java similarity index 100% rename from hbase-server/src/main/java/org/apache/hadoop/hbase/rest/RESTServer.java rename to hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/RESTServer.java diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/RESTServlet.java b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/RESTServlet.java similarity index 100% rename from hbase-server/src/main/java/org/apache/hadoop/hbase/rest/RESTServlet.java rename to hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/RESTServlet.java diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/RESTServletContainer.java b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/RESTServletContainer.java similarity index 100% rename from hbase-server/src/main/java/org/apache/hadoop/hbase/rest/RESTServletContainer.java rename to hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/RESTServletContainer.java diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/RegionsResource.java b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/RegionsResource.java similarity index 100% rename from hbase-server/src/main/java/org/apache/hadoop/hbase/rest/RegionsResource.java rename to hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/RegionsResource.java diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/ResourceBase.java b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/ResourceBase.java similarity index 100% rename from hbase-server/src/main/java/org/apache/hadoop/hbase/rest/ResourceBase.java rename to hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/ResourceBase.java diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/ResourceConfig.java b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/ResourceConfig.java similarity index 100% rename from hbase-server/src/main/java/org/apache/hadoop/hbase/rest/ResourceConfig.java rename to hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/ResourceConfig.java diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/ResultGenerator.java b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/ResultGenerator.java similarity index 100% rename from hbase-server/src/main/java/org/apache/hadoop/hbase/rest/ResultGenerator.java rename to hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/ResultGenerator.java diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/RootResource.java b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/RootResource.java similarity index 100% rename from hbase-server/src/main/java/org/apache/hadoop/hbase/rest/RootResource.java rename to hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/RootResource.java diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/RowResource.java b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/RowResource.java similarity index 100% rename from hbase-server/src/main/java/org/apache/hadoop/hbase/rest/RowResource.java rename to hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/RowResource.java diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/RowResultGenerator.java b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/RowResultGenerator.java similarity index 100% rename from hbase-server/src/main/java/org/apache/hadoop/hbase/rest/RowResultGenerator.java rename to hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/RowResultGenerator.java diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/RowSpec.java b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/RowSpec.java similarity index 100% rename from hbase-server/src/main/java/org/apache/hadoop/hbase/rest/RowSpec.java rename to hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/RowSpec.java diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/ScannerInstanceResource.java b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/ScannerInstanceResource.java similarity index 100% rename from hbase-server/src/main/java/org/apache/hadoop/hbase/rest/ScannerInstanceResource.java rename to hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/ScannerInstanceResource.java diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/ScannerResource.java b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/ScannerResource.java similarity index 100% rename from hbase-server/src/main/java/org/apache/hadoop/hbase/rest/ScannerResource.java rename to hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/ScannerResource.java diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/ScannerResultGenerator.java b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/ScannerResultGenerator.java similarity index 100% rename from hbase-server/src/main/java/org/apache/hadoop/hbase/rest/ScannerResultGenerator.java rename to hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/ScannerResultGenerator.java diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/SchemaResource.java b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/SchemaResource.java similarity index 100% rename from hbase-server/src/main/java/org/apache/hadoop/hbase/rest/SchemaResource.java rename to hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/SchemaResource.java diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/StorageClusterStatusResource.java b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/StorageClusterStatusResource.java similarity index 100% rename from hbase-server/src/main/java/org/apache/hadoop/hbase/rest/StorageClusterStatusResource.java rename to hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/StorageClusterStatusResource.java diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/StorageClusterVersionResource.java b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/StorageClusterVersionResource.java similarity index 100% rename from hbase-server/src/main/java/org/apache/hadoop/hbase/rest/StorageClusterVersionResource.java rename to hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/StorageClusterVersionResource.java diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/TableResource.java b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/TableResource.java similarity index 100% rename from hbase-server/src/main/java/org/apache/hadoop/hbase/rest/TableResource.java rename to hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/TableResource.java diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/TableScanResource.java b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/TableScanResource.java similarity index 100% rename from hbase-server/src/main/java/org/apache/hadoop/hbase/rest/TableScanResource.java rename to hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/TableScanResource.java diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/VersionResource.java b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/VersionResource.java similarity index 100% rename from hbase-server/src/main/java/org/apache/hadoop/hbase/rest/VersionResource.java rename to hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/VersionResource.java diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/client/Client.java b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/client/Client.java similarity index 100% rename from hbase-server/src/main/java/org/apache/hadoop/hbase/rest/client/Client.java rename to hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/client/Client.java diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/client/Cluster.java b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/client/Cluster.java similarity index 100% rename from hbase-server/src/main/java/org/apache/hadoop/hbase/rest/client/Cluster.java rename to hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/client/Cluster.java diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/client/RemoteAdmin.java b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/client/RemoteAdmin.java similarity index 100% rename from hbase-server/src/main/java/org/apache/hadoop/hbase/rest/client/RemoteAdmin.java rename to hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/client/RemoteAdmin.java diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/client/RemoteHTable.java b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/client/RemoteHTable.java similarity index 100% rename from hbase-server/src/main/java/org/apache/hadoop/hbase/rest/client/RemoteHTable.java rename to hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/client/RemoteHTable.java diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/client/Response.java b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/client/Response.java similarity index 100% rename from hbase-server/src/main/java/org/apache/hadoop/hbase/rest/client/Response.java rename to hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/client/Response.java diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/filter/AuthFilter.java b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/filter/AuthFilter.java similarity index 100% rename from hbase-server/src/main/java/org/apache/hadoop/hbase/rest/filter/AuthFilter.java rename to hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/filter/AuthFilter.java diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/filter/GZIPRequestStream.java b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/filter/GZIPRequestStream.java similarity index 100% rename from hbase-server/src/main/java/org/apache/hadoop/hbase/rest/filter/GZIPRequestStream.java rename to hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/filter/GZIPRequestStream.java diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/filter/GZIPRequestWrapper.java b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/filter/GZIPRequestWrapper.java similarity index 100% rename from hbase-server/src/main/java/org/apache/hadoop/hbase/rest/filter/GZIPRequestWrapper.java rename to hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/filter/GZIPRequestWrapper.java diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/filter/GZIPResponseStream.java b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/filter/GZIPResponseStream.java similarity index 100% rename from hbase-server/src/main/java/org/apache/hadoop/hbase/rest/filter/GZIPResponseStream.java rename to hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/filter/GZIPResponseStream.java diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/filter/GZIPResponseWrapper.java b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/filter/GZIPResponseWrapper.java similarity index 100% rename from hbase-server/src/main/java/org/apache/hadoop/hbase/rest/filter/GZIPResponseWrapper.java rename to hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/filter/GZIPResponseWrapper.java diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/filter/GzipFilter.java b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/filter/GzipFilter.java similarity index 100% rename from hbase-server/src/main/java/org/apache/hadoop/hbase/rest/filter/GzipFilter.java rename to hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/filter/GzipFilter.java diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/model/CellModel.java b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/model/CellModel.java similarity index 100% rename from hbase-server/src/main/java/org/apache/hadoop/hbase/rest/model/CellModel.java rename to hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/model/CellModel.java diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/model/CellSetModel.java b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/model/CellSetModel.java similarity index 100% rename from hbase-server/src/main/java/org/apache/hadoop/hbase/rest/model/CellSetModel.java rename to hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/model/CellSetModel.java diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/model/ColumnSchemaModel.java b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/model/ColumnSchemaModel.java similarity index 100% rename from hbase-server/src/main/java/org/apache/hadoop/hbase/rest/model/ColumnSchemaModel.java rename to hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/model/ColumnSchemaModel.java diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/model/RowModel.java b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/model/RowModel.java similarity index 100% rename from hbase-server/src/main/java/org/apache/hadoop/hbase/rest/model/RowModel.java rename to hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/model/RowModel.java diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/model/ScannerModel.java b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/model/ScannerModel.java similarity index 100% rename from hbase-server/src/main/java/org/apache/hadoop/hbase/rest/model/ScannerModel.java rename to hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/model/ScannerModel.java diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/model/StorageClusterStatusModel.java b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/model/StorageClusterStatusModel.java similarity index 100% rename from hbase-server/src/main/java/org/apache/hadoop/hbase/rest/model/StorageClusterStatusModel.java rename to hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/model/StorageClusterStatusModel.java diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/model/StorageClusterVersionModel.java b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/model/StorageClusterVersionModel.java similarity index 100% rename from hbase-server/src/main/java/org/apache/hadoop/hbase/rest/model/StorageClusterVersionModel.java rename to hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/model/StorageClusterVersionModel.java diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/model/TableInfoModel.java b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/model/TableInfoModel.java similarity index 100% rename from hbase-server/src/main/java/org/apache/hadoop/hbase/rest/model/TableInfoModel.java rename to hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/model/TableInfoModel.java diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/model/TableListModel.java b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/model/TableListModel.java similarity index 100% rename from hbase-server/src/main/java/org/apache/hadoop/hbase/rest/model/TableListModel.java rename to hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/model/TableListModel.java diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/model/TableModel.java b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/model/TableModel.java similarity index 100% rename from hbase-server/src/main/java/org/apache/hadoop/hbase/rest/model/TableModel.java rename to hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/model/TableModel.java diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/model/TableRegionModel.java b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/model/TableRegionModel.java similarity index 100% rename from hbase-server/src/main/java/org/apache/hadoop/hbase/rest/model/TableRegionModel.java rename to hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/model/TableRegionModel.java diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/model/TableSchemaModel.java b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/model/TableSchemaModel.java similarity index 100% rename from hbase-server/src/main/java/org/apache/hadoop/hbase/rest/model/TableSchemaModel.java rename to hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/model/TableSchemaModel.java diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/model/VersionModel.java b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/model/VersionModel.java similarity index 100% rename from hbase-server/src/main/java/org/apache/hadoop/hbase/rest/model/VersionModel.java rename to hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/model/VersionModel.java diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/package.html b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/package.html similarity index 100% rename from hbase-server/src/main/java/org/apache/hadoop/hbase/rest/package.html rename to hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/package.html diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/protobuf/generated/CellMessage.java b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/protobuf/generated/CellMessage.java similarity index 100% rename from hbase-server/src/main/java/org/apache/hadoop/hbase/rest/protobuf/generated/CellMessage.java rename to hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/protobuf/generated/CellMessage.java diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/protobuf/generated/CellSetMessage.java b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/protobuf/generated/CellSetMessage.java similarity index 100% rename from hbase-server/src/main/java/org/apache/hadoop/hbase/rest/protobuf/generated/CellSetMessage.java rename to hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/protobuf/generated/CellSetMessage.java diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/protobuf/generated/ColumnSchemaMessage.java b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/protobuf/generated/ColumnSchemaMessage.java similarity index 100% rename from hbase-server/src/main/java/org/apache/hadoop/hbase/rest/protobuf/generated/ColumnSchemaMessage.java rename to hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/protobuf/generated/ColumnSchemaMessage.java diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/protobuf/generated/ScannerMessage.java b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/protobuf/generated/ScannerMessage.java similarity index 100% rename from hbase-server/src/main/java/org/apache/hadoop/hbase/rest/protobuf/generated/ScannerMessage.java rename to hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/protobuf/generated/ScannerMessage.java diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/protobuf/generated/StorageClusterStatusMessage.java b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/protobuf/generated/StorageClusterStatusMessage.java similarity index 100% rename from hbase-server/src/main/java/org/apache/hadoop/hbase/rest/protobuf/generated/StorageClusterStatusMessage.java rename to hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/protobuf/generated/StorageClusterStatusMessage.java diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/protobuf/generated/TableInfoMessage.java b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/protobuf/generated/TableInfoMessage.java similarity index 100% rename from hbase-server/src/main/java/org/apache/hadoop/hbase/rest/protobuf/generated/TableInfoMessage.java rename to hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/protobuf/generated/TableInfoMessage.java diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/protobuf/generated/TableListMessage.java b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/protobuf/generated/TableListMessage.java similarity index 100% rename from hbase-server/src/main/java/org/apache/hadoop/hbase/rest/protobuf/generated/TableListMessage.java rename to hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/protobuf/generated/TableListMessage.java diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/protobuf/generated/TableSchemaMessage.java b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/protobuf/generated/TableSchemaMessage.java similarity index 100% rename from hbase-server/src/main/java/org/apache/hadoop/hbase/rest/protobuf/generated/TableSchemaMessage.java rename to hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/protobuf/generated/TableSchemaMessage.java diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/protobuf/generated/VersionMessage.java b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/protobuf/generated/VersionMessage.java similarity index 100% rename from hbase-server/src/main/java/org/apache/hadoop/hbase/rest/protobuf/generated/VersionMessage.java rename to hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/protobuf/generated/VersionMessage.java diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/provider/JAXBContextResolver.java b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/provider/JAXBContextResolver.java similarity index 100% rename from hbase-server/src/main/java/org/apache/hadoop/hbase/rest/provider/JAXBContextResolver.java rename to hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/provider/JAXBContextResolver.java diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/provider/JacksonProvider.java b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/provider/JacksonProvider.java similarity index 100% rename from hbase-server/src/main/java/org/apache/hadoop/hbase/rest/provider/JacksonProvider.java rename to hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/provider/JacksonProvider.java diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/provider/consumer/ProtobufMessageBodyConsumer.java b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/provider/consumer/ProtobufMessageBodyConsumer.java similarity index 100% rename from hbase-server/src/main/java/org/apache/hadoop/hbase/rest/provider/consumer/ProtobufMessageBodyConsumer.java rename to hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/provider/consumer/ProtobufMessageBodyConsumer.java diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/provider/producer/PlainTextMessageBodyProducer.java b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/provider/producer/PlainTextMessageBodyProducer.java similarity index 100% rename from hbase-server/src/main/java/org/apache/hadoop/hbase/rest/provider/producer/PlainTextMessageBodyProducer.java rename to hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/provider/producer/PlainTextMessageBodyProducer.java diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/provider/producer/ProtobufMessageBodyProducer.java b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/provider/producer/ProtobufMessageBodyProducer.java similarity index 100% rename from hbase-server/src/main/java/org/apache/hadoop/hbase/rest/provider/producer/ProtobufMessageBodyProducer.java rename to hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/provider/producer/ProtobufMessageBodyProducer.java diff --git a/hbase-server/src/main/resources/hbase-webapps/rest/index.html b/hbase-rest/src/main/resources/hbase-webapps/rest/index.html similarity index 100% rename from hbase-server/src/main/resources/hbase-webapps/rest/index.html rename to hbase-rest/src/main/resources/hbase-webapps/rest/index.html diff --git a/hbase-server/src/main/resources/hbase-webapps/rest/rest.jsp b/hbase-rest/src/main/resources/hbase-webapps/rest/rest.jsp similarity index 100% rename from hbase-server/src/main/resources/hbase-webapps/rest/rest.jsp rename to hbase-rest/src/main/resources/hbase-webapps/rest/rest.jsp diff --git a/hbase-server/src/main/resources/org/apache/hadoop/hbase/rest/XMLSchema.xsd b/hbase-rest/src/main/resources/org/apache/hadoop/hbase/rest/XMLSchema.xsd similarity index 100% rename from hbase-server/src/main/resources/org/apache/hadoop/hbase/rest/XMLSchema.xsd rename to hbase-rest/src/main/resources/org/apache/hadoop/hbase/rest/XMLSchema.xsd diff --git a/hbase-server/src/main/resources/org/apache/hadoop/hbase/rest/protobuf/CellMessage.proto b/hbase-rest/src/main/resources/org/apache/hadoop/hbase/rest/protobuf/CellMessage.proto similarity index 100% rename from hbase-server/src/main/resources/org/apache/hadoop/hbase/rest/protobuf/CellMessage.proto rename to hbase-rest/src/main/resources/org/apache/hadoop/hbase/rest/protobuf/CellMessage.proto diff --git a/hbase-server/src/main/resources/org/apache/hadoop/hbase/rest/protobuf/CellSetMessage.proto b/hbase-rest/src/main/resources/org/apache/hadoop/hbase/rest/protobuf/CellSetMessage.proto similarity index 100% rename from hbase-server/src/main/resources/org/apache/hadoop/hbase/rest/protobuf/CellSetMessage.proto rename to hbase-rest/src/main/resources/org/apache/hadoop/hbase/rest/protobuf/CellSetMessage.proto diff --git a/hbase-server/src/main/resources/org/apache/hadoop/hbase/rest/protobuf/ColumnSchemaMessage.proto b/hbase-rest/src/main/resources/org/apache/hadoop/hbase/rest/protobuf/ColumnSchemaMessage.proto similarity index 100% rename from hbase-server/src/main/resources/org/apache/hadoop/hbase/rest/protobuf/ColumnSchemaMessage.proto rename to hbase-rest/src/main/resources/org/apache/hadoop/hbase/rest/protobuf/ColumnSchemaMessage.proto diff --git a/hbase-server/src/main/resources/org/apache/hadoop/hbase/rest/protobuf/ScannerMessage.proto b/hbase-rest/src/main/resources/org/apache/hadoop/hbase/rest/protobuf/ScannerMessage.proto similarity index 100% rename from hbase-server/src/main/resources/org/apache/hadoop/hbase/rest/protobuf/ScannerMessage.proto rename to hbase-rest/src/main/resources/org/apache/hadoop/hbase/rest/protobuf/ScannerMessage.proto diff --git a/hbase-server/src/main/resources/org/apache/hadoop/hbase/rest/protobuf/StorageClusterStatusMessage.proto b/hbase-rest/src/main/resources/org/apache/hadoop/hbase/rest/protobuf/StorageClusterStatusMessage.proto similarity index 100% rename from hbase-server/src/main/resources/org/apache/hadoop/hbase/rest/protobuf/StorageClusterStatusMessage.proto rename to hbase-rest/src/main/resources/org/apache/hadoop/hbase/rest/protobuf/StorageClusterStatusMessage.proto diff --git a/hbase-server/src/main/resources/org/apache/hadoop/hbase/rest/protobuf/TableInfoMessage.proto b/hbase-rest/src/main/resources/org/apache/hadoop/hbase/rest/protobuf/TableInfoMessage.proto similarity index 100% rename from hbase-server/src/main/resources/org/apache/hadoop/hbase/rest/protobuf/TableInfoMessage.proto rename to hbase-rest/src/main/resources/org/apache/hadoop/hbase/rest/protobuf/TableInfoMessage.proto diff --git a/hbase-server/src/main/resources/org/apache/hadoop/hbase/rest/protobuf/TableListMessage.proto b/hbase-rest/src/main/resources/org/apache/hadoop/hbase/rest/protobuf/TableListMessage.proto similarity index 100% rename from hbase-server/src/main/resources/org/apache/hadoop/hbase/rest/protobuf/TableListMessage.proto rename to hbase-rest/src/main/resources/org/apache/hadoop/hbase/rest/protobuf/TableListMessage.proto diff --git a/hbase-server/src/main/resources/org/apache/hadoop/hbase/rest/protobuf/TableSchemaMessage.proto b/hbase-rest/src/main/resources/org/apache/hadoop/hbase/rest/protobuf/TableSchemaMessage.proto similarity index 100% rename from hbase-server/src/main/resources/org/apache/hadoop/hbase/rest/protobuf/TableSchemaMessage.proto rename to hbase-rest/src/main/resources/org/apache/hadoop/hbase/rest/protobuf/TableSchemaMessage.proto diff --git a/hbase-server/src/main/resources/org/apache/hadoop/hbase/rest/protobuf/VersionMessage.proto b/hbase-rest/src/main/resources/org/apache/hadoop/hbase/rest/protobuf/VersionMessage.proto similarity index 100% rename from hbase-server/src/main/resources/org/apache/hadoop/hbase/rest/protobuf/VersionMessage.proto rename to hbase-rest/src/main/resources/org/apache/hadoop/hbase/rest/protobuf/VersionMessage.proto diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/rest/DummyFilter.java b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/DummyFilter.java similarity index 100% rename from hbase-server/src/test/java/org/apache/hadoop/hbase/rest/DummyFilter.java rename to hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/DummyFilter.java diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/rest/HBaseRESTTestingUtility.java b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/HBaseRESTTestingUtility.java similarity index 100% rename from hbase-server/src/test/java/org/apache/hadoop/hbase/rest/HBaseRESTTestingUtility.java rename to hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/HBaseRESTTestingUtility.java diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/rest/PerformanceEvaluation.java b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/PerformanceEvaluation.java similarity index 100% rename from hbase-server/src/test/java/org/apache/hadoop/hbase/rest/PerformanceEvaluation.java rename to hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/PerformanceEvaluation.java diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/rest/RowResourceBase.java b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/RowResourceBase.java similarity index 100% rename from hbase-server/src/test/java/org/apache/hadoop/hbase/rest/RowResourceBase.java rename to hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/RowResourceBase.java diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/rest/TestDeleteRow.java b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestDeleteRow.java similarity index 100% rename from hbase-server/src/test/java/org/apache/hadoop/hbase/rest/TestDeleteRow.java rename to hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestDeleteRow.java diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/rest/TestGZIPResponseWrapper.java b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestGZIPResponseWrapper.java similarity index 100% rename from hbase-server/src/test/java/org/apache/hadoop/hbase/rest/TestGZIPResponseWrapper.java rename to hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestGZIPResponseWrapper.java diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/rest/TestGetAndPutResource.java b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestGetAndPutResource.java similarity index 100% rename from hbase-server/src/test/java/org/apache/hadoop/hbase/rest/TestGetAndPutResource.java rename to hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestGetAndPutResource.java diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/rest/TestGzipFilter.java b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestGzipFilter.java similarity index 100% rename from hbase-server/src/test/java/org/apache/hadoop/hbase/rest/TestGzipFilter.java rename to hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestGzipFilter.java diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/rest/TestMultiRowResource.java b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestMultiRowResource.java similarity index 100% rename from hbase-server/src/test/java/org/apache/hadoop/hbase/rest/TestMultiRowResource.java rename to hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestMultiRowResource.java diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/rest/TestResourceFilter.java b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestResourceFilter.java similarity index 100% rename from hbase-server/src/test/java/org/apache/hadoop/hbase/rest/TestResourceFilter.java rename to hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestResourceFilter.java diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/rest/TestScannerResource.java b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestScannerResource.java similarity index 100% rename from hbase-server/src/test/java/org/apache/hadoop/hbase/rest/TestScannerResource.java rename to hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestScannerResource.java diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/rest/TestScannersWithFilters.java b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestScannersWithFilters.java similarity index 100% rename from hbase-server/src/test/java/org/apache/hadoop/hbase/rest/TestScannersWithFilters.java rename to hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestScannersWithFilters.java diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/rest/TestScannersWithLabels.java b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestScannersWithLabels.java similarity index 100% rename from hbase-server/src/test/java/org/apache/hadoop/hbase/rest/TestScannersWithLabels.java rename to hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestScannersWithLabels.java diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/rest/TestSchemaResource.java b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestSchemaResource.java similarity index 100% rename from hbase-server/src/test/java/org/apache/hadoop/hbase/rest/TestSchemaResource.java rename to hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestSchemaResource.java diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/rest/TestStatusResource.java b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestStatusResource.java similarity index 100% rename from hbase-server/src/test/java/org/apache/hadoop/hbase/rest/TestStatusResource.java rename to hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestStatusResource.java diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/rest/TestTableResource.java b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestTableResource.java similarity index 100% rename from hbase-server/src/test/java/org/apache/hadoop/hbase/rest/TestTableResource.java rename to hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestTableResource.java diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/rest/TestTableScan.java b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestTableScan.java similarity index 100% rename from hbase-server/src/test/java/org/apache/hadoop/hbase/rest/TestTableScan.java rename to hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestTableScan.java diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/rest/TestVersionResource.java b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestVersionResource.java similarity index 100% rename from hbase-server/src/test/java/org/apache/hadoop/hbase/rest/TestVersionResource.java rename to hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestVersionResource.java diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/rest/client/TestRemoteAdminRetries.java b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/client/TestRemoteAdminRetries.java similarity index 100% rename from hbase-server/src/test/java/org/apache/hadoop/hbase/rest/client/TestRemoteAdminRetries.java rename to hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/client/TestRemoteAdminRetries.java diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/rest/client/TestRemoteHTableRetries.java b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/client/TestRemoteHTableRetries.java similarity index 100% rename from hbase-server/src/test/java/org/apache/hadoop/hbase/rest/client/TestRemoteHTableRetries.java rename to hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/client/TestRemoteHTableRetries.java diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/rest/client/TestRemoteTable.java b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/client/TestRemoteTable.java similarity index 100% rename from hbase-server/src/test/java/org/apache/hadoop/hbase/rest/client/TestRemoteTable.java rename to hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/client/TestRemoteTable.java diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/rest/model/TestCellModel.java b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/model/TestCellModel.java similarity index 100% rename from hbase-server/src/test/java/org/apache/hadoop/hbase/rest/model/TestCellModel.java rename to hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/model/TestCellModel.java diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/rest/model/TestCellSetModel.java b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/model/TestCellSetModel.java similarity index 100% rename from hbase-server/src/test/java/org/apache/hadoop/hbase/rest/model/TestCellSetModel.java rename to hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/model/TestCellSetModel.java diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/rest/model/TestColumnSchemaModel.java b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/model/TestColumnSchemaModel.java similarity index 100% rename from hbase-server/src/test/java/org/apache/hadoop/hbase/rest/model/TestColumnSchemaModel.java rename to hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/model/TestColumnSchemaModel.java diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/rest/model/TestModelBase.java b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/model/TestModelBase.java similarity index 100% rename from hbase-server/src/test/java/org/apache/hadoop/hbase/rest/model/TestModelBase.java rename to hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/model/TestModelBase.java diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/rest/model/TestRowModel.java b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/model/TestRowModel.java similarity index 100% rename from hbase-server/src/test/java/org/apache/hadoop/hbase/rest/model/TestRowModel.java rename to hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/model/TestRowModel.java diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/rest/model/TestScannerModel.java b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/model/TestScannerModel.java similarity index 100% rename from hbase-server/src/test/java/org/apache/hadoop/hbase/rest/model/TestScannerModel.java rename to hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/model/TestScannerModel.java diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/rest/model/TestStorageClusterStatusModel.java b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/model/TestStorageClusterStatusModel.java similarity index 100% rename from hbase-server/src/test/java/org/apache/hadoop/hbase/rest/model/TestStorageClusterStatusModel.java rename to hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/model/TestStorageClusterStatusModel.java diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/rest/model/TestStorageClusterVersionModel.java b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/model/TestStorageClusterVersionModel.java similarity index 100% rename from hbase-server/src/test/java/org/apache/hadoop/hbase/rest/model/TestStorageClusterVersionModel.java rename to hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/model/TestStorageClusterVersionModel.java diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/rest/model/TestTableInfoModel.java b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/model/TestTableInfoModel.java similarity index 100% rename from hbase-server/src/test/java/org/apache/hadoop/hbase/rest/model/TestTableInfoModel.java rename to hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/model/TestTableInfoModel.java diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/rest/model/TestTableListModel.java b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/model/TestTableListModel.java similarity index 100% rename from hbase-server/src/test/java/org/apache/hadoop/hbase/rest/model/TestTableListModel.java rename to hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/model/TestTableListModel.java diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/rest/model/TestTableRegionModel.java b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/model/TestTableRegionModel.java similarity index 100% rename from hbase-server/src/test/java/org/apache/hadoop/hbase/rest/model/TestTableRegionModel.java rename to hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/model/TestTableRegionModel.java diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/rest/model/TestTableSchemaModel.java b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/model/TestTableSchemaModel.java similarity index 100% rename from hbase-server/src/test/java/org/apache/hadoop/hbase/rest/model/TestTableSchemaModel.java rename to hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/model/TestTableSchemaModel.java diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/rest/model/TestVersionModel.java b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/model/TestVersionModel.java similarity index 100% rename from hbase-server/src/test/java/org/apache/hadoop/hbase/rest/model/TestVersionModel.java rename to hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/model/TestVersionModel.java diff --git a/hbase-rest/src/test/resources/hbase-site.xml b/hbase-rest/src/test/resources/hbase-site.xml new file mode 100644 index 00000000000..8c8312cb108 --- /dev/null +++ b/hbase-rest/src/test/resources/hbase-site.xml @@ -0,0 +1,150 @@ + + + + + + hbase.regionserver.msginterval + 1000 + Interval between messages from the RegionServer to HMaster + in milliseconds. Default is 15. Set this value low if you want unit + tests to be responsive. + + + + hbase.defaults.for.version.skip + true + + + hbase.server.thread.wakefrequency + 1000 + Time to sleep in between searches for work (in milliseconds). + Used as sleep interval by service threads such as hbase:meta scanner and log roller. + + + + hbase.master.event.waiting.time + 50 + Time to sleep between checks to see if a table event took place. + + + + hbase.regionserver.handler.count + 5 + + + hbase.master.info.port + -1 + The port for the hbase master web UI + Set to -1 if you do not want the info server to run. + + + + hbase.master.port + 0 + Always have masters and regionservers come up on port '0' so we don't clash over + default ports. + + + + hbase.regionserver.port + 0 + Always have masters and regionservers come up on port '0' so we don't clash over + default ports. + + + + hbase.ipc.client.fallback-to-simple-auth-allowed + true + + + + hbase.regionserver.info.port + -1 + The port for the hbase regionserver web UI + Set to -1 if you do not want the info server to run. + + + + hbase.regionserver.info.port.auto + true + Info server auto port bind. Enables automatic port + search if hbase.regionserver.info.port is already in use. + Enabled for testing to run multiple tests on one machine. + + + + hbase.master.lease.thread.wakefrequency + 3000 + The interval between checks for expired region server leases. + This value has been reduced due to the other reduced values above so that + the master will notice a dead region server sooner. The default is 15 seconds. + + + + hbase.regionserver.safemode + false + + Turn on/off safe mode in region server. Always on for production, always off + for tests. + + + + hbase.hregion.max.filesize + 67108864 + + Maximum desired file size for an HRegion. If filesize exceeds + value + (value / 2), the HRegion is split in two. Default: 256M. + + Keep the maximum filesize small so we split more often in tests. + + + + hadoop.log.dir + ${user.dir}/../logs + + + hbase.zookeeper.property.clientPort + 21818 + Property from ZooKeeper's config zoo.cfg. + The port at which the clients will connect. + + + + hbase.defaults.for.version.skip + true + + Set to true to skip the 'hbase.defaults.for.version'. + Setting this to true can be useful in contexts other than + the other side of a maven generation; i.e. running in an + ide. You'll want to set this boolean to true to avoid + seeing the RuntimException complaint: "hbase-default.xml file + seems to be for and old version of HBase (@@@VERSION@@@), this + version is X.X.X-SNAPSHOT" + + + + hbase.table.sanity.checks + false + Skip sanity checks in tests + + + diff --git a/hbase-rest/src/test/resources/hdfs-site.xml b/hbase-rest/src/test/resources/hdfs-site.xml new file mode 100644 index 00000000000..03be0c72c6d --- /dev/null +++ b/hbase-rest/src/test/resources/hdfs-site.xml @@ -0,0 +1,32 @@ + + + + + + + + dfs.namenode.fs-limits.min-block-size + 0 + + \ No newline at end of file diff --git a/hbase-rest/src/test/resources/log4j.properties b/hbase-rest/src/test/resources/log4j.properties new file mode 100644 index 00000000000..6ee91efc3b2 --- /dev/null +++ b/hbase-rest/src/test/resources/log4j.properties @@ -0,0 +1,66 @@ +# 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. + +# Define some default values that can be overridden by system properties +hbase.root.logger=INFO,console +hbase.log.dir=. +hbase.log.file=hbase.log + +# Define the root logger to the system property "hbase.root.logger". +log4j.rootLogger=${hbase.root.logger} + +# Logging Threshold +log4j.threshhold=ALL + +# +# Daily Rolling File Appender +# +log4j.appender.DRFA=org.apache.log4j.DailyRollingFileAppender +log4j.appender.DRFA.File=${hbase.log.dir}/${hbase.log.file} + +# Rollver at midnight +log4j.appender.DRFA.DatePattern=.yyyy-MM-dd + +# 30-day backup +#log4j.appender.DRFA.MaxBackupIndex=30 +log4j.appender.DRFA.layout=org.apache.log4j.PatternLayout +# Debugging Pattern format +log4j.appender.DRFA.layout.ConversionPattern=%d{ISO8601} %-5p [%t] %C{2}(%L): %m%n + + +# +# console +# Add "console" to rootlogger above if you want to use this +# +log4j.appender.console=org.apache.log4j.ConsoleAppender +log4j.appender.console.target=System.err +log4j.appender.console.layout=org.apache.log4j.PatternLayout +log4j.appender.console.layout.ConversionPattern=%d{ISO8601} %-5p [%t] %C{2}(%L): %m%n + +# Custom Logging levels + +#log4j.logger.org.apache.hadoop.fs.FSNamesystem=DEBUG + +log4j.logger.org.apache.hadoop=WARN +log4j.logger.org.apache.zookeeper=ERROR +log4j.logger.org.apache.hadoop.hbase=DEBUG + +#These two settings are workarounds against spurious logs from the minicluster. +#See HBASE-4709 +log4j.org.apache.hadoop.metrics2.impl.MetricsSystemImpl=ERROR +log4j.org.apache.hadoop.metrics2.util.MBeans=ERROR +# Enable this to get detailed connection error/retry logging. +# log4j.logger.org.apache.hadoop.hbase.client.HConnectionManager$HConnectionImplementation=TRACE diff --git a/hbase-rest/src/test/resources/mapred-queues.xml b/hbase-rest/src/test/resources/mapred-queues.xml new file mode 100644 index 00000000000..43f3e2ab14d --- /dev/null +++ b/hbase-rest/src/test/resources/mapred-queues.xml @@ -0,0 +1,75 @@ + + + + + + + + + + default + + + + + + + running + + + * + + + * + + + + diff --git a/hbase-rest/src/test/resources/mapred-site.xml b/hbase-rest/src/test/resources/mapred-site.xml new file mode 100644 index 00000000000..787ffb75511 --- /dev/null +++ b/hbase-rest/src/test/resources/mapred-site.xml @@ -0,0 +1,34 @@ + + + + + + mapred.map.child.java.opts + -Djava.awt.headless=true + + + + mapred.reduce.child.java.opts + -Djava.awt.headless=true + + + diff --git a/hbase-rest/src/test/resources/zoo.cfg b/hbase-rest/src/test/resources/zoo.cfg new file mode 100644 index 00000000000..a7b8ec8fce0 --- /dev/null +++ b/hbase-rest/src/test/resources/zoo.cfg @@ -0,0 +1,43 @@ +# +# 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. +# +# The number of milliseconds of each tick +tickTime=2000 +# The number of ticks that the initial +# synchronization phase can take +initLimit=10 +# The number of ticks that can pass between +# sending a request and getting an acknowledgement +syncLimit=5 +# the directory where the snapshot is stored. +# do not use /tmp for storage, /tmp here is just +# example sakes. +dataDir=/tmp/hbase-test-zookeeper-deleteme +# the port at which the clients will connect +clientPort=9999 +# +# Be sure to read the maintenance section of the +# administrator guide before turning on autopurge. +# +# http://zookeeper.apache.org/doc/current/zookeeperAdmin.html#sc_maintenance +# +# The number of snapshots to retain in dataDir +autopurge.snapRetainCount=3 +# Purge task interval in hours +# Set to "0" to disable auto purge feature +autopurge.purgeInterval=1 + +server.1=i-am-a-test-server:7999:8999 diff --git a/hbase-server/pom.xml b/hbase-server/pom.xml index 6d3697ef934..ce1efb12a54 100644 --- a/hbase-server/pom.xml +++ b/hbase-server/pom.xml @@ -127,8 +127,6 @@ - - @@ -431,27 +429,6 @@ io.netty netty-all - - - com.google.protobuf - protobuf-java - - - com.sun.jersey - jersey-core - - - com.sun.jersey - jersey-json - - - com.sun.jersey - jersey-server - - - javax.xml.bind - jaxb-api - org.htrace @@ -720,34 +697,6 @@ org.apache.hadoop hadoop-maven-plugins - - compile-protoc - generate-sources - - protoc - - - - ${basedir}/src/main/resources/org/apache/hadoop/hbase/rest/protobuf - - - - ${basedir}/src/main/resources/org/apache/hadoop/hbase/rest/protobuf - - CellMessage.proto - CellSetMessage.proto - ColumnSchemaMessage.proto - ScannerMessage.proto - StorageClusterStatusMessage.proto - TableInfoMessage.proto - TableListMessage.proto - TableSchemaMessage.proto - VersionMessage.proto - - - ${basedir}/src/main/java/ - - compile-test-protoc generate-test-sources diff --git a/pom.xml b/pom.xml index 3e93afa1040..0f707ddde3c 100644 --- a/pom.xml +++ b/pom.xml @@ -51,6 +51,7 @@ hbase-server hbase-thrift + hbase-rest hbase-shell hbase-protocol hbase-client @@ -1115,12 +1116,24 @@ test-jar test - - org.apache.hbase - hbase-testing-util - ${project.version} - test - + + hbase-rest + org.apache.hbase + ${project.version} + + + hbase-rest + org.apache.hbase + ${project.version} + test-jar + test + + + org.apache.hbase + hbase-testing-util + ${project.version} + test + org.apache.hbase hbase-prefix-tree