[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/1b5fb8f4 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/1b5fb8f4 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/1b5fb8f4 Branch: refs/heads/karaf-2.3.x Commit: 1b5fb8f4819cbc2b31350fe441a30fcc9f11b374 Parents: 2bc415c Author: Jean-Baptiste Onofré <jbono...@apache.org> Authored: Wed Jul 23 11:04:01 2014 +0200 Committer: Jean-Baptiste Onofré <jbono...@apache.org> Committed: Wed Jul 23 11:04:01 2014 +0200 ---------------------------------------------------------------------- .../distribution/windows-text/bin/karaf.bat | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/1b5fb8f4/assemblies/apache-karaf/src/main/distribution/windows-text/bin/karaf.bat ---------------------------------------------------------------------- diff --git a/assemblies/apache-karaf/src/main/distribution/windows-text/bin/karaf.bat b/assemblies/apache-karaf/src/main/distribution/windows-text/bin/karaf.bat index 06ff47a..e7142d9 100755 --- a/assemblies/apache-karaf/src/main/distribution/windows-text/bin/karaf.bat +++ b/assemblies/apache-karaf/src/main/distribution/windows-text/bin/karaf.bat @@ -85,17 +85,7 @@ if "%KARAF_DATA%" == "" ( ) 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 rem Check some easily accessible MIN/MAX params for JVM mem usage if not "%JAVA_PERM_MEM%" == "" ( @@ -222,6 +212,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 + if "%JAVA_OPTS%" == "" set JAVA_OPTS=%DEFAULT_JAVA_OPTS% if "%KARAF_DEBUG%" == "" goto :KARAF_DEBUG_END
