[prev in list] [next in list] [prev in thread] [next in thread] 

List:       jboss-cvs-commits
Subject:    [jboss-cvs] contrib/varia/src/resources/jmx/html     ...
From:       Elias Ross <genman () noderunner ! net>
Date:       2006-02-28 20:08:17
Message-ID: E1FEB8r-0001KW-SN () committer01 ! frg ! pub ! inap ! atl ! jboss ! com
[Download RAW message or body]

  User: genman  
  Date: 06/02/28 15:08:17

  Modified:    varia/src/resources/jmx/html     displayMBeans.jsp
                        displayOpResult.jsp inspectMBean.jsp
                        style_master.css
  Log:
  JBAS-2289 -- Port JMX console from 3.2 to HEAD, eventually will go to 4.0
  
  Revision  Changes    Path
  1.13      +31 -29    contrib/varia/src/resources/jmx/html/displayMBeans.jsp
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: displayMBeans.jsp
  ===================================================================
  RCS file: /cvsroot/jboss/contrib/varia/src/resources/jmx/html/displayMBeans.jsp,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -b -r1.12 -r1.13
  --- displayMBeans.jsp	27 Aug 2003 04:34:20 -0000	1.12
  +++ displayMBeans.jsp	28 Feb 2006 20:08:17 -0000	1.13
  @@ -1,18 +1,18 @@
  +<?xml version="1.0"?>
   <%@page contentType="text/html"
      import="java.net.*,java.util.*,org.jboss.jmx.adaptor.model.*,java.io.*"
   %>
  +<!DOCTYPE html 
  +    PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
  +    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
   <html>
   <head>
      <title>JBoss JMX Management Console</title>
  -   <link rel="stylesheet" href="style_master.css" type="text/css">
  -   <meta http-equiv="cache-control" content="no-cache">
  +   <link rel="stylesheet" href="style_master.css" type="text/css" />
  +   <meta http-equiv="cache-control" content="no-cache" />
   </head>
   <body>
  -<table width="100%">
  -   <table>
  -      <tr>
  -         <td><img src="images/logo.gif" align="left" border="0" alt="JBoss"></td>
  -         <td valign="middle">
  +   <img src="images/logo.gif" align="right" border="0" alt="logo" />
            <%
            String hostname = "";
            try
  @@ -21,22 +21,24 @@
            }
            catch(IOException e)  {}
            %>
  -         <h1>JMX Agent View <code><%= hostname %></code></h1>
  -         </td>
  -      </tr>
  -   </table>
  -<hr>
  +   <h1>JMX Agent View</h1>
  +   <h3><%= hostname %></h3>
  +
   <form action="HtmlAdaptor?action=displayMBeans" method="post" name="applyFilter" \
                id="applyFilter">
  -ObjectName Filter (e.g. "jboss:*", "*:service=invoker,*")  :<input type="text" \
name="filter" size="40" value="<%= request.getAttribute("filter")%>"> <input \
                type="submit" name="apply" value="ApplyFilter">
  -</form>
  -<hr>
  +ObjectName Filter (e.g. "jboss:*", "*:service=invoker,*"): <br />
  +<input type="text" name="filter" size="40" value="<%= \
request.getAttribute("filter")%>" />  +  <br/>
  +<input type="submit" name="apply" value="Apply Filter" />
  +<input type="button" onClick="javascript:location='HtmlAdaptor?filter='" \
