You are viewing a plain text version of this content. The canonical link for it is here.

Posted to scm@geronimo.apache.org by ga...@apache.org on 2008/12/11 17:21:50 UTC

svn commit: r725730 - /geronimo/server/trunk/assemblies/geronimo-boilerplate/src/main/underlay/contents/bin/setjavaenv.bat

Author: gawor
Date: Thu Dec 11 08:21:50 2008
New Revision: 725730

URL: http://svn.apache.org/viewvc?rev=725730&view=rev
Log:
Allow JAVA_HOME to point to a JRE in Windows OS. Patch from Jack Cai (GERONIMO-4462)

Modified:
    geronimo/server/trunk/assemblies/geronimo-boilerplate/src/main/underlay/contents/bin/setjavaenv.bat

Modified: geronimo/server/trunk/assemblies/geronimo-boilerplate/src/main/underlay/contents/bin/setjavaenv.bat
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-boilerplate/src/main/underlay/contents/bin/setjavaenv.bat?rev=725730&r1=725729&r2=725730&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-boilerplate/src/main/underlay/contents/bin/setjavaenv.bat (original)
+++ geronimo/server/trunk/assemblies/geronimo-boilerplate/src/main/underlay/contents/bin/setjavaenv.bat Thu Dec 11 08:21:50 2008
@@ -86,7 +86,7 @@
 
 :okJdkFileCheck
 @REM default JRE_HOME to JAVA_HOME if not set.
-if "%JRE_HOME%" == "" set JRE_HOME=%JAVA_HOME%\jre
+if "%JRE_HOME%" == "" if exist "%JAVA_HOME%\bin\javac.exe" (set JRE_HOME=%JAVA_HOME%\jre) else set JRE_HOME=%JAVA_HOME%
 
 @REM Set standard command for invoking Java.
 @REM Note that NT requires a window name argument when using start.