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 2014/09/29 15:30:52 UTC
git commit: [KARAF-3250] Fix options support in karaf.bat on Windows
platform
Repository: karaf
Updated Branches:
refs/heads/karaf-3.0.x 66631a0d8 -> 2a88926f1
[KARAF-3250] Fix options support in karaf.bat on Windows platform
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/2a88926f
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/2a88926f
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/2a88926f
Branch: refs/heads/karaf-3.0.x
Commit: 2a88926f12f900c11b49174a518f212998fb89e5
Parents: 66631a0
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Mon Sep 29 15:29:18 2014 +0200
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Mon Sep 29 15:29:18 2014 +0200
----------------------------------------------------------------------
.../src/main/resources/resources/bin/karaf.bat | 22 ++++++++++----------
1 file changed, 11 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/2a88926f/assemblies/features/framework/src/main/resources/resources/bin/karaf.bat
----------------------------------------------------------------------
diff --git a/assemblies/features/framework/src/main/resources/resources/bin/karaf.bat b/assemblies/features/framework/src/main/resources/resources/bin/karaf.bat
index 58a5369..c650fcb 100644
--- a/assemblies/features/framework/src/main/resources/resources/bin/karaf.bat
+++ b/assemblies/features/framework/src/main/resources/resources/bin/karaf.bat
@@ -97,14 +97,6 @@ if "%KARAF_ETC%" == "" (
set LOCAL_CLASSPATH=%CLASSPATH%
set JAVA_MODE=-server
-rem Check some easily accessible MIN/MAX params for JVM mem usage
-if not "%JAVA_PERM_MEM%" == "" (
- set DEFAULT_JAVA_OPTS=%DEFAULT_JAVA_OPTS% -XX:PermSize=%JAVA_PERM_MEM%
-)
-if not "%JAVA_MAX_PERM_MEM%" == "" (
- set DEFAULT_JAVA_OPTS=%DEFAULT_JAVA_OPTS% -XX:MaxPermSize=%JAVA_MAX_PERM_MEM%
-)
-
set CLASSPATH=%LOCAL_CLASSPATH%;%KARAF_BASE%\conf
set DEFAULT_JAVA_DEBUG_OPTS=-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005
@@ -229,10 +221,18 @@ if not exist "%JAVA_HOME%\bin\server\jvm.dll" (
)
set DEFAULT_JAVA_OPTS=%JAVA_MODE% -Xms%JAVA_MIN_MEM% -Xmx%JAVA_MAX_MEM% -Dderby.system.home="%KARAF_DATA%\derby" -Dderby.storage.fileSyncTransactionLog=true -Dcom.sun.management.jmxremote -XX:+UnlockDiagnosticVMOptions -XX:+UnsyncloadClass
+rem Check some easily accessible MIN/MAX params for JVM mem usage
+if not "%JAVA_PERM_MEM%" == "" (
+ set DEFAULT_JAVA_OPTS=%DEFAULT_JAVA_OPTS% -XX:PermSize=%JAVA_PERM_MEM%
+)
+if not "%JAVA_MAX_PERM_MEM%" == "" (
+ set DEFAULT_JAVA_OPTS=%DEFAULT_JAVA_OPTS% -XX:MaxPermSize=%JAVA_MAX_PERM_MEM%
+)
+
if "%JAVA_OPTS%" == "" set JAVA_OPTS=%DEFAULT_JAVA_OPTS%
if "%EXTRA_JAVA_OPTS%" == "" goto :KARAF_EXTRA_JAVA_OPTS_END
- set JAVA_OPTS="%JAVA_OPTS% %EXTRA_JAVA_OPTS%"
+ set JAVA_OPTS=%JAVA_OPTS% %EXTRA_JAVA_OPTS%
:KARAF_EXTRA_JAVA_OPTS_END
if "%KARAF_DEBUG%" == "" goto :KARAF_DEBUG_END
@@ -241,7 +241,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
@@ -319,7 +319,7 @@ 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 JAVA_OPTS=%JAVA_DEBUG_OPTS% %JAVA_OPTS%
shift
goto :RUN_LOOP