KARAF-2984 - Improve setenv script to include placeholder for extra java options
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/52cd3d55 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/52cd3d55 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/52cd3d55 Branch: refs/heads/karaf-3.0.x Commit: 52cd3d558b68569c8793b520c9aa32452dadada6 Parents: ff1a0a8 Author: Jonathan Anstey <[email protected]> Authored: Thu May 15 16:28:15 2014 -0230 Committer: Jonathan Anstey <[email protected]> Committed: Thu May 15 16:28:15 2014 -0230 ---------------------------------------------------------------------- .../src/main/filtered-resources/resources/bin/client.bat | 4 ++++ .../framework/src/main/filtered-resources/resources/bin/instance | 4 ++++ .../src/main/filtered-resources/resources/bin/instance.bat | 4 ++++ .../framework/src/main/filtered-resources/resources/bin/karaf | 4 ++++ .../src/main/filtered-resources/resources/bin/karaf.bat | 4 ++++ .../framework/src/main/filtered-resources/resources/bin/setenv | 1 + .../src/main/filtered-resources/resources/bin/setenv.bat | 2 ++ .../framework/src/main/filtered-resources/resources/bin/shell | 4 ++++ .../src/main/filtered-resources/resources/bin/shell.bat | 4 ++++ 9 files changed, 31 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/52cd3d55/assemblies/features/framework/src/main/filtered-resources/resources/bin/client.bat ---------------------------------------------------------------------- diff --git a/assemblies/features/framework/src/main/filtered-resources/resources/bin/client.bat b/assemblies/features/framework/src/main/filtered-resources/resources/bin/client.bat index 34b1bd1..e28d90a 100644 --- a/assemblies/features/framework/src/main/filtered-resources/resources/bin/client.bat +++ b/assemblies/features/framework/src/main/filtered-resources/resources/bin/client.bat @@ -111,6 +111,10 @@ 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=%EXTRA_JAVA_OPTS% %JAVA_OPTS%" +:KARAF_EXTRA_JAVA_OPTS_END + set CLASSPATH=%KARAF_HOME%\lib\bin\karaf-client.jar set CLASSPATH=%CLASSPATH%;%KARAF_HOME%\system\org\apache\sshd\sshd-core\${sshd.version}\sshd-core-${sshd.version}.jar set CLASSPATH=%CLASSPATH%;%KARAF_HOME%\system\org\apache\mina\mina-core\${mina.version}\mina-core-${mina.version}.jar http://git-wip-us.apache.org/repos/asf/karaf/blob/52cd3d55/assemblies/features/framework/src/main/filtered-resources/resources/bin/instance ---------------------------------------------------------------------- diff --git a/assemblies/features/framework/src/main/filtered-resources/resources/bin/instance b/assemblies/features/framework/src/main/filtered-resources/resources/bin/instance index ef2e72b..2c3a8a8 100755 --- a/assemblies/features/framework/src/main/filtered-resources/resources/bin/instance +++ b/assemblies/features/framework/src/main/filtered-resources/resources/bin/instance @@ -234,6 +234,10 @@ setupDebugOptions() { fi export JAVA_OPTS + if [ "x$EXTRA_JAVA_OPTS" != "x" ]; then + JAVA_OPTS="$EXTRA_JAVA_OPTS $JAVA_OPTS" + fi + # Set Debug options if enabled if [ "x$KARAF_DEBUG" != "x" ]; then # Use the defaults if JAVA_DEBUG_OPTS was not set http://git-wip-us.apache.org/repos/asf/karaf/blob/52cd3d55/assemblies/features/framework/src/main/filtered-resources/resources/bin/instance.bat ---------------------------------------------------------------------- diff --git a/assemblies/features/framework/src/main/filtered-resources/resources/bin/instance.bat b/assemblies/features/framework/src/main/filtered-resources/resources/bin/instance.bat index 7f62efe..221adb6 100644 --- a/assemblies/features/framework/src/main/filtered-resources/resources/bin/instance.bat +++ b/assemblies/features/framework/src/main/filtered-resources/resources/bin/instance.bat @@ -113,6 +113,10 @@ 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="%EXTRA_JAVA_OPTS% %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% http://git-wip-us.apache.org/repos/asf/karaf/blob/52cd3d55/assemblies/features/framework/src/main/filtered-resources/resources/bin/karaf ---------------------------------------------------------------------- diff --git a/assemblies/features/framework/src/main/filtered-resources/resources/bin/karaf b/assemblies/features/framework/src/main/filtered-resources/resources/bin/karaf index 95b3303..02a5f3b 100755 --- a/assemblies/features/framework/src/main/filtered-resources/resources/bin/karaf +++ b/assemblies/features/framework/src/main/filtered-resources/resources/bin/karaf @@ -251,6 +251,10 @@ setupDebugOptions() { fi export JAVA_OPTS + if [ "x$EXTRA_JAVA_OPTS" != "x" ]; then + JAVA_OPTS="$EXTRA_JAVA_OPTS $JAVA_OPTS" + fi + # Set Debug options if enabled if [ "x$KARAF_DEBUG" != "x" ]; then # Ignore DEBUG in case of stop or client mode http://git-wip-us.apache.org/repos/asf/karaf/blob/52cd3d55/assemblies/features/framework/src/main/filtered-resources/resources/bin/karaf.bat ---------------------------------------------------------------------- diff --git a/assemblies/features/framework/src/main/filtered-resources/resources/bin/karaf.bat b/assemblies/features/framework/src/main/filtered-resources/resources/bin/karaf.bat index da4c739..7545488 100644 --- a/assemblies/features/framework/src/main/filtered-resources/resources/bin/karaf.bat +++ b/assemblies/features/framework/src/main/filtered-resources/resources/bin/karaf.bat @@ -230,6 +230,10 @@ 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=%EXTRA_JAVA_OPTS% %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 http://git-wip-us.apache.org/repos/asf/karaf/blob/52cd3d55/assemblies/features/framework/src/main/filtered-resources/resources/bin/setenv ---------------------------------------------------------------------- diff --git a/assemblies/features/framework/src/main/filtered-resources/resources/bin/setenv b/assemblies/features/framework/src/main/filtered-resources/resources/bin/setenv index 86149ba..0d6d2b0 100755 --- a/assemblies/features/framework/src/main/filtered-resources/resources/bin/setenv +++ b/assemblies/features/framework/src/main/filtered-resources/resources/bin/setenv @@ -40,6 +40,7 @@ # 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 http://git-wip-us.apache.org/repos/asf/karaf/blob/52cd3d55/assemblies/features/framework/src/main/filtered-resources/resources/bin/setenv.bat ---------------------------------------------------------------------- diff --git a/assemblies/features/framework/src/main/filtered-resources/resources/bin/setenv.bat b/assemblies/features/framework/src/main/filtered-resources/resources/bin/setenv.bat index cbcdfdc..2eead33 100644 --- a/assemblies/features/framework/src/main/filtered-resources/resources/bin/setenv.bat +++ b/assemblies/features/framework/src/main/filtered-resources/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 http://git-wip-us.apache.org/repos/asf/karaf/blob/52cd3d55/assemblies/features/framework/src/main/filtered-resources/resources/bin/shell ---------------------------------------------------------------------- diff --git a/assemblies/features/framework/src/main/filtered-resources/resources/bin/shell b/assemblies/features/framework/src/main/filtered-resources/resources/bin/shell index 7f66eaa..cdd0258 100755 --- a/assemblies/features/framework/src/main/filtered-resources/resources/bin/shell +++ b/assemblies/features/framework/src/main/filtered-resources/resources/bin/shell @@ -234,6 +234,10 @@ setupDebugOptions() { fi export JAVA_OPTS + if [ "x$EXTRA_JAVA_OPTS" != "x" ]; then + JAVA_OPTS="$EXTRA_JAVA_OPTS $JAVA_OPTS" + fi + # Set Debug options if enabled if [ "x$KARAF_DEBUG" != "x" ]; then # Use the defaults if JAVA_DEBUG_OPTS was not set http://git-wip-us.apache.org/repos/asf/karaf/blob/52cd3d55/assemblies/features/framework/src/main/filtered-resources/resources/bin/shell.bat ---------------------------------------------------------------------- diff --git a/assemblies/features/framework/src/main/filtered-resources/resources/bin/shell.bat b/assemblies/features/framework/src/main/filtered-resources/resources/bin/shell.bat index c4734f8..8d3cc3a 100644 --- a/assemblies/features/framework/src/main/filtered-resources/resources/bin/shell.bat +++ b/assemblies/features/framework/src/main/filtered-resources/resources/bin/shell.bat @@ -113,6 +113,10 @@ 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=%EXTRA_JAVA_OPTS% %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%
