Author: markt
Date: Tue Jun 10 10:15:17 2014
New Revision: 1601597
URL: http://svn.apache.org/r1601597
Log:
Ensure that the new attribute name username is used in the tomcat-users.xml
examples rather than the old name of user.
Modified:
tomcat/trunk/res/tomcat.nsi
tomcat/trunk/webapps/docs/changelog.xml
tomcat/trunk/webapps/docs/manager-howto.xml
tomcat/trunk/webapps/docs/realm-howto.xml
Modified: tomcat/trunk/res/tomcat.nsi
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/tomcat.nsi?rev=1601597&r1=1601596&r2=1601597&view=diff
==============================================================================
--- tomcat/trunk/res/tomcat.nsi (original)
+++ tomcat/trunk/res/tomcat.nsi Tue Jun 10 10:15:17 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/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1601597&r1=1601596&r2=1601597&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Tue Jun 10 10:15:17 2014
@@ -224,6 +224,16 @@
</fix>
</changelog>
</subsection>
+ <subsection name="Web applications">
+ <changelog>
+ <fix>
+ <bug>56606</bug>: Ensure that the new attribute name
+ <code>username</code> is used in the <code>tomcat-users.xml</code>
+ examples rather than the old attribute name of <code>user</code>.
+ (markt)
+ </fix>
+ </changelog>
+ </subsection>
<subsection name="Other">
<changelog>
<update>
Modified: tomcat/trunk/webapps/docs/manager-howto.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/manager-howto.xml?rev=1601597&r1=1601596&r2=1601597&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/manager-howto.xml (original)
+++ tomcat/trunk/webapps/docs/manager-howto.xml Tue Jun 10 10:15:17 2014
@@ -173,7 +173,7 @@ Exactly how the usernames/passwords are
edited with any text editor. This file contains an XML
<code><user></code> for each individual user, which might
look something like this:
-<source><![CDATA[<user name="craigmcc" password="secret"
roles="standard,manager-script" />]]></source>
+<source><![CDATA[<user username="craigmcc" password="secret"
roles="standard,manager-script" />]]></source>
which defines the username and password used by this individual to
log on, and the role names he or she is associated with. You can
add the <strong>manager-script</strong> role to the comma-delimited
Modified: tomcat/trunk/webapps/docs/realm-howto.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/realm-howto.xml?rev=1601597&r1=1601596&r2=1601597&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/realm-howto.xml (original)
+++ tomcat/trunk/webapps/docs/realm-howto.xml Tue Jun 10 10:15:17 2014
@@ -891,9 +891,9 @@ nested inside the <code><Engine></
to all virtual hosts and web applications. The default contents of the
<code>conf/tomcat-users.xml</code> file is:</p>
<source><![CDATA[<tomcat-users>
- <user name="tomcat" password="tomcat" roles="tomcat" />
- <user name="role1" password="tomcat" roles="role1" />
- <user name="both" password="tomcat" roles="tomcat,role1" />
+ <user username="tomcat" password="tomcat" roles="tomcat" />
+ <user username="role1" password="tomcat" roles="role1" />
+ <user username="both" password="tomcat" roles="tomcat,role1" />
</tomcat-users>]]></source>
<h5>Additional Notes</h5>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
