From: markt Date: Mon, 15 Nov 2010 17:29:45 +0000 (+0000) Subject: Parallel deployment X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=fc23a0520c48c9eb82f8a5ace2b6974b9db50027;p=tomcat7.0 Parallel deployment Add a version column to the HTML Manager output. git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1035360 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/java/org/apache/catalina/manager/HTMLManagerServlet.java b/java/org/apache/catalina/manager/HTMLManagerServlet.java index dda96b2ae..258fbda1e 100644 --- a/java/org/apache/catalina/manager/HTMLManagerServlet.java +++ b/java/org/apache/catalina/manager/HTMLManagerServlet.java @@ -35,7 +35,6 @@ import java.util.Locale; import java.util.Map; import java.util.Random; import java.util.Set; -import java.util.TreeMap; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; @@ -444,70 +443,70 @@ public final class HTMLManagerServlet extends ManagerServlet { writer.print(MessageFormat.format(Constants.MANAGER_SECTION, args)); // Apps Header Section - args = new Object[6]; + args = new Object[7]; args[0] = smClient.getString("htmlManagerServlet.appsTitle"); args[1] = smClient.getString("htmlManagerServlet.appsPath"); - args[2] = smClient.getString("htmlManagerServlet.appsName"); - args[3] = smClient.getString("htmlManagerServlet.appsAvailable"); - args[4] = smClient.getString("htmlManagerServlet.appsSessions"); - args[5] = smClient.getString("htmlManagerServlet.appsTasks"); + args[2] = smClient.getString("htmlManagerServlet.appsVersion"); + args[3] = smClient.getString("htmlManagerServlet.appsName"); + args[4] = smClient.getString("htmlManagerServlet.appsAvailable"); + args[5] = smClient.getString("htmlManagerServlet.appsSessions"); + args[6] = smClient.getString("htmlManagerServlet.appsTasks"); writer.print(MessageFormat.format(APPS_HEADER_SECTION, args)); // Apps Row Section - // Create sorted map of deployed applications context paths. + // Create sorted map of deployed applications by context name. Container children[] = host.findChildren(); - String contextPaths[] = new String[children.length]; + String contextNames[] = new String[children.length]; for (int i = 0; i < children.length; i++) - contextPaths[i] = children[i].getName(); - - TreeMap sortedContextPathsMap = - new TreeMap(); + contextNames[i] = children[i].getName(); - for (int i = 0; i < contextPaths.length; i++) { - String displayPath = contextPaths[i]; - sortedContextPathsMap.put(displayPath, contextPaths[i]); - } - + Arrays.sort(contextNames); + String appsStart = smClient.getString("htmlManagerServlet.appsStart"); String appsStop = smClient.getString("htmlManagerServlet.appsStop"); String appsReload = smClient.getString("htmlManagerServlet.appsReload"); - String appsUndeploy = smClient.getString("htmlManagerServlet.appsUndeploy"); + String appsUndeploy = + smClient.getString("htmlManagerServlet.appsUndeploy"); String appsExpire = smClient.getString("htmlManagerServlet.appsExpire"); + String noVersion = "" + + smClient.getString("htmlManagerServlet.noVersion") + ""; - Iterator> iterator = - sortedContextPathsMap.entrySet().iterator(); boolean isHighlighted = true; boolean isDeployed = true; String highlightColor = null; - while (iterator.hasNext()) { - // Bugzilla 34818, alternating row colors - isHighlighted = !isHighlighted; - if(isHighlighted) { - highlightColor = "#C3F3C3"; - } else { - highlightColor = "#FFFFFF"; - } + for (String contextName : contextNames) { + Context ctxt = (Context) host.findChild(contextName); + + if (ctxt != null) { + // Bugzilla 34818, alternating row colors + isHighlighted = !isHighlighted; + if(isHighlighted) { + highlightColor = "#C3F3C3"; + } else { + highlightColor = "#FFFFFF"; + } - Map.Entry entry = iterator.next(); - String displayPath = entry.getKey(); - String contextPath = entry.getValue(); - Context ctxt = (Context) host.findChild(contextPath); - if (displayPath.equals("")) { - displayPath = "/"; - } + String contextPath = ctxt.getPath(); + String displayPath = contextPath; + if (displayPath.equals("")) { + displayPath = "/"; + } - if (ctxt != null ) { try { - isDeployed = isDeployed(contextPath); + isDeployed = isDeployed(contextName); } catch (Exception e) { // Assume false on failure for safety isDeployed = false; } args = new Object[7]; - args[0] = URL_ENCODER.encode(displayPath); - args[1] = displayPath; + args[0] = "" + + URL_ENCODER.encode(displayPath) + ""; + args[1] = ctxt.getWebappVersion(); + if ("".equals(args[1])) { + args[1]= noVersion; + } args[2] = ctxt.getDisplayName(); if (args[2] == null) { args[2] = " "; @@ -1151,7 +1150,7 @@ public final class HTMLManagerServlet extends ManagerServlet { private static final String APPS_HEADER_SECTION = "\n" + "\n" + - " \n" + + " \n" + "\n" + "\n" + " \n" + @@ -1159,12 +1158,13 @@ public final class HTMLManagerServlet extends ManagerServlet { " \n" + " \n" + " \n" + + " \n" + "\n"; private static final String APPS_ROW_DETAILS_SECTION = "\n" + - " \n" + + " \n" + + " \n" + " \n" + " \n" + "
{0}{0}
{1}{3}{4}{5}{6}
{1}" + - "{0}{1}{2}{3}" + diff --git a/java/org/apache/catalina/manager/LocalStrings.properties b/java/org/apache/catalina/manager/LocalStrings.properties index f764bdac1..70c703825 100644 --- a/java/org/apache/catalina/manager/LocalStrings.properties +++ b/java/org/apache/catalina/manager/LocalStrings.properties @@ -18,12 +18,14 @@ htmlManagerServlet.appsName=Display Name htmlManagerServlet.appsPath=Path htmlManagerServlet.appsReload=Reload htmlManagerServlet.appsUndeploy=Undeploy +htmlManagerServlet.appsVersion=Version htmlManagerServlet.appsExpire=Expire sessions htmlManagerServlet.appsSessions=Sessions htmlManagerServlet.appsStart=Start htmlManagerServlet.appsStop=Stop htmlManagerServlet.appsTasks=Commands htmlManagerServlet.appsTitle=Applications +htmlManagerServlet.noVersion=None specified htmlManagerServlet.expire.explain=with idle ≥ htmlManagerServlet.expire.unit=minutes htmlManagerServlet.helpHtmlManager=HTML Manager Help