You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ca...@apache.org on 2010/01/15 09:38:52 UTC
svn commit: r899564 - in /geronimo/server/branches/2.2:
framework/configs/geronimo-boilerplate/src/main/underlay/contents/bin/
plugins/jaxws/jaxws-tools/src/main/resources/contents/bin/
plugins/procrun/src/main/resources/bin/
Author: caijunj
Date: Fri Jan 15 08:38:51 2010
New Revision: 899564
URL: http://svn.apache.org/viewvc?rev=899564&view=rev
Log:
GERONIMO-4968 - Problemastic OS check in Windows startup command
Modified:
geronimo/server/branches/2.2/framework/configs/geronimo-boilerplate/src/main/underlay/contents/bin/client.bat
geronimo/server/branches/2.2/framework/configs/geronimo-boilerplate/src/main/underlay/contents/bin/deploy.bat
geronimo/server/branches/2.2/framework/configs/geronimo-boilerplate/src/main/underlay/contents/bin/geronimo.bat
geronimo/server/branches/2.2/framework/configs/geronimo-boilerplate/src/main/underlay/contents/bin/gsh.bat
geronimo/server/branches/2.2/framework/configs/geronimo-boilerplate/src/main/underlay/contents/bin/shutdown.bat
geronimo/server/branches/2.2/framework/configs/geronimo-boilerplate/src/main/underlay/contents/bin/start-server.bat
geronimo/server/branches/2.2/framework/configs/geronimo-boilerplate/src/main/underlay/contents/bin/startup.bat
geronimo/server/branches/2.2/framework/configs/geronimo-boilerplate/src/main/underlay/contents/bin/stop-server.bat
geronimo/server/branches/2.2/plugins/jaxws/jaxws-tools/src/main/resources/contents/bin/jaxws-tools.bat
geronimo/server/branches/2.2/plugins/procrun/src/main/resources/bin/service_pr.bat
Modified: geronimo/server/branches/2.2/framework/configs/geronimo-boilerplate/src/main/underlay/contents/bin/client.bat
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/framework/configs/geronimo-boilerplate/src/main/underlay/contents/bin/client.bat?rev=899564&r1=899563&r2=899564&view=diff
==============================================================================
--- geronimo/server/branches/2.2/framework/configs/geronimo-boilerplate/src/main/underlay/contents/bin/client.bat (original)
+++ geronimo/server/branches/2.2/framework/configs/geronimo-boilerplate/src/main/underlay/contents/bin/client.bat Fri Jan 15 08:38:51 2010
@@ -96,12 +96,6 @@
@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.
-cmd /c exit /b 1
-goto end
-
-:okOsCheck
@setlocal enableextensions
if not "%GERONIMO_HOME%" == "" goto resolveHome
Modified: geronimo/server/branches/2.2/framework/configs/geronimo-boilerplate/src/main/underlay/contents/bin/deploy.bat
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/framework/configs/geronimo-boilerplate/src/main/underlay/contents/bin/deploy.bat?rev=899564&r1=899563&r2=899564&view=diff
==============================================================================
--- geronimo/server/branches/2.2/framework/configs/geronimo-boilerplate/src/main/underlay/contents/bin/deploy.bat (original)
+++ geronimo/server/branches/2.2/framework/configs/geronimo-boilerplate/src/main/underlay/contents/bin/deploy.bat Fri Jan 15 08:38:51 2010
@@ -96,12 +96,6 @@
@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.
-cmd /c exit /b 1
-goto end
-
-:okOsCheck
@setlocal enableextensions
if not "%GERONIMO_HOME%" == "" goto resolveHome
Modified: geronimo/server/branches/2.2/framework/configs/geronimo-boilerplate/src/main/underlay/contents/bin/geronimo.bat
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/framework/configs/geronimo-boilerplate/src/main/underlay/contents/bin/geronimo.bat?rev=899564&r1=899563&r2=899564&view=diff
==============================================================================
--- geronimo/server/branches/2.2/framework/configs/geronimo-boilerplate/src/main/underlay/contents/bin/geronimo.bat (original)
+++ geronimo/server/branches/2.2/framework/configs/geronimo-boilerplate/src/main/underlay/contents/bin/geronimo.bat Fri Jan 15 08:38:51 2010
@@ -133,12 +133,6 @@
@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.
-cmd /c exit /b 1
-goto end
-
-:okOsCheck
@setlocal enableextensions
if not "%GERONIMO_HOME%" == "" goto resolveHome
Modified: geronimo/server/branches/2.2/framework/configs/geronimo-boilerplate/src/main/underlay/contents/bin/gsh.bat
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/framework/configs/geronimo-boilerplate/src/main/underlay/contents/bin/gsh.bat?rev=899564&r1=899563&r2=899564&view=diff
==============================================================================
--- geronimo/server/branches/2.2/framework/configs/geronimo-boilerplate/src/main/underlay/contents/bin/gsh.bat (original)
+++ geronimo/server/branches/2.2/framework/configs/geronimo-boilerplate/src/main/underlay/contents/bin/gsh.bat Fri Jan 15 08:38:51 2010
@@ -24,12 +24,6 @@
@if "%GERONIMO_BATCH_ECHO%" == "on" echo on
@if not "%GERONIMO_BATCH_ECHO%" == "on" echo off
-if "%OS%" == "Windows_NT" goto okOsCheck
-echo Cannot process command - you are running an unsupported operating system.
-cmd /c exit /b 1
-goto end
-
-:okOsCheck
@setlocal enableextensions
set DIRNAME=%~dp0
Modified: geronimo/server/branches/2.2/framework/configs/geronimo-boilerplate/src/main/underlay/contents/bin/shutdown.bat
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/framework/configs/geronimo-boilerplate/src/main/underlay/contents/bin/shutdown.bat?rev=899564&r1=899563&r2=899564&view=diff
==============================================================================
--- geronimo/server/branches/2.2/framework/configs/geronimo-boilerplate/src/main/underlay/contents/bin/shutdown.bat (original)
+++ geronimo/server/branches/2.2/framework/configs/geronimo-boilerplate/src/main/underlay/contents/bin/shutdown.bat Fri Jan 15 08:38:51 2010
@@ -48,12 +48,6 @@
@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.
-cmd /c exit /b 1
-goto end
-
-:okOsCheck
@setlocal enableextensions
if not "%GERONIMO_HOME%" == "" goto resolveHome
Modified: geronimo/server/branches/2.2/framework/configs/geronimo-boilerplate/src/main/underlay/contents/bin/start-server.bat
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/framework/configs/geronimo-boilerplate/src/main/underlay/contents/bin/start-server.bat?rev=899564&r1=899563&r2=899564&view=diff
==============================================================================
--- geronimo/server/branches/2.2/framework/configs/geronimo-boilerplate/src/main/underlay/contents/bin/start-server.bat (original)
+++ geronimo/server/branches/2.2/framework/configs/geronimo-boilerplate/src/main/underlay/contents/bin/start-server.bat Fri Jan 15 08:38:51 2010
@@ -43,12 +43,6 @@
@if "%GERONIMO_BATCH_ECHO%" == "on" echo on
@if not "%GERONIMO_BATCH_ECHO%" == "on" echo off
-if "%OS%"=="Windows_NT" goto okOsCheck
-echo Cannot process command - you are running an unsupported operating system.
-cmd /c exit /b 1
-goto end
-
-:okOsCheck
@setlocal enableextensions
set DIRNAME=%~dp0
Modified: geronimo/server/branches/2.2/framework/configs/geronimo-boilerplate/src/main/underlay/contents/bin/startup.bat
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/framework/configs/geronimo-boilerplate/src/main/underlay/contents/bin/startup.bat?rev=899564&r1=899563&r2=899564&view=diff
==============================================================================
--- geronimo/server/branches/2.2/framework/configs/geronimo-boilerplate/src/main/underlay/contents/bin/startup.bat (original)
+++ geronimo/server/branches/2.2/framework/configs/geronimo-boilerplate/src/main/underlay/contents/bin/startup.bat Fri Jan 15 08:38:51 2010
@@ -44,12 +44,6 @@
@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.
-cmd /c exit /b 1
-goto end
-
-:okOsCheck
@setlocal enableextensions
if not "%GERONIMO_HOME%" == "" goto resolveHome
Modified: geronimo/server/branches/2.2/framework/configs/geronimo-boilerplate/src/main/underlay/contents/bin/stop-server.bat
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/framework/configs/geronimo-boilerplate/src/main/underlay/contents/bin/stop-server.bat?rev=899564&r1=899563&r2=899564&view=diff
==============================================================================
--- geronimo/server/branches/2.2/framework/configs/geronimo-boilerplate/src/main/underlay/contents/bin/stop-server.bat (original)
+++ geronimo/server/branches/2.2/framework/configs/geronimo-boilerplate/src/main/underlay/contents/bin/stop-server.bat Fri Jan 15 08:38:51 2010
@@ -43,12 +43,6 @@
@if "%GERONIMO_BATCH_ECHO%" == "on" echo on
@if not "%GERONIMO_BATCH_ECHO%" == "on" echo off
-if "%OS%"=="Windows_NT" goto okOsCheck
-echo Cannot process command - you are running an unsupported operating system.
-cmd /c exit /b 1
-goto end
-
-:okOsCheck
@setlocal enableextensions
set DIRNAME=%~dp0
Modified: geronimo/server/branches/2.2/plugins/jaxws/jaxws-tools/src/main/resources/contents/bin/jaxws-tools.bat
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/jaxws/jaxws-tools/src/main/resources/contents/bin/jaxws-tools.bat?rev=899564&r1=899563&r2=899564&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/jaxws/jaxws-tools/src/main/resources/contents/bin/jaxws-tools.bat (original)
+++ geronimo/server/branches/2.2/plugins/jaxws/jaxws-tools/src/main/resources/contents/bin/jaxws-tools.bat Fri Jan 15 08:38:51 2010
@@ -94,12 +94,6 @@
@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.
-cmd /c exit /b 1
-goto end
-
-:okOsCheck
@setlocal enableextensions
if not "%GERONIMO_HOME%" == "" goto resolveHome
Modified: geronimo/server/branches/2.2/plugins/procrun/src/main/resources/bin/service_pr.bat
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/procrun/src/main/resources/bin/service_pr.bat?rev=899564&r1=899563&r2=899564&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/procrun/src/main/resources/bin/service_pr.bat (original)
+++ geronimo/server/branches/2.2/plugins/procrun/src/main/resources/bin/service_pr.bat Fri Jan 15 08:38:51 2010
@@ -92,12 +92,6 @@
@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.
-cmd /c exit /b 1
-goto end
-
-:okOsCheck
@setlocal enableextensions
if not "%GERONIMO_HOME%" == "" goto resolveHome