From: Ed Warnicke Date: Mon, 16 Feb 2015 01:35:40 +0000 (-0700) Subject: Bug 2907 - corrections for upgrade to karaf 3.0.3 X-Git-Tag: release/lithium~263 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=783679071e01620bfc468cb9f9472f2a1030ae00;hp=e3a22ae5edead2319553bb4dfce59e359386d535 Bug 2907 - corrections for upgrade to karaf 3.0.3 Needs patch: https://git.opendaylight.org/gerrit/15391 from odlparent So far this seems to work fine except for the issues with aaa-authn's use of sqllite. If you want to test with integration, you will need patch: https://git.opendaylight.org/gerrit/15392 Change-Id: I34d9adf31562a0650abba015d19dd8c6958b2bf3 Signed-off-by: Ed Warnicke --- diff --git a/karaf/karaf-parent/pom.xml b/karaf/karaf-parent/pom.xml index 2d914b3fe2..958f2b884c 100644 --- a/karaf/karaf-parent/pom.xml +++ b/karaf/karaf-parent/pom.xml @@ -23,6 +23,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html 1.1.0-SNAPSHOT 1.5.0-SNAPSHOT + standard @@ -47,6 +48,15 @@ and is available at http://www.eclipse.org/legal/epl-v10.html + + + org.apache.karaf.features + standard + ${karaf.version} + xml + features + runtime + org.opendaylight.controller diff --git a/karaf/opendaylight-karaf-resources/src/main/resources/bin/instance b/karaf/opendaylight-karaf-resources/src/main/resources/bin/instance old mode 100755 new mode 100644 index 7288042bab..27772fd255 --- a/karaf/opendaylight-karaf-resources/src/main/resources/bin/instance +++ b/karaf/opendaylight-karaf-resources/src/main/resources/bin/instance @@ -85,7 +85,7 @@ unlimitFD() { # Increase the maximum file descriptors if we can if [ "$os400" = "false" ] && [ "$cygwin" = "false" ]; then MAX_FD_LIMIT=`ulimit -H -n` - if [ "$MAX_FD_LIMIT" != 'unlimited' ]; then + if [ "$MAX_FD_LIMIT" != 'unlimited' ]; then if [ $? -eq 0 ]; then if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ]; then # use the system max @@ -188,7 +188,7 @@ locateJava() { fi if [ "x$JAVA_HOME" = "x" ] && [ "$darwin" = "true" ]; then - JAVA_HOME="$(/usr/libexec/java_home)" + JAVA_HOME="$(/usr/libexec/java_home -v 1.7)" fi if [ "x$JAVA" = "x" ] && [ -r /etc/gentoo-release ] ; then JAVA_HOME=`java-config --jre-home` @@ -202,7 +202,7 @@ locateJava() { else warn "JAVA_HOME not set; results may vary" JAVA=`type java` - JAVA=`expr "$JAVA" : '.*is \(.*\)$'` + JAVA=`expr "$JAVA" : '.* \(/.*\)$'` if [ "x$JAVA" = "x" ]; then die "java command not found" fi @@ -234,6 +234,10 @@ setupDebugOptions() { fi export JAVA_OPTS + if [ "x$EXTRA_JAVA_OPTS" != "x" ]; then + JAVA_OPTS="$JAVA_OPTS $EXTRA_JAVA_OPTS" + fi + # Set Debug options if enabled if [ "x$KARAF_DEBUG" != "x" ]; then # Use the defaults if JAVA_DEBUG_OPTS was not set @@ -280,7 +284,12 @@ setupDefaults() { CLASSPATH="$CLASSPATH:$file" fi done - DEFAULT_JAVA_DEBUG_OPTS="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005" + + DEFAULT_JAVA_DEBUG_PORT="5005" + if [ "x$JAVA_DEBUG_PORT" = "x" ]; then + JAVA_DEBUG_PORT="$DEFAULT_JAVA_DEBUG_PORT" + fi + DEFAULT_JAVA_DEBUG_OPTS="-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=$JAVA_DEBUG_PORT" ## ## TODO: Move to conf/profiler/yourkit.{sh|cmd} @@ -327,7 +336,7 @@ init() { run() { - CLASSPATH="${KARAF_HOME}/system/org/apache/karaf/instance/org.apache.karaf.instance.command/3.0.1/org.apache.karaf.instance.command-3.0.1.jar:${KARAF_HOME}/system/org/apache/karaf/instance/org.apache.karaf.instance.core/3.0.1/org.apache.karaf.instance.core-3.0.1.jar:${KARAF_HOME}/system/org/apache/karaf/shell/org.apache.karaf.shell.console/3.0.1/org.apache.karaf.shell.console-3.0.1.jar:${KARAF_HOME}/system/org/apache/karaf/shell/org.apache.karaf.shell.table/3.0.1/org.apache.karaf.shell.table-3.0.1.jar:${KARAF_HOME}/system/org/apache/aries/blueprint/org.apache.aries.blueprint.api/1.0.0/org.apache.aries.blueprint.api-1.0.0.jar:${KARAF_HOME}/system/org/apache/aries/blueprint/org.apache.aries.blueprint.core/1.4.0/org.apache.aries.blueprint.core-1.4.0.jar:${KARAF_HOME}/system/org/apache/aries/blueprint/org.apache.aries.blueprint.cm/1.0.3/org.apache.aries.blueprint.cm-1.0.3.jar:${KARAF_HOME}/system/org/ops4j/pax/logging/pax-logging-api/1.7.2/pax-logging-api-1.7.2.jar:${KARAF_HOME}/system/org/apache/felix/org.apache.felix.framework/4.2.1/org.apache.felix.framework-4.2.1.jar:${KARAF_HOME}/system/jline/jline/2.11/jline-2.11.jar:$CLASSPATH" + CLASSPATH="${KARAF_HOME}/system/org/apache/karaf/instance/org.apache.karaf.instance.command/3.0.3/org.apache.karaf.instance.command-3.0.3.jar:${KARAF_HOME}/system/org/apache/karaf/instance/org.apache.karaf.instance.core/3.0.3/org.apache.karaf.instance.core-3.0.3.jar:${KARAF_HOME}/system/org/apache/karaf/shell/org.apache.karaf.shell.console/3.0.3/org.apache.karaf.shell.console-3.0.3.jar:${KARAF_HOME}/system/org/apache/karaf/shell/org.apache.karaf.shell.table/3.0.3/org.apache.karaf.shell.table-3.0.3.jar:${KARAF_HOME}/system/org/apache/aries/blueprint/org.apache.aries.blueprint.api/1.0.1/org.apache.aries.blueprint.api-1.0.1.jar:${KARAF_HOME}/system/org/apache/aries/blueprint/org.apache.aries.blueprint.core/1.4.2/org.apache.aries.blueprint.core-1.4.2.jar:${KARAF_HOME}/system/org/apache/aries/blueprint/org.apache.aries.blueprint.cm/1.0.5/org.apache.aries.blueprint.cm-1.0.5.jar:${KARAF_HOME}/system/org/ops4j/pax/logging/pax-logging-api/1.8.1/pax-logging-api-1.8.1.jar:${KARAF_HOME}/system/org/apache/felix/org.apache.felix.framework/4.2.1/org.apache.felix.framework-4.2.1.jar:${KARAF_HOME}/system/jline/jline/2.12/jline-2.12.jar:$CLASSPATH" if $cygwin; then KARAF_HOME=`cygpath --path --windows "$KARAF_HOME"` @@ -346,4 +355,3 @@ main() { } main "$@" - diff --git a/karaf/opendaylight-karaf-resources/src/main/resources/bin/instance.bat b/karaf/opendaylight-karaf-resources/src/main/resources/bin/instance.bat index 49c2c0fb4e..2ac8db1897 100644 --- a/karaf/opendaylight-karaf-resources/src/main/resources/bin/instance.bat +++ b/karaf/opendaylight-karaf-resources/src/main/resources/bin/instance.bat @@ -95,7 +95,7 @@ if "%KARAF_ETC%" == "" ( ) set DEFAULT_JAVA_OPTS= -set DEFAULT_JAVA_DEBUG_OPTS=-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005 +set DEFAULT_JAVA_DEBUG_OPTS=-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005 rem Support for loading native libraries set PATH=%PATH%;%KARAF_BASE%\lib;%KARAF_HOME%\lib @@ -113,11 +113,15 @@ if not "%JAVA%" == "" goto :Check_JAVA_END if "%JAVA_OPTS%" == "" set JAVA_OPTS=%DEFAULT_JAVA_OPTS% +if "%EXTRA_JAVA_OPTS%" == "" goto :KARAF_EXTRA_JAVA_OPTS_END + set JAVA_OPTS="%JAVA_OPTS% %EXTRA_JAVA_OPTS%" +:KARAF_EXTRA_JAVA_OPTS_END + if "%KARAF_DEBUG%" == "" goto :KARAF_DEBUG_END rem Use the defaults if JAVA_DEBUG_OPTS was not set if "%JAVA_DEBUG_OPTS%" == "" set JAVA_DEBUG_OPTS=%DEFAULT_JAVA_DEBUG_OPTS% - set "JAVA_OPTS=%JAVA_DEBUG_OPTS% %JAVA_OPTS%" + set JAVA_OPTS="%JAVA_DEBUG_OPTS% %JAVA_OPTS%" call :warn Enabling Java debug options: %JAVA_DEBUG_OPTS% :KARAF_DEBUG_END @@ -135,7 +139,7 @@ goto :EOF :CLASSPATH_END -set CLASSPATH=%KARAF_HOME%\system\org\apache\karaf\instance\org.apache.karaf.instance.command\3.0.1\org.apache.karaf.instance.command-3.0.1.jar;%KARAF_HOME%\system\org\apache\karaf\instance\org.apache.karaf.instance.core\3.0.1\org.apache.karaf.instance.core-3.0.1.jar;%KARAF_HOME%\system\org\apache\karaf\shell\org.apache.karaf.shell.console\3.0.1\org.apache.karaf.shell.console-3.0.1.jar;%KARAF_HOME%\system\org\apache\karaf\shell\org.apache.karaf.shell.table\3.0.1\org.apache.karaf.shell.table-3.0.1.jar;%KARAF_HOME%\system\org\apache\aries\blueprint\org.apache.aries.blueprint.api\1.0.0\org.apache.aries.blueprint.api-1.0.0.jar;%KARAF_HOME%\system\org\apache\aries\blueprint\org.apache.aries.blueprint.core\1.4.0\org.apache.aries.blueprint.core-1.4.0.jar;%KARAF_HOME%\system\org\apache\aries\blueprint\org.apache.aries.blueprint.cm\1.0.3\org.apache.aries.blueprint.cm-1.0.3.jar;%KARAF_HOME%\system\org\ops4j\pax\logging\pax-logging-api\1.7.2\pax-logging-api-1.7.2.jar;%KARAF_HOME%\system\org\apache\felix\org.apache.felix.framework\4.2.1\org.apache.felix.framework-4.2.1.jar;%KARAF_HOME%\system\jline\jline\2.11\jline-2.11.jar;%CLASSPATH% +set CLASSPATH=%KARAF_HOME%\system\org\apache\karaf\instance\org.apache.karaf.instance.command\3.0.3\org.apache.karaf.instance.command-3.0.3.jar;%KARAF_HOME%\system\org\apache\karaf\instance\org.apache.karaf.instance.core\3.0.3\org.apache.karaf.instance.core-3.0.3.jar;%KARAF_HOME%\system\org\apache\karaf\shell\org.apache.karaf.shell.console\3.0.3\org.apache.karaf.shell.console-3.0.3.jar;%KARAF_HOME%\system\org\apache\karaf\shell\org.apache.karaf.shell.table\3.0.3\org.apache.karaf.shell.table-3.0.3.jar;%KARAF_HOME%\system\org\apache\aries\blueprint\org.apache.aries.blueprint.api\1.0.1\org.apache.aries.blueprint.api-1.0.1.jar;%KARAF_HOME%\system\org\apache\aries\blueprint\org.apache.aries.blueprint.core\1.4.2\org.apache.aries.blueprint.core-1.4.2.jar;%KARAF_HOME%\system\org\apache\aries\blueprint\org.apache.aries.blueprint.cm\1.0.5\org.apache.aries.blueprint.cm-1.0.5.jar;%KARAF_HOME%\system\org\ops4j\pax\logging\pax-logging-api\1.8.1\pax-logging-api-1.8.1.jar;%KARAF_HOME%\system\org\apache\felix\org.apache.felix.framework\4.2.1\org.apache.felix.framework-4.2.1.jar;%KARAF_HOME%\system\jline\jline\2.12\jline-2.12.jar;%CLASSPATH% :EXECUTE if "%SHIFT%" == "true" SET ARGS=%2 %3 %4 %5 %6 %7 %8 @@ -148,4 +152,3 @@ rem # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # :END endlocal - diff --git a/karaf/opendaylight-karaf-resources/src/main/resources/bin/karaf b/karaf/opendaylight-karaf-resources/src/main/resources/bin/karaf index cad052a8ce..23fbbec452 100755 --- a/karaf/opendaylight-karaf-resources/src/main/resources/bin/karaf +++ b/karaf/opendaylight-karaf-resources/src/main/resources/bin/karaf @@ -16,8 +16,8 @@ # limitations under the License. # -DIRNAME=`dirname $0` -PROGNAME=`basename $0` +DIRNAME=`dirname "$0"` +PROGNAME=`basename "$0"` # # Sourcing environment settings for karaf similar to tomcats setenv @@ -92,7 +92,7 @@ unlimitFD() { # Increase the maximum file descriptors if we can if [ "$os400" = "false" ] && [ "$cygwin" = "false" ]; then MAX_FD_LIMIT=`ulimit -H -n` - if [ "$MAX_FD_LIMIT" != 'unlimited' ]; then + if [ "$MAX_FD_LIMIT" != 'unlimited' ]; then if [ $? -eq 0 ]; then if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ]; then # use the system max @@ -195,7 +195,7 @@ locateJava() { fi if [ "x$JAVA_HOME" = "x" ] && [ "$darwin" = "true" ]; then - JAVA_HOME="$(/usr/libexec/java_home)" + JAVA_HOME="$(/usr/libexec/java_home -v 1.7)" fi if [ "x$JAVA" = "x" ] && [ -r /etc/gentoo-release ] ; then JAVA_HOME=`java-config --jre-home` @@ -209,7 +209,7 @@ locateJava() { else warn "JAVA_HOME not set; results may vary" JAVA=`type java` - JAVA=`expr "$JAVA" : '.*is \(.*\)$'` + JAVA=`expr "$JAVA" : '.* \(/.*\)$'` if [ "x$JAVA" = "x" ]; then die "java command not found" fi @@ -237,7 +237,7 @@ detectJVM() { checkJvmVersion() { # echo "`$JAVA -version`" - VERSION=`$JAVA -version 2>&1 | egrep '"([0-9].[0-9]\..*[0-9])"' | awk '{print substr($3,2,length($3)-2)}' | awk '{print substr($1, 3, 3)}' | sed -e 's;\.;;g'` + VERSION=`$JAVA -version 2>&1 | egrep '"([0-9].[0-9]\..*[0-9]).*"' | awk '{print substr($3,2,length($3)-2)}' | awk '{print substr($1, 3, 3)}' | sed -e 's;\.;;g'` # echo $VERSION if [ "$VERSION" -lt "60" ]; then echo "JVM must be greater than 1.6" @@ -251,6 +251,10 @@ setupDebugOptions() { fi export JAVA_OPTS + if [ "x$EXTRA_JAVA_OPTS" != "x" ]; then + JAVA_OPTS="$JAVA_OPTS $EXTRA_JAVA_OPTS" + fi + # Set Debug options if enabled if [ "x$KARAF_DEBUG" != "x" ]; then # Ignore DEBUG in case of stop or client mode @@ -304,7 +308,12 @@ setupDefaults() { CLASSPATH="$CLASSPATH:$file" fi done - DEFAULT_JAVA_DEBUG_OPTS="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005" + + DEFAULT_JAVA_DEBUG_PORT="5005" + if [ "x$JAVA_DEBUG_PORT" = "x" ]; then + JAVA_DEBUG_PORT="$DEFAULT_JAVA_DEBUG_PORT" + fi + DEFAULT_JAVA_DEBUG_OPTS="-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=$JAVA_DEBUG_PORT" ## ## TODO: Move to conf/profiler/yourkit.{sh|cmd} @@ -340,7 +349,7 @@ init() { # Determine the JVM vendor detectJVM - + # Determine the JVM version >= 1.6 checkJvmVersion diff --git a/karaf/opendaylight-karaf-resources/src/main/resources/bin/karaf.bat b/karaf/opendaylight-karaf-resources/src/main/resources/bin/karaf.bat index a45087730f..9c278c3b9a 100644 --- a/karaf/opendaylight-karaf-resources/src/main/resources/bin/karaf.bat +++ b/karaf/opendaylight-karaf-resources/src/main/resources/bin/karaf.bat @@ -96,26 +96,9 @@ if "%KARAF_ETC%" == "" ( set LOCAL_CLASSPATH=%CLASSPATH% set JAVA_MODE=-server -if not exist "%JAVA_HOME%\bin\server\jvm.dll" ( - if not exist "%JAVA_HOME%\jre\bin\server\jvm.dll" ( - echo WARNING: Running karaf on a Java HotSpot Client VM because server-mode is not available. - echo Install Java Developer Kit to fix this. - echo For more details see http://java.sun.com/products/hotspot/whitepaper.html#client - set JAVA_MODE=-client - ) -) -set DEFAULT_JAVA_OPTS=%JAVA_MODE% -Xms%JAVA_MIN_MEM% -Xmx%JAVA_MAX_MEM% -Dderby.system.home="%KARAF_DATA%\derby" -Dderby.storage.fileSyncTransactionLog=true -Dcom.sun.management.jmxremote -XX:+UnlockDiagnosticVMOptions -XX:+UnsyncloadClass - -rem Check some easily accessible MIN/MAX params for JVM mem usage -if not "%JAVA_PERM_MEM%" == "" ( - set DEFAULT_JAVA_OPTS=%DEFAULT_JAVA_OPTS% -XX:PermSize=%JAVA_PERM_MEM% -) -if not "%JAVA_MAX_PERM_MEM%" == "" ( - set DEFAULT_JAVA_OPTS=%DEFAULT_JAVA_OPTS% -XX:MaxPermSize=%JAVA_MAX_PERM_MEM% -) set CLASSPATH=%LOCAL_CLASSPATH%;%KARAF_BASE%\conf -set DEFAULT_JAVA_DEBUG_OPTS=-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005 +set DEFAULT_JAVA_DEBUG_OPTS=-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005 if "%LOCAL_CLASSPATH%" == "" goto :KARAF_CLASSPATH_EMPTY set CLASSPATH=%LOCAL_CLASSPATH%;%KARAF_BASE%\conf @@ -206,8 +189,8 @@ if not "%JAVA%" == "" goto :Check_JAVA_END ) if not exist "%JAVA_HOME%" ( goto TryRegJDK - ) - goto TryJDKEnd + ) + goto TryJDKEnd :TryRegJDK rem try getting the JAVA_HOME from registry FOR /F "usebackq tokens=3*" %%A IN (`REG QUERY "HKLM\Software\JavaSoft\Java Development Kit" /v CurrentVersion`) DO ( @@ -219,7 +202,7 @@ if not "%JAVA%" == "" goto :Check_JAVA_END if not exist "%JAVA_HOME%" ( call :warn Unable to retrieve JAVA_HOME from Registry ) - goto TryJDKEnd + goto TryJDKEnd :TryJDKEnd if not exist "%JAVA_HOME%" ( call :warn JAVA_HOME is not valid: "%JAVA_HOME%" @@ -228,15 +211,37 @@ if not "%JAVA%" == "" goto :Check_JAVA_END set JAVA=%JAVA_HOME%\bin\java :Check_JAVA_END +if not exist "%JAVA_HOME%\bin\server\jvm.dll" ( + if not exist "%JAVA_HOME%\jre\bin\server\jvm.dll" ( + echo WARNING: Running Karaf on a Java HotSpot Client VM because server-mode is not available. + echo Install Java Developer Kit to fix this. + echo For more details see http://java.sun.com/products/hotspot/whitepaper.html#client + set JAVA_MODE=-client + ) +) +set DEFAULT_JAVA_OPTS=%JAVA_MODE% -Xms%JAVA_MIN_MEM% -Xmx%JAVA_MAX_MEM% -Dderby.system.home="%KARAF_DATA%\derby" -Dderby.storage.fileSyncTransactionLog=true -Dcom.sun.management.jmxremote -XX:+UnlockDiagnosticVMOptions -XX:+UnsyncloadClass + +rem Check some easily accessible MIN/MAX params for JVM mem usage +if not "%JAVA_PERM_MEM%" == "" ( + set DEFAULT_JAVA_OPTS=%DEFAULT_JAVA_OPTS% -XX:PermSize=%JAVA_PERM_MEM% +) +if not "%JAVA_MAX_PERM_MEM%" == "" ( + set DEFAULT_JAVA_OPTS=%DEFAULT_JAVA_OPTS% -XX:MaxPermSize=%JAVA_MAX_PERM_MEM% +) + if "%JAVA_OPTS%" == "" set JAVA_OPTS=%DEFAULT_JAVA_OPTS% +if "%EXTRA_JAVA_OPTS%" == "" goto :KARAF_EXTRA_JAVA_OPTS_END + set JAVA_OPTS=%JAVA_OPTS% %EXTRA_JAVA_OPTS% +:KARAF_EXTRA_JAVA_OPTS_END + if "%KARAF_DEBUG%" == "" goto :KARAF_DEBUG_END if "%1" == "stop" goto :KARAF_DEBUG_END if "%1" == "client" goto :KARAF_DEBUG_END rem Use the defaults if JAVA_DEBUG_OPTS was not set if "%JAVA_DEBUG_OPTS%" == "" set JAVA_DEBUG_OPTS=%DEFAULT_JAVA_DEBUG_OPTS% - set "JAVA_OPTS=%JAVA_DEBUG_OPTS% %JAVA_OPTS%" + set JAVA_OPTS=%JAVA_DEBUG_OPTS% %JAVA_OPTS% call :warn Enabling Java debug options: %JAVA_DEBUG_OPTS% :KARAF_DEBUG_END @@ -314,7 +319,7 @@ if "%KARAF_PROFILER%" == "" goto :RUN :EXECUTE_DEBUG if "%JAVA_DEBUG_OPTS%" == "" set JAVA_DEBUG_OPTS=%DEFAULT_JAVA_DEBUG_OPTS% - set "JAVA_OPTS=%JAVA_DEBUG_OPTS% %JAVA_OPTS%" + set JAVA_OPTS=%JAVA_DEBUG_OPTS% %JAVA_OPTS% shift goto :RUN_LOOP @@ -333,4 +338,3 @@ endlocal if not "%PAUSE%" == "" pause :END_NO_PAUSE - diff --git a/karaf/opendaylight-karaf-resources/src/main/resources/bin/setenv b/karaf/opendaylight-karaf-resources/src/main/resources/bin/setenv old mode 100755 new mode 100644 index 947c65f6bd..42330fa933 --- a/karaf/opendaylight-karaf-resources/src/main/resources/bin/setenv +++ b/karaf/opendaylight-karaf-resources/src/main/resources/bin/setenv @@ -32,7 +32,7 @@ # # -# The following section shows the possible configuration options for the default +# The following section shows the possible configuration options for the default # karaf scripts # # export JAVA_HOME # Location of Java installation @@ -40,16 +40,17 @@ # export JAVA_MAX_MEM # Maximum memory for the JVM # export JAVA_PERM_MEM # Minimum perm memory for the JVM # export JAVA_MAX_PERM_MEM # Maximum perm memory for the JVM +# export EXTRA_JAVA_OPTS # Additional JVM options # export KARAF_HOME # Karaf home folder # export KARAF_DATA # Karaf data folder # export KARAF_BASE # Karaf base folder # export KARAF_ETC # Karaf etc folder # export KARAF_OPTS # Additional available Karaf options # export KARAF_DEBUG # Enable debug mode +# export KARAF_REDIRECT # Enable/set the std/err redirection when using bin/start if [ "x$JAVA_MAX_PERM_MEM" = "x" ]; then export JAVA_MAX_PERM_MEM="512m" fi if [ "x$JAVA_MAX_MEM" = "x" ]; then export JAVA_MAX_MEM="2048m" fi - diff --git a/karaf/opendaylight-karaf-resources/src/main/resources/bin/setenv.bat b/karaf/opendaylight-karaf-resources/src/main/resources/bin/setenv.bat index 7c6192002c..66a25a3a84 100644 --- a/karaf/opendaylight-karaf-resources/src/main/resources/bin/setenv.bat +++ b/karaf/opendaylight-karaf-resources/src/main/resources/bin/setenv.bat @@ -48,6 +48,8 @@ rem Minimum perm memory for the JVM rem SET JAVA_PERM_MEM rem Maximum perm memory for the JVM rem SET JAVA_MAX_PERM_MEM +rem Additional JVM options +rem SET EXTRA_JAVA_OPTS rem Karaf home folder rem SET KARAF_HOME rem Karaf data folder diff --git a/karaf/opendaylight-karaf-resources/src/main/resources/etc/jre.properties b/karaf/opendaylight-karaf-resources/src/main/resources/etc/jre.properties index f32078a953..bfdef62d0d 100644 --- a/karaf/opendaylight-karaf-resources/src/main/resources/etc/jre.properties +++ b/karaf/opendaylight-karaf-resources/src/main/resources/etc/jre.properties @@ -27,8 +27,8 @@ jre-1.6= \ javax.accessibility, \ javax.activation;version="1.1", \ javax.activity, \ - javax.annotation;version="1.1", \ - javax.annotation.processing;version="1.1", \ + javax.annotation;version="1.0", \ + javax.annotation.processing;version="1.6", \ javax.crypto, \ javax.crypto.interfaces, \ javax.crypto.spec, \ @@ -182,7 +182,7 @@ jre-1.6= \ org.w3c.dom.xpath, \ org.xml.sax, \ org.xml.sax.ext, \ - org.xml.sax.helpers, \ + org.xml.sax.helpers, \ sun.misc # Standard package set. Note that: @@ -191,8 +191,8 @@ jre-1.7= \ javax.accessibility, \ javax.activation;version="1.1", \ javax.activity, \ - javax.annotation;version="1.2", \ - javax.annotation.processing;version="1.2", \ + javax.annotation;version="1.0", \ + javax.annotation.processing;version="1.6", \ javax.crypto, \ javax.crypto.interfaces, \ javax.crypto.spec, \ @@ -346,15 +346,15 @@ jre-1.7= \ org.w3c.dom.xpath, \ org.xml.sax, \ org.xml.sax.ext, \ - org.xml.sax.helpers, \ + org.xml.sax.helpers, \ sun.misc jre-1.8= \ javax.accessibility, \ javax.activation;version="1.1", \ javax.activity, \ - javax.annotation;version="1.2", \ - javax.annotation.processing;version="1.2", \ + javax.annotation;version="1.0", \ + javax.annotation.processing;version="1.6", \ javax.crypto, \ javax.crypto.interfaces, \ javax.crypto.spec, \ @@ -465,6 +465,39 @@ jre-1.8= \ javax.xml.ws.wsaddressing;version="2.2", \ javax.xml.ws.spi.http;version="2.2", \ javax.xml.xpath, \ + javafx.animation, \ + javafx.application, \ + javafx.beans, \ + javafx.beans.binding, \ + javafx.beans.property, \ + javafx.beans.property.adapter, \ + javafx.beans.value, \ + javafx.collections, \ + javafx.concurrent, \ + javafx.css, \ + javafx.embed.swing, \ + javafx.embed.swt, \ + javafx.event, \ + javafx.fxml, \ + javafx.geometry, \ + javafx.scene, \ + javafx.scene.canvas, \ + javafx.scene.chart, \ + javafx.scene.control, \ + javafx.scene.control.cell, \ + javafx.scene.effect, \ + javafx.scene.image, \ + javafx.scene.input, \ + javafx.scene.layout, \ + javafx.scene.media, \ + javafx.scene.paint, \ + javafx.scene.shape, \ + javafx.scene.text, \ + javafx.scene.transform, \ + javafx.scene.web, \ + javafx.stage, \ + javafx.util, \ + javafx.util.converter, \ org.ietf.jgss, \ org.omg.CORBA, \ org.omg.CORBA_2_3, \ @@ -508,5 +541,5 @@ jre-1.8= \ org.w3c.dom.xpath, \ org.xml.sax, \ org.xml.sax.ext, \ - org.xml.sax.helpers, \ + org.xml.sax.helpers, \ sun.misc