geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dwo...@apache.org
Subject svn commit: r531321 - in /geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/bin: deploy.bat geronimo.bat shutdown.bat startup.bat
Date Mon, 23 Apr 2007 03:28:26 GMT
Author: dwoods
Date: Sun Apr 22 20:28:26 2007
New Revision: 531321

URL: http://svn.apache.org/viewvc?view=rev&rev=531321
Log:
GERONIMO-3110 Update Windows scripts to handle a couple failure scenarios.

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=531321&r1=531320&r2=531321
==============================================================================
--- 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
Sun Apr 22 20:28:26 2007
@@ -23,17 +23,17 @@
 @REM
 @REM You should not have to edit this file.  If you wish to have
 @REM environment variables set each time you run this batch file
-@REM refer to the information on the setenv.bat file below. 
+@REM refer to the information on the setenv.bat file below.
 @REM
 @REM Invocation Syntax:
 @REM
-@REM   deploy [general options] command [command options] 
+@REM   deploy [general options] command [command options]
 @REM
 @REM   For detailed usage information, just run deploy without
 @REM   arguments.
 @REM
 @REM Environment Variable Prequisites
-@REM 
+@REM
 @REM   GERONIMO_HOME   May point at your Geronimo top-level directory.
 @REM                   If not specified, this batch file will attempt to
 @REM                   discover it relative to the location of this file.
@@ -54,7 +54,7 @@
 @REM                   It is mandatory either JAVA_HOME or JRE_HOME are set.
 @REM
 @REM   JRE_HOME        (Optional) Points to your Java Runtime Environment
-@REM                   Set this if you wish to run Geronimo using the JRE 
+@REM                   Set this if you wish to run Geronimo using the JRE
 @REM                   instead of the JDK.
 @REM                   Defaults to JAVA_HOME if empty.
 @REM                   It is mandatory either JAVA_HOME or JRE_HOME are set.
@@ -72,14 +72,14 @@
 @REM                        end of execution
 @REM
 @REM   GERONIMO_ENV_INFO    (Optional) Environment variable that when set to
-@REM                        "on" (the default) outputs the values of  
+@REM                        "on" (the default) outputs the values of
 @REM                        GERONIMO_HOME, GERONIMO_BASE, GERONIMO_TMPDIR,
 @REM                        JAVA_HOME and JRE_HOME before the command is
 @REM                        issued. Set to "off" if you do not want this
 @REM                        information displayed.
 @REM
 @REM Batch files called by this batch file:
-@REM 
+@REM
 @REM   %GERONIMO_HOME%\bin\setenv.bat
 @REM                   (Optional) This batch file is called if it is present.
 @REM                   Its contents may set one or more of the above environment
@@ -106,7 +106,8 @@
 goto end
 
 :okOsCheck
-setlocal
+@setlocal enableextensions
+@set ERRORLEVEL=0
 
 if not "%GERONIMO_HOME%" == "" goto resolveHome
 @REM %~dp0 is expanded pathname of the current script

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=531321&r1=531320&r2=531321
==============================================================================
--- 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
Sun Apr 22 20:28:26 2007
@@ -143,7 +143,8 @@
 goto end
 
 :okOsCheck
-setlocal
+@setlocal enableextensions
+@set ERRORLEVEL=0
 
 if not "%GERONIMO_HOME%" == "" goto resolveHome
 @REM %~dp0 is expanded pathname of the current script
@@ -324,3 +325,4 @@
 :end
 @REM pause the batch file if GERONIMO_BATCH_PAUSE is set to 'on'
 if "%GERONIMO_BATCH_PAUSE%" == "on" pause
+@endlocal

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=531321&r1=531320&r2=531321
==============================================================================
--- 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
Sun Apr 22 20:28:26 2007
@@ -26,8 +26,8 @@
 @REM
 @REM This batch file is based upon Tomcat's shutdown.bat file to enable
 @REM those familiar with Tomcat to easily stop Geronimo.
-@REM 
-@REM Alternatively you can use the more comprehensive geronimo.bat file 
+@REM
+@REM Alternatively you can use the more comprehensive geronimo.bat file
 @REM directly.
 @REM
 @REM Invocation Syntax:
@@ -54,7 +54,8 @@
 goto end
 
 :okOsCheck
-setlocal
+@setlocal enableextensions
+@set ERRORLEVEL=0
 
 if not "%GERONIMO_HOME%" == "" goto resolveHome
 @REM %~dp0 is expanded pathname of the current script
@@ -98,6 +99,6 @@
 call "%EXECUTABLE%" stop %CMD_LINE_ARGS%
 
 :end
-
 @REM pause the batch file if GERONIMO_BATCH_PAUSE is set to 'on'
 if "%GERONIMO_BATCH_PAUSE%" == "on" pause
+@endlocal

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=531321&r1=531320&r2=531321
==============================================================================
--- 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
Sun Apr 22 20:28:26 2007
@@ -26,8 +26,8 @@
 @REM
 @REM This batch file is based upon Tomcat's startup.bat file to enable
 @REM those familiar with Tomcat to quickly get started with Geronimo.
-@REM 
-@REM Alternatively you can use the more comprehensive geronimo.bat file 
+@REM
+@REM Alternatively you can use the more comprehensive geronimo.bat file
 @REM directly.
 @REM
 @REM Invocation Syntax:
@@ -50,7 +50,8 @@
 goto end
 
 :okOsCheck
-setlocal
+@setlocal enableextensions
+@set ERRORLEVEL=0
 
 if not "%GERONIMO_HOME%" == "" goto resolveHome
 @REM %~dp0 is expanded pathname of the current script
@@ -93,6 +94,6 @@
 call "%EXECUTABLE%" start %CMD_LINE_ARGS%
 
 :end
-
 @REM pause the batch file if GERONIMO_BATCH_PAUSE is set to 'on'
 if "%GERONIMO_BATCH_PAUSE%" == "on" pause
+@endlocal



Mime
View raw message