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/03/27 19:16:24 UTC
git commit: Dog bugs found while testing.
Updated Branches:
refs/heads/master b83a1df39 -> 128e4613c
Dog bugs found while testing.
Project: http://git-wip-us.apache.org/repos/asf/incubator-knox/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-knox/commit/128e4613
Tree: http://git-wip-us.apache.org/repos/asf/incubator-knox/tree/128e4613
Diff: http://git-wip-us.apache.org/repos/asf/incubator-knox/diff/128e4613
Branch: refs/heads/master
Commit: 128e4613cdcc0b5a8c46dc8526969682fba09cc0
Parents: b83a1df
Author: Kevin Minder <ke...@hortonworks.com>
Authored: Wed Mar 27 14:16:19 2013 -0400
Committer: Kevin Minder <ke...@hortonworks.com>
Committed: Wed Mar 27 14:16:19 2013 -0400
----------------------------------------------------------------------
gateway-release/home/INSTALL | 9 ++++-----
gateway-release/home/ISSUES | 5 ++---
gateway-release/home/LICENSE | 11 ++++++-----
.../org/apache/hadoop/gateway/GatewayServer.java | 2 +-
4 files changed, 13 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/128e4613/gateway-release/home/INSTALL
----------------------------------------------------------------------
diff --git a/gateway-release/home/INSTALL b/gateway-release/home/INSTALL
index f320165..9cab07b 100644
--- a/gateway-release/home/INSTALL
+++ b/gateway-release/home/INSTALL
@@ -24,9 +24,9 @@ Hadoop Cluster:
Installation and Deployment Instructions
------------------------------------------------------------------------------
1. Install
- Download and extract the gateway-0.2.0-SNAPSHOT.zip file into the
+ Download and extract the knox-{VERSION}.zip file into the
installation directory that will contain your GATEWAY_HOME
- jar xf gateway-0.2.0-SNAPSHOT.zip
+ jar xf knox-{VERSION}.zip
This will create a directory 'gateway' in your current directory.
2. Enter Gateway Home directory
@@ -50,7 +50,7 @@ Installation and Deployment Instructions
over if necessary.
c. Start the LDAP server - pointing it to the config dir where it will find
the users.ldif file in the conf directory.
- java -jar bin/ldap-0.2.0-SNAPSHOT.jar conf &
+ java -jar bin/ldap.jar conf &
There are a number of log messages of the form "Created null." that can
safely be ignored. Take note of the port on which it was started as this
needs to match later configuration. This will create a directory named
@@ -58,7 +58,7 @@ Installation and Deployment Instructions
can safely be ignored.
4. Start the Gateway server
- java -jar bin/gateway-server-0.2.0-SNAPSHOT.jar
+ java -jar bin/server.jar
a. Take note of the port identified in the logging output as you will need this for
accessing the gateway.
b. The server will prompt you for the master secret (password). This secret is used
@@ -200,7 +200,6 @@ to be shared across all gateway instances in a cluster. When certs are dedicated
store will not be able to be blindly replicated as hostname verification problems will ensue. Obviously, truststores will
need to be taken into account as well.
-
------------------------------------------------------------------------------
Mapping Gateway URLs to Hadoop cluster URLs
------------------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/128e4613/gateway-release/home/ISSUES
----------------------------------------------------------------------
diff --git a/gateway-release/home/ISSUES b/gateway-release/home/ISSUES
index 290956e..6f43c5d 100644
--- a/gateway-release/home/ISSUES
+++ b/gateway-release/home/ISSUES
@@ -1,9 +1,8 @@
------------------------------------------------------------------------------
Know Issues
------------------------------------------------------------------------------
-The Gateway cannot be be used against either EC2 clusters or Hadoop Sandbox
-VMs unless the gateway is deployed within the EC2 cluster or the on the
-Sandbox VM.
+The Gateway cannot be be used against either EC2 cluster unless the gateway
+is deployed within the EC2.
If the cluster deployment descriptors in {GATEWAY_HOME}/deployments are
incorrect, the errors logged by the gateway are overly detailed and not
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/128e4613/gateway-release/home/LICENSE
----------------------------------------------------------------------
diff --git a/gateway-release/home/LICENSE b/gateway-release/home/LICENSE
index 3b317b5..ee0daeb 100644
--- a/gateway-release/home/LICENSE
+++ b/gateway-release/home/LICENSE
@@ -204,13 +204,14 @@
Apache Knox Subcomponents:
-Apache Knox includes a number of subcomponents with separate copyright notices
-and license terms. Your use of these subcomponents is subject to the terms and
-conditions of the following licenses.
+Apache Knox includes a number of sub-components with separate copyright
+notices and license terms. Your use of these sub-components is subject
+to the terms and conditions of the following licenses.
-For TODO.jar (Jerico)
-
+------------------------------------------------------------------------------
+From Jetty and Jerico
+------------------------------------------------------------------------------
Eclipse Public License - v 1.0
THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/128e4613/gateway-server/src/main/java/org/apache/hadoop/gateway/GatewayServer.java
----------------------------------------------------------------------
diff --git a/gateway-server/src/main/java/org/apache/hadoop/gateway/GatewayServer.java b/gateway-server/src/main/java/org/apache/hadoop/gateway/GatewayServer.java
index eadd35f..ef923da 100644
--- a/gateway-server/src/main/java/org/apache/hadoop/gateway/GatewayServer.java
+++ b/gateway-server/src/main/java/org/apache/hadoop/gateway/GatewayServer.java
@@ -128,7 +128,7 @@ public class GatewayServer {
private static Properties loadBuildProperties() {
Properties properties = new Properties();
- InputStream inputStream = ClassLoader.getSystemResourceAsStream( "build.properties" );
+ InputStream inputStream = GatewayServer.class.getClassLoader().getResourceAsStream( "build.properties" );
if( inputStream != null ) {
try {
properties.load( inputStream );