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:26 UTC
[6/8] git commit: KNOX-42: Changed Oozie URLs.
KNOX-42: Changed Oozie 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/1ea67de7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-knox/tree/1ea67de7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-knox/diff/1ea67de7
Branch: refs/heads/master
Commit: 1ea67de774e1ab18f90a3391282265c8ae458318
Parents: e7e518e
Author: Kevin Minder <ke...@hortonworks.com>
Authored: Tue Sep 24 10:32:43 2013 -0400
Committer: Kevin Minder <ke...@hortonworks.com>
Committed: Tue Sep 24 11:44:16 2013 -0400
----------------------------------------------------------------------
.../apache/hadoop/gateway/filter/rewrite/impl/rewrite.xml | 6 +++---
.../main/java/org/apache/hadoop/gateway/GatewayMessages.java | 8 ++++----
.../org/apache/hadoop/gateway/deploy/DeploymentFactory.java | 2 +-
.../hadoop/gateway/oozie/OozieDeploymentContributor.java | 2 +-
.../gateway/oozie/OozieDeploymentContributor/rewrite.xml | 4 ++--
.../org/apache/hadoop/gateway/shell/workflow/Workflow.java | 2 +-
.../java/org/apache/hadoop/gateway/GatewayBasicFuncTest.java | 2 +-
7 files changed, 13 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/1ea67de7/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 a61820f..1d58a25 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
@@ -96,11 +96,11 @@
<rule dir="IN" name="WEBHCAT/webhcat/request" pattern="*://*:*/**/templeton/{version}/{path=**}?{**}">
<rewrite template="http://vm:50111/templeton/{version}/{path=**}?{**}"/>
</rule>
- <rule dir="IN" name="OOZIE/oozie/root/inbound" pattern="*://*:*/**/oozie/api/{**}?{**}">
+ <rule dir="IN" name="OOZIE/oozie/root/inbound" pattern="*://*:*/**/oozie/{**}?{**}">
<rewrite template="http://vm:11000/oozie/{**}?{**}"/>
</rule>
- <rule dir="IN" name="OOZIE/oozie/api/inbound" pattern="*://*:*/**/oozie/api/{**}?{**}">
- <rewrite template="http://vm:11000/oozie/{**}?{**}"/>
+ <rule dir="IN" name="OOZIE/oozie/v1/inbound" pattern="*://*:*/**/oozie/v1/{**}?{**}">
+ <rewrite template="http://vm:11000/oozie/v1/{**}?{**}"/>
</rule>
</rules>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/1ea67de7/gateway-server/src/main/java/org/apache/hadoop/gateway/GatewayMessages.java
----------------------------------------------------------------------
diff --git a/gateway-server/src/main/java/org/apache/hadoop/gateway/GatewayMessages.java b/gateway-server/src/main/java/org/apache/hadoop/gateway/GatewayMessages.java
index be755ad..2120bbf 100644
--- a/gateway-server/src/main/java/org/apache/hadoop/gateway/GatewayMessages.java
+++ b/gateway-server/src/main/java/org/apache/hadoop/gateway/GatewayMessages.java
@@ -165,11 +165,11 @@ public interface GatewayMessages {
@Message( level = MessageLevel.ERROR, text = "Failed to finalize contribution: {0}" )
void failedToFinalizeContribution( @StackTrace( level = MessageLevel.DEBUG ) Exception e );
- @Message( level = MessageLevel.ERROR, text = "Failed to contribute service [name={0}, role={1}]: {2}" )
- void failedToContributeService( String name, String role, @StackTrace( level = MessageLevel.DEBUG ) Exception e );
+ @Message( level = MessageLevel.ERROR, text = "Failed to contribute service [role={1}, name={0}]: {2}" )
+ void failedToContributeService( String name, String role, @StackTrace( level = MessageLevel.ERROR ) Exception e );
- @Message( level = MessageLevel.ERROR, text = "Failed to contribute provider [name={0}, role={1}]: {2}" )
- void failedToContributeProvider( String name, String role, @StackTrace( level = MessageLevel.DEBUG ) Exception e );
+ @Message( level = MessageLevel.ERROR, text = "Failed to contribute provider [role={1}, name={0}]: {2}" )
+ void failedToContributeProvider( String name, String role, @StackTrace( level = MessageLevel.ERROR ) Exception e );
@Message( level = MessageLevel.ERROR, text = "Failed to initialize contribution: {0}" )
void failedToInitializeContribution( @StackTrace( level = MessageLevel.DEBUG ) Exception e );
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/1ea67de7/gateway-server/src/main/java/org/apache/hadoop/gateway/deploy/DeploymentFactory.java
----------------------------------------------------------------------
diff --git a/gateway-server/src/main/java/org/apache/hadoop/gateway/deploy/DeploymentFactory.java b/gateway-server/src/main/java/org/apache/hadoop/gateway/deploy/DeploymentFactory.java
index 01f9663..3ee564b 100644
--- a/gateway-server/src/main/java/org/apache/hadoop/gateway/deploy/DeploymentFactory.java
+++ b/gateway-server/src/main/java/org/apache/hadoop/gateway/deploy/DeploymentFactory.java
@@ -261,7 +261,7 @@ public abstract class DeploymentFactory {
} catch( Exception e ) {
// Maybe it makes sense to throw exception
log.failedToContributeService( service.getName(), service.getRole(), e );
- throw new DeploymentException("Failed to contribute provider.", e);
+ throw new DeploymentException("Failed to contribute service.", e);
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/1ea67de7/gateway-service-oozie/src/main/java/org/apache/hadoop/gateway/oozie/OozieDeploymentContributor.java
----------------------------------------------------------------------
diff --git a/gateway-service-oozie/src/main/java/org/apache/hadoop/gateway/oozie/OozieDeploymentContributor.java b/gateway-service-oozie/src/main/java/org/apache/hadoop/gateway/oozie/OozieDeploymentContributor.java
index 6933ba3..7215945 100644
--- a/gateway-service-oozie/src/main/java/org/apache/hadoop/gateway/oozie/OozieDeploymentContributor.java
+++ b/gateway-service-oozie/src/main/java/org/apache/hadoop/gateway/oozie/OozieDeploymentContributor.java
@@ -36,7 +36,7 @@ import java.util.List;
public class OozieDeploymentContributor extends ServiceDeploymentContributorBase {
private static final String RULES_RESOURCE = OozieDeploymentContributor.class.getName().replace( '.', '/' ) + "/rewrite.xml";
- private static final String EXTERNAL_PATH = "/oozie/api";
+ private static final String EXTERNAL_PATH = "/oozie";
@Override
public String getRole() {
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/1ea67de7/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 b129326..dac2e51 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
@@ -16,11 +16,11 @@
-->
<rules>
- <rule dir="IN" name="OOZIE/oozie/root" pattern="*://*:*/**/oozie/api/{**}?{**}">
+ <rule dir="IN" name="OOZIE/oozie/root" pattern="*://*:*/**/oozie/{**}?{**}">
<rewrite template="{$serviceUrl[OOZIE]}/{**}?{**}"/>
</rule>
- <rule dir="IN" name="OOZIE/oozie/api" pattern="*://*:*/**/oozie/api/v1/{**}?{**}">
+ <rule dir="IN" name="OOZIE/oozie/v1" pattern="*://*:*/**/oozie/v1/{**}?{**}">
<rewrite template="{$serviceUrl[OOZIE]}/v1/{**}?{**}"/>
</rule>
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/1ea67de7/gateway-shell/src/main/java/org/apache/hadoop/gateway/shell/workflow/Workflow.java
----------------------------------------------------------------------
diff --git a/gateway-shell/src/main/java/org/apache/hadoop/gateway/shell/workflow/Workflow.java b/gateway-shell/src/main/java/org/apache/hadoop/gateway/shell/workflow/Workflow.java
index 2e0d09c..a132e9f 100644
--- a/gateway-shell/src/main/java/org/apache/hadoop/gateway/shell/workflow/Workflow.java
+++ b/gateway-shell/src/main/java/org/apache/hadoop/gateway/shell/workflow/Workflow.java
@@ -21,7 +21,7 @@ import org.apache.hadoop.gateway.shell.Hadoop;
public class Workflow {
- static String SERVICE_PATH = "/oozie/api/v1";
+ static String SERVICE_PATH = "/oozie/v1";
public static Submit.Request submit( Hadoop session ) {
return new Submit.Request( session );
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/1ea67de7/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 32f1a30..4c9b33e 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
@@ -120,7 +120,7 @@ public class GatewayBasicFuncTest {
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/templeton", "/cluster/templeton", USE_MOCK_SERVICES );
- driver.setupService( "OOZIE", "http://" + TEST_HOST + ":11000/oozie", "/cluster/oozie/api", 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/api/v1", USE_MOCK_SERVICES );
driver.setupService( "STARGATE", "http://" + TEST_HOST + ":60080", "/cluster/hbase", USE_MOCK_SERVICES );
driver.setupService( "NAMENODE", "hdfs://" + TEST_HOST + ":8020", null, USE_MOCK_SERVICES );