Tag 7.0.6

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/TOMCAT_7_0_6@1057285 13f79535-47bb-0310-9956-ffa450edef68
apache · Jan 10, 2011 · 82af094 · 82af094
1 parent 583ea97
commit 82af094
Show file tree

Hide file tree

Showing 220 changed files with 29 additions and 50,751 deletions.
diff --git a/build.properties.default b/build.properties.default
@@ -29,7 +29,7 @@ version.major=7
 version.minor=0
 version.build=6
 version.patch=0
-version.suffix=-dev
+version.suffix=
 
 # ----- Build control flags -----
 # Note enabling validation uses Checkstyle which is LGPL licensed

diff --git a/java/org/apache/catalina/manager/HTMLManagerServlet.java b/java/org/apache/catalina/manager/HTMLManagerServlet.java
@@ -523,19 +523,21 @@ protected void list(HttpServletRequest request,
                 }
 
                 args = new Object[7];
-                args[0] = "<a href=\"" + URL_ENCODER.encode(displayPath) +
-                        "\">" + displayPath + "</a>";
-                args[1] = ctxt.getWebappVersion();
-                if ("".equals(args[1])) {
-                    args[1]= noVersion;
+                args[0] = "<a href=\"" + URL_ENCODER.encode(displayPath)
+                        + "\">" + RequestUtil.filter(displayPath) + "</a>";
+                if ("".equals(ctxt.getWebappVersion())) {
+                    args[1] = noVersion;
+                } else {
+                    args[1] = RequestUtil.filter(ctxt.getWebappVersion());
                 }
-                args[2] = ctxt.getDisplayName();
-                if (args[2] == null) {
+                if (ctxt.getDisplayName() == null) {
                     args[2] = "&nbsp;";
+                } else {
+                    args[2] = RequestUtil.filter(ctxt.getDisplayName());
                 }
                 args[3] = Boolean.valueOf(ctxt.getAvailable());
-                args[4] = response.encodeURL(request.getContextPath() +
-                     "/html/sessions?" + pathVersion);
+                args[4] = RequestUtil.filter(response.encodeURL(request.getContextPath() +
+                     "/html/sessions?" + pathVersion));
                 Manager manager = ctxt.getManager(); 
                 if (manager instanceof DistributedManager && showProxySessions) {
                     args[5] = Integer.valueOf(
@@ -552,20 +554,20 @@ protected void list(HttpServletRequest request,
                     (MessageFormat.format(APPS_ROW_DETAILS_SECTION, args));
 
                 args = new Object[14];
-                args[0] = response.encodeURL(request.getContextPath() +
-                        "/html/start?" + pathVersion);
+                args[0] = RequestUtil.filter(response.encodeURL(request
+                        .getContextPath() + "/html/start?" + pathVersion));
                 args[1] = appsStart;
-                args[2] = response.encodeURL(request.getContextPath() +
-                        "/html/stop?" + pathVersion);
+                args[2] = RequestUtil.filter(response.encodeURL(request
+                        .getContextPath() + "/html/stop?" + pathVersion));
                 args[3] = appsStop;
-                args[4] = response.encodeURL(request.getContextPath() +
-                     "/html/reload?" + pathVersion);
+                args[4] = RequestUtil.filter(response.encodeURL(request
+                        .getContextPath() + "/html/reload?" + pathVersion));
                 args[5] = appsReload;
-                args[6] = response.encodeURL(request.getContextPath() +
-                     "/html/undeploy?" + pathVersion);
+                args[6] = RequestUtil.filter(response.encodeURL(request
+                        .getContextPath() + "/html/undeploy?" + pathVersion));
                 args[7] = appsUndeploy;
-                args[8] = response.encodeURL(request.getContextPath() +
-                     "/html/expire?" + pathVersion);
+                args[8] = RequestUtil.filter(response.encodeURL(request
+                        .getContextPath() + "/html/expire?" + pathVersion));
                 args[9] = appsExpire;
                 args[10] = smClient.getString(
                         "htmlManagerServlet.expire.explain");

diff --git a/java/org/apache/catalina/manager/StatusTransformer.java b/java/org/apache/catalina/manager/StatusTransformer.java
@@ -572,7 +572,7 @@ public static void writeDetailedState(PrintWriter writer,
                 }
 
                 writer.print("<a href=\"#" + (count++) + ".0\">");
-                writer.print(webModuleName);
+                writer.print(filter(webModuleName));
                 writer.print("</a>");
                 if (iterator.hasNext()) {
                     writer.print("<br>");
@@ -649,7 +649,7 @@ protected static void writeContext(PrintWriter writer,
             }
 
             writer.print("<h1>");
-            writer.print(name);
+            writer.print(filter(name));
             writer.print("</h1>");
             writer.print("</a>");
 
@@ -778,11 +778,11 @@ public static void writeWrapper(PrintWriter writer, ObjectName objectName,
                 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(" , ");
                     }

diff --git a/modules/bayeux/.classpath b/modules/bayeux/.classpath
diff --git a/modules/bayeux/.project b/modules/bayeux/.project
diff --git a/modules/bayeux/build.xml b/modules/bayeux/build.xml