Author: kkolinko
Date: Tue Jan 11 08:13:05 2011
New Revision: 1057518
URL: http://svn.apache.org/viewvc?rev=1057518&view=rev
Log:
Improve filtering
Modified:
tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
tomcat/tc5.5.x/trunk/container/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/HTMLManagerServlet.java
tomcat/tc5.5.x/trunk/container/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/StatusTransformer.java
Modified: tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml?rev=1057518&r1=1057517&r2=1057518&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml (original)
+++ tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml Tue Jan 11
08:13:05 2011
@@ -106,6 +106,9 @@
<update>
Improve documentation of database connection factory. (rjung)
</update>
+ <fix>
+ Improve filtering of Manager display output. (kkolinko)
+ </fix>
</changelog>
</subsection>
</section>
Modified:
tomcat/tc5.5.x/trunk/container/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/HTMLManagerServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/HTMLManagerServlet.java?rev=1057518&r1=1057517&r2=1057518&view=diff
==============================================================================
---
tomcat/tc5.5.x/trunk/container/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/HTMLManagerServlet.java
(original)
+++
tomcat/tc5.5.x/trunk/container/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/HTMLManagerServlet.java
Tue Jan 11 08:13:05 2011
@@ -370,15 +370,16 @@ public final class HTMLManagerServlet ex
}
args = new Object[6];
- args[0] = displayPath;
- args[1] = context.getDisplayName();
- if (args[1] == null) {
+ args[0] = RequestUtil.filter(displayPath);
+ if (context.getDisplayName() == null) {
args[1] = " ";
+ } else {
+ args[1] = RequestUtil.filter(context.getDisplayName());
}
args[2] = new Boolean(context.getAvailable());
- args[3] = response.encodeURL
+ args[3] = RequestUtil.filter(response.encodeURL
(request.getContextPath() +
- "/html/sessions?path=" + displayPath);
+ "/html/sessions?path=" + displayPath));
if (context.getManager() != null) {
args[4] = new Integer
(context.getManager().getActiveSessions());
@@ -392,21 +393,21 @@ public final class HTMLManagerServlet ex
(MessageFormat.format(APPS_ROW_DETAILS_SECTION, args));
args = new Object[9];
- args[0] = response.encodeURL
+ args[0] = RequestUtil.filter(response.encodeURL
(request.getContextPath() +
- "/html/start?path=" + displayPath);
+ "/html/start?path=" + displayPath));
args[1] = appsStart;
- args[2] = response.encodeURL
+ args[2] = RequestUtil.filter(response.encodeURL
(request.getContextPath() +
- "/html/stop?path=" + displayPath);
+ "/html/stop?path=" + displayPath));
args[3] = appsStop;
- args[4] = response.encodeURL
+ args[4] = RequestUtil.filter(response.encodeURL
(request.getContextPath() +
- "/html/reload?path=" + displayPath);
+ "/html/reload?path=" + displayPath));
args[5] = appsReload;
- args[6] = response.encodeURL
+ args[6] = RequestUtil.filter(response.encodeURL
(request.getContextPath() +
- "/html/undeploy?path=" + displayPath);
+ "/html/undeploy?path=" + displayPath));
args[7] = appsUndeploy;
args[8] = highlightColor;
Modified:
tomcat/tc5.5.x/trunk/container/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/StatusTransformer.java
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/StatusTransformer.java?rev=1057518&r1=1057517&r2=1057518&view=diff
==============================================================================
---
tomcat/tc5.5.x/trunk/container/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/StatusTransformer.java
(original)
+++
tomcat/tc5.5.x/trunk/container/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/StatusTransformer.java
Tue Jan 11 08:13:05 2011
@@ -581,7 +581,7 @@ public class StatusTransformer {
}
writer.print("<a href=\"#" + (count++) + ".0\">");
- writer.print(webModuleName);
+ writer.print(filter(webModuleName));
writer.print("</a>");
if (iterator.hasNext()) {
writer.print("<br>");
@@ -656,7 +656,7 @@ public class StatusTransformer {
}
writer.print("<h1>");
- writer.print(name);
+ writer.print(filter(name));
writer.print("</h1>");
writer.print("</a>");
@@ -784,11 +784,11 @@ public class StatusTransformer {
mBeanServer.invoke(objectName, "findMappings", null, null);
writer.print("<h2>");
- writer.print(servletName);
+ writer.print(filter(servletName));
if ((mappings != null) && (mappings.length > 0)) {
writer.print(" [ ");
for (int i = 0; i < mappings.length; i++) {
- writer.print(mappings[i]);
+ writer.print(filter(mappings[i]));
if (i < mappings.length - 1) {
writer.print(" , ");
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
