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/07/23 10:53:48 UTC
git commit: [KARAF-2315] Move JDK test after JAVA_HOME definition in
karaf.bat
Repository: karaf
Updated Branches:
refs/heads/master 63e1146f6 -> 93839c640
[KARAF-2315] Move JDK test after JAVA_HOME definition in karaf.bat
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/93839c64
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/93839c64
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/93839c64
Branch: refs/heads/master
Commit: 93839c640af9ecc20f1250deb3d2ee2108ef794e
Parents: 63e1146
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Wed Jul 23 10:53:04 2014 +0200
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Wed Jul 23 10:53:04 2014 +0200
----------------------------------------------------------------------
.../filtered-resources/resources/bin/karaf.bat | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/93839c64/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 e970f61..aff0c19 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
@@ -96,15 +96,6 @@ if "%KARAF_ETC%" == "" (
set LOCAL_CLASSPATH=%CLASSPATH%
set JAVA_MODE=-server
-if not exist "%JAVA_HOME%\bin\server\jvm.dll" (
- if not exist "%JAVA_HOME%\jre\bin\server\jvm.dll" (
- echo WARNING: Running karaf on a Java HotSpot Client VM because server-mode is not available.
- echo Install Java Developer Kit to fix this.
- echo For more details see http://java.sun.com/products/hotspot/whitepaper.html#client
- set JAVA_MODE=-client
- )
-)
-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%" == "" (
@@ -228,6 +219,16 @@ if not "%JAVA%" == "" goto :Check_JAVA_END
set JAVA=%JAVA_HOME%\bin\java
:Check_JAVA_END
+if not exist "%JAVA_HOME%\bin\server\jvm.dll" (
+ if not exist "%JAVA_HOME%\jre\bin\server\jvm.dll" (
+ echo WARNING: Running Karaf on a Java HotSpot Client VM because server-mode is not available.
+ echo Install Java Developer Kit to fix this.
+ echo For more details see http://java.sun.com/products/hotspot/whitepaper.html#client
+ set JAVA_MODE=-client
+ )
+)
+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
+
if "%JAVA_OPTS%" == "" set JAVA_OPTS=%DEFAULT_JAVA_OPTS%
if "%EXTRA_JAVA_OPTS%" == "" goto :KARAF_EXTRA_JAVA_OPTS_END