Documentation fixes:

1) role name: s/manager/manager-script/ (BZ 50599),
s/manager-script/admin-script/ on 401/403 pages of host-manager webapp (a typo)
2) there is no property "debug" on the Context, nor on several other classes (realms, authenticators)

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

diff --git a/webapps/docs/config/host.xml b/webapps/docs/config/host.xml
index fc54c73..cb60d56 100644 (file)
--- a/webapps/docs/config/host.xml
+++ b/webapps/docs/config/host.xml
@@ -554,8 +554,7 @@
 <source>
 &lt;Host name="localhost" ...&gt;
   ...
-  &lt;Valve className="org.apache.catalina.authenticator.SingleSignOn"
-         debug="0"/&gt;
+  &lt;Valve className="org.apache.catalina.authenticator.SingleSignOn"/&gt;
   ...
 &lt;/Host&gt;
 </source>

diff --git a/webapps/docs/deployer-howto.xml b/webapps/docs/deployer-howto.xml
index 3c0256c..44e91ae 100644 (file)
--- a/webapps/docs/deployer-howto.xml
+++ b/webapps/docs/deployer-howto.xml
@@ -324,7 +324,7 @@
             </li>
             <li>
                 <code>username</code>: Tomcat Manager username (user should have a role of
-                manager)
+                manager-script)
             </li>
             <li><code>password</code>: Tomcat Manager password.</li>
         </ul>

diff --git a/webapps/docs/html-manager-howto.xml b/webapps/docs/html-manager-howto.xml
index 1dd65f4..f8cd402 100644 (file)
--- a/webapps/docs/html-manager-howto.xml
+++ b/webapps/docs/html-manager-howto.xml
@@ -387,8 +387,7 @@ web application Context just as if it were configured in your
 Tomcat <code>server.xml</code> configuration file. Here is an
 example for Tomcat running on Windows:</p>
 <source>
-&lt;Context path="/foobar" docBase="C:\path\to\application\foobar"
-         debug="0"&gt;
+&lt;Context path="/foobar" docBase="C:\path\to\application\foobar"&gt;
 
   &lt;!-- Link to the user database we will get roles from --&gt;
   &lt;ResourceLink name="users" global="UserDatabase"

diff --git a/webapps/docs/jndi-datasource-examples-howto.xml b/webapps/docs/jndi-datasource-examples-howto.xml
index 3152221..b7165d5 100644 (file)
--- a/webapps/docs/jndi-datasource-examples-howto.xml
+++ b/webapps/docs/jndi-datasource-examples-howto.xml
@@ -207,7 +207,7 @@ resource to your <a href="config/context.html">Context</a>.</p>
 
 <source>
 &lt;Context path="/DBTest" docBase="DBTest"
-        debug="5" reloadable="true" crossContext="true"&gt;
+        reloadable="true" crossContext="true"&gt;
 
     &lt;!-- maxActive: Maximum number of dB connections in pool. Make sure you
          configure your mysqld max_connections large enough to handle
@@ -412,7 +412,7 @@ The Context element should look something like the following.
 
 <source>
 &lt;Context path="/someApp" docBase="someApp"
-   crossContext="true" reloadable="true" debug="1"&gt;
+   crossContext="true" reloadable="true"&gt;
 
 &lt;Resource name="jdbc/postgres" auth="Container"
           type="javax.sql.DataSource" driverClassName="org.postgresql.Driver"

diff --git a/webapps/docs/manager-howto.xml b/webapps/docs/manager-howto.xml
index cac1592..a4fe986 100644 (file)
--- a/webapps/docs/manager-howto.xml
+++ b/webapps/docs/manager-howto.xml
@@ -72,8 +72,8 @@ Manager web application <code>Context</code> to a new host install the
 <code>$CATALINA_BASE/conf/[enginename]/[hostname]</code> folder. Here is an
 example:</p>
 <pre>
-&lt;Context path="/manager" debug="0" privileged="true"
-         docBase="/usr/local/kinetic/tomcat6/server/webapps/manager"&gt;
+&lt;Context path="/manager" privileged="true"
+         docBase="/usr/local/kinetic/tomcat7/server/webapps/manager"&gt;
 &lt;/Context&gt;
 </pre>
 
@@ -164,7 +164,7 @@ could be restricted by the remote IP address or host by adding a
 an example of restricting access to the localhost by IP address:</p>
 <pre>
 &lt;Context path="/manager" privileged="true"
-         docBase="/usr/local/kinetic/tomcat6/server/webapps/manager"&gt;
+         docBase="/usr/local/kinetic/tomcat7/server/webapps/manager"&gt;
          &lt;Valve className="org.apache.catalina.valves.RemoteAddrValve"
                 allow="127\.0\.0\.1"/&gt;
 &lt;/Context&gt;
@@ -389,8 +389,7 @@ web application Context just as if it were configured in your
 Tomcat <code>server.xml</code> configuration file. Here is an
 example:</p>
 <source>
-&lt;Context path="/foobar" docBase="/path/to/application/foobar"
-         debug="0"&gt;
+&lt;Context path="/foobar" docBase="/path/to/application/foobar"&gt;
 
   &lt;!-- Link to the user database we will get roles from --&gt;
   &lt;ResourceLink name="users" global="UserDatabase"

