commit 9d06fc5b7c18160317bf06fc91938d1de25d1e56
author Masayoshi Kobayashi <masayoshi@onlab.us> Thu Jun 20 23:05:30 2013 -0700
committer Masayoshi Kobayashi <masayoshi@onlab.us> Thu Jun 20 23:05:30 2013 -0700
tree 817cee2d7057ba74e09767fee2d290de94927687
parent bc91dc375d44b3074a9760dddb3940233bcd2030

fix for ONOS-147: ONOS starting script (start-onos.sh and start-onos-embedded.sh) can run at any directory

start-onos-embedded.sh

diff --git a/start-onos-embedded.sh b/start-onos-embedded.sh
index fa6bb3a..e75b696 100755
--- a/start-onos-embedded.sh
+++ b/start-onos-embedded.sh
@@ -1,7 +1,8 @@
 #!/bin/bash
 
 # Set paths
-ONOS_HOME=`dirname $0`
+#ONOS_HOME=`dirname $0`
+ONOS_HOME=${HOME}/ONOS
 ONOS_JAR="${ONOS_HOME}/target/floodlight.jar"
 ONOS_ONLY_JAR="${ONOS_HOME}/target/floodlight-only.jar"
 ONOS_LOGBACK="${ONOS_HOME}/logback.xml"
@@ -91,6 +92,8 @@
   #java ${JVM_OPTS} -Dlogback.configurationFile=${ONOS_LOGBACK} -jar ${ONOS_JAR} -cf ${ONOS_HOME}/onos.properties > /dev/null 2>&1 &
   #java ${JVM_OPTS} -Dlogback.configurationFile=${ONOS_LOGBACK} -cp ${CLASSPATH} ${MAIN_CLASS} -cf ${ONOS_HOME}/onos.properties > /dev/n
 
+  # XXX MVN has to run at the project top dir..
+  cd ${ONOS_HOME}
   ${MVN} exec:exec -Dexec.executable="java" -Dexec.args="${JVM_OPTS} -Dlogback.configurationFile=${ONOS_LOGBACK} -cp %classpath ${MAIN_CLASS} -cf ${ONOS_HOME}/conf/onos-embedded.properties" > ${LOGDIR}/onos.stdout 2>${LOGDIR}/onos.stderr &
 
   echo "Waiting for ONOS to start..."

start-onos.sh

diff --git a/start-onos.sh b/start-onos.sh
index 56a8999..9e8d559 100755
--- a/start-onos.sh
+++ b/start-onos.sh
@@ -1,7 +1,8 @@
 #!/bin/bash
 
 # Set paths
-ONOS_HOME=`dirname $0`
+#ONOS_HOME=`dirname $0`
+ONOS_HOME=${HOME}/ONOS
 ONOS_JAR="${ONOS_HOME}/target/floodlight.jar"
 ONOS_ONLY_JAR="${ONOS_HOME}/target/floodlight-only.jar"
 ONOS_LOGBACK="${ONOS_HOME}/logback.xml"
@@ -91,7 +92,8 @@
   #java ${JVM_OPTS} -Dlogback.configurationFile=${ONOS_LOGBACK} -jar ${ONOS_JAR} -cf ${ONOS_HOME}/onos.properties > /dev/null 2>&1 &
   #java ${JVM_OPTS} -Dlogback.configurationFile=${ONOS_LOGBACK} -cp ${CLASSPATH} ${MAIN_CLASS} -cf ${ONOS_HOME}/onos.properties > /dev/n
 
-  echo "mvn exec:exec -Dexec.executable=\"java\" -Dexec.args=\"${JVM_OPTS} -Dlogback.configurationFile=${ONOS_LOGBACK} -cp %classpath ${MAIN_CLASS} -cf ${ONOS_HOME}/conf/onos.properties\""
+  # XXX : MVN has to run at the project top dir 
+  cd ${ONOS_HOME}
   ${MVN} exec:exec -Dexec.executable="java" -Dexec.args="${JVM_OPTS} -Dlogback.configurationFile=${ONOS_LOGBACK} -cp %classpath ${MAIN_CLASS} -cf ${ONOS_HOME}/conf/onos.properties" > ${LOGDIR}/onos.stdout 2>${LOGDIR}/onos.stderr &
 
   echo "Waiting for ONOS to start..."