You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@eagle.apache.org by ha...@apache.org on 2016/04/13 14:37:50 UTC

incubator-eagle git commit: [EAGLE-196] eagle-topology.sh supports jar file path as parameter

Repository: incubator-eagle
Updated Branches:
  refs/heads/master 48b595251 -> 4bcf78abc


[EAGLE-196] eagle-topology.sh supports jar file path as parameter

https://issues.apache.org/jira/browse/EAGLE-196

Add optional parameter --jar in EAGLE-HOME/bin/eagle-topology.sh

Author: Zhao, Qingwen <qi...@ebay.com>

Closes #147 from qingwen220/EAGLE-196.


Project: http://git-wip-us.apache.org/repos/asf/incubator-eagle/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-eagle/commit/4bcf78ab
Tree: http://git-wip-us.apache.org/repos/asf/incubator-eagle/tree/4bcf78ab
Diff: http://git-wip-us.apache.org/repos/asf/incubator-eagle/diff/4bcf78ab

Branch: refs/heads/master
Commit: 4bcf78abcb67836d3b7b204ecb81f9701a76e45f
Parents: 48b5952
Author: Zhao, Qingwen <qi...@ebay.com>
Authored: Wed Apr 13 20:37:41 2016 +0800
Committer: Hao Chen <ha...@apache.org>
Committed: Wed Apr 13 20:37:41 2016 +0800

----------------------------------------------------------------------
 eagle-assembly/src/main/bin/eagle-topology.sh | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/4bcf78ab/eagle-assembly/src/main/bin/eagle-topology.sh
----------------------------------------------------------------------
diff --git a/eagle-assembly/src/main/bin/eagle-topology.sh b/eagle-assembly/src/main/bin/eagle-topology.sh
index e1104ac..06cd7e5 100755
--- a/eagle-assembly/src/main/bin/eagle-topology.sh
+++ b/eagle-assembly/src/main/bin/eagle-topology.sh
@@ -22,13 +22,14 @@ TOPOLOGY_NAME_SET=0
 function print_help() {
 	echo "Usage: $0 options {start | stop | status}"
 	echo "Options:                       Description:"
-	echo "  --main     <main class>        Default is org.apache.eagle.security.auditlog.HdfsAuditLogProcessorMain"
-	echo "  --topology <topology name>     Default is sandbox-hdfsAuditLog-topology"
-	echo "  --config   <file path>         Default is $EAGLE_HOME/conf/sandbox-hdfsAuditLog-application.conf"
+	echo "  --jar      <fatJar path>       (Optional) Default is ${EAGLE_HOME}/lib/topology/eagle-topology-*-assembly.jar"
+	echo "  --main     <main class>        for example: org.apache.eagle.security.auditlog.HdfsAuditLogProcessorMain"
+	echo "  --topology <topology name>     for example: sandbox-hdfsAuditLog-topology"
+	echo "  --config   <file path>         for example: $EAGLE_HOME/conf/sandbox-hdfsAuditLog-application.conf"
 	echo "  --storm-ui <storm ui url>      Execute through storm UI API, default: http://localhost:8744"
 
 	echo "Command Examples:"
-	echo "  $0 --main <mainClass> [--topology <topologyName>] --config <filePath> start"
+	echo "  $0 --main <mainClass> --topology <topologyName> --config <filePath> start"
 	echo "  $0 --topology <topologyName> stop"
 	echo "  $0 --topology <topologyName> status"
 }
@@ -63,6 +64,14 @@ case $1 in
         cmd=$1
         shift
         ;;
+    --jar)
+        if [ $# -lt 3 ]; then
+            print_help
+            exit 1
+        fi
+        jarName=$2
+        shift 2
+        ;;
     --main)
         if [ $# -lt 3 ]; then
             print_help
@@ -101,11 +110,8 @@ case $1 in
 done
 
 
-jarName=$(ls ${EAGLE_HOME}/lib/topology/eagle-topology-*-assembly.jar)
-
 if [ -z "$jarName" ]; then
-    echo "Error: jar file is not found"
-    exit 1
+    jarName=$(ls ${EAGLE_HOME}/lib/topology/eagle-topology-*-assembly.jar)
 fi
 
 if [ -z "$mainClass" ]; then