diff --git a/webapps/docs/realm-howto.xml b/webapps/docs/realm-howto.xml
index a25e3a7..6e2d95f 100644 (file)
--- a/webapps/docs/realm-howto.xml
+++ b/webapps/docs/realm-howto.xml
@@ -359,7 +359,7 @@ default <code>$CATALINA_BASE/conf/server.xml</code> file.  Here's an example
 for using a MySQL database called "authority", configured with the tables
 described above, and accessed with username "dbuser" and password "dbpass":</p>
 <source>
-&lt;Realm className="org.apache.catalina.realm.JDBCRealm" debug="99"
+&lt;Realm className="org.apache.catalina.realm.JDBCRealm"
       driverName="org.gjt.mm.mysql.Driver"
    connectionURL="jdbc:mysql://localhost/authority?user=dbuser&amp;amp;password=dbpass"
        userTable="users" userNameCol="user_name" userCredCol="user_pass"
@@ -471,7 +471,7 @@ create table user_roles (
 with the tables described above, and accessed with the JNDI JDBC DataSource with
 name "java:/comp/env/jdbc/authority".</p>
 <source>
-&lt;Realm className="org.apache.catalina.realm.DataSourceRealm" debug="99"
+&lt;Realm className="org.apache.catalina.realm.DataSourceRealm"
    dataSourceName="jdbc/authority"
    userTable="users" userNameCol="user_name" userCredCol="user_pass"
    userRoleTable="user_roles" roleNameCol="role_name"/&gt;
@@ -788,7 +788,7 @@ application and that an anonymous connection is sufficient to search
 the directory and retrieve role information:</p>
 
 <source>
-&lt;Realm   className="org.apache.catalina.realm.JNDIRealm" debug="99"
+&lt;Realm   className="org.apache.catalina.realm.JNDIRealm"
      connectionURL="ldap://localhost:389"
        userPattern="uid={0},ou=people,dc=mycompany,dc=com"
           roleBase="ou=groups,dc=mycompany,dc=com"
@@ -828,7 +828,7 @@ userPassword: janet
 <p> This realm configuration would satisfy the new requirements:</p>
 
 <source>
-&lt;Realm   className="org.apache.catalina.realm.JNDIRealm" debug="99"
+&lt;Realm   className="org.apache.catalina.realm.JNDIRealm"
      connectionURL="ldap://localhost:389"
           userBase="ou=people,dc=mycompany,dc=com"
         userSearch="(mail={0})"
@@ -853,7 +853,7 @@ the password from the directory and making a local comparison in the
 realm, you might use a realm configuration like this:</p>
 
 <source>
-&lt;Realm   className="org.apache.catalina.realm.JNDIRealm" debug="99"
+&lt;Realm   className="org.apache.catalina.realm.JNDIRealm"
     connectionName="cn=Manager,dc=mycompany,dc=com"
 connectionPassword="secret"
      connectionURL="ldap://localhost:389"
@@ -1091,8 +1091,7 @@ configuration documentation.</p>
 &lt;Realm className="org.apache.catalina.realm.JAASRealm"                 
                 appName="MyFooRealm"       
     userClassNames="org.foobar.realm.FooUser"       
-     roleClassNames="org.foobar.realm.FooRole" 
-                      debug="99"/&gt;
+     roleClassNames="org.foobar.realm.FooRole"/&gt;
 </source>
 
 <p>It is the responsibility of your login module to create and save User and 
@@ -1169,7 +1168,7 @@ UserDatabase Realm and a DataSource Realm.</p>
 &lt;Realm className="org.apache.catalina.realm.CombinedRealm" &gt;
    &lt;Realm className="org.apache.catalina.realm.UserDatabaseRealm"
              resourceName="UserDatabase"/&gt;
-   &lt;Realm className="org.apache.catalina.realm.DataSourceRealm" debug="99"
+   &lt;Realm className="org.apache.catalina.realm.DataSourceRealm"
              dataSourceName="jdbc/authority"
              userTable="users" userNameCol="user_name" userCredCol="user_pass"
              userRoleTable="user_roles" roleNameCol="role_name"/&gt;

diff --git a/webapps/host-manager/401.jsp b/webapps/host-manager/401.jsp
index 3392020..5f18f51 100644 (file)
--- a/webapps/host-manager/401.jsp
+++ b/webapps/host-manager/401.jsp
@@ -63,7 +63,7 @@
    </p>
    <ul>
     <li>Users with the <tt>admin-gui</tt> role should not be granted the
-       <tt>manager-script</tt> role.</li>
+       <tt>admin-script</tt> role.</li>
     <li>If the text interface is accessed through a browser (e.g. for testing
         since this interface is intended for tools not humans) then the browser
         must be closed afterwards to terminate the session.</li>

diff --git a/webapps/host-manager/403.jsp b/webapps/host-manager/403.jsp
index c20a2e8..b1d1bd5 100644 (file)
--- a/webapps/host-manager/403.jsp
+++ b/webapps/host-manager/403.jsp
@@ -77,7 +77,7 @@
    </p>
    <ul>
     <li>Users with the <tt>admin-gui</tt> role should not be granted the
-       <tt>manager-script</tt> role.</li>
+       <tt>admin-script</tt> role.</li>
     <li>If the text interface is accessed through a browser (e.g. for testing
         since this interface is intended for tools not humans) then the browser
         must be closed afterwards to terminate the session.</li>