Author: kkolinko
Date: Mon Apr 14 18:50:56 2014
New Revision: 1587279
URL: http://svn.apache.org/r1587279
Log:
Update proposal:
Merge code and docs patches and add r1587273
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1587279&r1=1587278&r2=1587279&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Apr 14 18:50:56 2014
@@ -51,10 +51,22 @@ PATCHES PROPOSED TO BACKPORT:
+1: markt
-1:
-* Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=49993
- Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=56143
+* Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=56143
+ and http://issues.apache.org/bugzilla/show_bug.cgi?id=49993
- Improvements to service.bat:
+ Improve service.bat so that it can be launched from a non-UAC console,
+ and backport other minor improvements.
+
+ Update documentation. There is no more a need to start cmd.exe with
+ elevated priviledges.
+
+ Add support for '<version-major/>', '<version-major-minor>' to
+ tomcat-docs.xsl to simplify documentation backports.
+
+ (I am not backporting the "/user" option of service.bat. The rest of
+ service.bat is the same as in TC7 and TC8.)
+
+ Changes to service.bat:
- Improve service.bat so that it can be launched from a non-UAC console.
This includes using a single call to tomcat6.exe to install the Windows
@@ -65,16 +77,16 @@ PATCHES PROPOSED TO BACKPORT:
--DisplayName, --StartPath, --StopPath and --LogPath.
- Make command comparisons case-insensitive. Remove %OS% check for setlocal.
- (This assumes that nobody runs on ancient non-NT systems).
+
+ (This assumes that nobody runs on ancient non-NT systems that do not have
+ setlocal).
- Improve check for JAVA_HOME and add support for JRE_HOME environment
variable. (BZ 49993)
- (I am not backporting the "/user" option. The rest of service.bat is the
- same as in TC7 & TC8).
+ - Print a warning in case if neither server nor client jvm is found.
- https://people.apache.org/~kkolinko/patches/2014-04-13_tc6_service_bat.patch
-
https://people.apache.org/~kkolinko/patches/2014-04-13_tc6_service_bat_docs.patch
(documentation)
+ https://people.apache.org/~kkolinko/patches/2014-04-14_tc6_56143_v2.patch
+1: kkolinko
-1:
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
