client IP/port definition in configuration separation

[controller.git] / opendaylight / distribution / opendaylight / src / main / resources / run.sh

diff --git a/opendaylight/distribution/opendaylight/src/main/resources/run.sh b/opendaylight/distribution/opendaylight/src/main/resources/run.sh
index 31bf3c6632158ecc532566c8275fa00e07d28800..3a29f63b81a5ab0d442fae2b6e0c75003d6c2e68 100755 (executable)
--- a/opendaylight/distribution/opendaylight/src/main/resources/run.sh
+++ b/opendaylight/distribution/opendaylight/src/main/resources/run.sh
@@ -11,8 +11,14 @@ fi
 if [[ $platform == 'linux' ]]; then
    fullpath=`readlink -f $0`
 
-   [[ -z ${JAVA_HOME} ]] && [[ -x "/usr/lib/jvm/java-1.7.0" ]] && export JAVA_HOME=`/usr/lib/jvm/java-1.7.0`;
+   if [[ -z ${JAVA_HOME} ]]; then
+      # Find the actual location of the Java launcher:
+      java_launcher=`which java`
+      java_launcher=`readlink -f "${java_launcher}"`
 
+      # Compute the Java home from the location of the Java launcher:
+      export JAVA_HOME="${java_launcher%/bin/java}"
+    fi
 elif [[ $platform == 'osx' ]]; then
    TARGET_FILE=$0
    cd `dirname $TARGET_FILE`
@@ -40,7 +46,17 @@ fi
 [[ ! -x ${JAVA_HOME}/bin/java ]] && echo "Cannot find an executable \
 JVM at path ${JAVA_HOME}/bin/java check your JAVA_HOME" && exit -1;
 
-basedir=`dirname ${fullpath}`
+if [ -z ${ODL_BASEDIR} ]; then
+    basedir=`dirname ${fullpath}`
+else
+    basedir=${ODL_BASEDIR}
+fi
+
+if [ -z ${ODL_DATADIR} ]; then
+    datadir=`dirname ${fullpath}`
+else
+    datadir=${ODL_DATADIR}
+fi
 
 function usage {
     echo "Usage: $0 [-jmx] [-jmxport <num>] [-debug] [-debugsuspend] [-debugport <num>] [-start [<console port>]] [-stop] [-status] [-console] [-help] [<other args will automatically be used for the JVM>]"
@@ -186,11 +202,12 @@ if [ "${startdaemon}" -eq 1 ]; then
         exit -1
     fi
     $JAVA_HOME/bin/java ${extraJVMOpts} \
-        -Djava.io.tmpdir=${basedir}/work/tmp \
+        -Djava.io.tmpdir=${datadir}/work/tmp \
         -Dosgi.install.area=${basedir} \
-        -Dosgi.configuration.area=${basedir}/configuration \
+        -Dosgi.configuration.area=${datadir}/configuration \
         -Dosgi.frameworkClassPath=${FWCLASSPATH} \
         -Dosgi.framework=file:${basedir}/lib/org.eclipse.osgi-3.8.1.v20120830-144521.jar \
+        -Djava.awt.headless=true \
         -classpath ${CLASSPATH} \
         org.eclipse.equinox.launcher.Main \
         -console ${daemonport} \
@@ -203,11 +220,12 @@ elif [ "${consolestart}" -eq 1 ]; then
         exit -1
     fi
     $JAVA_HOME/bin/java ${extraJVMOpts} \
-        -Djava.io.tmpdir=${basedir}/work/tmp \
+        -Djava.io.tmpdir=${datadir}/work/tmp \
         -Dosgi.install.area=${basedir} \
-        -Dosgi.configuration.area=${basedir}/configuration \
+        -Dosgi.configuration.area=${datadir}/configuration \
         -Dosgi.frameworkClassPath=${FWCLASSPATH} \
         -Dosgi.framework=file:${basedir}/lib/org.eclipse.osgi-3.8.1.v20120830-144521.jar \
+        -Djava.awt.headless=true \
         -classpath ${CLASSPATH} \
         org.eclipse.equinox.launcher.Main \
         -console \