geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r741689 - in /geronimo/server/trunk: assemblies/geronimo-boilerplate/src/main/underlay/contents/bin/ plugins/cxf/cxf-tools/src/main/resources/bin/ plugins/jaxws/jaxws-tools/src/main/resources/bin/ plugins/procrun/src/main/resources/bin/
Date Fri, 06 Feb 2009 19:38:01 GMT
Author: gawor
Date: Fri Feb  6 19:38:00 2009
New Revision: 741689

URL: http://svn.apache.org/viewvc?rev=741689&view=rev
Log:
use exit /b n to set error code on windows - based on patch from Jack Cai (GERONIMO-4525)

Modified:
    geronimo/server/trunk/assemblies/geronimo-boilerplate/src/main/underlay/contents/bin/client.bat
    geronimo/server/trunk/assemblies/geronimo-boilerplate/src/main/underlay/contents/bin/deploy.bat
    geronimo/server/trunk/assemblies/geronimo-boilerplate/src/main/underlay/contents/bin/geronimo.bat
    geronimo/server/trunk/assemblies/geronimo-boilerplate/src/main/underlay/contents/bin/gsh.bat
    geronimo/server/trunk/assemblies/geronimo-boilerplate/src/main/underlay/contents/bin/setjavaenv.bat
    geronimo/server/trunk/assemblies/geronimo-boilerplate/src/main/underlay/contents/bin/shutdown.bat
    geronimo/server/trunk/assemblies/geronimo-boilerplate/src/main/underlay/contents/bin/start-server.bat
    geronimo/server/trunk/assemblies/geronimo-boilerplate/src/main/underlay/contents/bin/startup.bat
    geronimo/server/trunk/assemblies/geronimo-boilerplate/src/main/underlay/contents/bin/stop-server.bat
    geronimo/server/trunk/plugins/cxf/cxf-tools/src/main/resources/bin/cxf-tools.bat
    geronimo/server/trunk/plugins/jaxws/jaxws-tools/src/main/resources/bin/jaxws-tools.bat
    geronimo/server/trunk/plugins/procrun/src/main/resources/bin/service_pr.bat

Modified: geronimo/server/trunk/assemblies/geronimo-boilerplate/src/main/underlay/contents/bin/client.bat
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-boilerplate/src/main/underlay/contents/bin/client.bat?rev=741689&r1=741688&r2=741689&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-boilerplate/src/main/underlay/contents/bin/client.bat
(original)
+++ geronimo/server/trunk/assemblies/geronimo-boilerplate/src/main/underlay/contents/bin/client.bat
Fri Feb  6 19:38:00 2009
@@ -90,20 +90,19 @@
 @REM
 @REM Exit Codes:
 @REM
-@REM  0 - Success
-@REM  1 - Error
+@REM  0        - Success
+@REM  Non-zero - Error
 @REM ---------------------------------------------------------------------------
 @if "%GERONIMO_BATCH_ECHO%" == "on"  echo on
 @if not "%GERONIMO_BATCH_ECHO%" == "on"  echo off
 
 if "%OS%" == "Windows_NT" goto okOsCheck
 echo Cannot process Geronimo command - you are running an unsupported operating system.
-set ERRORLEVEL=1
+cmd /c exit /b 1
 goto end
 
 :okOsCheck
 @setlocal enableextensions
-@set ERRORLEVEL=0
 
 if not "%GERONIMO_HOME%" == "" goto resolveHome
 @REM %~dp0 is expanded pathname of the current script
@@ -120,7 +119,7 @@
 if exist "%GERONIMO_HOME%\bin\client.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
+cmd /c exit /b 1
 goto end
 :okHome
 
@@ -134,7 +133,7 @@
 if exist "%GERONIMO_HOME%\bin\setjavaenv.bat" goto okSetJavaEnv
 echo Cannot find %GERONIMO_HOME%\bin\setjavaenv.bat
 echo This file is needed to run this program
-set ERRORLEVEL=1
+cmd /c exit /b 1
 goto end
 :okSetJavaEnv
 set BASEDIR=%GERONIMO_HOME%

