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/14 22:56:53 UTC
git commit: Integrated shell into release builds.
Updated Branches:
refs/heads/master 9f1eafbe2 -> e09ea97d1
Integrated shell into release builds.
Project: http://git-wip-us.apache.org/repos/asf/incubator-knox/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-knox/commit/e09ea97d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-knox/tree/e09ea97d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-knox/diff/e09ea97d
Branch: refs/heads/master
Commit: e09ea97d130c6f8be986723028442131552ac319
Parents: 9f1eafb
Author: Kevin Minder <ke...@hortonworks.com>
Authored: Thu Mar 14 17:56:48 2013 -0400
Committer: Kevin Minder <ke...@hortonworks.com>
Committed: Thu Mar 14 17:56:48 2013 -0400
----------------------------------------------------------------------
build.xml | 4 +
.../org/apache/hadoop/gateway/shell/KnoxShell.java | 25 ++--
.../apache/hadoop/gateway/shell/hadoop/Hadoop.java | 4 +-
gateway-site/src/site/apt/not-index.apt | 112 ---------------
gateway-site/src/site/site.xml | 4 +-
pom.xml | 4 +-
6 files changed, 21 insertions(+), 132 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/e09ea97d/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 93724c2..bdcea12 100644
--- a/build.xml
+++ b/build.xml
@@ -55,6 +55,10 @@
dir="gateway-release/target"
includes="gateway-release-${version}.jar"
fullpath="${gateway_home}/bin/gateway-${version}.jar"/>
+ <zipfileset
+ dir="gateway-shell/target"
+ includes="gateway-shell-${version}.jar"
+ fullpath="${gateway_home}/bin/shell-${version}.jar"/>
</zip>
</target>
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/e09ea97d/gateway-shell/src/main/java/org/apache/hadoop/gateway/shell/KnoxShell.java
----------------------------------------------------------------------
diff --git a/gateway-shell/src/main/java/org/apache/hadoop/gateway/shell/KnoxShell.java b/gateway-shell/src/main/java/org/apache/hadoop/gateway/shell/KnoxShell.java
index 3ed96a9..2ade99a 100644
--- a/gateway-shell/src/main/java/org/apache/hadoop/gateway/shell/KnoxShell.java
+++ b/gateway-shell/src/main/java/org/apache/hadoop/gateway/shell/KnoxShell.java
@@ -19,32 +19,29 @@ package org.apache.hadoop.gateway.shell;
import org.codehaus.groovy.tools.shell.AnsiDetector;
import org.codehaus.groovy.tools.shell.Groovysh;
-import org.codehaus.groovy.tools.shell.IO;
import org.fusesource.jansi.Ansi;
import org.fusesource.jansi.AnsiConsole;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+
public class KnoxShell {
static {
AnsiConsole.systemInstall();
Ansi.setDetector( new AnsiDetector() );
+ System.setProperty( "groovysh.prompt", "knox" );
}
public static void main( String... args ) {
+ StringWriter buffer = new StringWriter();
+ PrintWriter imports = new PrintWriter( buffer );
+ imports.println( "import org.apache.hadoop.gateway.shell.hadoop.Hadoop;" );
+ imports.println( "import org.apache.hadoop.gateway.shell.hdfs.Hdfs;" );
+ imports.println( "import org.apache.hadoop.gateway.shell.job.Job;" );
+ imports.println( "import org.apache.hadoop.gateway.shell.workflow.Workflow;" );
Groovysh shell = new Groovysh();
- shell.execute( "import org.apache.commons.io.FileUtils" );
- shell.execute( "import static org.apache.commons.io.FileUtils.*" );
- shell.execute( "import com.jayway.restassured.RestAssured" );
- shell.execute( "import static com.jayway.restassured.RestAssured.*" );
- shell.execute( "import com.jayway.restassured.path.json.JsonPath" );
- shell.execute( "import static com.jayway.restassured.path.json.JsonPath.*" );
- shell.execute( "import org.apache.hadoop.gateway.shell.hadoop.Hadoop" );
- shell.execute( "import org.apache.hadoop.gateway.shell.hdfs.Hdfs" );
- shell.execute( "import static org.apache.hadoop.gateway.shell.hdfs.Hdfs.*" );
- shell.execute( "import org.apache.hadoop.gateway.shell.job.Job" );
- shell.execute( "import static org.apache.hadoop.gateway.shell.job.Job.*" );
- shell.execute( "import org.apache.hadoop.gateway.shell.workflow.Workflow" );
- shell.execute( "import static org.apache.hadoop.gateway.shell.workflow.Workflow.*" );
+ shell.execute( buffer.toString() );
shell.run( args );
}
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/e09ea97d/gateway-shell/src/main/java/org/apache/hadoop/gateway/shell/hadoop/Hadoop.java
----------------------------------------------------------------------
diff --git a/gateway-shell/src/main/java/org/apache/hadoop/gateway/shell/hadoop/Hadoop.java b/gateway-shell/src/main/java/org/apache/hadoop/gateway/shell/hadoop/Hadoop.java
index 1214709..9a994d8 100644
--- a/gateway-shell/src/main/java/org/apache/hadoop/gateway/shell/hadoop/Hadoop.java
+++ b/gateway-shell/src/main/java/org/apache/hadoop/gateway/shell/hadoop/Hadoop.java
@@ -35,8 +35,8 @@ public class Hadoop {
}
public RequestSpecification request() {
- return with().log().all().auth().preemptive().basic( username, password );
- //return with().auth().preemptive().basic( username, password );
+ //return with().log().all().auth().preemptive().basic( username, password );
+ return with().auth().preemptive().basic( username, password );
}
public ResponseSpecification response() {
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/e09ea97d/gateway-site/src/site/apt/not-index.apt
----------------------------------------------------------------------
diff --git a/gateway-site/src/site/apt/not-index.apt b/gateway-site/src/site/apt/not-index.apt
deleted file mode 100644
index cf14f79..0000000
--- a/gateway-site/src/site/apt/not-index.apt
+++ /dev/null
@@ -1,112 +0,0 @@
-~~ 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.
-~~
-Introduction
-
- Apache Ambari is a web-based tool for provisioning, managing, and monitoring Apache Hadoop clusters. The set of
- Hadoop components that are currently supported by Ambari includes:
-
- * {{{http://hadoop.apache.org/docs/hdfs} Apache Hadoop - HDFS}}
-
- * {{{http://hadoop.apache.org/docs/mapreduce} Apache Hadoop - MapReduce}}
-
- * {{{http://hive.apache.org} Apache Hive}}
-
- * {{{http://incubator.apache.org/hcatalog} Apache HCatalog}}
-
- * {{{http://hbase.apache.org} Apache HBase}}
-
- * {{{http://zookeeper.apache.org} Apache Zookeeper}}
-
- * {{{http://incubator.apache.org/oozie/} Apache Oozie}}
-
- * {{{http://pig.apache.org} Apache Pig}}
-
- * {{{http://sqoop.apache.org} Apache Sqoop}}
-
- []
-
- Ambari enables System Administrators to:
-
- * Provision a Hadoop Cluster
-
- * Ambari provides an easy-to-use, step-by-step wizard for installing Hadoop services across any number of hosts.
-
- * Ambari handles configuration of Hadoop services for the cluster.
-
- []
-
- * Manage a Hadoop Cluster
-
- * Ambari provides central management for starting, stopping, and reconfiguring Hadoop services across the entire cluster.
-
- []
-
- * Monitor a Hadoop Cluster
-
- * Ambari provides a dashboard for monitoring health and status of the Hadoop cluster.
-
- * Ambari leverages {{{http://ganglia.sourceforge.net/} Ganglia}} for metrics collection.
-
- * Ambari leverages {{{http://www.nagios.org/} Nagios}} for system alerting and will send emails when your attention is needed (e.g., a node goes down, remaining disk space is low, etc).
-
- []
-
-Ambari Source
-
- Follow the {{{./1.2.0/installing-hadoop-using-ambari/content/index.html} installation guide for 1.2.0 (stable)}} or check out the work going on in {{{./whats-new.html} trunk}} for the upcoming 1.2.1 release.
-
-Roadmap
-
- * Support for additional Operating Systems
-
- * Ambari currently supports 64-bit RHEL/CentOS 5 + 6 and SLES 11
-
- []
-
- * RESTful API for integration
-
- * Ambari will expose a unified, RESTful API to enable third-party applications to integrate
- Hadoop cluster management and monitoring capabilities (1.2.0)
-
- []
-
- * Granular configurations
-
- * Ambari currently applies service configurations at the cluster-level. For more
- flexibility, Ambari will allow for configurations in a more granular manner, such as
- applying a set of configurations to a specific group of hosts.
-
- []
-
- * Security
-
- * Installation of secure Hadoop clusters (Kerberos-based)
-
- * Role-based user authentication, authorization, and auditing
-
- * Support for LDAP and Active Directory (1.2.0)
-
- []
-
- * Visualization
-
- * Interactive visualization of the current state of the cluster for a number of key metrics (1.2.0)
-
- * Interactive visualization of historical states of the cluster for a number of key metrics
-
- * Interactive visualization of Pig, Hive, and MapReduce jobs (1.2.0)
-
- []
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/e09ea97d/gateway-site/src/site/site.xml
----------------------------------------------------------------------
diff --git a/gateway-site/src/site/site.xml b/gateway-site/src/site/site.xml
index bcdab2d..3ea04cf 100644
--- a/gateway-site/src/site/site.xml
+++ b/gateway-site/src/site/site.xml
@@ -79,8 +79,8 @@
</head>
<links>
+ <item name="Git" href="https://git-wip-us.apache.org/repos/asf/incubator-knox.git" />
<item name="Jira" href="https://issues.apache.org/jira/browse/KNOX" />
- <item name="SVN" href="https://svn.apache.org/repos/asf/incubator/knox/" />
<item name="Wiki" href="https://cwiki.apache.org/confluence/display/KNOX/Knox" />
</links>
@@ -108,7 +108,7 @@
</menu>
<menu name="Resources">
- <item name="Source Code" href="https://svn.apache.org/repos/asf/incubator/knox/"/>
+ <item name="Source Code" href="https://git-wip-us.apache.org/repos/asf/incubator-knox.git"/>
<item name="Project Team" href="team-list.html"/>
<item name="Mailing Lists" href="mail-lists.html"/>
<item name="Issue Tracking" href="issue-tracking.html"/>
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/e09ea97d/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 1ccc1a1..0ddf45d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,8 +61,8 @@
<module>gateway-release</module>
<module>gateway-test</module>
<module>gateway-demo</module>
+ <module>gateway-shell</module>
<module>gateway-site</module>
- <!-- <module>gateway-shell</module> -->
</modules>
<properties>
@@ -85,7 +85,7 @@
</organization>
<scm>
- <connection>scm:git:git://@github.com/hortonworks/knox.git</connection>
+ <connection>scm:git:git://git-wip-us.apache.org/repos/asf/incubator-knox.git</connection>
</scm>
<build>