Author: kkolinko
Date: Mon Jan 17 13:02:29 2011
New Revision: 1059906
URL: http://svn.apache.org/viewvc?rev=1059906&view=rev
Log:
Updated the patch - added r1038975,
and rephrased the proposal.
Modified:
tomcat/tc5.5.x/trunk/STATUS.txt
Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=1059906&r1=1059905&r2=1059906&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Mon Jan 17 13:02:29 2011
@@ -43,17 +43,17 @@ PATCHES PROPOSED TO BACKPORT:
-1:
* Backport Windows installer improvements from Tomcat 7.0.5.
+ (as applied to TC6 in http://svn.apache.org/viewvc?rev=1056426&view=rev )
- See TC 6 proposal for details (r1035106).
- TC5.5 proposal is different in the following:
- - Patch includes changes to build.xml, to implement filtering for @YEAR@
- - Patch includes changes to tomcat-users_1.xml, to implement TC6/TC7
+ TC5.5 differences from TC6:
+ 1) The patch includes changes to build.xml, to implement filtering for
@YEAR@
+ 2) The patch includes changes to tomcat-users_1.xml, to implement TC6/TC7
installer feature that the character encoding that was used to write
- tomcat-users.xml is included in the XML signature that is printed
- at the top of the file. That was to support non-latin usernames.
- - TC5.5 uses the old roles "manager" and "admin", instead of the newer
- "-gui" ones.
+ tomcat-users.xml is included in the XML signature at the top of the file.
+ That is to support non-latin usernames.
+ 3) The patch uses the old roles "manager" and "admin", not the "-gui" ones.
+ To apply:
1. Run the following SVN commands:
svn del build/resources/jvm.ini
svn del build/resources/config.ini
@@ -63,14 +63,13 @@ PATCHES PROPOSED TO BACKPORT:
svn copy ../../trunk/res/main.ico build/resources/
svn copy ../../trunk/res/uninst.ico build/resources/
2. Apply patch:
- http://people.apache.org/~kkolinko/patches/2010-11-15_tc55_tomcat-nsi.patch
- (
- For reference: here is the diff of tomcat.nsi of trunk @1035132 if I copy
- this patched tc5.5 version on top of it:
-
http://people.apache.org/~kkolinko/patches/2010-11-15_tc55_tomcat-nsi-of-tc7_vs_tc55.diff
- )
- +1: kkolinko - with r1038975 to remove use of PID file
- -1:
+ http://people.apache.org/~kkolinko/patches/2011-01-17_tc55_tomcat-nsi.patch
+ +1: kkolinko
+ -1:
+
+ For reference: here is the diff of tomcat.nsi of trunk @1059900 if I copy
+ patched tomcat.nsi of tc5.5 on top of it:
+ (
http://people.apache.org/~kkolinko/patches/2011-01-17_tc55_tomcat-nsi-of-tc7_vs_tc55.diff
)
* Configure manager, host-manager and admin webapps to use HttpOnly for
session cookies
http://people.apache.org/~kkolinko/patches/2010-11-22_tc55_httpOnly.patch
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
