hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From st...@apache.org
Subject hbase git commit: Revert "HBASE-14147 REST Support for Namespaces (Matt Warhaftig); DOES NOT COMPILE"
Date Wed, 09 Sep 2015 13:53:38 GMT
Repository: hbase
Updated Branches:
  refs/heads/branch-1 39ec06e5a -> 48ab0923c


Revert "HBASE-14147 REST Support for Namespaces (Matt Warhaftig); DOES NOT COMPILE"

This reverts commit 39ec06e5acc8b60b69473abd95489d894256aec2.


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/48ab0923
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/48ab0923
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/48ab0923

Branch: refs/heads/branch-1
Commit: 48ab0923c991bafe29eb204a9cd290a41fb90592
Parents: 39ec06e
Author: stack <stack@apache.org>
Authored: Wed Sep 9 06:53:25 2015 -0700
Committer: stack <stack@apache.org>
Committed: Wed Sep 9 06:53:25 2015 -0700

----------------------------------------------------------------------
 hbase-rest/pom.xml                              |  2 --
 .../apache/hadoop/hbase/rest/RootResource.java  |  5 ----
 .../rest/provider/JAXBContextResolver.java      |  4 ---
 .../org/apache/hadoop/hbase/rest/XMLSchema.xsd  | 28 --------------------
 4 files changed, 39 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/48ab0923/hbase-rest/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-rest/pom.xml b/hbase-rest/pom.xml
index 75320da..02dad90 100644
--- a/hbase-rest/pom.xml
+++ b/hbase-rest/pom.xml
@@ -366,8 +366,6 @@
                       <include>CellMessage.proto</include>
                       <include>CellSetMessage.proto</include>
                       <include>ColumnSchemaMessage.proto</include>
-                      <include>NamespacesMessage.proto</include>
-                      <include>NamespacePropertiesMessage.proto</include>
                       <include>ScannerMessage.proto</include>
                       <include>StorageClusterStatusMessage.proto</include>
                       <include>TableInfoMessage.proto</include>

http://git-wip-us.apache.org/repos/asf/hbase/blob/48ab0923/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/RootResource.java
----------------------------------------------------------------------
diff --git a/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/RootResource.java b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/RootResource.java
index c08bb8b..c425e84 100644
--- a/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/RootResource.java
+++ b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/RootResource.java
@@ -103,9 +103,4 @@ public class RootResource extends ResourceBase {
       final @PathParam("table") String table) throws IOException {
     return new TableResource(table);
   }
-
-  @Path("namespaces")
-  public NamespacesResource getNamespaceResource() throws IOException {
-    return new NamespacesResource();
-  }
 }

http://git-wip-us.apache.org/repos/asf/hbase/blob/48ab0923/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/provider/JAXBContextResolver.java
----------------------------------------------------------------------
diff --git a/hbase-rest/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
index ba91519..216f830 100644
--- a/hbase-rest/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
@@ -31,8 +31,6 @@ import org.apache.hadoop.hbase.classification.InterfaceAudience;
 import org.apache.hadoop.hbase.rest.model.CellModel;
 import org.apache.hadoop.hbase.rest.model.CellSetModel;
 import org.apache.hadoop.hbase.rest.model.ColumnSchemaModel;
-import org.apache.hadoop.hbase.rest.model.NamespacesInstanceModel;
-import org.apache.hadoop.hbase.rest.model.NamespacesModel;
 import org.apache.hadoop.hbase.rest.model.RowModel;
 import org.apache.hadoop.hbase.rest.model.ScannerModel;
 import org.apache.hadoop.hbase.rest.model.StorageClusterStatusModel;
@@ -65,8 +63,6 @@ public class JAXBContextResolver implements ContextResolver<JAXBContext>
{
     CellModel.class,
     CellSetModel.class,
     ColumnSchemaModel.class,
-    NamespacesModel.class,
-    NamespacesInstanceModel.class,
     RowModel.class,
     ScannerModel.class,
     StorageClusterStatusModel.class,

http://git-wip-us.apache.org/repos/asf/hbase/blob/48ab0923/hbase-rest/src/main/resources/org/apache/hadoop/hbase/rest/XMLSchema.xsd
----------------------------------------------------------------------
diff --git a/hbase-rest/src/main/resources/org/apache/hadoop/hbase/rest/XMLSchema.xsd b/hbase-rest/src/main/resources/org/apache/hadoop/hbase/rest/XMLSchema.xsd
index 53945f3..ab1b722 100644
--- a/hbase-rest/src/main/resources/org/apache/hadoop/hbase/rest/XMLSchema.xsd
+++ b/hbase-rest/src/main/resources/org/apache/hadoop/hbase/rest/XMLSchema.xsd
@@ -178,32 +178,4 @@
         <attribute name="currentCompactedKVs" type="int"></attribute>
     </complexType>
 
-    <element name="Namespaces" type="tns:Namespaces"></element>
-
-    <complexType name="Namespaces">
-        <sequence>
-            <element name="Namespace" type="string"
-                maxOccurs="unbounded" minOccurs="0">
-            </element>
-        </sequence>
-    </complexType>
-
-    <complexType name="NamespaceProperties">
-          <sequence>
-               <element name="properties">
-                    <complexType>
-                         <sequence>
-                              <element name="entry" maxOccurs="unbounded" minOccurs="0">
-                                   <complexType>
-                                        <sequence>
-                                             <element type="string" name="key" />
-                                             <element type="string" name="value" />
-                                        </sequence>
-                                   </complexType>
-                              </element>
-                         </sequence>
-                    </complexType>
-               </element>
-          </sequence>
-     </complexType>
 </schema>


Mime
View raw message