Modified: geronimo/server/trunk/assemblies/geronimo-boilerplate/src/main/underlay/contents/bin/deploy.bat
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-boilerplate/src/main/underlay/contents/bin/deploy.bat?rev=741689&r1=741688&r2=741689&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-boilerplate/src/main/underlay/contents/bin/deploy.bat
(original)
+++ geronimo/server/trunk/assemblies/geronimo-boilerplate/src/main/underlay/contents/bin/deploy.bat
Fri Feb  6 19:38:00 2009
@@ -90,20 +90,19 @@
 @REM
 @REM Exit Codes:
 @REM
-@REM  0 - Success
-@REM  1 - Error
+@REM  0        - Success
+@REM  Non-zero - Error
 @REM ---------------------------------------------------------------------------
 @if "%GERONIMO_BATCH_ECHO%" == "on"  echo on
 @if not "%GERONIMO_BATCH_ECHO%" == "on"  echo off
 
 if "%OS%" == "Windows_NT" goto okOsCheck
 echo Cannot process Geronimo command - you are running an unsupported operating system.
-set ERRORLEVEL=1
+cmd /c exit /b 1
 goto end
 
 :okOsCheck
 @setlocal enableextensions
-@set ERRORLEVEL=0
 
 if not "%GERONIMO_HOME%" == "" goto resolveHome
 @REM %~dp0 is expanded pathname of the current script
@@ -120,7 +119,7 @@
 if exist "%GERONIMO_HOME%\bin\deploy.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
+cmd /c exit /b 1
 goto end
 :okHome
 
@@ -134,7 +133,7 @@
 if exist "%GERONIMO_HOME%\bin\setjavaenv.bat" goto okSetJavaEnv
 echo Cannot find %GERONIMO_HOME%\bin\setjavaenv.bat
 echo This file is needed to run this program
-set ERRORLEVEL=1
+cmd /c exit /b 1
 goto end
 :okSetJavaEnv
 set BASEDIR=%GERONIMO_HOME%

Modified: geronimo/server/trunk/assemblies/geronimo-boilerplate/src/main/underlay/contents/bin/geronimo.bat
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-boilerplate/src/main/underlay/contents/bin/geronimo.bat?rev=741689&r1=741688&r2=741689&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-boilerplate/src/main/underlay/contents/bin/geronimo.bat
(original)
+++ geronimo/server/trunk/assemblies/geronimo-boilerplate/src/main/underlay/contents/bin/geronimo.bat
Fri Feb  6 19:38:00 2009
@@ -126,8 +126,8 @@
 @REM
 @REM Exit Codes:
 @REM
-@REM  0 - Success
-@REM  1 - Error
+@REM  0        - Success
+@REM  Non-zero - Error
 @REM ---------------------------------------------------------------------------
 
 @if "%GERONIMO_BATCH_ECHO%" == "on"  echo on
@@ -135,12 +135,11 @@
 
 if "%OS%" == "Windows_NT" goto okOsCheck
 echo Cannot process Geronimo command - you are running an unsupported operating system.
-set ERRORLEVEL=1
+cmd /c exit /b 1
 goto end
 
 :okOsCheck
 @setlocal enableextensions
-@set ERRORLEVEL=0
 
 if not "%GERONIMO_HOME%" == "" goto resolveHome
 @REM %~dp0 is expanded pathname of the current script
@@ -157,7 +156,7 @@
 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
+cmd /c exit /b 1
 goto end
 :okHome
 
@@ -171,7 +170,7 @@
 if exist "%GERONIMO_HOME%\bin\setjavaenv.bat" goto okSetJavaEnv
 echo Cannot find %GERONIMO_HOME%\bin\setjavaenv.bat
 echo This file is needed to run this program
-set ERRORLEVEL=1
+cmd /c exit /b 1
 goto end
 :okSetJavaEnv
 set BASEDIR=%GERONIMO_HOME%

Modified: geronimo/server/trunk/assemblies/geronimo-boilerplate/src/main/underlay/contents/bin/gsh.bat
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-boilerplate/src/main/underlay/contents/bin/gsh.bat?rev=741689&r1=741688&r2=741689&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-boilerplate/src/main/underlay/contents/bin/gsh.bat
(original)
+++ geronimo/server/trunk/assemblies/geronimo-boilerplate/src/main/underlay/contents/bin/gsh.bat
Fri Feb  6 19:38:00 2009
@@ -26,12 +26,11 @@
 
 if "%OS%" == "Windows_NT" goto okOsCheck
 echo Cannot process command - you are running an unsupported operating system.
