Code Review / controller.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | patch | inline | side by side (parent: 80fa93b)
Add awt headless flag 58/2258/2
authorAndrew Kim <andrekim@cisco.com>
Tue, 29 Oct 2013 18:28:06 +0000 (13:28 -0500)
committerGerrit Code Review <gerrit@opendaylight.org>
Tue, 29 Oct 2013 21:05:51 +0000 (21:05 +0000)
-Djava.awt.headless to run.sh and run.bat

Change-Id: Idfb122e10a38b050bbf1984918d59a7b026c29be
Signed-off-by: Andrew Kim <andrekim@cisco.com>
opendaylight/distribution/opendaylight/src/main/resources/run.bat patch | blob | history
opendaylight/distribution/opendaylight/src/main/resources/run.sh patch | blob | history

diff --git a/opendaylight/distribution/opendaylight/src/main/resources/run.bat b/opendaylight/distribution/opendaylight/src/main/resources/run.bat
index d6583a021de96f3e12c111aefdcad211f9e3f25c..60896aad12f9ccc3f103cd500d93494ea0b798ef 100644 (file)
--- a/opendaylight/distribution/opendaylight/src/main/resources/run.bat
+++ b/opendaylight/distribution/opendaylight/src/main/resources/run.bat
@@ -16,8 +16,8 @@ set fwcp="file:\%basedir%lib\org.eclipse.osgi-3.8.1.v20120830-144521.jar,file:\%
 REM echo cp: %cp%
 REM echo fwcp: %fwcp%
 
-REM echo %JAVA_HOME%\bin\java.exe %* -Djava.io.tmpdir=%basedir%work\tmp -Dosgi.install.area=%basedir% -Dosgi.configuration.area=%basedir%configuration -Dosgi.frameworkClassPath=%fwcp% -Dosgi.framework=file:\%basedir%lib\org.eclipse.osgi-3.8.1.v20120830-144521.jar -classpath %cp% org.eclipse.equinox.launcher.Main -console -consoleLog
-"%JAVA_HOME%\bin\java.exe" %* -Djava.io.tmpdir="%basedir%work\tmp" -Dosgi.install.area=%basedir% -Dosgi.configuration.area="%basedir%configuration" -Dosgi.frameworkClassPath=%fwcp% -Dosgi.framework="file:\%basedir%lib\org.eclipse.osgi-3.8.1.v20120830-144521.jar" -classpath %cp% org.eclipse.equinox.launcher.Main -console -consoleLog
+REM echo %JAVA_HOME%\bin\java.exe %* -Djava.io.tmpdir=%basedir%work\tmp -Djava.awt.headless=true -Dosgi.install.area=%basedir% -Dosgi.configuration.area=%basedir%configuration -Dosgi.frameworkClassPath=%fwcp% -Dosgi.framework=file:\%basedir%lib\org.eclipse.osgi-3.8.1.v20120830-144521.jar -classpath %cp% org.eclipse.equinox.launcher.Main -console -consoleLog
+"%JAVA_HOME%\bin\java.exe" %* -Djava.io.tmpdir="%basedir%work\tmp" -Djava.awt.headless=true -Dosgi.install.area=%basedir% -Dosgi.configuration.area="%basedir%configuration" -Dosgi.frameworkClassPath=%fwcp% -Dosgi.framework="file:\%basedir%lib\org.eclipse.osgi-3.8.1.v20120830-144521.jar" -classpath %cp% org.eclipse.equinox.launcher.Main -console -consoleLog
 
 exit %ERRORLEVEL%
 
diff --git a/opendaylight/distribution/opendaylight/src/main/resources/run.sh b/opendaylight/distribution/opendaylight/src/main/resources/run.sh
index b34e8f773fbb324990bb19c8428fdde49d696189..3a29f63b81a5ab0d442fae2b6e0c75003d6c2e68 100755 (executable)
--- a/opendaylight/distribution/opendaylight/src/main/resources/run.sh
+++ b/opendaylight/distribution/opendaylight/src/main/resources/run.sh
@@ -207,6 +207,7 @@ if [ "${startdaemon}" -eq 1 ]; then
         -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} \
@@ -224,6 +225,7 @@ elif [ "${consolestart}" -eq 1 ]; then
         -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 \
OpenDaylight controller