Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Rename initial config files from *.xml.conf to *.xml
[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 e4c20da350b87fac520cab4b9d2dac48881f1810..ffe53afd4d5393de8e065a1708caf41893e3e726 100755
(executable)
--- a/
opendaylight/distribution/opendaylight/src/main/resources/run.sh
+++ b/
opendaylight/distribution/opendaylight/src/main/resources/run.sh
@@
-46,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;
[[ ! -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>]"
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>]"
@@
-154,6
+164,8
@@
FWCLASSPATH=${FWCLASSPATH},file:${basedir}/lib/org.eclipse.virgo.kernel.equinox.
CLASSPATH=${CLASSPATH}:${basedir}/lib/org.eclipse.equinox.launcher-1.3.0.v20120522-1813.jar
FWCLASSPATH=${FWCLASSPATH},file:${basedir}/lib/org.eclipse.equinox.launcher-1.3.0.v20120522-1813.jar
CLASSPATH=${CLASSPATH}:${basedir}/lib/org.eclipse.equinox.launcher-1.3.0.v20120522-1813.jar
FWCLASSPATH=${FWCLASSPATH},file:${basedir}/lib/org.eclipse.equinox.launcher-1.3.0.v20120522-1813.jar
+cd $basedir
+
if [ "${stopdaemon}" -eq 1 ]; then
if [ -e "${pidfile}" ]; then
daemonpid=`cat "${pidfile}"`
if [ "${stopdaemon}" -eq 1 ]; then
if [ -e "${pidfile}" ]; then
daemonpid=`cat "${pidfile}"`
@@
-192,11
+204,12
@@
if [ "${startdaemon}" -eq 1 ]; then
exit -1
fi
$JAVA_HOME/bin/java ${extraJVMOpts} \
exit -1
fi
$JAVA_HOME/bin/java ${extraJVMOpts} \
- -Djava.io.tmpdir=${
base
dir}/work/tmp \
+ -Djava.io.tmpdir=${
data
dir}/work/tmp \
-Dosgi.install.area=${basedir} \
-Dosgi.install.area=${basedir} \
- -Dosgi.configuration.area=${
base
dir}/configuration \
+ -Dosgi.configuration.area=${
data
dir}/configuration \
-Dosgi.frameworkClassPath=${FWCLASSPATH} \
-Dosgi.framework=file:${basedir}/lib/org.eclipse.osgi-3.8.1.v20120830-144521.jar \
-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} \
-classpath ${CLASSPATH} \
org.eclipse.equinox.launcher.Main \
-console ${daemonport} \
@@
-209,11
+222,12
@@
elif [ "${consolestart}" -eq 1 ]; then
exit -1
fi
$JAVA_HOME/bin/java ${extraJVMOpts} \
exit -1
fi
$JAVA_HOME/bin/java ${extraJVMOpts} \
- -Djava.io.tmpdir=${
base
dir}/work/tmp \
+ -Djava.io.tmpdir=${
data
dir}/work/tmp \
-Dosgi.install.area=${basedir} \
-Dosgi.install.area=${basedir} \
- -Dosgi.configuration.area=${
base
dir}/configuration \
+ -Dosgi.configuration.area=${
data
dir}/configuration \
-Dosgi.frameworkClassPath=${FWCLASSPATH} \
-Dosgi.framework=file:${basedir}/lib/org.eclipse.osgi-3.8.1.v20120830-144521.jar \
-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 \
-classpath ${CLASSPATH} \
org.eclipse.equinox.launcher.Main \
-console \