-set ERRORLEVEL=1
+cmd /c exit /b 1
 goto end
 
 :okOsCheck
 @setlocal enableextensions
-@set ERRORLEVEL=0
 
 set DIRNAME=%~dp0
 if "%DIRNAME%" == "" set DIRNAME=.\
@@ -45,7 +44,7 @@
 @REM Get standard Java environment variables
 if exist "%DIRNAME%\setjavaenv.bat" goto okSetJavaEnv
 echo ERROR - Cannot find %DIRNAME%\setjavaenv.bat
-set ERRORLEVEL=1
+cmd /c exit /b 1
 goto end
 :okSetJavaEnv
 set BASEDIR=%DIRNAME%

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=741689&r1=741688&r2=741689&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
Fri Feb  6 19:38:00 2009
@@ -61,7 +61,7 @@
 if "%jdkOrJreHomeSet%" == "1" goto gotJdkOrJreHome
 echo Neither the JAVA_HOME nor the JRE_HOME environment variable is defined
 echo At least one of these environment variable is needed to run this program
-set ERRORLEVEL=1
+cmd /c exit /b 1
 goto end
 
 @REM If we get this far we have either JAVA_HOME or JRE_HOME set
@@ -81,7 +81,7 @@
 echo The JAVA_HOME environment variable is not defined correctly
 echo This environment variable is needed to run this program
 echo NB: JAVA_HOME should point to a JDK not a JRE
-set ERRORLEVEL=1
+cmd /c exit /b 1
 goto end
 
 :okJdkFileCheck

Modified: geronimo/server/trunk/assemblies/geronimo-boilerplate/src/main/underlay/contents/bin/shutdown.bat
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-boilerplate/src/main/underlay/contents/bin/shutdown.bat?rev=741689&r1=741688&r2=741689&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-boilerplate/src/main/underlay/contents/bin/shutdown.bat
(original)
+++ geronimo/server/trunk/assemblies/geronimo-boilerplate/src/main/underlay/contents/bin/shutdown.bat
Fri Feb  6 19:38:00 2009
@@ -50,12 +50,11 @@
 
 if "%OS%" == "Windows_NT" goto okOsCheck
 echo Cannot process Geronimo command - you are running an unsupported operating system.
-set ERRORLEVEL=1
+cmd /c exit /b 1
 goto end
 
 :okOsCheck
 @setlocal enableextensions
-@set ERRORLEVEL=0
 
 if not "%GERONIMO_HOME%" == "" goto resolveHome
 @REM %~dp0 is expanded pathname of the current script
@@ -72,7 +71,7 @@
 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
+cmd /c exit /b 1
 goto end
 
 :okHome
@@ -83,7 +82,7 @@
 if exist "%EXECUTABLE%" goto okExec
 echo Cannot find %EXECUTABLE%
 echo This file is needed to run this program
-set ERRORLEVEL=1
+cmd /c exit /b 1
 goto end
 :okExec
 

Modified: geronimo/server/trunk/assemblies/geronimo-boilerplate/src/main/underlay/contents/bin/start-server.bat
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-boilerplate/src/main/underlay/contents/bin/start-server.bat?rev=741689&r1=741688&r2=741689&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-boilerplate/src/main/underlay/contents/bin/start-server.bat
(original)
+++ geronimo/server/trunk/assemblies/geronimo-boilerplate/src/main/underlay/contents/bin/start-server.bat
Fri Feb  6 19:38:00 2009
@@ -45,12 +45,11 @@
 
 if "%OS%"=="Windows_NT" goto okOsCheck
 echo Cannot process command - you are running an unsupported operating system.
-set ERRORLEVEL=1
+cmd /c exit /b 1
 goto end
 
 :okOsCheck
 @setlocal enableextensions
-@set ERRORLEVEL=0
 
 set DIRNAME=%~dp0
 if "%DIRNAME%" == "" set DIRNAME=.\
@@ -61,7 +60,7 @@
 @REM Check that target executable exists
 if exist "%EXECUTABLE%" goto okExec
 echo ERROR - Cannot find required script %EXECUTABLE%
-set ERRORLEVEL=1
+cmd /c exit /b 1
 goto end
 
 :okExec

