Author: markt
Date: Tue Sep 30 13:10:02 2014
New Revision: 1628428
URL: http://svn.apache.org/r1628428
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56606
User new attribute name for username
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/res/tomcat.nsi
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1628428&r1=1628427&r2=1628428&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Sep 30 13:10:02 2014
@@ -28,12 +28,6 @@ None
PATCHES PROPOSED TO BACKPORT:
[ New proposals should be added at the end of the list ]
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56606
- User new attribute name for username
- http://people.apache.org/~markt/patches/2014-06-10-user-username-tc6-v1.patch
- +1: markt, kkolinko, remm
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56334#c15
Fix a regression in EL parsing when quoted string follows a whitespace.
http://people.apache.org/~markt/patches/2014-06-18-bug56334%23c15-tc6-v1.patch
Modified: tomcat/tc6.0.x/trunk/res/tomcat.nsi
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/res/tomcat.nsi?rev=1628428&r1=1628427&r2=1628428&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/res/tomcat.nsi (original)
+++ tomcat/tc6.0.x/trunk/res/tomcat.nsi Tue Sep 30 13:10:02 2014
@@ -936,7 +936,7 @@ Function configure
Push $TomcatAdminRoles
Call xmlEscape
Pop $R3
- StrCpy $R5 '<user name="$R1" password="$R2" roles="$R3" />$\r$\n'
+ StrCpy $R5 '<user username="$R1" password="$R2" roles="$R3" />$\r$\n'
DetailPrint 'Admin user added: "$TomcatAdminUsername"'
${EndIf}
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=1628428&r1=1628427&r2=1628428&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Tue Sep 30 13:10:02 2014
@@ -97,6 +97,13 @@
</scode>
</changelog>
</subsection>
+ <subsection name="Other">
+ <changelog>
+ <bug>56606</bug>: When creating <code>tomcat-users.xml</code> in the
+ Windows Installer, use the new attribute name for the name of the user.
+ (markt)
+ </changelog>
+ </subsection>
</section>
<section name="Tomcat 6.0.41 (markt)" rtext="released 2014-05-23">
<subsection name="Jasper">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