value="Clear Filter" />  +
   <%
  -   Iterator mbeans = (Iterator) request.getAttribute("mbeans");
  -   while( mbeans.hasNext() )
  +   for ( Iterator mbeans = (Iterator) request.getAttribute("mbeans"); \
mbeans.hasNext(); )  {
         DomainData domainData = (DomainData) mbeans.next();
   %>
  -   <h2 class='DomainName'><%= domainData.getDomainName() %></h2>
  +   <h2 class='DomainName'>
  +   <a href="javascript:document.applyFilter.filter.value='<%= \
domainData.getDomainName() %>:*';document.applyFilter.submit()"><%= \
domainData.getDomainName() %></a>  +   </h2>
      <ul class='MBeanList'>
   <%
         MBeanData[] data = domainData.getData();
  @@ -45,7 +47,7 @@
            String name = data[d].getObjectName().toString();
            String properties = data[d].getNameProperties();
   %>
  -      <li><a href="HtmlAdaptor?action=inspectMBean&name=<%= \
URLEncoder.encode(name) %>"><%= URLDecoder.decode(properties) %></a></li>  +      \
<li><a href="HtmlAdaptor?action=inspectMBean&amp;name=<%= URLEncoder.encode(name) \
%>"><%= URLDecoder.decode(properties) %></a></li>  <%
         }
   %>
  @@ -53,7 +55,7 @@
   <%
      }
   %>
  -</td></tr>
  -</table>
  +
  +</form>
   </body>
   </html>
  
  
  
  1.9       +39 -33    contrib/varia/src/resources/jmx/html/displayOpResult.jsp
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: displayOpResult.jsp
  ===================================================================
  RCS file: /cvsroot/jboss/contrib/varia/src/resources/jmx/html/displayOpResult.jsp,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -b -r1.8 -r1.9
  --- displayOpResult.jsp	16 Mar 2004 06:02:42 -0000	1.8
  +++ displayOpResult.jsp	28 Feb 2006 20:08:17 -0000	1.9
  @@ -1,53 +1,52 @@
  +<?xml version="1.0"?>
   <%@page contentType="text/html"
  -   import="java.net.*"
  +   import="java.net.*,
  +   		   java.beans.PropertyEditor,
  +   		   org.jboss.util.propertyeditor.PropertyEditors"
   %>
  +
  +<!DOCTYPE html 
  +    PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
  +    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
  +
   <html>
   <head>
      <title>Operation Results</title>
  -   <link rel="stylesheet" href="style_master.css" type="text/css">
  -   <meta http-equiv="cache-control" content="no-cache">
  +   <link rel="stylesheet" href="style_master.css" type="text/css" />
  +   <meta http-equiv="cache-control" content="no-cache" />
   </head>
   <body>
   
   <jsp:useBean id='opResultInfo' type='org.jboss.jmx.adaptor.control.OpResultInfo' \
