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/08/23 00:41:06 UTC
git commit: Pre RC cleanup.
Updated Branches:
refs/heads/master cf0bf5674 -> df2cc164e
Pre RC cleanup.
Project: http://git-wip-us.apache.org/repos/asf/incubator-knox/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-knox/commit/df2cc164
Tree: http://git-wip-us.apache.org/repos/asf/incubator-knox/tree/df2cc164
Diff: http://git-wip-us.apache.org/repos/asf/incubator-knox/diff/df2cc164
Branch: refs/heads/master
Commit: df2cc164edd409b2aa68ed26092c474558f1d8b8
Parents: cf0bf56
Author: Kevin Minder <ke...@hortonworks.com>
Authored: Thu Aug 22 16:01:23 2013 -0400
Committer: Kevin Minder <ke...@hortonworks.com>
Committed: Thu Aug 22 16:01:23 2013 -0400
----------------------------------------------------------------------
gateway-provider-rewrite/pom.xml | 8 -------
.../impl/html/HtmlFilterReaderBaseTest.java | 6 ------
.../rewrite/impl/xml/XmlFilterReaderTest.java | 7 -------
gateway-release/home/deployments/sample.xml | 8 +++++++
.../home/samples/ExampleSubmitWorkflow.groovy | 4 ++--
gateway-release/home/templates/sample.conf | 4 ++++
gateway-release/home/templates/sample.xml | 8 +++++++
gateway-release/home/templates/topology.xml | 22 +++++++++++++++-----
.../home/templates/workflow-configuration.xml | 6 +++---
gateway-release/src/assembly.xml | 2 +-
.../hbase/HbaseDeploymentContributor.java | 2 +-
.../gateway/hive/HiveDeploymentContributor.java | 2 +-
.../gateway/shell/workflow/Example.groovy | 4 ++--
.../hadoop/gateway/GatewayBasicFuncTest.java | 4 ++--
hsso-release/home/deployments/sample.xml | 14 ++++++++++---
hsso-release/home/templates/topology.xml | 16 ++++++++++++--
.../home/templates/workflow-configuration.xml | 6 +++---
hsso-release/src/assembly.xml | 2 +-
pom.xml | 10 ---------
19 files changed, 78 insertions(+), 57 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/df2cc164/gateway-provider-rewrite/pom.xml
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite/pom.xml b/gateway-provider-rewrite/pom.xml
index c46d949..8a98a6a 100644
--- a/gateway-provider-rewrite/pom.xml
+++ b/gateway-provider-rewrite/pom.xml
@@ -91,14 +91,6 @@
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</dependency>
- <dependency>
- <groupId>org.jdom</groupId>
- <artifactId>jdom2</artifactId>
- </dependency>
- <dependency>
- <groupId>jaxen</groupId>
- <artifactId>jaxen</artifactId>
- </dependency>
<!-- ********** ********** ********** ********** ********** ********** -->
<!-- ********** Test Dependencies ********** -->
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/df2cc164/gateway-provider-rewrite/src/test/java/org/apache/hadoop/gateway/filter/rewrite/impl/html/HtmlFilterReaderBaseTest.java
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite/src/test/java/org/apache/hadoop/gateway/filter/rewrite/impl/html/HtmlFilterReaderBaseTest.java b/gateway-provider-rewrite/src/test/java/org/apache/hadoop/gateway/filter/rewrite/impl/html/HtmlFilterReaderBaseTest.java
index 6648477..dabd695 100644
--- a/gateway-provider-rewrite/src/test/java/org/apache/hadoop/gateway/filter/rewrite/impl/html/HtmlFilterReaderBaseTest.java
+++ b/gateway-provider-rewrite/src/test/java/org/apache/hadoop/gateway/filter/rewrite/impl/html/HtmlFilterReaderBaseTest.java
@@ -33,12 +33,6 @@ import org.apache.hadoop.gateway.filter.rewrite.ext.UrlRewriteMatchDescriptorExt
import org.apache.hadoop.gateway.filter.rewrite.impl.xml.XmlRewriteRulesDigester;
import org.apache.hadoop.gateway.filter.rewrite.spi.UrlRewriteActionDescriptorBase;
import org.hamcrest.Matchers;
-import org.jdom2.filter.AttributeFilter;
-import org.jdom2.filter.ContentFilter;
-import org.jdom2.output.Format;
-import org.jdom2.output.XMLOutputter;
-import org.jdom2.xpath.XPathExpression;
-import org.jdom2.xpath.XPathFactory;
import org.junit.Before;
import org.junit.Test;
import org.w3c.dom.Document;
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/df2cc164/gateway-provider-rewrite/src/test/java/org/apache/hadoop/gateway/filter/rewrite/impl/xml/XmlFilterReaderTest.java
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite/src/test/java/org/apache/hadoop/gateway/filter/rewrite/impl/xml/XmlFilterReaderTest.java b/gateway-provider-rewrite/src/test/java/org/apache/hadoop/gateway/filter/rewrite/impl/xml/XmlFilterReaderTest.java
index ca68004..bce6ef4 100644
--- a/gateway-provider-rewrite/src/test/java/org/apache/hadoop/gateway/filter/rewrite/impl/xml/XmlFilterReaderTest.java
+++ b/gateway-provider-rewrite/src/test/java/org/apache/hadoop/gateway/filter/rewrite/impl/xml/XmlFilterReaderTest.java
@@ -33,13 +33,6 @@ import org.apache.hadoop.gateway.filter.rewrite.ext.UrlRewriteMatchDescriptorExt
import org.apache.hadoop.gateway.filter.rewrite.spi.UrlRewriteActionDescriptorBase;
import org.apache.hadoop.test.TestUtils;
import org.hamcrest.Matchers;
-import org.jdom2.Content;
-import org.jdom2.filter.AttributeFilter;
-import org.jdom2.filter.ContentFilter;
-import org.jdom2.output.Format;
-import org.jdom2.output.XMLOutputter;
-import org.jdom2.xpath.XPathExpression;
-import org.jdom2.xpath.XPathFactory;
import org.junit.Before;
import org.junit.Test;
import org.w3c.dom.Document;
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/df2cc164/gateway-release/home/deployments/sample.xml
----------------------------------------------------------------------
diff --git a/gateway-release/home/deployments/sample.xml b/gateway-release/home/deployments/sample.xml
index 15f942a..a16c387 100644
--- a/gateway-release/home/deployments/sample.xml
+++ b/gateway-release/home/deployments/sample.xml
@@ -62,5 +62,13 @@
<role>OOZIE</role>
<url>http://localhost:11000/oozie</url>
</service>
+ <service>
+ <role>HBASE</role>
+ <url>http://localhost:60000/</url>
+ </service>
+ <service>
+ <role>HIVE</role>
+ <url>http://localhost:10000/</url>
+ </service>
</topology>
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/df2cc164/gateway-release/home/samples/ExampleSubmitWorkflow.groovy
----------------------------------------------------------------------
diff --git a/gateway-release/home/samples/ExampleSubmitWorkflow.groovy b/gateway-release/home/samples/ExampleSubmitWorkflow.groovy
index 4dfc367..cb2f8d6 100644
--- a/gateway-release/home/samples/ExampleSubmitWorkflow.groovy
+++ b/gateway-release/home/samples/ExampleSubmitWorkflow.groovy
@@ -23,8 +23,8 @@ import org.apache.hadoop.gateway.shell.workflow.Workflow
import static java.util.concurrent.TimeUnit.SECONDS
gateway = "https://localhost:8443/gateway/sample"
-jobTracker = "sandbox:50300";
-nameNode = "sandbox:8020";
+jobTracker = "localhost:50300";
+nameNode = "localhost:8020";
username = "mapred"
password = "mapred-password"
inputFile = "LICENSE"
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/df2cc164/gateway-release/home/templates/sample.conf
----------------------------------------------------------------------
diff --git a/gateway-release/home/templates/sample.conf b/gateway-release/home/templates/sample.conf
index 0c3454c..7797f17 100644
--- a/gateway-release/home/templates/sample.conf
+++ b/gateway-release/home/templates/sample.conf
@@ -69,6 +69,10 @@
<value>http://localhost:11000/oozie</value>
</property>
<property>
+ <name>topology.service.HBASE..url</name>
+ <value>http://localhost:60000</value>
+ </property>
+ <property>
<name>topology.service.HIVE..url</name>
<value>http://localhost:10000</value>
</property>
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/df2cc164/gateway-release/home/templates/sample.xml
----------------------------------------------------------------------
diff --git a/gateway-release/home/templates/sample.xml b/gateway-release/home/templates/sample.xml
index 15f942a..5c6891d 100644
--- a/gateway-release/home/templates/sample.xml
+++ b/gateway-release/home/templates/sample.xml
@@ -62,5 +62,13 @@
<role>OOZIE</role>
<url>http://localhost:11000/oozie</url>
</service>
+ <service>
+ <role>HBASE</role>
+ <url>http://localhost:60080/</url>
+ </service>
+ <service>
+ <role>HIVE</role>
+ <url>http://localhost:10000/</url>
+ </service>
</topology>
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/df2cc164/gateway-release/home/templates/topology.xml
----------------------------------------------------------------------
diff --git a/gateway-release/home/templates/topology.xml b/gateway-release/home/templates/topology.xml
index 1ef62a9..41de7f7 100644
--- a/gateway-release/home/templates/topology.xml
+++ b/gateway-release/home/templates/topology.xml
@@ -44,19 +44,31 @@
</param>
</provider>
<provider>
- <role>identity-assertion</role>
- <enabled>true</enabled>
- <name>Pseudo</name>
+ <role>identity-assertion</role>
+ <enabled>true</enabled>
+ <name>Pseudo</name>
</provider>
</gateway>
<service>
<role>NAMENODE</role>
- <url>http://vm:50070/webhdfs/v1</url>
+ <url>http://localhost:50070/webhdfs/v1</url>
</service>
<service>
<role>TEMPLETON</role>
- <url>http://vm:50111/templeton/v1</url>
+ <url>http://localhost:50111/templeton/v1</url>
+ </service>
+ <service>
+ <role>OOZIE</role>
+ <url>http://localhost:11000/oozie</url>
+ </service>
+ <service>
+ <role>HBASE</role>
+ <url>http://localhost:60080</url>
+ </service>
+ <service>
+ <role>HIVE</role>
+ <url>http://localhost:10000</url>
</service>
</topology>
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/df2cc164/gateway-release/home/templates/workflow-configuration.xml
----------------------------------------------------------------------
diff --git a/gateway-release/home/templates/workflow-configuration.xml b/gateway-release/home/templates/workflow-configuration.xml
index 6c06a73..eff0103 100644
--- a/gateway-release/home/templates/workflow-configuration.xml
+++ b/gateway-release/home/templates/workflow-configuration.xml
@@ -20,17 +20,17 @@ limitations under the License.
<property>
<name>jobTracker</name>
<value>REPLACE.JOBTRACKER.RPCHOSTPORT</value>
- <!-- Example: <value>sandbox:50300</value> -->
+ <!-- Example: <value>localhost:50300</value> -->
</property>
<property>
<name>nameNode</name>
<value>hdfs://REPLACE.NAMENODE.RPCHOSTPORT</value>
- <!-- Example: <value>hdfs://sandbox:8020</value> -->
+ <!-- Example: <value>hdfs://localhost:8020</value> -->
</property>
<property>
<name>oozie.wf.application.path</name>
<value>hdfs://REPLACE.NAMENODE.RPCHOSTPORT/tmp/test</value>
- <!-- Example: <value>hdfs://sandbox:8020/tmp/test</value> -->
+ <!-- Example: <value>hdfs://localhost:8020/tmp/test</value> -->
</property>
<property>
<name>user.name</name>
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/df2cc164/gateway-release/src/assembly.xml
----------------------------------------------------------------------
diff --git a/gateway-release/src/assembly.xml b/gateway-release/src/assembly.xml
index 24cae78..9a5cf72 100644
--- a/gateway-release/src/assembly.xml
+++ b/gateway-release/src/assembly.xml
@@ -64,7 +64,7 @@
</dependencySet>
<dependencySet>
<outputDirectory>bin</outputDirectory>
- <outputFileNameMapping>server.jar</outputFileNameMapping>
+ <outputFileNameMapping>gateway.jar</outputFileNameMapping>
<includes>
<include>${gateway-group}:gateway-server-launcher</include>
</includes>
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/df2cc164/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 c6a9567..1e3f2be 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
@@ -35,7 +35,7 @@ import java.util.List;
public class HbaseDeploymentContributor extends ServiceDeploymentContributorBase {
- private static final String EXTERNAL_PATH = "/hbase/api";
+ private static final String EXTERNAL_PATH = "/hbase/api/v1";
private static final String CLUSTER_URL_FUNCTION = "{gateway.url}";
@Override
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/df2cc164/gateway-service-hive/src/main/java/org/apache/hadoop/gateway/hive/HiveDeploymentContributor.java
----------------------------------------------------------------------
diff --git a/gateway-service-hive/src/main/java/org/apache/hadoop/gateway/hive/HiveDeploymentContributor.java b/gateway-service-hive/src/main/java/org/apache/hadoop/gateway/hive/HiveDeploymentContributor.java
index f11ceff..59d247c 100644
--- a/gateway-service-hive/src/main/java/org/apache/hadoop/gateway/hive/HiveDeploymentContributor.java
+++ b/gateway-service-hive/src/main/java/org/apache/hadoop/gateway/hive/HiveDeploymentContributor.java
@@ -31,7 +31,7 @@ public class HiveDeploymentContributor extends ServiceDeploymentContributorBase
private static final String ROLE = "HIVE";
private static final String NAME = "hive";
- private static final String EXTERNAL_PATH = "/hive";
+ private static final String EXTERNAL_PATH = "/hive/api/vi";
@Override
public String getRole() {
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/df2cc164/gateway-shell/src/main/java/org/apache/hadoop/gateway/shell/workflow/Example.groovy
----------------------------------------------------------------------
diff --git a/gateway-shell/src/main/java/org/apache/hadoop/gateway/shell/workflow/Example.groovy b/gateway-shell/src/main/java/org/apache/hadoop/gateway/shell/workflow/Example.groovy
index c67e8e4..86a97c7 100644
--- a/gateway-shell/src/main/java/org/apache/hadoop/gateway/shell/workflow/Example.groovy
+++ b/gateway-shell/src/main/java/org/apache/hadoop/gateway/shell/workflow/Example.groovy
@@ -24,8 +24,8 @@ import com.jayway.jsonpath.JsonPath
import org.apache.hadoop.gateway.shell.Hadoop
gateway = "https://localhost:8443/gateway/sample"
-jobTracker = "sandbox:50300";
-nameNode = "sandbox:8020";
+jobTracker = "localhost:50300";
+nameNode = "localhost:8020";
username = "mapred"
password = "mapred-password"
inputFile = "LICENSE"
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/df2cc164/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 66c9555..138479c 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
@@ -129,8 +129,8 @@ public class GatewayBasicFuncTest {
// TaskTracker: UI:50060, 127.0.0.1:0
driver.setupService( "TEMPLETON", "http://" + TEST_HOST + ":50111/templeton/v1", "/cluster/templeton/api/v1", USE_MOCK_SERVICES );
driver.setupService( "OOZIE", "http://" + TEST_HOST + ":11000/oozie", "/cluster/oozie/api", USE_MOCK_SERVICES );
- driver.setupService( "HIVE", "http://" + TEST_HOST + ":10000", "/cluster/hive", USE_MOCK_SERVICES );
- driver.setupService( "HBASE", "http://" + TEST_HOST + ":2707", "/cluster/hbase/api", USE_MOCK_SERVICES );
+ driver.setupService( "HIVE", "http://" + TEST_HOST + ":10000", "/cluster/hive/api/vi", USE_MOCK_SERVICES );
+ driver.setupService( "HBASE", "http://" + TEST_HOST + ":2707", "/cluster/hbase/api/v1", USE_MOCK_SERVICES );
driver.setupGateway( config, "cluster", createTopology(), USE_GATEWAY );
}
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/df2cc164/hsso-release/home/deployments/sample.xml
----------------------------------------------------------------------
diff --git a/hsso-release/home/deployments/sample.xml b/hsso-release/home/deployments/sample.xml
index fe0d038..4f840d4 100644
--- a/hsso-release/home/deployments/sample.xml
+++ b/hsso-release/home/deployments/sample.xml
@@ -32,15 +32,23 @@
<service>
<role>NAMENODE</role>
- <url>http://vm:50070/webhdfs/v1</url>
+ <url>http://localhost:50070/webhdfs/v1</url>
</service>
<service>
<role>TEMPLETON</role>
- <url>http://vm:50111/templeton/v1</url>
+ <url>http://localhost:50111/templeton/v1</url>
</service>
<service>
<role>OOZIE</role>
- <url>http://vm:11000/oozie</url>
+ <url>http://localhost:11000/oozie</url>
+ </service>
+ <service>
+ <role>HBASE</role>
+ <url>http://localhost:60080</url>
+ </service>
+ <service>
+ <role>HIVE</role>
+ <url>http://localhost:10000</url>
</service>
</topology>
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/df2cc164/hsso-release/home/templates/topology.xml
----------------------------------------------------------------------
diff --git a/hsso-release/home/templates/topology.xml b/hsso-release/home/templates/topology.xml
index 1ef62a9..a7939d4 100644
--- a/hsso-release/home/templates/topology.xml
+++ b/hsso-release/home/templates/topology.xml
@@ -52,11 +52,23 @@
<service>
<role>NAMENODE</role>
- <url>http://vm:50070/webhdfs/v1</url>
+ <url>http://localhost:50070/webhdfs/v1</url>
</service>
<service>
<role>TEMPLETON</role>
- <url>http://vm:50111/templeton/v1</url>
+ <url>http://localhost:50111/templeton/v1</url>
+ </service>
+ <service>
+ <role>OOZIE</role>
+ <url>http://localhost:11000/oozie</url>
+ </service>
+ <service>
+ <role>HBASE</role>
+ <url>http://localhost:60080</url>
+ </service>
+ <service>
+ <role>HIVE</role>
+ <url>http://localhost:10000</url>
</service>
</topology>
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/df2cc164/hsso-release/home/templates/workflow-configuration.xml
----------------------------------------------------------------------
diff --git a/hsso-release/home/templates/workflow-configuration.xml b/hsso-release/home/templates/workflow-configuration.xml
index a35000d..66bee24 100644
--- a/hsso-release/home/templates/workflow-configuration.xml
+++ b/hsso-release/home/templates/workflow-configuration.xml
@@ -20,17 +20,17 @@ limitations under the License.
<property>
<name>jobTracker</name>
<value>REPLACE.JOBTRACKER.RPCHOSTPORT</value>
- <!-- Example: <value>sandbox:50300</value> -->
+ <!-- Example: <value>localhost:50300</value> -->
</property>
<property>
<name>nameNode</name>
<value>hdfs://REPLACE.NAMENODE.RPCHOSTPORT</value>
- <!-- Example: <value>hdfs://sandbox:8020</value> -->
+ <!-- Example: <value>hdfs://localhost:8020</value> -->
</property>
<property>
<name>oozie.wf.application.path</name>
<value>hdfs://REPLACE.NAMENODE.RPCHOSTPORT/tmp/test</value>
- <!-- Example: <value>hdfs://sandbox:8020/tmp/test</value> -->
+ <!-- Example: <value>hdfs://localhost:8020/tmp/test</value> -->
</property>
<property>
<name>user.name</name>
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/df2cc164/hsso-release/src/assembly.xml
----------------------------------------------------------------------
diff --git a/hsso-release/src/assembly.xml b/hsso-release/src/assembly.xml
index e3a5fb8..48d57b5 100644
--- a/hsso-release/src/assembly.xml
+++ b/hsso-release/src/assembly.xml
@@ -63,7 +63,7 @@
</dependencySet>
<dependencySet>
<outputDirectory>bin</outputDirectory>
- <outputFileNameMapping>server.jar</outputFileNameMapping>
+ <outputFileNameMapping>hsso.jar</outputFileNameMapping>
<includes>
<include>${gateway-group}:gateway-server-launcher</include>
</includes>
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/df2cc164/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 4d27ca3..21c3d6a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -694,16 +694,6 @@
<artifactId>jericho-html</artifactId>
<version>3.2</version>
</dependency>
- <dependency>
- <groupId>org.jdom</groupId>
- <artifactId>jdom2</artifactId>
- <version>2.0.5</version>
- </dependency>
- <dependency>
- <groupId>jaxen</groupId>
- <artifactId>jaxen</artifactId>
- <version>1.1.4</version>
- </dependency>
<dependency>
<groupId>${gateway-group}</groupId>