Modified: geronimo/server/trunk/assemblies/geronimo-boilerplate/src/main/underlay/contents/bin/startup.bat
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-boilerplate/src/main/underlay/contents/bin/startup.bat?rev=741689&r1=741688&r2=741689&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-boilerplate/src/main/underlay/contents/bin/startup.bat
(original)
+++ geronimo/server/trunk/assemblies/geronimo-boilerplate/src/main/underlay/contents/bin/startup.bat
Fri Feb  6 19:38:00 2009
@@ -46,12 +46,11 @@
 
 if "%OS%" == "Windows_NT" goto okOsCheck
 echo Cannot process Geronimo command - you are running an unsupported operating system.
-set ERRORLEVEL=1
+cmd /c exit /b 1
 goto end
 
 :okOsCheck
 @setlocal enableextensions
-@set ERRORLEVEL=0
 
 if not "%GERONIMO_HOME%" == "" goto resolveHome
 @REM %~dp0 is expanded pathname of the current script
@@ -68,7 +67,7 @@
 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
+cmd /c exit /b 1
 goto end
 :okHome
 
@@ -78,7 +77,7 @@
 if exist "%EXECUTABLE%" goto okExec
 echo Cannot find %EXECUTABLE%
 echo This file is needed to run this program
-set ERRORLEVEL=1
+cmd /c exit /b 1
 goto end
 :okExec
 

Modified: geronimo/server/trunk/assemblies/geronimo-boilerplate/src/main/underlay/contents/bin/stop-server.bat
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-boilerplate/src/main/underlay/contents/bin/stop-server.bat?rev=741689&r1=741688&r2=741689&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-boilerplate/src/main/underlay/contents/bin/stop-server.bat
(original)
+++ geronimo/server/trunk/assemblies/geronimo-boilerplate/src/main/underlay/contents/bin/stop-server.bat
Fri Feb  6 19:38:00 2009
@@ -45,12 +45,11 @@
 
 if "%OS%"=="Windows_NT" goto okOsCheck
 echo Cannot process command - you are running an unsupported operating system.
-set ERRORLEVEL=1
+cmd /c exit /b 1
 goto end
 
 :okOsCheck
 @setlocal enableextensions
-@set ERRORLEVEL=0
 
 set DIRNAME=%~dp0
 if "%DIRNAME%" == "" set DIRNAME=.\
@@ -61,7 +60,7 @@
 @REM Check that target executable exists
 if exist "%EXECUTABLE%" goto okExec
 echo ERROR - Cannot find required script %EXECUTABLE%
-set ERRORLEVEL=1
+cmd /c exit /b 1
 goto end
 
 :okExec

Modified: geronimo/server/trunk/plugins/cxf/cxf-tools/src/main/resources/bin/cxf-tools.bat
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/cxf/cxf-tools/src/main/resources/bin/cxf-tools.bat?rev=741689&r1=741688&r2=741689&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/cxf/cxf-tools/src/main/resources/bin/cxf-tools.bat (original)
+++ geronimo/server/trunk/plugins/cxf/cxf-tools/src/main/resources/bin/cxf-tools.bat Fri Feb
 6 19:38:00 2009
@@ -88,20 +88,19 @@
 @REM
 @REM Exit Codes:
 @REM
-@REM  0 - Success
-@REM  1 - Error
+@REM  0        - Success
+@REM  Non-zero - Error
 @REM ---------------------------------------------------------------------------
 @if "%GERONIMO_BATCH_ECHO%" == "on"  echo on
 @if not "%GERONIMO_BATCH_ECHO%" == "on"  echo off
 
 if "%OS%" == "Windows_NT" goto okOsCheck
 echo Cannot process Geronimo command - you are running an unsupported operating system.
-set ERRORLEVEL=1
+cmd /c exit /b 1
 goto end
 
 :okOsCheck
 @setlocal enableextensions
-@set ERRORLEVEL=0
 
 if not "%GERONIMO_HOME%" == "" goto resolveHome
 @REM %~dp0 is expanded pathname of the current script
@@ -118,7 +117,7 @@
 if exist "%GERONIMO_HOME%\bin\deploy.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
+cmd /c exit /b 1
 goto end
 :okHome
 
