10:29 p.m.
Author: remy.maucherat(a)jboss.com
Date: 2008-03-03 16:29:40 -0500 (Mon, 03 Mar 2008)
New Revision: 458
Added:
trunk/webapps/host-manager/images/apr_pb.gif
trunk/webapps/host-manager/images/bkg_shadow.png
trunk/webapps/host-manager/images/hdr_bkg.gif
trunk/webapps/host-manager/images/hdr_hdrtitle.gif
trunk/webapps/host-manager/images/hdr_jbosslogo.gif
trunk/webapps/host-manager/images/hdr_jbossorglogo.gif
trunk/webapps/host-manager/images/jboss_ics.gif
trunk/webapps/host-manager/images/jbweb_pb.gif
trunk/webapps/host-manager/images/openssl_ics.gif
trunk/webapps/host-manager/images/tomcat_pb.gif
trunk/webapps/manager/images/apr_pb.gif
trunk/webapps/manager/images/bkg_shadow.png
trunk/webapps/manager/images/hdr_bkg.gif
trunk/webapps/manager/images/hdr_hdrtitle.gif
trunk/webapps/manager/images/hdr_jbosslogo.gif
trunk/webapps/manager/images/hdr_jbossorglogo.gif
trunk/webapps/manager/images/jboss_ics.gif
trunk/webapps/manager/images/jbweb_pb.gif
trunk/webapps/manager/images/openssl_ics.gif
trunk/webapps/manager/images/tomcat_pb.gif
Modified:
trunk/java/org/apache/catalina/manager/Constants.java
trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
trunk/java/org/apache/catalina/manager/StatusManagerServlet.java
trunk/java/org/apache/catalina/manager/StatusTransformer.java
trunk/java/org/apache/catalina/manager/host/Constants.java
trunk/java/org/apache/catalina/manager/host/HTMLHostManagerServlet.java
trunk/java/org/apache/catalina/util/TomcatCSS.java
trunk/webapps/host-manager/images/jboss_logo.gif
Log:
- Move the manager to the new CSS. I may replace the embedded CSS with an external one.
Modified: trunk/java/org/apache/catalina/manager/Constants.java
===================================================================
--- trunk/java/org/apache/catalina/manager/Constants.java 2008-03-03 16:16:39 UTC (rev
457)
+++ trunk/java/org/apache/catalina/manager/Constants.java 2008-03-03 21:29:40 UTC (rev
458)
@@ -27,7 +27,7 @@
"<html>\n" +
"<head>\n" +
"<style>\n" +
- org.apache.catalina.util.TomcatCSS.TOMCAT_CSS +
+ org.apache.catalina.util.TomcatCSS.JBOSSWEB_CSS +
" table {\n" +
" width: 100%;\n" +
" }\n" +
@@ -45,21 +45,21 @@
" font-family:sans-serif,Tahoma,Arial;\n" +
" font-style:italic;\n" +
" font-weight: bold;\n" +
- " background: #D2A41C;\n" +
+ " background: #4a5d75;\n" +
" }\n" +
" td.header-left {\n" +
" text-align: left;\n" +
" vertical-align: top;\n" +
" font-family:sans-serif,Tahoma,Arial;\n" +
" font-weight: bold;\n" +
- " background: #FFDC75;\n" +
+ " background: #656565;\n" +
" }\n" +
" td.header-center {\n" +
" text-align: center;\n" +
" vertical-align: top;\n" +
" font-family:sans-serif,Tahoma,Arial;\n" +
" font-weight: bold;\n" +
- " background: #FFDC75;\n" +
+ " background: #656565;\n" +
" }\n" +
" td.row-left {\n" +
" text-align: left;\n" +
@@ -84,7 +84,7 @@
" vertical-align: top;\n" +
" font-family:sans-serif,Tahoma,Arial;\n" +
" font-weight: bold;\n" +
- " background: #FFDC75;\n" +
+ " background: #656565;\n" +
" }\n" +
" TD {\n" +
" text-align: center;\n" +
@@ -98,32 +98,14 @@
"<title>{0}</title>\n" +
"</head>\n" +
"\n" +
- "<body bgcolor=\"#FFFFFF\">\n" +
+ "<body>\n" +
"\n" +
- "<table cellspacing=\"4\" width=\"100%\"
border=\"0\">\n" +
- " <tr>\n" +
- " <td colspan=\"2\">\n" +
- " <a href=\"http://www.jboss.org/\">\n" +
- " <img border=\"0\" alt=\"JBoss.org\"
align=\"left\"\n" +
- " src=\"{0}/images/jboss_logo.gif\">\n" +
- " </a>\n" +
- " <a href=\"http://labs.jboss.com/jbossweb/\">\n" +
- " <img border=\"0\" alt=\"JBoss Web Servlet/JSP
Container\"\n" +
- " align=\"right\"
src=\"{0}/images/jbossweblogo.gif\">\n" +
- " </a>\n" +
- " </td>\n" +
- " </tr>\n" +
- "</table>\n" +
- "<hr size=\"1\" noshade=\"noshade\">\n" +
- "<table cellspacing=\"4\" width=\"100%\"
border=\"0\">\n" +
- " <tr>\n" +
- " <td class=\"page-title\" bordercolor=\"#000000\"
" +
- "align=\"left\" nowrap>\n" +
- " <font size=\"+2\">{1}</font>\n" +
- " </td>\n" +
- " </tr>\n" +
- "</table>\n" +
- "<br>\n" +
+ "<div class=\"wrapper\">\n" +
+ " <div class=\"header\">\n" +
+ " <div class=\"floatleft\"><a
href=\"list\"><img src=\"images/hdr_hdrtitle.gif\"
border=\"0\"></a></div>\n" +
+ " <div class=\"floatright\"><a
href=\"http://www.jboss.com/\"><img
src=\"images/hdr_jbosslogo.gif\" alt=\"JBoss, a division of Red Hat\"
border=\"0\"></a><a
href=\"http://www.jboss.org\"><img
src=\"images/hdr_jbossorglogo.gif\" alt=\"JBoss.org - Community
driven.\" border=\"0\" /></a></div>\n" +
+ " </div>\n" +
+ " <div class=\"container\">\n" +
"\n";
public static final String MESSAGE_SECTION =
@@ -138,20 +120,27 @@
"\n";
public static final String MANAGER_SECTION =
- "<table border=\"1\" cellspacing=\"0\"
cellpadding=\"3\">\n" +
- "<tr>\n" +
- " <td colspan=\"4\"
class=\"title\">{0}</td>\n" +
- "</tr>\n" +
- " <tr>\n" +
- " <td class=\"row-left\"><a
href=\"{1}\">{2}</a></td>\n" +
- " <td class=\"row-center\"><a
href=\"{3}\">{4}</a></td>\n" +
- " <td class=\"row-center\"><a
href=\"{5}\">{6}</a></td>\n" +
- " <td class=\"row-right\"><a
href=\"{7}\">{8}</a></td>\n" +
- " </tr>\n" +
- "</table>\n" +
- "<br>\n" +
- "\n";
+ "<div class=\"leftcol\"><dl>\n" +
+ " <dt>Manager</dt>" +
+ " <dd><a
href=\"{1}\">{2}</a></dd>" +
+ " <dd><a
href=\"{3}\">{4}</a></dd>" +
+ " <dd><a
href=\"{5}\">{6}</a></dd>" +
+ " <dd><a
href=\"{7}\">{8}</a></dd>" +
+ "</dl></div>\n" +
+ "<div class=\"maincol\">\n";
+ public static final String MANAGER_STATUS_SECTION1 =
+ "<div class=\"leftcol\"><dl>\n" +
+ " <dt>Manager</dt>" +
+ " <dd><a
href=\"{1}\">{2}</a></dd>" +
+ " <dd><a
href=\"{3}\">{4}</a></dd>" +
+ " <dd><a
href=\"{5}\">{6}</a></dd>" +
+ " <dd><a
href=\"{7}\">{8}</a></dd>";
+
+ public static final String MANAGER_STATUS_SECTION2 =
+ "</dl></div>\n" +
+ "<div class=\"maincol\">\n";
+
public static final String SERVER_HEADER_SECTION =
"<table border=\"1\" cellspacing=\"0\"
cellpadding=\"3\">\n" +
"<tr>\n" +
@@ -180,13 +169,11 @@
"\n";
public static final String HTML_TAIL_SECTION =
- "<hr size=\"1\" noshade=\"noshade\">\n" +
- "<center><font size=\"-1\"
color=\"#525D76\">\n" +
- " <em>Copyright © 2008, Red Hat Middleware,
LLC.</em>" +
- "</font></center>\n" +
- "\n" +
- "</body>\n" +
- "</html>";
+ " </div>\n" +
+ " </div>\n" +
+ " <div class=\"footer\">© 2008 Red Hat Middleware,
LLC. All Rights Reserved. </div>\n" +
+ "</div></body></html>";
+
public static final String CHARSET="utf-8";
public static final String XML_DECLARATION =
Modified: trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
===================================================================
--- trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java 2008-03-03 16:16:39 UTC
(rev 457)
+++ trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java 2008-03-03 21:29:40 UTC
(rev 458)
@@ -299,24 +299,23 @@
PrintWriter writer = response.getWriter();
// HTML Header Section
- writer.print(Constants.HTML_HEADER_SECTION);
+ if (request.getPathInfo() == null) {
+ writer.print(Constants.HTML_HEADER_SECTION);
+ } else {
+ writer.print(Constants.HTML_HEADER_SECTION.replace("images/",
"../images/"));
+ }
// Body Header Section
Object[] args = new Object[2];
args[0] = request.getContextPath();
args[1] = sm.getString("htmlManagerServlet.title");
- writer.print(MessageFormat.format
- (Constants.BODY_HEADER_SECTION, args));
-
- // Message Section
- args = new Object[3];
- args[0] = sm.getString("htmlManagerServlet.messageLabel");
- if (message == null || message.length() == 0) {
- args[1] = "OK";
+ if (request.getPathInfo() == null) {
+ writer.print(MessageFormat.format
+ (Constants.BODY_HEADER_SECTION, args));
} else {
- args[1] = RequestUtil.filter(message);
+ writer.print(MessageFormat.format
+ (Constants.BODY_HEADER_SECTION.replace("images/",
"../images/"), args));
}
- writer.print(MessageFormat.format(Constants.MESSAGE_SECTION, args));
// Manager Section
args = new Object[9];
@@ -336,6 +335,16 @@
args[8] = sm.getString("statusServlet.title");
writer.print(MessageFormat.format(Constants.MANAGER_SECTION, args));
+ // Message Section
+ args = new Object[3];
+ args[0] = sm.getString("htmlManagerServlet.messageLabel");
+ if (message == null || message.length() == 0) {
+ args[1] = "OK";
+ } else {
+ args[1] = RequestUtil.filter(message);
+ }
+ writer.print(MessageFormat.format(Constants.MESSAGE_SECTION, args));
+
// Apps Header Section
args = new Object[6];
args[0] = sm.getString("htmlManagerServlet.appsTitle");
Modified: trunk/java/org/apache/catalina/manager/StatusManagerServlet.java
===================================================================
--- trunk/java/org/apache/catalina/manager/StatusManagerServlet.java 2008-03-03 16:16:39
UTC (rev 457)
+++ trunk/java/org/apache/catalina/manager/StatusManagerServlet.java 2008-03-03 21:29:40
UTC (rev 458)
@@ -212,7 +212,7 @@
completeStatus = true;
}
// use StatusTransformer to output status
- StatusTransformer.writeHeader(writer,mode);
+ StatusTransformer.writeHeader(writer, mode, (request.getPathInfo() != null));
// Body Header Section
Object[] args = new Object[2];
@@ -223,7 +223,7 @@
args[1] = sm.getString("statusServlet.title");
}
// use StatusTransformer to output status
- StatusTransformer.writeBody(writer,args,mode);
+ StatusTransformer.writeBody(writer,args,mode, (request.getPathInfo() != null));
// Manager Section
args = new Object[9];
@@ -248,8 +248,22 @@
args[8] = sm.getString("statusServlet.complete");
}
// use StatusTransformer to output status
- StatusTransformer.writeManager(writer,args,mode);
+ StatusTransformer.writeManager1(writer,args,mode);
+ try {
+ if ((request.getPathInfo() != null)
+ && (request.getPathInfo().equals("/all"))) {
+ // Note: Retrieving the full status is much slower
+ // use StatusTransformer to output status
+ StatusTransformer.writeAppList
+ (writer, mBeanServer, mode);
+ }
+
+ } catch (Exception e) {
+ throw new ServletException(e);
+ }
+ StatusTransformer.writeManager2(writer,args,mode);
+
// Server Header Section
args = new Object[7];
args[0] = sm.getString("htmlManagerServlet.serverTitle");
Modified: trunk/java/org/apache/catalina/manager/StatusTransformer.java
===================================================================
--- trunk/java/org/apache/catalina/manager/StatusTransformer.java 2008-03-03 16:16:39 UTC
(rev 457)
+++ trunk/java/org/apache/catalina/manager/StatusTransformer.java 2008-03-03 21:29:40 UTC
(rev 458)
@@ -70,10 +70,14 @@
* @exception IOException if an input/output error occurs
* @exception ServletException if a servlet-specified error occurs
*/
- public static void writeHeader(PrintWriter writer, int mode) {
+ public static void writeHeader(PrintWriter writer, int mode, boolean pathInfo) {
if (mode == 0){
// HTML Header Section
- writer.print(Constants.HTML_HEADER_SECTION);
+ if (pathInfo) {
+ writer.print(Constants.HTML_HEADER_SECTION.replace("images/",
"../images/"));
+ } else {
+ writer.print(Constants.HTML_HEADER_SECTION);
+ }
} else if (mode == 1){
writer.write(Constants.XML_DECLARATION);
writer.write
@@ -91,10 +95,15 @@
* @param args What to write
* @param mode 0 means write
*/
- public static void writeBody(PrintWriter writer, Object[] args, int mode) {
+ public static void writeBody(PrintWriter writer, Object[] args, int mode, boolean
pathInfo) {
if (mode == 0){
- writer.print(MessageFormat.format
- (Constants.BODY_HEADER_SECTION, args));
+ if (pathInfo) {
+ writer.print(MessageFormat.format
+ (Constants.BODY_HEADER_SECTION.replace("images/",
"../images/"), args));
+ } else {
+ writer.print(MessageFormat.format
+ (Constants.BODY_HEADER_SECTION, args));
+ }
}
}
@@ -106,14 +115,29 @@
* @param args What to write
* @param mode 0 means write
*/
- public static void writeManager(PrintWriter writer, Object[] args,
+ public static void writeManager1(PrintWriter writer, Object[] args,
int mode) {
if (mode == 0){
- writer.print(MessageFormat.format(Constants.MANAGER_SECTION, args));
+ writer.print(MessageFormat.format(Constants.MANAGER_STATUS_SECTION1, args));
}
}
+ /**
+ * Write the manager webapp information.
+ *
+ * @param writer The output writer
+ * @param args What to write
+ * @param mode 0 means write
+ */
+ public static void writeManager2(PrintWriter writer, Object[] args,
+ int mode) {
+ if (mode == 0){
+ writer.print(MessageFormat.format(Constants.MANAGER_STATUS_SECTION2, args));
+ }
+ }
+
+
public static void writePageHeading(PrintWriter writer, Object[] args,
int mode) {
if (mode == 0){
@@ -554,15 +578,41 @@
ObjectName queryHosts = new ObjectName("*:j2eeType=WebModule,*");
Set hostsON = mBeanServer.queryNames(queryHosts, null);
+ // Webapp list
+ int count = 0;
+ Iterator iterator = hostsON.iterator();
+ while (iterator.hasNext()) {
+ ObjectName contextON = (ObjectName) iterator.next();
+ writer.print("<a class=\"A.name\" name=\""
+ + (count++) + ".0\">");
+ writeContext(writer, contextON, mBeanServer, mode);
+ }
+
+ } else if (mode == 1){
+ // for now we don't write out the Detailed state in XML
+ }
+
+ }
+
+
+ /**
+ * Write applications state.
+ */
+ public static void writeAppList(PrintWriter writer,
+ MBeanServer mBeanServer, int mode)
+ throws Exception {
+
+ if (mode == 0){
+ ObjectName queryHosts = new ObjectName("*:j2eeType=WebModule,*");
+ Set hostsON = mBeanServer.queryNames(queryHosts, null);
+
// Navigation menu
- writer.print("<h1>");
- writer.print("Application list");
- writer.print("</h1>");
+ writer.print("<dt>Application list</dt>");
- writer.print("<p>");
int count = 0;
Iterator iterator = hostsON.iterator();
while (iterator.hasNext()) {
+ writer.print("<dd>");
ObjectName contextON = (ObjectName) iterator.next();
String webModuleName = contextON.getKeyProperty("name");
if (webModuleName.startsWith("//")) {
@@ -577,23 +627,9 @@
writer.print("<a href=\"#" + (count++) +
".0\">");
writer.print(webModuleName);
writer.print("</a>");
- if (iterator.hasNext()) {
- writer.print("<br>");
- }
-
+ writer.print("</dd>");
}
- writer.print("</p>");
- // Webapp list
- count = 0;
- iterator = hostsON.iterator();
- while (iterator.hasNext()) {
- ObjectName contextON = (ObjectName) iterator.next();
- writer.print("<a class=\"A.name\" name=\""
- + (count++) + ".0\">");
- writeContext(writer, contextON, mBeanServer, mode);
- }
-
} else if (mode == 1){
// for now we don't write out the Detailed state in XML
}
Modified: trunk/java/org/apache/catalina/manager/host/Constants.java
===================================================================
--- trunk/java/org/apache/catalina/manager/host/Constants.java 2008-03-03 16:16:39 UTC
(rev 457)
+++ trunk/java/org/apache/catalina/manager/host/Constants.java 2008-03-03 21:29:40 UTC
(rev 458)
@@ -27,7 +27,7 @@
"<html>\n" +
"<head>\n" +
"<style>\n" +
- org.apache.catalina.util.TomcatCSS.TOMCAT_CSS +
+ org.apache.catalina.util.TomcatCSS.JBOSSWEB_CSS +
" table {\n" +
" width: 100%;\n" +
" }\n" +
@@ -102,32 +102,14 @@
"<title>{0}</title>\n" +
"</head>\n" +
"\n" +
- "<body bgcolor=\"#FFFFFF\">\n" +
+ "<body>\n" +
"\n" +
- "<table cellspacing=\"4\" width=\"100%\"
border=\"0\">\n" +
- " <tr>\n" +
- " <td colspan=\"2\">\n" +
- " <a href=\"http://www.jboss.org/\">\n" +
- " <img border=\"0\" alt=\"JBoss.org\"
align=\"left\"\n" +
- " src=\"{0}/images/jboss_logo.gif\">\n" +
- " </a>\n" +
- " <a href=\"http://labs.jboss.com/jbossweb/\">\n" +
- " <img border=\"0\" alt=\"JBoss Web Servlet/JSP
Container\"\n" +
- " align=\"right\"
src=\"{0}/images/jbossweblogo.gif\">\n" +
- " </a>\n" +
- " </td>\n" +
- " </tr>\n" +
- "</table>\n" +
- "<hr size=\"1\" noshade=\"noshade\">\n" +
- "<table cellspacing=\"4\" width=\"100%\"
border=\"0\">\n" +
- " <tr>\n" +
- " <td class=\"page-title\" bordercolor=\"#000000\"
" +
- "align=\"left\" nowrap>\n" +
- " <font size=\"+2\">{1}</font>\n" +
- " </td>\n" +
- " </tr>\n" +
- "</table>\n" +
- "<br>\n" +
+ "<div class=\"wrapper\">\n" +
+ " <div class=\"header\">\n" +
+ " <div class=\"floatleft\"><a
href=\"list\"><img src=\"images/hdr_hdrtitle.gif\"
border=\"0\"></a></div>\n" +
+ " <div class=\"floatright\"><a
href=\"http://www.jboss.com/\"><img
src=\"images/hdr_jbosslogo.gif\" alt=\"JBoss, a division of Red Hat\"
border=\"0\"></a><a
href=\"http://www.jboss.org\"><img
src=\"images/hdr_jbossorglogo.gif\" alt=\"JBoss.org - Community
driven.\" border=\"0\" /></a></div>\n" +
+ " </div>\n" +
+ " <div class=\"container\">\n" +
"\n";
public static final String MESSAGE_SECTION =
@@ -142,19 +124,14 @@
"\n";
public static final String MANAGER_SECTION =
- "<table border=\"1\" cellspacing=\"0\"
cellpadding=\"3\">\n" +
- "<tr>\n" +
- " <td colspan=\"4\"
class=\"title\">{0}</td>\n" +
- "</tr>\n" +
- " <tr>\n" +
- " <td class=\"row-left\"><a
href=\"{1}\">{2}</a></td>\n" +
- " <td class=\"row-center\"><a
href=\"{3}\">{4}</a></td>\n" +
- " <td class=\"row-center\"><a
href=\"{5}\">{6}</a></td>\n" +
- " <td class=\"row-right\"><a
href=\"{7}\">{8}</a></td>\n" +
- " </tr>\n" +
- "</table>\n" +
- "<br>\n" +
- "\n";
+ "<div class=\"leftcol\"><dl>\n" +
+ " <dt>Manager</dt>" +
+ " <dd><a
href=\"{1}\">{2}</a></dd>" +
+ " <dd><a
href=\"{3}\">{4}</a></dd>" +
+ " <dd><a
href=\"{5}\">{6}</a></dd>" +
+ " <dd><a
href=\"{7}\">{8}</a></dd>" +
+ "</dl></div>\n" +
+ "<div class=\"maincol\">\n";
public static final String SERVER_HEADER_SECTION =
"<table border=\"1\" cellspacing=\"0\"
cellpadding=\"3\">\n" +
@@ -184,13 +161,11 @@
"\n";
public static final String HTML_TAIL_SECTION =
- "<hr size=\"1\" noshade=\"noshade\">\n" +
- "<center><font size=\"-1\"
color=\"#525D76\">\n" +
- " <em>Copyright © 2008, Red Hat Middleware,
LLC.</em>" +
- "</font></center>\n" +
- "\n" +
- "</body>\n" +
- "</html>";
+ " </div>\n" +
+ " </div>\n" +
+ " <div class=\"footer\">© 2008 Red Hat Middleware,
LLC. All Rights Reserved. </div>\n" +
+ "</div></body></html>";
+
public static final String CHARSET="utf-8";
// FIXME need we this?
Modified: trunk/java/org/apache/catalina/manager/host/HTMLHostManagerServlet.java
===================================================================
--- trunk/java/org/apache/catalina/manager/host/HTMLHostManagerServlet.java 2008-03-03
16:16:39 UTC (rev 457)
+++ trunk/java/org/apache/catalina/manager/host/HTMLHostManagerServlet.java 2008-03-03
21:29:40 UTC (rev 458)
@@ -32,6 +32,7 @@
import org.apache.catalina.Container;
import org.apache.catalina.Host;
+import org.apache.catalina.manager.Constants;
import org.apache.catalina.util.RequestUtil;
import org.apache.catalina.util.ServerInfo;
@@ -184,24 +185,23 @@
PrintWriter writer = response.getWriter();
// HTML Header Section
- writer.print(Constants.HTML_HEADER_SECTION);
+ if (request.getPathInfo() == null) {
+ writer.print(Constants.HTML_HEADER_SECTION);
+ } else {
+ writer.print(Constants.HTML_HEADER_SECTION.replace("images/",
"../images/"));
+ }
// Body Header Section
Object[] args = new Object[2];
args[0] = request.getContextPath();
args[1] = sm.getString("htmlHostManagerServlet.title");
- writer.print(MessageFormat.format
- (Constants.BODY_HEADER_SECTION, args));
-
- // Message Section
- args = new Object[3];
- args[0] = sm.getString("htmlHostManagerServlet.messageLabel");
- if (message == null || message.length() == 0) {
- args[1] = "OK";
+ if (request.getPathInfo() == null) {
+ writer.print(MessageFormat.format
+ (Constants.BODY_HEADER_SECTION, args));
} else {
- args[1] = RequestUtil.filter(message);
+ writer.print(MessageFormat.format
+ (Constants.BODY_HEADER_SECTION.replace("images/",
"../images/"), args));
}
- writer.print(MessageFormat.format(Constants.MESSAGE_SECTION, args));
// Manager Section
args = new Object[9];
@@ -220,6 +220,16 @@
args[8] = sm.getString("statusServlet.title");
writer.print(MessageFormat.format(Constants.MANAGER_SECTION, args));
+ // Message Section
+ args = new Object[3];
+ args[0] = sm.getString("htmlHostManagerServlet.messageLabel");
+ if (message == null || message.length() == 0) {
+ args[1] = "OK";
+ } else {
+ args[1] = RequestUtil.filter(message);
+ }
+ writer.print(MessageFormat.format(Constants.MESSAGE_SECTION, args));
+
// Hosts Header Section
args = new Object[3];
args[0] = sm.getString("htmlHostManagerServlet.hostName");
Modified: trunk/java/org/apache/catalina/util/TomcatCSS.java
===================================================================
--- trunk/java/org/apache/catalina/util/TomcatCSS.java 2008-03-03 16:16:39 UTC (rev 457)
+++ trunk/java/org/apache/catalina/util/TomcatCSS.java 2008-03-03 21:29:40 UTC (rev 458)
@@ -32,6 +32,50 @@
"A.name {color : black;}" +
"HR {color : #525D76;}";
+ public static final String JBOSSWEB_CSS =
+ "html {margin:0;padding:0;}" +
+ "body {margin:20px;padding: 0px;font-family:Verdana, Arial, Helvetica,
sans-serif;background-color:#a3a9ad;color:#424242;font-size: 12px;}" +
+ "p {}" +
+ "a {color:#527fa8;}" +
+ "hr {border-top: 1px solid #a4b2b9;border-right: 0px solid
#a4b2b9;border-left: 0px solid #a4b2b9;border-bottom: 0px solid #a4b2b9;margin-bottom:
3px;}" +
+ "img {border:0px;}" +
+ "h1 {font-size:14px;color:#4a5d75;margin-top:0px;padding-top: 6px;}" +
+ "h2 {font-size:13px;color:#32444d;}" +
+ "h3 {}" +
+ "h4 {}" +
+ "h5 {}" +
+ "h6 {}" +
+ ".wrapper {min-width:
900px;background-image:url(images/bkg_shadow.png);background-position:right;background-repeat:repeat-y;padding-right:7px;}"
+
+ ".container {margin: 0px;padding:0px;background-color:
white;overflow:hidden;}" +
+ ".leftcol {float:left;width:300px;background-color:#eaeff2;border-right: 1px
solid #c1c4ca;}" +
+ ".maincol {margin: 0px 20px 0px 325px;padding-top: 30px;}" +
+ ".leftcol, .maincol {padding-bottom: 30005px;margin-bottom: -30000px;}"
+
+ ".header {background-image:
url(images/hdr_bkg.gif);background-position:bottom;background-repeat:
repeat-x;background-color:#35485d;height: 50px;}" +
+ ".footer
{background-color:#35485d;color:#dbe7ee;line-height:2em;font-size:9px;text-align:
center;clear:both;}" +
+ ".footer a {color:#dbe7ee;line-height:2em;font-size:9px;text-align:
center;clear:both;}" +
+ ".floatright {float:right;}" +
+ ".floatleft {float:left;}" +
+ ".leftcol dl {margin-left: 30px;}" +
+ ".leftcol dt {color:#4a5d75;font-weight: bold;margin-left: 0px;margin-right:
20px;padding: 10px 0px 0px 0px;border-bottom: 1px solid #424242;}" +
+ ".leftcol dd {margin-left: 4px;padding:2px 0px;}" +
+ "#bread {color: #656565;padding-right: 3px;margin-bottom: 10px;}" +
+ "#bread ul {margin-left: 0;padding-left: 0;display: inline;border:
none;}" +
+ "#bread ul li {margin-left: 0;padding-left: 2px;font-size:10px;border:
none;list-style: none;display: inline;}" +
+ "#bread a {color:#656565;text-decoration: underline;}";
+ /*
+ public static final String SHADOW_IMG=
+ "<img src=\"data:image/gif;base64,\n" +
+
"iVBORw0KGgoAAAANSUhEUgAAAAcAAAABCAYAAAASC7TOAAAABGdBTUEAANbY1E9YMgAAABl0RVh0\n"
+
+
"U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAjSURBVHjaYoyqnhTFwMDwBYjfM/xneMPA\n"
+
+ "CKRB/P8MPwACDAB+pAlsRfRmXgAAAABJRU5ErkJggg==\"/>";
+
+ public static final String HEADER_IMG=
+ "<img src=\"data:image/gif;base64,\n" +
+
"R0lGODlhAQAuAMQAACQ0Rio8TyU2SC9BVSc3SiY2SSk6TSg4SzVIXTJFWSc4SzFDWC0+Uio7TjRG\n"
+
+
"Wy5AVCs9UCMzRSM0Ri5AUyw9UQ0NDSw+US4+Uyg5TTRHXCQ0RTNGWzNFWjBCVjBDVy9BViwAAAAA\n"
+
+
"AQAuAAAFJSCCZM7GJcnidd03DM90MRYVQEHQGAZ2HAoCoVAQGAFIiSZSCQEAOw==\"/>";
+ */
+
}
Added: trunk/webapps/host-manager/images/apr_pb.gif
===================================================================
(Binary files differ)
Property changes on: trunk/webapps/host-manager/images/apr_pb.gif
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: trunk/webapps/host-manager/images/bkg_shadow.png
===================================================================
(Binary files differ)
Property changes on: trunk/webapps/host-manager/images/bkg_shadow.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/webapps/host-manager/images/hdr_bkg.gif
===================================================================
(Binary files differ)
Property changes on: trunk/webapps/host-manager/images/hdr_bkg.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/webapps/host-manager/images/hdr_hdrtitle.gif
===================================================================
(Binary files differ)
Property changes on: trunk/webapps/host-manager/images/hdr_hdrtitle.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/webapps/host-manager/images/hdr_jbosslogo.gif
===================================================================
(Binary files differ)
Property changes on: trunk/webapps/host-manager/images/hdr_jbosslogo.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/webapps/host-manager/images/hdr_jbossorglogo.gif
===================================================================
(Binary files differ)
Property changes on: trunk/webapps/host-manager/images/hdr_jbossorglogo.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/webapps/host-manager/images/jboss_ics.gif
===================================================================
(Binary files differ)
Property changes on: trunk/webapps/host-manager/images/jboss_ics.gif
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/webapps/host-manager/images/jboss_logo.gif
===================================================================
(Binary files differ)
Added: trunk/webapps/host-manager/images/jbweb_pb.gif
===================================================================
(Binary files differ)
Property changes on: trunk/webapps/host-manager/images/jbweb_pb.gif
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: trunk/webapps/host-manager/images/openssl_ics.gif
===================================================================
(Binary files differ)
Property changes on: trunk/webapps/host-manager/images/openssl_ics.gif
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: trunk/webapps/host-manager/images/tomcat_pb.gif
===================================================================
(Binary files differ)
Property changes on: trunk/webapps/host-manager/images/tomcat_pb.gif
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: trunk/webapps/manager/images/apr_pb.gif
===================================================================
(Binary files differ)
Property changes on: trunk/webapps/manager/images/apr_pb.gif
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: trunk/webapps/manager/images/bkg_shadow.png
===================================================================
(Binary files differ)
Property changes on: trunk/webapps/manager/images/bkg_shadow.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/webapps/manager/images/hdr_bkg.gif
===================================================================
(Binary files differ)
Property changes on: trunk/webapps/manager/images/hdr_bkg.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/webapps/manager/images/hdr_hdrtitle.gif
===================================================================
(Binary files differ)
Property changes on: trunk/webapps/manager/images/hdr_hdrtitle.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/webapps/manager/images/hdr_jbosslogo.gif
===================================================================
(Binary files differ)
Property changes on: trunk/webapps/manager/images/hdr_jbosslogo.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/webapps/manager/images/hdr_jbossorglogo.gif
===================================================================
(Binary files differ)
Property changes on: trunk/webapps/manager/images/hdr_jbossorglogo.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/webapps/manager/images/jboss_ics.gif
===================================================================
(Binary files differ)
Property changes on: trunk/webapps/manager/images/jboss_ics.gif
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: trunk/webapps/manager/images/jbweb_pb.gif
===================================================================
(Binary files differ)
Property changes on: trunk/webapps/manager/images/jbweb_pb.gif
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: trunk/webapps/manager/images/openssl_ics.gif
===================================================================
(Binary files differ)
Property changes on: trunk/webapps/manager/images/openssl_ics.gif
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: trunk/webapps/manager/images/tomcat_pb.gif
===================================================================
(Binary files differ)
Property changes on: trunk/webapps/manager/images/tomcat_pb.gif
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
6165
days inactive
6165
days old
jbossweb-commits@lists.jboss.org
0 comments
1 participants
participants (1)
-
jbossweb-commits＠lists.jboss.org