Repository: karaf Updated Branches: refs/heads/karaf-2.x 8eb598380 -> c47204bf8 refs/heads/karaf-3.0.x ff1a0a8c1 -> cb2f61264 refs/heads/master 57ec802bc -> 036570fe9
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/e1c334ec Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/e1c334ec Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/e1c334ec Branch: refs/heads/karaf-2.x Commit: e1c334ec0d69c5501557ae400f5d66827d8537e5 Parents: 8eb5983 Author: Jonathan Anstey <[email protected]> Authored: Thu May 15 16:18:41 2014 -0230 Committer: Jonathan Anstey <[email protected]> Committed: Thu May 15 16:18:41 2014 -0230 ---------------------------------------------------------------------- .../apache-karaf/src/main/distribution/unix-shell/bin/karaf | 4 ++++ .../apache-karaf/src/main/distribution/unix-shell/bin/setenv | 1 + .../src/main/distribution/windows-text/bin/karaf.bat | 4 ++++ .../src/main/distribution/windows-text/bin/setenv.bat | 2 ++ assemblies/apache-karaf/src/main/filtered-resources/bin/admin | 4 ++++ .../apache-karaf/src/main/filtered-resources/bin/admin.bat | 4 ++++ .../apache-karaf/src/main/filtered-resources/bin/client.bat | 4 ++++ assemblies/apache-karaf/src/main/filtered-resources/bin/shell | 4 ++++ .../apache-karaf/src/main/filtered-resources/bin/shell.bat | 4 ++++ 9 files changed, 31 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/e1c334ec/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/karaf ---------------------------------------------------------------------- diff --git a/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/karaf b/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/karaf index a3d5f40..b8687d2 100755 --- a/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/karaf +++ b/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/karaf @@ -241,6 +241,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/e1c334ec/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/setenv ---------------------------------------------------------------------- diff --git a/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/setenv b/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/setenv index 5512298..d4f2053 100755 --- a/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/setenv +++ b/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/setenv @@ -39,6 +39,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 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/e1c334ec/assemblies/apache-karaf/src/main/distribution/windows-text/bin/karaf.bat ---------------------------------------------------------------------- diff --git a/assemblies/apache-karaf/src/main/distribution/windows-text/bin/karaf.bat b/assemblies/apache-karaf/src/main/distribution/windows-text/bin/karaf.bat index 6c1a1ba..36affdc 100755 --- a/assemblies/apache-karaf/src/main/distribution/windows-text/bin/karaf.bat +++ b/assemblies/apache-karaf/src/main/distribution/windows-text/bin/karaf.bat @@ -232,6 +232,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/e1c334ec/assemblies/apache-karaf/src/main/distribution/windows-text/bin/setenv.bat ---------------------------------------------------------------------- diff --git a/assemblies/apache-karaf/src/main/distribution/windows-text/bin/setenv.bat b/assemblies/apache-karaf/src/main/distribution/windows-text/bin/setenv.bat index 89c3b3c..88280a7 100644 --- a/assemblies/apache-karaf/src/main/distribution/windows-text/bin/setenv.bat +++ b/assemblies/apache-karaf/src/main/distribution/windows-text/bin/setenv.bat @@ -46,6 +46,8 @@ rem Minimum perm memory for the JVM rem SET JAVA_PERM_MEM rem Maximum 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/e1c334ec/assemblies/apache-karaf/src/main/filtered-resources/bin/admin ---------------------------------------------------------------------- diff --git a/assemblies/apache-karaf/src/main/filtered-resources/bin/admin b/assemblies/apache-karaf/src/main/filtered-resources/bin/admin index 09b9350..bcf6cf0 100644 --- a/assemblies/apache-karaf/src/main/filtered-resources/bin/admin +++ b/assemblies/apache-karaf/src/main/filtered-resources/bin/admin @@ -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/e1c334ec/assemblies/apache-karaf/src/main/filtered-resources/bin/admin.bat ---------------------------------------------------------------------- diff --git a/assemblies/apache-karaf/src/main/filtered-resources/bin/admin.bat b/assemblies/apache-karaf/src/main/filtered-resources/bin/admin.bat index 031bf7e..faee42e 100644 --- a/assemblies/apache-karaf/src/main/filtered-resources/bin/admin.bat +++ b/assemblies/apache-karaf/src/main/filtered-resources/bin/admin.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/e1c334ec/assemblies/apache-karaf/src/main/filtered-resources/bin/client.bat ---------------------------------------------------------------------- diff --git a/assemblies/apache-karaf/src/main/filtered-resources/bin/client.bat b/assemblies/apache-karaf/src/main/filtered-resources/bin/client.bat index a2d4eb2..2507502 100644 --- a/assemblies/apache-karaf/src/main/filtered-resources/bin/client.bat +++ b/assemblies/apache-karaf/src/main/filtered-resources/bin/client.bat @@ -112,6 +112,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/e1c334ec/assemblies/apache-karaf/src/main/filtered-resources/bin/shell ---------------------------------------------------------------------- diff --git a/assemblies/apache-karaf/src/main/filtered-resources/bin/shell b/assemblies/apache-karaf/src/main/filtered-resources/bin/shell index 0199eb8..330631a 100644 --- a/assemblies/apache-karaf/src/main/filtered-resources/bin/shell +++ b/assemblies/apache-karaf/src/main/filtered-resources/bin/shell @@ -233,6 +233,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/e1c334ec/assemblies/apache-karaf/src/main/filtered-resources/bin/shell.bat ---------------------------------------------------------------------- diff --git a/assemblies/apache-karaf/src/main/filtered-resources/bin/shell.bat b/assemblies/apache-karaf/src/main/filtered-resources/bin/shell.bat index 3f7ab19..bf5937c 100644 --- a/assemblies/apache-karaf/src/main/filtered-resources/bin/shell.bat +++ b/assemblies/apache-karaf/src/main/filtered-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%