@@ -132,7 +131,7 @@
 if exist "%GERONIMO_HOME%\bin\setjavaenv.bat" goto okSetJavaEnv
 echo Cannot find %GERONIMO_HOME%\bin\setjavaenv.bat
 echo This file is needed to run this program
-set ERRORLEVEL=1
+cmd /c exit /b 1
 goto end
 :okSetJavaEnv
 set BASEDIR=%GERONIMO_HOME%

Modified: geronimo/server/trunk/plugins/jaxws/jaxws-tools/src/main/resources/bin/jaxws-tools.bat
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jaxws/jaxws-tools/src/main/resources/bin/jaxws-tools.bat?rev=741689&r1=741688&r2=741689&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jaxws/jaxws-tools/src/main/resources/bin/jaxws-tools.bat
(original)
+++ geronimo/server/trunk/plugins/jaxws/jaxws-tools/src/main/resources/bin/jaxws-tools.bat
Fri Feb  6 19:38:00 2009
@@ -88,20 +88,19 @@
 @REM
 @REM Exit Codes:
 @REM
-@REM  0 - Success
-@REM  1 - Error
+@REM  0        - Success
+@REM  Non-zero - Error
 @REM ---------------------------------------------------------------------------
 @if "%GERONIMO_BATCH_ECHO%" == "on"  echo on
 @if not "%GERONIMO_BATCH_ECHO%" == "on"  echo off
 
 if "%OS%" == "Windows_NT" goto okOsCheck
 echo Cannot process Geronimo command - you are running an unsupported operating system.
-set ERRORLEVEL=1
+cmd /c exit /b 1
 goto end
 
 :okOsCheck
 @setlocal enableextensions
-@set ERRORLEVEL=0
 
 if not "%GERONIMO_HOME%" == "" goto resolveHome
 @REM %~dp0 is expanded pathname of the current script
@@ -118,7 +117,7 @@
 if exist "%GERONIMO_HOME%\bin\deploy.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
+cmd /c exit /b 1
 goto end
 :okHome
 
@@ -132,7 +131,7 @@
 if exist "%GERONIMO_HOME%\bin\setjavaenv.bat" goto okSetJavaEnv
 echo Cannot find %GERONIMO_HOME%\bin\setjavaenv.bat
 echo This file is needed to run this program
-set ERRORLEVEL=1
+cmd /c exit /b 1
 goto end
 :okSetJavaEnv
 set BASEDIR=%GERONIMO_HOME%

Modified: geronimo/server/trunk/plugins/procrun/src/main/resources/bin/service_pr.bat
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/procrun/src/main/resources/bin/service_pr.bat?rev=741689&r1=741688&r2=741689&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/procrun/src/main/resources/bin/service_pr.bat (original)
+++ geronimo/server/trunk/plugins/procrun/src/main/resources/bin/service_pr.bat Fri Feb  6
19:38:00 2009
@@ -85,8 +85,8 @@
 @REM
 @REM Exit Codes:
 @REM
-@REM  0 - Success
-@REM  1 - Error
+@REM  0        - Success
+@REM  Non-zero - Error
 @REM ---------------------------------------------------------------------------
 
 @if "%GERONIMO_BATCH_ECHO%" == "on"  echo on
@@ -94,12 +94,11 @@
 
 if "%OS%" == "Windows_NT" goto okOsCheck
 echo Cannot process Geronimo command - you are running an unsupported operating system.
-set ERRORLEVEL=1
+cmd /c exit /b 1
 goto end
 
 :okOsCheck
 @setlocal enableextensions
-@set ERRORLEVEL=0
 
 if not "%GERONIMO_HOME%" == "" goto resolveHome
 @REM %~dp0 is expanded pathname of the current script
@@ -116,7 +115,7 @@
 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
+cmd /c exit /b 1
 goto end
 :okHome
 
@@ -130,7 +129,7 @@
 if exist "%GERONIMO_HOME%\bin\setjavaenv.bat" goto okSetJavaEnv
 echo Cannot find %GERONIMO_HOME%\bin\setjavaenv.bat
 echo This file is needed to run this program
-set ERRORLEVEL=1
+cmd /c exit /b 1
 goto end
 :okSetJavaEnv
 set BASEDIR=%GERONIMO_HOME%



Mime
View raw message