scope='request'/>  
  -<table width="100%">
  -   <table>
  -      <tr>
  -         <td><img src="images/logo.gif" align="left" border="0" alt="JBoss"></td>
  -         <td valign="middle"><h1>JMX MBean Operation Result <code><%= \
                opResultInfo.name%>()</code></h1></td>
  -	  <tr/>
  -   </table>
  -
  -<tr><td>
  -
  -
  -<table cellpadding="5">
  -   <tr>
  -      <td><a href='HtmlAdaptor?action=displayMBeans'>Back to Agent View</a></td>
  -      <td>
  -      <td><a href='HtmlAdaptor?action=inspectMBean&name=<%= \
                URLEncoder.encode(request.getParameter("name")) %>'>Back to MBean \
                View</a></td>
  -      <td>
  -      <td><a href=
  +         <img src="images/logo.gif" align="right" border="0" alt="logo" />
  +         <h1>JMX MBean Operation Result</h1>
  +         <h3><%= request.getParameter("name") %></h3>
  +         <h3>Operation <code><%= opResultInfo.name%>()</code></h3>
  +
  +<p>
  +<a href='HtmlAdaptor?action=displayMBeans'>Back to Agent View</a>
  +&emsp;
  +<a href='HtmlAdaptor?action=inspectMBean&amp;name=<%= \
URLEncoder.encode(request.getParameter("name")) %>'>Back to MBean View</a>  +&emsp;
  +<a href=
   <%
   	out.print("'HtmlAdaptor?action=invokeOpByName");
  -	out.print("&name=" + URLEncoder.encode(request.getParameter("name")));
  -	out.print("&methodName=" + opResultInfo.name );
  +	out.print("&amp;name=" + URLEncoder.encode(request.getParameter("name")));
  +	out.print("&amp;methodName=" + opResultInfo.name );
   
   	for (int i=0; i<opResultInfo.args.length; i++)
       {
  -		out.print("&argType=" + opResultInfo.signature[i]);
  -		out.print("&arg" + i + "=" + opResultInfo.args[i]);
  +		out.print("&amp;argType=" + opResultInfo.signature[i]);
  +		out.print("&amp;arg" + i + "=" + opResultInfo.args[i]);
   	}
   
   	out.println("'>Reinvoke MBean Operation");
   %>
  -	  </a></td>
  -   </tr>
  -</table>
  -
  +</a>
  +</p>
   
  -<hr>
  +<hr />
      <span class='OpResult'>
   <%
      if( opResultInfo.result == null )
  @@ -58,7 +57,16 @@
      }
      else
      {
  -      String opResultString = opResultInfo.result.toString();
  +      String opResultString = null;
  +      
  +      PropertyEditor propertyEditor = \
PropertyEditors.findEditor(opResultInfo.result.getClass());  +      if(propertyEditor \
!= null) {  +         propertyEditor.setValue(opResultInfo.result);
  +         opResultString = propertyEditor.getAsText();
  +      } else {
  +         opResultString = opResultInfo.result.toString();
  +      }
  +
         boolean hasPreTag = opResultString.startsWith("<pre>");
         if( hasPreTag == false )
            out.println("<pre>");
  @@ -68,7 +76,5 @@
      }
   %>
      </span>
  -</td></tr>
  -</table>
   </body>
   </html>
  
  
  
  1.24      +198 -117  contrib/varia/src/resources/jmx/html/inspectMBean.jsp
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: inspectMBean.jsp
  ===================================================================
  RCS file: /cvsroot/jboss/contrib/varia/src/resources/jmx/html/inspectMBean.jsp,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -b -r1.23 -r1.24
  --- inspectMBean.jsp	19 Nov 2005 04:20:55 -0000	1.23
  +++ inspectMBean.jsp	28 Feb 2006 20:08:17 -0000	1.24
  @@ -1,12 +1,36 @@
  +<?xml version="1.0"?>
   <%@page contentType="text/html"
      import="java.net.*,java.util.*,javax.management.*,javax.management.modelmbean.*,
  org.jboss.jmx.adaptor.control.Server,
      org.jboss.jmx.adaptor.control.AttrResultInfo,
      org.jboss.jmx.adaptor.model.*,
  +   org.dom4j.io.HTMLWriter,
  +   org.dom4j.tree.FlyweightCDATA,
      java.lang.reflect.Array,
  -           org.jboss.util.propertyeditor.PropertyEditors"
  +           java.io.StringWriter"
   %>
   <%!
  +    private static final Comparator MBEAN_FEATURE_INFO_COMPARATOR = new \
