Author: markt
Date: Wed Feb 10 23:26:42 2010
New Revision: 908749
URL: http://svn.apache.org/viewvc?rev=908749&view=rev
Log:
Allow special characters recognized by the Windows command-line shell to be
present in the names of CATALINA_HOME/_BASE and the current directory
used to call the Tomcat scripts. (kkolinko)
Modified:
tomcat/tc6.0.x/trunk/ (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/bin/catalina.bat
tomcat/tc6.0.x/trunk/bin/digest.bat
tomcat/tc6.0.x/trunk/bin/service.bat
tomcat/tc6.0.x/trunk/bin/setclasspath.bat
tomcat/tc6.0.x/trunk/bin/shutdown.bat
tomcat/tc6.0.x/trunk/bin/startup.bat
tomcat/tc6.0.x/trunk/bin/tool-wrapper.bat
tomcat/tc6.0.x/trunk/bin/version.bat
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc6.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 10 23:26:42 2010
@@ -1,2 +1,2 @@
/tomcat:883362
-/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,770809,77
0876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,816252,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832214,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883134,883146,883165,883177,883362,883565,884341,885038,885231,885241,885260,885901,885991,886019,888072,889363,889606,889716,890139,8902
65,890349-890350,890417,891185-891187,891583,892198,892341,892415,892464,892555,892812,892814,892817,892843,892887,893321,893493,894580,894586,894805,894831,895013,895045,895057,895703,896370,896384,897380-897381,897776,898126,898256,898468,898527,898555,898558,898718,898836,898906,899284,899348,899420,903916,905151,908721
+/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,770809,77
0876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,816252,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832214,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883134,883146,883165,883177,883362,883565,884341,885038,885231,885241,885260,885901,885991,886019,888072,889363,889606,889716,890139,8902
65,890349-890350,890417,891185-891187,891583,892198,892341,892415,892464,892555,892812,892814,892817,892843,892887,893321,893493,894580,894586,894805,894831,895013,895045,895057,895191,895392,895703,896370,896384,897380-897381,897776,898126,898256,898468,898527,898555,898558,898718,898836,898906,899284,899348,899420,903916,905151,908721
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=908749&r1=908748&r2=908749&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Feb 10 23:26:42 2010
@@ -68,28 +68,6 @@
-1: remm: no for TC 6.0
-1: funkman : api change in Session.java for .x.x release
-* Allow special characters recognized by the Windows command-line shell to
- be present in the names of CATALINA_HOME/_BASE and the current directory
- used to call the Tomcat scripts.
- Fixes the problem reported for the '&' character:
- https://issues.apache.org/bugzilla/show_bug.cgi?id=48464#c4
- "help cmd" lists the following characters as special:
- <space> and &()[]{}^=;!'+,`~
- Note that:
- - cd, set, echo commands have to use quotes when a name contains '&'
- - names containing the space character are already working without this
patch
- Patch:
-
http://people.apache.org/~kkolinko/patches/2010-01-03_bug48464-c4_ampersand_tc6.patch
- (a backport of revs. 895191, 895392)
- Tested on Windows XP.
- +1: kkolinko, rjung, markt
- -1:
- rjung: I would slightly prefer to apply after we finally managed to produce
a working
- release for 6.0.x, since changes in the Windows bat files are hard to
test
- for all possible cases, paths etc.
- The 'set "a=%b%"' trick is nice, because if you only use the quotation
- marks around the rhs, Windows actually adds them to the value of 'a'.
-
* Remove @Deprecated annotations from javax.servlet.jsp.JspContext
Part of http://svn.apache.org/viewvc?rev=899635&view=rev
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/jsp/JspContext.java?view=diff&r1=899634&r2=899635&pathrev=899635
Modified: tomcat/tc6.0.x/trunk/bin/catalina.bat
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/bin/catalina.bat?rev=908749&r1=908748&r2=908749&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/bin/catalina.bat (original)
+++ tomcat/tc6.0.x/trunk/bin/catalina.bat Wed Feb 10 23:26:42 2010
@@ -79,13 +79,13 @@
rem ---------------------------------------------------------------------------
rem Guess CATALINA_HOME if not defined
-set CURRENT_DIR=%cd%
+set "CURRENT_DIR=%cd%"
if not "%CATALINA_HOME%" == "" goto gotHome
-set CATALINA_HOME=%CURRENT_DIR%
+set "CATALINA_HOME=%CURRENT_DIR%"
if exist "%CATALINA_HOME%\bin\catalina.bat" goto okHome
cd ..
-set CATALINA_HOME=%cd%
-cd %CURRENT_DIR%
+set "CATALINA_HOME=%cd%"
+cd "%CURRENT_DIR%"
:gotHome
if exist "%CATALINA_HOME%\bin\catalina.bat" goto okHome
echo The CATALINA_HOME environment variable is not defined correctly
@@ -107,20 +107,20 @@
rem Get standard Java environment variables
if exist "%CATALINA_HOME%\bin\setclasspath.bat" goto okSetclasspath
-echo Cannot find %CATALINA_HOME%\bin\setclasspath.bat
+echo Cannot find "%CATALINA_HOME%\bin\setclasspath.bat"
echo This file is needed to run this program
goto end
:okSetclasspath
-set BASEDIR=%CATALINA_HOME%
+set "BASEDIR=%CATALINA_HOME%"
call "%CATALINA_HOME%\bin\setclasspath.bat" %1
if errorlevel 1 goto end
if not "%CATALINA_BASE%" == "" goto gotBase
-set CATALINA_BASE=%CATALINA_HOME%
+set "CATALINA_BASE=%CATALINA_HOME%"
:gotBase
if not "%CATALINA_TMPDIR%" == "" goto gotTmpdir
-set CATALINA_TMPDIR=%CATALINA_BASE%\temp
+set "CATALINA_TMPDIR=%CATALINA_BASE%\temp"
:gotTmpdir
rem Add tomcat-juli.jar and bootstrap.jar to classpath
@@ -128,14 +128,14 @@
rem Note that there are no quotes as we do not want to introduce random
rem quotes into the CLASSPATH
if "%CLASSPATH%" == "" goto emptyClasspath
-set CLASSPATH=%CLASSPATH%;
+set "CLASSPATH=%CLASSPATH%;"
:emptyClasspath
if "%CATALINA_BASE%" == "%CATALINA_HOME%" goto juliClasspathHome
if not exist "%CATALINA_BASE%\bin\tomcat-juli.jar" goto juliClasspathHome
-set
CLASSPATH=%CLASSPATH%%CATALINA_BASE%\bin\tomcat-juli.jar;%CATALINA_HOME%\bin\bootstrap.jar
+set
"CLASSPATH=%CLASSPATH%%CATALINA_BASE%\bin\tomcat-juli.jar;%CATALINA_HOME%\bin\bootstrap.jar"
goto juliClasspathDone
:juliClasspathHome
-set CLASSPATH=%CLASSPATH%%CATALINA_HOME%\bin\bootstrap.jar
+set "CLASSPATH=%CLASSPATH%%CATALINA_HOME%\bin\bootstrap.jar"
:juliClasspathDone
if not "%LOGGING_CONFIG%" == "" goto noJuliConfig
@@ -152,16 +152,16 @@
rem ----- Execute The Requested Command ---------------------------------------
-echo Using CATALINA_BASE: %CATALINA_BASE%
-echo Using CATALINA_HOME: %CATALINA_HOME%
-echo Using CATALINA_TMPDIR: %CATALINA_TMPDIR%
+echo Using CATALINA_BASE: "%CATALINA_BASE%"
+echo Using CATALINA_HOME: "%CATALINA_HOME%"
+echo Using CATALINA_TMPDIR: "%CATALINA_TMPDIR%"
if ""%1"" == ""debug"" goto use_jdk
-echo Using JRE_HOME: %JRE_HOME%
+echo Using JRE_HOME: "%JRE_HOME%"
goto java_dir_displayed
:use_jdk
-echo Using JAVA_HOME: %JAVA_HOME%
+echo Using JAVA_HOME: "%JAVA_HOME%"
:java_dir_displayed
-echo Using CLASSPATH: %CLASSPATH%
+echo Using CLASSPATH: "%CLASSPATH%"
set _EXECJAVA=%_RUNJAVA%
set MAINCLASS=org.apache.catalina.startup.Bootstrap
@@ -213,7 +213,7 @@
if not ""%1"" == ""-security"" goto execCmd
shift
echo Using Security Manager
-set SECURITY_POLICY_FILE=%CATALINA_BASE%\conf\catalina.policy
+set "SECURITY_POLICY_FILE=%CATALINA_BASE%\conf\catalina.policy"
goto execCmd
:doRun
@@ -221,7 +221,7 @@
if not ""%1"" == ""-security"" goto execCmd
shift
echo Using Security Manager
-set SECURITY_POLICY_FILE=%CATALINA_BASE%\conf\catalina.policy
+set "SECURITY_POLICY_FILE=%CATALINA_BASE%\conf\catalina.policy"
goto execCmd
:doStart
@@ -236,7 +236,7 @@
if not ""%1"" == ""-security"" goto execCmd
shift
echo Using Security Manager
-set SECURITY_POLICY_FILE=%CATALINA_BASE%\conf\catalina.policy
+set "SECURITY_POLICY_FILE=%CATALINA_BASE%\conf\catalina.policy"
goto execCmd
:doStop
Modified: tomcat/tc6.0.x/trunk/bin/digest.bat
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/bin/digest.bat?rev=908749&r1=908748&r2=908749&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/bin/digest.bat (original)
+++ tomcat/tc6.0.x/trunk/bin/digest.bat Wed Feb 10 23:26:42 2010
@@ -33,11 +33,11 @@
goto end
:okHome
-set EXECUTABLE=%CATALINA_HOME%\bin\tool-wrapper.bat
+set "EXECUTABLE=%CATALINA_HOME%\bin\tool-wrapper.bat"
rem Check that target executable exists
if exist "%EXECUTABLE%" goto okExec
-echo Cannot find %EXECUTABLE%
+echo Cannot find "%EXECUTABLE%"
echo This file is needed to run this program
goto end
:okExec
Modified: tomcat/tc6.0.x/trunk/bin/service.bat
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/bin/service.bat?rev=908749&r1=908748&r2=908749&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/bin/service.bat (original)
+++ tomcat/tc6.0.x/trunk/bin/service.bat Wed Feb 10 23:26:42 2010
@@ -30,13 +30,13 @@
rem ---------------------------------------------------------------------------
rem Guess CATALINA_HOME if not defined
-set CURRENT_DIR=%cd%
+set "CURRENT_DIR=%cd%"
if not "%CATALINA_HOME%" == "" goto gotHome
-set CATALINA_HOME=%cd%
+set "CATALINA_HOME=%cd%"
if exist "%catalina_home%\bin\tom...@version_major@.exe" goto okHome
rem CD to the upper dir
cd ..
-set CATALINA_HOME=%cd%
+set "CATALINA_HOME=%cd%"
:gotHome
if exist "%catalina_home%\bin\tom...@version_major@.exe" goto okHome
echo The tomcat.exe was not found...
@@ -50,10 +50,10 @@
goto end
:okHome
if not "%CATALINA_BASE%" == "" goto gotBase
-set CATALINA_BASE=%CATALINA_HOME%
+set "CATALINA_BASE=%CATALINA_HOME%"
:gotBase
-set executable=%catalina_home%\bin\tom...@version_major@.exe
+set "executable=%catalina_home%\bin\tom...@version_major@.exe"
rem Set default Service name
set service_name=tom...@version_major@
@@ -82,26 +82,26 @@
:doInstall
rem Install the service
echo Installing the service '%SERVICE_NAME%' ...
-echo Using CATALINA_HOME: %CATALINA_HOME%
-echo Using CATALINA_BASE: %CATALINA_BASE%
-echo Using JAVA_HOME: %JAVA_HOME%
+echo Using CATALINA_HOME: "%CATALINA_HOME%"
+echo Using CATALINA_BASE: "%CATALINA_BASE%"
+echo Using JAVA_HOME: "%JAVA_HOME%"
rem Use the environment variables as an example
rem Each command line option is prefixed with PR_
set PR_DESCRIPTION=Apache Tomcat @VERSION@ Server - http://tomcat.apache.org/
-set PR_INSTALL=%EXECUTABLE%
-set PR_LOGPATH=%CATALINA_BASE%\logs
-set
PR_CLASSPATH=%CATALINA_BASE%\bin\tomcat-juli.jar;%CATALINA_HOME%\bin\tomcat-juli.jar;%CATALINA_HOME%\bin\bootstrap.jar
+set "PR_INSTALL=%EXECUTABLE%"
+set "PR_LOGPATH=%CATALINA_BASE%\logs"
+set
"PR_CLASSPATH=%CATALINA_BASE%\bin\tomcat-juli.jar;%CATALINA_HOME%\bin\tomcat-juli.jar;%CATALINA_HOME%\bin\bootstrap.jar"
rem Set the server jvm from JAVA_HOME
-set PR_JVM=%JAVA_HOME%\jre\bin\server\jvm.dll
+set "PR_JVM=%JAVA_HOME%\jre\bin\server\jvm.dll"
if exist "%PR_JVM%" goto foundJvm
rem Set the client jvm from JAVA_HOME
-set PR_JVM=%JAVA_HOME%\jre\bin\client\jvm.dll
+set "PR_JVM=%JAVA_HOME%\jre\bin\client\jvm.dll"
if exist "%PR_JVM%" goto foundJvm
set PR_JVM=auto
:foundJvm
-echo Using JVM: %PR_JVM%
+echo Using JVM: "%PR_JVM%"
"%EXECUTABLE%" //IS//%SERVICE_NAME% --StartClass
org.apache.catalina.startup.Bootstrap --StopClass
org.apache.catalina.startup.Bootstrap --StartParams start --StopParams stop
if not errorlevel 1 goto installed
echo Failed installing '%SERVICE_NAME%' service
@@ -117,11 +117,11 @@
rem Set extra parameters
"%EXECUTABLE%" //US//%SERVICE_NAME% --JvmOptions
"-Dcatalina.base=%CATALINA_BASE%;-Dcatalina.home=%CATALINA_HOME%;-Djava.endorsed.dirs=%CATALINA_HOME%\endorsed"
--StartMode jvm --StopMode jvm
rem More extra parameters
-set PR_LOGPATH=%CATALINA_BASE%\logs
+set "PR_LOGPATH=%CATALINA_BASE%\logs"
set PR_STDOUTPUT=auto
set PR_STDERROR=auto
"%EXECUTABLE%" //US//%SERVICE_NAME% ++JvmOptions
"-Djava.io.tmpdir=%CATALINA_BASE%\temp;-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager;-Djava.util.logging.config.file=%CATALINA_BASE%\conf\logging.properties"
--JvmMs 128 --JvmMx 256
echo The service '%SERVICE_NAME%' has been installed.
:end
-cd %CURRENT_DIR%
+cd "%CURRENT_DIR%"
Modified: tomcat/tc6.0.x/trunk/bin/setclasspath.bat
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/bin/setclasspath.bat?rev=908749&r1=908748&r2=908749&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/bin/setclasspath.bat (original)
+++ tomcat/tc6.0.x/trunk/bin/setclasspath.bat Wed Feb 10 23:26:42 2010
@@ -40,7 +40,7 @@
if not exist "%JAVA_HOME%\bin\jdb.exe" goto noJavaHome
if not exist "%JAVA_HOME%\bin\javac.exe" goto noJavaHome
if not "%JRE_HOME%" == "" goto okJavaHome
-set JRE_HOME=%JAVA_HOME%
+set "JRE_HOME=%JAVA_HOME%"
goto okJavaHome
:noJavaHome
@@ -64,7 +64,7 @@
rem Don't override the endorsed dir if the user has set it previously
if not "%JAVA_ENDORSED_DIRS%" == "" goto gotEndorseddir
rem Set the default -Djava.endorsed.dirs argument
-set JAVA_ENDORSED_DIRS=%BASEDIR%\endorsed
+set "JAVA_ENDORSED_DIRS=%BASEDIR%\endorsed"
:gotEndorseddir
rem Set standard command for invoking Java.
Modified: tomcat/tc6.0.x/trunk/bin/shutdown.bat
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/bin/shutdown.bat?rev=908749&r1=908748&r2=908749&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/bin/shutdown.bat (original)
+++ tomcat/tc6.0.x/trunk/bin/shutdown.bat Wed Feb 10 23:26:42 2010
@@ -22,13 +22,13 @@
rem ---------------------------------------------------------------------------
rem Guess CATALINA_HOME if not defined
-set CURRENT_DIR=%cd%
+set "CURRENT_DIR=%cd%"
if not "%CATALINA_HOME%" == "" goto gotHome
-set CATALINA_HOME=%CURRENT_DIR%
+set "CATALINA_HOME=%CURRENT_DIR%"
if exist "%CATALINA_HOME%\bin\catalina.bat" goto okHome
cd ..
-set CATALINA_HOME=%cd%
-cd %CURRENT_DIR%
+set "CATALINA_HOME=%cd%"
+cd "%CURRENT_DIR%"
:gotHome
if exist "%CATALINA_HOME%\bin\catalina.bat" goto okHome
echo The CATALINA_HOME environment variable is not defined correctly
@@ -36,11 +36,11 @@
goto end
:okHome
-set EXECUTABLE=%CATALINA_HOME%\bin\catalina.bat
+set "EXECUTABLE=%CATALINA_HOME%\bin\catalina.bat"
rem Check that target executable exists
if exist "%EXECUTABLE%" goto okExec
-echo Cannot find %EXECUTABLE%
+echo Cannot find "%EXECUTABLE%"
echo This file is needed to run this program
goto end
:okExec
Modified: tomcat/tc6.0.x/trunk/bin/startup.bat
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/bin/startup.bat?rev=908749&r1=908748&r2=908749&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/bin/startup.bat (original)
+++ tomcat/tc6.0.x/trunk/bin/startup.bat Wed Feb 10 23:26:42 2010
@@ -22,13 +22,13 @@
rem ---------------------------------------------------------------------------
rem Guess CATALINA_HOME if not defined
-set CURRENT_DIR=%cd%
+set "CURRENT_DIR=%cd%"
if not "%CATALINA_HOME%" == "" goto gotHome
-set CATALINA_HOME=%CURRENT_DIR%
+set "CATALINA_HOME=%CURRENT_DIR%"
if exist "%CATALINA_HOME%\bin\catalina.bat" goto okHome
cd ..
-set CATALINA_HOME=%cd%
-cd %CURRENT_DIR%
+set "CATALINA_HOME=%cd%"
+cd "%CURRENT_DIR%"
:gotHome
if exist "%CATALINA_HOME%\bin\catalina.bat" goto okHome
echo The CATALINA_HOME environment variable is not defined correctly
@@ -36,11 +36,11 @@
goto end
:okHome
-set EXECUTABLE=%CATALINA_HOME%\bin\catalina.bat
+set "EXECUTABLE=%CATALINA_HOME%\bin\catalina.bat"
rem Check that target executable exists
if exist "%EXECUTABLE%" goto okExec
-echo Cannot find %EXECUTABLE%
+echo Cannot find "%EXECUTABLE%"
echo This file is needed to run this program
goto end
:okExec
Modified: tomcat/tc6.0.x/trunk/bin/tool-wrapper.bat
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/bin/tool-wrapper.bat?rev=908749&r1=908748&r2=908749&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/bin/tool-wrapper.bat (original)
+++ tomcat/tc6.0.x/trunk/bin/tool-wrapper.bat Wed Feb 10 23:26:42 2010
@@ -54,21 +54,21 @@
rem Get standard Java environment variables
if exist "%CATALINA_HOME%\bin\setclasspath.bat" goto okSetclasspath
-echo Cannot find %CATALINA_HOME%\bin\setclasspath.bat
+echo Cannot find "%CATALINA_HOME%\bin\setclasspath.bat"
echo This file is needed to run this program
goto end
:okSetclasspath
-set BASEDIR=%CATALINA_HOME%
+set "BASEDIR=%CATALINA_HOME%"
call "%CATALINA_HOME%\bin\setclasspath.bat"
rem Add on extra jar files to CLASSPATH
rem Note that there are no quotes as we do not want to introduce random
rem quotes into the CLASSPATH
if "%CLASSPATH%" == "" goto noclasspath
-set
CLASSPATH=%CLASSPATH%;%CATALINA_HOME%\bin\bootstrap.jar;%BASEDIR%\lib\servlet-api.jar
+set
"CLASSPATH=%CLASSPATH%;%CATALINA_HOME%\bin\bootstrap.jar;%BASEDIR%\lib\servlet-api.jar"
goto okclasspath
:noclasspath
-set CLASSPATH=%CATALINA_HOME%\bin\bootstrap.jar;%BASEDIR%\lib\servlet-api.jar
+set "CLASSPATH=%CATALINA_HOME%\bin\bootstrap.jar;%BASEDIR%\lib\servlet-api.jar"
:okclasspath
rem Get remaining unshifted command line arguments and save them in the
Modified: tomcat/tc6.0.x/trunk/bin/version.bat
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/bin/version.bat?rev=908749&r1=908748&r2=908749&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/bin/version.bat (original)
+++ tomcat/tc6.0.x/trunk/bin/version.bat Wed Feb 10 23:26:42 2010
@@ -22,13 +22,13 @@
rem ---------------------------------------------------------------------------
rem Guess CATALINA_HOME if not defined
-set CURRENT_DIR=%cd%
+set "CURRENT_DIR=%cd%"
if not "%CATALINA_HOME%" == "" goto gotHome
-set CATALINA_HOME=%CURRENT_DIR%
+set "CATALINA_HOME=%CURRENT_DIR%"
if exist "%CATALINA_HOME%\bin\catalina.bat" goto okHome
cd ..
-set CATALINA_HOME=%cd%
-cd %CURRENT_DIR%
+set "CATALINA_HOME=%cd%"
+cd "%CURRENT_DIR%"
:gotHome
if exist "%CATALINA_HOME%\bin\catalina.bat" goto okHome
echo The CATALINA_HOME environment variable is not defined correctly
@@ -36,11 +36,11 @@
goto end
:okHome
-set EXECUTABLE=%CATALINA_HOME%\bin\catalina.bat
+set "EXECUTABLE=%CATALINA_HOME%\bin\catalina.bat"
rem Check that target executable exists
if exist "%EXECUTABLE%" goto okExec
-echo Cannot find %EXECUTABLE%
+echo Cannot find "%EXECUTABLE%"
echo This file is needed to run this program
goto end
:okExec
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=908749&r1=908748&r2=908749&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Wed Feb 10 23:26:42 2010
@@ -45,14 +45,23 @@
</subsection>
<subsection name="Cluster">
<changelog>
- <fix>Force a disconnect if an error occurs during replication such as
- a firewall dropping the connection. (fhanik)</fix>
+ <fix>
+ Force a disconnect if an error occurs during replication such as
+ a firewall dropping the connection. (fhanik)
+ </fix>
</changelog>
</subsection>
<subsection name="Other">
<changelog>
- <fix>Ensure files in conf directory have CRLF line endings when using the
- Windows installer. (kkolinko)</fix>
+ <fix>
+ Ensure files in conf directory have CRLF line endings when using the
+ Windows installer. (kkolinko)
+ </fix>
+ <fix>
+ Allow special characters recognized by the Windows command-line shell
to
+ be present in the names of CATALINA_HOME/_BASE and the current
directory
+ used to call the Tomcat scripts. (kkolinko)
+ </fix>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
