Author: markt
Date: Mon Jan 17 17:19:37 2011
New Revision: 1060002
URL: http://svn.apache.org/viewvc?rev=1060002&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50598
Correct URL for manager text interface
Modified:
tomcat/trunk/java/org/apache/catalina/ant/AbstractCatalinaTask.java
tomcat/trunk/java/org/apache/catalina/ant/package.html
tomcat/trunk/res/deployer/build.xml
tomcat/trunk/webapps/docs/appdev/build.xml.txt
tomcat/trunk/webapps/docs/changelog.xml
tomcat/trunk/webapps/docs/deployer-howto.xml
Modified: tomcat/trunk/java/org/apache/catalina/ant/AbstractCatalinaTask.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ant/AbstractCatalinaTask.java?rev=1060002&r1=1060001&r2=1060002&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ant/AbstractCatalinaTask.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ant/AbstractCatalinaTask.java Mon Jan
17 17:19:37 2011
@@ -88,7 +88,7 @@ public abstract class AbstractCatalinaTa
/**
* 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);
Modified: tomcat/trunk/java/org/apache/catalina/ant/package.html
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ant/package.html?rev=1060002&r1=1060001&r2=1060002&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ant/package.html (original)
+++ tomcat/trunk/java/org/apache/catalina/ant/package.html Mon Jan 17 17:19:37
2011
@@ -38,8 +38,8 @@ sent directly to the Manager application
<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>
Modified: tomcat/trunk/res/deployer/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/deployer/build.xml?rev=1060002&r1=1060001&r2=1060002&view=diff
==============================================================================
--- tomcat/trunk/res/deployer/build.xml (original)
+++ tomcat/trunk/res/deployer/build.xml Mon Jan 17 17:19:37 2011
@@ -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"/>
Modified: tomcat/trunk/webapps/docs/appdev/build.xml.txt
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/appdev/build.xml.txt?rev=1060002&r1=1060001&r2=1060002&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/appdev/build.xml.txt (original)
+++ tomcat/trunk/webapps/docs/appdev/build.xml.txt Mon Jan 17 17:19:37 2011
@@ -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"/>
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1060002&r1=1060001&r2=1060002&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Mon Jan 17 17:19:37 2011
@@ -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">
Modified: tomcat/trunk/webapps/docs/deployer-howto.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/deployer-howto.xml?rev=1060002&r1=1060001&r2=1060002&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/deployer-howto.xml (original)
+++ tomcat/trunk/webapps/docs/deployer-howto.xml Mon Jan 17 17:19:37 2011
@@ -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
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
