Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 6145 invoked from network); 15 Jan 2010 08:38:27 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 15 Jan 2010 08:38:27 -0000 Received: (qmail 38428 invoked by uid 500); 15 Jan 2010 08:38:26 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 38361 invoked by uid 500); 15 Jan 2010 08:38:26 -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 38352 invoked by uid 99); 15 Jan 2010 08:38:26 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 15 Jan 2010 08:38:26 +0000 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; Fri, 15 Jan 2010 08:38:25 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 4CE6723888EC; Fri, 15 Jan 2010 08:38:05 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r899562 - in /geronimo/server/branches/2.1: assemblies/geronimo-boilerplate-minimal/src/main/underlay/bin/ plugins/jaxws/jaxws-tools/src/main/resources/contents/bin/ plugins/procrun/src/main/resources/bin/ Date: Fri, 15 Jan 2010 08:38:05 -0000 To: scm@geronimo.apache.org From: caijunj@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100115083805.4CE6723888EC@eris.apache.org> Author: caijunj Date: Fri Jan 15 08:38:04 2010 New Revision: 899562 URL: http://svn.apache.org/viewvc?rev=899562&view=rev Log: GERONIMO-4968 - Problemastic OS check in Windows startup command Modified: geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/src/main/underlay/bin/client.bat geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/src/main/underlay/bin/deploy.bat geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/src/main/underlay/bin/geronimo.bat geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/src/main/underlay/bin/gsh.bat geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/src/main/underlay/bin/shutdown.bat geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/src/main/underlay/bin/start-server.bat geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/src/main/underlay/bin/startup.bat geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/src/main/underlay/bin/stop-server.bat geronimo/server/branches/2.1/plugins/jaxws/jaxws-tools/src/main/resources/contents/bin/jaxws-tools.bat geronimo/server/branches/2.1/plugins/procrun/src/main/resources/bin/service_pr.bat Modified: geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/src/main/underlay/bin/client.bat URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/src/main/underlay/bin/client.bat?rev=899562&r1=899561&r2=899562&view=diff ============================================================================== --- geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/src/main/underlay/bin/client.bat (original) +++ geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/src/main/underlay/bin/client.bat Fri Jan 15 08:38:04 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.1/assemblies/geronimo-boilerplate-minimal/src/main/underlay/bin/deploy.bat URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/src/main/underlay/bin/deploy.bat?rev=899562&r1=899561&r2=899562&view=diff ============================================================================== --- geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/src/main/underlay/bin/deploy.bat (original) +++ geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/src/main/underlay/bin/deploy.bat Fri Jan 15 08:38:04 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.1/assemblies/geronimo-boilerplate-minimal/src/main/underlay/bin/geronimo.bat URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/src/main/underlay/bin/geronimo.bat?rev=899562&r1=899561&r2=899562&view=diff ============================================================================== --- geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/src/main/underlay/bin/geronimo.bat (original) +++ geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/src/main/underlay/bin/geronimo.bat Fri Jan 15 08:38:04 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.1/assemblies/geronimo-boilerplate-minimal/src/main/underlay/bin/gsh.bat URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/src/main/underlay/bin/gsh.bat?rev=899562&r1=899561&r2=899562&view=diff ============================================================================== --- geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/src/main/underlay/bin/gsh.bat (original) +++ geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/src/main/underlay/bin/gsh.bat Fri Jan 15 08:38:04 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.1/assemblies/geronimo-boilerplate-minimal/src/main/underlay/bin/shutdown.bat URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/src/main/underlay/bin/shutdown.bat?rev=899562&r1=899561&r2=899562&view=diff ============================================================================== --- geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/src/main/underlay/bin/shutdown.bat (original) +++ geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/src/main/underlay/bin/shutdown.bat Fri Jan 15 08:38:04 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.1/assemblies/geronimo-boilerplate-minimal/src/main/underlay/bin/start-server.bat URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/src/main/underlay/bin/start-server.bat?rev=899562&r1=899561&r2=899562&view=diff ============================================================================== --- geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/src/main/underlay/bin/start-server.bat (original) +++ geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/src/main/underlay/bin/start-server.bat Fri Jan 15 08:38:04 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.1/assemblies/geronimo-boilerplate-minimal/src/main/underlay/bin/startup.bat URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/src/main/underlay/bin/startup.bat?rev=899562&r1=899561&r2=899562&view=diff ============================================================================== --- geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/src/main/underlay/bin/startup.bat (original) +++ geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/src/main/underlay/bin/startup.bat Fri Jan 15 08:38:04 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.1/assemblies/geronimo-boilerplate-minimal/src/main/underlay/bin/stop-server.bat URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/src/main/underlay/bin/stop-server.bat?rev=899562&r1=899561&r2=899562&view=diff ============================================================================== --- geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/src/main/underlay/bin/stop-server.bat (original) +++ geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/src/main/underlay/bin/stop-server.bat Fri Jan 15 08:38:04 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.1/plugins/jaxws/jaxws-tools/src/main/resources/contents/bin/jaxws-tools.bat URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/jaxws/jaxws-tools/src/main/resources/contents/bin/jaxws-tools.bat?rev=899562&r1=899561&r2=899562&view=diff ============================================================================== --- geronimo/server/branches/2.1/plugins/jaxws/jaxws-tools/src/main/resources/contents/bin/jaxws-tools.bat (original) +++ geronimo/server/branches/2.1/plugins/jaxws/jaxws-tools/src/main/resources/contents/bin/jaxws-tools.bat Fri Jan 15 08:38:04 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.1/plugins/procrun/src/main/resources/bin/service_pr.bat URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/procrun/src/main/resources/bin/service_pr.bat?rev=899562&r1=899561&r2=899562&view=diff ============================================================================== --- geronimo/server/branches/2.1/plugins/procrun/src/main/resources/bin/service_pr.bat (original) +++ geronimo/server/branches/2.1/plugins/procrun/src/main/resources/bin/service_pr.bat Fri Jan 15 08:38:04 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