You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by kk...@apache.org on 2014/02/16 23:16:07 UTC
svn commit: r1568846 - in /tomcat/tc7.0.x/trunk: ./ bin/catalina.bat
bin/configtest.bat bin/digest.bat bin/service.bat bin/shutdown.bat
bin/startup.bat bin/tool-wrapper.bat bin/version.bat
webapps/docs/changelog.xml
Author: kkolinko
Date: Sun Feb 16 22:16:07 2014
New Revision: 1568846
URL: http://svn.apache.org/r1568846
Log:
Merged r1568768 from tomcat/trunk:
Simplify Windows *.bat files: remove %OS% checks, as current java does not run on ancient non-NT operating systems.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/bin/catalina.bat
tomcat/tc7.0.x/trunk/bin/configtest.bat
tomcat/tc7.0.x/trunk/bin/digest.bat
tomcat/tc7.0.x/trunk/bin/service.bat
tomcat/tc7.0.x/trunk/bin/shutdown.bat
tomcat/tc7.0.x/trunk/bin/startup.bat
tomcat/tc7.0.x/trunk/bin/tool-wrapper.bat
tomcat/tc7.0.x/trunk/bin/version.bat
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1568768
Modified: tomcat/tc7.0.x/trunk/bin/catalina.bat
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/bin/catalina.bat?rev=1568846&r1=1568845&r2=1568846&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/bin/catalina.bat (original)
+++ tomcat/tc7.0.x/trunk/bin/catalina.bat Sun Feb 16 22:16:07 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
@@ -260,13 +261,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/tc7.0.x/trunk/bin/configtest.bat
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/bin/configtest.bat?rev=1568846&r1=1568845&r2=1568846&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/bin/configtest.bat (original)
+++ tomcat/tc7.0.x/trunk/bin/configtest.bat Sun Feb 16 22:16:07 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/tc7.0.x/trunk/bin/digest.bat
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/bin/digest.bat?rev=1568846&r1=1568845&r2=1568846&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/bin/digest.bat (original)
+++ tomcat/tc7.0.x/trunk/bin/digest.bat Sun Feb 16 22:16:07 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/tc7.0.x/trunk/bin/service.bat
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/bin/service.bat?rev=1568846&r1=1568845&r2=1568846&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/bin/service.bat (original)
+++ tomcat/tc7.0.x/trunk/bin/service.bat Sun Feb 16 22:16:07 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/tc7.0.x/trunk/bin/shutdown.bat
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/bin/shutdown.bat?rev=1568846&r1=1568845&r2=1568846&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/bin/shutdown.bat (original)
+++ tomcat/tc7.0.x/trunk/bin/shutdown.bat Sun Feb 16 22:16:07 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/tc7.0.x/trunk/bin/startup.bat
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/bin/startup.bat?rev=1568846&r1=1568845&r2=1568846&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/bin/startup.bat (original)
+++ tomcat/tc7.0.x/trunk/bin/startup.bat Sun Feb 16 22:16:07 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/tc7.0.x/trunk/bin/tool-wrapper.bat
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/bin/tool-wrapper.bat?rev=1568846&r1=1568845&r2=1568846&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/bin/tool-wrapper.bat (original)
+++ tomcat/tc7.0.x/trunk/bin/tool-wrapper.bat Sun Feb 16 22:16:07 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/tc7.0.x/trunk/bin/version.bat
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/bin/version.bat?rev=1568846&r1=1568845&r2=1568846&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/bin/version.bat (original)
+++ tomcat/tc7.0.x/trunk/bin/version.bat Sun Feb 16 22:16:07 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
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1568846&r1=1568845&r2=1568846&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Sun Feb 16 22:16:07 2014
@@ -64,6 +64,14 @@
</fix>
</changelog>
</subsection>
+ <subsection name="Other">
+ <changelog>
+ <scode>
+ Simplify Windows *.bat files: remove %OS% checks, as java 6 does
+ not run on ancient non-NT operating systems. (kkolinko)
+ </scode>
+ </changelog>
+ </subsection>
</section>
<section name="Tomcat 7.0.52 (violetagg)">
<subsection name="Catalina">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org