cvs commit: jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager Constants.java HTMLManagerServlet.java
yoavs 2005/07/22 09:09:10 Modified:webapps/docs changelog.xml webapps/manager/WEB-INF/classes/org/apache/catalina/manager Constants.java HTMLManagerServlet.java Log: Bugzilla 34818: http://issues.apache.org/bugzilla/show_bug.cgi?id=34818 Revision ChangesPath 1.336 +4 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml Index: changelog.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v retrieving revision 1.335 retrieving revision 1.336 diff -u -r1.335 -r1.336 --- changelog.xml 22 Jul 2005 15:40:30 - 1.335 +++ changelog.xml 22 Jul 2005 16:09:09 - 1.336 @@ -421,6 +421,10 @@ 34250: Admin webapp Commit Changes button now asks for confirmation. (yoavs) + +34818: Alternating row for apps in HTML manager, as suggested by Jeff + Domeyer. (yoavs) + 1.13 +0 -4 jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/Constants.java Index: Constants.java === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/Constants.java,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- Constants.java11 Mar 2005 22:39:26 - 1.12 +++ Constants.java22 Jul 2005 16:09:10 - 1.13 @@ -65,21 +65,18 @@ "vertical-align: middle;\n" + "font-family:sans-serif,Tahoma,Arial;\n" + "color: black;\n" + -"background: white;\n" + " }\n" + " td.row-center {\n" + "text-align: center;\n" + "vertical-align: middle;\n" + "font-family:sans-serif,Tahoma,Arial;\n" + "color: black;\n" + -"background: white;\n" + " }\n" + " td.row-right {\n" + "text-align: right;\n" + "vertical-align: middle;\n" + "font-family:sans-serif,Tahoma,Arial;\n" + "color: black;\n" + -"background: white;\n" + " }\n" + " TH {\n" + "text-align: center;\n" + @@ -93,7 +90,6 @@ "vertical-align: middle;\n" + "font-family:sans-serif,Tahoma,Arial;\n" + "color: black;\n" + -"background: white;\n" + " }\n" + "\n"; 1.19 +28 -13 jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/HTMLManagerServlet.java Index: HTMLManagerServlet.java === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/HTMLManagerServlet.java,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- HTMLManagerServlet.java 5 Jan 2005 01:03:22 - 1.18 +++ HTMLManagerServlet.java 22 Jul 2005 16:09:10 - 1.19 @@ -1,5 +1,5 @@ /* - * Copyright 1999,2004 The Apache Software Foundation. + * Copyright 1999,2004-2005 The Apache Software Foundation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -332,7 +332,18 @@ String appsUndeploy = sm.getString("htmlManagerServlet.appsUndeploy"); Iterator iterator = sortedContextPathsMap.entrySet().iterator(); +boolean isHighlighted = true; +String highlightColor = null; + while (iterator.hasNext()) { +// Bugzilla 34818, alternating row colors +isHighlighted = !isHighlighted; +if(isHighlighted) { +highlightColor = "#C3F3C3"; +} else { +highlightColor = "#FF"; +} + Map.Entry entry = (Map.Entry) iterator.next(); String displayPath = (String) entry.getKey(); String contextPath = (String) entry.getKey(); @@ -342,7 +353,7 @@ } if (context != null ) { -args = new Object[5]; +args = new Object[6]; args[0] = displayPath; args[1] = context.getDisplayName(); if (args[1] == null) { @@ -358,10 +369,13 @@ } else { args[4] = new Integer(0); } + +args[5] = highlightColor; + writer.print (MessageFormat.format(APPS_ROW_DETAILS_SECTION, args)); -args = new Object[8]; +
cvs commit: jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager Constants.java HTMLManagerServlet.java ManagerServlet.java StatusTransformer.java
remm2003/09/07 11:47:14 Modified:webapps/manager/WEB-INF/classes/org/apache/catalina/manager Constants.java HTMLManagerServlet.java ManagerServlet.java StatusTransformer.java Log: - Bug 22956: Use UTF8 encoding. - Submitted by Takashi Okamoto Revision ChangesPath 1.8 +5 -4 jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/Constants.java Index: Constants.java === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/Constants.java,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- Constants.java4 Sep 2003 14:39:21 - 1.7 +++ Constants.java7 Sep 2003 18:47:14 - 1.8 @@ -237,9 +237,10 @@ "\n" + "\n" + ""; +public static final String CHARSET="utf-8"; public static final String XML_DECLARATION = -""; +""; public static final String XML_STYLE = ""; 1.8 +6 -13 jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/HTMLManagerServlet.java Index: HTMLManagerServlet.java === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/HTMLManagerServlet.java,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- HTMLManagerServlet.java 28 Jul 2003 14:57:47 - 1.7 +++ HTMLManagerServlet.java 7 Sep 2003 18:47:14 - 1.8 @@ -74,7 +74,6 @@ import java.util.Date; import java.util.Iterator; import java.util.List; -import java.util.Locale; import java.util.Map; import java.util.TreeMap; import javax.servlet.ServletException; @@ -136,10 +135,7 @@ String deployWar = request.getParameter("deployWar"); // Prepare our output writer to generate the response message -Locale locale = Locale.getDefault(); -String charset = context.getCharsetMapper().getCharset(locale); -response.setLocale(locale); -response.setContentType("text/html; charset=" + charset); +response.setContentType("text/html; charset=" + Constants.CHARSET); String message = ""; // Process the requested command @@ -187,10 +183,7 @@ } // Prepare our output writer to generate the response message -Locale locale = Locale.getDefault(); -String charset = context.getCharsetMapper().getCharset(locale); -response.setLocale(locale); -response.setContentType("text/html; charset=" + charset); +response.setContentType("text/html; charset=" + Constants.CHARSET); String message = ""; 1.9 +6 -12 jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/ManagerServlet.java Index: ManagerServlet.java === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/ManagerServlet.java,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- ManagerServlet.java 6 Aug 2003 18:21:32 - 1.8 +++ ManagerServlet.java 7 Sep 2003 18:47:14 - 1.9 @@ -76,7 +76,6 @@ import java.net.MalformedURLException; import java.util.Enumeration; import java.util.Iterator; -import java.util.Locale; import java.util.jar.JarEntry; import java.util.jar.JarFile; import javax.naming.Binding; @@ -357,10 +356,7 @@ } // Prepare our output writer to generate the response message -Locale locale = Locale.getDefault(); -String charset = context.getCharsetMapper().getCharset(locale); -response.setLocale(locale); -response.setContentType("text/plain; charset=" + charset); +response.setContentType("text/plain; charset=" + Constants.CHARSET); PrintWriter writer = response.getWriter(); // Process the requested command (note - "/deploy" is not listed here) @@ -439,9 +435,7 @@ } // Prepare our output writer to generate the response message -response.setContentType("text/plain"); -Locale locale = Locale.getDefault(); -response.setLocale(locale); +response.setContentType("text/plain;charset="+Constants.CHARSET); PrintWriter writer = response.getWriter(); // Process the requested command 1.3 +6 -6 jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/StatusTransformer.java Index: StatusTransformer.ja
cvs commit: jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager Constants.java HTMLManagerServlet.java LocalStrings.properties LocalStrings_fr.properties StatusManagerServlet.java
remm2003/07/28 07:57:48 Modified:webapps/manager/WEB-INF/classes/org/apache/catalina/manager Constants.java HTMLManagerServlet.java LocalStrings.properties LocalStrings_fr.properties StatusManagerServlet.java Log: - Beautify the status servlet, and integrate it with the HTML manager, through links. - Note: For programmatic access, I recommend not trying to hack the status output, but rather look into JSR 160 (http://www.jcp.org/en/jsr/detail?id=160). This JSR could possibly be finalized by the time TC 5 ships, so it's IMO the preffered solution. Revision ChangesPath 1.2 +155 -3 jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/Constants.java Index: Constants.java === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/Constants.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Constants.java26 Mar 2003 09:49:18 - 1.1 +++ Constants.java28 Jul 2003 14:57:47 - 1.2 @@ -69,5 +69,157 @@ public static final String Package = "org.apache.catalina.manager"; +public static final String HTML_HEADER_SECTION = +"\n" + +"\n" + +"\n" + +" table { width: 100%; }\n" + +" td.page-title {\n" + +"text-align: center;\n" + +"vertical-align: top;\n" + +"font-family:verdana,sans-serif;\n" + +"font-weight: bold;\n" + +"background: white;\n" + +"color: black;\n" + +" }\n" + +" td.title {\n" + +"text-align: left;\n" + +"vertical-align: top;\n" + +"font-family:verdana,sans-serif;\n" + +"font-style:italic;\n" + +"font-weight: bold;\n" + +"background: #D2A41C;\n" + +" }\n" + +" td.header-left {\n" + +"text-align: left;\n" + +"vertical-align: top;\n" + +"font-family:verdana,sans-serif;\n" + +"font-weight: bold;\n" + +"background: #FFDC75;\n" + +" }\n" + +" td.header-center {\n" + +"text-align: center;\n" + +"vertical-align: top;\n" + +"font-family:verdana,sans-serif;\n" + +"font-weight: bold;\n" + +"background: #FFDC75;\n" + +" }\n" + +" td.row-left {\n" + +"text-align: left;\n" + +"vertical-align: middle;\n" + +"font-family:verdana,sans-serif;\n" + +"color: black;\n" + +"background: white;\n" + +" }\n" + +" td.row-center {\n" + +"text-align: center;\n" + +"vertical-align: middle;\n" + +"font-family:verdana,sans-serif;\n" + +"color: black;\n" + +"background: white;\n" + +" }\n" + +" td.row-right {\n" + +"text-align: right;\n" + +"vertical-align: middle;\n" + +"font-family:verdana,sans-serif;\n" + +"color: black;\n" + +"background: white;\n" + +" }\n" + +"\n"; + +public static final String BODY_HEADER_SECTION = +"{0}\n" + +"\n" + +"\n" + +"\n" + +"\n" + +"\n" + +" \n" + +" \n" + +" http://jakarta.apache.org/\";>\n" + +"\n" + +" \n" + +" http://jakarta.apache.org/tomcat/\";>\n" + +"\n" + +" \n" + +" \n" + +" \n" + +"\n" + +"\n" + +"\n" + +" \n" + +" \n" + +" {1}\n" + +" \n" + +" \n" + +"\n" + +"\n" + +"\n"; + +public static final String MESSAGE_SECTION = +"\n" + +" \n" + +" " + +"{0} \n" + +" {1}\n" + +" \n" + +"\n" + +"\n" + +"\n"; + +public static final String MANAGER_SECTION = +"\n" + +"\n" + +" {0}\n" + +"\n" + +" \n" + +" {2}\n" + +" {4}\n" + +" {6}\n" + +" {8}\n" + +" \n" + +"\n" + +"\n" + +"\n"; + +public static final String SERVER_HEADER_SECTION = +"\n" + +"\n" + +" {0}\n" + +"\n" + +"\n" + +" {1}\n" + +" {2}\n" + +" {3}\n" + +" {4}\n" + +" {5}\n" + +" {6}\n" + +"\n"; + +public static f