You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2020/12/09 08:52:52 UTC
[karaf] branch karaf-4.2.x updated: Add ability to set additional
non-debug JVM options
This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch karaf-4.2.x
in repository https://gitbox.apache.org/repos/asf/karaf.git
The following commit(s) were added to refs/heads/karaf-4.2.x by this push:
new e19e271 Add ability to set additional non-debug JVM options
e19e271 is described below
commit e19e271cdab562b04ca9409b41cae92c02547943
Author: Fabian Wolter <fw...@skytender.de>
AuthorDate: Mon Dec 7 18:25:27 2020 +0100
Add ability to set additional non-debug JVM options
(cherry picked from commit 04285fa46a086ce4db53c7739c2453f7b32cfc9c)
---
.../features/base/src/main/filtered-resources/resources/bin/karaf | 2 ++
.../features/base/src/main/filtered-resources/resources/bin/karaf.bat | 4 ++++
.../features/base/src/main/filtered-resources/resources/bin/setenv | 1 +
.../base/src/main/filtered-resources/resources/bin/setenv.bat | 2 ++
4 files changed, 9 insertions(+)
diff --git a/assemblies/features/base/src/main/filtered-resources/resources/bin/karaf b/assemblies/features/base/src/main/filtered-resources/resources/bin/karaf
index 9b3b791..fbd3c16 100755
--- a/assemblies/features/base/src/main/filtered-resources/resources/bin/karaf
+++ b/assemblies/features/base/src/main/filtered-resources/resources/bin/karaf
@@ -277,6 +277,8 @@ run() {
fi
fi
JAVA_OPTS="${JAVA_DEBUG_OPTS} ${JAVA_OPTS}"
+ else
+ JAVA_OPTS="${JAVA_NON_DEBUG_OPTS} ${JAVA_OPTS}"
fi
while true; do
diff --git a/assemblies/features/base/src/main/filtered-resources/resources/bin/karaf.bat b/assemblies/features/base/src/main/filtered-resources/resources/bin/karaf.bat
index 77b51fd..fce5031 100644
--- a/assemblies/features/base/src/main/filtered-resources/resources/bin/karaf.bat
+++ b/assemblies/features/base/src/main/filtered-resources/resources/bin/karaf.bat
@@ -394,12 +394,14 @@ 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 DEBUG=true
shift
goto :RUN_LOOP
:EXECUTE_DEBUGS
if "%JAVA_DEBUG_OPTS%" == "" set JAVA_DEBUG_OPTS=%DEFAULT_JAVA_DEBUGS_OPTS%
set JAVA_OPTS=%JAVA_DEBUG_OPTS% %JAVA_OPTS%
+ set DEBUG=true
shift
goto :RUN_LOOP
@@ -408,6 +410,8 @@ if "%KARAF_PROFILER%" == "" goto :RUN
rem Execute the Java Virtual Machine
cd "%KARAF_BASE%"
+ if not "%DEBUG%" == "true" set JAVA_OPTS=%JAVA_NON_DEBUG_OPTS% %JAVA_OPTS%
+
rem When users want to update the lib version of, they just need to create
rem a lib.next directory and on the new restart, it will replace the current lib directory.
if exist "%KARAF_HOME%\lib.next" (
diff --git a/assemblies/features/base/src/main/filtered-resources/resources/bin/setenv b/assemblies/features/base/src/main/filtered-resources/resources/bin/setenv
index 041966b..9c45446 100755
--- a/assemblies/features/base/src/main/filtered-resources/resources/bin/setenv
+++ b/assemblies/features/base/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 JAVA_NON_DEBUG_OPTS # Additional non-debug JVM options
# export EXTRA_JAVA_OPTS # Additional JVM options
# export KARAF_HOME # Karaf home folder
# export KARAF_DATA # Karaf data folder
diff --git a/assemblies/features/base/src/main/filtered-resources/resources/bin/setenv.bat b/assemblies/features/base/src/main/filtered-resources/resources/bin/setenv.bat
index 9d16b67..1d647e1 100644
--- a/assemblies/features/base/src/main/filtered-resources/resources/bin/setenv.bat
+++ b/assemblies/features/base/src/main/filtered-resources/resources/bin/setenv.bat
@@ -49,6 +49,8 @@ rem SET JAVA_PERM_MEM
rem Maximum perm memory for the JVM
rem SET JAVA_MAX_PERM_MEM
rem Additional JVM options
+rem SET JAVA_NON_DEBUG_OPTS
+rem Additional non-debug JVM options
rem SET EXTRA_JAVA_OPTS
rem Karaf home folder
rem SET KARAF_HOME