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 2017/12/11 10:12:24 UTC
[karaf] branch karaf-4.1.x updated: [KARAF-5464] Add
KARAF_SYSTEM_OPTS on karaf.bat and add corresponding comments in setenv
This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch karaf-4.1.x
in repository https://gitbox.apache.org/repos/asf/karaf.git
The following commit(s) were added to refs/heads/karaf-4.1.x by this push:
new 2252b64 [KARAF-5464] Add KARAF_SYSTEM_OPTS on karaf.bat and add corresponding comments in setenv
2252b64 is described below
commit 2252b645a2e770adc8da3930707cc78206284a7f
Author: Jean-Baptiste Onofré <jb...@apache.org>
AuthorDate: Mon Dec 11 09:30:32 2017 +0100
[KARAF-5464] Add KARAF_SYSTEM_OPTS on karaf.bat and add corresponding comments in setenv
---
.../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 ++
3 files changed, 5 insertions(+), 2 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 f78d961..0c0d9d2 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
@@ -402,7 +402,7 @@ if "%KARAF_PROFILER%" == "" goto :RUN
-Djava.io.tmpdir="%KARAF_DATA%\tmp" ^
-Dkaraf.data="%KARAF_DATA%" ^
-Djava.util.logging.config.file="%KARAF_BASE%\etc\java.util.logging.properties" ^
- %KARAF_OPTS% %MAIN% %ARGS%
+ %KARAF_SYSTEM_OPTS% %KARAF_OPTS% %MAIN% %ARGS%
) else (
"%JAVA%" %JAVA_OPTS% %OPTS% ^
-classpath "%CLASSPATH%" ^
@@ -416,7 +416,7 @@ if "%KARAF_PROFILER%" == "" goto :RUN
-Djava.io.tmpdir="%KARAF_DATA%\tmp" ^
-Dkaraf.data="%KARAF_DATA%" ^
-Djava.util.logging.config.file="%KARAF_BASE%\etc\java.util.logging.properties" ^
- %KARAF_OPTS% %MAIN% %ARGS%
+ %KARAF_SYSTEM_OPTS% %KARAF_OPTS% %MAIN% %ARGS%
)
) else (
echo There is a Root instance already running with name %ROOT_INSTANCE_NAME% and pid %ROOT_INSTANCE_PID%. If you know what you are doing and want to force the run anyway, SET CHECK_ROOT_INSTANCE_RUNNING=false and re run the command.
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 7ea9f69..f285fc0 100755
--- a/assemblies/features/base/src/main/filtered-resources/resources/bin/setenv
+++ b/assemblies/features/base/src/main/filtered-resources/resources/bin/setenv
@@ -45,6 +45,7 @@
# export KARAF_DATA # Karaf data folder
# export KARAF_BASE # Karaf base folder
# export KARAF_ETC # Karaf etc folder
+# export KARAF_SYSTEM_OPTS # First citizen Karaf options
# export KARAF_OPTS # Additional available Karaf options
# export KARAF_DEBUG # Enable debug mode
# export KARAF_REDIRECT # Enable/set the std/err redirection when using bin/start
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 2eead33..b5ed417 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
@@ -58,6 +58,8 @@ rem Karaf base folder
rem SET KARAF_BASE
rem Karaf etc folder
rem SET KARAF_ETC
+rem First citizen Karaf options
+rem SET KARAF_SYSTEM_OPTS
rem Additional available Karaf options
rem SET KARAF_OPTS
rem Enable debug mode
--
To stop receiving notification emails like this one, please contact
['"commits@karaf.apache.org" <co...@karaf.apache.org>'].