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:22 UTC
[2/8] git commit: KNOX-42: Changed namenode URLs.
KNOX-42: Changed namenode URLs.
Project: http://git-wip-us.apache.org/repos/asf/incubator-knox/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-knox/commit/a6fdb19f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-knox/tree/a6fdb19f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-knox/diff/a6fdb19f
Branch: refs/heads/master
Commit: a6fdb19fd17877539cb96f26d2f999b894c3629b
Parents: 8701269
Author: Kevin Minder <ke...@hortonworks.com>
Authored: Mon Sep 23 17:12:06 2013 -0400
Committer: Kevin Minder <ke...@hortonworks.com>
Committed: Tue Sep 24 11:44:15 2013 -0400
----------------------------------------------------------------------
.../hadoop/gateway/filter/rewrite/impl/gateway.xml | 2 +-
.../hadoop/gateway/filter/rewrite/impl/rewrite.xml | 4 ++--
gateway-release/home/samples/SampleService.groovy | 2 +-
.../org/apache/hadoop/gateway/GatewayServer.xml | 6 +++---
.../org/apache/hadoop/gateway/GatewayFuncTest.xml | 6 +++---
.../org/apache/hadoop/gateway/GatewayFuncTest.xml | 6 +++---
.../gateway/hdfs/WebHdfsDeploymentContributor.java | 2 +-
.../hdfs/WebHdfsDeploymentContributor/rewrite.xml | 8 ++++----
.../org/apache/hadoop/gateway/shell/hdfs/Hdfs.java | 2 +-
.../apache/hadoop/gateway/GatewayBasicFuncTest.java | 14 +++++++-------
.../gateway/deploy/DeploymentFactoryFuncTest.java | 6 ++----
.../gateway/util/urltemplate/MatcherTest.java | 16 ++++++++--------
.../hadoop/gateway/util/urltemplate/ParserTest.java | 2 +-
.../gateway/util/urltemplate/RewriterTest.java | 14 +++++++-------
14 files changed, 44 insertions(+), 46 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/a6fdb19f/gateway-provider-rewrite/src/test/java/org/apache/hadoop/gateway/filter/rewrite/impl/gateway.xml
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite/src/test/java/org/apache/hadoop/gateway/filter/rewrite/impl/gateway.xml b/gateway-provider-rewrite/src/test/java/org/apache/hadoop/gateway/filter/rewrite/impl/gateway.xml
index 0ed824c..cf0a491 100644
--- a/gateway-provider-rewrite/src/test/java/org/apache/hadoop/gateway/filter/rewrite/impl/gateway.xml
+++ b/gateway-provider-rewrite/src/test/java/org/apache/hadoop/gateway/filter/rewrite/impl/gateway.xml
@@ -18,7 +18,7 @@
<gateway>
<resource>
<role>WEBHDFS</role>
- <pattern>/namenode/api/v1/?**</pattern>
+ <pattern>/webhdfs/v1/?**</pattern>
...
<filter>
<role>rewrite</role>
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/a6fdb19f/gateway-provider-rewrite/src/test/java/org/apache/hadoop/gateway/filter/rewrite/impl/rewrite.xml
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite/src/test/java/org/apache/hadoop/gateway/filter/rewrite/impl/rewrite.xml b/gateway-provider-rewrite/src/test/java/org/apache/hadoop/gateway/filter/rewrite/impl/rewrite.xml
index b10fe0a..1278ffa 100644
--- a/gateway-provider-rewrite/src/test/java/org/apache/hadoop/gateway/filter/rewrite/impl/rewrite.xml
+++ b/gateway-provider-rewrite/src/test/java/org/apache/hadoop/gateway/filter/rewrite/impl/rewrite.xml
@@ -77,10 +77,10 @@
ContentPathParser
-->
- <rule dir="IN" name="WEBHDFS/webhdfs/namenode/root/inbound" pattern="*://*:*/**/namenode/api/{version}/?{**}">
+ <rule dir="IN" name="WEBHDFS/webhdfs/namenode/root/inbound" pattern="*://*:*/**/webhdfs/{version}/?{**}">
<rewrite template="http://vm:50070/webhdfs/{version}/?{**}"/>
</rule>
- <rule dir="IN" name="WEBHDFS/webhdfs/namenode/file/inbound" pattern="*://*:*/**/namenode/api/{version}/{path=**}?{**}">
+ <rule dir="IN" name="WEBHDFS/webhdfs/namenode/file/inbound" pattern="*://*:*/**/webhdfs/{version}/{path=**}?{**}">
<rewrite template="http://vm:50070/webhdfs/{version}/{path=**}?{**}"/>
</rule>
<rule dir="IN" name="WEBHDFS/webhdfs/datanode/inbound" pattern="*://*:*/**/webhdfs/data/{version}/{path=**}?**">
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/a6fdb19f/gateway-release/home/samples/SampleService.groovy
----------------------------------------------------------------------
diff --git a/gateway-release/home/samples/SampleService.groovy b/gateway-release/home/samples/SampleService.groovy
index e8c5bdf..3b1345c 100644
--- a/gateway-release/home/samples/SampleService.groovy
+++ b/gateway-release/home/samples/SampleService.groovy
@@ -19,7 +19,7 @@ import org.apache.hadoop.gateway.shell.Hadoop
class SampleService {
- static String PATH = "/namenode/api/v1"
+ static String PATH = "/webhdfs/v1"
static SampleSimpleCommand simple( Hadoop hadoop ) {
return new SampleSimpleCommand( hadoop )
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/a6fdb19f/gateway-server/src/main/resources/org/apache/hadoop/gateway/GatewayServer.xml
----------------------------------------------------------------------
diff --git a/gateway-server/src/main/resources/org/apache/hadoop/gateway/GatewayServer.xml b/gateway-server/src/main/resources/org/apache/hadoop/gateway/GatewayServer.xml
index 64948af..0075a04 100644
--- a/gateway-server/src/main/resources/org/apache/hadoop/gateway/GatewayServer.xml
+++ b/gateway-server/src/main/resources/org/apache/hadoop/gateway/GatewayServer.xml
@@ -19,7 +19,7 @@
<service>
<name>namenode-root</name>
- <source>/namenode/api/v1?{**}</source>
+ <source>/webhdfs/v1?{**}</source>
<target>http://{namenode.address}/webhdfs/v1/?{**}</target>
<filter>
<name>shiro</name>
@@ -33,7 +33,7 @@
<service>
<name>namenode-children</name>
- <source>/namenode/api/v1/{path=**}?{**}</source>
+ <source>/webhdfs/v1/{path=**}?{**}</source>
<target>http://{namenode.address}/webhdfs/v1/{path=**}?{**}</target>
<filter>
<name>shiro</name>
@@ -43,7 +43,7 @@
<name>rewrite</name>
<class>org.apache.org.apache.hadoop.gateway.filter.rewrite.api.UrlRewriteServletFilter</class>
<rewrite>webhdfs://*:*/{path=**}
- http://{gateway.address}/gateway/gateway/namenode/api/v1/{path=**}</rewrite>
+ http://{gateway.address}/webhdfs/v1/{path=**}</rewrite>
</filter>
<filter>
<name>dispatch</name>
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/a6fdb19f/gateway-server/src/test/java/org/apache/hadoop/gateway/GatewayFuncTest.xml
----------------------------------------------------------------------
diff --git a/gateway-server/src/test/java/org/apache/hadoop/gateway/GatewayFuncTest.xml b/gateway-server/src/test/java/org/apache/hadoop/gateway/GatewayFuncTest.xml
index 841c955..8dfc59d 100644
--- a/gateway-server/src/test/java/org/apache/hadoop/gateway/GatewayFuncTest.xml
+++ b/gateway-server/src/test/java/org/apache/hadoop/gateway/GatewayFuncTest.xml
@@ -19,7 +19,7 @@
<service>
<name>namenode-root</name>
- <source>/namenode/api/v1?{**}</source>
+ <source>/webhdfs/v1?{**}</source>
<target>http://{namenode.address}/webhdfs/v1/?{**}</target>
<filter>
<name>shiro</name>
@@ -33,7 +33,7 @@
<service>
<name>namenode-children</name>
- <source>/namenode/api/v1/{path=**}?{**}</source>
+ <source>/webhdfs/v1/{path=**}?{**}</source>
<target>http://{namenode.address}/webhdfs/v1/{path=**}?{**}</target>
<filter>
<name>shiro</name>
@@ -43,7 +43,7 @@
<name>rewrite</name>
<class>org.apache.org.apache.hadoop.gateway.filter.rewrite.api.UrlRewriteServletFilter</class>
<rewrite>webhdfs://*:*/{path=**}
- http://{org.apache.org.apache.hadoop.gateway.address}/org.apache.hadoopache.hadoop.gateway/gateway/namenode/api/v1/{path=**}</rewrite>
+ http://{org.apache.org.apache.hadoop.gateway.address}/org.apache.hadoopache.hadoop.gateway/gateway/webhdfs/v1/{path=**}</rewrite>
</filter>
<filter>
<name>dispatch</name>
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/a6fdb19f/gateway-server/src/test/resources/org/apache/hadoop/gateway/GatewayFuncTest.xml
----------------------------------------------------------------------
diff --git a/gateway-server/src/test/resources/org/apache/hadoop/gateway/GatewayFuncTest.xml b/gateway-server/src/test/resources/org/apache/hadoop/gateway/GatewayFuncTest.xml
index 8db66bc..abcf963 100644
--- a/gateway-server/src/test/resources/org/apache/hadoop/gateway/GatewayFuncTest.xml
+++ b/gateway-server/src/test/resources/org/apache/hadoop/gateway/GatewayFuncTest.xml
@@ -18,7 +18,7 @@
<resource>
<!--<name>namenode-root</name>-->
- <source>/namenode/api/v1?{**}</source>
+ <source>/webhdfs/v1?{**}</source>
<target>http://{namenode.address}/webhdfs/v1/?{**}</target>
<filter>
<role>authentication</role>
@@ -32,7 +32,7 @@
<resource>
<!--<name>namenode-children</name>-->
- <source>/namenode/api/v1/{path=**}?{**}</source>
+ <source>/webhdfs/v1/{path=**}?{**}</source>
<target>http://{namenode.address}/webhdfs/v1/{path=**}?{**}</target>
<filter>
<role>authentication</role>
@@ -43,7 +43,7 @@
<class>org.apache.hadoop.gateway.filter.rewrite.api.UrlRewriteServletFilter</class>
<param>
<name>rewrite</name>
- <value>webhdfs://*:*/{path=**} {gateway.url}/namenode/api/v1/{path=**}</value>
+ <value>webhdfs://*:*/{path=**} {gateway.url}/webhdfs/v1/{path=**}</value>
</param>
</filter>
<filter>
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/a6fdb19f/gateway-service-webhdfs/src/main/java/org/apache/hadoop/gateway/hdfs/WebHdfsDeploymentContributor.java
----------------------------------------------------------------------
diff --git a/gateway-service-webhdfs/src/main/java/org/apache/hadoop/gateway/hdfs/WebHdfsDeploymentContributor.java b/gateway-service-webhdfs/src/main/java/org/apache/hadoop/gateway/hdfs/WebHdfsDeploymentContributor.java
index b7f0ec5..eff7f47 100644
--- a/gateway-service-webhdfs/src/main/java/org/apache/hadoop/gateway/hdfs/WebHdfsDeploymentContributor.java
+++ b/gateway-service-webhdfs/src/main/java/org/apache/hadoop/gateway/hdfs/WebHdfsDeploymentContributor.java
@@ -37,7 +37,7 @@ import java.util.List;
public class WebHdfsDeploymentContributor extends ServiceDeploymentContributorBase {
private static final String RULES_RESOURCE = WebHdfsDeploymentContributor.class.getName().replace( '.', '/' ) + "/rewrite.xml";
- private static final String WEBHDFS_EXTERNAL_PATH = "/namenode/api/v1";
+ private static final String WEBHDFS_EXTERNAL_PATH = "/webhdfs/v1";
private static final String DATANODE_EXTERNAL_PATH = "/webhdfs/data/v1";
// private static final String WEBHDFS_INTERNAL_PATH = "/webhdfs";
// private static final String CLUSTER_URL_FUNCTION = "{gateway.url}";
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/a6fdb19f/gateway-service-webhdfs/src/main/resources/org/apache/hadoop/gateway/hdfs/WebHdfsDeploymentContributor/rewrite.xml
----------------------------------------------------------------------
diff --git a/gateway-service-webhdfs/src/main/resources/org/apache/hadoop/gateway/hdfs/WebHdfsDeploymentContributor/rewrite.xml b/gateway-service-webhdfs/src/main/resources/org/apache/hadoop/gateway/hdfs/WebHdfsDeploymentContributor/rewrite.xml
index 0c746b6..66081ee 100644
--- a/gateway-service-webhdfs/src/main/resources/org/apache/hadoop/gateway/hdfs/WebHdfsDeploymentContributor/rewrite.xml
+++ b/gateway-service-webhdfs/src/main/resources/org/apache/hadoop/gateway/hdfs/WebHdfsDeploymentContributor/rewrite.xml
@@ -18,11 +18,11 @@
<rules>
<rule dir="OUT" name="WEBHDFS/webhdfs/outbound" pattern="hdfs://*:*/{path=**}?{**}">
- <rewrite template="{gateway.url}/namenode/api/v1/{path=**}?{**}"/>
+ <rewrite template="{gateway.url}/webhdfs/v1/{path=**}?{**}"/>
</rule>
<rule dir="OUT" name="WEBHDFS/webhdfs/outbound" pattern="webhdfs://*:*/{path=**}?{**}">
- <rewrite template="{gateway.url}/namenode/api/v1/{path=**}?{**}"/>
+ <rewrite template="{gateway.url}/webhdfs/v1/{path=**}?{**}"/>
</rule>
<rule dir="OUT" name="WEBHDFS/webhdfs/outbound/namenode/headers/location">
@@ -39,11 +39,11 @@
<rewrite template="{$serviceUrl[WEBHDFS]}/{path=**}?{**}"/>
</rule>
- <rule dir="IN" name="WEBHDFS/webhdfs/inbound/namenode/root" pattern="*://*:*/**/namenode/api/{version}/?{**}">
+ <rule dir="IN" name="WEBHDFS/webhdfs/inbound/namenode/root" pattern="*://*:*/**/webhdfs/{version}/?{**}">
<rewrite template="{$serviceUrl[WEBHDFS]}/{version}/?{**}"/>
</rule>
- <rule dir="IN" name="WEBHDFS/webhdfs/inbound/namenode/file" pattern="*://*:*/**/namenode/api/{version}/{path=**}?{**}">
+ <rule dir="IN" name="WEBHDFS/webhdfs/inbound/namenode/file" pattern="*://*:*/**/webhdfs/{version}/{path=**}?{**}">
<rewrite template="{$serviceUrl[WEBHDFS]}/{version}/{path=**}?{**}"/>
</rule>
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/a6fdb19f/gateway-shell/src/main/java/org/apache/hadoop/gateway/shell/hdfs/Hdfs.java
----------------------------------------------------------------------
diff --git a/gateway-shell/src/main/java/org/apache/hadoop/gateway/shell/hdfs/Hdfs.java b/gateway-shell/src/main/java/org/apache/hadoop/gateway/shell/hdfs/Hdfs.java
index f1c84c9..b5b8bf3 100644
--- a/gateway-shell/src/main/java/org/apache/hadoop/gateway/shell/hdfs/Hdfs.java
+++ b/gateway-shell/src/main/java/org/apache/hadoop/gateway/shell/hdfs/Hdfs.java
@@ -21,7 +21,7 @@ import org.apache.hadoop.gateway.shell.Hadoop;
public class Hdfs {
- static String SERVICE_PATH = "/namenode/api/v1";
+ static String SERVICE_PATH = "/webhdfs/v1";
public static Ls.Request ls( Hadoop session ) {
return new Ls.Request( session );
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/a6fdb19f/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 b03b6cb..272d514 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
@@ -117,7 +117,7 @@ public class GatewayBasicFuncTest {
config.setGatewayPath( "gateway" );
driver.setResourceBase( GatewayBasicFuncTest.class );
driver.setupLdap( findFreePort() );
- driver.setupService( "WEBHDFS", "http://" + TEST_HOST + ":50070/webhdfs", "/cluster/namenode/api", USE_MOCK_SERVICES );
+ driver.setupService( "WEBHDFS", "http://" + TEST_HOST + ":50070/webhdfs", "/cluster/webhdfs", USE_MOCK_SERVICES );
driver.setupService( "DATANODE", "http://" + TEST_HOST + ":50075/webhdfs", "/cluster/webhdfs/data", USE_MOCK_SERVICES );
driver.setupService( "WEBHCAT", "http://" + TEST_HOST + ":50111/webhcat", "/cluster/webhcat/api", USE_MOCK_SERVICES );
driver.setupService( "OOZIE", "http://" + TEST_HOST + ":11000/oozie", "/cluster/oozie/api", USE_MOCK_SERVICES );
@@ -673,17 +673,17 @@ public class GatewayBasicFuncTest {
driver.deleteFile( user, pass, root, "true", HttpStatus.SC_OK );
/* Put the mapreduce code into HDFS. (hadoop-examples.jar)
- curl -X PUT --data-binary @hadoop-examples.jar 'http://192.168.1.163:8888/org.apache.org.apache.hadoop.gateway/cluster/namenode/api/v1/user/hdfs/wordcount/hadoop-examples.jar?user.name=hdfs&op=CREATE'
+ curl -X PUT --data-binary @hadoop-examples.jar 'http://192.168.1.163:8888/org.apache.org.apache.hadoop.gateway/cluster/webhdfs/v1/user/hdfs/wordcount/hadoop-examples.jar?user.name=hdfs&op=CREATE'
*/
driver.createFile( user, pass, null, root+"/hadoop-examples.jar", "777", "application/octet-stream", "hadoop-examples.jar", 307, 201, 200 );
/* Put the data file into HDFS (changes.txt)
- curl -X PUT --data-binary @changes.txt 'http://192.168.1.163:8888/org.apache.org.apache.hadoop.gateway/cluster/namenode/api/v1/user/hdfs/wordcount/input/changes.txt?user.name=hdfs&op=CREATE'
+ curl -X PUT --data-binary @changes.txt 'http://192.168.1.163:8888/org.apache.org.apache.hadoop.gateway/cluster/webhdfs/v1/user/hdfs/wordcount/input/changes.txt?user.name=hdfs&op=CREATE'
*/
driver.createFile( user, pass, null, root+"/input/changes.txt", "777", "text/plain", "changes.txt", 307, 201, 200 );
/* Create the output directory
- curl -X PUT 'http://192.168.1.163:8888/org.apache.org.apache.hadoop.gateway/cluster/namenode/api/v1/user/hdfs/wordcount/output?op=MKDIRS&user.name=hdfs'
+ curl -X PUT 'http://192.168.1.163:8888/org.apache.org.apache.hadoop.gateway/cluster/webhdfs/v1/user/hdfs/wordcount/output?op=MKDIRS&user.name=hdfs'
*/
driver.createDir( user, pass, null, root+"/output", "777", 200, 200 );
@@ -704,7 +704,7 @@ public class GatewayBasicFuncTest {
// Can't really check for the output here because the job won't be done.
/* Retrieve results
- curl 'http://192.168.1.163:8888/org.apache.org.apache.hadoop.gateway/cluster/namenode/api/v1/user/hdfs/wordcount/input?op=LISTSTATUS'
+ curl 'http://192.168.1.163:8888/org.apache.org.apache.hadoop.gateway/cluster/webhdfs/v1/user/hdfs/wordcount/input?op=LISTSTATUS'
*/
if( CLEANUP_TEST ) {
@@ -789,12 +789,12 @@ public class GatewayBasicFuncTest {
driver.createFile( user, pass, group, root+"/workflow.xml", "666", "application/octet-stream", "oozie-workflow.xml", 307, 201, 200 );
/* Put the mapreduce code into HDFS. (hadoop-examples.jar)
- curl -X PUT --data-binary @hadoop-examples.jar 'http://192.168.1.163:8888/org.apache.org.apache.hadoop.gateway/cluster/namenode/api/v1/user/hdfs/wordcount/hadoop-examples.jar?user.name=hdfs&op=CREATE'
+ curl -X PUT --data-binary @hadoop-examples.jar 'http://192.168.1.163:8888/org.apache.org.apache.hadoop.gateway/cluster/webhdfs/v1/user/hdfs/wordcount/hadoop-examples.jar?user.name=hdfs&op=CREATE'
*/
driver.createFile( user, pass, group, root+"/lib/hadoop-examples.jar", "777", "application/octet-stream", "hadoop-examples.jar", 307, 201, 200 );
/* Put the data file into HDFS (changes.txt)
- curl -X PUT --data-binary @changes.txt 'http://192.168.1.163:8888/org.apache.org.apache.hadoop.gateway/cluster/namenode/api/v1/user/hdfs/wordcount/input/changes.txt?user.name=hdfs&op=CREATE'
+ curl -X PUT --data-binary @changes.txt 'http://192.168.1.163:8888/org.apache.org.apache.hadoop.gateway/cluster/webhdfs/v1/user/hdfs/wordcount/input/changes.txt?user.name=hdfs&op=CREATE'
*/
driver.createFile( user, pass, group, root+"/input/changes.txt", "666", "text/plain", "changes.txt", 307, 201, 200 );
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/a6fdb19f/gateway-test/src/test/java/org/apache/hadoop/gateway/deploy/DeploymentFactoryFuncTest.java
----------------------------------------------------------------------
diff --git a/gateway-test/src/test/java/org/apache/hadoop/gateway/deploy/DeploymentFactoryFuncTest.java b/gateway-test/src/test/java/org/apache/hadoop/gateway/deploy/DeploymentFactoryFuncTest.java
index 4198125..d2e1ca8 100644
--- a/gateway-test/src/test/java/org/apache/hadoop/gateway/deploy/DeploymentFactoryFuncTest.java
+++ b/gateway-test/src/test/java/org/apache/hadoop/gateway/deploy/DeploymentFactoryFuncTest.java
@@ -19,7 +19,6 @@ package org.apache.hadoop.gateway.deploy;
import org.apache.hadoop.gateway.GatewayTestConfig;
import org.apache.hadoop.gateway.config.GatewayConfig;
-import org.apache.hadoop.gateway.config.impl.GatewayConfigImpl;
import org.apache.hadoop.gateway.services.DefaultGatewayServices;
import org.apache.hadoop.gateway.services.ServiceLifecycleException;
import org.apache.hadoop.gateway.topology.Provider;
@@ -35,7 +34,6 @@ import org.xml.sax.SAXException;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
-
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
@@ -113,7 +111,7 @@ public class DeploymentFactoryFuncTest {
Document gateway = parse( war.get( "WEB-INF/gateway.xml" ).getAsset().openStream() );
- assertThat( gateway, hasXPath( "/gateway/resource[1]/pattern", equalTo( "/namenode/api/v1/?**" ) ) );
+ assertThat( gateway, hasXPath( "/gateway/resource[1]/pattern", equalTo( "/webhdfs/v1/?**" ) ) );
//assertThat( gateway, hasXPath( "/gateway/resource[1]/target", equalTo( "http://localhost:50070/webhdfs/v1/?{**}" ) ) );
assertThat( gateway, hasXPath( "/gateway/resource[1]/filter[1]/role", equalTo( "authentication" ) ) );
@@ -139,7 +137,7 @@ public class DeploymentFactoryFuncTest {
assertThat( gateway, hasXPath( "/gateway/resource[1]/filter[7]/name", equalTo( "http-client" ) ) );
assertThat( gateway, hasXPath( "/gateway/resource[1]/filter[7]/class", equalTo( "org.apache.hadoop.gateway.dispatch.HttpClientDispatch" ) ) );
- assertThat( gateway, hasXPath( "/gateway/resource[2]/pattern", equalTo( "/namenode/api/v1/**?**" ) ) );
+ assertThat( gateway, hasXPath( "/gateway/resource[2]/pattern", equalTo( "/webhdfs/v1/**?**" ) ) );
//assertThat( gateway, hasXPath( "/gateway/resource[2]/target", equalTo( "http://localhost:50070/webhdfs/v1/{path=**}?{**}" ) ) );
assertThat( gateway, hasXPath( "/gateway/resource[2]/filter[1]/role", equalTo( "authentication" ) ) );
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/a6fdb19f/gateway-util-urltemplate/src/test/java/org/apache/hadoop/gateway/util/urltemplate/MatcherTest.java
----------------------------------------------------------------------
diff --git a/gateway-util-urltemplate/src/test/java/org/apache/hadoop/gateway/util/urltemplate/MatcherTest.java b/gateway-util-urltemplate/src/test/java/org/apache/hadoop/gateway/util/urltemplate/MatcherTest.java
index 912c4ea..1a600a3 100644
--- a/gateway-util-urltemplate/src/test/java/org/apache/hadoop/gateway/util/urltemplate/MatcherTest.java
+++ b/gateway-util-urltemplate/src/test/java/org/apache/hadoop/gateway/util/urltemplate/MatcherTest.java
@@ -613,14 +613,14 @@ public class MatcherTest {
Matcher<String> stringMatcher;
Matcher<?>.Match match;
-// template = Parser.parse( "*://*:*/**/namenode/api/v1/**?**" );
-// input = Parser.parse( "http://localhost:53221/gateway/cluster/namenode/api/v1/tmp/GatewayWebHdfsFuncTest/testBasicHdfsUseCase/dir?user.name=hdfs&op=MKDIRS" );
+// template = Parser.parse( "*://*:*/**/webhdfs/v1/**?**" );
+// input = Parser.parse( "http://localhost:53221/gateway/cluster/webhdfs/v1/tmp/GatewayWebHdfsFuncTest/testBasicHdfsUseCase/dir?user.name=hdfs&op=MKDIRS" );
// matcher = new Matcher<String>( template, "test-value" );
// match = matcher.match( input );
// assertThat( (String)match.getValue(), is( "test-value" ) );
//
-// template = Parser.parse( "*://*:*/**/namenode/api/v1/{path=**}?{**=*}" );
-// input = Parser.parse( "http://localhost:53221/gateway/cluster/namenode/api/v1/tmp/GatewayWebHdfsFuncTest/testBasicHdfsUseCase/dir?user.name=hdfs&op=MKDIRS" );
+// template = Parser.parse( "*://*:*/**/webhdfs/v1/{path=**}?{**=*}" );
+// input = Parser.parse( "http://localhost:53221/gateway/cluster/webhdfs/v1/tmp/GatewayWebHdfsFuncTest/testBasicHdfsUseCase/dir?user.name=hdfs&op=MKDIRS" );
// matcher = new Matcher<String>( template, "test-value-2" );
// match = matcher.match( input );
// assertThat( (String)match.getValue(), is( "test-value-2" ) );
@@ -628,20 +628,20 @@ public class MatcherTest {
// stringMatcher = new Matcher<String>();
// template = Parser.parse( "*://*:*/**/datanode/api/v1/{path=**}?host={host=*}&port={port=*}&{**=*}" );
// stringMatcher.add( template, "test-value-C" );
-// template = Parser.parse( "*://*:*/**/namenode/api/v1/{path=**}?{**=*}" );
+// template = Parser.parse( "*://*:*/**/webhdfs/v1/{path=**}?{**=*}" );
// stringMatcher.add( template, "test-value-B" );
-// input = Parser.parse( "http://localhost:53221/gateway/cluster/namenode/api/v1/tmp/GatewayWebHdfsFuncTest/testBasicHdfsUseCase/dir?user.name=hdfs&op=MKDIRS" );
+// input = Parser.parse( "http://localhost:53221/gateway/cluster/webhdfs/v1/tmp/GatewayWebHdfsFuncTest/testBasicHdfsUseCase/dir?user.name=hdfs&op=MKDIRS" );
// match = stringMatcher.match( input );
// assertThat( match.getValue(), notNullValue() );
// assertThat( (String)match.getValue(), is( "test-value-B" ) );
// This is just a reverse of the above. The order caused a bug.
stringMatcher = new Matcher<String>();
- template = Parser.parse( "*://*:*/**/namenode/api/v1/{path=**}?{**=*}" );
+ template = Parser.parse( "*://*:*/**/webhdfs/v1/{path=**}?{**=*}" );
stringMatcher.add( template, "test-value-B" );
template = Parser.parse( "*://*:*/**/webhdfs/data/v1/{path=**}?host={host=*}&port={port=*}&{**=*}" );
stringMatcher.add( template, "test-value-C" );
- input = Parser.parse( "http://localhost:53221/gateway/cluster/namenode/api/v1/tmp/GatewayWebHdfsFuncTest/testBasicHdfsUseCase/dir?user.name=hdfs&op=MKDIRS" );
+ input = Parser.parse( "http://localhost:53221/gateway/cluster/webhdfs/v1/tmp/GatewayWebHdfsFuncTest/testBasicHdfsUseCase/dir?user.name=hdfs&op=MKDIRS" );
match = stringMatcher.match( input );
assertThat( match.getValue(), notNullValue() );
assertThat( (String)match.getValue(), is( "test-value-B" ) );
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/a6fdb19f/gateway-util-urltemplate/src/test/java/org/apache/hadoop/gateway/util/urltemplate/ParserTest.java
----------------------------------------------------------------------
diff --git a/gateway-util-urltemplate/src/test/java/org/apache/hadoop/gateway/util/urltemplate/ParserTest.java b/gateway-util-urltemplate/src/test/java/org/apache/hadoop/gateway/util/urltemplate/ParserTest.java
index 69fdf5b..dc03828 100644
--- a/gateway-util-urltemplate/src/test/java/org/apache/hadoop/gateway/util/urltemplate/ParserTest.java
+++ b/gateway-util-urltemplate/src/test/java/org/apache/hadoop/gateway/util/urltemplate/ParserTest.java
@@ -874,7 +874,7 @@ public class ParserTest {
template = Parser.parse( "*://*:*/**/path?{**}" );
assertThat( template, notNullValue() );
- template = Parser.parse( "*://*:*/**/namenode/api/v1/?{**}" );
+ template = Parser.parse( "*://*:*/**/webhdfs/v1/?{**}" );
assertThat( template, notNullValue() );
}
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/a6fdb19f/gateway-util-urltemplate/src/test/java/org/apache/hadoop/gateway/util/urltemplate/RewriterTest.java
----------------------------------------------------------------------
diff --git a/gateway-util-urltemplate/src/test/java/org/apache/hadoop/gateway/util/urltemplate/RewriterTest.java b/gateway-util-urltemplate/src/test/java/org/apache/hadoop/gateway/util/urltemplate/RewriterTest.java
index 58e7f1c..8d031c2 100644
--- a/gateway-util-urltemplate/src/test/java/org/apache/hadoop/gateway/util/urltemplate/RewriterTest.java
+++ b/gateway-util-urltemplate/src/test/java/org/apache/hadoop/gateway/util/urltemplate/RewriterTest.java
@@ -221,24 +221,24 @@ public class RewriterTest {
expectOutput = new URI( "http://some-other-host/pathC/pathB/filter-queryParam-value/expect-queryParam-value" );
assertThat( actualOutput, equalTo( expectOutput ) );
- actualInput = new URI( "/namenode/api/v1/test" );
- sourcePattern = Parser.parse( "/namenode/api/v1/{0=**}" );
+ actualInput = new URI( "/webhdfs/v1/test" );
+ sourcePattern = Parser.parse( "/webhdfs/v1/{0=**}" );
targetPattern = Parser.parse( "http://{filter-queryParam-name}/webhdfs/v1/{0}" );
actualOutput = Rewriter.rewrite( actualInput, sourcePattern, targetPattern, new TestResolver( config, request ), null );
expectOutput = new URI( "http://filter-queryParam-value/webhdfs/v1/test" );
assertThat( actualOutput, equalTo( expectOutput ) );
- actualInput = new URI( "/namenode/api/v1/test" );
- sourcePattern = Parser.parse( "/namenode/api/v1/{0=**}" );
+ actualInput = new URI( "/webhdfs/v1/test" );
+ sourcePattern = Parser.parse( "/webhdfs/v1/{0=**}" );
targetPattern = Parser.parse( "http://{filter-queryParam-name}/webhdfs/v1/{0}" );
actualOutput = Rewriter.rewrite( actualInput, sourcePattern, targetPattern, new TestResolver( config, request ), null );
expectOutput = new URI( "http://filter-queryParam-value/webhdfs/v1/test" );
assertThat( actualOutput, equalTo( expectOutput ) );
actualInput = new URI( "http://vm.home:50075/webhdfs/v1/test/file?op=CREATE&user.name=hdfs&overwrite=false" );
- expectOutput = new URI( "http://filter-queryParam-value/gatewaycluster/namenode/api/v1/test/file?op=CREATE&user.name=hdfs&overwrite=false" );
+ expectOutput = new URI( "http://filter-queryParam-value/gatewaycluster/webhdfs/v1/test/file?op=CREATE&user.name=hdfs&overwrite=false" );
sourcePattern = Parser.parse( "*://*:*/webhdfs/v1/{path=**}?op={op=*}&user.name={username=*}&overwrite={overwrite=*}" );
- targetPattern = Parser.parse( "http://{filter-queryParam-name}/gatewaycluster/namenode/api/v1/{path=**}?op={op}&user.name={username}&overwrite={overwrite}" );
+ targetPattern = Parser.parse( "http://{filter-queryParam-name}/gatewaycluster/webhdfs/v1/{path=**}?op={op}&user.name={username}&overwrite={overwrite}" );
actualOutput = Rewriter.rewrite( actualInput, sourcePattern, targetPattern, new TestResolver( config, request ), null );
assertThat( actualOutput, equalTo( expectOutput ) );
@@ -254,7 +254,7 @@ public class RewriterTest {
assertThat( actualOutput, equalTo( expectOutput ) );
// *://**/webhdfs/v1/{path=**}?**={**}
- // http://{org.apache.org.apache.hadoop.gateway.address}/gatewaycluster/namenode/api/v1/{path}?**={**}
+ // http://{org.apache.org.apache.hadoop.gateway.address}/gatewaycluster/webhdfs/v1/{path}?**={**}
// 1) Should not add query if none in source.
// 2) Should only add unmatch query parameters
// Consider chaning = within {} to : and wrapping query fully within {} (e.g. {query=pattern:alias}