Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 14161 invoked from network); 12 Dec 2006 22:46:34 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 12 Dec 2006 22:46:34 -0000 Received: (qmail 27264 invoked by uid 500); 12 Dec 2006 22:46:41 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 27236 invoked by uid 500); 12 Dec 2006 22:46:41 -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 27225 invoked by uid 99); 12 Dec 2006 22:46:41 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 12 Dec 2006 14:46:41 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 12 Dec 2006 14:46:33 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id 493AB1A981A; Tue, 12 Dec 2006 14:45:48 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r486381 - in /geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/bin: deploy.bat geronimo.bat shutdown.bat startup.bat Date: Tue, 12 Dec 2006 22:45:48 -0000 To: scm@geronimo.apache.org From: dain@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20061212224548.493AB1A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dain Date: Tue Dec 12 14:45:47 2006 New Revision: 486381 URL: http://svn.apache.org/viewvc?view=rev&rev=486381 Log: Applied GERONIMO-2555 Windows scripts don't work when used from different drive Thanks for the patch Mark DeLaFranier Modified: geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/bin/deploy.bat geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/bin/geronimo.bat geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/bin/shutdown.bat geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/bin/startup.bat Modified: geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/bin/deploy.bat URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/bin/deploy.bat?view=diff&rev=486381&r1=486380&r2=486381 ============================================================================== --- geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/bin/deploy.bat (original) +++ geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/bin/deploy.bat Tue Dec 12 14:45:47 2006 @@ -115,9 +115,9 @@ @REM resolve .. and remove any trailing slashes :resolveHome set CURRENT_DIR=%cd% -cd %GERONIMO_HOME% +cd /d %GERONIMO_HOME% set GERONIMO_HOME=%cd% -cd %CURRENT_DIR% +cd /d %CURRENT_DIR% :gotHome if exist "%GERONIMO_HOME%\bin\deploy.bat" goto okHome Modified: geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/bin/geronimo.bat URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/bin/geronimo.bat?view=diff&rev=486381&r1=486380&r2=486381 ============================================================================== --- geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/bin/geronimo.bat (original) +++ geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/bin/geronimo.bat Tue Dec 12 14:45:47 2006 @@ -152,9 +152,9 @@ @REM resolve .. and remove any trailing slashes :resolveHome set CURRENT_DIR=%cd% -cd %GERONIMO_HOME% +cd /d %GERONIMO_HOME% set GERONIMO_HOME=%cd% -cd %CURRENT_DIR% +cd /d %CURRENT_DIR% :gotHome if exist "%GERONIMO_HOME%\bin\geronimo.bat" goto okHome Modified: geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/bin/shutdown.bat URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/bin/shutdown.bat?view=diff&rev=486381&r1=486380&r2=486381 ============================================================================== --- geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/bin/shutdown.bat (original) +++ geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/bin/shutdown.bat Tue Dec 12 14:45:47 2006 @@ -56,20 +56,24 @@ :okOsCheck setlocal -@REM Guess GERONIMO_HOME if not defined +if not "%GERONIMO_HOME%" == "" goto resolveHome +@REM %~dp0 is expanded pathname of the current script +set GERONIMO_HOME=%~dp0.. + +@REM resolve .. and remove any trailing slashes +:resolveHome set CURRENT_DIR=%cd% -if not "%GERONIMO_HOME%" == "" goto gotHome -set GERONIMO_HOME=%CURRENT_DIR% -if exist "%GERONIMO_HOME%\bin\geronimo.bat" goto okHome -cd .. +cd /d %GERONIMO_HOME% set GERONIMO_HOME=%cd% -cd %CURRENT_DIR% +cd /d %CURRENT_DIR% + :gotHome if exist "%GERONIMO_HOME%\bin\geronimo.bat" goto okHome echo The GERONIMO_HOME environment variable is not defined correctly echo This environment variable is needed to run this program set ERRORLEVEL=1 goto end + :okHome set EXECUTABLE=%GERONIMO_HOME%\bin\geronimo.bat Modified: geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/bin/startup.bat URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/bin/startup.bat?view=diff&rev=486381&r1=486380&r2=486381 ============================================================================== --- geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/bin/startup.bat (original) +++ geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/bin/startup.bat Tue Dec 12 14:45:47 2006 @@ -52,14 +52,17 @@ :okOsCheck setlocal -@REM Guess GERONIMO_HOME if not defined +if not "%GERONIMO_HOME%" == "" goto resolveHome +@REM %~dp0 is expanded pathname of the current script +set GERONIMO_HOME=%~dp0.. + +@REM resolve .. and remove any trailing slashes +:resolveHome set CURRENT_DIR=%cd% -if not "%GERONIMO_HOME%" == "" goto gotHome -set GERONIMO_HOME=%CURRENT_DIR% -if exist "%GERONIMO_HOME%\bin\geronimo.bat" goto okHome -cd .. +cd /d %GERONIMO_HOME% set GERONIMO_HOME=%cd% -cd %CURRENT_DIR% +cd /d %CURRENT_DIR% + :gotHome if exist "%GERONIMO_HOME%\bin\geronimo.bat" goto okHome echo The GERONIMO_HOME environment variable is not defined correctly