From 5dea0b3330e8ab7c2fb22fcb51c35af61042b531 Mon Sep 17 00:00:00 2001 From: markt Date: Mon, 6 Sep 2010 12:20:32 +0000 Subject: [PATCH] manager -> manager-script git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@993008 13f79535-47bb-0310-9956-ffa450edef68 --- webapps/docs/changelog.xml | 5 +++++ webapps/docs/manager-howto.xml | 12 ++++++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 92610a1d1..80a53fb9f 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -202,6 +202,11 @@ Update the Servlet, JSP and EL Javadoc links to link to the specifications and the relevant part of the Java EE 6 Javadoc. (markt) + + Update a few places in the docs where the Manager documentation referred + to the old role name of manager rather than than the new manager-script. + (markt) + diff --git a/webapps/docs/manager-howto.xml b/webapps/docs/manager-howto.xml index b56125b47..cd0806484 100644 --- a/webapps/docs/manager-howto.xml +++ b/webapps/docs/manager-howto.xml @@ -66,7 +66,7 @@ the following functions:

directory (unless it was deployed from file system). -

A default Tomcat installation includes the manager. To add an instance of the +

A default Tomcat installation includes the Manager. To add an instance of the Manager web application Context to a new host install the manager.xml context configuration file in the $CATALINA_BASE/conf/[enginename]/[hostname] folder. Here is an @@ -137,7 +137,7 @@ depends on which Realm implementation you are using:

which defines the username and password used by this individual to log on, and the role names he or she is associated with. You can - add the manager role to the comma-delimited + add the manager-script role to the comma-delimited roles attribute for one or more existing users, and/or create new users with that assigned role.
  • JDBCRealm - Your user and role information is stored in @@ -156,9 +156,9 @@ depends on which Realm implementation you are using:

    described in the next section, you will be challenged to log on using BASIC authentication. The username and password you enter do not matter, as long as they identify a valid user in the users database who possesses -the role manager.

    +the role manager-script.

    -

    In addition to the password restrictions the manager web application +

    In addition to the password restrictions the Manager web application could be restricted by the remote IP address or host by adding a RemoteAddrValve or RemoteHostValve. Here is an example of restricting access to the localhost by IP address:

    @@ -305,7 +305,7 @@ This command is the logical opposite of the /undeploy command.

    This can be used to deploy a previous version of a web application, which has been deployed using the tag attribute. Note that the work -directory for the manager webapp will contain the previously deployed WARs; +directory for the Manager webapp will contain the previously deployed WARs; removing it would make the deployment fail.

    http://localhost:8080/manager/text/deploy?path=/footoo&tag=footag @@ -958,7 +958,7 @@ commands, you must perform the following setup operations:

  • Add the $ANT_HOME/bin directory to your PATH environment variable.
  • Configure at least one username/password combination in your Tomcat - user database that includes the manager role.
    • + user database that includes the manager-script role.

    To use custom tasks within Ant, you must declare them first with a -- 2.11.0