Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 95106 invoked from network); 11 Dec 2008 16:22:37 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 11 Dec 2008 16:22:37 -0000 Received: (qmail 42926 invoked by uid 500); 11 Dec 2008 16:22:49 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 42877 invoked by uid 500); 11 Dec 2008 16:22:49 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 42868 invoked by uid 99); 11 Dec 2008 16:22:49 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 11 Dec 2008 08:22:49 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 11 Dec 2008 16:22:36 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 407962388999; Thu, 11 Dec 2008 08:22:16 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit 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 -0000 To: scm@geronimo.apache.org From: gawor@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20081211162216.407962388999@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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.