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 18:27:43 UTC
git commit: KNOX-42 - Missed a few /api/ references. Fixes RAT build
error.
Updated Branches:
refs/heads/master 209d23bcd -> 4d3cb03bc
KNOX-42 - Missed a few /api/ references. Fixes RAT build error.
Project: http://git-wip-us.apache.org/repos/asf/incubator-knox/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-knox/commit/4d3cb03b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-knox/tree/4d3cb03b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-knox/diff/4d3cb03b
Branch: refs/heads/master
Commit: 4d3cb03bc436231b09d7545f18199027f5afe46f
Parents: 209d23b
Author: Kevin Minder <ke...@hortonworks.com>
Authored: Tue Sep 24 12:27:38 2013 -0400
Committer: Kevin Minder <ke...@hortonworks.com>
Committed: Tue Sep 24 12:27:38 2013 -0400
----------------------------------------------------------------------
gateway-release/home/INSTALL | 4 ++--
.../sandbox-with-knox-inside/HiveJDBCSample.groovy | 2 +-
.../hive/groovy/jdbc/sandbox/HiveJDBCSample.groovy | 2 +-
.../sandbox-with-knox-inside/HiveJDBCSample.java | 2 +-
gateway-release/home/samples/hive/sample.log | 15 +++++++++++++++
.../org/apache/hadoop/gateway/GatewayServer.xml | 2 +-
.../hadoop/gateway/util/urltemplate/MatcherTest.java | 2 +-
hsso-release/home/INSTALL | 4 ++--
8 files changed, 24 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/4d3cb03b/gateway-release/home/INSTALL
----------------------------------------------------------------------
diff --git a/gateway-release/home/INSTALL b/gateway-release/home/INSTALL
index 965aae7..8d870a0 100644
--- a/gateway-release/home/INSTALL
+++ b/gateway-release/home/INSTALL
@@ -87,14 +87,14 @@ Installation and Deployment Instructions
topology file. Note that the name of the file excluding the extension
is also used as the path for that cluster in the URL. So for example
the sample.xml file will result in Gateway URLs of the form
- http://{gateway-host}:{gateway-port}/gateway/sandbox/webhdfs/api/v1
+ http://{gateway-host}:{gateway-port}/gateway/sandbox/webhdfs/v1
6. Test the installation and configuration of your Gateway
Invoke the LISTSATUS operation on HDFS represented by your configured
WEBHDFS by using your web browser or curl:
curl -i -k -u guest:guest-password -X GET \
- 'https://localhost:8443/gateway/sandbox/webhdfs/api/v1/?op=LISTSTATUS'
+ 'https://localhost:8443/gateway/sandbox/webhdfs/v1/?op=LISTSTATUS'
The results of the above command should result in something to along the
lines of the output below. The exact information returned is subject to
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/4d3cb03b/gateway-release/home/samples/hive/groovy/jdbc/sandbox-with-knox-inside/HiveJDBCSample.groovy
----------------------------------------------------------------------
diff --git a/gateway-release/home/samples/hive/groovy/jdbc/sandbox-with-knox-inside/HiveJDBCSample.groovy b/gateway-release/home/samples/hive/groovy/jdbc/sandbox-with-knox-inside/HiveJDBCSample.groovy
index 24e7daa..01f2af7 100644
--- a/gateway-release/home/samples/hive/groovy/jdbc/sandbox-with-knox-inside/HiveJDBCSample.groovy
+++ b/gateway-release/home/samples/hive/groovy/jdbc/sandbox-with-knox-inside/HiveJDBCSample.groovy
@@ -21,7 +21,7 @@ user = "guest";
password = user + "-password";
gatewayHost = "localhost";
gatewayPort = 8443;
-contextPath = "gateway/sandbox-with-knox-inside/hive/api/v1";
+contextPath = "gateway/sandbox-with-knox-inside/hive";
connectionString = String.format( "jdbc:hive2://%s:%d/?hive.server2.servermode=https;hive.server2.http.path=%s", gatewayHost, gatewayPort, contextPath );
// Load Hive JDBC Driver
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/4d3cb03b/gateway-release/home/samples/hive/groovy/jdbc/sandbox/HiveJDBCSample.groovy
----------------------------------------------------------------------
diff --git a/gateway-release/home/samples/hive/groovy/jdbc/sandbox/HiveJDBCSample.groovy b/gateway-release/home/samples/hive/groovy/jdbc/sandbox/HiveJDBCSample.groovy
index cf8b5ce..09e58a6 100644
--- a/gateway-release/home/samples/hive/groovy/jdbc/sandbox/HiveJDBCSample.groovy
+++ b/gateway-release/home/samples/hive/groovy/jdbc/sandbox/HiveJDBCSample.groovy
@@ -21,7 +21,7 @@ user = "guest";
password = user + "-password";
gatewayHost = "localhost";
gatewayPort = 8443;
-contextPath = "gateway/sandbox/hive/api/v1";
+contextPath = "gateway/sandbox/hive";
connectionString = String.format( "jdbc:hive2://%s:%d/?hive.server2.servermode=https;hive.server2.http.path=%s", gatewayHost, gatewayPort, contextPath );
// Load Hive JDBC Driver
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/4d3cb03b/gateway-release/home/samples/hive/java/jdbc/sandbox-with-knox-inside/HiveJDBCSample.java
----------------------------------------------------------------------
diff --git a/gateway-release/home/samples/hive/java/jdbc/sandbox-with-knox-inside/HiveJDBCSample.java b/gateway-release/home/samples/hive/java/jdbc/sandbox-with-knox-inside/HiveJDBCSample.java
index 3d6154a..3562952 100644
--- a/gateway-release/home/samples/hive/java/jdbc/sandbox-with-knox-inside/HiveJDBCSample.java
+++ b/gateway-release/home/samples/hive/java/jdbc/sandbox-with-knox-inside/HiveJDBCSample.java
@@ -37,7 +37,7 @@ public class HiveJDBCSample {
String password = user + "-password";
String gatewayHost = "localhost";
int gatewayPort = 8443;
- String contextPath = "gateway/sandbox-with-knox-inside/hive/api/v1";
+ String contextPath = "gateway/sandbox-with-knox-inside/hive";
String connectionString = String.format( "jdbc:hive2://%s:%d/?hive.server2.servermode=https;hive.server2.http.path=%s", gatewayHost, gatewayPort, contextPath );
// Load Hive JDBC Driver
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/4d3cb03b/gateway-release/home/samples/hive/sample.log
----------------------------------------------------------------------
diff --git a/gateway-release/home/samples/hive/sample.log b/gateway-release/home/samples/hive/sample.log
index 9a63b67..6f8dfa6 100644
--- a/gateway-release/home/samples/hive/sample.log
+++ b/gateway-release/home/samples/hive/sample.log
@@ -1,3 +1,18 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
2012-02-03 18:35:34 SampleClass6 [INFO] everything normal for id 577725851
2012-02-03 18:35:34 SampleClass4 [FATAL] system problem at id 1991281254
2012-02-03 18:35:34 SampleClass3 [DEBUG] detail for id 1304807656
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/4d3cb03b/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 0075a04..8f4f57d 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
@@ -53,7 +53,7 @@
<service>
<name>WEBHCAT</name>
- <source>/templeton/api/{path=**}?{**}</source>
+ <source>/templeton/{path=**}?{**}</source>
<target>http://{templeton.address}/templeton/{path=**}?{**}</target>
<filter>
<name>shiro</name>
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/4d3cb03b/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 03dcb19..cbd2af5 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
@@ -659,7 +659,7 @@ public class MatcherTest {
// assertThat( (String)match.getValue(), is( "test-value-2" ) );
//
// stringMatcher = new Matcher<String>();
-// template = Parser.parse( "*://*:*/**/datanode/api/v1/{path=**}?host={host=*}&port={port=*}&{**=*}" );
+// template = Parser.parse( "*://*:*/**/webhdfs/data/v1/{path=**}?host={host=*}&port={port=*}&{**=*}" );
// stringMatcher.add( template, "test-value-C" );
// template = Parser.parse( "*://*:*/**/webhdfs/v1/{path=**}?{**=*}" );
// stringMatcher.add( template, "test-value-B" );
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/4d3cb03b/hsso-release/home/INSTALL
----------------------------------------------------------------------
diff --git a/hsso-release/home/INSTALL b/hsso-release/home/INSTALL
index 679f601..66a3dea 100644
--- a/hsso-release/home/INSTALL
+++ b/hsso-release/home/INSTALL
@@ -87,14 +87,14 @@ Installation and Deployment Instructions
topology file. Note that the name of the file excluding the extension
is also used as the path for that cluster in the URL. So for example
the sample.xml file will result in Gateway URLs of the form
- http://{gateway-host}:{gateway-port}/gateway/sandbox/webhdfs/api/v1
+ http://{gateway-host}:{gateway-port}/gateway/sandbox/webhdfs/v1
6. Test the installation and configuration of your Gateway
Invoke the LISTSATUS operation on HDFS represented by your configured
WEBHDFS by using your web browser or curl:
curl -i -k -u guest:guest-password -X GET \
- 'https://localhost:8443/gateway/sandbox/webhdfs/api/v1/?op=LISTSTATUS'
+ 'https://localhost:8443/gateway/sandbox/webhdfs/v1/?op=LISTSTATUS'
The results of the above command should result in something to along the
lines of the output below. The exact information returned is subject to