You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2008/01/10 22:53:14 UTC
svn commit: r610946 - in /tomcat/trunk: conf/tomcat-users.xml
webapps/examples/jsp/tagplugin/if.jsp
Author: markt
Date: Thu Jan 10 13:53:14 2008
New Revision: 610946
URL: http://svn.apache.org/viewvc?rev=610946&view=rev
Log:
Fix bug 43344. Correct typo. Patch provided by Tim Nowaczyk.
Modified:
tomcat/trunk/conf/tomcat-users.xml
tomcat/trunk/webapps/examples/jsp/tagplugin/if.jsp
Modified: tomcat/trunk/conf/tomcat-users.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/conf/tomcat-users.xml?rev=610946&r1=610945&r2=610946&view=diff
==============================================================================
--- tomcat/trunk/conf/tomcat-users.xml (original)
+++ tomcat/trunk/conf/tomcat-users.xml Thu Jan 10 13:53:14 2008
@@ -16,11 +16,11 @@
limitations under the License.
-->
<tomcat-users>
-<!--
+ <role rolename="manager"/>
<role rolename="tomcat"/>
+ <role rolename="admin"/>
<role rolename="role1"/>
+ <user username="both" password="tomcat" roles="tomcat,role1,manager,admin"/>
<user username="tomcat" password="tomcat" roles="tomcat"/>
- <user username="both" password="tomcat" roles="tomcat,role1"/>
<user username="role1" password="tomcat" roles="role1"/>
--->
</tomcat-users>
Modified: tomcat/trunk/webapps/examples/jsp/tagplugin/if.jsp
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/jsp/tagplugin/if.jsp?rev=610946&r1=610945&r2=610946&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/jsp/tagplugin/if.jsp (original)
+++ tomcat/trunk/webapps/examples/jsp/tagplugin/if.jsp Thu Jan 10 13:53:14 2008
@@ -25,7 +25,7 @@
</br>
<a href="notes.html">Plugin Introductory Notes<font <font color="#0000FF"></a>
<br/>
- <a href="howto.html">Brief Instructions for Wrieting Plugins<font color="#0000FF"></a>
+ <a href="howto.html">Brief Instructions for Writing Plugins<font color="#0000FF"></a>
<br/> <br/>
<hr>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r610946 - in /tomcat/trunk: conf/tomcat-users.xml
webapps/examples/jsp/tagplugin/if.jsp
Posted by Mark Thomas <ma...@apache.org>.
Filip Hanik - Dev Lists wrote:
> I don't think we wanna ship a file that has a default user for admin and
> manager roles.
Sorry - my bad. I always change that file locally and forgot to un-select
it from the commit. I'll revert it.
Mark
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r610946 - in /tomcat/trunk: conf/tomcat-users.xml
webapps/examples/jsp/tagplugin/if.jsp
Posted by Filip Hanik - Dev Lists <de...@hanik.com>.
I don't think we wanna ship a file that has a default user for admin and
manager roles.
most folks leave this realm in their server.xml, and the manager app
enabled, so this would create future complaints
-1 on the tomcat-users.xml change
Filip
markt@apache.org wrote:
> Author: markt
> Date: Thu Jan 10 13:53:14 2008
> New Revision: 610946
>
> URL: http://svn.apache.org/viewvc?rev=610946&view=rev
> Log:
> Fix bug 43344. Correct typo. Patch provided by Tim Nowaczyk.
>
> Modified:
> tomcat/trunk/conf/tomcat-users.xml
> tomcat/trunk/webapps/examples/jsp/tagplugin/if.jsp
>
> Modified: tomcat/trunk/conf/tomcat-users.xml
> URL: http://svn.apache.org/viewvc/tomcat/trunk/conf/tomcat-users.xml?rev=610946&r1=610945&r2=610946&view=diff
> ==============================================================================
> --- tomcat/trunk/conf/tomcat-users.xml (original)
> +++ tomcat/trunk/conf/tomcat-users.xml Thu Jan 10 13:53:14 2008
> @@ -16,11 +16,11 @@
> limitations under the License.
> -->
> <tomcat-users>
> -<!--
> + <role rolename="manager"/>
> <role rolename="tomcat"/>
> + <role rolename="admin"/>
> <role rolename="role1"/>
> + <user username="both" password="tomcat" roles="tomcat,role1,manager,admin"/>
> <user username="tomcat" password="tomcat" roles="tomcat"/>
> - <user username="both" password="tomcat" roles="tomcat,role1"/>
> <user username="role1" password="tomcat" roles="role1"/>
> --->
> </tomcat-users>
>
> Modified: tomcat/trunk/webapps/examples/jsp/tagplugin/if.jsp
> URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/jsp/tagplugin/if.jsp?rev=610946&r1=610945&r2=610946&view=diff
> ==============================================================================
> --- tomcat/trunk/webapps/examples/jsp/tagplugin/if.jsp (original)
> +++ tomcat/trunk/webapps/examples/jsp/tagplugin/if.jsp Thu Jan 10 13:53:14 2008
> @@ -25,7 +25,7 @@
> </br>
> <a href="notes.html">Plugin Introductory Notes<font <font color="#0000FF"></a>
> <br/>
> - <a href="howto.html">Brief Instructions for Wrieting Plugins<font color="#0000FF"></a>
> + <a href="howto.html">Brief Instructions for Writing Plugins<font color="#0000FF"></a>
> <br/> <br/>
> <hr>
>
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
> For additional commands, e-mail: dev-help@tomcat.apache.org
>
>
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org