Author: jim Date: Tue Jan 12 15:42:11 2010 New Revision: 898383 URL: http://svn.apache.org/viewvc?rev=898383&view=rev Log: Merge r895600 from trunk:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48464 Provide an option to specify the command window title Patch provided by LiuYan Submitted by: markt Reviewed/backported by: jim Modified: tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/bin/catalina.bat Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=898383&r1=898382&r2=898383&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Jan 12 15:42:11 2010 @@ -28,13 +28,6 @@ PATCHES ACCEPTED TO BACKPORT: [ start all new proposals below, under PATCHES PROPOSED. ] -* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48464 - Provide an option to specify the command window title - Patch provided by LiuYan - http://svn.apache.org/viewvc?rev=895600&view=rev - +1: markt, kkolinko, jim - -1: - * Update recommended tcnative version to the forthcoming 1.1.19. No update on the required version (17) http://svn.apache.org/viewvc?rev=895703&view=rev Modified: tomcat/tc6.0.x/trunk/bin/catalina.bat URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/bin/catalina.bat?rev=898383&r1=898382&r2=898383&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/bin/catalina.bat (original) +++ tomcat/tc6.0.x/trunk/bin/catalina.bat Tue Jan 12 15:42:11 2010 @@ -222,7 +222,8 @@ :doStart shift if not "%OS%" == "Windows_NT" goto noTitle -set _EXECJAVA=start "Tomcat" %_RUNJAVA% +if "%TITLE%" == "" set TITLE=Tomcat +set _EXECJAVA=start "%TITLE%" %_RUNJAVA% goto gotTitle :noTitle set _EXECJAVA=start %_RUNJAVA% --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org