You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@knox.apache.org by km...@apache.org on 2013/09/24 17:44:28 UTC
[8/8] git commit: KNOX-42: Change stargate to webhbase.
KNOX-42: Change stargate to webhbase.
Project: http://git-wip-us.apache.org/repos/asf/incubator-knox/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-knox/commit/7756104b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-knox/tree/7756104b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-knox/diff/7756104b
Branch: refs/heads/master
Commit: 7756104bca5eea99aee264c617a2bf2c8282e3e3
Parents: d6d6c19
Author: Kevin Minder <ke...@hortonworks.com>
Authored: Tue Sep 24 11:03:27 2013 -0400
Committer: Kevin Minder <ke...@hortonworks.com>
Committed: Tue Sep 24 11:44:16 2013 -0400
----------------------------------------------------------------------
gateway-release/home/deployments/sandbox.xml | 2 +-
gateway-release/home/templates/sample.conf | 2 +-
gateway-release/home/templates/sample.xml | 2 +-
.../hbase/HBaseDeploymentContributor.java | 8 +-
.../HBaseDeploymentContributor/rewrite.xml | 28 ++---
.../OozieDeploymentContributor/rewrite.xml | 4 +
.../hadoop/gateway/GatewayBasicFuncTest.java | 120 +++++++++----------
hsso-release/home/deployments/sample.xml | 2 +-
hsso-release/home/templates/topology.xml | 2 +-
9 files changed, 87 insertions(+), 83 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/7756104b/gateway-release/home/deployments/sandbox.xml
----------------------------------------------------------------------
diff --git a/gateway-release/home/deployments/sandbox.xml b/gateway-release/home/deployments/sandbox.xml
index 1753b5e..d8766cf 100644
--- a/gateway-release/home/deployments/sandbox.xml
+++ b/gateway-release/home/deployments/sandbox.xml
@@ -86,7 +86,7 @@
<url>http://localhost:11000/oozie</url>
</service>
<service>
- <role>STARGATE</role>
+ <role>WEBHBASE</role>
<url>http://localhost:60080</url>
</service>
<service>
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/7756104b/gateway-release/home/templates/sample.conf
----------------------------------------------------------------------
diff --git a/gateway-release/home/templates/sample.conf b/gateway-release/home/templates/sample.conf
index e9506ee..9c3cd9d 100644
--- a/gateway-release/home/templates/sample.conf
+++ b/gateway-release/home/templates/sample.conf
@@ -69,7 +69,7 @@
<value>http://localhost:11000/oozie</value>
</property>
<property>
- <name>topology.service.STARGATE..url</name>
+ <name>topology.service.WEBHBASE..url</name>
<value>http://localhost:60080</value>
</property>
<property>
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/7756104b/gateway-release/home/templates/sample.xml
----------------------------------------------------------------------
diff --git a/gateway-release/home/templates/sample.xml b/gateway-release/home/templates/sample.xml
index 1203f83..ec52fd9 100644
--- a/gateway-release/home/templates/sample.xml
+++ b/gateway-release/home/templates/sample.xml
@@ -63,7 +63,7 @@
<url>http://localhost:11000/oozie</url>
</service>
<service>
- <role>STARGATE</role>
+ <role>WEBHBASE</role>
<url>http://localhost:60080/</url>
</service>
<service>
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/7756104b/gateway-service-hbase/src/main/java/org/apache/hadoop/gateway/hbase/HBaseDeploymentContributor.java
----------------------------------------------------------------------
diff --git a/gateway-service-hbase/src/main/java/org/apache/hadoop/gateway/hbase/HBaseDeploymentContributor.java b/gateway-service-hbase/src/main/java/org/apache/hadoop/gateway/hbase/HBaseDeploymentContributor.java
index 7cc9dc7..e94c9f3 100644
--- a/gateway-service-hbase/src/main/java/org/apache/hadoop/gateway/hbase/HBaseDeploymentContributor.java
+++ b/gateway-service-hbase/src/main/java/org/apache/hadoop/gateway/hbase/HBaseDeploymentContributor.java
@@ -41,12 +41,12 @@ public class HBaseDeploymentContributor extends ServiceDeploymentContributorBase
@Override
public String getRole() {
- return "STARGATE";
+ return "WEBHBASE";
}
@Override
public String getName() {
- return "stargate";
+ return "webhbase";
}
@Override
@@ -56,9 +56,9 @@ public class HBaseDeploymentContributor extends ServiceDeploymentContributorBase
}
private void contributeRewriteRules( DeploymentContext context, Service service ) throws URISyntaxException, IOException {
- UrlRewriteRulesDescriptor stargateRules = loadRulesFromTemplate();
+ UrlRewriteRulesDescriptor hbaseRules = loadRulesFromTemplate();
UrlRewriteRulesDescriptor clusterRules = context.getDescriptor( "rewrite" );
- clusterRules.addRules( stargateRules );
+ clusterRules.addRules( hbaseRules );
}
private void contributeResources( DeploymentContext context, Service service ) throws URISyntaxException {
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/7756104b/gateway-service-hbase/src/main/resources/org/apache/hadoop/gateway/hbase/HBaseDeploymentContributor/rewrite.xml
----------------------------------------------------------------------
diff --git a/gateway-service-hbase/src/main/resources/org/apache/hadoop/gateway/hbase/HBaseDeploymentContributor/rewrite.xml b/gateway-service-hbase/src/main/resources/org/apache/hadoop/gateway/hbase/HBaseDeploymentContributor/rewrite.xml
index 1a1236f..fabcef4 100644
--- a/gateway-service-hbase/src/main/resources/org/apache/hadoop/gateway/hbase/HBaseDeploymentContributor/rewrite.xml
+++ b/gateway-service-hbase/src/main/resources/org/apache/hadoop/gateway/hbase/HBaseDeploymentContributor/rewrite.xml
@@ -16,46 +16,46 @@
-->
<rules>
- <rule dir="IN" name="STARGATE/stargate/root/inbound" pattern="*://*:*/**/hbase/?{**}">
- <rewrite template="{$serviceUrl[STARGATE]}/?{**}"/>
+ <rule dir="IN" name="WEBHBASE/webhbase/root/inbound" pattern="*://*:*/**/hbase/?{**}">
+ <rewrite template="{$serviceUrl[WEBHBASE]}/?{**}"/>
</rule>
- <rule dir="IN" name="STARGATE/stargate/path/inbound" pattern="*://*:*/**/hbase/{path=**}?{**}">
- <rewrite template="{$serviceUrl[STARGATE]}/{path=**}?{**}"/>
+ <rule dir="IN" name="WEBHBASE/webhbase/path/inbound" pattern="*://*:*/**/hbase/{path=**}?{**}">
+ <rewrite template="{$serviceUrl[WEBHBASE]}/{path=**}?{**}"/>
</rule>
- <rule name="STARGATE/stargate/location/outbound">
+ <rule name="WEBHBASE/webhbase/location/outbound">
<match pattern="*://*:*/{path=**}?{**}"/>
<rewrite template="{gateway.url}/hbase/{path=**}?{**}"/>
</rule>
- <rule name="STARGATE/stargate/address/outbound">
+ <rule name="WEBHBASE/webhbase/address/outbound">
<match pattern="{host}:{port}"/>
<rewrite template="{gateway.url}/hbase-region?host={host}?port={port}"/>
<encrypt-query/>
</rule>
- <filter name="STARGATE/stargate/headers/outbound">
+ <filter name="WEBHBASE/webhbase/headers/outbound">
<content type="application/x-http-headers">
- <apply path="Location" rule="STARGATE/stargate/location/outbound"/>
+ <apply path="Location" rule="WEBHBASE/webhbase/location/outbound"/>
</content>
</filter>
- <filter name="STARGATE/stargate/status/outbound">
+ <filter name="WEBHBASE/webhbase/status/outbound">
<content type="*/json">
- <apply path="$[LiveNodes][*][name]" rule="STARGATE/stargate/address/outbound"/>
+ <apply path="$[LiveNodes][*][name]" rule="WEBHBASE/webhbase/address/outbound"/>
</content>
<content type="*/xml">
- <apply path="/ClusterStatus/LiveNodes/Node/@name" rule="STARGATE/stargate/address/outbound"/>
+ <apply path="/ClusterStatus/LiveNodes/Node/@name" rule="WEBHBASE/webhbase/address/outbound"/>
</content>
</filter>
- <filter name="STARGATE/stargate/regions/outbound">
+ <filter name="WEBHBASE/webhbase/regions/outbound">
<content type="*/json">
- <apply path="$[Region][*][location]" rule="STARGATE/stargate/address/outbound"/>
+ <apply path="$[Region][*][location]" rule="WEBHBASE/webhbase/address/outbound"/>
</content>
<content type="*/xml">
- <apply path="/TableInfo/Region/@location" rule="STARGATE/stargate/address/outbound"/>
+ <apply path="/TableInfo/Region/@location" rule="WEBHBASE/webhbase/address/outbound"/>
</content>
</filter>
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/7756104b/gateway-service-oozie/src/main/resources/org/apache/hadoop/gateway/oozie/OozieDeploymentContributor/rewrite.xml
----------------------------------------------------------------------
diff --git a/gateway-service-oozie/src/main/resources/org/apache/hadoop/gateway/oozie/OozieDeploymentContributor/rewrite.xml b/gateway-service-oozie/src/main/resources/org/apache/hadoop/gateway/oozie/OozieDeploymentContributor/rewrite.xml
index dac2e51..b7abde6 100644
--- a/gateway-service-oozie/src/main/resources/org/apache/hadoop/gateway/oozie/OozieDeploymentContributor/rewrite.xml
+++ b/gateway-service-oozie/src/main/resources/org/apache/hadoop/gateway/oozie/OozieDeploymentContributor/rewrite.xml
@@ -24,6 +24,10 @@
<rewrite template="{$serviceUrl[OOZIE]}/v1/{**}?{**}"/>
</rule>
+ <rule dir="IN" name="OOZIE/oozie/v2" pattern="*://*:*/**/oozie/v2/{**}?{**}">
+ <rewrite template="{$serviceUrl[OOZIE]}/v2/{**}?{**}"/>
+ </rule>
+
<rule name="OOZIE/oozie/user-name">
<rewrite template="{$username}"/>
</rule>
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/7756104b/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayBasicFuncTest.java
----------------------------------------------------------------------
diff --git a/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayBasicFuncTest.java b/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayBasicFuncTest.java
index ed99966..ff39b09 100644
--- a/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayBasicFuncTest.java
+++ b/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayBasicFuncTest.java
@@ -122,7 +122,7 @@ public class GatewayBasicFuncTest {
driver.setupService( "WEBHCAT", "http://" + TEST_HOST + ":50111/templeton", "/cluster/templeton", USE_MOCK_SERVICES );
driver.setupService( "OOZIE", "http://" + TEST_HOST + ":11000/oozie", "/cluster/oozie", USE_MOCK_SERVICES );
driver.setupService( "HIVE", "http://" + TEST_HOST + ":10000", "/cluster/hive", USE_MOCK_SERVICES );
- driver.setupService( "STARGATE", "http://" + TEST_HOST + ":60080", "/cluster/hbase", USE_MOCK_SERVICES );
+ driver.setupService( "WEBHBASE", "http://" + TEST_HOST + ":60080", "/cluster/hbase", USE_MOCK_SERVICES );
driver.setupService( "NAMENODE", "hdfs://" + TEST_HOST + ":8020", null, USE_MOCK_SERVICES );
driver.setupService( "JOBTRACKER", "thrift://" + TEST_HOST + ":8021", null, USE_MOCK_SERVICES );
driver.setupGateway( config, "cluster", createTopology(), USE_GATEWAY );
@@ -204,8 +204,8 @@ public class GatewayBasicFuncTest {
.addTag( "role" ).addText( "HIVE" )
.addTag( "url" ).addText( driver.getRealUrl( "HIVE" ) ).gotoParent()
.addTag( "service" )
- .addTag( "role" ).addText( "STARGATE" )
- .addTag( "url" ).addText( driver.getRealUrl( "STARGATE" ) )
+ .addTag( "role" ).addText( "WEBHBASE" )
+ .addTag( "url" ).addText( driver.getRealUrl( "WEBHBASE" ) )
.gotoRoot();
// System.out.println( "GATEWAY=" + xml.toString() );
return xml;
@@ -1241,7 +1241,7 @@ public class GatewayBasicFuncTest {
String password = "hbase-password";
String resourceName = "hbase/table-list";
- driver.getMock( "STARGATE" )
+ driver.getMock( "WEBHBASE" )
.expect()
.method( "GET" )
.pathInfo( "/" )
@@ -1257,7 +1257,7 @@ public class GatewayBasicFuncTest {
.expect()
.statusCode( HttpStatus.SC_OK )
.contentType( ContentType.XML )
- .when().get( driver.getUrl( "STARGATE" ) );
+ .when().get( driver.getUrl( "WEBHBASE" ) );
MatcherAssert
.assertThat(
@@ -1265,7 +1265,7 @@ public class GatewayBasicFuncTest {
isEquivalentTo( the( driver.getResourceString( resourceName + ".xml", UTF8 ) ) ) );
driver.assertComplete();
- driver.getMock( "STARGATE" )
+ driver.getMock( "WEBHBASE" )
.expect()
.method( "GET" )
.pathInfo( "/" )
@@ -1281,13 +1281,13 @@ public class GatewayBasicFuncTest {
.expect()
.statusCode( HttpStatus.SC_OK )
.contentType( ContentType.JSON )
- .when().get( driver.getUrl( "STARGATE" ) );
+ .when().get( driver.getUrl( "WEBHBASE" ) );
MatcherAssert
.assertThat( response.getBody().asString(), sameJSONAs( driver.getResourceString( resourceName + ".json", UTF8 ) ) );
driver.assertComplete();
- driver.getMock( "STARGATE" )
+ driver.getMock( "WEBHBASE" )
.expect()
.method( "GET" )
.pathInfo( "/" )
@@ -1304,7 +1304,7 @@ public class GatewayBasicFuncTest {
.statusCode( HttpStatus.SC_OK )
.contentType( "application/x-protobuf" )
.content( is( driver.getResourceString( resourceName + ".protobuf", UTF8 ) ) )
- .when().get( driver.getUrl( "STARGATE" ) );
+ .when().get( driver.getUrl( "WEBHBASE" ) );
driver.assertComplete();
}
@@ -1315,7 +1315,7 @@ public class GatewayBasicFuncTest {
String resourceName = "hbase/table-schema";
String path = "/table/schema";
- driver.getMock( "STARGATE" )
+ driver.getMock( "WEBHBASE" )
.expect()
.method( "PUT" )
.pathInfo( path )
@@ -1323,18 +1323,18 @@ public class GatewayBasicFuncTest {
.status( HttpStatus.SC_CREATED )
.content( driver.getResourceBytes( resourceName + ".xml" ) )
.contentType( ContentType.XML.toString() )
- .header( "Location", driver.getRealUrl( "STARGATE" ) + path );
+ .header( "Location", driver.getRealUrl( "WEBHBASE" ) + path );
given()
.auth().preemptive().basic( username, password )
.expect()
.statusCode( HttpStatus.SC_CREATED )
.contentType( ContentType.XML )
- .header( "Location", startsWith( driver.getUrl( "STARGATE" ) + path ) )
- .when().put( driver.getUrl( "STARGATE" ) + path );
+ .header( "Location", startsWith( driver.getUrl( "WEBHBASE" ) + path ) )
+ .when().put( driver.getUrl( "WEBHBASE" ) + path );
driver.assertComplete();
- driver.getMock( "STARGATE" )
+ driver.getMock( "WEBHBASE" )
.expect()
.method( "PUT" )
.pathInfo( path )
@@ -1342,18 +1342,18 @@ public class GatewayBasicFuncTest {
.status( HttpStatus.SC_CREATED )
.content( driver.getResourceBytes( resourceName + ".json" ) )
.contentType( ContentType.JSON.toString() )
- .header( "Location", driver.getRealUrl( "STARGATE" ) + path );
+ .header( "Location", driver.getRealUrl( "WEBHBASE" ) + path );
given()
.auth().preemptive().basic( username, password )
.expect()
.statusCode( HttpStatus.SC_CREATED )
.contentType( ContentType.JSON )
- .header( "Location", startsWith( driver.getUrl( "STARGATE" ) + path ) )
- .when().put( driver.getUrl( "STARGATE" ) + path );
+ .header( "Location", startsWith( driver.getUrl( "WEBHBASE" ) + path ) )
+ .when().put( driver.getUrl( "WEBHBASE" ) + path );
driver.assertComplete();
- driver.getMock( "STARGATE" )
+ driver.getMock( "WEBHBASE" )
.expect()
.method( "PUT" )
.pathInfo( path )
@@ -1361,15 +1361,15 @@ public class GatewayBasicFuncTest {
.status( HttpStatus.SC_CREATED )
.content( driver.getResourceBytes( resourceName + ".protobuf" ) )
.contentType( "application/x-protobuf" )
- .header( "Location", driver.getRealUrl( "STARGATE" ) + path );
+ .header( "Location", driver.getRealUrl( "WEBHBASE" ) + path );
given()
.auth().preemptive().basic( username, password )
.expect()
.statusCode( HttpStatus.SC_CREATED )
.contentType( "application/x-protobuf" )
- .header( "Location", startsWith( driver.getUrl( "STARGATE" ) + path ) )
- .when().put( driver.getUrl( "STARGATE" ) + path );
+ .header( "Location", startsWith( driver.getUrl( "WEBHBASE" ) + path ) )
+ .when().put( driver.getUrl( "WEBHBASE" ) + path );
driver.assertComplete();
}
@@ -1381,7 +1381,7 @@ public class GatewayBasicFuncTest {
String resourceName = "hbase/table-metadata";
String path = "/table/schema";
- driver.getMock( "STARGATE" )
+ driver.getMock( "WEBHBASE" )
.expect()
.method( "GET" )
.pathInfo( path )
@@ -1397,7 +1397,7 @@ public class GatewayBasicFuncTest {
.expect()
.statusCode( HttpStatus.SC_OK )
.contentType( ContentType.XML )
- .when().get( driver.getUrl( "STARGATE" ) + path );
+ .when().get( driver.getUrl( "WEBHBASE" ) + path );
MatcherAssert
.assertThat(
@@ -1405,7 +1405,7 @@ public class GatewayBasicFuncTest {
isEquivalentTo( the( driver.getResourceString( resourceName + ".xml", UTF8 ) ) ) );
driver.assertComplete();
- driver.getMock( "STARGATE" )
+ driver.getMock( "WEBHBASE" )
.expect()
.method( "GET" )
.pathInfo( path )
@@ -1421,13 +1421,13 @@ public class GatewayBasicFuncTest {
.expect()
.statusCode( HttpStatus.SC_OK )
.contentType( ContentType.JSON )
- .when().get( driver.getUrl( "STARGATE" ) + path );
+ .when().get( driver.getUrl( "WEBHBASE" ) + path );
MatcherAssert
.assertThat( response.getBody().asString(), sameJSONAs( driver.getResourceString( resourceName + ".json", UTF8 ) ) );
driver.assertComplete();
- driver.getMock( "STARGATE" )
+ driver.getMock( "WEBHBASE" )
.expect()
.method( "GET" )
.pathInfo( path )
@@ -1444,7 +1444,7 @@ public class GatewayBasicFuncTest {
.statusCode( HttpStatus.SC_OK )
//.content( is( driver.getResourceBytes( resourceName + ".protobuf" ) ) )
.contentType( "application/x-protobuf" )
- .when().get( driver.getUrl( "STARGATE" ) + path );
+ .when().get( driver.getUrl( "WEBHBASE" ) + path );
// RestAssured seems to be screwing up the binary comparison so do it explicitly.
assertThat( driver.getResourceBytes( resourceName + ".protobuf" ), is( response.body().asByteArray() ) );
driver.assertComplete();
@@ -1461,7 +1461,7 @@ public class GatewayBasicFuncTest {
//PUT request
- driver.getMock( "STARGATE" )
+ driver.getMock( "WEBHBASE" )
.expect()
.method( "PUT" )
.pathInfo( multipleRowPath )
@@ -1478,10 +1478,10 @@ public class GatewayBasicFuncTest {
.contentType( ContentType.XML.toString() )
.expect()
.statusCode( HttpStatus.SC_OK )
- .when().put( driver.getUrl( "STARGATE" ) + multipleRowPath );
+ .when().put( driver.getUrl( "WEBHBASE" ) + multipleRowPath );
driver.assertComplete();
- driver.getMock( "STARGATE" )
+ driver.getMock( "WEBHBASE" )
.expect()
.method( "PUT" )
.pathInfo( singleRowPath )
@@ -1497,10 +1497,10 @@ public class GatewayBasicFuncTest {
.contentType( ContentType.JSON.toString() )
.expect()
.statusCode( HttpStatus.SC_OK )
- .when().put( driver.getUrl( "STARGATE" ) + singleRowPath );
+ .when().put( driver.getUrl( "WEBHBASE" ) + singleRowPath );
driver.assertComplete();
- driver.getMock( "STARGATE" )
+ driver.getMock( "WEBHBASE" )
.expect()
.method( "PUT" )
.pathInfo( multipleRowPath )
@@ -1517,12 +1517,12 @@ public class GatewayBasicFuncTest {
.contentType( "application/x-protobuf" )
.expect()
.statusCode( HttpStatus.SC_OK )
- .when().put( driver.getUrl( "STARGATE" ) + multipleRowPath );
+ .when().put( driver.getUrl( "WEBHBASE" ) + multipleRowPath );
driver.assertComplete();
//POST request
- driver.getMock( "STARGATE" )
+ driver.getMock( "WEBHBASE" )
.expect()
.method( "POST" )
.pathInfo( multipleRowPath )
@@ -1539,10 +1539,10 @@ public class GatewayBasicFuncTest {
.contentType( ContentType.XML.toString() )
.expect()
.statusCode( HttpStatus.SC_OK )
- .when().post( driver.getUrl( "STARGATE" ) + multipleRowPath );
+ .when().post( driver.getUrl( "WEBHBASE" ) + multipleRowPath );
driver.assertComplete();
- driver.getMock( "STARGATE" )
+ driver.getMock( "WEBHBASE" )
.expect()
.method( "POST" )
.pathInfo( singleRowPath )
@@ -1558,10 +1558,10 @@ public class GatewayBasicFuncTest {
.contentType( ContentType.JSON.toString() )
.expect()
.statusCode( HttpStatus.SC_OK )
- .when().post( driver.getUrl( "STARGATE" ) + singleRowPath );
+ .when().post( driver.getUrl( "WEBHBASE" ) + singleRowPath );
driver.assertComplete();
- driver.getMock( "STARGATE" )
+ driver.getMock( "WEBHBASE" )
.expect()
.method( "POST" )
.pathInfo( multipleRowPath )
@@ -1578,7 +1578,7 @@ public class GatewayBasicFuncTest {
.contentType( "application/x-protobuf" )
.expect()
.statusCode( HttpStatus.SC_OK )
- .when().post( driver.getUrl( "STARGATE" ) + multipleRowPath );
+ .when().post( driver.getUrl( "WEBHBASE" ) + multipleRowPath );
driver.assertComplete();
}
@@ -1592,7 +1592,7 @@ public class GatewayBasicFuncTest {
String familyId = "family";
String columnId = "column";
- driver.getMock( "STARGATE" )
+ driver.getMock( "WEBHBASE" )
.expect()
.method( "DELETE" )
.pathInfo( "/" + tableId + "/" + rowId )
@@ -1603,10 +1603,10 @@ public class GatewayBasicFuncTest {
.auth().preemptive().basic( username, password )
.expect()
.statusCode( HttpStatus.SC_OK )
- .when().delete( driver.getUrl( "STARGATE" ) + "/" + tableId + "/" + rowId );
+ .when().delete( driver.getUrl( "WEBHBASE" ) + "/" + tableId + "/" + rowId );
driver.assertComplete();
- driver.getMock( "STARGATE" )
+ driver.getMock( "WEBHBASE" )
.expect()
.method( "DELETE" )
.pathInfo( "/" + tableId + "/" + rowId + "/" + familyId )
@@ -1617,10 +1617,10 @@ public class GatewayBasicFuncTest {
.auth().preemptive().basic( username, password )
.expect()
.statusCode( HttpStatus.SC_OK )
- .when().delete( driver.getUrl( "STARGATE" ) + "/" + tableId + "/" + rowId + "/" + familyId );
+ .when().delete( driver.getUrl( "WEBHBASE" ) + "/" + tableId + "/" + rowId + "/" + familyId );
driver.assertComplete();
- driver.getMock( "STARGATE" )
+ driver.getMock( "WEBHBASE" )
.expect()
.method( "DELETE" )
.pathInfo( "/" + tableId + "/" + rowId + "/" + familyId + ":" + columnId )
@@ -1631,7 +1631,7 @@ public class GatewayBasicFuncTest {
.auth().preemptive().basic( username, password )
.expect()
.statusCode( HttpStatus.SC_OK )
- .when().delete( driver.getUrl( "STARGATE" ) + "/" + tableId + "/" + rowId + "/" + familyId + ":" + columnId );
+ .when().delete( driver.getUrl( "WEBHBASE" ) + "/" + tableId + "/" + rowId + "/" + familyId + ":" + columnId );
driver.assertComplete();
}
@@ -1648,7 +1648,7 @@ public class GatewayBasicFuncTest {
String rowsWithKeyPath = "/table/row";
String rowsWithKeyAndColumnPath = "/table/row/family:col";
- driver.getMock( "STARGATE" )
+ driver.getMock( "WEBHBASE" )
.expect()
.method( "GET" )
.pathInfo( allRowsPath )
@@ -1664,7 +1664,7 @@ public class GatewayBasicFuncTest {
.expect()
.statusCode( HttpStatus.SC_OK )
.contentType( ContentType.XML )
- .when().get( driver.getUrl( "STARGATE" ) + allRowsPath );
+ .when().get( driver.getUrl( "WEBHBASE" ) + allRowsPath );
MatcherAssert
.assertThat(
@@ -1672,7 +1672,7 @@ public class GatewayBasicFuncTest {
isEquivalentTo( the( driver.getResourceString( resourceName + ".xml", UTF8 ) ) ) );
driver.assertComplete();
- driver.getMock( "STARGATE" )
+ driver.getMock( "WEBHBASE" )
.expect()
.method( "GET" )
.pathInfo( rowsStartsWithPath )
@@ -1688,7 +1688,7 @@ public class GatewayBasicFuncTest {
.expect()
.statusCode( HttpStatus.SC_OK )
.contentType( ContentType.XML )
- .when().get( driver.getUrl( "STARGATE" ) + rowsStartsWithPath );
+ .when().get( driver.getUrl( "WEBHBASE" ) + rowsStartsWithPath );
MatcherAssert
.assertThat(
@@ -1696,7 +1696,7 @@ public class GatewayBasicFuncTest {
isEquivalentTo( the( driver.getResourceString( resourceName + ".xml", UTF8 ) ) ) );
driver.assertComplete();
- driver.getMock( "STARGATE" )
+ driver.getMock( "WEBHBASE" )
.expect()
.method( "GET" )
.pathInfo( rowsWithKeyPath )
@@ -1712,13 +1712,13 @@ public class GatewayBasicFuncTest {
.expect()
.statusCode( HttpStatus.SC_OK )
.contentType( ContentType.JSON )
- .when().get( driver.getUrl( "STARGATE" ) + rowsWithKeyPath );
+ .when().get( driver.getUrl( "WEBHBASE" ) + rowsWithKeyPath );
MatcherAssert
.assertThat( response.getBody().asString(), sameJSONAs( driver.getResourceString( resourceName + ".json", UTF8 ) ) );
driver.assertComplete();
- driver.getMock( "STARGATE" )
+ driver.getMock( "WEBHBASE" )
.expect()
.method( "GET" )
.pathInfo( rowsWithKeyAndColumnPath )
@@ -1734,7 +1734,7 @@ public class GatewayBasicFuncTest {
.expect()
.statusCode( HttpStatus.SC_OK )
.contentType( ContentType.JSON )
- .when().get( driver.getUrl( "STARGATE" ) + rowsWithKeyAndColumnPath );
+ .when().get( driver.getUrl( "WEBHBASE" ) + rowsWithKeyAndColumnPath );
MatcherAssert
.assertThat( response.getBody().asString(), sameJSONAs( driver.getResourceString( resourceName + ".json", UTF8 ) ) );
@@ -1752,7 +1752,7 @@ public class GatewayBasicFuncTest {
String scannerId = "13705290446328cff5ed";
//Create scanner for table using PUT and POST requests
- driver.getMock( "STARGATE" )
+ driver.getMock( "WEBHBASE" )
.expect()
.method( "PUT" )
.pathInfo( scannerPath )
@@ -1766,13 +1766,13 @@ public class GatewayBasicFuncTest {
.content( driver.getResourceBytes( scannerDefinitionResourceName + ".xml" ) )
.expect()
//TODO: Add "Location" header check when issue with incorrect outbound rewrites will be resolved
- //.header( "Location", startsWith( driver.getUrl( "STARGATE" ) + createScannerPath ) )
+ //.header( "Location", startsWith( driver.getUrl( "WEBHBASE" ) + createScannerPath ) )
.statusCode( HttpStatus.SC_CREATED )
- .when().put( driver.getUrl( "STARGATE" ) + scannerPath );
+ .when().put( driver.getUrl( "WEBHBASE" ) + scannerPath );
driver.assertComplete();
//Get the values of the next cells found by the scanner
- driver.getMock( "STARGATE" )
+ driver.getMock( "WEBHBASE" )
.expect()
.method( "GET" )
.pathInfo( scannerPath + "/" + scannerId )
@@ -1788,7 +1788,7 @@ public class GatewayBasicFuncTest {
.expect()
.statusCode( HttpStatus.SC_OK )
.contentType( ContentType.XML )
- .when().get( driver.getUrl( "STARGATE" ) + scannerPath + "/" + scannerId );
+ .when().get( driver.getUrl( "WEBHBASE" ) + scannerPath + "/" + scannerId );
MatcherAssert
.assertThat(
@@ -1797,7 +1797,7 @@ public class GatewayBasicFuncTest {
driver.assertComplete();
//Delete scanner
- driver.getMock( "STARGATE" )
+ driver.getMock( "WEBHBASE" )
.expect()
.method( "DELETE" )
.pathInfo( scannerPath + "/" + scannerId )
@@ -1808,7 +1808,7 @@ public class GatewayBasicFuncTest {
.auth().preemptive().basic( username, password )
.expect()
.statusCode( HttpStatus.SC_OK )
- .when().delete( driver.getUrl( "STARGATE" ) + scannerPath + "/" + scannerId );
+ .when().delete( driver.getUrl( "WEBHBASE" ) + scannerPath + "/" + scannerId );
driver.assertComplete();
}
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/7756104b/hsso-release/home/deployments/sample.xml
----------------------------------------------------------------------
diff --git a/hsso-release/home/deployments/sample.xml b/hsso-release/home/deployments/sample.xml
index 3b15ae4..645a6e3 100644
--- a/hsso-release/home/deployments/sample.xml
+++ b/hsso-release/home/deployments/sample.xml
@@ -43,7 +43,7 @@
<url>http://localhost:11000/oozie</url>
</service>
<service>
- <role>STARGATE</role>
+ <role>WEBHBASE</role>
<url>http://localhost:60080</url>
</service>
<service>
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/7756104b/hsso-release/home/templates/topology.xml
----------------------------------------------------------------------
diff --git a/hsso-release/home/templates/topology.xml b/hsso-release/home/templates/topology.xml
index 15cc546..8ee236e 100644
--- a/hsso-release/home/templates/topology.xml
+++ b/hsso-release/home/templates/topology.xml
@@ -63,7 +63,7 @@
<url>http://localhost:11000/oozie</url>
</service>
<service>
- <role>STARGATE</role>
+ <role>WEBHBASE</role>
<url>http://localhost:60080</url>
</service>
<service>