Change role name for Manager GUI access to manager-gui to align with planned changes...

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@943290 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/webapps/manager/401.jsp b/webapps/manager/401.jsp
index caab47f..8fb2cfd 100644 (file)
--- a/webapps/manager/401.jsp
+++ b/webapps/manager/401.jsp
@@ -39,13 +39,13 @@
     file must contain the credentials to let you use this webapp.
    </p>
    <p>
-    For example, to add the <tt>manager</tt> role to a user named
+    For example, to add the <tt>manager-gui</tt> role to a user named
     <tt>tomcat</tt> with a password of <tt>s3cret</tt>, add the following to the
     config file listed above.
    </p>
 <pre>
-&lt;role rolename="manager"/&gt;
-&lt;user username="tomcat" password="s3cret" roles="manager"/&gt;
+&lt;role rolename="manager-gui"/&gt;
+&lt;user username="tomcat" password="s3cret" roles="manager-gui"/&gt;
 </pre>
    <p>
     Note that for Tomcat 7 onwards, the roles required to use the manager
@@ -54,7 +54,7 @@
     the functionality you wish to access.
    </p>
     <ul>
-      <li><tt>manager</tt> - allows access to the HTML GUI and the status
+      <li><tt>manager-gui</tt> - allows access to the HTML GUI and the status
           pages</li>
       <li><tt>manager-script</tt> - allows access to the text interface and the
           status pages</li>

diff --git a/webapps/manager/WEB-INF/web.xml b/webapps/manager/WEB-INF/web.xml
index 3ea03d5..89cf40a 100644 (file)
--- a/webapps/manager/WEB-INF/web.xml
+++ b/webapps/manager/WEB-INF/web.xml
@@ -105,7 +105,7 @@
       <url-pattern>/html/*</url-pattern>
     </web-resource-collection>
     <auth-constraint>
-       <role-name>manager</role-name>
+       <role-name>manager-gui</role-name>
     </auth-constraint>
   </security-constraint>
   <security-constraint>
@@ -132,7 +132,7 @@
       <url-pattern>/status/*</url-pattern>
     </web-resource-collection>
     <auth-constraint>
-       <role-name>manager</role-name>
+       <role-name>manager-gui</role-name>
        <role-name>manager-script</role-name>
        <role-name>manager-jmx</role-name>
        <role-name>manager-status</role-name>
@@ -150,7 +150,7 @@
     <description>
       The role that is required to access the HTML Manager pages
     </description>
-    <role-name>manager</role-name>
+    <role-name>manager-gui</role-name>
   </security-role>
   <security-role>
     <description>