Comparator()  +    {
  +      public int compare(Object value1, Object value2)
  +      {
  +        MBeanFeatureInfo featureInfo1 = (MBeanFeatureInfo) value1;
  +        MBeanFeatureInfo featureInfo2 = (MBeanFeatureInfo) value2;
  +
  +        String name1 = featureInfo1.getName();
  +        String name2 = featureInfo2.getName();
  +
  +        return name1.compareTo(name2);
  +      }
  +
  +      public boolean equals(Object other)
  +      {
  +        return this == other;
  +      }
  +    };
  +
  +    String sep = System.getProperty("line.separator", "\n");
  +
      public String fixDescription(String desc)
      {
         if (desc == null || desc.equals(""))
  @@ -15,12 +39,37 @@
         }
         return desc;
      }
  +
  +   public String fixValue(Object value)
  +   {
  +      if (value == null)
  +         return null;
  +      String s = String.valueOf(value);
  +      StringWriter sw = new StringWriter();
  +      HTMLWriter hw = new HTMLWriter(sw);
  +      try
  +      {
  +         // hw.write(s); // strips whitespace
  +         hw.write(new FlyweightCDATA(s));
  +         s = sw.toString();
  +      }
  +      catch(Exception e)
  +      {
  +      }
  +      return s;
  +   }
  +
   %>
  +
  +<!DOCTYPE html 
  +    PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
  +    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
  +
   <html>
   <head>
      <title>MBean Inspector</title>
  -   <link rel="stylesheet" href="style_master.css" type="text/css">
  -   <meta http-equiv="cache-control" content="no-cache">
  +   <link rel="stylesheet" href="style_master.css" type="text/css" />
  +   <meta http-equiv="cache-control" content="no-cache" />
   </head>
   <body>
   
  @@ -29,65 +78,81 @@
   <%
      ObjectName objectName = mbeanData.getObjectName();
      String objectNameString = mbeanData.getName();
  +
      MBeanInfo mbeanInfo = mbeanData.getMetaData();
  +
      MBeanAttributeInfo[] attributeInfo = mbeanInfo.getAttributes();
      MBeanOperationInfo[] operationInfo = mbeanInfo.getOperations();
  +
  +   Arrays.sort(attributeInfo, MBEAN_FEATURE_INFO_COMPARATOR);
  +
  +   HashMap operationInfoIndexMap = new HashMap();
  +   for (int a = 0; a < operationInfo.length; a++)
  +   {
  +      MBeanOperationInfo opInfo = operationInfo[a];
  +      operationInfoIndexMap.put(opInfo, String.valueOf(a));
  +   }
  +
  +   Arrays.sort(operationInfo, MBEAN_FEATURE_INFO_COMPARATOR);
   %>
   
  -<table width="100%">
  -   <table>
  -      <tr>
  -         <td><img src="images/logo.gif" align="left" border="0" alt="JBoss"></td>
  -         <td valign="middle"><h1>JMX MBean View</h1></td>
  -      <tr/>
  -   </table>
  -   <ul>
  -   <table>
  +<img src="images/logo.gif" align="right" border="0" alt="" />
  +
  +<h1>JMX MBean View</h1>
  +
  +<h3><%= objectNameString %></h3>
  +
  +<%
  +   Hashtable properties = objectName.getKeyPropertyList();
  +   int size = properties.keySet().size();
  +%>
  +   <table class="ObjectName" cellspacing="0" cellpadding="5">
         <tr>
  -         <td>MBean Name:</td>
  -         <td><b>Domain Name:</b></td>
  -         <td><%= objectName.getDomain() %></td>
  +      <td class="nameh" rowspan="<%= size + 1 %>">Name</td>
  +      <td class='sep'>Domain</td>
  +      <td class='sep'><%= objectName.getDomain() %></td>
         </tr>
   <%
  -   Hashtable properties = objectName.getKeyPropertyList();
      Iterator it = properties.keySet().iterator();
      while( it.hasNext() )
      {
         String key = (String) it.next();
         String value = (String) properties.get( key );
   %>
  -      <tr><td></td><td><b><%= key %>: </b></td><td><%= value %></td></tr>
  +   <tr>
  +      <td class='sep'><%= key %></td>
  +      <td class='sep'><%= value %></td>
  +   </tr>
   <%
      }
   %>
  -      <tr><td>MBean Java Class:</td><td colspan="3"><jsp:getProperty \
                name='mbeanData' property='className'/></td></tr>
  -   </table>
  -</ul>
  -<table cellpadding="5">
      <tr>
  -      <td><a href='HtmlAdaptor?action=displayMBeans'>Back to Agent View</a></td>
  -	  <td>
  -      <td><a href='HtmlAdaptor?action=inspectMBean&name=<%= \
URLEncoder.encode(request.getParameter("name")) %>'>Refresh MBean View</a></td>  +    \
<td class='nameh'>Java Class</td>  +      <td colspan="3"><jsp:getProperty \
name='mbeanData' property='className'/></td></tr>  +      <tr><td \
class='nameh'>Description</td>  +      <td colspan="3" class="adescription">
  +         <%= fixDescription(mbeanInfo.getDescription())%>
  +      </td>
      </tr>
   </table>
   
  -<hr>
  -<h3>MBean description:</h3>
  -<%= fixDescription(mbeanInfo.getDescription())%>
  -
  -<hr>
  -<h3>List of MBean attributes:</h3>
  +<p>
  +<a href='HtmlAdaptor?action=displayMBeans'>Back to Agent View</a>
  +&emsp;
  +<a href='HtmlAdaptor?action=inspectMBean&amp;name=<%= \
URLEncoder.encode(request.getParameter("name")) %>'>Refresh MBean View</a>  +</p>
   
   <form method="post" action="HtmlAdaptor">
  -   <input type="hidden" name="action" value="updateAttributes">
  -   <input type="hidden" name="name" value="<%= objectNameString %>">
  -	<table cellspacing="1" cellpadding="1" border="1">
  +   <input type="hidden" name="action" value="updateAttributes" />
  +   <input type="hidden" name="name" value="<%= objectNameString %>" />
  +   <table class="AttributesClass" cellspacing="0" cellpadding="5">
   		<tr class="AttributesHeader">
  -		    <th>Name</th>
  -		    <th>Type</th>
  -		    <th>Access</th>
  -		    <th>Value</th>
  -		    <th>Description</th>
  +      <th width="25%">
  +         <span class='aname'>Attribute Name</span> <span \
