From b66f3bb294321f6297676124dd44877d35fcb1bd Mon Sep 17 00:00:00 2001 From: kkolinko Date: Tue, 18 Jan 2011 17:30:24 +0000 Subject: [PATCH] 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 --- webapps/docs/config/host.xml | 3 +-- webapps/docs/deployer-howto.xml | 2 +- webapps/docs/html-manager-howto.xml | 3 +-- webapps/docs/jndi-datasource-examples-howto.xml | 4 ++-- webapps/docs/manager-howto.xml | 9 ++++----- webapps/docs/realm-howto.xml | 15 +++++++-------- webapps/host-manager/401.jsp | 2 +- webapps/host-manager/403.jsp | 2 +- 8 files changed, 18 insertions(+), 22 deletions(-) diff --git a/webapps/docs/config/host.xml b/webapps/docs/config/host.xml index fc54c735e..cb60d5631 100644 --- a/webapps/docs/config/host.xml +++ b/webapps/docs/config/host.xml @@ -554,8 +554,7 @@ <Host name="localhost" ...> ... - <Valve className="org.apache.catalina.authenticator.SingleSignOn" - debug="0"/> + <Valve className="org.apache.catalina.authenticator.SingleSignOn"/> ... </Host> diff --git a/webapps/docs/deployer-howto.xml b/webapps/docs/deployer-howto.xml index 3c0256c62..44e91ae5a 100644 --- a/webapps/docs/deployer-howto.xml +++ b/webapps/docs/deployer-howto.xml @@ -324,7 +324,7 @@
  • username: Tomcat Manager username (user should have a role of - manager) + manager-script)
  • password: Tomcat Manager password.
    • diff --git a/webapps/docs/html-manager-howto.xml b/webapps/docs/html-manager-howto.xml index 1dd65f452..f8cd40252 100644 --- 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 server.xml configuration file. Here is an example for Tomcat running on Windows:

    -<Context path="/foobar" docBase="C:\path\to\application\foobar" - debug="0"> +<Context path="/foobar" docBase="C:\path\to\application\foobar"> <!-- Link to the user database we will get roles from --> <ResourceLink name="users" global="UserDatabase" diff --git a/webapps/docs/jndi-datasource-examples-howto.xml b/webapps/docs/jndi-datasource-examples-howto.xml index 3152221ca..b7165d52f 100644 --- a/webapps/docs/jndi-datasource-examples-howto.xml +++ b/webapps/docs/jndi-datasource-examples-howto.xml @@ -207,7 +207,7 @@ resource to your Context.

    <Context path="/DBTest" docBase="DBTest" - debug="5" reloadable="true" crossContext="true"> + reloadable="true" crossContext="true"> <!-- 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. <Context path="/someApp" docBase="someApp" - crossContext="true" reloadable="true" debug="1"> + crossContext="true" reloadable="true"> <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 cac15926e..a4fe9864b 100644 --- a/webapps/docs/manager-howto.xml +++ b/webapps/docs/manager-howto.xml @@ -72,8 +72,8 @@ Manager web application Context to a new host install the $CATALINA_BASE/conf/[enginename]/[hostname] folder. Here is an example:

    -<Context path="/manager" debug="0" privileged="true"
-         docBase="/usr/local/kinetic/tomcat6/server/webapps/manager">
+<Context path="/manager" privileged="true"
+         docBase="/usr/local/kinetic/tomcat7/server/webapps/manager">
 </Context>
    @@ -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:

     <Context path="/manager" privileged="true"
-         docBase="/usr/local/kinetic/tomcat6/server/webapps/manager">
+         docBase="/usr/local/kinetic/tomcat7/server/webapps/manager">
          <Valve className="org.apache.catalina.valves.RemoteAddrValve"
                 allow="127\.0\.0\.1"/>
 </Context>
@@ -389,8 +389,7 @@ web application Context just as if it were configured in your
 Tomcat server.xml configuration file. Here is an
 example:
    
 
-<Context path="/foobar" docBase="/path/to/application/foobar"
-         debug="0">
+<Context path="/foobar" docBase="/path/to/application/foobar">
 
   <!-- Link to the user database we will get roles from -->
   <ResourceLink name="users" global="UserDatabase"
diff --git a/webapps/docs/realm-howto.xml b/webapps/docs/realm-howto.xml
index a25e3a702..6e2d95f53 100644
--- a/webapps/docs/realm-howto.xml
+++ b/webapps/docs/realm-howto.xml
@@ -359,7 +359,7 @@ default $CATALINA_BASE/conf/server.xml 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":
    
 
-<Realm className="org.apache.catalina.realm.JDBCRealm" debug="99"
+<Realm className="org.apache.catalina.realm.JDBCRealm"
       driverName="org.gjt.mm.mysql.Driver"
    connectionURL="jdbc:mysql://localhost/authority?user=dbuser&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".
    
 
-<Realm className="org.apache.catalina.realm.DataSourceRealm" debug="99"
+<Realm className="org.apache.catalina.realm.DataSourceRealm"
    dataSourceName="jdbc/authority"
    userTable="users" userNameCol="user_name" userCredCol="user_pass"
    userRoleTable="user_roles" roleNameCol="role_name"/>
@@ -788,7 +788,7 @@ application and that an anonymous connection is sufficient to search
 the directory and retrieve role information:
    
 
 
-<Realm   className="org.apache.catalina.realm.JNDIRealm" debug="99"
+<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
 
     This realm configuration would satisfy the new requirements:
    
 
 
-<Realm   className="org.apache.catalina.realm.JNDIRealm" debug="99"
+<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:
    
 
 
-<Realm   className="org.apache.catalina.realm.JNDIRealm" debug="99"
+<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.
    
 <Realm className="org.apache.catalina.realm.JAASRealm"                 
                 appName="MyFooRealm"       
     userClassNames="org.foobar.realm.FooUser"       
-     roleClassNames="org.foobar.realm.FooRole" 
-                      debug="99"/>
+     roleClassNames="org.foobar.realm.FooRole"/>
 
 
 
    It is the responsibility of your login module to create and save User and 
@@ -1169,7 +1168,7 @@ UserDatabase Realm and a DataSource Realm.
    
 <Realm className="org.apache.catalina.realm.CombinedRealm" >
    <Realm className="org.apache.catalina.realm.UserDatabaseRealm"
              resourceName="UserDatabase"/>
-   <Realm className="org.apache.catalina.realm.DataSourceRealm" debug="99"
+   <Realm className="org.apache.catalina.realm.DataSourceRealm"
              dataSourceName="jdbc/authority"
              userTable="users" userNameCol="user_name" userCredCol="user_pass"
              userRoleTable="user_roles" roleNameCol="role_name"/>
diff --git a/webapps/host-manager/401.jsp b/webapps/host-manager/401.jsp
index 339202097..5f18f514c 100644
--- a/webapps/host-manager/401.jsp
+++ b/webapps/host-manager/401.jsp
@@ -63,7 +63,7 @@