Author: kkolinko
Date: Tue Aug 28 22:19:39 2012
New Revision: 1378367
URL: http://svn.apache.org/viewvc?rev=1378367&view=rev
Log:
Merged revision 1378361 from tomcat/trunk:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53793
Change webapp links in Manager to point to /appname/ instead of /appname
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1378361
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java?rev=1378367&r1=1378366&r2=1378367&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
Tue Aug 28 22:19:39 2012
@@ -492,7 +492,7 @@ public final class HTMLManagerServlet ex
}
args = new Object[7];
- args[0] = "<a href=\"" + URL_ENCODER.encode(displayPath)
+ args[0] = "<a href=\"" + URL_ENCODER.encode(contextPath + "/")
+ "\">" + RequestUtil.filter(displayPath) + "</a>";
if ("".equals(ctxt.getWebappVersion())) {
args[1] = noVersion;
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1378367&r1=1378366&r2=1378367&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Tue Aug 28 22:19:39 2012
@@ -261,6 +261,10 @@
<bug>53653</bug>: Allow for wrapped source code example in
config/context.html. Patch provided by Terence Bandoian. (schultz)
</fix>
+ <update>
+ <bug>53793</bug>: Change links on the list of applications in the
+ Manager to point to '/appname/' instead of '/appname'. (kkolinko)
+ </update>
</changelog>
</subsection>
<subsection name="Tribes">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
