JBossWeb SVN: r463 - in trunk/java/org/apache: coyote/http11 and 1 other directory.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2008-03-03 21:31:01 -0500 (Mon, 03 Mar 2008)
New Revision: 463
Modified:
trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
trunk/java/org/apache/catalina/connector/InputBuffer.java
trunk/java/org/apache/catalina/connector/Request.java
trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java
Log:
- Fix some glitches that did not allow reads to read 0 bytes.
- Add blocking reads when available is not being used (more complex than I thought ...).
- Two problems found:
- read timeout glitch in blocking mode (it doesn't timeout)
- a read on a nonblocking socket returns immediately (good), but with an EAGAIN rather than returning
it has read 0 bytes (not good ?); now that I know about it, I can code for it
Modified: trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
===================================================================
--- trunk/java/org/apache/catalina/connector/CoyoteAdapter.java 2008-03-04 00:36:11 UTC (rev 462)
+++ trunk/java/org/apache/catalina/connector/CoyoteAdapter.java 2008-03-04 02:31:01 UTC (rev 463)
@@ -215,7 +215,7 @@
/*if (response.isClosed() || !request.isComet()) {
res.action(ActionCode.ACTION_COMET_END, null);
} else*/
- if (!error && read && request.isReadable()) {
+ if (!error && read && request.ready()) {
// If this was a read and not all bytes have been read, or if no data
// was read from the connector, then it is an error
log.error(sm.getString("coyoteAdapter.read"));
@@ -297,7 +297,7 @@
if (request.isComet()) {
if (!response.isClosed() && !response.isError()) {
res.action(ActionCode.ACTION_COMET_BEGIN, null);
- if (request.isReadable()) {
+ if (request.ready()) {
// Invoke a read event right away if there are available bytes
if (event(req, res, SocketStatus.OPEN_READ)) {
comet = true;
Modified: trunk/java/org/apache/catalina/connector/InputBuffer.java
===================================================================
--- trunk/java/org/apache/catalina/connector/InputBuffer.java 2008-03-04 00:36:11 UTC (rev 462)
+++ trunk/java/org/apache/catalina/connector/InputBuffer.java 2008-03-04 02:31:01 UTC (rev 463)
@@ -270,6 +270,7 @@
available = bb.getLength();
if (request.isComet() && available == 0) {
try {
+ coyoteRequest.action(ActionCode.ACTION_AVAILABLE, null);
available = realReadBytes(null, 0, 0);
} catch (IOException e) {
// Ignore, will return 0, and another error
@@ -280,6 +281,7 @@
available = cb.getLength();
if (request.isComet() && available == 0) {
try {
+ coyoteRequest.action(ActionCode.ACTION_AVAILABLE, null);
available = realReadChars(null, 0, cb.getBuffer().length);
} catch (IOException e) {
// Ignore, will return 0, and another error
Modified: trunk/java/org/apache/catalina/connector/Request.java
===================================================================
--- trunk/java/org/apache/catalina/connector/Request.java 2008-03-04 00:36:11 UTC (rev 462)
+++ trunk/java/org/apache/catalina/connector/Request.java 2008-03-04 02:31:01 UTC (rev 463)
@@ -2257,7 +2257,7 @@
/**
* Return true if bytes are available.
*/
- public boolean isReadable() {
+ public boolean ready() {
return (inputBuffer.available() > 0);
}
Modified: trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
===================================================================
--- trunk/java/org/apache/coyote/http11/Http11AprProcessor.java 2008-03-04 00:36:11 UTC (rev 462)
+++ trunk/java/org/apache/coyote/http11/Http11AprProcessor.java 2008-03-04 02:31:01 UTC (rev 463)
@@ -1267,19 +1267,22 @@
internalBuffer.addActiveFilter(savedBody);
} else if (actionCode == ActionCode.ACTION_AVAILABLE) {
- request.setAvailable(inputBuffer.available());
+ //request.setAvailable(inputBuffer.available());
+ inputBuffer.useAvailable();
} else if (actionCode == ActionCode.ACTION_COMET_BEGIN) {
comet = true;
// Set socket to non blocking mode
Socket.optSet(socket, Socket.APR_SO_NONBLOCK, 1);
Socket.timeoutSet(socket, 0);
outputBuffer.setNonBlocking(true);
+ inputBuffer.setNonBlocking(true);
} else if (actionCode == ActionCode.ACTION_COMET_END) {
comet = false;
// End non blocking mode
Socket.optSet(socket, Socket.APR_SO_NONBLOCK, 0);
Socket.timeoutSet(socket, endpoint.getSoTimeout());
outputBuffer.setNonBlocking(false);
+ inputBuffer.setNonBlocking(false);
} else if (actionCode == ActionCode.ACTION_COMET_SUSPEND) {
readNotifications = false;
} else if (actionCode == ActionCode.ACTION_COMET_RESUME) {
Modified: trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java
===================================================================
--- trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java 2008-03-04 00:36:11 UTC (rev 462)
+++ trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java 2008-03-04 02:31:01 UTC (rev 463)
@@ -174,6 +174,18 @@
protected int lastActiveFilter;
+ /**
+ * Non blocking mode.
+ */
+ protected boolean nonBlocking = false;
+
+
+ /**
+ * Non blocking mode.
+ */
+ protected boolean available = false;
+
+
// ------------------------------------------------------------- Properties
@@ -195,6 +207,22 @@
/**
+ * Set the non blocking flag.
+ */
+ public void setNonBlocking(boolean nonBlocking) {
+ this.nonBlocking = nonBlocking;
+ }
+
+
+ /**
+ * Get the non blocking flag value.
+ */
+ public boolean getNonBlocking() {
+ return nonBlocking;
+ }
+
+
+ /**
* Add an input filter to the filter library.
*/
public void addFilter(InputFilter filter) {
@@ -319,6 +347,7 @@
lastActiveFilter = -1;
parsingHeader = true;
swallowInput = true;
+ nonBlocking = false;
}
@@ -677,7 +706,8 @@
/**
* Available bytes (note that due to encoding, this may not correspond )
*/
- public int available() {
+ public void useAvailable() {
+ /*
int result = (lastValid - pos);
if ((result == 0) && (lastActiveFilter >= 0)) {
for (int i = 0; (result == 0) && (i <= lastActiveFilter); i++) {
@@ -685,6 +715,8 @@
}
}
return result;
+ */
+ available = true;
}
@@ -759,6 +791,33 @@
} else if (nRead < 0) {
if ((-nRead) == Status.ETIMEDOUT || (-nRead) == Status.TIMEUP) {
throw new SocketTimeoutException(sm.getString("iib.failedread"));
+ } else if ((-nRead) == Status.EAGAIN && nonBlocking) {
+ // FIXME: I don't understand why the result is not nRead = 0
+ /* As asynchronous reads are forbidden, this test is not useful */
+ /*&& (Http11AprProcessor.containerThread.get() == Boolean.TRUE)*/
+ if (available) {
+ nRead = 0;
+ } else {
+ // In this specific situation, perform the read again in blocking mode (the user is not
+ // using available and simply wants to read all data)
+ Socket.optSet(socket, Socket.APR_SO_NONBLOCK, 0);
+ // Also use the usual timeout
+ Socket.timeoutSet(socket, 20000*1000);
+ nRead = Socket.recvbb(socket, 0, buf.length - lastValid);
+ Socket.optSet(socket, Socket.APR_SO_NONBLOCK, 1);
+ Socket.timeoutSet(socket, 0);
+ if (nRead > 0) {
+ bbuf.limit(nRead);
+ bbuf.get(buf, pos, nRead);
+ lastValid = pos + nRead;
+ } else if (nRead < 0) {
+ if ((-nRead) == Status.ETIMEDOUT || (-nRead) == Status.TIMEUP) {
+ throw new SocketTimeoutException(sm.getString("iib.failedread"));
+ } else {
+ throw new IOException(sm.getString("iib.failedread"));
+ }
+ }
+ }
} else {
throw new IOException(sm.getString("iib.failedread"));
}
@@ -766,7 +825,7 @@
}
- return (nRead > 0);
+ return (nRead >= 0);
}
16 years, 1 month
- 1
- 0
JBossWeb SVN: r462 - trunk/java/org/apache/catalina/util.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2008-03-03 19:36:11 -0500 (Mon, 03 Mar 2008)
New Revision: 462
Modified:
trunk/java/org/apache/catalina/util/TomcatCSS.java
Log:
- Comment out the CSS (it's unlikely to get used).
Modified: trunk/java/org/apache/catalina/util/TomcatCSS.java
===================================================================
--- trunk/java/org/apache/catalina/util/TomcatCSS.java 2008-03-04 00:35:05 UTC (rev 461)
+++ trunk/java/org/apache/catalina/util/TomcatCSS.java 2008-03-04 00:36:11 UTC (rev 462)
@@ -32,6 +32,7 @@
"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;}" +
@@ -63,7 +64,6 @@
"#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" +
16 years, 1 month
- 1
- 0
JBossWeb SVN: r461 - trunk/java/org/apache/tomcat/jni.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2008-03-03 19:35:05 -0500 (Mon, 03 Mar 2008)
New Revision: 461
Modified:
trunk/java/org/apache/tomcat/jni/Socket.java
Log:
- Remove exception from signature.
Modified: trunk/java/org/apache/tomcat/jni/Socket.java
===================================================================
--- trunk/java/org/apache/tomcat/jni/Socket.java 2008-03-04 00:34:24 UTC (rev 460)
+++ trunk/java/org/apache/tomcat/jni/Socket.java 2008-03-04 00:35:05 UTC (rev 461)
@@ -464,8 +464,7 @@
* </PRE>
* @return Socket option returned on the call.
*/
- public static native int optGet(long sock, int opt)
- throws Exception;
+ public static native int optGet(long sock, int opt);
/**
* Setup socket timeout for the specified socket
16 years, 1 month
- 1
- 0
JBossWeb SVN: r460 - trunk/native/connector/src.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2008-03-03 19:34:24 -0500 (Mon, 03 Mar 2008)
New Revision: 460
Modified:
trunk/native/connector/src/network.c
Log:
- Port patch from JF: optGet didn't work.
Modified: trunk/native/connector/src/network.c
===================================================================
--- trunk/native/connector/src/network.c 2008-03-03 22:27:07 UTC (rev 459)
+++ trunk/native/connector/src/network.c 2008-03-04 00:34:24 UTC (rev 460)
@@ -17,7 +17,7 @@
/*
*
* @author Mladen Turk
- * @version $Revision: 562478 $, $Date: 2007-08-03 16:33:51 +0200 (ven., 03 août 2007) $
+ * @version $Revision: 631212 $, $Date: 2008-02-26 14:46:57 +0100 (Tue, 26 Feb 2008) $
*/
#include "tcn.h"
@@ -1106,7 +1106,6 @@
UNREFERENCED(o);
if (!s->sock) {
- tcn_ThrowAPRException(e, APR_ENOTSOCK);
return APR_ENOTSOCK;
}
else
@@ -1120,7 +1119,7 @@
apr_int32_t on = 0;
UNREFERENCED(o);
- if (s->sock)
+ if (!s->sock)
tcn_ThrowAPRException(e, APR_ENOTSOCK);
else {
TCN_THROW_IF_ERR((*s->net->opt_get)(s->opaque, (apr_int32_t)opt,
16 years, 1 month
- 1
- 0
JBossWeb SVN: r459 - in trunk: java/org/apache/catalina/manager/host and 2 other directories.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2008-03-03 17:27:07 -0500 (Mon, 03 Mar 2008)
New Revision: 459
Added:
trunk/webapps/host-manager/jbossweb.css
trunk/webapps/manager/jbossweb.css
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
Log:
- Move the CSS to an external file.
Modified: trunk/java/org/apache/catalina/manager/Constants.java
===================================================================
--- trunk/java/org/apache/catalina/manager/Constants.java 2008-03-03 21:29:40 UTC (rev 458)
+++ trunk/java/org/apache/catalina/manager/Constants.java 2008-03-03 22:27:07 UTC (rev 459)
@@ -26,84 +26,18 @@
public static final String HTML_HEADER_SECTION =
"<html>\n" +
"<head>\n" +
- "<style>\n" +
- org.apache.catalina.util.TomcatCSS.JBOSSWEB_CSS +
- " table {\n" +
- " width: 100%;\n" +
- " }\n" +
- " td.page-title {\n" +
- " text-align: center;\n" +
- " vertical-align: top;\n" +
- " font-family:sans-serif,Tahoma,Arial;\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:sans-serif,Tahoma,Arial;\n" +
- " font-style:italic;\n" +
- " font-weight: bold;\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: #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: #656565;\n" +
- " }\n" +
- " td.row-left {\n" +
- " text-align: left;\n" +
- " vertical-align: middle;\n" +
- " font-family:sans-serif,Tahoma,Arial;\n" +
- " color: black;\n" +
- " }\n" +
- " td.row-center {\n" +
- " text-align: center;\n" +
- " vertical-align: middle;\n" +
- " font-family:sans-serif,Tahoma,Arial;\n" +
- " color: black;\n" +
- " }\n" +
- " td.row-right {\n" +
- " text-align: right;\n" +
- " vertical-align: middle;\n" +
- " font-family:sans-serif,Tahoma,Arial;\n" +
- " color: black;\n" +
- " }\n" +
- " TH {\n" +
- " text-align: center;\n" +
- " vertical-align: top;\n" +
- " font-family:sans-serif,Tahoma,Arial;\n" +
- " font-weight: bold;\n" +
- " background: #656565;\n" +
- " }\n" +
- " TD {\n" +
- " text-align: center;\n" +
- " vertical-align: middle;\n" +
- " font-family:sans-serif,Tahoma,Arial;\n" +
- " color: black;\n" +
- " }\n" +
- "</style>\n";
+ "<link href=\"{0}/jbossweb.css\" rel=\"stylesheet\" type=\"text/css\" />\n";
public static final String BODY_HEADER_SECTION =
- "<title>{0}</title>\n" +
+ "<title>{1}</title>\n" +
"</head>\n" +
"\n" +
"<body>\n" +
"\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 class=\"floatleft\"><a href=\"list\"><img src=\"{0}/images/hdr_hdrtitle.gif\" border=\"0\"></a></div>\n" +
+ " <div class=\"floatright\"><a href=\"http://www.jboss.com/\"><img src=\"{0}/images/hdr_jbosslogo.gif\" alt=\"JBoss, a division of Red Hat\" border=\"0\"></a><a href=\"http://www.jboss.org\"><img src=\"{0}/images/hdr_jbossorglogo.gif\" alt=\"JBoss.org - Community driven.\" border=\"0\" /></a></div>\n" +
" </div>\n" +
" <div class=\"container\">\n" +
"\n";
Modified: trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
===================================================================
--- trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java 2008-03-03 21:29:40 UTC (rev 458)
+++ trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java 2008-03-03 22:27:07 UTC (rev 459)
@@ -299,23 +299,15 @@
PrintWriter writer = response.getWriter();
// HTML Header Section
- if (request.getPathInfo() == null) {
- writer.print(Constants.HTML_HEADER_SECTION);
- } else {
- writer.print(Constants.HTML_HEADER_SECTION.replace("images/", "../images/"));
- }
+ Object[] args = new Object[1];
+ args[0] = request.getContextPath();
+ writer.print(MessageFormat.format(Constants.HTML_HEADER_SECTION, args));
// Body Header Section
- Object[] args = new Object[2];
+ args = new Object[2];
args[0] = request.getContextPath();
args[1] = sm.getString("htmlManagerServlet.title");
- if (request.getPathInfo() == null) {
- writer.print(MessageFormat.format
- (Constants.BODY_HEADER_SECTION, args));
- } else {
- writer.print(MessageFormat.format
- (Constants.BODY_HEADER_SECTION.replace("images/", "../images/"), args));
- }
+ writer.print(MessageFormat.format(Constants.BODY_HEADER_SECTION, args));
// Manager Section
args = new Object[9];
Modified: trunk/java/org/apache/catalina/manager/StatusManagerServlet.java
===================================================================
--- trunk/java/org/apache/catalina/manager/StatusManagerServlet.java 2008-03-03 21:29:40 UTC (rev 458)
+++ trunk/java/org/apache/catalina/manager/StatusManagerServlet.java 2008-03-03 22:27:07 UTC (rev 459)
@@ -212,10 +212,12 @@
completeStatus = true;
}
// use StatusTransformer to output status
- StatusTransformer.writeHeader(writer, mode, (request.getPathInfo() != null));
+ Object[] args = new Object[1];
+ args[0] = request.getContextPath();
+ StatusTransformer.writeHeader(writer, args, mode);
// Body Header Section
- Object[] args = new Object[2];
+ args = new Object[2];
args[0] = request.getContextPath();
if (completeStatus) {
args[1] = sm.getString("statusServlet.complete");
@@ -223,7 +225,7 @@
args[1] = sm.getString("statusServlet.title");
}
// use StatusTransformer to output status
- StatusTransformer.writeBody(writer,args,mode, (request.getPathInfo() != null));
+ StatusTransformer.writeBody(writer,args,mode);
// Manager Section
args = new Object[9];
Modified: trunk/java/org/apache/catalina/manager/StatusTransformer.java
===================================================================
--- trunk/java/org/apache/catalina/manager/StatusTransformer.java 2008-03-03 21:29:40 UTC (rev 458)
+++ trunk/java/org/apache/catalina/manager/StatusTransformer.java 2008-03-03 22:27:07 UTC (rev 459)
@@ -70,14 +70,11 @@
* @exception IOException if an input/output error occurs
* @exception ServletException if a servlet-specified error occurs
*/
- public static void writeHeader(PrintWriter writer, int mode, boolean pathInfo) {
+ public static void writeHeader(PrintWriter writer, Object[] args, int mode) {
if (mode == 0){
// HTML Header Section
- if (pathInfo) {
- writer.print(Constants.HTML_HEADER_SECTION.replace("images/", "../images/"));
- } else {
- writer.print(Constants.HTML_HEADER_SECTION);
- }
+ writer.print(MessageFormat.format
+ (Constants.HTML_HEADER_SECTION, args));
} else if (mode == 1){
writer.write(Constants.XML_DECLARATION);
writer.write
@@ -95,15 +92,10 @@
* @param args What to write
* @param mode 0 means write
*/
- public static void writeBody(PrintWriter writer, Object[] args, int mode, boolean pathInfo) {
+ public static void writeBody(PrintWriter writer, Object[] args, int mode) {
if (mode == 0){
- if (pathInfo) {
- writer.print(MessageFormat.format
- (Constants.BODY_HEADER_SECTION.replace("images/", "../images/"), args));
- } else {
- writer.print(MessageFormat.format
- (Constants.BODY_HEADER_SECTION, args));
- }
+ writer.print(MessageFormat.format
+ (Constants.BODY_HEADER_SECTION, args));
}
}
Modified: trunk/java/org/apache/catalina/manager/host/Constants.java
===================================================================
--- trunk/java/org/apache/catalina/manager/host/Constants.java 2008-03-03 21:29:40 UTC (rev 458)
+++ trunk/java/org/apache/catalina/manager/host/Constants.java 2008-03-03 22:27:07 UTC (rev 459)
@@ -26,88 +26,18 @@
public static final String HTML_HEADER_SECTION =
"<html>\n" +
"<head>\n" +
- "<style>\n" +
- org.apache.catalina.util.TomcatCSS.JBOSSWEB_CSS +
- " table {\n" +
- " width: 100%;\n" +
- " }\n" +
- " td.page-title {\n" +
- " text-align: center;\n" +
- " vertical-align: top;\n" +
- " font-family:sans-serif,Tahoma,Arial;\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:sans-serif,Tahoma,Arial;\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:sans-serif,Tahoma,Arial;\n" +
- " font-weight: bold;\n" +
- " background: #FFDC75;\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" +
- " }\n" +
- " td.row-left {\n" +
- " text-align: left;\n" +
- " 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" +
- " vertical-align: top;\n" +
- " font-family:sans-serif,Tahoma,Arial;\n" +
- " font-weight: bold;\n" +
- " background: #FFDC75;\n" +
- " }\n" +
- " TD {\n" +
- " text-align: center;\n" +
- " vertical-align: middle;\n" +
- " font-family:sans-serif,Tahoma,Arial;\n" +
- " color: black;\n" +
- " background: white;\n" +
- " }\n" +
- "</style>\n";
+ "<link href=\"{0}/jbossweb.css\" rel=\"stylesheet\" type=\"text/css\" />\n";
public static final String BODY_HEADER_SECTION =
- "<title>{0}</title>\n" +
+ "<title>{1}</title>\n" +
"</head>\n" +
"\n" +
"<body>\n" +
"\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 class=\"floatleft\"><a href=\"list\"><img src=\"{0}/images/hdr_hdrtitle.gif\" border=\"0\"></a></div>\n" +
+ " <div class=\"floatright\"><a href=\"http://www.jboss.com/\"><img src=\"{0}/images/hdr_jbosslogo.gif\" alt=\"JBoss, a division of Red Hat\" border=\"0\"></a><a href=\"http://www.jboss.org\"><img src=\"{0}/images/hdr_jbossorglogo.gif\" alt=\"JBoss.org - Community driven.\" border=\"0\" /></a></div>\n" +
" </div>\n" +
" <div class=\"container\">\n" +
"\n";
Modified: trunk/java/org/apache/catalina/manager/host/HTMLHostManagerServlet.java
===================================================================
--- trunk/java/org/apache/catalina/manager/host/HTMLHostManagerServlet.java 2008-03-03 21:29:40 UTC (rev 458)
+++ trunk/java/org/apache/catalina/manager/host/HTMLHostManagerServlet.java 2008-03-03 22:27:07 UTC (rev 459)
@@ -185,23 +185,15 @@
PrintWriter writer = response.getWriter();
// HTML Header Section
- if (request.getPathInfo() == null) {
- writer.print(Constants.HTML_HEADER_SECTION);
- } else {
- writer.print(Constants.HTML_HEADER_SECTION.replace("images/", "../images/"));
- }
+ Object[] args = new Object[1];
+ args[0] = request.getContextPath();
+ writer.print(MessageFormat.format(Constants.HTML_HEADER_SECTION, args));
// Body Header Section
- Object[] args = new Object[2];
+ args = new Object[2];
args[0] = request.getContextPath();
args[1] = sm.getString("htmlHostManagerServlet.title");
- if (request.getPathInfo() == null) {
- writer.print(MessageFormat.format
- (Constants.BODY_HEADER_SECTION, args));
- } else {
- writer.print(MessageFormat.format
- (Constants.BODY_HEADER_SECTION.replace("images/", "../images/"), args));
- }
+ writer.print(MessageFormat.format(Constants.BODY_HEADER_SECTION, args));
// Manager Section
args = new Object[9];
Added: trunk/webapps/host-manager/jbossweb.css
===================================================================
--- trunk/webapps/host-manager/jbossweb.css (rev 0)
+++ trunk/webapps/host-manager/jbossweb.css 2008-03-03 22:27:07 UTC (rev 459)
@@ -0,0 +1,238 @@
+
+/* ------- Common Elements ---------- */
+
+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 { }
+
+table {
+ width: 100%;
+}
+
+td.page-title {
+ text-align: center;
+ vertical-align: top;
+ font-family:sans-serif,Tahoma,Arial;
+ font-weight: bold;
+ background: white;
+ color: black;
+}
+
+td.title {
+ text-align: left;
+ vertical-align: top;
+ font-family:sans-serif,Tahoma,Arial;
+ font-style:italic;
+ font-weight: bold;
+ background: #4a5d75;
+}
+
+td.header-left {
+ text-align: left;
+ vertical-align: top;
+ font-family:sans-serif,Tahoma,Arial;
+ font-weight: bold;
+ background: #656565;
+}
+
+td.header-center {
+ text-align: center;
+ vertical-align: top;
+ font-family:sans-serif,Tahoma,Arial;
+ font-weight: bold;
+ background: #656565;
+}
+
+td.row-left {
+ text-align: left;
+ vertical-align: middle;
+ font-family:sans-serif,Tahoma,Arial;
+ color: black;
+}
+
+td.row-center {
+ text-align: center;
+ vertical-align: middle;
+ font-family:sans-serif,Tahoma,Arial;
+ color: black;
+}
+
+td.row-right {
+ text-align: right;
+ vertical-align: middle;
+ font-family:sans-serif,Tahoma,Arial;
+ color: black;
+}
+
+TH {
+ text-align: center;
+ vertical-align: top;
+ font-family:sans-serif,Tahoma,Arial;
+ font-weight: bold;
+ background: #656565;
+}
+
+TD {
+ text-align: center;
+ vertical-align: middle;
+ font-family:sans-serif,Tahoma,Arial;
+ color: black;
+}
+
+.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;
+
+}
+
+/* -------- This equalizes the two column heights in the layout ----------------- */
+
+.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;
+}
+
+/* ------------------------------------------------- Left Navigation ------------------------------------------------------------------------- */
+
+.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;
+}
+
+/* ------------------------------------------------- Breadcrumb navigation ------------------------------------------------------------------ */
+
+#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;
+}
Added: trunk/webapps/manager/jbossweb.css
===================================================================
--- trunk/webapps/manager/jbossweb.css (rev 0)
+++ trunk/webapps/manager/jbossweb.css 2008-03-03 22:27:07 UTC (rev 459)
@@ -0,0 +1,238 @@
+
+/* ------- Common Elements ---------- */
+
+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 { }
+
+table {
+ width: 100%;
+}
+
+td.page-title {
+ text-align: center;
+ vertical-align: top;
+ font-family:sans-serif,Tahoma,Arial;
+ font-weight: bold;
+ background: white;
+ color: black;
+}
+
+td.title {
+ text-align: left;
+ vertical-align: top;
+ font-family:sans-serif,Tahoma,Arial;
+ font-style:italic;
+ font-weight: bold;
+ background: #4a5d75;
+}
+
+td.header-left {
+ text-align: left;
+ vertical-align: top;
+ font-family:sans-serif,Tahoma,Arial;
+ font-weight: bold;
+ background: #656565;
+}
+
+td.header-center {
+ text-align: center;
+ vertical-align: top;
+ font-family:sans-serif,Tahoma,Arial;
+ font-weight: bold;
+ background: #656565;
+}
+
+td.row-left {
+ text-align: left;
+ vertical-align: middle;
+ font-family:sans-serif,Tahoma,Arial;
+ color: black;
+}
+
+td.row-center {
+ text-align: center;
+ vertical-align: middle;
+ font-family:sans-serif,Tahoma,Arial;
+ color: black;
+}
+
+td.row-right {
+ text-align: right;
+ vertical-align: middle;
+ font-family:sans-serif,Tahoma,Arial;
+ color: black;
+}
+
+TH {
+ text-align: center;
+ vertical-align: top;
+ font-family:sans-serif,Tahoma,Arial;
+ font-weight: bold;
+ background: #656565;
+}
+
+TD {
+ text-align: center;
+ vertical-align: middle;
+ font-family:sans-serif,Tahoma,Arial;
+ color: black;
+}
+
+.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;
+
+}
+
+/* -------- This equalizes the two column heights in the layout ----------------- */
+
+.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;
+}
+
+/* ------------------------------------------------- Left Navigation ------------------------------------------------------------------------- */
+
+.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;
+}
+
+/* ------------------------------------------------- Breadcrumb navigation ------------------------------------------------------------------ */
+
+#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;
+}
16 years, 1 month
- 1
- 0
JBossWeb SVN: r458 - in trunk: java/org/apache/catalina/manager/host and 3 other directories.
by jbossweb-commits＠lists.jboss.org
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
16 years, 1 month
- 1
- 0
JBossWeb SVN: r457 - in trunk: webapps/ROOT and 2 other directories.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2008-03-03 11:16:39 -0500 (Mon, 03 Mar 2008)
New Revision: 457
Added:
trunk/webapps/docs/images/apr_pb.gif
trunk/webapps/docs/images/bkg_shadow.png
trunk/webapps/docs/images/hdr_bkg.gif
trunk/webapps/docs/images/hdr_hdrtitle.gif
trunk/webapps/docs/images/hdr_jbosslogo.gif
trunk/webapps/docs/images/hdr_jbossorglogo.gif
trunk/webapps/docs/jbossweb.css
Modified:
trunk/build.xml
trunk/webapps/ROOT/jbossweb.css
trunk/webapps/docs/changelog.xml
trunk/webapps/docs/tomcat-docs.xsl
Log:
- Integrate the new CSS in the docs (the hard part is going to be the manager).
Modified: trunk/build.xml
===================================================================
--- trunk/build.xml 2008-02-29 02:11:24 UTC (rev 456)
+++ trunk/build.xml 2008-03-03 16:16:39 UTC (rev 457)
@@ -301,6 +301,7 @@
<copy todir="${tomcat.build}/webapps">
<fileset dir="webapps">
<include name="docs/images/**"/>
+ <include name="docs/**/*.css"/>
<include name="docs/**/*.html"/>
<include name="docs/WEB-INF/**"/>
<include name="docs/appdev/*.txt"/>
Modified: trunk/webapps/ROOT/jbossweb.css
===================================================================
--- trunk/webapps/ROOT/jbossweb.css 2008-02-29 02:11:24 UTC (rev 456)
+++ trunk/webapps/ROOT/jbossweb.css 2008-03-03 16:16:39 UTC (rev 457)
@@ -48,7 +48,7 @@
.wrapper {
min-width: 900px;
- background-image:url(../images/bkg_shadow.png);
+ background-image:url(images/bkg_shadow.png);
background-position:right;
background-repeat:repeat-y;
padding-right:7px;
@@ -85,7 +85,7 @@
/* ---------- */
.header {
- background-image: url(../images/hdr_bkg.gif);
+ background-image: url(images/hdr_bkg.gif);
background-position:bottom;
background-repeat: repeat-x;
background-color:#35485d;
Modified: trunk/webapps/docs/changelog.xml
===================================================================
--- trunk/webapps/docs/changelog.xml 2008-02-29 02:11:24 UTC (rev 456)
+++ trunk/webapps/docs/changelog.xml 2008-03-03 16:16:39 UTC (rev 457)
@@ -27,7 +27,6 @@
</fix>
<update>
Update to NSIS 2.35, and allow building it using Wine. (remm)
- (markt)
</update>
<update>
Update to commons-pool version 1.4, native version 1.1.12 and update
Added: trunk/webapps/docs/images/apr_pb.gif
===================================================================
(Binary files differ)
Property changes on: trunk/webapps/docs/images/apr_pb.gif
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: trunk/webapps/docs/images/bkg_shadow.png
===================================================================
(Binary files differ)
Property changes on: trunk/webapps/docs/images/bkg_shadow.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/webapps/docs/images/hdr_bkg.gif
===================================================================
(Binary files differ)
Property changes on: trunk/webapps/docs/images/hdr_bkg.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/webapps/docs/images/hdr_hdrtitle.gif
===================================================================
(Binary files differ)
Property changes on: trunk/webapps/docs/images/hdr_hdrtitle.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/webapps/docs/images/hdr_jbosslogo.gif
===================================================================
(Binary files differ)
Property changes on: trunk/webapps/docs/images/hdr_jbosslogo.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/webapps/docs/images/hdr_jbossorglogo.gif
===================================================================
(Binary files differ)
Property changes on: trunk/webapps/docs/images/hdr_jbossorglogo.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/webapps/docs/jbossweb.css
===================================================================
--- trunk/webapps/docs/jbossweb.css (rev 0)
+++ trunk/webapps/docs/jbossweb.css 2008-03-03 16:16:39 UTC (rev 457)
@@ -0,0 +1,164 @@
+
+/* ------- Common Elements ---------- */
+
+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;
+
+}
+
+/* -------- This equalizes the two column heights in the layout ----------------- */
+
+.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;
+}
+
+/* ------------------------------------------------- Left Navigation ------------------------------------------------------------------------- */
+
+.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;
+}
+
+/* ------------------------------------------------- Breadcrumb navigation ------------------------------------------------------------------ */
+
+#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;
+}
Modified: trunk/webapps/docs/tomcat-docs.xsl
===================================================================
--- trunk/webapps/docs/tomcat-docs.xsl 2008-02-29 02:11:24 UTC (rev 456)
+++ trunk/webapps/docs/tomcat-docs.xsl 2008-03-03 16:16:39 UTC (rev 457)
@@ -20,6 +20,9 @@
<xsl:param name="printer-logo" select="'/images/printer.gif'"/>
<xsl:param name="jbossorg-logo" select="'/images/jbossorg_logo.gif'"/>
<xsl:param name="jbossweb-logo" select="'/images/jbossweblogo.gif'"/>
+ <xsl:param name="hdr_hdrtitle" select="'/images/hdr_hdrtitle.gif'"/>
+ <xsl:param name="hdr_jbosslogo" select="'/images/hdr_jbosslogo.gif'"/>
+ <xsl:param name="hdr_jbossorglogo" select="'/images/hdr_jbossorglogo.gif'"/>
<xsl:param name="relative-path" select="'.'"/>
<xsl:param name="void-image" select="'/images/void.gif'"/>
<xsl:param name="project-menu" select="'menu'"/>
@@ -33,9 +36,9 @@
<xsl:variable name="body-bg" select="'#ffffff'"/>
<xsl:variable name="body-fg" select="'#000000'"/>
<xsl:variable name="body-link" select="'#525D76'"/>
- <xsl:variable name="banner-bg" select="'#525D76'"/>
+ <xsl:variable name="banner-bg" select="'#eaeff2'"/>
<xsl:variable name="banner-fg" select="'#ffffff'"/>
- <xsl:variable name="sub-banner-bg" select="'#828DA6'"/>
+ <xsl:variable name="sub-banner-bg" select="'#eaeff2'"/>
<xsl:variable name="sub-banner-fg" select="'#ffffff'"/>
<xsl:variable name="source-color" select="'#023264'"/>
<xsl:variable name="attributes-color" select="'#023264'"/>
@@ -53,9 +56,11 @@
<xsl:if test="$bodyonly != 'true'">
- <html>
+ <html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title><xsl:value-of select="project/title"/> - <xsl:value-of select="properties/title"/></title>
+ <xsl:variable name="csshref"><xsl:value-of select="$relative-path"/>/jbossweb.css</xsl:variable>
+ <link href="{$csshref}" rel="stylesheet" type="text/css" />
<xsl:for-each select="properties/author">
<xsl:variable name="name">
<xsl:value-of select="."/>
@@ -68,74 +73,38 @@
</xsl:for-each>
</head>
- <body bgcolor="{$body-bg}" text="{$body-fg}" link="{$body-link}"
- alink="{$body-link}" vlink="{$body-link}">
+ <body>
- <table border="0" width="100%" cellspacing="0">
+ <div class="wrapper">
- <xsl:comment>PAGE HEADER</xsl:comment>
- <tr>
- <td>
- <xsl:if test="project/logo">
- <xsl:variable name="alt">
- <xsl:value-of select="project/logo"/>
- </xsl:variable>
- <xsl:variable name="home">
- <xsl:value-of select="project/@href"/>
- </xsl:variable>
- <xsl:variable name="src">
- <xsl:value-of select="$relative-path"/><xsl:value-of select="project/logo/@href"/>
- </xsl:variable>
+ <xsl:comment>HEADER</xsl:comment>
+ <div class="header">
+ <div class="floatleft"><a href="index.html">
+ <xsl:variable name="src"><xsl:value-of select="$relative-path"/><xsl:value-of select="$hdr_hdrtitle"/></xsl:variable>
+ <img src="{$src}" border="0"/></a></div>
+ <div class="floatright"><a href="http://www.jboss.com/">
+ <xsl:variable name="src"><xsl:value-of select="$relative-path"/><xsl:value-of select="$hdr_jbosslogo"/></xsl:variable>
+ <img src="{$src}" alt="JBoss, a division of Red Hat" border="0"/></a><a href="http://www.jboss.org">
+ <xsl:variable name="src"><xsl:value-of select="$relative-path"/><xsl:value-of select="$hdr_jbossorglogo"/></xsl:variable>
+ <img src="{$src}" alt="JBoss.org - Community driven." border="0" /></a></div>
+ </div>
+ <div class="container">
- <xsl:comment>PROJECT LOGO</xsl:comment>
- <a href="{$home}">
- <img src="{$src}" align="right" alt="{$alt}" border="0"/>
- </a>
- </xsl:if>
- </td>
- <td>
- <font face="arial,helvetica,sanserif">
- <h1><xsl:value-of select="$project/title"/></h1>
- </font>
- </td>
- <td>
- <xsl:comment>APACHE LOGO</xsl:comment>
- <xsl:variable name="src">
- <xsl:value-of select="$relative-path"/><xsl:value-of select="$jbossorg-logo"/>
- </xsl:variable>
- <a href="http://www.jboss.org/">
- <img src="{$src}" align="right" alt="JBoss Logo" border="0"/>
- </a>
- </td>
- </tr>
- </table>
-
- <table border="0" width="100%" cellspacing="4">
-
- <xsl:comment>HEADER SEPARATOR</xsl:comment>
- <tr>
- <td colspan="2">
- <hr noshade="noshade" size="1"/>
- </td>
- </tr>
-
- <tr>
-
- <!-- Don't generate a menu if styling printer friendly docs -->
- <xsl:if test="$project-menu = 'menu'">
- <xsl:comment>LEFT SIDE NAVIGATION</xsl:comment>
- <td width="20%" valign="top" nowrap="true">
- <xsl:apply-templates select="project/body/menu"/>
- </td>
- </xsl:if>
-
- <xsl:comment>RIGHT SIDE MAIN BODY</xsl:comment>
- <td width="80%" valign="top" align="left">
+ <xsl:comment>OPTIONAL MENU</xsl:comment>
+ <xsl:if test="$project-menu = 'menu'">
+ <div class="leftcol">
+ <dl>
+ <xsl:apply-templates select="project/body/menu"/>
+ </dl>
+ </div>
+
+ <xsl:comment>MAIN</xsl:comment>
+ <div class="maincol">
+
<table border="0" width="100%" cellspacing="4">
<tr>
<td align="left" valign="top">
- <h1><xsl:value-of select="project/title"/></h1>
- <h2><xsl:value-of select="properties/title"/></h2>
+ <h1><xsl:value-of select="properties/title"/></h1>
</td>
<td align="right" valign="top" nowrap="true">
<!-- Add the printer friendly link for docs with a menu -->
@@ -149,7 +118,6 @@
<small>
<a href="printer/{$url}">
<img src="{$src}" border="0" alt="Printer Friendly Version"/>
- <br />print-friendly<br />version
</a>
</small>
</xsl:if>
@@ -163,29 +131,54 @@
</tr>
</table>
<xsl:apply-templates select="body/section"/>
- </td>
+
+ </div>
+ </xsl:if>
+
+ <xsl:if test="$project-menu != 'menu'">
+
+ <table border="0" width="100%" cellspacing="4">
+ <tr>
+ <td align="left" valign="top">
+ <h1><xsl:value-of select="properties/title"/></h1>
+ </td>
+ <td align="right" valign="top" nowrap="true">
+ <!-- Add the printer friendly link for docs with a menu -->
+ <xsl:if test="$project-menu = 'menu'">
+ <xsl:variable name="src">
+ <xsl:value-of select="$relative-path"/><xsl:value-of select="$printer-logo"/>
+ </xsl:variable>
+ <xsl:variable name="url">
+ <xsl:value-of select="/document/@url"/>
+ </xsl:variable>
+ <small>
+ <a href="printer/{$url}">
+ <img src="{$src}" border="0" alt="Printer Friendly Version"/>
+ </a>
+ </small>
+ </xsl:if>
+ <xsl:if test="$project-menu != 'menu'">
+ <xsl:variable name="void">
+ <xsl:value-of select="$relative-path"/><xsl:value-of select="$void-image"/>
+ </xsl:variable>
+ <img src="{$void}" width="1" height="1" vspace="0" hspace="0" border="0"/>
+ </xsl:if>
+ </td>
+ </tr>
+ </table>
+ <xsl:apply-templates select="body/section"/>
+
+ </xsl:if>
+
+ </div>
+
+ <xsl:comment>FOOTER</xsl:comment>
+ <div class="footer">© 1999-2007, Apache Software Foundation. © 2007-2008 Red Hat Middleware, LLC. All Rights Reserved. </div>
+
+ </div>
- </tr>
-
- <xsl:comment>FOOTER SEPARATOR</xsl:comment>
- <tr>
- <td colspan="2">
- <hr noshade="noshade" size="1"/>
- </td>
- </tr>
-
- <xsl:comment>PAGE FOOTER</xsl:comment>
- <tr><td colspan="2">
- <div align="center"><font color="{$body-link}" size="-1"><em>
- © 1999-2007, Apache Software Foundation
- © 2007-2008, Red Hat Middleware, LLC. All rights reserved.
- </em></font></div>
- </td></tr>
-
- </table>
</body>
</html>
-
</xsl:if>
</xsl:template>
@@ -193,10 +186,8 @@
<!-- Process a menu for the navigation bar -->
<xsl:template match="menu">
- <p><strong><xsl:value-of select="@name"/></strong></p>
- <ul>
- <xsl:apply-templates select="item"/>
- </ul>
+ <dt><xsl:value-of select="@name"/></dt>
+ <xsl:apply-templates select="item"/>
</xsl:template>
@@ -205,7 +196,7 @@
<xsl:variable name="href">
<xsl:value-of select="@href"/>
</xsl:variable>
- <li><a href="{$href}"><xsl:value-of select="@name"/></a></li>
+ <dd><a href="{$href}"><xsl:value-of select="@name"/></a></dd>
</xsl:template>
@@ -217,7 +208,7 @@
<xsl:variable name="name">
<xsl:value-of select="@name"/>
</xsl:variable>
- <h2 class="head2"><xsl:value-of select="@name"/></h2>
+ <h2><xsl:value-of select="@name"/></h2>
<xsl:apply-templates/>
</xsl:if>
@@ -253,7 +244,7 @@
<xsl:variable name="name">
<xsl:value-of select="@name"/>
</xsl:variable>
- <h3 class="head3"><xsl:value-of select="@name"/></h3>
+ <h3><xsl:value-of select="@name"/></h3>
<xsl:apply-templates/>
</xsl:if>
16 years, 1 month
- 1
- 0