Menu
▾
▴
[Jboss-svn-commits] JBL Code SVN: r1626 - in trunk/labs/jbossweb: . src/share/classes/org/apache/catalina src/share/classes/org/apache/catalina/manager src/share/classes/org/apache/catalina/util
Author: rem...@jb...
Date: 2005-11-22 20:21:13 -0500 (Tue, 22 Nov 2005)
New Revision: 1626
Added:
trunk/labs/jbossweb/src/share/classes/org/apache/catalina/manager/
trunk/labs/jbossweb/src/share/classes/org/apache/catalina/manager/Constants.java
trunk/labs/jbossweb/src/share/classes/org/apache/catalina/manager/StatusTransformer.java
Modified:
trunk/labs/jbossweb/build.xml
trunk/labs/jbossweb/src/share/classes/org/apache/catalina/util/ServerInfo.properties
Log:
- Add status servlet support classes to the tree.
- Add filtering.
Modified: trunk/labs/jbossweb/build.xml
===================================================================
--- trunk/labs/jbossweb/build.xml 2005-11-23 00:01:00 UTC (rev 1625)
+++ trunk/labs/jbossweb/build.xml 2005-11-23 01:21:13 UTC (rev 1626)
@@ -1,4 +1,4 @@
-<project name="JBossWeb" default="deploy" basedir=".">
+<project name="JBoss Web" default="deploy" basedir=".">
<!-- ===================== Initialize Property Values =================== -->
@@ -11,13 +11,15 @@
<property file="build.properties.default"/>
<!-- Project Properties -->
- <property name="name" value="JBossWeb" />
+ <property name="name" value="JBoss Web" />
<property name="year" value="2005" />
<property name="version.major" value="4" />
<property name="version.minor" value="0" />
<property name="version.build" value="0" />
<property name="version.patch" value="" />
- <property name="version" value="${version.major}.${version.minor}.${version.build}${version.patch}" />
+ <property name="version.flag" value="" />
+ <property name="version.number" value="${version.major}.${version.minor}.${version.build}${version.patch}" />
+ <property name="version" value="${version.major}.${version.minor}.${version.build}${version.patch}${version.flag}" />
<property name="project" value="jbossweb" />
<property name="final.name" value="${project}-${version}" />
@@ -115,6 +117,7 @@
<include name="deploy/tc5-cluster-service.xml" />
<exclude name="deploy/jbossweb-tomcat55.sar/catalina.jar" />
+ <exclude name="deploy/jbossweb-tomcat55.sar/catalina-manager.jar" />
<exclude name="deploy/jbossweb-tomcat55.sar/catalina-optional.jar" />
<exclude name="deploy/jbossweb-tomcat55.sar/naming-resources.jar" />
<exclude name="deploy/jbossweb-tomcat55.sar/servlets-default.jar" />
@@ -147,6 +150,14 @@
<exclude name="**/*TestCase.java" />
</javac>
+ <tstamp>
+ <format property="TODAY" pattern="MMM d yyyy" locale="en"/>
+ <format property="TSTAMP" pattern="hh:mm:ss"/>
+ </tstamp>
+ <!-- Copy static resource files -->
+ <filter token="VERSION" value="${version}"/>
+ <filter token="VERSION_NUMBER" value="${version.number}"/>
+ <filter token="VERSION_BUILT" value="${TODAY} ${TSTAMP}"/>
<copy todir="${jbossweb.build}/classes" filtering="yes">
<fileset dir="src/share/classes">
<include name="**/*.xml"/>
@@ -156,22 +167,12 @@
<jar jarfile="${jbossweb.build}/${final.name}/server/default/deploy/jbossweb-tomcat55.sar/jbossweb.jar" index="true">
<fileset dir="${jbossweb.build}/classes">
- <exclude name="org/jboss/web/rewrite/**"/>
<!-- Javadoc and i18n exclusions -->
<exclude name="**/package.html" />
<exclude name="**/LocalStrings_*" />
</fileset>
</jar>
- <jar jarfile="${jbossweb.build}/${final.name}/server/default/deploy/jbossweb-tomcat55.sar/catalina-rewrite.jar" index="true">
- <fileset dir="${jbossweb.build}/classes">
- <include name="org/jboss/web/rewrite/**"/>
- <!-- Javadoc and i18n exclusions -->
- <exclude name="**/package.html" />
- <exclude name="**/LocalStrings_*" />
- </fileset>
- </jar>
-
</target>
<target name="clean">
Added: trunk/labs/jbossweb/src/share/classes/org/apache/catalina/manager/Constants.java
===================================================================
--- trunk/labs/jbossweb/src/share/classes/org/apache/catalina/manager/Constants.java 2005-11-23 00:01:00 UTC (rev 1625)
+++ trunk/labs/jbossweb/src/share/classes/org/apache/catalina/manager/Constants.java 2005-11-23 01:21:13 UTC (rev 1626)
@@ -0,0 +1,198 @@
+/*
+ * Copyright 1999,2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+package org.apache.catalina.manager;
+
+
+public class Constants {
+
+ public static final String Package = "org.apache.catalina.manager";
+
+ public static final String HTML_HEADER_SECTION =
+ "<html>\n" +
+ "<head>\n" +
+ "<style>\n" +
+ org.apache.catalina.util.TomcatCSS.TOMCAT_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" +
+ " }\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: #FFDC75;\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";
+
+ public static final String BODY_HEADER_SECTION =
+ "<title>{0}</title>\n" +
+ "</head>\n" +
+ "\n" +
+ "<body bgcolor=\"#FFFFFF\">\n" +
+ "\n" +
+ "<table cellspacing=\"4\" width=\"100%\" border=\"0\">\n" +
+ " <tr>\n" +
+ " <td colspan=\"2\">\n" +
+ " <a href=\"http://jakarta.apache.org/\">\n" +
+ " <img border=\"0\" alt=\"The Jakarta Project\" align=\"left\"\n" +
+ " src=\"{0}/images/jakarta-logo.gif\">\n" +
+ " </a>\n" +
+ " <a href=\"http://jakarta.apache.org/tomcat/\">\n" +
+ " <img border=\"0\" alt=\"The Tomcat Servlet/JSP Container\"\n" +
+ " align=\"right\" src=\"{0}/images/tomcat.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" +
+ "\n";
+
+ public static final String MESSAGE_SECTION =
+ "<table border=\"1\" cellspacing=\"0\" cellpadding=\"3\">\n" +
+ " <tr>\n" +
+ " <td class=\"row-left\" width=\"10%\">" +
+ "<small><strong>{0}</strong></small> </td>\n" +
+ " <td class=\"row-left\"><pre>{1}</pre></td>\n" +
+ " </tr>\n" +
+ "</table>\n" +
+ "<br>\n" +
+ "\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";
+
+ public static final String SERVER_HEADER_SECTION =
+ "<table border=\"1\" cellspacing=\"0\" cellpadding=\"3\">\n" +
+ "<tr>\n" +
+ " <td colspan=\"6\" class=\"title\">{0}</td>\n" +
+ "</tr>\n" +
+ "<tr>\n" +
+ " <td class=\"header-center\"><small>{1}</small></td>\n" +
+ " <td class=\"header-center\"><small>{2}</small></td>\n" +
+ " <td class=\"header-center\"><small>{3}</small></td>\n" +
+ " <td class=\"header-center\"><small>{4}</small></td>\n" +
+ " <td class=\"header-center\"><small>{5}</small></td>\n" +
+ " <td class=\"header-center\"><small>{6}</small></td>\n" +
+ "</tr>\n";
+
+ public static final String SERVER_ROW_SECTION =
+ "<tr>\n" +
+ " <td class=\"row-center\"><small>{0}</small></td>\n" +
+ " <td class=\"row-center\"><small>{1}</small></td>\n" +
+ " <td class=\"row-center\"><small>{2}</small></td>\n" +
+ " <td class=\"row-center\"><small>{3}</small></td>\n" +
+ " <td class=\"row-center\"><small>{4}</small></td>\n" +
+ " <td class=\"row-center\"><small>{5}</small></td>\n" +
+ "</tr>\n" +
+ "</table>\n" +
+ "<br>\n" +
+ "\n";
+
+ public static final String HTML_TAIL_SECTION =
+ "<hr size=\"1\" noshade=\"noshade\">\n" +
+ "<center><font size=\"-1\" color=\"#525D76\">\n" +
+ " <em>Copyright © 1999-2005, Apache Software Foundation</em>" +
+ "</font></center>\n" +
+ "\n" +
+ "</body>\n" +
+ "</html>";
+ public static final String CHARSET="utf-8";
+
+ public static final String XML_DECLARATION =
+ "<?xml version=\"1.0\" encoding=\""+CHARSET+"\"?>";
+
+ public static final String XML_STYLE =
+ "<?xml-stylesheet type=\"text/xsl\" href=\"/manager/xform.xsl\" ?>";
+
+}
+
Added: trunk/labs/jbossweb/src/share/classes/org/apache/catalina/manager/StatusTransformer.java
===================================================================
--- trunk/labs/jbossweb/src/share/classes/org/apache/catalina/manager/StatusTransformer.java 2005-11-23 00:01:00 UTC (rev 1625)
+++ trunk/labs/jbossweb/src/share/classes/org/apache/catalina/manager/StatusTransformer.java 2005-11-23 01:21:13 UTC (rev 1626)
@@ -0,0 +1,933 @@
+/*
+ * Copyright 1999,2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+package org.apache.catalina.manager;
+
+import java.io.PrintWriter;
+import java.lang.reflect.Method;
+import java.text.MessageFormat;
+import java.util.Date;
+import java.util.Enumeration;
+import java.util.Iterator;
+import java.util.Set;
+import java.util.Vector;
+
+import javax.servlet.http.HttpServletResponse;
+import org.apache.catalina.util.RequestUtil;
+import org.apache.tomcat.util.compat.JdkCompat;
+
+import javax.management.MBeanServer;
+import javax.management.ObjectInstance;
+import javax.management.ObjectName;
+
+/**
+ * This is a refactoring of the servlet to externalize
+ * the output into a simple class. Although we could
+ * use XSLT, that is unnecessarily complex.
+ *
+ * @author Peter Lin
+ * @version $Revision: 303967 $ $Date: 2005-06-29 19:31:56 +0200 (mer., 29 juin 2005) $
+ */
+
+public class StatusTransformer {
+
+
+ // --------------------------------------------------------- Public Methods
+
+
+ public static void setContentType(HttpServletResponse response,
+ int mode) {
+ if (mode == 0){
+ response.setContentType("text/html;charset="+Constants.CHARSET);
+ } else if (mode == 1){
+ response.setContentType("text/xml;charset="+Constants.CHARSET);
+ }
+ }
+
+
+ /**
+ * Process a GET request for the specified resource.
+ *
+ * @param request The servlet request we are processing
+ * @param response The servlet response we are creating
+ *
+ * @exception IOException if an input/output error occurs
+ * @exception ServletException if a servlet-specified error occurs
+ */
+ public static void writeHeader(PrintWriter writer, int mode) {
+ if (mode == 0){
+ // HTML Header Section
+ writer.print(Constants.HTML_HEADER_SECTION);
+ } else if (mode == 1){
+ writer.write(Constants.XML_DECLARATION);
+ writer.write
+ (Constants.XML_STYLE);
+ writer.write("<status>");
+ }
+ }
+
+
+ /**
+ * Write the header body. XML output doesn't bother
+ * to output this stuff, since it's just title.
+ *
+ * @param writer The output writer
+ * @param args What to write
+ * @param mode 0 means write
+ */
+ public static void writeBody(PrintWriter writer, Object[] args, int mode) {
+ if (mode == 0){
+ writer.print(MessageFormat.format
+ (Constants.BODY_HEADER_SECTION, args));
+ }
+ }
+
+
+ /**
+ * Write the manager webapp information.
+ *
+ * @param writer The output writer
+ * @param args What to write
+ * @param mode 0 means write
+ */
+ public static void writeManager(PrintWriter writer, Object[] args,
+ int mode) {
+ if (mode == 0){
+ writer.print(MessageFormat.format(Constants.MANAGER_SECTION, args));
+ }
+ }
+
+
+ public static void writePageHeading(PrintWriter writer, Object[] args,
+ int mode) {
+ if (mode == 0){
+ writer.print(MessageFormat.format
+ (Constants.SERVER_HEADER_SECTION, args));
+ }
+ }
+
+
+ public static void writeServerInfo(PrintWriter writer, Object[] args,
+ int mode){
+ if (mode == 0){
+ writer.print(MessageFormat.format(Constants.SERVER_ROW_SECTION, args));
+ }
+ }
+
+
+ /**
+ *
+ */
+ public static void writeFooter(PrintWriter writer, int mode) {
+ if (mode == 0){
+ // HTML Tail Section
+ writer.print(Constants.HTML_TAIL_SECTION);
+ } else if (mode == 1){
+ writer.write("</status>");
+ }
+ }
+
+
+ /**
+ * Write the OS state. Mode 0 will generate HTML.
+ * Mode 1 will generate XML.
+ */
+ public static void writeOSState(PrintWriter writer, int mode) {
+ long[] result = new long[16];
+ boolean ok = false;
+ try {
+ String methodName = "info";
+ Class paramTypes[] = new Class[1];
+ paramTypes[0] = result.getClass();
+ Object paramValues[] = new Object[1];
+ paramValues[0] = result;
+ Method method = Class.forName("org.apache.tomcat.jni.OS")
+ .getMethod(methodName, paramTypes);
+ method.invoke(null, paramValues);
+ ok = true;
+ } catch (Throwable t) {
+ // Ignore
+ }
+
+ if (ok) {
+ if (mode == 0){
+ writer.print("<h1>OS</h1>");
+
+ writer.print("<p>");
+ writer.print(" Physical memory: ");
+ writer.print(formatSize(new Long(result[0]), true));
+ writer.print(" Available memory: ");
+ writer.print(formatSize(new Long(result[1]), true));
+ writer.print(" Total page file: ");
+ writer.print(formatSize(new Long(result[2]), true));
+ writer.print(" Free page file: ");
+ writer.print(formatSize(new Long(result[3]), true));
+ writer.print(" Memory load: ");
+ writer.print(new Long(result[6]));
+ writer.print("<br>");
+ writer.print(" Process kernel time: ");
+ writer.print(formatTime(new Long(result[11] / 1000), true));
+ writer.print(" Process user time: ");
+ writer.print(formatTime(new Long(result[12] / 1000), true));
+ writer.print("</p>");
+ } else if (mode == 1){
+ }
+ }
+
+ }
+
+
+ /**
+ * Write the VM state. Mode 0 will generate HTML.
+ * Mode 1 will generate XML.
+ */
+ public static void writeVMState(PrintWriter writer, int mode)
+ throws Exception {
+
+ if (mode == 0){
+ writer.print("<h1>JVM</h1>");
+
+ writer.print("<p>");
+ writer.print(" Free memory: ");
+ writer.print(formatSize
+ (new Long(Runtime.getRuntime().freeMemory()), true));
+ writer.print(" Total memory: ");
+ writer.print(formatSize
+ (new Long(Runtime.getRuntime().totalMemory()), true));
+ writer.print(" Max memory: ");
+ writer.print(formatSize
+ (new Long(JdkCompat.getJdkCompat().getMaxMemory()),
+ true));
+ writer.print("</p>");
+ } else if (mode == 1){
+ writer.write("<jvm>");
+
+ writer.write("<memory");
+ writer.write(" free='" + Runtime.getRuntime().freeMemory() + "'");
+ writer.write(" total='" + Runtime.getRuntime().totalMemory() + "'");
+ writer.write(" max='" + JdkCompat.getJdkCompat().getMaxMemory() + "'/>");
+
+ writer.write("</jvm>");
+ }
+
+ }
+
+
+ /**
+ * Write connector state.
+ */
+ public static void writeConnectorState(PrintWriter writer,
+ ObjectName tpName, String name,
+ MBeanServer mBeanServer,
+ Vector globalRequestProcessors,
+ Vector requestProcessors,
+ int mode)
+ throws Exception {
+
+ if (mode == 0) {
+ writer.print("<h1>");
+ writer.print(name);
+ writer.print("</h1>");
+
+ writer.print("<p>");
+ writer.print(" Max threads: ");
+ writer.print(mBeanServer.getAttribute(tpName, "maxThreads"));
+ writer.print(" Min spare threads: ");
+ writer.print(mBeanServer.getAttribute(tpName, "minSpareThreads"));
+ writer.print(" Max spare threads: ");
+ writer.print(mBeanServer.getAttribute(tpName, "maxSpareThreads"));
+ writer.print(" Current thread count: ");
+ writer.print(mBeanServer.getAttribute(tpName, "currentThreadCount"));
+ writer.print(" Current thread busy: ");
+ writer.print(mBeanServer.getAttribute(tpName, "currentThreadsBusy"));
+ try {
+ Object value = mBeanServer.getAttribute(tpName, "keepAliveCount");
+ writer.print(" Keeped alive sockets count: ");
+ writer.print(value);
+ } catch (Exception e) {
+ // Ignore
+ }
+
+ writer.print("<br>");
+
+ ObjectName grpName = null;
+
+ Enumeration enumeration = globalRequestProcessors.elements();
+ while (enumeration.hasMoreElements()) {
+ ObjectName objectName = (ObjectName) enumeration.nextElement();
+ if (name.equals(objectName.getKeyProperty("name"))) {
+ grpName = objectName;
+ }
+ }
+
+ if (grpName == null) {
+ return;
+ }
+
+ writer.print(" Max processing time: ");
+ writer.print(formatTime(mBeanServer.getAttribute
+ (grpName, "maxTime"), false));
+ writer.print(" Processing time: ");
+ writer.print(formatTime(mBeanServer.getAttribute
+ (grpName, "processingTime"), true));
+ writer.print(" Request count: ");
+ writer.print(mBeanServer.getAttribute(grpName, "requestCount"));
+ writer.print(" Error count: ");
+ writer.print(mBeanServer.getAttribute(grpName, "errorCount"));
+ writer.print(" Bytes received: ");
+ writer.print(formatSize(mBeanServer.getAttribute
+ (grpName, "bytesReceived"), true));
+ writer.print(" Bytes sent: ");
+ writer.print(formatSize(mBeanServer.getAttribute
+ (grpName, "bytesSent"), true));
+ writer.print("</p>");
+
+ writer.print("<table border=\"0\"><tr><th>Stage</th><th>Time</th><th>B Sent</th><th>B Recv</th><th>Client</th><th>VHost</th><th>Request</th></tr>");
+
+ enumeration = requestProcessors.elements();
+ while (enumeration.hasMoreElements()) {
+ ObjectName objectName = (ObjectName) enumeration.nextElement();
+ if (name.equals(objectName.getKeyProperty("worker"))) {
+ writer.print("<tr>");
+ writeProcessorState(writer, objectName, mBeanServer, mode);
+ writer.print("</tr>");
+ }
+ }
+
+ writer.print("</table>");
+
+ writer.print("<p>");
+ writer.print("P: Parse and prepare request S: Service F: Finishing R: Ready K: Keepalive");
+ writer.print("</p>");
+ } else if (mode == 1){
+ writer.write("<connector name='" + name + "'>");
+
+ writer.write("<threadInfo ");
+ writer.write(" maxThreads=\"" + mBeanServer.getAttribute(tpName, "maxThreads") + "\"");
+ writer.write(" minSpareThreads=\"" + mBeanServer.getAttribute(tpName, "minSpareThreads") + "\"");
+ writer.write(" maxSpareThreads=\"" + mBeanServer.getAttribute(tpName, "maxSpareThreads") + "\"");
+ writer.write(" currentThreadCount=\"" + mBeanServer.getAttribute(tpName, "currentThreadCount") + "\"");
+ writer.write(" currentThreadsBusy=\"" + mBeanServer.getAttribute(tpName, "currentThreadsBusy") + "\"");
+ writer.write(" />");
+
+ ObjectName grpName = null;
+
+ Enumeration enumeration = globalRequestProcessors.elements();
+ while (enumeration.hasMoreElements()) {
+ ObjectName objectName = (ObjectName) enumeration.nextElement();
+ if (name.equals(objectName.getKeyProperty("name"))) {
+ grpName = objectName;
+ }
+ }
+
+ if (grpName != null) {
+
+ writer.write("<requestInfo ");
+ writer.write(" maxTime=\"" + mBeanServer.getAttribute(grpName, "maxTime") + "\"");
+ writer.write(" processingTime=\"" + mBeanServer.getAttribute(grpName, "processingTime") + "\"");
+ writer.write(" requestCount=\"" + mBeanServer.getAttribute(grpName, "requestCount") + "\"");
+ writer.write(" errorCount=\"" + mBeanServer.getAttribute(grpName, "errorCount") + "\"");
+ writer.write(" bytesReceived=\"" + mBeanServer.getAttribute(grpName, "bytesReceived") + "\"");
+ writer.write(" bytesSent=\"" + mBeanServer.getAttribute(grpName, "bytesSent") + "\"");
+ writer.write(" />");
+
+ writer.write("<workers>");
+ enumeration = requestProcessors.elements();
+ while (enumeration.hasMoreElements()) {
+ ObjectName objectName = (ObjectName) enumeration.nextElement();
+ if (name.equals(objectName.getKeyProperty("worker"))) {
+ writeProcessorState(writer, objectName, mBeanServer, mode);
+ }
+ }
+ writer.write("</workers>");
+ }
+
+ writer.write("</connector>");
+ }
+
+ }
+
+
+ /**
+ * Write processor state.
+ */
+ protected static void writeProcessorState(PrintWriter writer,
+ ObjectName pName,
+ MBeanServer mBeanServer,
+ int mode)
+ throws Exception {
+
+ Integer stageValue =
+ (Integer) mBeanServer.getAttribute(pName, "stage");
+ int stage = stageValue.intValue();
+ boolean fullStatus = true;
+ boolean showRequest = true;
+ String stageStr = null;
+
+ switch (stage) {
+
+ case (1/*org.apache.coyote.Constants.STAGE_PARSE*/):
+ stageStr = "P";
+ fullStatus = false;
+ break;
+ case (2/*org.apache.coyote.Constants.STAGE_PREPARE*/):
+ stageStr = "P";
+ fullStatus = false;
+ break;
+ case (3/*org.apache.coyote.Constants.STAGE_SERVICE*/):
+ stageStr = "S";
+ break;
+ case (4/*org.apache.coyote.Constants.STAGE_ENDINPUT*/):
+ stageStr = "F";
+ break;
+ case (5/*org.apache.coyote.Constants.STAGE_ENDOUTPUT*/):
+ stageStr = "F";
+ break;
+ case (7/*org.apache.coyote.Constants.STAGE_ENDED*/):
+ stageStr = "R";
+ fullStatus = false;
+ break;
+ case (6/*org.apache.coyote.Constants.STAGE_KEEPALIVE*/):
+ stageStr = "K";
+ fullStatus = true;
+ showRequest = false;
+ break;
+ case (0/*org.apache.coyote.Constants.STAGE_NEW*/):
+ stageStr = "R";
+ fullStatus = false;
+ break;
+ default:
+ // Unknown stage
+ stageStr = "?";
+ fullStatus = false;
+
+ }
+
+ if (mode == 0) {
+ writer.write("<td><strong>");
+ writer.write(stageStr);
+ writer.write("</strong></td>");
+
+ if (fullStatus) {
+ writer.write("<td>");
+ writer.print(formatTime(mBeanServer.getAttribute
+ (pName, "requestProcessingTime"), false));
+ writer.write("</td>");
+ writer.write("<td>");
+ if (showRequest) {
+ writer.print(formatSize(mBeanServer.getAttribute
+ (pName, "requestBytesSent"), false));
+ } else {
+ writer.write("?");
+ }
+ writer.write("</td>");
+ writer.write("<td>");
+ if (showRequest) {
+ writer.print(formatSize(mBeanServer.getAttribute
+ (pName, "requestBytesReceived"),
+ false));
+ } else {
+ writer.write("?");
+ }
+ writer.write("</td>");
+ writer.write("<td>");
+ writer.print(filter(mBeanServer.getAttribute
+ (pName, "remoteAddr")));
+ writer.write("</td>");
+ writer.write("<td nowrap>");
+ writer.write(filter(mBeanServer.getAttribute
+ (pName, "virtualHost")));
+ writer.write("</td>");
+ writer.write("<td nowrap>");
+ if (showRequest) {
+ writer.write(filter(mBeanServer.getAttribute
+ (pName, "method")));
+ writer.write(" ");
+ writer.write(filter(mBeanServer.getAttribute
+ (pName, "currentUri")));
+ String queryString = (String) mBeanServer.getAttribute
+ (pName, "currentQueryString");
+ if ((queryString != null) && (!queryString.equals(""))) {
+ writer.write("?");
+ writer.print(RequestUtil.filter(queryString));
+ }
+ writer.write(" ");
+ writer.write(filter(mBeanServer.getAttribute
+ (pName, "protocol")));
+ } else {
+ writer.write("?");
+ }
+ writer.write("</td>");
+ } else {
+ writer.write("<td>?</td><td>?</td><td>?</td><td>?</td><td>?</td><td>?</td>");
+ }
+ } else if (mode == 1){
+ writer.write("<worker ");
+ writer.write(" stage=\"" + stageStr + "\"");
+
+ if (fullStatus) {
+ writer.write(" requestProcessingTime=\""
+ + mBeanServer.getAttribute
+ (pName, "requestProcessingTime") + "\"");
+ writer.write(" requestBytesSent=\"");
+ if (showRequest) {
+ writer.write("" + mBeanServer.getAttribute
+ (pName, "requestBytesSent"));
+ } else {
+ writer.write("0");
+ }
+ writer.write("\"");
+ writer.write(" requestBytesReceived=\"");
+ if (showRequest) {
+ writer.write("" + mBeanServer.getAttribute
+ (pName, "requestBytesReceived"));
+ } else {
+ writer.write("0");
+ }
+ writer.write("\"");
+ writer.write(" remoteAddr=\""
+ + filter(mBeanServer.getAttribute
+ (pName, "remoteAddr")) + "\"");
+ writer.write(" virtualHost=\""
+ + filter(mBeanServer.getAttribute
+ (pName, "virtualHost")) + "\"");
+
+ if (showRequest) {
+ writer.write(" method=\""
+ + filter(mBeanServer.getAttribute
+ (pName, "method")) + "\"");
+ writer.write(" currentUri=\""
+ + filter(mBeanServer.getAttribute
+ (pName, "currentUri")) + "\"");
+
+ String queryString = (String) mBeanServer.getAttribute
+ (pName, "currentQueryString");
+ if ((queryString != null) && (!queryString.equals(""))) {
+ writer.write(" currentQueryString=\""
+ + RequestUtil.filter(queryString) + "\"");
+ } else {
+ writer.write(" currentQueryString=\"?\"");
+ }
+ writer.write(" protocol=\""
+ + filter(mBeanServer.getAttribute
+ (pName, "protocol")) + "\"");
+ } else {
+ writer.write(" method=\"?\"");
+ writer.write(" currentUri=\"?\"");
+ writer.write(" currentQueryString=\"?\"");
+ writer.write(" protocol=\"?\"");
+ }
+ } else {
+ writer.write(" requestProcessingTime=\"0\"");
+ writer.write(" requestBytesSent=\"0\"");
+ writer.write(" requestBytesRecieved=\"0\"");
+ writer.write(" remoteAddr=\"?\"");
+ writer.write(" virtualHost=\"?\"");
+ writer.write(" method=\"?\"");
+ writer.write(" currentUri=\"?\"");
+ writer.write(" currentQueryString=\"?\"");
+ writer.write(" protocol=\"?\"");
+ }
+ writer.write(" />");
+ }
+
+ }
+
+
+ /**
+ * Write applications state.
+ */
+ public static void writeDetailedState(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("<p>");
+ int count = 0;
+ Iterator iterator = hostsON.iterator();
+ while (iterator.hasNext()) {
+ ObjectName contextON = (ObjectName) iterator.next();
+ String webModuleName = contextON.getKeyProperty("name");
+ if (webModuleName.startsWith("//")) {
+ webModuleName = webModuleName.substring(2);
+ }
+ int slash = webModuleName.indexOf("/");
+ if (slash == -1) {
+ count++;
+ continue;
+ }
+
+ writer.print("<a href=\"#" + (count++) + ".0\">");
+ writer.print(webModuleName);
+ writer.print("</a>");
+ if (iterator.hasNext()) {
+ writer.print("<br>");
+ }
+
+ }
+ 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
+ }
+
+ }
+
+
+ /**
+ * Write context state.
+ */
+ protected static void writeContext(PrintWriter writer,
+ ObjectName objectName,
+ MBeanServer mBeanServer, int mode)
+ throws Exception {
+
+ if (mode == 0){
+ String webModuleName = objectName.getKeyProperty("name");
+ String name = webModuleName;
+ if (name == null) {
+ return;
+ }
+
+ String hostName = null;
+ String contextName = null;
+ if (name.startsWith("//")) {
+ name = name.substring(2);
+ }
+ int slash = name.indexOf("/");
+ if (slash != -1) {
+ hostName = name.substring(0, slash);
+ contextName = name.substring(slash);
+ } else {
+ return;
+ }
+
+ ObjectName queryManager = new ObjectName
+ (objectName.getDomain() + ":type=Manager,path=" + contextName
+ + ",host=" + hostName + ",*");
+ Set managersON = mBeanServer.queryNames(queryManager, null);
+ ObjectName managerON = null;
+ Iterator iterator2 = managersON.iterator();
+ while (iterator2.hasNext()) {
+ managerON = (ObjectName) iterator2.next();
+ }
+
+ ObjectName queryJspMonitor = new ObjectName
+ (objectName.getDomain() + ":type=JspMonitor,WebModule=" +
+ webModuleName + ",*");
+ Set jspMonitorONs = mBeanServer.queryNames(queryJspMonitor, null);
+
+ // Special case for the root context
+ if (contextName.equals("/")) {
+ contextName = "";
+ }
+
+ writer.print("<h1>");
+ writer.print(name);
+ writer.print("</h1>");
+ writer.print("</a>");
+
+ writer.print("<p>");
+ Object startTime = mBeanServer.getAttribute(objectName,
+ "startTime");
+ writer.print(" Start time: " +
+ new Date(((Long) startTime).longValue()));
+ writer.print(" Startup time: ");
+ writer.print(formatTime(mBeanServer.getAttribute
+ (objectName, "startupTime"), false));
+ writer.print(" TLD scan time: ");
+ writer.print(formatTime(mBeanServer.getAttribute
+ (objectName, "tldScanTime"), false));
+ if (managerON != null) {
+ writeManager(writer, managerON, mBeanServer, mode);
+ }
+ if (jspMonitorONs != null) {
+ writeJspMonitor(writer, jspMonitorONs, mBeanServer, mode);
+ }
+ writer.print("</p>");
+
+ String onStr = objectName.getDomain()
+ + ":j2eeType=Servlet,WebModule=" + webModuleName + ",*";
+ ObjectName servletObjectName = new ObjectName(onStr);
+ Set set = mBeanServer.queryMBeans(servletObjectName, null);
+ Iterator iterator = set.iterator();
+ while (iterator.hasNext()) {
+ ObjectInstance oi = (ObjectInstance) iterator.next();
+ writeWrapper(writer, oi.getObjectName(), mBeanServer, mode);
+ }
+
+ } else if (mode == 1){
+ // for now we don't write out the context in XML
+ }
+
+ }
+
+
+ /**
+ * Write detailed information about a manager.
+ */
+ public static void writeManager(PrintWriter writer, ObjectName objectName,
+ MBeanServer mBeanServer, int mode)
+ throws Exception {
+
+ if (mode == 0) {
+ writer.print("<br>");
+ writer.print(" Active sessions: ");
+ writer.print(mBeanServer.getAttribute
+ (objectName, "activeSessions"));
+ writer.print(" Session count: ");
+ writer.print(mBeanServer.getAttribute
+ (objectName, "sessionCounter"));
+ writer.print(" Max active sessions: ");
+ writer.print(mBeanServer.getAttribute(objectName, "maxActive"));
+ writer.print(" Rejected session creations: ");
+ writer.print(mBeanServer.getAttribute
+ (objectName, "rejectedSessions"));
+ writer.print(" Expired sessions: ");
+ writer.print(mBeanServer.getAttribute
+ (objectName, "expiredSessions"));
+ writer.print(" Longest session alive time: ");
+ writer.print(formatSeconds(mBeanServer.getAttribute(
+ objectName,
+ "sessionMaxAliveTime")));
+ writer.print(" Average session alive time: ");
+ writer.print(formatSeconds(mBeanServer.getAttribute(
+ objectName,
+ "sessionAverageAliveTime")));
+ writer.print(" Processing time: ");
+ writer.print(formatTime(mBeanServer.getAttribute
+ (objectName, "processingTime"), false));
+ } else if (mode == 1) {
+ // for now we don't write out the wrapper details
+ }
+
+ }
+
+
+ /**
+ * Write JSP monitoring information.
+ */
+ public static void writeJspMonitor(PrintWriter writer,
+ Set jspMonitorONs,
+ MBeanServer mBeanServer,
+ int mode)
+ throws Exception {
+
+ int jspCount = 0;
+ int jspReloadCount = 0;
+
+ Iterator iter = jspMonitorONs.iterator();
+ while (iter.hasNext()) {
+ ObjectName jspMonitorON = (ObjectName) iter.next();
+ Object obj = mBeanServer.getAttribute(jspMonitorON, "jspCount");
+ jspCount += ((Integer) obj).intValue();
+ obj = mBeanServer.getAttribute(jspMonitorON, "jspReloadCount");
+ jspReloadCount += ((Integer) obj).intValue();
+ }
+
+ if (mode == 0) {
+ writer.print("<br>");
+ writer.print(" JSPs loaded: ");
+ writer.print(jspCount);
+ writer.print(" JSPs reloaded: ");
+ writer.print(jspReloadCount);
+ } else if (mode == 1) {
+ // for now we don't write out anything
+ }
+ }
+
+
+ /**
+ * Write detailed information about a wrapper.
+ */
+ public static void writeWrapper(PrintWriter writer, ObjectName objectName,
+ MBeanServer mBeanServer, int mode)
+ throws Exception {
+
+ if (mode == 0) {
+ String servletName = objectName.getKeyProperty("name");
+
+ String[] mappings = (String[])
+ mBeanServer.invoke(objectName, "findMappings", null, null);
+
+ writer.print("<h2>");
+ writer.print(servletName);
+ if ((mappings != null) && (mappings.length > 0)) {
+ writer.print(" [ ");
+ for (int i = 0; i < mappings.length; i++) {
+ writer.print(mappings[i]);
+ if (i < mappings.length - 1) {
+ writer.print(" , ");
+ }
+ }
+ writer.print(" ] ");
+ }
+ writer.print("</h2>");
+
+ writer.print("<p>");
+ writer.print(" Processing time: ");
+ writer.print(formatTime(mBeanServer.getAttribute
+ (objectName, "processingTime"), true));
+ writer.print(" Max time: ");
+ writer.print(formatTime(mBeanServer.getAttribute
+ (objectName, "maxTime"), false));
+ writer.print(" Request count: ");
+ writer.print(mBeanServer.getAttribute(objectName, "requestCount"));
+ writer.print(" Error count: ");
+ writer.print(mBeanServer.getAttribute(objectName, "errorCount"));
+ writer.print(" Load time: ");
+ writer.print(formatTime(mBeanServer.getAttribute
+ (objectName, "loadTime"), false));
+ writer.print(" Classloading time: ");
+ writer.print(formatTime(mBeanServer.getAttribute
+ (objectName, "classLoadTime"), false));
+ writer.print("</p>");
+ } else if (mode == 1){
+ // for now we don't write out the wrapper details
+ }
+
+ }
+
+
+ /**
+ * Filter the specified message string for characters that are sensitive
+ * in HTML. This avoids potential attacks caused by including JavaScript
+ * codes in the request URL that is often reported in error messages.
+ *
+ * @param obj The message string to be filtered
+ */
+ public static String filter(Object obj) {
+
+ if (obj == null)
+ return ("?");
+ String message = obj.toString();
+
+ char content[] = new char[message.length()];
+ message.getChars(0, message.length(), content, 0);
+ StringBuffer result = new StringBuffer(content.length + 50);
+ for (int i = 0; i < content.length; i++) {
+ switch (content[i]) {
+ case '<':
+ result.append("<");
+ break;
+ case '>':
+ result.append(">");
+ break;
+ case '&':
+ result.append("&");
+ break;
+ case '"':
+ result.append(""");
+ break;
+ default:
+ result.append(content[i]);
+ }
+ }
+ return (result.toString());
+
+ }
+
+
+ /**
+ * Display the given size in bytes, either as KB or MB.
+ *
+ * @param mb true to display megabytes, false for kilobytes
+ */
+ public static String formatSize(Object obj, boolean mb) {
+
+ long bytes = -1L;
+
+ if (obj instanceof Long) {
+ bytes = ((Long) obj).longValue();
+ } else if (obj instanceof Integer) {
+ bytes = ((Integer) obj).intValue();
+ }
+
+ if (mb) {
+ long mbytes = bytes / (1024 * 1024);
+ long rest =
+ ((bytes - (mbytes * (1024 * 1024))) * 100) / (1024 * 1024);
+ return (mbytes + "." + ((rest < 10) ? "0" : "") + rest + " MB");
+ } else {
+ return ((bytes / 1024) + " KB");
+ }
+
+ }
+
+
+ /**
+ * Display the given time in ms, either as ms or s.
+ *
+ * @param seconds true to display seconds, false for milliseconds
+ */
+ public static String formatTime(Object obj, boolean seconds) {
+
+ long time = -1L;
+
+ if (obj instanceof Long) {
+ time = ((Long) obj).longValue();
+ } else if (obj instanceof Integer) {
+ time = ((Integer) obj).intValue();
+ }
+
+ if (seconds) {
+ return ((((float) time ) / 1000) + " s");
+ } else {
+ return (time + " ms");
+ }
+ }
+
+
+ /**
+ * Formats the given time (given in seconds) as a string.
+ *
+ * @param obj Time object to be formatted as string
+ *
+ * @return String formatted time
+ */
+ public static String formatSeconds(Object obj) {
+
+ long time = -1L;
+
+ if (obj instanceof Long) {
+ time = ((Long) obj).longValue();
+ } else if (obj instanceof Integer) {
+ time = ((Integer) obj).intValue();
+ }
+
+ return (time + " s");
+ }
+
+}
Modified: trunk/labs/jbossweb/src/share/classes/org/apache/catalina/util/ServerInfo.properties
===================================================================
--- trunk/labs/jbossweb/src/share/classes/org/apache/catalina/util/ServerInfo.properties 2005-11-23 00:01:00 UTC (rev 1625)
+++ trunk/labs/jbossweb/src/share/classes/org/apache/catalina/util/ServerInfo.properties 2005-11-23 01:21:13 UTC (rev 1626)
@@ -1,3 +1,3 @@
-server.info=Apache Tomcat/@VERSION@
+server.info=JBoss Web/@VERSION@
server.number=@VERSION_NUMBER@
server.built=@VERSION_BUILT@
\ No newline at end of file
|
