geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r725731 - /geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/src/main/underlay/bin/setjavaenv.bat
Date Thu, 11 Dec 2008 16:22:16 GMT
Author: gawor
Date: Thu Dec 11 08:22:15 2008
New Revision: 725731

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

Modified:
    geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/src/main/underlay/bin/setjavaenv.bat

Modified: geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/src/main/underlay/bin/setjavaenv.bat
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/src/main/underlay/bin/setjavaenv.bat?rev=725731&r1=725730&r2=725731&view=diff
==============================================================================
--- geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/src/main/underlay/bin/setjavaenv.bat
(original)
+++ geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/src/main/underlay/bin/setjavaenv.bat
Thu Dec 11 08:22:15 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.



Mime
View raw message