Author: kkolinko
Date: Sun Feb 16 14:45:47 2014
New Revision: 1568768
URL: http://svn.apache.org/r1568768
Log:
Simplify Windows *.bat files: remove %OS% checks, as current java does not run
on ancient non-NT operating systems.
Modified:
tomcat/trunk/bin/catalina.bat
tomcat/trunk/bin/configtest.bat
tomcat/trunk/bin/digest.bat
tomcat/trunk/bin/service.bat
tomcat/trunk/bin/shutdown.bat
tomcat/trunk/bin/startup.bat
tomcat/trunk/bin/tool-wrapper.bat
tomcat/trunk/bin/version.bat
Modified: tomcat/trunk/bin/catalina.bat
URL:
http://svn.apache.org/viewvc/tomcat/trunk/bin/catalina.bat?rev=1568768&r1=1568767&r2=1568768&view=diff
==============================================================================
--- tomcat/trunk/bin/catalina.bat (original)
+++ tomcat/trunk/bin/catalina.bat Sun Feb 16 14:45:47 2014
@@ -14,7 +14,6 @@ rem WITHOUT WARRANTIES OR CONDITIONS OF
rem See the License for the specific language governing permissions and
rem limitations under the License.
-if "%OS%" == "Windows_NT" setlocal
rem ---------------------------------------------------------------------------
rem Start/Stop Script for the CATALINA Server
rem
@@ -92,6 +91,8 @@ rem Example (all one l
rem set TITLE=Tomcat.Cluster#1.Server#1 [%DATE% %TIME%]
rem ---------------------------------------------------------------------------
+setlocal
+
rem Suppress Terminate batch job on CTRL+C
if not ""%1"" == ""run"" goto mainEntry
if "%TEMP%" == "" goto mainEntry
@@ -277,13 +278,8 @@ goto execCmd
:doStart
shift
-if not "%OS%" == "Windows_NT" goto noTitle
if "%TITLE%" == "" set TITLE=Tomcat
set _EXECJAVA=start "%TITLE%" %_RUNJAVA%
-goto gotTitle
-:noTitle
-set _EXECJAVA=start %_RUNJAVA%
-:gotTitle
if not ""%1"" == ""-security"" goto execCmd
shift
echo Using Security Manager
Modified: tomcat/trunk/bin/configtest.bat
URL:
http://svn.apache.org/viewvc/tomcat/trunk/bin/configtest.bat?rev=1568768&r1=1568767&r2=1568768&view=diff
==============================================================================
--- tomcat/trunk/bin/configtest.bat (original)
+++ tomcat/trunk/bin/configtest.bat Sun Feb 16 14:45:47 2014
@@ -14,11 +14,12 @@ rem WITHOUT WARRANTIES OR CONDITIONS OF
rem See the License for the specific language governing permissions and
rem limitations under the License.
-if "%OS%" == "Windows_NT" setlocal
rem ---------------------------------------------------------------------------
rem Configuration test script for the CATALINA Server
rem ---------------------------------------------------------------------------
+setlocal
+
rem Guess CATALINA_HOME if not defined
set "CURRENT_DIR=%cd%"
if not "%CATALINA_HOME%" == "" goto gotHome
Modified: tomcat/trunk/bin/digest.bat
URL:
http://svn.apache.org/viewvc/tomcat/trunk/bin/digest.bat?rev=1568768&r1=1568767&r2=1568768&view=diff
==============================================================================
--- tomcat/trunk/bin/digest.bat (original)
+++ tomcat/trunk/bin/digest.bat Sun Feb 16 14:45:47 2014
@@ -14,11 +14,12 @@ rem WITHOUT WARRANTIES OR CONDITIONS OF
rem See the License for the specific language governing permissions and
rem limitations under the License.
-if "%OS%" == "Windows_NT" setlocal
rem ---------------------------------------------------------------------------
rem Script to digest password using the algorithm specified
rem ---------------------------------------------------------------------------
+setlocal
+
rem Guess CATALINA_HOME if not defined
set "CURRENT_DIR=%cd%"
if not "%CATALINA_HOME%" == "" goto gotHome
Modified: tomcat/trunk/bin/service.bat
URL:
http://svn.apache.org/viewvc/tomcat/trunk/bin/service.bat?rev=1568768&r1=1568767&r2=1568768&view=diff
==============================================================================
--- tomcat/trunk/bin/service.bat (original)
+++ tomcat/trunk/bin/service.bat Sun Feb 16 14:45:47 2014
@@ -14,7 +14,6 @@ rem WITHOUT WARRANTIES OR CONDITIONS OF
rem See the License for the specific language governing permissions and
rem limitations under the License.
-if "%OS%" == "Windows_NT" setlocal
rem ---------------------------------------------------------------------------
rem NT Service Install/Uninstall script
rem
@@ -27,6 +26,8 @@ rem name (optional) If the second
rem to be new service name
rem ---------------------------------------------------------------------------
+setlocal
+
set "SELF=%~dp0%service.bat"
rem Guess CATALINA_HOME if not defined
set "CURRENT_DIR=%cd%"
Modified: tomcat/trunk/bin/shutdown.bat
URL:
http://svn.apache.org/viewvc/tomcat/trunk/bin/shutdown.bat?rev=1568768&r1=1568767&r2=1568768&view=diff
==============================================================================
--- tomcat/trunk/bin/shutdown.bat (original)
+++ tomcat/trunk/bin/shutdown.bat Sun Feb 16 14:45:47 2014
@@ -14,11 +14,12 @@ rem WITHOUT WARRANTIES OR CONDITIONS OF
rem See the License for the specific language governing permissions and
rem limitations under the License.
-if "%OS%" == "Windows_NT" setlocal
rem ---------------------------------------------------------------------------
rem Stop script for the CATALINA Server
rem ---------------------------------------------------------------------------
+setlocal
+
rem Guess CATALINA_HOME if not defined
set "CURRENT_DIR=%cd%"
if not "%CATALINA_HOME%" == "" goto gotHome
Modified: tomcat/trunk/bin/startup.bat
URL:
http://svn.apache.org/viewvc/tomcat/trunk/bin/startup.bat?rev=1568768&r1=1568767&r2=1568768&view=diff
==============================================================================
--- tomcat/trunk/bin/startup.bat (original)
+++ tomcat/trunk/bin/startup.bat Sun Feb 16 14:45:47 2014
@@ -14,11 +14,12 @@ rem WITHOUT WARRANTIES OR CONDITIONS OF
rem See the License for the specific language governing permissions and
rem limitations under the License.
-if "%OS%" == "Windows_NT" setlocal
rem ---------------------------------------------------------------------------
rem Start script for the CATALINA Server
rem ---------------------------------------------------------------------------
+setlocal
+
rem Guess CATALINA_HOME if not defined
set "CURRENT_DIR=%cd%"
if not "%CATALINA_HOME%" == "" goto gotHome
Modified: tomcat/trunk/bin/tool-wrapper.bat
URL:
http://svn.apache.org/viewvc/tomcat/trunk/bin/tool-wrapper.bat?rev=1568768&r1=1568767&r2=1568768&view=diff
==============================================================================
--- tomcat/trunk/bin/tool-wrapper.bat (original)
+++ tomcat/trunk/bin/tool-wrapper.bat Sun Feb 16 14:45:47 2014
@@ -14,7 +14,6 @@ rem WITHOUT WARRANTIES OR CONDITIONS OF
rem See the License for the specific language governing permissions and
rem limitations under the License.
-if "%OS%" == "Windows_NT" setlocal
rem ---------------------------------------------------------------------------
rem Wrapper script for command line tools
rem
@@ -40,6 +39,8 @@ rem It can also be use
rem Defaults to $CATALINA_HOME/endorsed.
rem ---------------------------------------------------------------------------
+setlocal
+
rem Guess CATALINA_HOME if not defined
set "CURRENT_DIR=%cd%"
if not "%CATALINA_HOME%" == "" goto gotHome
Modified: tomcat/trunk/bin/version.bat
URL:
http://svn.apache.org/viewvc/tomcat/trunk/bin/version.bat?rev=1568768&r1=1568767&r2=1568768&view=diff
==============================================================================
--- tomcat/trunk/bin/version.bat (original)
+++ tomcat/trunk/bin/version.bat Sun Feb 16 14:45:47 2014
@@ -14,11 +14,12 @@ rem WITHOUT WARRANTIES OR CONDITIONS OF
rem See the License for the specific language governing permissions and
rem limitations under the License.
-if "%OS%" == "Windows_NT" setlocal
rem ---------------------------------------------------------------------------
rem Version script for the CATALINA Server
rem ---------------------------------------------------------------------------
+setlocal
+
rem Guess CATALINA_HOME if not defined
set "CURRENT_DIR=%cd%"
if not "%CATALINA_HOME%" == "" goto gotHome
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
