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 4b428fd [KARAF-7071] Cleanup reference to *_MEM (replaced by
JAVA_OPTS)
4b428fd is described below
commit 4b428fd6b99676003fd55911105149ac269d45b2
Author: jbonofre <[email protected]>
AuthorDate: Thu Mar 25 06:06:01 2021 +0100
[KARAF-7071] Cleanup reference to *_MEM (replaced by JAVA_OPTS)
(cherry picked from commit 0947c4b01327563ae0b8e3c12ac56f2ef7cfed6d)
---
.../base/src/main/filtered-resources/resources/bin/karaf.bat | 10 +---------
.../base/src/main/filtered-resources/resources/bin/setenv | 5 +----
.../base/src/main/filtered-resources/resources/bin/setenv.bat | 10 ++--------
3 files changed, 4 insertions(+), 21 deletions(-)
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 556df79..95e862e 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
@@ -40,14 +40,6 @@ if not "%KARAF_TITLE%" == "" (
title Karaf
)
-rem Check/Set up some easily accessible MIN/MAX params for JVM mem usage
-if "%JAVA_MIN_MEM%" == "" (
- set JAVA_MIN_MEM=128M
-)
-if "%JAVA_MAX_MEM%" == "" (
- set JAVA_MAX_MEM=512M
-)
-
goto BEGIN
:warn
@@ -268,7 +260,7 @@ if not exist "%JAVA_HOME%\bin\server\jvm.dll" (
echo For more details see
http://java.sun.com/products/hotspot/whitepaper.html#client
)
)
-set DEFAULT_JAVA_OPTS=-Xms%JAVA_MIN_MEM% -Xmx%JAVA_MAX_MEM%
-XX:+UnlockDiagnosticVMOptions
+set DEFAULT_JAVA_OPTS=-XX:+UnlockDiagnosticVMOptions
if "%JAVA_OPTS%" == "" set JAVA_OPTS=%DEFAULT_JAVA_OPTS%
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 9c45446..130f2a8 100755
--- a/assemblies/features/base/src/main/filtered-resources/resources/bin/setenv
+++ b/assemblies/features/base/src/main/filtered-resources/resources/bin/setenv
@@ -36,10 +36,7 @@
# karaf scripts
#
# export JAVA_HOME # Location of Java installation
-# export JAVA_MIN_MEM # Minimum memory for the JVM
-# 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_OPTS # Generic JVM options, for instance, where you can pass the
memory configuration
# export JAVA_NON_DEBUG_OPTS # Additional non-debug JVM options
# export EXTRA_JAVA_OPTS # Additional JVM options
# export KARAF_HOME # Karaf home 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 1d647e1..9f4e9fe 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
@@ -40,14 +40,8 @@ rem Window name of the windows console
rem SET KARAF_TITLE
rem Location of Java installation
rem SET JAVA_HOME
-rem Minimum memory for the JVM
-rem SET JAVA_MIN_MEM
-rem Maximum memory for the JVM
-rem SET JAVA_MAX_MEM
-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 Generic JVM options (for instance, where you can provide memory
configuration)
+rem SET JAVA_OPTS
rem Additional JVM options
rem SET JAVA_NON_DEBUG_OPTS
rem Additional non-debug JVM options