class='aaccess'>(Access)</span><br/>  +         <span class='atype'>Type</span> <br/>
  +         <span class='adescription'>Description</span> <br/>
  +      </th>
  +      <th width="75%" class='aname'>Attribute Value</th>
   		</tr>
   <%
      boolean hasWriteable = false;
  @@ -109,43 +174,47 @@
         String attrDescription = fixDescription(attrInfo.getDescription());
   %>
   		<tr>
  -		    <td><%= attrName %></td>
  -		    <td><%= attrType %></td>
  -		    <td><%= access %></td>
  -          <td>
  +		  <td class='sep'>
  +           <span class='aname'><%= attrName %></span> <span class='aaccess'>(<%= \
access %>)</span> <br/>  +           <span class='atype'><%= attrType %></span> <br/>
  +           <span class='adescription'><%= attrDescription %></span> <br/>
  +        </td>
  +        <td class='sep'>
   <%
         if( attrInfo.isWritable() )
         {
  -         String readonly = attrResult.editor == null ? "readonly" : "";
  +         String readonly = attrResult.editor == null ? "readonly='readonly'" : "";
            if( attrType.equals("boolean") || attrType.equals("java.lang.Boolean") )
            {
               // Boolean true/false radio boxes
  -            Boolean value = attrValue == null || "".equals( attrValue ) ? null : \
                Boolean.valueOf(attrValue);
  -            String trueChecked = (value == Boolean.TRUE ? "checked" : "");
  -            String falseChecked = (value == Boolean.FALSE ? "checked" : "");
  -            String naChecked = value == null ? "checked" : "";
  +            Boolean value = Boolean.valueOf(attrValue);
  +            String trueChecked = (value == Boolean.TRUE ? "checked='checked'" : \
"");  +            String falseChecked = (value == Boolean.FALSE ? \
"checked='checked'" : "");  %>
  -            <input type="radio" name="<%= attrName %>" value="True" \
                <%=trueChecked%>>True
  -            <input type="radio" name="<%= attrName %>" value="False" \
<%=falseChecked%>>False  +            <input type="radio" name="<%= attrName %>" \
value="True" <%=trueChecked%>/>True  +            <input type="radio" name="<%= \
attrName %>" value="False" <%=falseChecked%>/>False  <%
  -            // For wrappers, enable a 'null' selection
  -            if ( attrType.equals( "java.lang.Boolean" ) && \
                PropertyEditors.isNullHandlingEnabled() ) {
  -%>
  -                <input type="radio" name="<%= attrName %>" value="" \
                <%=naChecked%>>Null
  -<%
  -            }
            }
            else if( attrInfo.isReadable() )
            {  // Text fields for read-write string values
  +            attrValue = fixValue(attrValue);
  +            if (String.valueOf(attrValue).indexOf(sep) == -1)
  +            {
   %>
  -          <input type="text" name="<%= attrName %>" value="<%= (attrValue != null \
                ? attrValue : "") %>" <%= readonly %>>
  -
  +            <input class="iauto" type="text" name="<%= attrName %>" value="<%= \
attrValue %>" <%= readonly %>/>  +<%
  +            }
  +            else
  +            {
  +%>
  +            <textarea cols="80" rows="10" nowrap='nowrap' type="text" name="<%= \
attrName %>" <%= readonly %>><%= attrValue %></textarea>  <%
            }
  +         }
            else
            {  // Empty text fields for write-only
   %>
  -		    <input type="text" name="<%= attrName %>" <%= readonly %>>
  +		    <input class="iauto" type="text" name="<%= attrName %>" <%= readonly %>/>
   <%
            }
         }
  @@ -158,37 +227,26 @@
               if( names != null )
               {
   %>
  -                  <table>
   <%
                  for( int i = 0; i < names.length; i++ )
                  {
   %>
  -                  <tr><td>
  -                  <a href="HtmlAdaptor?action=inspectMBean&name=<%= \
                URLEncoder.encode(( names[ i ] + "" )) %>"><%= ( names[ i ] + "" ) \
                %></a>
  -                  </td></tr>
  +                  <a href="HtmlAdaptor?action=inspectMBean&amp;name=<%= \
URLEncoder.encode(( names[ i ] + "" )) %>"><%= ( names[ i ] + "" ) %></a>  +          \
<br />  <%
                  }
  -%>
  -                  </table>
  -<%
               }
            }
            // Array of some objects
  -         else if( attrType.endsWith("[]") || attrType.startsWith("[L") )
  +         else if( attrType.startsWith("["))
            {
               Object arrayObject = Server.getMBeanAttributeObject(objectNameString, \
attrName);  if (arrayObject != null) {
  -%>
  -                  <table>
  -<%
  +               out.print("<pre>");
                  for (int i = 0; i < Array.getLength(arrayObject); ++i) {
  -%>
  -                  <tr><td><%=Array.get(arrayObject,i)%></td></tr>
  -<%
  +                  out.println(fixValue(Array.get(arrayObject,i)));
                  }
  -%>
  -                  </table>
  -<%
  +               out.print("</pre>");
               } 
               
            }
  @@ -196,7 +254,7 @@
            {
               // Just the value string
   %>
  -		    <%= attrValue %>
  +            <pre><%= fixValue(attrValue) %></pre>
   <%
            }
         }
  @@ -206,29 +264,46 @@
            if( attrValue != null )
            {
   %>
  -         <a href="HtmlAdaptor?action=inspectMBean&name=<%= \
URLEncoder.encode(attrValue) %>">View MBean</a>  +            <br />
  +            <a href="HtmlAdaptor?action=inspectMBean&amp;name=<%= \
URLEncoder.encode(attrValue) %>">View MBean</a>  <%
            }
         }
   %>
            </td>
  -         <td><%= attrDescription%></td>
   		</tr>
   <%
      }
   %>
  -	</table>
   <% if( hasWriteable )
      {
   %>
  -	<input type="submit" value="Apply Changes">
  +   <tr>
  +      <td colspan='2'>
  +         <input class='applyb' type="submit" value="Apply Changes" />
  +      </td>
  +   </tr>
   <%
      }
   %>
  +   </table>
   </form>
   
  -<hr>
  -<h3>List of MBean operations:</h3>
  +<p>
  +</p>
  +
  +<% if (operationInfo.length > 0) { %>
  +<table class="AttributesClass" cellspacing="0" cellpadding="5">
  +   <tr class="AttributesHeader">
  +   <th width="25%">
  +      <span class='aname'>Operation Name</span><br/>
  +      <span class='atype'>Return Type</span> <br/>
  +      <span class='adescription'>Description</span> <br/>
  +   </th>
  +   <th width="75%">
  +      <span class='aname'>Parameters</span>
  +   </th>
  +   </tr>
   <%
      for(int a = 0; a < operationInfo.length; a ++)
      {
  @@ -246,25 +321,24 @@
         if (accept)
         {
            MBeanParameterInfo[] sig = opInfo.getSignature();
  +         String methodIndex = (String) operationInfoIndexMap.get(opInfo);
   %>
  -<form method="post" action="HtmlAdaptor">
  -   <input type="hidden" name="action" value="invokeOp">
  -   <input type="hidden" name="name" value="<%= objectNameString %>">
  -   <input type="hidden" name="methodIndex" value="<%= a %>">
  -   <hr align='left' width='80'>
  -   <h4><%= opInfo.getReturnType() + " " + opInfo.getName() + "()" %></h4>
  -   <p><%= fixDescription(opInfo.getDescription())%></p>
  +   <tr>
  +		<td class='sep'>
  +         <span class='aname'><%= opInfo.getName() %></span><br/>
  +         <span class='atype'><%= opInfo.getReturnType() %></span> <br/>
  +         <span class='adescription'><%= \
fixDescription(opInfo.getDescription())%></span> <br/>  +      </td>
  +      <td class='sep'>
  +         <form method="post" action="HtmlAdaptor">
  +            <input type="hidden" name="action" value="invokeOp" />
  +            <input type="hidden" name="name" value="<%= objectNameString %>" />
  +            <input type="hidden" name="methodIndex" value="<%= methodIndex %>" />
   <%
            if( sig.length > 0 )
            {
   %>
  -	<table cellspacing="2" cellpadding="2" border="1">
  -		<tr class="OperationHeader">
  -			<th>Param</th>
  -			<th>ParamType</th>
  -			<th>ParamValue</th>
  -			<th>ParamDescription</th>
  -		</tr>
  +	<table>
   <%
               for(int p = 0; p < sig.length; p ++)
               {
  @@ -275,44 +349,51 @@
                  {
                     pname = "arg"+p;
                  }
  +               String pdesc = fixDescription(paramInfo.getDescription());
   %>
   		<tr>
  -			<td><%= pname %></td>
  -		   <td><%= ptype %></td>
            <td> 
  +         <span class='aname'><%= pname %></span><br/>
  +         <span class='atype'><%= ptype %></span> <br/>
  +         <span class='adescription'><%= pdesc %></span> <br/>
   <%
                   if( ptype.equals("boolean") || ptype.equals("java.lang.Boolean") )
                   {
                      // Boolean true/false radio boxes
   %>
  -            <input type="radio" name="arg<%= p%>" value="True"checked>True
  -            <input type="radio" name="arg<%= p%>" value="False">False
  +            <input type="radio" name="arg<%= p%>" value="True" \
checked='checked'>True  +            <input type="radio" name="arg<%= p%>" \
value="False" />False  <%
                    }
                    else
                    {
   %>
  -            <input type="text" name="arg<%= p%>">
  +            <input type="text" class="iauto" name="arg<%= p%>" />
   <%
                     }
   %>
            </td>
  -         <td><%= fixDescription(paramInfo.getDescription())%></td>
   		</tr>
   <%
  -               }
  +               } // parameter list
   %>
   	</table>
   <%
  -         }
  +         } // has parameter list
   %>
  -	<input type="submit" value="Invoke">
  -</form>
  +      <input type="submit" value="Invoke" />
  +      </form>
  +
  +</td></tr>
   <%
  -      }
  -   }
  +      } // mbean operation
  +   } // all mbean operations
   %>
  -</td></tr>
   </table>
  +<%
  +} // has mbean operation
  +%>
  +
   </body>
   </html>
  +
  
  
  
  1.4       +76 -46    contrib/varia/src/resources/jmx/html/style_master.css
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: style_master.css
  ===================================================================
  RCS file: /cvsroot/jboss/contrib/varia/src/resources/jmx/html/style_master.css,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- style_master.css	13 Dec 2002 23:50:22 -0000	1.3
  +++ style_master.css	28 Feb 2006 20:08:17 -0000	1.4
  @@ -1,64 +1,94 @@
  -BODY {
  -	font-family: Verdana, Arial, Helvetica, sans-serif;
  -	font-size: 14px;
  -	background-color : White;
  -}
  +/* From http://www.jboss.com/themes/jbosstheme/style/common.css */
   
  -H1{  
  -	font-family: Verdana, Arial, Helvetica, sans-serif; 
  -	font-size: 25px; 
  -	font-weight: bold; 
  -	color: #000099}
  -H2 {
  -	 font-family: Verdana, Arial, Helvetica, sans-serif; 
  -	 font-size: 20px; 
  -	 font-weight: bold; 
  -	 color: #000000
  -}
  -H3 {
  -	 font-family: Verdana, Arial, Helvetica, sans-serif; 
  -	 font-size: 17px; 
  -	 font-weight: bold; 
  -	 color: #000000
  -}
  -TH {
  -	background-color : #000099;
  -	color: #DEB887;
  +body { font: 11px Helvetica, Arial, sans-serif; }
  +
  +h1 { color: #000000; line-height: 22px; font: 20px Helvetica, Arial, sans-serif; }
  +h2 { color: #000000; line-height: 18px; font: bold 16px Helvetica, Arial, \
sans-serif; margin-top: 16px; }  +h3 { color: #000000; line-height: 16px; font: bold \
14px Helvetica, Arial, sans-serif; margin-top: 8px; }  +h4 { color: #000000; \
line-height: 16px; font: 14px Helvetica, Arial, sans-serif; margin-top: 8px; }  +h5 { \
color: #000000; line-height: 14px; font: 12px Helvetica, Arial, sans-serif; \
margin-top: 8px; }  +
  +th {
   	 font-weight: bold; 
  -}.bg_table {
  -	background-color : #DEB887;
  +   text-align: left;
  +   vertical-align: top;
  +   background-color : #EEEEFF;
  +   border: 1px solid black;
  +}
  +table.ObjectName {
  +   margin-bottom: 1em;
  +   border: 1px solid black;
  +}
  +table.AttributesClass {
  +   width: 100%;
  +   margin-bottom: 1em;
  +   border: 1px solid black;
  +}
  +td.nameh {
  +	background-color : #EEEEFF;
  +   border: 1px solid #444444;
  +}
  +td.sep {
  +  vertical-align: top;
  +  border-width: thin;
  +  border: 1px solid #DDDDDD;
  +  margin-right: 0px;
  +  margin-left: 0px;
  +}
  +*.applyb {
  +  font-size: larger;
  +  text-align: center;
  +}
  +input.iauto {
  +   width: 80%;
  +	font-size: 12px;
   }
  -}.bg_cell{
  -	background-color : #ffffff;
  +
  +*.aname {
  +	font-size: large;
  +}.aaccess {
  +	font-size: small;
  +	font-weight: normal;
  +	color: gray;
  +}
  +*.atype {
  +	font-size: small;
  +	color: gray;
  +}
  +*.adescription {
  +	font-size: small;
  +	color: navy;
  +   font-style: oblique;
   }
  +
   A:ACTIVE {
  -	font-family: Arial, Helvetica, sans-serif;
  -	font-size: 14px;
   	color:Red;
   	background-color: #DEB887;
   	text-decoration : underline;
  -	font-weight:bold;
   }
  - A:HOVER {
  -	font-family:Arial, Helvetica, sans-serif;
  -	font-size: 14px;
  +
  +A:HOVER {
   	color:Red;
   	text-decoration : underline;
  -	font-weight:bold;
   }
  -  A:LINK {
  -	font-family:  Arial, Helvetica, sans-serif;
  -	font-size: 14px;
  +
  +A:LINK {
   	color:#000099;
   	text-decoration : underline;
  -	font-weight:bold;
   }
  -   A:VISITED {
  -	font-family: Arial, Helvetica, sans-serif;
  -	font-size: 14px;
  +
  +A:VISITED {
   	color:Purple;
   	text-decoration : underline;
  -	font-weight:bold;
   }
   
  +pre {
  +  white-space: pre-wrap;       /* css-3 */
  +  white-space: -moz-pre-wrap;  /* Mozilla, since 1999 */
  +  white-space: -pre-wrap;      /* Opera 4-6 */
  +  white-space: -o-pre-wrap;    /* Opera 7 */
  +  word-wrap: break-word;       /* Internet Explorer 5.5+ */
  +}
  +
  +
   
  
  
  


-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
jboss-cvs-commits mailing list
jboss-cvs-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jboss-cvs-commits


[prev in list] [next in list] [prev in thread] [next in thread] 

Configure | About | News | Add a list | Sponsored by KoreLogic