Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50598

Correct URL for manager text interface

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

diff --git a/java/org/apache/catalina/ant/AbstractCatalinaTask.java b/java/org/apache/catalina/ant/AbstractCatalinaTask.java
index 58f9409..c248d42 100644 (file)
--- a/java/org/apache/catalina/ant/AbstractCatalinaTask.java
+++ b/java/org/apache/catalina/ant/AbstractCatalinaTask.java
@@ -88,7 +88,7 @@ public abstract class AbstractCatalinaTask extends BaseRedirectorHelperTask {
     /**
      * The URL of the <code>Manager</code> application to be used.
      */
-    protected String url = "http://localhost:8080/manager";
+    protected String url = "http://localhost:8080/manager/text";
 
     public String getUrl() {
         return (this.url);

diff --git a/java/org/apache/catalina/ant/package.html b/java/org/apache/catalina/ant/package.html
index 999a31a..1aa06e1 100644 (file)
--- a/java/org/apache/catalina/ant/package.html
+++ b/java/org/apache/catalina/ant/package.html
@@ -38,8 +38,8 @@ sent directly to the Manager application.  They are summarized as follows:
     <td>
       The URL of the Manager web application you will use to
       perform the requested operations.  If not specified, defaults to
-      <code>http://localhost:8080/manager</code> (which corresponds
-      to a standard installation of Tomcat 5).
+      <code>http://localhost:8080/manager/text</code> (which corresponds
+      to a standard installation of Tomcat 7).
     </td>
   </tr>
   <tr>

diff --git a/res/deployer/build.xml b/res/deployer/build.xml
index 86ef646..1c158d9 100644 (file)
--- a/res/deployer/build.xml
+++ b/res/deployer/build.xml
@@ -27,7 +27,7 @@
   <property name="path"     value="/myapp"/>
 
   <!-- Configure properties to access the Manager application -->
-  <property name="url"      value="http://localhost:8080/manager"/>
+  <property name="url"      value="http://localhost:8080/manager/text"/>
   <property name="username" value="tomcat"/>
   <property name="password" value="tomcat"/>
 

diff --git a/webapps/docs/appdev/build.xml.txt b/webapps/docs/appdev/build.xml.txt
index d074939..2de66e6 100644 (file)
--- a/webapps/docs/appdev/build.xml.txt
+++ b/webapps/docs/appdev/build.xml.txt
@@ -133,7 +133,7 @@
   <property name="catalina.home" value="../../../.."/> <!-- UPDATE THIS! -->
   <property name="dist.home"     value="${basedir}/dist"/>
   <property name="docs.home"     value="${basedir}/docs"/>
-  <property name="manager.url"   value="http://localhost:8080/manager"/>
+  <property name="manager.url"   value="http://localhost:8080/manager/text"/>
   <property name="src.home"      value="${basedir}/src"/>
   <property name="web.home"      value="${basedir}/web"/>
 

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 93c10eb..68b57c2 100644 (file)
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -75,6 +75,9 @@
         <code>ServletContext.addFilter(String, Filter)</code> method. Patch
         provided by Ismael Juma. (markt)
       </fix>
+      <fix>
+        <bug>50598</bug>: Correct URL for Manager text interface. (markt)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Jasper">

diff --git a/webapps/docs/deployer-howto.xml b/webapps/docs/deployer-howto.xml
index 633196b..3c0256c 100644 (file)
--- a/webapps/docs/deployer-howto.xml
+++ b/webapps/docs/deployer-howto.xml
@@ -320,7 +320,7 @@
                 running Tomcat server, which will be used to deploy and undeploy the
                 web application. By default, the deployer will attempt to access 
                 a Tomcat instance running on localhost, at 
-                <code>http://localhost:8080/manager</code>.
+                <code>http://localhost:8080/manager/text</code>.
             </li>
             <li>
                 <code>username</code>: Tomcat Manager username (user should have a role of