Author: kkolinko Date: Tue Jan 18 17:30:24 2011 New Revision: 1060486 URL: http://svn.apache.org/viewvc?rev=1060486&view=rev Log: 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)
Modified: tomcat/trunk/webapps/docs/config/host.xml tomcat/trunk/webapps/docs/deployer-howto.xml tomcat/trunk/webapps/docs/html-manager-howto.xml tomcat/trunk/webapps/docs/jndi-datasource-examples-howto.xml tomcat/trunk/webapps/docs/manager-howto.xml tomcat/trunk/webapps/docs/realm-howto.xml tomcat/trunk/webapps/host-manager/401.jsp tomcat/trunk/webapps/host-manager/403.jsp Modified: tomcat/trunk/webapps/docs/config/host.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/host.xml?rev=1060486&r1=1060485&r2=1060486&view=diff ============================================================================== --- tomcat/trunk/webapps/docs/config/host.xml (original) +++ tomcat/trunk/webapps/docs/config/host.xml Tue Jan 18 17:30:24 2011 @@ -554,8 +554,7 @@ <source> <Host name="localhost" ...> ... - <Valve className="org.apache.catalina.authenticator.SingleSignOn" - debug="0"/> + <Valve className="org.apache.catalina.authenticator.SingleSignOn"/> ... </Host> </source> Modified: tomcat/trunk/webapps/docs/deployer-howto.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/deployer-howto.xml?rev=1060486&r1=1060485&r2=1060486&view=diff ============================================================================== --- tomcat/trunk/webapps/docs/deployer-howto.xml (original) +++ tomcat/trunk/webapps/docs/deployer-howto.xml Tue Jan 18 17:30:24 2011 @@ -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> Modified: tomcat/trunk/webapps/docs/html-manager-howto.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/html-manager-howto.xml?rev=1060486&r1=1060485&r2=1060486&view=diff ============================================================================== --- tomcat/trunk/webapps/docs/html-manager-howto.xml (original) +++ tomcat/trunk/webapps/docs/html-manager-howto.xml Tue Jan 18 17:30:24 2011 @@ -387,8 +387,7 @@ web application Context just as if it we Tomcat <code>server.xml</code> configuration file. Here is an example for Tomcat running on Windows:</p> <source> -<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" Modified: tomcat/trunk/webapps/docs/jndi-datasource-examples-howto.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/jndi-datasource-examples-howto.xml?rev=1060486&r1=1060485&r2=1060486&view=diff ============================================================================== --- tomcat/trunk/webapps/docs/jndi-datasource-examples-howto.xml (original) +++ tomcat/trunk/webapps/docs/jndi-datasource-examples-howto.xml Tue Jan 18 17:30:24 2011 @@ -207,7 +207,7 @@ resource to your <a href="config/context <source> <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 somethin <source> <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" Modified: tomcat/trunk/webapps/docs/manager-howto.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/manager-howto.xml?rev=1060486&r1=1060485&r2=1060486&view=diff ============================================================================== --- tomcat/trunk/webapps/docs/manager-howto.xml (original) +++ tomcat/trunk/webapps/docs/manager-howto.xml Tue Jan 18 17:30:24 2011 @@ -72,8 +72,8 @@ Manager web application <code>Context</c <code>$CATALINA_BASE/conf/[enginename]/[hostname]</code> folder. Here is an example:</p> <pre> -<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> </pre> @@ -164,7 +164,7 @@ could be restricted by the remote IP add an example of restricting access to the localhost by IP address:</p> <pre> <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 we Tomcat <code>server.xml</code> configuration file. Here is an example:</p> <source> -<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" Modified: tomcat/trunk/webapps/docs/realm-howto.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/realm-howto.xml?rev=1060486&r1=1060485&r2=1060486&view=diff ============================================================================== --- tomcat/trunk/webapps/docs/realm-howto.xml (original) +++ tomcat/trunk/webapps/docs/realm-howto.xml Tue Jan 18 17:30:24 2011 @@ -359,7 +359,7 @@ default <code>$CATALINA_BASE/conf/server for using a MySQL database called "authority", configured with the tables described above, and accessed with username "dbuser" and password "dbpass":</p> <source> -<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".</p> <source> -<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 connec the directory and retrieve role information:</p> <source> -<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 <p> This realm configuration would satisfy the new requirements:</p> <source> -<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 maki realm, you might use a realm configuration like this:</p> <source> -<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.</p> <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"/> </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 Real <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"/> Modified: tomcat/trunk/webapps/host-manager/401.jsp URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/host-manager/401.jsp?rev=1060486&r1=1060485&r2=1060486&view=diff ============================================================================== --- tomcat/trunk/webapps/host-manager/401.jsp (original) +++ tomcat/trunk/webapps/host-manager/401.jsp Tue Jan 18 17:30:24 2011 @@ -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> Modified: tomcat/trunk/webapps/host-manager/403.jsp URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/host-manager/403.jsp?rev=1060486&r1=1060485&r2=1060486&view=diff ============================================================================== --- tomcat/trunk/webapps/host-manager/403.jsp (original) +++ tomcat/trunk/webapps/host-manager/403.jsp Tue Jan 18 17:30:24 2011 @@ -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> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org