You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by ja...@apache.org on 2014/05/15 21:03:42 UTC
[1/6] git commit: KARAF-2984 - Improve setenv script to include
placeholder for extra java options
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 <ja...@gmail.com>
Authored: Thu May 15 16:18:41 2014 -0230
Committer: Jonathan Anstey <ja...@gmail.com>
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%
[4/6] git commit: Fix misplaced quote
Posted by ja...@apache.org.
Fix misplaced quote
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/036570fe
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/036570fe
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/036570fe
Branch: refs/heads/master
Commit: 036570fe9f8b4e69ec3a331f691b3160f027892c
Parents: 9b1cca0
Author: Jonathan Anstey <ja...@gmail.com>
Authored: Thu May 15 16:31:13 2014 -0230
Committer: Jonathan Anstey <ja...@gmail.com>
Committed: Thu May 15 16:31:13 2014 -0230
----------------------------------------------------------------------
.../src/main/filtered-resources/resources/bin/client.bat | 2 +-
.../src/main/filtered-resources/resources/bin/instance.bat | 2 +-
.../src/main/filtered-resources/resources/bin/karaf.bat | 4 ++--
.../src/main/filtered-resources/resources/bin/shell.bat | 4 ++--
4 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/036570fe/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 e28d90a..7153c2a 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
@@ -112,7 +112,7 @@ 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%"
+ set JAVA_OPTS="%EXTRA_JAVA_OPTS% %JAVA_OPTS%"
:KARAF_EXTRA_JAVA_OPTS_END
set CLASSPATH=%KARAF_HOME%\lib\bin\karaf-client.jar
http://git-wip-us.apache.org/repos/asf/karaf/blob/036570fe/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 221adb6..bb2a911 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
@@ -121,7 +121,7 @@ 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
http://git-wip-us.apache.org/repos/asf/karaf/blob/036570fe/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 7545488..e970f61 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
@@ -231,7 +231,7 @@ 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%"
+ set JAVA_OPTS="%EXTRA_JAVA_OPTS% %JAVA_OPTS%"
:KARAF_EXTRA_JAVA_OPTS_END
if "%KARAF_DEBUG%" == "" goto :KARAF_DEBUG_END
@@ -240,7 +240,7 @@ 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
http://git-wip-us.apache.org/repos/asf/karaf/blob/036570fe/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 ae562fe..bae846e 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
@@ -114,14 +114,14 @@ 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%"
+ 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%
- 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
[6/6] git commit: Fix misplaced quote
Posted by ja...@apache.org.
Fix misplaced quote
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/c47204bf
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/c47204bf
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/c47204bf
Branch: refs/heads/karaf-2.x
Commit: c47204bf871f9cf5aaece5fd03f1254e4fc0814b
Parents: e1c334e
Author: Jonathan Anstey <ja...@gmail.com>
Authored: Thu May 15 16:33:15 2014 -0230
Committer: Jonathan Anstey <ja...@gmail.com>
Committed: Thu May 15 16:33:15 2014 -0230
----------------------------------------------------------------------
.../src/main/distribution/windows-text/bin/karaf.bat | 4 ++--
.../apache-karaf/src/main/filtered-resources/bin/admin.bat | 4 ++--
.../apache-karaf/src/main/filtered-resources/bin/client.bat | 2 +-
.../apache-karaf/src/main/filtered-resources/bin/shell.bat | 4 ++--
4 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/c47204bf/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 36affdc..67bded5 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
@@ -233,7 +233,7 @@ 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%"
+ set JAVA_OPTS="%EXTRA_JAVA_OPTS% %JAVA_OPTS%"
:KARAF_EXTRA_JAVA_OPTS_END
if "%KARAF_DEBUG%" == "" goto :KARAF_DEBUG_END
@@ -242,7 +242,7 @@ 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
http://git-wip-us.apache.org/repos/asf/karaf/blob/c47204bf/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 faee42e..3572f41 100644
--- a/assemblies/apache-karaf/src/main/filtered-resources/bin/admin.bat
+++ b/assemblies/apache-karaf/src/main/filtered-resources/bin/admin.bat
@@ -114,14 +114,14 @@ 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%"
+ 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%
- 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
http://git-wip-us.apache.org/repos/asf/karaf/blob/c47204bf/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 2507502..40b4ecd 100644
--- a/assemblies/apache-karaf/src/main/filtered-resources/bin/client.bat
+++ b/assemblies/apache-karaf/src/main/filtered-resources/bin/client.bat
@@ -113,7 +113,7 @@ 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%"
+ set JAVA_OPTS="%EXTRA_JAVA_OPTS% %JAVA_OPTS%"
:KARAF_EXTRA_JAVA_OPTS_END
set CLASSPATH=%KARAF_HOME%\lib\bin\karaf-client.jar
http://git-wip-us.apache.org/repos/asf/karaf/blob/c47204bf/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 bf5937c..b444038 100644
--- a/assemblies/apache-karaf/src/main/filtered-resources/bin/shell.bat
+++ b/assemblies/apache-karaf/src/main/filtered-resources/bin/shell.bat
@@ -114,14 +114,14 @@ 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%"
+ 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%
- 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
[3/6] git commit: KARAF-2984 - Improve setenv script to include
placeholder for extra java options
Posted by ja...@apache.org.
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/9b1cca04
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/9b1cca04
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/9b1cca04
Branch: refs/heads/master
Commit: 9b1cca0435060248a579226bb14e14a88f58bfa2
Parents: 57ec802
Author: Jonathan Anstey <ja...@gmail.com>
Authored: Thu May 15 16:28:15 2014 -0230
Committer: Jonathan Anstey <ja...@gmail.com>
Committed: Thu May 15 16:28:41 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/9b1cca04/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/9b1cca04/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/9b1cca04/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/9b1cca04/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/9b1cca04/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/9b1cca04/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/9b1cca04/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/9b1cca04/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 bb62d23..e733d2f 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/9b1cca04/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 69b7a72..ae562fe 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%
[5/6] git commit: Fix misplaced quote
Posted by ja...@apache.org.
Fix misplaced quote
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/cb2f6126
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/cb2f6126
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/cb2f6126
Branch: refs/heads/karaf-3.0.x
Commit: cb2f612644975ae081d41280fcf59264e7f488be
Parents: 52cd3d5
Author: Jonathan Anstey <ja...@gmail.com>
Authored: Thu May 15 16:31:13 2014 -0230
Committer: Jonathan Anstey <ja...@gmail.com>
Committed: Thu May 15 16:31:33 2014 -0230
----------------------------------------------------------------------
.../src/main/filtered-resources/resources/bin/client.bat | 2 +-
.../src/main/filtered-resources/resources/bin/instance.bat | 2 +-
.../src/main/filtered-resources/resources/bin/karaf.bat | 4 ++--
.../src/main/filtered-resources/resources/bin/shell.bat | 4 ++--
4 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/cb2f6126/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 e28d90a..7153c2a 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
@@ -112,7 +112,7 @@ 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%"
+ set JAVA_OPTS="%EXTRA_JAVA_OPTS% %JAVA_OPTS%"
:KARAF_EXTRA_JAVA_OPTS_END
set CLASSPATH=%KARAF_HOME%\lib\bin\karaf-client.jar
http://git-wip-us.apache.org/repos/asf/karaf/blob/cb2f6126/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 221adb6..bb2a911 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
@@ -121,7 +121,7 @@ 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
http://git-wip-us.apache.org/repos/asf/karaf/blob/cb2f6126/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 7545488..e970f61 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
@@ -231,7 +231,7 @@ 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%"
+ set JAVA_OPTS="%EXTRA_JAVA_OPTS% %JAVA_OPTS%"
:KARAF_EXTRA_JAVA_OPTS_END
if "%KARAF_DEBUG%" == "" goto :KARAF_DEBUG_END
@@ -240,7 +240,7 @@ 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
http://git-wip-us.apache.org/repos/asf/karaf/blob/cb2f6126/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 8d3cc3a..18241fb 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
@@ -114,14 +114,14 @@ 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%"
+ 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%
- 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
[2/6] git commit: KARAF-2984 - Improve setenv script to include
placeholder for extra java options
Posted by ja...@apache.org.
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 <ja...@gmail.com>
Authored: Thu May 15 16:28:15 2014 -0230
Committer: Jonathan Anstey <ja...@gmail.com>
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%