mc4j-cvs — Mailing list for CVS commit notices.

[Mc4j-cvs] mc4j/src/org/mc4j/jre15/components MemoryUsageLineChartComponent.java,1.1,1.2 MemoryUsagePieChartComponent.java,1.1,1.2

[Greg H. <gh...@us...>]

Update of /cvsroot/mc4j/mc4j/src/org/mc4j/jre15/components
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv549/src/org/mc4j/jre15/components

Modified Files:
	MemoryUsageLineChartComponent.java 
	MemoryUsagePieChartComponent.java 
Log Message:
Upgrade to jfreechart 0.9.17
(Cool new pie chart features)

Index: MemoryUsagePieChartComponent.java
===================================================================
RCS file: /cvsroot/mc4j/mc4j/src/org/mc4j/jre15/components/MemoryUsagePieChartComponent.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MemoryUsagePieChartComponent.java	21 Mar 2004 21:35:50 -0000	1.1
--- MemoryUsagePieChartComponent.java	9 Apr 2004 01:54:16 -0000	1.2
***************
*** 28,37 ****
--- 28,44 ----
  import javax.management.ObjectName;
  
+ import org.openide.windows.IOProvider;
+ 
  import org.mc4j.console.bean.MBeanNode;
  import org.mc4j.console.dashboard.Dashboard;
  import org.mc4j.console.dashboard.components.NumericAttributeGraph;
+ import org.mc4j.console.install.ExplorerUtil;
  
  import org.jfree.chart.ChartFactory;
+ import org.jfree.chart.ChartMouseEvent;
+ import org.jfree.chart.ChartMouseListener;
  import org.jfree.chart.ChartPanel;
+ import org.jfree.chart.entity.ChartEntity;
+ import org.jfree.chart.entity.PieSectionEntity;
  import org.jfree.chart.labels.StandardPieItemLabelGenerator;
  import org.jfree.chart.plot.PiePlot;
***************
*** 71,81 ****
          chart.setBackgroundPaint(this.getBackground());
          PiePlot plot = (PiePlot) chart.getPlot();
!         plot.setSectionLabelType(PiePlot.NAME_AND_PERCENT_LABELS);
          plot.setNoDataMessage("No data available");
-         plot.setItemLabelGenerator(new StandardPieItemLabelGenerator());
  
          ChartPanel chartPanel = new ChartPanel(chart);
          chartPanel.setPreferredSize(new java.awt.Dimension(500, 270));
  
          setLayout(new BorderLayout());
          add(chartPanel, BorderLayout.CENTER);
--- 78,124 ----
          chart.setBackgroundPaint(this.getBackground());
          PiePlot plot = (PiePlot) chart.getPlot();
! 
!         plot.setLabelGenerator(new StandardPieItemLabelGenerator());
! 
!         //StandardPieItemLabelGenerator spilg = new StandardPieItemLabelGenerator();
! 
!         //plot.setSectionLabelType(PiePlot.NAME_AND_PERCENT_LABELS);
!         //plot.setItemLabelGenerator(new StandardPieItemLabelGenerator());
! 
          plot.setNoDataMessage("No data available");
  
          ChartPanel chartPanel = new ChartPanel(chart);
          chartPanel.setPreferredSize(new java.awt.Dimension(500, 270));
  
+         chartPanel.addChartMouseListener(new ChartMouseListener() {
+             public void chartMouseClicked(ChartMouseEvent event) {
+                 ChartEntity entity = event.getEntity();
+                 if (entity instanceof PieSectionEntity) {
+                     PieSectionEntity pieSection = (PieSectionEntity) entity;
+                     IOProvider.getDefault().getStdOut().println("Browsing to: " + pieSection.getSectionKey());
+ 
+                     for (Iterator iterator = beanList.iterator(); iterator.hasNext();) {
+                         try {
+                             MBeanNode beanNode = (MBeanNode) iterator.next();
+ 
+                             ObjectName objectName = beanNode.getObjectName();
+ 
+                             // TODO GH: Don't need to get this from the server every time
+                             String name = (String) MemoryUsagePieChartComponent.this.server.getAttribute(objectName, "Name");
+ 
+                             if (pieSection.getSectionKey().equals(name)) {
+                                 ExplorerUtil.browseTo(beanNode);
+                             }
+                         } catch(Exception e) {
+                             e.printStackTrace();
+                         }
+                     }
+                 }
+             }
+ 
+             public void chartMouseMoved(ChartMouseEvent event) {
+                 //To change body of implemented methods use File | Settings | File Templates.
+             }
+         });
          setLayout(new BorderLayout());
          add(chartPanel, BorderLayout.CENTER);
***************
*** 97,100 ****
--- 140,144 ----
                  ObjectName objectName = beanNode.getObjectName();
  
+                 // TODO GH: Don't need to get this from the server every time
                  String name = (String) this.server.getAttribute(objectName, "Name");
  

Index: MemoryUsageLineChartComponent.java
===================================================================
RCS file: /cvsroot/mc4j/mc4j/src/org/mc4j/jre15/components/MemoryUsageLineChartComponent.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MemoryUsageLineChartComponent.java	21 Mar 2004 21:35:50 -0000	1.1
--- MemoryUsageLineChartComponent.java	9 Apr 2004 01:54:16 -0000	1.2
***************
*** 20,24 ****
  package org.mc4j.jre15.components;
  
- import java.awt.BorderLayout;
  import java.lang.management.MemoryUsage;
  import java.util.Iterator;
--- 20,23 ----
***************
*** 33,40 ****
  import org.mc4j.console.dashboard.components.NumericAttributeGraph;
  
- import org.jfree.chart.ChartFactory;
- import org.jfree.chart.ChartPanel;
- import org.jfree.chart.labels.StandardPieItemLabelGenerator;
- import org.jfree.chart.plot.PiePlot;
  import org.jfree.data.DefaultPieDataset;
  import org.jfree.data.time.Millisecond;
--- 32,35 ----
***************
*** 59,88 ****
      protected List beanList;
  
-     protected void initGraphPanel2() {
- 
-         pieDataset = new DefaultPieDataset();
- 
-         this.chart = ChartFactory.createPieChart(
-             "JVM Memory Pool Usage",  // chart title
-             pieDataset,             // data
-             true,                // include legend
-             true,
-             false
-         );
- 
-         // set the background color for the chart...
-         chart.setBackgroundPaint(this.getBackground());
-         PiePlot plot = (PiePlot) chart.getPlot();
-         plot.setSectionLabelType(PiePlot.NAME_AND_PERCENT_LABELS);
-         plot.setNoDataMessage("No data available");
-         plot.setItemLabelGenerator(new StandardPieItemLabelGenerator());
- 
-         ChartPanel chartPanel = new ChartPanel(chart);
-         chartPanel.setPreferredSize(new java.awt.Dimension(500, 270));
- 
-         setLayout(new BorderLayout());
-         add(chartPanel, BorderLayout.CENTER);
- 
-     }
  
      public void addObservation() throws Exception {
--- 54,57 ----

[Mc4j-cvs] mc4j/lib/common jcommon-0.9.2.jar,NONE,1.1 jfreechart-0.9.17.jar,NONE,1.1 jcommon-0.9.1.jar,1.1,NONE jfreechart-0.9.16.jar,1.1,NONE

[Greg H. <gh...@us...>]

Update of /cvsroot/mc4j/mc4j/lib/common
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv549/lib/common

Added Files:
	jcommon-0.9.2.jar jfreechart-0.9.17.jar 
Removed Files:
	jcommon-0.9.1.jar jfreechart-0.9.16.jar 
Log Message:
Upgrade to jfreechart 0.9.17
(Cool new pie chart features)

--- NEW FILE: jcommon-0.9.2.jar ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: jfreechart-0.9.17.jar ---
(This appears to be a binary file; contents omitted.)

--- jfreechart-0.9.16.jar DELETED ---

--- jcommon-0.9.1.jar DELETED ---

[Mc4j-cvs] mc4j/doc-build 15Features_large.gif,NONE,1.1 15Features_small.gif,NONE,1.1 usageOC4J.xml,NONE,1.1 index.xml,1.7,1.8 module.xml,1.7,1.8 usageWebSphere.xml,1.1,1.2

[Greg H. <gh...@us...>]

Update of /cvsroot/mc4j/mc4j/doc-build
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25310/doc-build

Modified Files:
	index.xml module.xml usageWebSphere.xml 
Added Files:
	15Features_large.gif 15Features_small.gif usageOC4J.xml 
Log Message:
New docs for the 1.2beta5 release.
New dashboard guide section for building dashboards.
New doc for OC4J connections.

Index: index.xml
===================================================================
RCS file: /cvsroot/mc4j/mc4j/doc-build/index.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** index.xml	20 Feb 2004 00:01:09 -0000	1.7
--- index.xml	8 Apr 2004 22:12:22 -0000	1.8
***************
*** 22,30 ****
      provides the ability to browse existing managed beans (MBeans)
      and execute operations on them.</p>
- 
  </section>
  
  <section name="News">
  
  
      <subsection name="MC4J 1.2 beta 4 released! (2/19/04)">
--- 22,53 ----
      provides the ability to browse existing managed beans (MBeans)
      and execute operations on them.</p>
  </section>
  
  <section name="News">
+ <subsection name="MC4J 1.2 beta 5 released! (4/8/04)">
+         <table>
+             <tr>
+                 <td>
  
+         <p>
+             Support for JDK 1.5 and OC4J, better dashboards and other improvements are
+             included in MC4J 1.2 beta 5. Other improvements include:
+             <ul>
+                 <li>JDK 1.5 thread monitoring (states and stacks)</li>
+                 <li>JDK 1.5 memory pool monitoring (pie charts and graphs)</li>
+                 <li>Improved dashboard system and documentation to build your own</li>
+                 <li>OC4J server connections</li>
+                 <li>Authenticated JSR 160 connections</li>
+                 <li>Lots of bug fixes...</li>
+             </ul>
+         </p>
+                </td>
+                <td align="right">
+                  <a href="15Features_large.gif" align="right"><img src="15Features_small.gif" border="0"/></a><br/>
+                    <center><i><font size="-2">Click to enlarge</font></i></center>
+                 </td>
+             </tr>
+         </table>
+     </subsection>
  
      <subsection name="MC4J 1.2 beta 4 released! (2/19/04)">
***************
*** 46,50 ****
                  <li>Released on the Sapient Public License 1.0</li>
                  <li>Lots of bug fixes...</li>
- 
              </ul>
          </p>
--- 69,72 ----
***************
*** 52,58 ****
                 <td align="right">
                   <a href="ss5_large.gif" align="right"><img src="ss5_small.gif"/></a>
- 
- 
- 
                  </td>
              </tr>
--- 74,77 ----
***************
*** 96,128 ****
  
  <section name="Supported Servers">
!     <table>
          <tr>
!             <td>Server</td>
!             <td>Supported (tested) Versions</td>
          </tr>
          <tr>
!             <td><a href="http://www.jboss.org">JBoss</a></td>
!             <td>3.0.x<br/>3.2.0<br/>3.2.1<br/>3.2.2<br/>3.2.3<br/>4.0 DR2</td>
          </tr>
          <tr>
!             <td><a href="http://www.bea.com">Bea WebLogic</a></td>
!             <td>6.1<br/>7.0<br/>8.1</td>
          </tr>
          <tr>
!             <td><a href="http://jakarta.apache.org/tomcat/">Tomcat</a></td>
!             <td>4.1.29<br/>5.0.18</td>
          </tr>
          <tr>
!             <td><a href="http://mx4j.sourceforge.net">MX4J</a></td>
!             <td>1.1.1</td>
          </tr>
          <tr>
!             <td><a href="http://java.sun.com/products/JavaManagement/index.jsp">JMX Remoting (JSR 160)</a></td>
!             <td>1.0.1 (RMI and JMXP)</td>
!             <td>MX4J 2.0b1 (JMX Remoting)</td>
          </tr>
          <tr>
!             <td><a href="http://www.ibm.com/websphere">WebSphere 5.x</a></td>
!             <td>5.0<br/>5.1</td>
          </tr>
      </table>
--- 115,158 ----
  
  <section name="Supported Servers">
!     <table style="border: 1pt solid silver; background-color: #DDE6E6">
          <tr>
!             <td style="background-color: #6998BE">Server</td>
!             <td style="background-color: #6998BE">Supported/Tested Versions</td>
          </tr>
          <tr>
!             <td style="font-weight: bold; border-bottom: .75pt solid silver; background-color: #87ADCB">
!                 <a href="http://www.jboss.org">JBoss</a></td>
!             <td style="border-bottom: .75pt solid silver">3.0.x<br/>3.2.x<br/>4.0 DRx</td>
          </tr>
+ 
          <tr>
!             <td style="font-weight: bold; border-bottom: .75pt solid silver; background-color: #87ADCB">
!                 <a href="http://java.sun.com/products/JavaManagement/index.jsp">JMX Remoting (JSR 160)</a></td>
!             <td style="border-bottom: .75pt solid silver">1.0.1 (RMI and JMXP)</td>
          </tr>
          <tr>
!             <td style="font-weight: bold; border-bottom: .75pt solid silver; background-color: #87ADCB">
!                 <a href="http://mx4j.sourceforge.net">MX4J</a></td>
!             <td style="border-bottom: .75pt solid silver">1.1.1</td>
          </tr>
          <tr>
!             <td style="font-weight: bold; border-bottom: .75pt solid silver; background-color: #87ADCB">
!                 <a href="http://otn.oracle.com/tech/java/oc4j/index.html">OC4J</a></td>
!             <td style="border-bottom: .75pt solid silver">10.0.3</td>
          </tr>
          <tr>
!             <td style="font-weight: bold; border-bottom: .75pt solid silver; background-color: #87ADCB">
!                 <a href="http://jakarta.apache.org/tomcat/">Tomcat</a></td>
!             <td style="border-bottom: .75pt solid silver">4.1.29<br/>5.0.18</td>
          </tr>
          <tr>
!             <td style="font-weight: bold; border-bottom: .75pt solid silver; background-color: #87ADCB">
!                 <a href="http://www.bea.com">Bea Weblogic</a></td>
!             <td style="border-bottom: .75pt solid silver">6.1<br/>7.0<br/>8.1</td>
!         </tr>
!         <tr>
!             <td style="font-weight: bold; border-bottom: .75pt solid silver; background-color: #87ADCB">
!                 <a href="http://www.ibm.com/websphere">IBM WebSphere</a></td>
!             <td style="border-bottom: .75pt solid silver">5.0<br/>5.1</td>
          </tr>
      </table>

--- NEW FILE: 15Features_small.gif ---
(This appears to be a binary file; contents omitted.)

Index: usageWebSphere.xml
===================================================================
RCS file: /cvsroot/mc4j/mc4j/doc-build/usageWebSphere.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** usageWebSphere.xml	19 Feb 2004 23:57:35 -0000	1.1
--- usageWebSphere.xml	8 Apr 2004 22:12:22 -0000	1.2
***************
*** 20,24 ****
  
  
!   <section name="WebLogic and JMX">
      <p>
        The MC4J Application supports connections to WebSphere servers version 5.0 and higher. It uses RMI and the TMX4J
--- 20,24 ----
  
  
!   <section name="WebSphere and JMX">
      <p>
        The MC4J Application supports connections to WebSphere servers version 5.0 and higher. It uses RMI and the TMX4J
***************
*** 32,41 ****
          To connect to a WebSphere server, right-click on the root node in the [MC4J Server Connections] tab and select
          [Connect to server...]. This wil bring up a connection wizard that will ask you to enter server information
!         and supply the location of a local installation "lib" folder of WebSphere. <b>You must select the "lib"
!         folder or the connection will not work.</b> The local installation is required to provide the
          libraries that MC4J needs to connect to WebSphere Servers. <b>Note:</b> The local installation must be the
          same version as the server you are connecting to. Different version can be connected to simultaneously if
          you have all of the different versions installed on a machine.
      </p>
    </section>
  
--- 32,59 ----
          To connect to a WebSphere server, right-click on the root node in the [MC4J Server Connections] tab and select
          [Connect to server...]. This wil bring up a connection wizard that will ask you to enter server information
!         and supply the location of a local installation "lib" folder of WebSphere.
!     </p>
! 
!         <p>
!             To connect to WebSphere, you should use a server URL of the form "http://__Hostname__:__Port__".
!             The WSAD environment's test server uses the port "8880" by default for example. The port
!             configuration is that of the "Soap Connector" and can be reconfigured. A typical connection
!             to the local test server would therefore be "http://localhost:8880".
!         </p>
! 
!     <p>
!         <b>On the 2nd page of the wizard you must select the "lib" folder or the connection will not work.</b>
!         The local installation is required to provide the
          libraries that MC4J needs to connect to WebSphere Servers. <b>Note:</b> The local installation must be the
          same version as the server you are connecting to. Different version can be connected to simultaneously if
          you have all of the different versions installed on a machine.
      </p>
+ 
+     <p>
+         <b>Note:</b> If you are <b>not</b> running MC4J on an IBM JDK, you will also need to select some additional libraries
+         on the 3rd page of the connection wizard. Click the "add..." button and browse the installation
+         of your IBM JDK (Included with WSAD or WS). Within the folder "java/jre/lib/ext" select the
+         jars named "ibmjsse.jar" and "mail.jar".
+     </p>
    </section>
  

Index: module.xml
===================================================================
RCS file: /cvsroot/mc4j/mc4j/doc-build/module.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** module.xml	20 Feb 2004 00:01:09 -0000	1.7
--- module.xml	8 Apr 2004 22:12:22 -0000	1.8
***************
*** 10,38 ****
  
          <menu name="Getting Started">
!             <item name="Download"            href="http://sourceforge.net/project/showfiles.php?group_id=60228&amp;release_id=107843"/>
!             <item name="Screen Shots"       href="ScreenShots.html"/>
          </menu>
  
          <menu name="Documentation">
!             <item name="User Guide" href="guide/index.html"/>
!             <item name="Use with JBoss"      href="usageJBoss.html"/>
!             <item name="Use with WebLogic"   href="usageWebLogic.html"/>
!             <item name="Use with WebSphere"  href="usageWebSphere.html"/>
!             <item name="Use with MX4J"       href="usageMX4J.html"/>
!             <item name="Use with Tomcat"     href="usageTomcat.html"/>
          </menu>
  
          <menu name="Community">
              <item name="SF Project"             href="http://sourceforge.net/projects/mc4j"/>
!             <item name="Support Requests" href="http://sourceforge.net/tracker/?atid=493496&amp;group_id=60228&amp;func=browse"/>
!             <item name="Bug Tracker" href="http://sourceforge.net/tracker/?atid=493495&amp;group_id=60228&amp;func=browse"/>
!             <item name="Feature Requests" href="http://sourceforge.net/tracker/?atid=493498&amp;group_id=60228&amp;func=browse"/>
!             <item name="Mailing List" href="http://sourceforge.net/mail/?group_id=60228"/>
          </menu>
  
          <menu name="Development">
              <item name="CVS" href="http://sourceforge.net/cvs/?group_id=60228"/>
!             <item name="Build Guide"	     href="Building.html"/>
!             <item name="License"            href="License-SPL.html"/>
          </menu>
      </body>
--- 10,43 ----
  
          <menu name="Getting Started">
!             <item name="Download"               href="http://sourceforge.net/project/showfiles.php?group_id=60228&amp;release_id=107843"/>
!             <item name="Screen Shots"           href="ScreenShots.html"/>
          </menu>
  
          <menu name="Documentation">
!             <item name="User Guide"             href="guide/index.html"/>
!             <item name="Dashboard Guide"        href="dashboard-dev/index.html"/>
!         </menu>
! 
!         <menu name="Server Support">
!             <item name="JBoss"                  href="usageJBoss.html"/>
!             <item name="MX4J"                   href="usageMX4J.html"/>
!             <item name="OC4J"                   href="usageOC4J.html"/>
!             <item name="Tomcat"                 href="usageTomcat.html"/>
!             <item name="WebLogic"               href="usageWebLogic.html"/>
!             <item name="WebSphere"              href="usageWebSphere.html"/>
          </menu>
  
          <menu name="Community">
              <item name="SF Project"             href="http://sourceforge.net/projects/mc4j"/>
!             <item name="Support Requests"       href="http://sourceforge.net/tracker/?atid=493496&amp;group_id=60228&amp;func=browse"/>
!             <item name="Bug Tracker"            href="http://sourceforge.net/tracker/?atid=493495&amp;group_id=60228&amp;func=browse"/>
!             <item name="Feature Requests"       href="http://sourceforge.net/tracker/?atid=493498&amp;group_id=60228&amp;func=browse"/>
!             <item name="Mailing List"           href="http://sourceforge.net/mail/?group_id=60228"/>
          </menu>
  
          <menu name="Development">
              <item name="CVS" href="http://sourceforge.net/cvs/?group_id=60228"/>
!             <item name="Build Guide"	        href="Building.html"/>
!             <item name="License"                href="License-SPL.html"/>
          </menu>
      </body>

--- NEW FILE: usageOC4J.xml ---
<?xml version="1.0"?>
<!DOCTYPE document [
  <!ENTITY CarbonModule SYSTEM "module.xml">

  <!ENTITY nbsp "&#x00A0;">
]>

<document url="usageOC4J.html">

    &CarbonModule;

    <properties>
        <author email="sb...@us...">Steve Button</author>
        <created>April 2004</created>
        <title>Using MC4J with OC4J</title>
        <version>$Revision: 1.1 $($Author: ghinkl $ / $Date: 2004/04/08 22:12:22 $)</version>
    </properties>

<body>


  <section name="OC4J and JMX">
    <p>
        The MC4J Application supports connections to OC4J 10g (10.0.3). It uses the ORMI protocol to
        connect to OC4J and provide access to JMX MBeans running within the target server. It gains access
        using the Management EJB (MEJB) defined in the JSR77 specification and exposed by OC4J.
    </p>
  </section>

  <section name="Connecting MC4J to OC4J">
    <p>
        To connect to a OC4J server, right-click on the root node in the [MC4J Server Connections]
        tab and select [Connect to server...]. This wil bring up a connection wizard that will ask
        you to enter server information and supply the location of a local installation of OC4J.
        The local installation is required to provide the libraries that MC4J needs to connect to
        OC4JServers. The required set of class libraries required to connect to OC4J will be preset
        in the connection wizard classpath wizard page.
    </p>
    <p>
        To remotely access the JMX server, the new connection's 'Principal' and 'Credentials'
        values must specify a user who is part of the 'administrators' group.
    </p>
  </section>

  <section name="Requirements">
    <p>
        The MC4J console has only been tested against OC4J 10g (10.0.3). JMX support is not provided in any earlier releases of OC4J.
    </p>
  </section>

</body>

</document>
--- NEW FILE: 15Features_large.gif ---
(This appears to be a binary file; contents omitted.)

[Mc4j-cvs] mc4j/doc-build/images java.net.gif,NONE,1.1

[Greg H. <gh...@us...>]

Update of /cvsroot/mc4j/mc4j/doc-build/images
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25310/doc-build/images

Added Files:
	java.net.gif 
Log Message:
New docs for the 1.2beta5 release.
New dashboard guide section for building dashboards.
New doc for OC4J connections.

--- NEW FILE: java.net.gif ---
(This appears to be a binary file; contents omitted.)

[Mc4j-cvs] mc4j/doc-build/dashboard-dev DashboardComponents.xml,NONE,1.1 DashboardXML.xml,NONE,1.1 index.xml,NONE,1.1 module.xml,NONE,1.1

[Greg H. <gh...@us...>]

Update of /cvsroot/mc4j/mc4j/doc-build/dashboard-dev
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25310/doc-build/dashboard-dev

Added Files:
	DashboardComponents.xml DashboardXML.xml index.xml module.xml 
Log Message:
New docs for the 1.2beta5 release.
New dashboard guide section for building dashboards.
New doc for OC4J connections.

--- NEW FILE: index.xml ---
<?xml version="1.0"?>
<!DOCTYPE document [
  <!ENTITY CarbonModule SYSTEM "module.xml">
]>
<document url="index.html">

    &CarbonModule;

    <properties>
        <author email="gh...@sa...">Greg Hinkle</author>
        <created>April 2004</created>
        <title>Dashboard Development Guide</title>
        <version>$Revision: 1.1 $($Author: ghinkl $ / $Date: 2004/04/08 22:12:21 $)</version>
    </properties>

<body>


<section name="Introduction">

    <p>
        This guide is meant to help in the construction of new dashboads and dashboard components.
        These features allow one to customize and extend MC4J to create new ways of looking at
        and managing systems.
    </p>
    <p>
        Custom views can be created for the features built into specific servers like JBoss or WebSphere.
        Views can also be created for custom components running withing those servers.
    </p>
    <subsection name="What is a dashboard?">
        <p>
            A dashboard is a custom view of one or more MBeans that can be viewed through JMX. This custom
            view is meant to be flexible and customizable while also providing a rich interface
            to the underlying functionality. MC4J constructs the Swing components that make
            up a dashboard by parsing an XML file that defines its layout and properties. The following
            sections will describe the creation and customization of those files as well as the
            special components that they use.
        </p>
        <p>
            The capabilities of a dashboard should be anything that is possible within the framework
            of JMX. This should include reading or updating attributes, executing operations and
            listening for notifications. All of these typical jmx operations are done through
            the MC4J node framework in which an MBean is represented by an object that can
            execute these features on behalf of a dashboard.
        </p>
        <p>
            <i>If you create interesting or useful dashboards for any of the major servers or
            services, please consider donating them back for all to use.</i>
        </p>
    </subsection>

</section>


<section name="Sections">
    <ul>
        <li><a href="DashboardXML.html">Dashboard XML</a></li>
        <li><a href="DashboardComponents.html">Dashboard Components</a></li>
    </ul>
                
</section>

</body>

</document>

--- NEW FILE: DashboardComponents.xml ---
<?xml version="1.0"?>
<!DOCTYPE document [
  <!ENTITY CarbonModule SYSTEM "module.xml">

  <!ENTITY nbsp "&#x00A0;">
]>

<document url="DashboardComponents.html">

    &CarbonModule;

    <properties>
        <author email="gh...@sa...">Greg Hinkle</author>
        <created>April 2004</created>
        <title>Dashboard Components</title>
        <version>$Revision: 1.1 $($Author: ghinkl $ / $Date: 2004/04/08 22:12:21 $)</version>
    </properties>

<body>


<section name="Overview">
    <p>
        This document describes what a dashboard component is, what components are
        include with MC4J and how to create new ones.
    </p>
</section>

<section name="Dashboard Components">
    <p>
        A dashboard component is an implementation of
        <i>org.mc4j.console.dashboard.DashboardComponent</i>. It must also extend
        <i>javax.swing.JComponent</i>. A dashboard component follows a special lifecyle
        in order to be properly configured and then displayed. First the component
        is instantiated through the use of a <i>Component</i> tag in a dashboard xml file.
        The instantiation is done through reflection based on the <b>type</b> attribute
        of the <i>Component</i> tag.
    </p>
    <p>
        Next, a Component has attributes and borders set on it via
        <i>Attribute</i> and <i>Border</i> tags.
    </p>

    <p>
        A child <i>Content</i> tag may hold a list of child components that will
        be added to this component. The layout manger for the component will also
        be set using the <i>LayoutManager</i> tag.
    </p>
    <p>
        Finally, a component is added to its parent using any constraints specified by
        a <i>Constraint</i> tag.
    </p>
</section>

<Section name="Standard Components">
    <p>
        The following are the standard set of Dashboard Components that can be used to
        construct Dashboard views.
    </p>
    <subsection name="AttributeListComponent">

    </subsection>

    <subsection name="AttributeTableComponent">

    </subsection>

    <subsection name="AttributeTreeTableExplorer">

    </subsection>

    <subsection name="BeanListComponent">

    </subsection>

    <subsection name="MBeanTreeComponent">

    </subsection>

    <subsection name="NumericAttributeGaugeMeter"></subsection>

    <subsection name="NumericAttributeGraph"></subsection>
    <subsection name="NumericAttributeMeter"></subsection>
    <subsection name="OperationListComponent"></subsection>
    <subsection name="RefreshControlComponent"></subsection>
    <subsection name="RelationsGraphComponent"></subsection>
</Section>
</body>

</document>
--- NEW FILE: DashboardXML.xml ---
<?xml version="1.0"?>
<!DOCTYPE document [
  <!ENTITY CarbonModule SYSTEM "module.xml">

  <!ENTITY nbsp "&#x00A0;">
]>

<document url="DashboardXML.html">

    &CarbonModule;

    <properties>
        <author email="gh...@sa...">Greg Hinkle</author>
        <created>April 2004</created>
        <title>Dashboard XML Files</title>
        <version>$Revision: 1.1 $($Author: ghinkl $ / $Date: 2004/04/08 22:12:21 $)</version>
    </properties>

<body>


<section name="Overview">
    <p>
        This document describes the XML file that defines a dashboard custom view within MC4J.
        Dashboards have two primary sections that define how they behave and how they look.
        These are the <i>DashboardMatch</i> and <i>Content</i> sections.
    </p>
</section>

<section name="DashboardMatch Section">
    <p>
        The <i>DashboardMatch</i> section defines how the custom view for a dashboard is
        attached to the specific MBeans or managed beans that it will display. Some dashboards
        will display information from only a single bean, while others will display from
        entire lists of beans. This section defines how that connection is made.
    </p>
    <subsection name="Dashboard Types">
        <p>
            There are two primary types of dashboards. <b>Global</b> dashboards are designed to
            be often useful and are accessed from their own tree structure within a
            connection. <b>Bean</b> dashboards are used to display a custom view of a single
            MBean and are only available by right-clicking on that bean. <b>Global</b>
            dashboards can be <i>matched</i> to one or many beans.
        </p>
    </subsection>
    <subsection name="Matching Overview">
        <p>
            A match is defined by conditions that are used to link a dashboard XML to
            MBeans. A dashboard is only made available to view if its matches are
            succesful and it has beans to display. This allows you to create dashboards
            for many situations and MBeans and MC4J will only display them when
            appropriate.
        </p>
        <p>
            Matching is done through a <i>BeanMatch</i> section within a <i>DashboardMatch</i>
            section. A <i>BeanMatch</i> uses one or more conditions to assign one or a
            list of MBeans to a special <b>id</b> within the dashboard. If no beans
            match all of the conditions in a <i>BeanMatch</i>, the match is considered
            unfulfilled and the Dashboard will not display.
        </p>
        <p>
            The <b>id</b> to which a match is set is later used by the view components
            to select which of the matched MBeans will be used. This allows you to match
            many beans and then assign them to each component as appropriate. The <b>type</b>
            of a <i>BeanMatch</i> is used to tell MC4J whether to look for a single matching
            MBean or a whole list of them. Set <b>type</b> to &quot;Single&quot; if you want
            to match only one MBean or &quot;Multiple&quot; if you want to match a whole
            list.
        </p>
    </subsection>
    <subsection name="Conditions">
        <p>
            There are three types of conditions currently supported though more will be
            available soon.
            <dl>
                <dt>BeanObjectNameCondition</dt>
                <dd>This type matches to the object name of an MBean and will be the
                most often used type of condition. With this type, you also specify
                a <b>filter</b> attribute that contains a regular expression used
                to match to the MBean Name.</dd>
                <dt>ServerAttributeCondition</dt>
                <dd>This type matches to a specific server type in MC4J, as defined in
                the server connection drop-down list. You must specify the
                <b>serverType</b> atribute to match this condition.</dd>
                <dt></dt>
            </dl>
        </p>
    </subsection>
    <subsection name="Match example">

        <p>
            The following match example is a <i>Bean</i> type match that will display for every
            MBean in the system. This is because of the &quot;.*&quot; regex used as the filter.
            This dashboard will not display within the Global section of the dashboards.
        </p>
        <pre>
&lt;DashboardMatch type=&quot;Bean&quot;&gt;
  &lt;BeanMatch id=&quot;BeanNode&quot; type=&quot;Single&quot;&gt;
      &lt;Condition type=&quot;BeanObjectNameCondition&quot; filter=&quot;.*&quot;/&gt;
  &lt;/BeanMatch&gt;
&lt;/DashboardMatch&gt;
        </pre>

        <p>
            The following match example is a <i>Global</i> type of dashboard that will display
            within the global section only if an MBean with the name &quot;jboss.jetty:Server=0&quot;
            is found. If that bean is available, then this dashboard will be matched to it and
            only it.
        </p>
        <pre>
&lt;DashboardMatch type=&quot;Global&quot; location=&quot;/JBoss/Web&quot; &gt;
  &lt;BeanMatch id=&quot;Jetty&quot; type=&quot;Single&quot;&gt;
      &lt;Condition type=&quot;BeanObjectNameCondition&quot; filter=&quot;^jboss.jetty:Server=0$&quot;/&gt;
  &lt;/BeanMatch&gt;
&lt;/DashboardMatch&gt;
        </pre>

        <p>
            This final example is a <i>Global</i> dashboard that matches to a whole list of
            MBeans, any that include &quot;j2eeType=Servlet&quot; in their name.
        </p>
        <pre>
&lt;DashboardMatch type=&quot;Global&quot; location=&quot;/Tomcat/Web&quot;&gt;
  &lt;BeanMatch id=&quot;ServletList&quot; type=&quot;Multiple&quot;&gt;
      &lt;Condition type=&quot;BeanObjectNameCondition&quot; filter=&quot;j2eeType=Servlet&quot;/&gt;
      &lt;Condition type=&quot;ServerAttributeCondition&quot; serverType=&quot;MX4J&quot;/&gt;
  &lt;/BeanMatch&gt;
&lt;/DashboardMatch&gt;
        </pre>
    </subsection>
</section>

<section name="Content Section">
    <p>
        The content section is the part of a dashboard that lays out the Swing components for display
        and sets their attributes. The dashboard xml specification has ways to set most of the
        typical properties of a JavaBean. You can also work with typical container features like
        creating Borders, setting constraints and setting layout managers. The XML specification
        is designed to be as simple and human-readable as possible. This is the primary reason it
        is different then the JavaBeans XML serialization spec. The latest DTD for dashboards
        is available at
        <a href="http://mc4j.sourceforge.net/Dashboard_1_0.dtd">Dashboard.dtd</a>.
    </p>

    <pre>
&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;
&lt;!DOCTYPE Dashboard PUBLIC &quot;-//MC4J//DTD Dashboard 1.0//EN&quot; &quot;http://mc4j.sourceforge.net/Dashboard_1_0.dtd&quot;&gt;

&lt;Dashboard version=&quot;1.0&quot; name=&quot;Basic MBean View&quot;&gt;
  &lt;Description&gt;Displays general information about any MBean in the system.&lt;/Description&gt;

  &lt;DashboardMatch type=&quot;Bean&quot;&gt;
      &lt;BeanMatch id=&quot;BeanNode&quot; type=&quot;Single&quot;&gt;
          &lt;Condition type=&quot;BeanObjectNameCondition&quot; filter=&quot;.*&quot;/&gt;
      &lt;/BeanMatch&gt;
  &lt;/DashboardMatch&gt;

  &lt;LayoutManager type=&quot;java.awt.BorderLayout&quot;/&gt;
  &lt;Content&gt;

    <b>&lt;!-- *** The header section displays title and a refresh control *** --&gt;</b>
    &lt;Component type=&quot;javax.swing.JPanel&quot;&gt;
        &lt;Constraint type=&quot;BorderConstraints&quot; direction=&quot;NORTH&quot;/&gt;
        &lt;LayoutManager type=&quot;java.awt.BorderLayout&quot;/&gt;
        &lt;Border type=&quot;javax.swing.border.EmptyBorder&quot; top=&quot;(Literal)2&quot; left=&quot;(Literal)5&quot; bottom=&quot;(Literal)2&quot; right=&quot;(Literal)5&quot;/&gt;
        &lt;Content&gt;
            &lt;Component type=&quot;javax.swing.JPanel&quot;&gt;
                &lt;Constraint type=&quot;BorderConstraints&quot; direction=&quot;CENTER&quot;/&gt;
                &lt;LayoutManager type=&quot;java.awt.BorderLayout&quot;/&gt;
                &lt;Content&gt;
                    &lt;Component type=&quot;javax.swing.JLabel&quot; id=&quot;titleLable&quot;&gt;
                        &lt;Constraint type=&quot;BorderConstraints&quot; direction=&quot;CENTER&quot;/&gt;
                        &lt;Attribute name=&quot;text&quot; value=&quot;DashboardName&quot;/&gt;
                        &lt;Attribute name=&quot;font&quot; value=&quot;(Literal)SansSerif bold 20&quot;/&gt;
                        &lt;Attribute name=&quot;foreground&quot; value=&quot;(Literal)0x666666&quot;/&gt;
                    &lt;/Component&gt;
                    &lt;Component type=&quot;javax.swing.JTextArea&quot;&gt;
                        &lt;Constraint type=&quot;BorderConstraints&quot; direction=&quot;SOUTH&quot;/&gt;
                        &lt;Attribute name=&quot;text&quot; value=&quot;DashboardDescription&quot;/&gt;
                        &lt;Attribute name=&quot;font&quot; value=&quot;(Literal)DialogInput bold 14&quot;/&gt;
                        &lt;Attribute name=&quot;opaque&quot; value=&quot;(Literal)false&quot;/&gt;
                        &lt;Attribute name=&quot;editable&quot; value=&quot;(Literal)false&quot;/&gt;
                    &lt;/Component&gt;
                &lt;/Content&gt;
            &lt;/Component&gt;
            &lt;Component type=&quot;org.mc4j.console.dashboard.components.RefreshControlComponent&quot;&gt;
                &lt;Constraint type=&quot;BorderConstraints&quot; direction=&quot;EAST&quot;/&gt;
                &lt;Attribute name=&quot;refreshDelay&quot; value=&quot;(Literal)30000&quot;/&gt;
            &lt;/Component&gt;
        &lt;/Content&gt;
    &lt;/Component&gt;

    <b>&lt;!-- *** The main content is displayed within a scrollpane for easy viewing *** --&gt;</b>
    &lt;Component type=&quot;javax.swing.JScrollPane&quot;&gt;
        &lt;Constraint type=&quot;BorderConstraints&quot; direction=&quot;CENTER&quot;/&gt;
        &lt;Attribute name=&quot;background&quot; value=&quot;(Literal)0xFFFFFF&quot;/&gt;

        &lt;Content&gt;
            &lt;Component type=&quot;javax.swing.JPanel&quot;&gt;
                &lt;Attribute name=&quot;background&quot; value=&quot;(Literal)0xFFFFFF&quot;/&gt;

                &lt;LayoutManager type=&quot;java.awt.BoxLayout&quot; axis=&quot;Y_AXIS&quot;/&gt;
                &lt;Content&gt;
                    <b>&lt;!-- *** A Section holder is an included component for providing hide-able parts *** --&gt;</b>
                    &lt;Component type=&quot;org.mc4j.console.swing.SectionHolder&quot;&gt;
                    &lt;Attribute name=&quot;title&quot; value=&quot;(Literal)MBean Attributes&quot;/&gt;
                    &lt;Attribute name=&quot;background&quot; value=&quot;(Literal)0xFFFFFF&quot;/&gt;
                    &lt;LayoutManager type=&quot;java.awt.BorderLayout&quot;/&gt;
                    &lt;Content&gt;

                        <b>&lt;!-- *** This component displays the attributes of an MBean *** --&gt;</b>
                        &lt;Component type=&quot;org.mc4j.console.dashboard.components.AttributeTreeTableExplorer&quot;&gt;
                            <b>&lt;!-- *** Notice were setting the node that we matched above by name here *** --&gt;</b>
                            &lt;Attribute name=&quot;beanNode&quot; value=&quot;BeanNode&quot;/&gt;
                            &lt;Constraint type=&quot;BorderConstraints&quot; direction=&quot;CENTER&quot;/&gt;
                            &lt;Border type=&quot;javax.swing.border.LineBorder&quot; color=&quot;(Literal)0x444444&quot; thickness=&quot;(Literal)1&quot;/&gt;
                            &lt;Attribute name=&quot;background&quot; value=&quot;(Literal)0xFFFFFF&quot;/&gt;
                            &lt;Attribute name=&quot;background&quot; value=&quot;(Literal)0xFFFFFF&quot;/&gt;
                        &lt;/Component&gt;
                    &lt;/Content&gt;
                    &lt;/Component&gt;
                    &lt;Component type=&quot;org.mc4j.console.swing.SectionHolder&quot;&gt;
                        &lt;Attribute name=&quot;title&quot; value=&quot;(Literal)MBean Operations&quot;/&gt;
                        &lt;Attribute name=&quot;background&quot; value=&quot;(Literal)0xFFFFFF&quot;/&gt;
                        &lt;Content&gt;
                            &lt;Component type=&quot;org.mc4j.console.dashboard.components.OperationListComponent&quot;&gt;
                                &lt;Attribute name=&quot;beanNode&quot; value=&quot;BeanNode&quot;/&gt;
                                &lt;Attribute name=&quot;format&quot; value=&quot;(Literal)FULL_FORMAT&quot;/&gt;
                            &lt;/Component&gt;
                        &lt;/Content&gt;
                    &lt;/Component&gt;
                    &lt;Component type=&quot;org.mc4j.console.dashboard.components.FillerComponent&quot;&gt;
                        &lt;Attribute name=&quot;type&quot; value=&quot;(Literal)VERTICAL_GLUE_SHAPE&quot;/&gt;
                    &lt;/Component&gt;
                &lt;/Content&gt;

            &lt;/Component&gt;
        &lt;/Content&gt;
    &lt;/Component&gt;

  &lt;/Content&gt;
&lt;/Dashboard&gt;
    </pre>


</section>

</body>

</document>
--- NEW FILE: module.xml ---
<?xml version="1.0" encoding="ISO-8859-1"?>
<module>

    <title>MC4J Management Console</title>

    <crumbs>
        <crumb name="Dashboard Guide" href="index.html"/>
    </crumbs>
    <relative-path>./..</relative-path>
    <path>/dashboard-dev/</path>

    <body>

        <menu name="Documents">
            <item name="Dashboard XML"           href="DashboardXML.html"/>
            <item name="Dashboard Components"        href="DashboardComponents.html"/>
        </menu>

    </body>
</module>

[Mc4j-cvs] mc4j/doc-build/guide Dashboards.xml,1.1,1.2

[Greg H. <gh...@us...>]

Update of /cvsroot/mc4j/mc4j/doc-build/guide
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25310/doc-build/guide

Modified Files:
	Dashboards.xml 
Log Message:
New docs for the 1.2beta5 release.
New dashboard guide section for building dashboards.
New doc for OC4J connections.

Index: Dashboards.xml
===================================================================
RCS file: /cvsroot/mc4j/mc4j/doc-build/guide/Dashboards.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Dashboards.xml	6 Jun 2003 22:52:43 -0000	1.1
--- Dashboards.xml	8 Apr 2004 22:12:22 -0000	1.2
***************
*** 6,10 ****
  ]>
  
! <document url="MBean.html">
  
      &CarbonModule;
--- 6,10 ----
  ]>
  
! <document url="Dashboards.html">
  
      &CarbonModule;

[Mc4j-cvs] mc4j/application/dashboards BasicMBean.xml,1.8,1.9

[Greg H. <gh...@us...>]

Update of /cvsroot/mc4j/mc4j/application/dashboards
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18616/application/dashboards

Modified Files:
	BasicMBean.xml 
Log Message:
Rebuilt the header to make it take up less space and be more appealing.

Index: BasicMBean.xml
===================================================================
RCS file: /cvsroot/mc4j/mc4j/application/dashboards/BasicMBean.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** BasicMBean.xml	8 Apr 2004 15:07:17 -0000	1.8
--- BasicMBean.xml	8 Apr 2004 21:38:27 -0000	1.9
***************
*** 26,50 ****
          <Constraint type="BorderConstraints" direction="NORTH"/>
          <LayoutManager type="java.awt.BorderLayout"/>
          <Content>
!             <Component type="javax.swing.JLabel" id="titleLable">
                  <Constraint type="BorderConstraints" direction="CENTER"/>
!                 <Attribute name="text" value="DashboardName"/>
!                 <Attribute name="font" value="(Literal)Dialog bold 24"/>
!                 <Attribute name="foreground" value="(Literal)0xFF2222"/>
              </Component>
- 
              <Component type="org.mc4j.console.dashboard.components.RefreshControlComponent">
                  <Constraint type="BorderConstraints" direction="EAST"/>
                  <Attribute name="refreshDelay" value="(Literal)30000"/>
              </Component>
- 
-             <Component type="javax.swing.JTextArea">
-                 <Constraint type="BorderConstraints" direction="SOUTH"/>
-                 <Attribute name="text" value="DashboardDescription"/>
-                 <Attribute name="font" value="(Literal)Dialog bold 16"/>
-                 <Attribute name="opaque" value="(Literal)false"/>
-                 <Attribute name="editable" value="(Literal)false"/>
-             </Component>
- 
          </Content>
      </Component>
--- 26,54 ----
          <Constraint type="BorderConstraints" direction="NORTH"/>
          <LayoutManager type="java.awt.BorderLayout"/>
+         <Border type="javax.swing.border.EmptyBorder" top="(Literal)2" left="(Literal)5" bottom="(Literal)2" right="(Literal)5"/>
          <Content>
!             <Component type="javax.swing.JPanel">
                  <Constraint type="BorderConstraints" direction="CENTER"/>
!                 <LayoutManager type="java.awt.BorderLayout"/>
!                 <Content>
!                     <Component type="javax.swing.JLabel" id="titleLable">
!                         <Constraint type="BorderConstraints" direction="CENTER"/>
!                         <Attribute name="text" value="DashboardName"/>
!                         <Attribute name="font" value="(Literal)SansSerif bold 20"/>
!                         <Attribute name="foreground" value="(Literal)0x666666"/>
!                     </Component>
!                     <Component type="javax.swing.JTextArea">
!                         <Constraint type="BorderConstraints" direction="SOUTH"/>
!                         <Attribute name="text" value="(Message)General information about {ObjectName}"/>
!                         <Attribute name="font" value="(Literal)DialogInput bold 14"/>
!                         <Attribute name="opaque" value="(Literal)false"/>
!                         <Attribute name="editable" value="(Literal)false"/>
!                     </Component>
!                 </Content>
              </Component>
              <Component type="org.mc4j.console.dashboard.components.RefreshControlComponent">
                  <Constraint type="BorderConstraints" direction="EAST"/>
                  <Attribute name="refreshDelay" value="(Literal)30000"/>
              </Component>
          </Content>
      </Component>

[Mc4j-cvs] mc4j/application/dashboards/weblogic Weblogic_EJBPoolRuntimeTable.xml,1.2,1.3 Weblogic_EJBTransactionRuntime.xml,1.2,1.3 Weblogic_ExecuteQueue_Stats.xml,1.2,1.3 Weblogic_ServletTable.xml,1.2,1.3

[Greg H. <gh...@us...>]

Update of /cvsroot/mc4j/mc4j/application/dashboards/weblogic
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18616/application/dashboards/weblogic

Modified Files:
	Weblogic_EJBPoolRuntimeTable.xml 
	Weblogic_EJBTransactionRuntime.xml 
	Weblogic_ExecuteQueue_Stats.xml Weblogic_ServletTable.xml 
Log Message:
Rebuilt the header to make it take up less space and be more appealing.

Index: Weblogic_ServletTable.xml
===================================================================
RCS file: /cvsroot/mc4j/mc4j/application/dashboards/weblogic/Weblogic_ServletTable.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Weblogic_ServletTable.xml	8 Apr 2004 15:07:17 -0000	1.2
--- Weblogic_ServletTable.xml	8 Apr 2004 21:38:27 -0000	1.3
***************
*** 15,43 ****
    <Content>
  
!     <!-- *** Header *** -->
      <Component type="javax.swing.JPanel">
          <Constraint type="BorderConstraints" direction="NORTH"/>
          <LayoutManager type="java.awt.BorderLayout"/>
          <Content>
!             <Component type="javax.swing.JLabel" id="titleLable">
                  <Constraint type="BorderConstraints" direction="CENTER"/>
!                 <Attribute name="text" value="DashboardName"/>
!                 <Attribute name="font" value="(Literal)Dialog bold 24"/>
!                 <Attribute name="foreground" value="(Literal)0xFF2222"/>
              </Component>
- 
              <Component type="org.mc4j.console.dashboard.components.RefreshControlComponent">
                  <Constraint type="BorderConstraints" direction="EAST"/>
!                 <Attribute name="refreshDelay" value="(Literal)2000"/>
!             </Component>
! 
!             <Component type="javax.swing.JTextArea">
!                 <Constraint type="BorderConstraints" direction="SOUTH"/>
!                 <Attribute name="text" value="DashboardDescription"/>
!                 <Attribute name="font" value="(Literal)Dialog bold 16"/>
!                 <Attribute name="opaque" value="(Literal)false"/>
!                 <Attribute name="editable" value="(Literal)false"/>
              </Component>
- 
          </Content>
      </Component>
--- 15,47 ----
    <Content>
  
!     <!-- *** The header section displays title and a refresh control *** -->
      <Component type="javax.swing.JPanel">
          <Constraint type="BorderConstraints" direction="NORTH"/>
          <LayoutManager type="java.awt.BorderLayout"/>
+         <Border type="javax.swing.border.EmptyBorder" top="(Literal)2" left="(Literal)5" bottom="(Literal)2" right="(Literal)5"/>
          <Content>
!             <Component type="javax.swing.JPanel">
                  <Constraint type="BorderConstraints" direction="CENTER"/>
!                 <LayoutManager type="java.awt.BorderLayout"/>
!                 <Content>
!                     <Component type="javax.swing.JLabel" id="titleLable">
!                         <Constraint type="BorderConstraints" direction="CENTER"/>
!                         <Attribute name="text" value="DashboardName"/>
!                         <Attribute name="font" value="(Literal)SansSerif bold 20"/>
!                         <Attribute name="foreground" value="(Literal)0x666666"/>
!                     </Component>
!                     <Component type="javax.swing.JTextArea">
!                         <Constraint type="BorderConstraints" direction="SOUTH"/>
!                         <Attribute name="text" value="DashboardDescription"/>
!                         <Attribute name="font" value="(Literal)DialogInput bold 14"/>
!                         <Attribute name="opaque" value="(Literal)false"/>
!                         <Attribute name="editable" value="(Literal)false"/>
!                     </Component>
!                 </Content>
              </Component>
              <Component type="org.mc4j.console.dashboard.components.RefreshControlComponent">
                  <Constraint type="BorderConstraints" direction="EAST"/>
!                 <Attribute name="refreshDelay" value="(Literal)30000"/>
              </Component>
          </Content>
      </Component>

Index: Weblogic_EJBTransactionRuntime.xml
===================================================================
RCS file: /cvsroot/mc4j/mc4j/application/dashboards/weblogic/Weblogic_EJBTransactionRuntime.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Weblogic_EJBTransactionRuntime.xml	8 Apr 2004 15:07:17 -0000	1.2
--- Weblogic_EJBTransactionRuntime.xml	8 Apr 2004 21:38:27 -0000	1.3
***************
*** 15,43 ****
    <Content>
  
!     <!-- *** Header *** -->
      <Component type="javax.swing.JPanel">
          <Constraint type="BorderConstraints" direction="NORTH"/>
          <LayoutManager type="java.awt.BorderLayout"/>
          <Content>
!             <Component type="javax.swing.JLabel" id="titleLable">
                  <Constraint type="BorderConstraints" direction="CENTER"/>
!                 <Attribute name="text" value="DashboardName"/>
!                 <Attribute name="font" value="(Literal)Dialog bold 24"/>
!                 <Attribute name="foreground" value="(Literal)0xFF2222"/>
              </Component>
- 
              <Component type="org.mc4j.console.dashboard.components.RefreshControlComponent">
                  <Constraint type="BorderConstraints" direction="EAST"/>
!                 <Attribute name="refreshDelay" value="(Literal)2000"/>
!             </Component>
! 
!             <Component type="javax.swing.JTextArea">
!                 <Constraint type="BorderConstraints" direction="SOUTH"/>
!                 <Attribute name="text" value="DashboardDescription"/>
!                 <Attribute name="font" value="(Literal)Dialog bold 16"/>
!                 <Attribute name="opaque" value="(Literal)false"/>
!                 <Attribute name="editable" value="(Literal)false"/>
              </Component>
- 
          </Content>
      </Component>
--- 15,47 ----
    <Content>
  
!     <!-- *** The header section displays title and a refresh control *** -->
      <Component type="javax.swing.JPanel">
          <Constraint type="BorderConstraints" direction="NORTH"/>
          <LayoutManager type="java.awt.BorderLayout"/>
+         <Border type="javax.swing.border.EmptyBorder" top="(Literal)2" left="(Literal)5" bottom="(Literal)2" right="(Literal)5"/>
          <Content>
!             <Component type="javax.swing.JPanel">
                  <Constraint type="BorderConstraints" direction="CENTER"/>
!                 <LayoutManager type="java.awt.BorderLayout"/>
!                 <Content>
!                     <Component type="javax.swing.JLabel" id="titleLable">
!                         <Constraint type="BorderConstraints" direction="CENTER"/>
!                         <Attribute name="text" value="DashboardName"/>
!                         <Attribute name="font" value="(Literal)SansSerif bold 20"/>
!                         <Attribute name="foreground" value="(Literal)0x666666"/>
!                     </Component>
!                     <Component type="javax.swing.JTextArea">
!                         <Constraint type="BorderConstraints" direction="SOUTH"/>
!                         <Attribute name="text" value="DashboardDescription"/>
!                         <Attribute name="font" value="(Literal)DialogInput bold 14"/>
!                         <Attribute name="opaque" value="(Literal)false"/>
!                         <Attribute name="editable" value="(Literal)false"/>
!                     </Component>
!                 </Content>
              </Component>
              <Component type="org.mc4j.console.dashboard.components.RefreshControlComponent">
                  <Constraint type="BorderConstraints" direction="EAST"/>
!                 <Attribute name="refreshDelay" value="(Literal)30000"/>
              </Component>
          </Content>
      </Component>

Index: Weblogic_EJBPoolRuntimeTable.xml
===================================================================
RCS file: /cvsroot/mc4j/mc4j/application/dashboards/weblogic/Weblogic_EJBPoolRuntimeTable.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Weblogic_EJBPoolRuntimeTable.xml	8 Apr 2004 15:07:16 -0000	1.2
--- Weblogic_EJBPoolRuntimeTable.xml	8 Apr 2004 21:38:27 -0000	1.3
***************
*** 15,43 ****
    <Content>
  
!     <!-- *** Header *** -->
      <Component type="javax.swing.JPanel">
          <Constraint type="BorderConstraints" direction="NORTH"/>
          <LayoutManager type="java.awt.BorderLayout"/>
          <Content>
!             <Component type="javax.swing.JLabel" id="titleLable">
                  <Constraint type="BorderConstraints" direction="CENTER"/>
!                 <Attribute name="text" value="DashboardName"/>
!                 <Attribute name="font" value="(Literal)Dialog bold 24"/>
!                 <Attribute name="foreground" value="(Literal)0xFF2222"/>
              </Component>
- 
              <Component type="org.mc4j.console.dashboard.components.RefreshControlComponent">
                  <Constraint type="BorderConstraints" direction="EAST"/>
!                 <Attribute name="refreshDelay" value="(Literal)2000"/>
!             </Component>
! 
!             <Component type="javax.swing.JTextArea">
!                 <Constraint type="BorderConstraints" direction="SOUTH"/>
!                 <Attribute name="text" value="DashboardDescription"/>
!                 <Attribute name="font" value="(Literal)Dialog bold 16"/>
!                 <Attribute name="opaque" value="(Literal)false"/>
!                 <Attribute name="editable" value="(Literal)false"/>
              </Component>
- 
          </Content>
      </Component>
--- 15,47 ----
    <Content>
  
!     <!-- *** The header section displays title and a refresh control *** -->
      <Component type="javax.swing.JPanel">
          <Constraint type="BorderConstraints" direction="NORTH"/>
          <LayoutManager type="java.awt.BorderLayout"/>
+         <Border type="javax.swing.border.EmptyBorder" top="(Literal)2" left="(Literal)5" bottom="(Literal)2" right="(Literal)5"/>
          <Content>
!             <Component type="javax.swing.JPanel">
                  <Constraint type="BorderConstraints" direction="CENTER"/>
!                 <LayoutManager type="java.awt.BorderLayout"/>
!                 <Content>
!                     <Component type="javax.swing.JLabel" id="titleLable">
!                         <Constraint type="BorderConstraints" direction="CENTER"/>
!                         <Attribute name="text" value="DashboardName"/>
!                         <Attribute name="font" value="(Literal)SansSerif bold 20"/>
!                         <Attribute name="foreground" value="(Literal)0x666666"/>
!                     </Component>
!                     <Component type="javax.swing.JTextArea">
!                         <Constraint type="BorderConstraints" direction="SOUTH"/>
!                         <Attribute name="text" value="DashboardDescription"/>
!                         <Attribute name="font" value="(Literal)DialogInput bold 14"/>
!                         <Attribute name="opaque" value="(Literal)false"/>
!                         <Attribute name="editable" value="(Literal)false"/>
!                     </Component>
!                 </Content>
              </Component>
              <Component type="org.mc4j.console.dashboard.components.RefreshControlComponent">
                  <Constraint type="BorderConstraints" direction="EAST"/>
!                 <Attribute name="refreshDelay" value="(Literal)30000"/>
              </Component>
          </Content>
      </Component>

Index: Weblogic_ExecuteQueue_Stats.xml
===================================================================
RCS file: /cvsroot/mc4j/mc4j/application/dashboards/weblogic/Weblogic_ExecuteQueue_Stats.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Weblogic_ExecuteQueue_Stats.xml	8 Apr 2004 15:07:17 -0000	1.2
--- Weblogic_ExecuteQueue_Stats.xml	8 Apr 2004 21:38:27 -0000	1.3
***************
*** 16,44 ****
    <Content>
      
!     <!-- *** Header *** -->
      <Component type="javax.swing.JPanel">
          <Constraint type="BorderConstraints" direction="NORTH"/>
          <LayoutManager type="java.awt.BorderLayout"/>
          <Content>
!             <Component type="javax.swing.JLabel" id="titleLable">
                  <Constraint type="BorderConstraints" direction="CENTER"/>
!                 <Attribute name="text" value="DashboardName"/>
!                 <Attribute name="font" value="(Literal)Dialog bold 24"/>
!                 <Attribute name="foreground" value="(Literal)0xFF2222"/>
!             </Component>
! 
!             <Component type="org.mc4j.console.dashboard.components.RefreshControlComponent">
!                 <Constraint type="BorderConstraints" direction="EAST"/>
!                 <Attribute name="refreshDelay" value="(Literal)2000"/>
!             </Component>
! 
!             <Component type="javax.swing.JTextArea">
!                 <Constraint type="BorderConstraints" direction="SOUTH"/>
!                 <Attribute name="text" value="DashboardDescription"/>
!                 <Attribute name="font" value="(Literal)Dialog bold 16"/>
!                 <Attribute name="opaque" value="(Literal)false"/>
!                 <Attribute name="editable" value="(Literal)false"/>
              </Component>
- 
          </Content>
      </Component>
--- 16,44 ----
    <Content>
      
!     <!-- *** The header section displays title and a refresh control *** -->
      <Component type="javax.swing.JPanel">
          <Constraint type="BorderConstraints" direction="NORTH"/>
          <LayoutManager type="java.awt.BorderLayout"/>
+         <Border type="javax.swing.border.EmptyBorder" top="(Literal)2" left="(Literal)5" bottom="(Literal)2" right="(Literal)5"/>
          <Content>
!             <Component type="javax.swing.JPanel">
                  <Constraint type="BorderConstraints" direction="CENTER"/>
!                 <LayoutManager type="java.awt.BorderLayout"/>
!                 <Content>
!                     <Component type="javax.swing.JLabel" id="titleLable">
!                         <Constraint type="BorderConstraints" direction="CENTER"/>
!                         <Attribute name="text" value="DashboardName"/>
!                         <Attribute name="font" value="(Literal)SansSerif bold 20"/>
!                         <Attribute name="foreground" value="(Literal)0x666666"/>
!                     </Component>
!                     <Component type="javax.swing.JTextArea">
!                         <Constraint type="BorderConstraints" direction="SOUTH"/>
!                         <Attribute name="text" value="DashboardDescription"/>
!                         <Attribute name="font" value="(Literal)DialogInput bold 14"/>
!                         <Attribute name="opaque" value="(Literal)false"/>
!                         <Attribute name="editable" value="(Literal)false"/>
!                     </Component>
!                 </Content>
              </Component>
          </Content>
      </Component>

[Mc4j-cvs] mc4j/application/dashboards/jboss JBoss_MQ_QueueTable.xml,1.3,1.4 JBoss_MQ_TopicTable.xml,1.3,1.4 JBoss_ServerInfoMBean.xml,1.3,1.4 JBoss_ServerInfo_Memory.xml,1.2,1.3 JBoss_System_Server_Control.xml,1.2,1.3 JBoss_WebTable.xml,1.2,1.3 JBoss_Web_Jetty.xml,1.2,1.3 JBoss_Web_JettyNew.xml,1.2,1.3

[Greg H. <gh...@us...>]

Update of /cvsroot/mc4j/mc4j/application/dashboards/jboss
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18616/application/dashboards/jboss

Modified Files:
	JBoss_MQ_QueueTable.xml JBoss_MQ_TopicTable.xml 
	JBoss_ServerInfoMBean.xml JBoss_ServerInfo_Memory.xml 
	JBoss_System_Server_Control.xml JBoss_WebTable.xml 
	JBoss_Web_Jetty.xml JBoss_Web_JettyNew.xml 
Log Message:
Rebuilt the header to make it take up less space and be more appealing.

Index: JBoss_Web_JettyNew.xml
===================================================================
RCS file: /cvsroot/mc4j/mc4j/application/dashboards/jboss/JBoss_Web_JettyNew.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** JBoss_Web_JettyNew.xml	8 Apr 2004 15:07:16 -0000	1.2
--- JBoss_Web_JettyNew.xml	8 Apr 2004 21:38:26 -0000	1.3
***************
*** 16,44 ****
    <Content>
      
!     <!-- *** Header *** -->
      <Component type="javax.swing.JPanel">
          <Constraint type="BorderConstraints" direction="NORTH"/>
          <LayoutManager type="java.awt.BorderLayout"/>
          <Content>
!             <Component type="javax.swing.JLabel" id="titleLable">
                  <Constraint type="BorderConstraints" direction="CENTER"/>
!                 <Attribute name="text" value="DashboardName"/>
!                 <Attribute name="font" value="(Literal)Dialog bold 24"/>
!                 <Attribute name="foreground" value="(Literal)0xFF2222"/>
              </Component>
- 
              <Component type="org.mc4j.console.dashboard.components.RefreshControlComponent">
                  <Constraint type="BorderConstraints" direction="EAST"/>
!                 <Attribute name="refreshDelay" value="(Literal)2000"/>
!             </Component>
! 
!             <Component type="javax.swing.JTextArea">
!                 <Constraint type="BorderConstraints" direction="SOUTH"/>
!                 <Attribute name="text" value="DashboardDescription"/>
!                 <Attribute name="font" value="(Literal)Dialog bold 16"/>
!                 <Attribute name="opaque" value="(Literal)false"/>
!                 <Attribute name="editable" value="(Literal)false"/>
              </Component>
- 
          </Content>
      </Component>
--- 16,48 ----
    <Content>
      
!     <!-- *** The header section displays title and a refresh control *** -->
      <Component type="javax.swing.JPanel">
          <Constraint type="BorderConstraints" direction="NORTH"/>
          <LayoutManager type="java.awt.BorderLayout"/>
+         <Border type="javax.swing.border.EmptyBorder" top="(Literal)2" left="(Literal)5" bottom="(Literal)2" right="(Literal)5"/>
          <Content>
!             <Component type="javax.swing.JPanel">
                  <Constraint type="BorderConstraints" direction="CENTER"/>
!                 <LayoutManager type="java.awt.BorderLayout"/>
!                 <Content>
!                     <Component type="javax.swing.JLabel" id="titleLable">
!                         <Constraint type="BorderConstraints" direction="CENTER"/>
!                         <Attribute name="text" value="DashboardName"/>
!                         <Attribute name="font" value="(Literal)SansSerif bold 20"/>
!                         <Attribute name="foreground" value="(Literal)0x666666"/>
!                     </Component>
!                     <Component type="javax.swing.JTextArea">
!                         <Constraint type="BorderConstraints" direction="SOUTH"/>
!                         <Attribute name="text" value="DashboardDescription"/>
!                         <Attribute name="font" value="(Literal)DialogInput bold 14"/>
!                         <Attribute name="opaque" value="(Literal)false"/>
!                         <Attribute name="editable" value="(Literal)false"/>
!                     </Component>
!                 </Content>
              </Component>
              <Component type="org.mc4j.console.dashboard.components.RefreshControlComponent">
                  <Constraint type="BorderConstraints" direction="EAST"/>
!                 <Attribute name="refreshDelay" value="(Literal)30000"/>
              </Component>
          </Content>
      </Component>

Index: JBoss_MQ_QueueTable.xml
===================================================================
RCS file: /cvsroot/mc4j/mc4j/application/dashboards/jboss/JBoss_MQ_QueueTable.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** JBoss_MQ_QueueTable.xml	8 Apr 2004 15:07:16 -0000	1.3
--- JBoss_MQ_QueueTable.xml	8 Apr 2004 21:38:26 -0000	1.4
***************
*** 15,43 ****
    <Content>
  
!     <!-- *** Header *** -->
      <Component type="javax.swing.JPanel">
          <Constraint type="BorderConstraints" direction="NORTH"/>
          <LayoutManager type="java.awt.BorderLayout"/>
          <Content>
!             <Component type="javax.swing.JLabel" id="titleLable">
                  <Constraint type="BorderConstraints" direction="CENTER"/>
!                 <Attribute name="text" value="DashboardName"/>
!                 <Attribute name="font" value="(Literal)Dialog bold 24"/>
!                 <Attribute name="foreground" value="(Literal)0xFF2222"/>
              </Component>
- 
              <Component type="org.mc4j.console.dashboard.components.RefreshControlComponent">
                  <Constraint type="BorderConstraints" direction="EAST"/>
!                 <Attribute name="refreshDelay" value="(Literal)2000"/>
!             </Component>
! 
!             <Component type="javax.swing.JTextArea">
!                 <Constraint type="BorderConstraints" direction="SOUTH"/>
!                 <Attribute name="text" value="DashboardDescription"/>
!                 <Attribute name="font" value="(Literal)Dialog bold 16"/>
!                 <Attribute name="opaque" value="(Literal)false"/>
!                 <Attribute name="editable" value="(Literal)false"/>
              </Component>
- 
          </Content>
      </Component>
--- 15,47 ----
    <Content>
  
!     <!-- *** The header section displays title and a refresh control *** -->
      <Component type="javax.swing.JPanel">
          <Constraint type="BorderConstraints" direction="NORTH"/>
          <LayoutManager type="java.awt.BorderLayout"/>
+         <Border type="javax.swing.border.EmptyBorder" top="(Literal)2" left="(Literal)5" bottom="(Literal)2" right="(Literal)5"/>
          <Content>
!             <Component type="javax.swing.JPanel">
                  <Constraint type="BorderConstraints" direction="CENTER"/>
!                 <LayoutManager type="java.awt.BorderLayout"/>
!                 <Content>
!                     <Component type="javax.swing.JLabel" id="titleLable">
!                         <Constraint type="BorderConstraints" direction="CENTER"/>
!                         <Attribute name="text" value="DashboardName"/>
!                         <Attribute name="font" value="(Literal)SansSerif bold 20"/>
!                         <Attribute name="foreground" value="(Literal)0x666666"/>
!                     </Component>
!                     <Component type="javax.swing.JTextArea">
!                         <Constraint type="BorderConstraints" direction="SOUTH"/>
!                         <Attribute name="text" value="DashboardDescription"/>
!                         <Attribute name="font" value="(Literal)DialogInput bold 14"/>
!                         <Attribute name="opaque" value="(Literal)false"/>
!                         <Attribute name="editable" value="(Literal)false"/>
!                     </Component>
!                 </Content>
              </Component>
              <Component type="org.mc4j.console.dashboard.components.RefreshControlComponent">
                  <Constraint type="BorderConstraints" direction="EAST"/>
!                 <Attribute name="refreshDelay" value="(Literal)30000"/>
              </Component>
          </Content>
      </Component>

Index: JBoss_MQ_TopicTable.xml
===================================================================
RCS file: /cvsroot/mc4j/mc4j/application/dashboards/jboss/JBoss_MQ_TopicTable.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** JBoss_MQ_TopicTable.xml	8 Apr 2004 15:07:16 -0000	1.3
--- JBoss_MQ_TopicTable.xml	8 Apr 2004 21:38:26 -0000	1.4
***************
*** 15,47 ****
    <Content>
  
!     <!-- *** Header *** -->
      <Component type="javax.swing.JPanel">
          <Constraint type="BorderConstraints" direction="NORTH"/>
          <LayoutManager type="java.awt.BorderLayout"/>
          <Content>
!             <Component type="javax.swing.JLabel" id="titleLable">
                  <Constraint type="BorderConstraints" direction="CENTER"/>
!                 <Attribute name="text" value="DashboardName"/>
!                 <Attribute name="font" value="(Literal)Dialog bold 24"/>
!                 <Attribute name="foreground" value="(Literal)0xFF2222"/>
              </Component>
- 
              <Component type="org.mc4j.console.dashboard.components.RefreshControlComponent">
                  <Constraint type="BorderConstraints" direction="EAST"/>
!                 <Attribute name="refreshDelay" value="(Literal)2000"/>
!             </Component>
! 
!             <Component type="javax.swing.JTextArea">
!                 <Constraint type="BorderConstraints" direction="SOUTH"/>
!                 <Attribute name="text" value="DashboardDescription"/>
!                 <Attribute name="font" value="(Literal)Dialog bold 16"/>
!                 <Attribute name="opaque" value="(Literal)false"/>
!                 <Attribute name="editable" value="(Literal)false"/>
              </Component>
- 
          </Content>
      </Component>
  
- 
      <Component type="org.mc4j.console.dashboard.components.AttributeTableComponent">
          <Attribute name="beanList" value="QueueTopicBeanList"/>
--- 15,50 ----
    <Content>
  
!     <!-- *** The header section displays title and a refresh control *** -->
      <Component type="javax.swing.JPanel">
          <Constraint type="BorderConstraints" direction="NORTH"/>
          <LayoutManager type="java.awt.BorderLayout"/>
+         <Border type="javax.swing.border.EmptyBorder" top="(Literal)2" left="(Literal)5" bottom="(Literal)2" right="(Literal)5"/>
          <Content>
!             <Component type="javax.swing.JPanel">
                  <Constraint type="BorderConstraints" direction="CENTER"/>
!                 <LayoutManager type="java.awt.BorderLayout"/>
!                 <Content>
!                     <Component type="javax.swing.JLabel" id="titleLable">
!                         <Constraint type="BorderConstraints" direction="CENTER"/>
!                         <Attribute name="text" value="DashboardName"/>
!                         <Attribute name="font" value="(Literal)SansSerif bold 20"/>
!                         <Attribute name="foreground" value="(Literal)0x666666"/>
!                     </Component>
!                     <Component type="javax.swing.JTextArea">
!                         <Constraint type="BorderConstraints" direction="SOUTH"/>
!                         <Attribute name="text" value="DashboardDescription"/>
!                         <Attribute name="font" value="(Literal)DialogInput bold 14"/>
!                         <Attribute name="opaque" value="(Literal)false"/>
!                         <Attribute name="editable" value="(Literal)false"/>
!                     </Component>
!                 </Content>
              </Component>
              <Component type="org.mc4j.console.dashboard.components.RefreshControlComponent">
                  <Constraint type="BorderConstraints" direction="EAST"/>
!                 <Attribute name="refreshDelay" value="(Literal)30000"/>
              </Component>
          </Content>
      </Component>
  
      <Component type="org.mc4j.console.dashboard.components.AttributeTableComponent">
          <Attribute name="beanList" value="QueueTopicBeanList"/>

Index: JBoss_ServerInfoMBean.xml
===================================================================
RCS file: /cvsroot/mc4j/mc4j/application/dashboards/jboss/JBoss_ServerInfoMBean.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** JBoss_ServerInfoMBean.xml	8 Apr 2004 15:07:16 -0000	1.3
--- JBoss_ServerInfoMBean.xml	8 Apr 2004 21:38:26 -0000	1.4
***************
*** 21,44 ****
    <Content>
      
      <Component type="javax.swing.JPanel">
          <Constraint type="BorderConstraints" direction="NORTH"/>
!         <!--LayoutManager type="java.awt.GridBagLayout"/-->
!         <LayoutManager type="java.awt.GridLayout" rows="2" cols="1"/>
          <Content>
!             <Component type="javax.swing.JLabel" id="titleLable">
!                 <!--Constraint type="java.awt.GridBagConstraints" anchor="NORTHWEST" fill="HORIZONTAL" gridx="1" gridy="1"/-->
!                 <Attribute name="text" value="(Literal)JBoss Management Dashboard"/>
!                 <Attribute name="font" value="(Literal)Dialog bold 24"/>
!                 <Attribute name="foreground" value="(Literal)0xFF2222"/>
!                 
              </Component>
!             
!             <Component type="javax.swing.JTextArea">
!                 <!--Constraint type="java.awt.GridBagConstraints" anchor="NORTH" gridx="1" gridy="2"/-->
!                 <Attribute name="text" value="(Literal)This Dashboard displays important information about the status of your JBoss Server."/>
!                 <Attribute name="opaque" value="(Literal)false"/>
!                 <Attribute name="editable" value="(Literal)false"/>
              </Component>
-             
          </Content>
      </Component>
--- 21,53 ----
    <Content>
      
+     <!-- *** The header section displays title and a refresh control *** -->
      <Component type="javax.swing.JPanel">
          <Constraint type="BorderConstraints" direction="NORTH"/>
!         <LayoutManager type="java.awt.BorderLayout"/>
!         <Border type="javax.swing.border.EmptyBorder" top="(Literal)2" left="(Literal)5" bottom="(Literal)2" right="(Literal)5"/>
          <Content>
!             <Component type="javax.swing.JPanel">
!                 <Constraint type="BorderConstraints" direction="CENTER"/>
!                 <LayoutManager type="java.awt.BorderLayout"/>
!                 <Content>
!                     <Component type="javax.swing.JLabel" id="titleLable">
!                         <Constraint type="BorderConstraints" direction="CENTER"/>
!                         <Attribute name="text" value="DashboardName"/>
!                         <Attribute name="font" value="(Literal)SansSerif bold 20"/>
!                         <Attribute name="foreground" value="(Literal)0x666666"/>
!                     </Component>
!                     <Component type="javax.swing.JTextArea">
!                         <Constraint type="BorderConstraints" direction="SOUTH"/>
!                         <Attribute name="text" value="DashboardDescription"/>
!                         <Attribute name="font" value="(Literal)DialogInput bold 14"/>
!                         <Attribute name="opaque" value="(Literal)false"/>
!                         <Attribute name="editable" value="(Literal)false"/>
!                     </Component>
!                 </Content>
              </Component>
!             <Component type="org.mc4j.console.dashboard.components.RefreshControlComponent">
!                 <Constraint type="BorderConstraints" direction="EAST"/>
!                 <Attribute name="refreshDelay" value="(Literal)30000"/>
              </Component>
          </Content>
      </Component>

Index: JBoss_ServerInfo_Memory.xml
===================================================================
RCS file: /cvsroot/mc4j/mc4j/application/dashboards/jboss/JBoss_ServerInfo_Memory.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** JBoss_ServerInfo_Memory.xml	8 Apr 2004 15:07:16 -0000	1.2
--- JBoss_ServerInfo_Memory.xml	8 Apr 2004 21:38:26 -0000	1.3
***************
*** 27,50 ****
    <Content>
      
      <Component type="javax.swing.JPanel">
          <Constraint type="BorderConstraints" direction="NORTH"/>
!         <!--LayoutManager type="java.awt.GridBagLayout"/-->
!         <LayoutManager type="java.awt.GridLayout" rows="2" cols="1"/>
          <Content>
!             <Component type="javax.swing.JLabel" id="titleLable">
!                 <!--Constraint type="java.awt.GridBagConstraints" anchor="NORTHWEST" fill="HORIZONTAL" gridx="1" gridy="1"/-->
!                 <Attribute name="text" value="(Literal)JBoss Memory Status"/>
!                 <Attribute name="font" value="(Literal)Dialog bold 24"/>
!                 <Attribute name="foreground" value="(Literal)0xFF2222"/>
!                 
!             </Component>
!             
!             <Component type="javax.swing.JTextArea">
!                 <!--Constraint type="java.awt.GridBagConstraints" anchor="NORTH" gridx="1" gridy="2"/-->
!                 <Attribute name="text" value="(Literal)This Dashboard displays important information about the status of your JBoss Server."/>
!                 <Attribute name="opaque" value="(Literal)false"/>
!                 <Attribute name="editable" value="(Literal)false"/>
              </Component>
-             
          </Content>
      </Component>
--- 27,55 ----
    <Content>
      
+     <!-- *** The header section displays title and a refresh control *** -->
      <Component type="javax.swing.JPanel">
          <Constraint type="BorderConstraints" direction="NORTH"/>
!         <LayoutManager type="java.awt.BorderLayout"/>
!         <Border type="javax.swing.border.EmptyBorder" top="(Literal)2" left="(Literal)5" bottom="(Literal)2" right="(Literal)5"/>
          <Content>
!             <Component type="javax.swing.JPanel">
!                 <Constraint type="BorderConstraints" direction="CENTER"/>
!                 <LayoutManager type="java.awt.BorderLayout"/>
!                 <Content>
!                     <Component type="javax.swing.JLabel" id="titleLable">
!                         <Constraint type="BorderConstraints" direction="CENTER"/>
!                         <Attribute name="text" value="DashboardName"/>
!                         <Attribute name="font" value="(Literal)SansSerif bold 20"/>
!                         <Attribute name="foreground" value="(Literal)0x666666"/>
!                     </Component>
!                     <Component type="javax.swing.JTextArea">
!                         <Constraint type="BorderConstraints" direction="SOUTH"/>
!                         <Attribute name="text" value="DashboardDescription"/>
!                         <Attribute name="font" value="(Literal)DialogInput bold 14"/>
!                         <Attribute name="opaque" value="(Literal)false"/>
!                         <Attribute name="editable" value="(Literal)false"/>
!                     </Component>
!                 </Content>
              </Component>
          </Content>
      </Component>

Index: JBoss_Web_Jetty.xml
===================================================================
RCS file: /cvsroot/mc4j/mc4j/application/dashboards/jboss/JBoss_Web_Jetty.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** JBoss_Web_Jetty.xml	8 Apr 2004 15:07:16 -0000	1.2
--- JBoss_Web_Jetty.xml	8 Apr 2004 21:38:26 -0000	1.3
***************
*** 16,44 ****
    <Content>
      
!     <!-- *** Header *** -->
      <Component type="javax.swing.JPanel">
          <Constraint type="BorderConstraints" direction="NORTH"/>
          <LayoutManager type="java.awt.BorderLayout"/>
          <Content>
!             <Component type="javax.swing.JLabel" id="titleLable">
                  <Constraint type="BorderConstraints" direction="CENTER"/>
!                 <Attribute name="text" value="DashboardName"/>
!                 <Attribute name="font" value="(Literal)Dialog bold 24"/>
!                 <Attribute name="foreground" value="(Literal)0xFF2222"/>
              </Component>
- 
              <Component type="org.mc4j.console.dashboard.components.RefreshControlComponent">
                  <Constraint type="BorderConstraints" direction="EAST"/>
!                 <Attribute name="refreshDelay" value="(Literal)2000"/>
!             </Component>
! 
!             <Component type="javax.swing.JTextArea">
!                 <Constraint type="BorderConstraints" direction="SOUTH"/>
!                 <Attribute name="text" value="DashboardDescription"/>
!                 <Attribute name="font" value="(Literal)Dialog bold 16"/>
!                 <Attribute name="opaque" value="(Literal)false"/>
!                 <Attribute name="editable" value="(Literal)false"/>
              </Component>
- 
          </Content>
      </Component>
--- 16,48 ----
    <Content>
      
!     <!-- *** The header section displays title and a refresh control *** -->
      <Component type="javax.swing.JPanel">
          <Constraint type="BorderConstraints" direction="NORTH"/>
          <LayoutManager type="java.awt.BorderLayout"/>
+         <Border type="javax.swing.border.EmptyBorder" top="(Literal)2" left="(Literal)5" bottom="(Literal)2" right="(Literal)5"/>
          <Content>
!             <Component type="javax.swing.JPanel">
                  <Constraint type="BorderConstraints" direction="CENTER"/>
!                 <LayoutManager type="java.awt.BorderLayout"/>
!                 <Content>
!                     <Component type="javax.swing.JLabel" id="titleLable">
!                         <Constraint type="BorderConstraints" direction="CENTER"/>
!                         <Attribute name="text" value="DashboardName"/>
!                         <Attribute name="font" value="(Literal)SansSerif bold 20"/>
!                         <Attribute name="foreground" value="(Literal)0x666666"/>
!                     </Component>
!                     <Component type="javax.swing.JTextArea">
!                         <Constraint type="BorderConstraints" direction="SOUTH"/>
!                         <Attribute name="text" value="DashboardDescription"/>
!                         <Attribute name="font" value="(Literal)DialogInput bold 14"/>
!                         <Attribute name="opaque" value="(Literal)false"/>
!                         <Attribute name="editable" value="(Literal)false"/>
!                     </Component>
!                 </Content>
              </Component>
              <Component type="org.mc4j.console.dashboard.components.RefreshControlComponent">
                  <Constraint type="BorderConstraints" direction="EAST"/>
!                 <Attribute name="refreshDelay" value="(Literal)30000"/>
              </Component>
          </Content>
      </Component>

Index: JBoss_System_Server_Control.xml
===================================================================
RCS file: /cvsroot/mc4j/mc4j/application/dashboards/jboss/JBoss_System_Server_Control.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** JBoss_System_Server_Control.xml	8 Apr 2004 15:07:16 -0000	1.2
--- JBoss_System_Server_Control.xml	8 Apr 2004 21:38:26 -0000	1.3
***************
*** 19,42 ****
    <Content>
      
      <Component type="javax.swing.JPanel">
          <Constraint type="BorderConstraints" direction="NORTH"/>
!         <!--LayoutManager type="java.awt.GridBagLayout"/-->
!         <LayoutManager type="java.awt.GridLayout" rows="2" cols="1"/>
          <Content>
!             <Component type="javax.swing.JLabel" id="titleLable">
!                 <!--Constraint type="java.awt.GridBagConstraints" anchor="NORTHWEST" fill="HORIZONTAL" gridx="1" gridy="1"/-->
!                 <Attribute name="text" value="(Literal)JBoss Server Control"/>
!                 <Attribute name="font" value="(Literal)Dialog bold 24"/>
!                 <Attribute name="foreground" value="(Literal)0xFF2222"/>
!                 
              </Component>
!             
!             <Component type="javax.swing.JTextArea">
!                 <!--Constraint type="java.awt.GridBagConstraints" anchor="NORTH" gridx="1" gridy="2"/-->
!                 <Attribute name="text" value="(Literal)This Dashboard has control operations for the JBoss Server."/>
!                 <Attribute name="opaque" value="(Literal)false"/>
!                 <Attribute name="editable" value="(Literal)false"/>
              </Component>
-             
          </Content>
      </Component>
--- 19,51 ----
    <Content>
      
+     <!-- *** The header section displays title and a refresh control *** -->
      <Component type="javax.swing.JPanel">
          <Constraint type="BorderConstraints" direction="NORTH"/>
!         <LayoutManager type="java.awt.BorderLayout"/>
!         <Border type="javax.swing.border.EmptyBorder" top="(Literal)2" left="(Literal)5" bottom="(Literal)2" right="(Literal)5"/>
          <Content>
!             <Component type="javax.swing.JPanel">
!                 <Constraint type="BorderConstraints" direction="CENTER"/>
!                 <LayoutManager type="java.awt.BorderLayout"/>
!                 <Content>
!                     <Component type="javax.swing.JLabel" id="titleLable">
!                         <Constraint type="BorderConstraints" direction="CENTER"/>
!                         <Attribute name="text" value="DashboardName"/>
!                         <Attribute name="font" value="(Literal)SansSerif bold 20"/>
!                         <Attribute name="foreground" value="(Literal)0x666666"/>
!                     </Component>
!                     <Component type="javax.swing.JTextArea">
!                         <Constraint type="BorderConstraints" direction="SOUTH"/>
!                         <Attribute name="text" value="DashboardDescription"/>
!                         <Attribute name="font" value="(Literal)DialogInput bold 14"/>
!                         <Attribute name="opaque" value="(Literal)false"/>
!                         <Attribute name="editable" value="(Literal)false"/>
!                     </Component>
!                 </Content>
              </Component>
!             <Component type="org.mc4j.console.dashboard.components.RefreshControlComponent">
!                 <Constraint type="BorderConstraints" direction="EAST"/>
!                 <Attribute name="refreshDelay" value="(Literal)30000"/>
              </Component>
          </Content>
      </Component>

Index: JBoss_WebTable.xml
===================================================================
RCS file: /cvsroot/mc4j/mc4j/application/dashboards/jboss/JBoss_WebTable.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** JBoss_WebTable.xml	8 Apr 2004 15:07:16 -0000	1.2
--- JBoss_WebTable.xml	8 Apr 2004 21:38:26 -0000	1.3
***************
*** 15,43 ****
    <Content>
  
!     <!-- *** Header *** -->
      <Component type="javax.swing.JPanel">
          <Constraint type="BorderConstraints" direction="NORTH"/>
          <LayoutManager type="java.awt.BorderLayout"/>
          <Content>
!             <Component type="javax.swing.JLabel" id="titleLable">
                  <Constraint type="BorderConstraints" direction="CENTER"/>
!                 <Attribute name="text" value="DashboardName"/>
!                 <Attribute name="font" value="(Literal)Dialog bold 24"/>
!                 <Attribute name="foreground" value="(Literal)0xFF2222"/>
              </Component>
- 
              <Component type="org.mc4j.console.dashboard.components.RefreshControlComponent">
                  <Constraint type="BorderConstraints" direction="EAST"/>
!                 <Attribute name="refreshDelay" value="(Literal)2000"/>
!             </Component>
! 
!             <Component type="javax.swing.JTextArea">
!                 <Constraint type="BorderConstraints" direction="SOUTH"/>
!                 <Attribute name="text" value="DashboardDescription"/>
!                 <Attribute name="font" value="(Literal)Dialog bold 16"/>
!                 <Attribute name="opaque" value="(Literal)false"/> 
!                 <Attribute name="editable" value="(Literal)false"/>
              </Component>
- 
          </Content>
      </Component>
--- 15,47 ----
    <Content>
  
!     <!-- *** The header section displays title and a refresh control *** -->
      <Component type="javax.swing.JPanel">
          <Constraint type="BorderConstraints" direction="NORTH"/>
          <LayoutManager type="java.awt.BorderLayout"/>
+         <Border type="javax.swing.border.EmptyBorder" top="(Literal)2" left="(Literal)5" bottom="(Literal)2" right="(Literal)5"/>
          <Content>
!             <Component type="javax.swing.JPanel">
                  <Constraint type="BorderConstraints" direction="CENTER"/>
!                 <LayoutManager type="java.awt.BorderLayout"/>
!                 <Content>
!                     <Component type="javax.swing.JLabel" id="titleLable">
!                         <Constraint type="BorderConstraints" direction="CENTER"/>
!                         <Attribute name="text" value="DashboardName"/>
!                         <Attribute name="font" value="(Literal)SansSerif bold 20"/>
!                         <Attribute name="foreground" value="(Literal)0x666666"/>
!                     </Component>
!                     <Component type="javax.swing.JTextArea">
!                         <Constraint type="BorderConstraints" direction="SOUTH"/>
!                         <Attribute name="text" value="DashboardDescription"/>
!                         <Attribute name="font" value="(Literal)DialogInput bold 14"/>
!                         <Attribute name="opaque" value="(Literal)false"/>
!                         <Attribute name="editable" value="(Literal)false"/>
!                     </Component>
!                 </Content>
              </Component>
              <Component type="org.mc4j.console.dashboard.components.RefreshControlComponent">
                  <Constraint type="BorderConstraints" direction="EAST"/>
!                 <Attribute name="refreshDelay" value="(Literal)30000"/>
              </Component>
          </Content>
      </Component>

[Mc4j-cvs] mc4j/application/dashboards/tomcat Tomcat_RequestProcessorTable.xml,1.2,1.3 Tomcat_ServletTable.xml,1.3,1.4 Tomcat_SingleServlet_Graph.xml,1.2,1.3

[Greg H. <gh...@us...>]

Update of /cvsroot/mc4j/mc4j/application/dashboards/tomcat
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18616/application/dashboards/tomcat

Modified Files:
	Tomcat_RequestProcessorTable.xml Tomcat_ServletTable.xml 
	Tomcat_SingleServlet_Graph.xml 
Log Message:
Rebuilt the header to make it take up less space and be more appealing.

Index: Tomcat_SingleServlet_Graph.xml
===================================================================
RCS file: /cvsroot/mc4j/mc4j/application/dashboards/tomcat/Tomcat_SingleServlet_Graph.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Tomcat_SingleServlet_Graph.xml	8 Apr 2004 15:07:16 -0000	1.2
--- Tomcat_SingleServlet_Graph.xml	8 Apr 2004 21:38:27 -0000	1.3
***************
*** 15,43 ****
    <Content>
      
!     <!-- *** Header *** -->
      <Component type="javax.swing.JPanel">
          <Constraint type="BorderConstraints" direction="NORTH"/>
          <LayoutManager type="java.awt.BorderLayout"/>
          <Content>
!             <Component type="javax.swing.JLabel" id="titleLable">
                  <Constraint type="BorderConstraints" direction="CENTER"/>
!                 <Attribute name="text" value="DashboardName"/>
!                 <Attribute name="font" value="(Literal)Dialog bold 24"/>
!                 <Attribute name="foreground" value="(Literal)0xFF2222"/>
!             </Component>
! 
!             <Component type="org.mc4j.console.dashboard.components.RefreshControlComponent">
!                 <Constraint type="BorderConstraints" direction="EAST"/>
!                 <Attribute name="refreshDelay" value="(Literal)2000"/>
!             </Component>
! 
!             <Component type="javax.swing.JTextArea">
!                 <Constraint type="BorderConstraints" direction="SOUTH"/>
!                 <Attribute name="text" value="DashboardDescription"/>
!                 <Attribute name="font" value="(Literal)Dialog bold 16"/>
!                 <Attribute name="opaque" value="(Literal)false"/>
!                 <Attribute name="editable" value="(Literal)false"/>
              </Component>
- 
          </Content>
      </Component>
--- 15,43 ----
    <Content>
      
!     <!-- *** The header section displays title and a refresh control *** -->
      <Component type="javax.swing.JPanel">
          <Constraint type="BorderConstraints" direction="NORTH"/>
          <LayoutManager type="java.awt.BorderLayout"/>
+         <Border type="javax.swing.border.EmptyBorder" top="(Literal)2" left="(Literal)5" bottom="(Literal)2" right="(Literal)5"/>
          <Content>
!             <Component type="javax.swing.JPanel">
                  <Constraint type="BorderConstraints" direction="CENTER"/>
!                 <LayoutManager type="java.awt.BorderLayout"/>
!                 <Content>
!                     <Component type="javax.swing.JLabel" id="titleLable">
!                         <Constraint type="BorderConstraints" direction="CENTER"/>
!                         <Attribute name="text" value="DashboardName"/>
!                         <Attribute name="font" value="(Literal)SansSerif bold 20"/>
!                         <Attribute name="foreground" value="(Literal)0x666666"/>
!                     </Component>
!                     <Component type="javax.swing.JTextArea">
!                         <Constraint type="BorderConstraints" direction="SOUTH"/>
!                         <Attribute name="text" value="DashboardDescription"/>
!                         <Attribute name="font" value="(Literal)DialogInput bold 14"/>
!                         <Attribute name="opaque" value="(Literal)false"/>
!                         <Attribute name="editable" value="(Literal)false"/>
!                     </Component>
!                 </Content>
              </Component>
          </Content>
      </Component>

Index: Tomcat_ServletTable.xml
===================================================================
RCS file: /cvsroot/mc4j/mc4j/application/dashboards/tomcat/Tomcat_ServletTable.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Tomcat_ServletTable.xml	8 Apr 2004 15:07:16 -0000	1.3
--- Tomcat_ServletTable.xml	8 Apr 2004 21:38:27 -0000	1.4
***************
*** 16,44 ****
    <Content>
  
!     <!-- *** Header *** -->
      <Component type="javax.swing.JPanel">
          <Constraint type="BorderConstraints" direction="NORTH"/>
          <LayoutManager type="java.awt.BorderLayout"/>
          <Content>
!             <Component type="javax.swing.JLabel" id="titleLable">
                  <Constraint type="BorderConstraints" direction="CENTER"/>
!                 <Attribute name="text" value="DashboardName"/>
!                 <Attribute name="font" value="(Literal)Dialog bold 24"/>
!                 <Attribute name="foreground" value="(Literal)0xFF2222"/>
              </Component>
- 
              <Component type="org.mc4j.console.dashboard.components.RefreshControlComponent">
                  <Constraint type="BorderConstraints" direction="EAST"/>
!                 <Attribute name="refreshDelay" value="(Literal)2000"/>
!             </Component>
! 
!             <Component type="javax.swing.JTextArea">
!                 <Constraint type="BorderConstraints" direction="SOUTH"/>
!                 <Attribute name="text" value="DashboardDescription"/>
!                 <Attribute name="font" value="(Literal)Dialog bold 16"/>
!                 <Attribute name="opaque" value="(Literal)false"/>
!                 <Attribute name="editable" value="(Literal)false"/>
              </Component>
- 
          </Content>
      </Component>
--- 16,48 ----
    <Content>
  
!     <!-- *** The header section displays title and a refresh control *** -->
      <Component type="javax.swing.JPanel">
          <Constraint type="BorderConstraints" direction="NORTH"/>
          <LayoutManager type="java.awt.BorderLayout"/>
+         <Border type="javax.swing.border.EmptyBorder" top="(Literal)2" left="(Literal)5" bottom="(Literal)2" right="(Literal)5"/>
          <Content>
!             <Component type="javax.swing.JPanel">
                  <Constraint type="BorderConstraints" direction="CENTER"/>
!                 <LayoutManager type="java.awt.BorderLayout"/>
!                 <Content>
!                     <Component type="javax.swing.JLabel" id="titleLable">
!                         <Constraint type="BorderConstraints" direction="CENTER"/>
!                         <Attribute name="text" value="DashboardName"/>
!                         <Attribute name="font" value="(Literal)SansSerif bold 20"/>
!                         <Attribute name="foreground" value="(Literal)0x666666"/>
!                     </Component>
!                     <Component type="javax.swing.JTextArea">
!                         <Constraint type="BorderConstraints" direction="SOUTH"/>
!                         <Attribute name="text" value="DashboardDescription"/>
!                         <Attribute name="font" value="(Literal)DialogInput bold 14"/>
!                         <Attribute name="opaque" value="(Literal)false"/>
!                         <Attribute name="editable" value="(Literal)false"/>
!                     </Component>
!                 </Content>
              </Component>
              <Component type="org.mc4j.console.dashboard.components.RefreshControlComponent">
                  <Constraint type="BorderConstraints" direction="EAST"/>
!                 <Attribute name="refreshDelay" value="(Literal)30000"/>
              </Component>
          </Content>
      </Component>

Index: Tomcat_RequestProcessorTable.xml
===================================================================
RCS file: /cvsroot/mc4j/mc4j/application/dashboards/tomcat/Tomcat_RequestProcessorTable.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Tomcat_RequestProcessorTable.xml	8 Apr 2004 15:07:16 -0000	1.2
--- Tomcat_RequestProcessorTable.xml	8 Apr 2004 21:38:26 -0000	1.3
***************
*** 15,43 ****
    <Content>
  
!     <!-- *** Header *** -->
      <Component type="javax.swing.JPanel">
          <Constraint type="BorderConstraints" direction="NORTH"/>
          <LayoutManager type="java.awt.BorderLayout"/>
          <Content>
!             <Component type="javax.swing.JLabel" id="titleLable">
                  <Constraint type="BorderConstraints" direction="CENTER"/>
!                 <Attribute name="text" value="DashboardName"/>
!                 <Attribute name="font" value="(Literal)Dialog bold 24"/>
!                 <Attribute name="foreground" value="(Literal)0xFF2222"/>
              </Component>
- 
              <Component type="org.mc4j.console.dashboard.components.RefreshControlComponent">
                  <Constraint type="BorderConstraints" direction="EAST"/>
!                 <Attribute name="refreshDelay" value="(Literal)2000"/>
!             </Component>
! 
!             <Component type="javax.swing.JTextArea">
!                 <Constraint type="BorderConstraints" direction="SOUTH"/>
!                 <Attribute name="text" value="DashboardDescription"/>
!                 <Attribute name="font" value="(Literal)Dialog bold 16"/>
!                 <Attribute name="opaque" value="(Literal)false"/>
!                 <Attribute name="editable" value="(Literal)false"/>
              </Component>
- 
          </Content>
      </Component>
--- 15,47 ----
    <Content>
  
!     <!-- *** The header section displays title and a refresh control *** -->
      <Component type="javax.swing.JPanel">
          <Constraint type="BorderConstraints" direction="NORTH"/>
          <LayoutManager type="java.awt.BorderLayout"/>
+         <Border type="javax.swing.border.EmptyBorder" top="(Literal)2" left="(Literal)5" bottom="(Literal)2" right="(Literal)5"/>
          <Content>
!             <Component type="javax.swing.JPanel">
                  <Constraint type="BorderConstraints" direction="CENTER"/>
!                 <LayoutManager type="java.awt.BorderLayout"/>
!                 <Content>
!                     <Component type="javax.swing.JLabel" id="titleLable">
!                         <Constraint type="BorderConstraints" direction="CENTER"/>
!                         <Attribute name="text" value="DashboardName"/>
!                         <Attribute name="font" value="(Literal)SansSerif bold 20"/>
!                         <Attribute name="foreground" value="(Literal)0x666666"/>
!                     </Component>
!                     <Component type="javax.swing.JTextArea">
!                         <Constraint type="BorderConstraints" direction="SOUTH"/>
!                         <Attribute name="text" value="DashboardDescription"/>
!                         <Attribute name="font" value="(Literal)DialogInput bold 14"/>
!                         <Attribute name="opaque" value="(Literal)false"/>
!                         <Attribute name="editable" value="(Literal)false"/>
!                     </Component>
!                 </Content>
              </Component>
              <Component type="org.mc4j.console.dashboard.components.RefreshControlComponent">
                  <Constraint type="BorderConstraints" direction="EAST"/>
!                 <Attribute name="refreshDelay" value="(Literal)30000"/>
              </Component>
          </Content>
      </Component>

[Mc4j-cvs] mc4j/application/dashboards/jre15 JRE15_MemoryUsagePools_PieChart.xml,1.2,1.3 JRE15_MemoryUsage_Graph.xml,1.3,1.4 JRE15_MemoryUsage_LineChart.xml,1.2,1.3 JRE15_ThreadTree.xml,1.2,1.3

[Greg H. <gh...@us...>]

Update of /cvsroot/mc4j/mc4j/application/dashboards/jre15
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18616/application/dashboards/jre15

Modified Files:
	JRE15_MemoryUsagePools_PieChart.xml 
	JRE15_MemoryUsage_Graph.xml JRE15_MemoryUsage_LineChart.xml 
	JRE15_ThreadTree.xml 
Log Message:
Rebuilt the header to make it take up less space and be more appealing.

Index: JRE15_MemoryUsagePools_PieChart.xml
===================================================================
RCS file: /cvsroot/mc4j/mc4j/application/dashboards/jre15/JRE15_MemoryUsagePools_PieChart.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** JRE15_MemoryUsagePools_PieChart.xml	8 Apr 2004 15:07:16 -0000	1.2
--- JRE15_MemoryUsagePools_PieChart.xml	8 Apr 2004 21:38:26 -0000	1.3
***************
*** 15,43 ****
    <Content>
      
!     <!-- *** Header *** -->
      <Component type="javax.swing.JPanel">
          <Constraint type="BorderConstraints" direction="NORTH"/>
          <LayoutManager type="java.awt.BorderLayout"/>
          <Content>
!             <Component type="javax.swing.JLabel" id="titleLable">
                  <Constraint type="BorderConstraints" direction="CENTER"/>
!                 <Attribute name="text" value="DashboardName"/>
!                 <Attribute name="font" value="(Literal)Dialog bold 24"/>
!                 <Attribute name="foreground" value="(Literal)0xFF2222"/>
!             </Component>
! 
!             <Component type="org.mc4j.console.dashboard.components.RefreshControlComponent">
!                 <Constraint type="BorderConstraints" direction="EAST"/>
!                 <Attribute name="refreshDelay" value="(Literal)2000"/>
!             </Component>
! 
!             <Component type="javax.swing.JTextArea">
!                 <Constraint type="BorderConstraints" direction="SOUTH"/>
!                 <Attribute name="text" value="DashboardDescription"/>
!                 <Attribute name="font" value="(Literal)Dialog bold 16"/>
!                 <Attribute name="opaque" value="(Literal)false"/>
!                 <Attribute name="editable" value="(Literal)false"/>
              </Component>
- 
          </Content>
      </Component>
--- 15,43 ----
    <Content>
      
!     <!-- *** The header section displays title and a refresh control *** -->
      <Component type="javax.swing.JPanel">
          <Constraint type="BorderConstraints" direction="NORTH"/>
          <LayoutManager type="java.awt.BorderLayout"/>
+         <Border type="javax.swing.border.EmptyBorder" top="(Literal)2" left="(Literal)5" bottom="(Literal)2" right="(Literal)5"/>
          <Content>
!             <Component type="javax.swing.JPanel">
                  <Constraint type="BorderConstraints" direction="CENTER"/>
!                 <LayoutManager type="java.awt.BorderLayout"/>
!                 <Content>
!                     <Component type="javax.swing.JLabel" id="titleLable">
!                         <Constraint type="BorderConstraints" direction="CENTER"/>
!                         <Attribute name="text" value="DashboardName"/>
!                         <Attribute name="font" value="(Literal)SansSerif bold 20"/>
!                         <Attribute name="foreground" value="(Literal)0x666666"/>
!                     </Component>
!                     <Component type="javax.swing.JTextArea">
!                         <Constraint type="BorderConstraints" direction="SOUTH"/>
!                         <Attribute name="text" value="DashboardDescription"/>
!                         <Attribute name="font" value="(Literal)DialogInput bold 14"/>
!                         <Attribute name="opaque" value="(Literal)false"/>
!                         <Attribute name="editable" value="(Literal)false"/>
!                     </Component>
!                 </Content>
              </Component>
          </Content>
      </Component>

Index: JRE15_MemoryUsage_Graph.xml
===================================================================
RCS file: /cvsroot/mc4j/mc4j/application/dashboards/jre15/JRE15_MemoryUsage_Graph.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** JRE15_MemoryUsage_Graph.xml	8 Apr 2004 15:07:16 -0000	1.3
--- JRE15_MemoryUsage_Graph.xml	8 Apr 2004 21:38:26 -0000	1.4
***************
*** 2,6 ****
  <!DOCTYPE Dashboard PUBLIC "-//MC4J//DTD Dashboard 1.0//EN" "http://mc4j.sourceforge.net/Dashboard_1_0.dtd">
  
! <Dashboard version="1.0" name="Memory Usage Graph">
    
    <Description>Memory usage graph for a JRE 1.5 Memory Pool.</Description>
--- 2,6 ----
  <!DOCTYPE Dashboard PUBLIC "-//MC4J//DTD Dashboard 1.0//EN" "http://mc4j.sourceforge.net/Dashboard_1_0.dtd">
  
! <Dashboard version="1.0" name="(Message){name} Memory Pool Graph">
    
    <Description>Memory usage graph for a JRE 1.5 Memory Pool.</Description>
***************
*** 16,48 ****
    <Content>
      
!     <!-- *** Header *** -->
      <Component type="javax.swing.JPanel">
          <Constraint type="BorderConstraints" direction="NORTH"/>
          <LayoutManager type="java.awt.BorderLayout"/>
          <Content>
!             <Component type="javax.swing.JLabel" id="titleLable">
                  <Constraint type="BorderConstraints" direction="CENTER"/>
!                 <Attribute name="text" value="DashboardName"/>
!                 <Attribute name="font" value="(Literal)Dialog bold 24"/>
!                 <Attribute name="foreground" value="(Literal)0xFF2222"/>
!             </Component>
! 
!             <Component type="org.mc4j.console.dashboard.components.RefreshControlComponent">
!                 <Constraint type="BorderConstraints" direction="EAST"/>
!                 <Attribute name="refreshDelay" value="(Literal)2000"/>
!             </Component>
! 
!             <Component type="javax.swing.JTextArea">
!                 <Constraint type="BorderConstraints" direction="SOUTH"/>
!                 <Attribute name="text" value="DashboardDescription"/>
!                 <Attribute name="font" value="(Literal)Dialog bold 16"/>
!                 <Attribute name="opaque" value="(Literal)false"/>
!                 <Attribute name="editable" value="(Literal)false"/>
              </Component>
- 
          </Content>
      </Component>
      
-     
      <!-- *** Scroll pane of info *** -->
      <Component type="javax.swing.JScrollPane">
--- 16,47 ----
    <Content>
      
!     <!-- *** The header section displays title and a refresh control *** -->
      <Component type="javax.swing.JPanel">
          <Constraint type="BorderConstraints" direction="NORTH"/>
          <LayoutManager type="java.awt.BorderLayout"/>
+         <Border type="javax.swing.border.EmptyBorder" top="(Literal)2" left="(Literal)5" bottom="(Literal)2" right="(Literal)5"/>
          <Content>
!             <Component type="javax.swing.JPanel">
                  <Constraint type="BorderConstraints" direction="CENTER"/>
!                 <LayoutManager type="java.awt.BorderLayout"/>
!                 <Content>
!                     <Component type="javax.swing.JLabel" id="titleLable">
!                         <Constraint type="BorderConstraints" direction="CENTER"/>
!                         <Attribute name="text" value="DashboardName"/>
!                         <Attribute name="font" value="(Literal)SansSerif bold 20"/>
!                         <Attribute name="foreground" value="(Literal)0x666666"/>
!                     </Component>
!                     <Component type="javax.swing.JTextArea">
!                         <Constraint type="BorderConstraints" direction="SOUTH"/>
!                         <Attribute name="text" value="DashboardDescription"/>
!                         <Attribute name="font" value="(Literal)DialogInput bold 14"/>
!                         <Attribute name="opaque" value="(Literal)false"/>
!                         <Attribute name="editable" value="(Literal)false"/>
!                     </Component>
!                 </Content>
              </Component>
          </Content>
      </Component>
      
      <!-- *** Scroll pane of info *** -->
      <Component type="javax.swing.JScrollPane">

Index: JRE15_ThreadTree.xml
===================================================================
RCS file: /cvsroot/mc4j/mc4j/application/dashboards/jre15/JRE15_ThreadTree.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** JRE15_ThreadTree.xml	8 Apr 2004 15:07:16 -0000	1.2
--- JRE15_ThreadTree.xml	8 Apr 2004 21:38:26 -0000	1.3
***************
*** 15,43 ****
    <Content>
      
!     <!-- *** Header *** -->
      <Component type="javax.swing.JPanel">
          <Constraint type="BorderConstraints" direction="NORTH"/>
          <LayoutManager type="java.awt.BorderLayout"/>
          <Content>
!             <Component type="javax.swing.JLabel" id="titleLable">
                  <Constraint type="BorderConstraints" direction="CENTER"/>
!                 <Attribute name="text" value="DashboardName"/>
!                 <Attribute name="font" value="(Literal)Dialog bold 24"/>
!                 <Attribute name="foreground" value="(Literal)0xFF2222"/>
              </Component>
- 
              <Component type="org.mc4j.console.dashboard.components.RefreshControlComponent">
                  <Constraint type="BorderConstraints" direction="EAST"/>
!                 <Attribute name="refreshDelay" value="(Literal)2000"/>
!             </Component>
! 
!             <Component type="javax.swing.JTextArea">
!                 <Constraint type="BorderConstraints" direction="SOUTH"/>
!                 <Attribute name="text" value="DashboardDescription"/>
!                 <Attribute name="font" value="(Literal)Dialog bold 16"/>
!                 <Attribute name="opaque" value="(Literal)false"/>
!                 <Attribute name="editable" value="(Literal)false"/>
              </Component>
- 
          </Content>
      </Component>
--- 15,47 ----
    <Content>
      
!     <!-- *** The header section displays title and a refresh control *** -->
      <Component type="javax.swing.JPanel">
          <Constraint type="BorderConstraints" direction="NORTH"/>
          <LayoutManager type="java.awt.BorderLayout"/>
+         <Border type="javax.swing.border.EmptyBorder" top="(Literal)2" left="(Literal)5" bottom="(Literal)2" right="(Literal)5"/>
          <Content>
!             <Component type="javax.swing.JPanel">
                  <Constraint type="BorderConstraints" direction="CENTER"/>
!                 <LayoutManager type="java.awt.BorderLayout"/>
!                 <Content>
!                     <Component type="javax.swing.JLabel" id="titleLable">
!                         <Constraint type="BorderConstraints" direction="CENTER"/>
!                         <Attribute name="text" value="DashboardName"/>
!                         <Attribute name="font" value="(Literal)SansSerif bold 20"/>
!                         <Attribute name="foreground" value="(Literal)0x666666"/>
!                     </Component>
!                     <Component type="javax.swing.JTextArea">
!                         <Constraint type="BorderConstraints" direction="SOUTH"/>
!                         <Attribute name="text" value="DashboardDescription"/>
!                         <Attribute name="font" value="(Literal)DialogInput bold 14"/>
!                         <Attribute name="opaque" value="(Literal)false"/>
!                         <Attribute name="editable" value="(Literal)false"/>
!                     </Component>
!                 </Content>
              </Component>
              <Component type="org.mc4j.console.dashboard.components.RefreshControlComponent">
                  <Constraint type="BorderConstraints" direction="EAST"/>
!                 <Attribute name="refreshDelay" value="(Literal)30000"/>
              </Component>
          </Content>
      </Component>

Index: JRE15_MemoryUsage_LineChart.xml
===================================================================
RCS file: /cvsroot/mc4j/mc4j/application/dashboards/jre15/JRE15_MemoryUsage_LineChart.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** JRE15_MemoryUsage_LineChart.xml	8 Apr 2004 15:07:16 -0000	1.2
--- JRE15_MemoryUsage_LineChart.xml	8 Apr 2004 21:38:26 -0000	1.3
***************
*** 15,43 ****
    <Content>
      
!     <!-- *** Header *** -->
      <Component type="javax.swing.JPanel">
          <Constraint type="BorderConstraints" direction="NORTH"/>
          <LayoutManager type="java.awt.BorderLayout"/>
          <Content>
!             <Component type="javax.swing.JLabel" id="titleLable">
                  <Constraint type="BorderConstraints" direction="CENTER"/>
!                 <Attribute name="text" value="DashboardName"/>
!                 <Attribute name="font" value="(Literal)Dialog bold 24"/>
!                 <Attribute name="foreground" value="(Literal)0xFF2222"/>
!             </Component>
! 
!             <Component type="org.mc4j.console.dashboard.components.RefreshControlComponent">
!                 <Constraint type="BorderConstraints" direction="EAST"/>
!                 <Attribute name="refreshDelay" value="(Literal)2000"/>
!             </Component>
! 
!             <Component type="javax.swing.JTextArea">
!                 <Constraint type="BorderConstraints" direction="SOUTH"/>
!                 <Attribute name="text" value="DashboardDescription"/>
!                 <Attribute name="font" value="(Literal)Dialog bold 16"/>
!                 <Attribute name="opaque" value="(Literal)false"/>
!                 <Attribute name="editable" value="(Literal)false"/>
              </Component>
- 
          </Content>
      </Component>
--- 15,43 ----
    <Content>
      
!     <!-- *** The header section displays title and a refresh control *** -->
      <Component type="javax.swing.JPanel">
          <Constraint type="BorderConstraints" direction="NORTH"/>
          <LayoutManager type="java.awt.BorderLayout"/>
+         <Border type="javax.swing.border.EmptyBorder" top="(Literal)2" left="(Literal)5" bottom="(Literal)2" right="(Literal)5"/>
          <Content>
!             <Component type="javax.swing.JPanel">
                  <Constraint type="BorderConstraints" direction="CENTER"/>
!                 <LayoutManager type="java.awt.BorderLayout"/>
!                 <Content>
!                     <Component type="javax.swing.JLabel" id="titleLable">
!                         <Constraint type="BorderConstraints" direction="CENTER"/>
!                         <Attribute name="text" value="DashboardName"/>
!                         <Attribute name="font" value="(Literal)SansSerif bold 20"/>
!                         <Attribute name="foreground" value="(Literal)0x666666"/>
!                     </Component>
!                     <Component type="javax.swing.JTextArea">
!                         <Constraint type="BorderConstraints" direction="SOUTH"/>
!                         <Attribute name="text" value="DashboardDescription"/>
!                         <Attribute name="font" value="(Literal)DialogInput bold 14"/>
!                         <Attribute name="opaque" value="(Literal)false"/>
!                         <Attribute name="editable" value="(Literal)false"/>
!                     </Component>
!                 </Content>
              </Component>
          </Content>
      </Component>

[Mc4j-cvs] mc4j/src/org/mc4j/console/dashboard/global OpenDashboardAction.java,1.7,1.8

[Greg H. <gh...@us...>]

Update of /cvsroot/mc4j/mc4j/src/org/mc4j/console/dashboard/global
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18400/src/org/mc4j/console/dashboard/global

Modified Files:
	OpenDashboardAction.java 
Log Message:
Track dashboards as they are opened on a connection. When were disconnecting a connection, first ask if they really want to close the dashboards, and if they agree close all dashboards open for that connection.

Index: OpenDashboardAction.java
===================================================================
RCS file: /cvsroot/mc4j/mc4j/src/org/mc4j/console/dashboard/global/OpenDashboardAction.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** OpenDashboardAction.java	7 Apr 2004 15:27:36 -0000	1.7
--- OpenDashboardAction.java	8 Apr 2004 21:37:10 -0000	1.8
***************
*** 65,68 ****
--- 65,69 ----
                  }
              });
+             node.getConnectionNode().registerDashboard(tc);
          } catch (Exception e) {
              ErrorManager.getDefault().notify(e);

[Mc4j-cvs] mc4j/src/org/mc4j/console/dashboard/components NumericAttributeGaugeMeter.java,1.7,1.8

[Greg H. <gh...@us...>]

Update of /cvsroot/mc4j/mc4j/src/org/mc4j/console/dashboard/components
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18400/src/org/mc4j/console/dashboard/components

Modified Files:
	NumericAttributeGaugeMeter.java 
Log Message:
Track dashboards as they are opened on a connection. When were disconnecting a connection, first ask if they really want to close the dashboards, and if they agree close all dashboards open for that connection.

Index: NumericAttributeGaugeMeter.java
===================================================================
RCS file: /cvsroot/mc4j/mc4j/src/org/mc4j/console/dashboard/components/NumericAttributeGaugeMeter.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** NumericAttributeGaugeMeter.java	7 Apr 2004 02:56:39 -0000	1.7
--- NumericAttributeGaugeMeter.java	8 Apr 2004 21:37:09 -0000	1.8
***************
*** 28,36 ****
  import javax.management.MBeanServer;
  import javax.management.ObjectName;
! 
! import org.openide.windows.TopComponent;
  
  import org.mc4j.console.bean.MBeanNode;
- import org.mc4j.console.dashboard.DashboardComponent;
  import org.mc4j.console.swing.graph.MeterCanvas;
  
--- 28,34 ----
  import javax.management.MBeanServer;
  import javax.management.ObjectName;
! import javax.swing.JPanel;
  
  import org.mc4j.console.bean.MBeanNode;
  import org.mc4j.console.swing.graph.MeterCanvas;
  
***************
*** 47,51 ****
   * @version $Revision$($Author$ / $Date$)
   */
! public class NumericAttributeGaugeMeter extends TopComponent implements BeanComponent, Runnable {
  
      private MBeanServer server;
--- 45,49 ----
   * @version $Revision$($Author$ / $Date$)
   */
! public class NumericAttributeGaugeMeter extends JPanel implements BeanComponent, Runnable {
  
      private MBeanServer server;
***************
*** 164,169 ****
              }
          }
!         if (isRunning)
!             this.close();
      }
  
--- 162,167 ----
              }
          }
!         //if (isRunning)
!         //    this.close();
      }
  

[Mc4j-cvs] mc4j/src/org/mc4j/console/connection ConnectionNode.java,1.26,1.27 DisconnectAction.java,1.5,1.6

[Greg H. <gh...@us...>]

Update of /cvsroot/mc4j/mc4j/src/org/mc4j/console/connection
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18400/src/org/mc4j/console/connection

Modified Files:
	ConnectionNode.java DisconnectAction.java 
Log Message:
Track dashboards as they are opened on a connection. When were disconnecting a connection, first ask if they really want to close the dashboards, and if they agree close all dashboards open for that connection.

Index: ConnectionNode.java
===================================================================
RCS file: /cvsroot/mc4j/mc4j/src/org/mc4j/console/connection/ConnectionNode.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** ConnectionNode.java	7 Apr 2004 15:27:35 -0000	1.26
--- ConnectionNode.java	8 Apr 2004 21:37:08 -0000	1.27
***************
*** 40,43 ****
--- 40,44 ----
  import javax.management.ObjectInstance;
  import javax.management.ObjectName;
+ import javax.swing.SwingUtilities;
  
  import org.openide.ErrorManager;
***************
*** 54,57 ****
--- 55,59 ----
  import org.openide.util.actions.SystemAction;
  import org.openide.windows.IOProvider;
+ import org.openide.windows.TopComponent;
  
  import org.mc4j.console.IConnectionNode;
***************
*** 93,96 ****
--- 95,99 ----
      private PooledExecutor remoteExecutor;
  
+     private Set openDashboards = new HashSet();
  
      public ConnectionNode() {
***************
*** 398,401 ****
--- 401,418 ----
  
      public void disconnect() throws Exception {
+ 
+         if (!openDashboards.isEmpty()) {
+             for (Iterator iterator = openDashboards.iterator(); iterator.hasNext();) {
+                 final TopComponent topComponent = (TopComponent) iterator.next();
+                 if (topComponent.isOpened()) {
+                     SwingUtilities.invokeLater( new Runnable() {
+                         public void run() {
+                             topComponent.close();
+                         }
+                     });
+                 }
+             }
+         }
+ 
          if (this.refreshTimer != null)
              this.refreshTimer.cancel();
***************
*** 410,413 ****
--- 427,431 ----
          super.systemActions = null;
          super.getContextMenu();
+         this.openDashboards.clear();
      }
  
***************
*** 518,521 ****
--- 536,545 ----
      }
  
+     public void registerDashboard(TopComponent dashboard) {
+         this.openDashboards.add(dashboard);
+     }
  
+     public boolean isOpenedDashboards() {
+         return !this.openDashboards.isEmpty();
+     }
  }

Index: DisconnectAction.java
===================================================================
RCS file: /cvsroot/mc4j/mc4j/src/org/mc4j/console/connection/DisconnectAction.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** DisconnectAction.java	7 Feb 2004 16:10:41 -0000	1.5
--- DisconnectAction.java	8 Apr 2004 21:37:08 -0000	1.6
***************
*** 20,24 ****
--- 20,28 ----
  package org.mc4j.console.connection;
  
+ import javax.swing.JOptionPane;
+ 
+ import org.openide.DialogDisplayer;
  import org.openide.ErrorManager;
+ import org.openide.NotifyDescriptor;
  import org.openide.nodes.Node;
  import org.openide.util.HelpCtx;
***************
*** 35,38 ****
--- 39,54 ----
          ConnectionNode node = (ConnectionNode)nodes[0];
          try {
+             if (node.isOpenedDashboards()) {
+                 NotifyDescriptor d =
+                     new NotifyDescriptor.Confirmation(
+                         "There are opened dashboards associated with this connection. Disconnecting " +
+                         "will cause these dashboards to close. Are you sure you want to " +
+                         "disconnect?", JOptionPane.YES_NO_OPTION);
+                 Object answer = DialogDisplayer.getDefault().notify(d);
+                 if (((Integer)answer).intValue() != 0) {
+                     return;
+                 }
+             }
+ 
              node.disconnect();
          } catch (Exception e) {

[Mc4j-cvs] mc4j/src/org/mc4j/console/bean DashboardsAction.java,1.13,1.14

[Greg H. <gh...@us...>]

Update of /cvsroot/mc4j/mc4j/src/org/mc4j/console/bean
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18400/src/org/mc4j/console/bean

Modified Files:
	DashboardsAction.java 
Log Message:
Track dashboards as they are opened on a connection. When were disconnecting a connection, first ask if they really want to close the dashboards, and if they agree close all dashboards open for that connection.

Index: DashboardsAction.java
===================================================================
RCS file: /cvsroot/mc4j/mc4j/src/org/mc4j/console/bean/DashboardsAction.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** DashboardsAction.java	8 Apr 2004 20:30:43 -0000	1.13
--- DashboardsAction.java	8 Apr 2004 21:37:08 -0000	1.14
***************
*** 186,189 ****
--- 186,190 ----
                          }
                      });
+                     this.node.getConnectionNode().registerDashboard(tc);
                  } catch (Exception e) {
                      ErrorManager.getDefault().notify(e);

[Mc4j-cvs] mc4j/src/org/mc4j/console/swing/graph AbstractGraphPanel.java,1.5,1.6

[Greg H. <gh...@us...>]

Update of /cvsroot/mc4j/mc4j/src/org/mc4j/console/swing/graph
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6053/src/org/mc4j/console/swing/graph

Modified Files:
	AbstractGraphPanel.java 
Log Message:
Defaulting to a full second delay as the base graph update rate. Shorter periods really kill slower machines.

Index: AbstractGraphPanel.java
===================================================================
RCS file: /cvsroot/mc4j/mc4j/src/org/mc4j/console/swing/graph/AbstractGraphPanel.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** AbstractGraphPanel.java	7 Apr 2004 20:46:50 -0000	1.5
--- AbstractGraphPanel.java	8 Apr 2004 20:32:17 -0000	1.6
***************
*** 403,407 ****
          updateSpeedPanel.setBorder(BorderFactory.createTitledBorder("Update Speed"));
  
!         sleepSlider = new javax.swing.JSlider(100,10000,500);
          sleepSlider.setPaintLabels(true);
          sleepSlider.setPaintTicks(true);
--- 403,407 ----
          updateSpeedPanel.setBorder(BorderFactory.createTitledBorder("Update Speed"));
  
!         sleepSlider = new javax.swing.JSlider(100,10000,1000);
          sleepSlider.setPaintLabels(true);
          sleepSlider.setPaintTicks(true);

[Mc4j-cvs] mc4j/src/org/mc4j/console/dashboard Dashboard.java,1.13,1.14 DashboardComponentFactory.java,1.8,1.9 DashboardFactory.java,1.10,1.11 DashboardLoader.java,1.2,1.3

[Greg H. <gh...@us...>]

Update of /cvsroot/mc4j/mc4j/src/org/mc4j/console/dashboard
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5745/src/org/mc4j/console/dashboard

Modified Files:
	Dashboard.java DashboardComponentFactory.java 
	DashboardFactory.java DashboardLoader.java 
Log Message:
Allow for the name of dashboard to be context looked up base on context attributes.
Added the object name properties as content entries.

Index: DashboardFactory.java
===================================================================
RCS file: /cvsroot/mc4j/mc4j/src/org/mc4j/console/dashboard/DashboardFactory.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** DashboardFactory.java	2 Apr 2004 03:34:05 -0000	1.10
--- DashboardFactory.java	8 Apr 2004 20:30:43 -0000	1.11
***************
*** 137,141 ****
          JPanel contentPanel = new JPanel();
          context.put(Dashboard.CONTEXT_DASHBOARD_ROOT_CONTAINER, contentPanel);
!         context.put(Dashboard.CONTEXT_DASHBOARD_NAME, dashboard.getName());
  
  
--- 137,141 ----
          JPanel contentPanel = new JPanel();
          context.put(Dashboard.CONTEXT_DASHBOARD_ROOT_CONTAINER, contentPanel);
!         context.put(Dashboard.CONTEXT_DASHBOARD_NAME, dashboard.getDisplayName());
  
  

Index: Dashboard.java
===================================================================
RCS file: /cvsroot/mc4j/mc4j/src/org/mc4j/console/dashboard/Dashboard.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** Dashboard.java	7 Apr 2004 02:54:38 -0000	1.13
--- Dashboard.java	8 Apr 2004 20:30:43 -0000	1.14
***************
*** 50,53 ****
--- 50,55 ----
      private String name;
  
+     private String displayName;
+ 
      private String description;
  
***************
*** 71,74 ****
--- 73,77 ----
  
          this.name = name;
+         this.displayName = name;
          this.dashboardDocument = dashboardDocument;
  
***************
*** 82,86 ****
      public int compareTo(Object o) {
          Dashboard d = (Dashboard) o;
!         return getName().compareTo(d.getName());
      }
  
--- 85,89 ----
      public int compareTo(Object o) {
          Dashboard d = (Dashboard) o;
!         return getDisplayName().compareTo(d.getDisplayName());
      }
  
***************
*** 110,113 ****
--- 113,124 ----
      }
  
+     public String getDisplayName() {
+         return displayName;
+     }
+ 
+     public void setDisplayName(String displayName) {
+         this.displayName = displayName;
+     }
+ 
      /** Getter for property description.
       * @return Value of property description.


Index: DashboardComponentFactory.java
===================================================================
RCS file: /cvsroot/mc4j/mc4j/src/org/mc4j/console/dashboard/DashboardComponentFactory.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** DashboardComponentFactory.java	2 Apr 2004 03:34:05 -0000	1.8
--- DashboardComponentFactory.java	8 Apr 2004 20:30:43 -0000	1.9
***************
*** 21,28 ****
--- 21,32 ----
  
  import java.awt.Color;
+ import java.awt.Graphics;
+ import java.awt.Graphics2D;
+ import java.awt.RenderingHints;
  import java.util.Map;
  
  import javax.swing.JComponent;
  import javax.swing.JEditorPane;
+ import javax.swing.JLabel;
  import javax.swing.JScrollPane;
  
***************
*** 49,55 ****
          IOProvider.getDefault().getIO("Dashboard debugging",false).getOut().println("Instantiating new component: " + type);
          try {
              Class componentType = Class.forName(type);
!             JComponent component = (JComponent) componentType.newInstance();
!             
              
              AttributeFactory.loadAttributes(node, component, context);
--- 53,73 ----
          IOProvider.getDefault().getIO("Dashboard debugging",false).getOut().println("Instantiating new component: " + type);
          try {
+             JComponent component = null;
+ 
              Class componentType = Class.forName(type);
!             if (componentType.equals(JLabel.class)){
!                 // GH - This hack is to make dashboards look more attractive.
!                 component = new JLabel() {
!                     public void paintComponent(Graphics g) {
!                         Graphics2D g2 = (Graphics2D)g;
!                         g2.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
!                             RenderingHints.VALUE_ANTIALIAS_ON);
!                         super.paintComponent(g);
!                     }
!                 };
! 
!             } else {
!                 component = (JComponent) componentType.newInstance();
!             }
              
              AttributeFactory.loadAttributes(node, component, context);

[Mc4j-cvs] mc4j/src/org/mc4j/console/dashboard/match MatchExecutor.java,1.1,1.2

[Greg H. <gh...@us...>]

Update of /cvsroot/mc4j/mc4j/src/org/mc4j/console/dashboard/match
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5745/src/org/mc4j/console/dashboard/match

Modified Files:
	MatchExecutor.java 
Log Message:
Allow for the name of dashboard to be context looked up base on context attributes.
Added the object name properties as content entries.

Index: MatchExecutor.java
===================================================================
RCS file: /cvsroot/mc4j/mc4j/src/org/mc4j/console/dashboard/match/MatchExecutor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MatchExecutor.java	7 Apr 2004 02:52:33 -0000	1.1
--- MatchExecutor.java	8 Apr 2004 20:30:43 -0000	1.2
***************
*** 19,29 ****
  package org.mc4j.console.dashboard.match;
  
- import java.util.List;
- import java.util.Iterator;
  import java.util.ArrayList;
  
- import org.mc4j.console.dashboard.Dashboard;
  import org.mc4j.console.bean.MBeanNode;
  import org.mc4j.console.connection.ConnectionNode;
  
  /**
--- 19,32 ----
  package org.mc4j.console.dashboard.match;
  
  import java.util.ArrayList;
+ import java.util.Hashtable;
+ import java.util.Iterator;
+ import java.util.List;
+ import java.util.Map;
  
  import org.mc4j.console.bean.MBeanNode;
  import org.mc4j.console.connection.ConnectionNode;
+ import org.mc4j.console.dashboard.Dashboard;
+ import org.mc4j.console.dashboard.context.ContextHelper;
  
  /**
***************
*** 61,64 ****
--- 64,89 ----
              if (beanConditionListMatch(conditionList, mBeanNode)) {
                  dashboard.putContext(beanMatch.getId(), mBeanNode);
+ 
+                 // For single types, experimenting with placing their object name attributes in context
+                 Hashtable objectNameProps = mBeanNode.getObjectName().getKeyPropertyList();
+                 for(Iterator iterator2 = objectNameProps.entrySet().iterator(); iterator2.hasNext(); ) {
+                     Map.Entry entry = (Map.Entry) iterator2.next();
+ 
+                     String key = (String)entry.getKey();
+                     String value = (String)entry.getValue();
+                     dashboard.putContext(key, value);
+                 }
+ 
+                 String currentName = dashboard.getName();
+                 String newName = null;
+                 try {
+                     newName = (String) ContextHelper.getValue(currentName,dashboard.getContextStarter());
+                 } catch (Exception e) {
+                     // This is ok, just assume its not a context lookup
+                 }
+                 if (newName != null) {
+                     dashboard.setDisplayName(newName);
+                 }
+ 
                  return true;
              }   
***************
*** 111,114 ****
--- 136,149 ----
                              dashboard.putContext(beanMatch.getId(), mBeanNode);
                              beanMatched = true;
+                             // For single types, experimenting with placing their object name attributes in context
+                             Hashtable objectNameProps = mBeanNode.getObjectName().getKeyPropertyList();
+                             for(Iterator iterator2 = objectNameProps.entrySet().iterator(); iterator2.hasNext(); ) {
+                                 Map.Entry entry = (Map.Entry) iterator2.next();
+ 
+                                 String key = (String)entry.getKey();
+                                 String value = (String)entry.getValue();
+                                 dashboard.putContext(key, value);
+                             }
+ 
                          }
                      }

[Mc4j-cvs] mc4j/src/org/mc4j/console/bean DashboardsAction.java,1.12,1.13

[Greg H. <gh...@us...>]

Update of /cvsroot/mc4j/mc4j/src/org/mc4j/console/bean
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5745/src/org/mc4j/console/bean

Modified Files:
	DashboardsAction.java 
Log Message:
Allow for the name of dashboard to be context looked up base on context attributes.
Added the object name properties as content entries.

Index: DashboardsAction.java
===================================================================
RCS file: /cvsroot/mc4j/mc4j/src/org/mc4j/console/bean/DashboardsAction.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** DashboardsAction.java	7 Apr 2004 03:08:24 -0000	1.12
--- DashboardsAction.java	8 Apr 2004 20:30:43 -0000	1.13
***************
*** 181,185 ****
                      SwingUtilities.invokeLater(new Runnable() {
                          public void run() {
!                             tc.setDisplayName(dashboard.getName());
                              tc.open();
                              tc.requestActive();
--- 181,185 ----
                      SwingUtilities.invokeLater(new Runnable() {
                          public void run() {
!                             tc.setDisplayName(dashboard.getDisplayName());
                              tc.open();
                              tc.requestActive();
***************
*** 227,231 ****
  
                  //String name = doc.getDocumentElement().getAttribute("name");
!                 this.displayNames.add(dashboard.getName());
                  this.associatedInfo.add(dashboard);
              }
--- 227,231 ----
  
                  //String name = doc.getDocumentElement().getAttribute("name");
!                 this.displayNames.add(dashboard.getDisplayName());
                  this.associatedInfo.add(dashboard);
              }

[Mc4j-cvs] mc4j/src/org/mc4j/console/dashboard BorderFactory.java,1.6,1.7

[Greg H. <gh...@us...>]

Update of /cvsroot/mc4j/mc4j/src/org/mc4j/console/dashboard
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5499/src/org/mc4j/console/dashboard

Modified Files:
	BorderFactory.java 
Log Message:
Support for empty borders to make prettier layouts.

Index: BorderFactory.java
===================================================================
RCS file: /cvsroot/mc4j/mc4j/src/org/mc4j/console/dashboard/BorderFactory.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** BorderFactory.java	2 Apr 2004 03:34:33 -0000	1.6
--- BorderFactory.java	8 Apr 2004 20:29:26 -0000	1.7
***************
*** 82,85 ****
--- 82,98 ----
  
              return javax.swing.BorderFactory.createLineBorder(color, thickness.intValue());
+         } else if (type.equals("javax.swing.border.EmptyBorder")) {
+             Class borderType = javax.swing.border.EmptyBorder.class;
+             String topString = element.getAttribute("top");
+             Integer top = (Integer) getAttributeValue(topString, context, Integer.class, borderType);
+             String leftString = element.getAttribute("left");
+             Integer left = (Integer) getAttributeValue(leftString, context, Integer.class, borderType);
+             String bottomString = element.getAttribute("bottom");
+             Integer bottom = (Integer) getAttributeValue(bottomString, context, Integer.class, borderType);
+             String rightString = element.getAttribute("right");
+             Integer right = (Integer) getAttributeValue(rightString, context, Integer.class, borderType);
+ 
+             return javax.swing.BorderFactory.createEmptyBorder(
+                 top.intValue(), left.intValue(), bottom.intValue(), right.intValue());
          }
          return javax.swing.BorderFactory.createLineBorder(Color.green, 5);

[Mc4j-cvs] mc4j/application/dashboards Dashboard_1_0.dtd,1.1,1.2

[Greg H. <gh...@us...>]

Update of /cvsroot/mc4j/mc4j/application/dashboards
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5499/application/dashboards

Modified Files:
	Dashboard_1_0.dtd 
Log Message:
Support for empty borders to make prettier layouts.

Index: Dashboard_1_0.dtd
===================================================================
RCS file: /cvsroot/mc4j/mc4j/application/dashboards/Dashboard_1_0.dtd,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Dashboard_1_0.dtd	8 Apr 2004 13:39:22 -0000	1.1
--- Dashboard_1_0.dtd	8 Apr 2004 20:29:26 -0000	1.2
***************
*** 58,60 ****
--- 58,65 ----
  <!ATTLIST Border color CDATA #IMPLIED>
  <!ATTLIST Border thickness CDATA #IMPLIED>
+ <!ATTLIST Border top CDATA #IMPLIED>
+ <!ATTLIST Border left CDATA #IMPLIED>
+ <!ATTLIST Border bottom CDATA #IMPLIED>
+ <!ATTLIST Border right CDATA #IMPLIED>
+ 
  

[Mc4j-cvs] mc4j/src/org/mc4j/console/dashboard/context MessageMapFormat.java,NONE,1.1 ContextHelper.java,1.5,1.6 ContextType.java,1.3,1.4

[Greg H. <gh...@us...>]

Update of /cvsroot/mc4j/mc4j/src/org/mc4j/console/dashboard/context
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5292/src/org/mc4j/console/dashboard/context

Modified Files:
	ContextHelper.java ContextType.java 
Added Files:
	MessageMapFormat.java 
Log Message:
New message map format for context lookups should help a lot
in making usable dashboards.

--- NEW FILE: MessageMapFormat.java ---
/*
 * Author: Greg Hinkle
 *
 * The contents of this file are subject to the Sapient Public License Version 1.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://mc4j.sf.net/License-SPL.html.
 *
 * Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND,
 * either express or implied. See the License for the specific language governing rights and limitations
 * under the License.
 *
 * The Original Code is The MC4J Management Console
 * The Initial Developer of the Original Code is Greg Hinkle (gh...@us...)
 * Copyright (C) 2004 Greg Hinkle. All Rights Reserved.
 *
 * Redistributions of code or binary files using or based on this code must reproduce the
 * above copyright and disclaimer. For more information see <http://mc4j.sourceforge.net>.
 */
package org.mc4j.console.dashboard.context;

import java.text.FieldPosition;
import java.text.Format;
import java.text.ParsePosition;
import java.util.Locale;
import java.util.Map;
import java.util.StringTokenizer;



/**
 * <p>Supports replacement of arbitrary codes in a string with values from
 * a map. Includes support for replacing data with formatted objects using
 * the FormatManager. Each replaced element can be formatted with any other
 * com.sapient.framework.presentation.format.Formatter. Recursive formatting
 * using other instances of this formatter within a larger message are <b>not</b>
 * supported.</p>
 *
 * <h3>Use</h3>
 * <p>A message element is defined as follows <code>{ mapKey [, formatName] }</code>.
 * This allows any count of replacable elements to be in a single message. Other
 * non-replaced can also be supported around the message elements.</p>
 *
 * @author Greg Hinkle, January 2001
 * @version $Revision: 1.1 $($Author: ghinkl $)
 */
public class MessageMapFormat extends Format {

    private static final String START = new String("{");
    private static final String COMMA = new String(",");
    private static final String END = new String("}");


    /** Creates new MessageMapFormat */
    public MessageMapFormat() {
    }

    public StringBuffer format(Object obj,StringBuffer stringBuffer,
        FieldPosition fieldPosition) {
        return null;
                //return new StringBuffer(MessageMapFormat.
                //        format(stringBuffer.toString(), this.formatMap, null));
    }

        /** overloaded format function with locale information */
    public StringBuffer format(Object obj,StringBuffer stringBuffer,
        FieldPosition fieldPosition, Locale locale) {
            return null;
        //return new StringBuffer(MessageMapFormat.
        //        format(stringBuffer.toString(), this.formatMap, locale));
    }

    public static String format(String message, Map formatMap) {
                return format(message, formatMap, null);
        }

    public static String format(String message, Map formatMap, Locale locale) {
        if (formatMap == null)
            return message;
        else {
            StringBuffer output = new StringBuffer(message.length()+10);
            StringTokenizer msgTokenizer = new StringTokenizer(message,"{,}",true);
            while (msgTokenizer.hasMoreElements()) {
                String element = (String) msgTokenizer.nextToken();

                if (element.equals(END)) {
                    // bad
                    throw new IllegalArgumentException("The format string was invalid. " +
                        "\"}\" was found where \"{\" was expected.");
                } else if (element.equals(START)) {
                    // just output it

                    String nextToken = msgTokenizer.nextToken();
                    if (!nextToken.equals(COMMA) && !nextToken.equals(START) && !nextToken.equals(END)) {
                        // Start of element block

                        String newNextToken = msgTokenizer.nextToken();
                        if (newNextToken.equals(COMMA)) {
                            /*
                            // has formatter
                            String formatName = msgTokenizer.nextToken().trim();


                            // Fail if the data we're looking up is missing.
                            if (!formatMap.containsKey(nextToken.trim()))
                                 throw new IllegalArgumentException("MessageMapFormat.format - " +
                                    "The parameter [" + nextToken.trim() + "] was not found in the supplied map.");

                            Object data = formatMap.get(nextToken.trim());

                            try {
                                String formattedData = FormatManager.format(data,formatName, locale);
                                output.append(formattedData);
                            } catch (FormatterNotFoundException fnfe) {
                                throw new IllegalArgumentException("MessageMapFormat.format - " +
                                    "The specified formatter was not defined.",fnfe);
                            }
                            if (!msgTokenizer.nextToken().equals(END)) {
                                throw new InvalidParameterException("MessageMapFormat.format - " +
                                    "The format string was invalid.",
                                    new IllegalMaskException("A \"}\" was expected at the end of the message mask element."));
                            }
                            */
                        } else if (newNextToken.equals(END)) {
                            // Non-formatted piece of data

                            // Fail if the data we're looking up is missing.
                            if (!formatMap.containsKey(nextToken.trim()))
                                 throw new IllegalArgumentException("MessageMapFormat.format - " +
                                    "The parameter [" + nextToken.trim() + "] was not found in the supplied map.");

                            Object data = formatMap.get(nextToken);
                            output.append(data);
                        } else {
                            // bad
                             throw new IllegalArgumentException("MessageMapFormat.format - " +
                                "The format string was invalid. " +
                                 "A replacement element should end with \"}\".");
                        }
                    } else {
                        // No more tokens...
                    }
                } else {
                    // Just text
                    output.append(element);
                }
            }
            return output.toString();
        }
    }

    public Object parseObject(String str, ParsePosition parsePosition) {
        throw new UnsupportedOperationException("Map message parsing is not yet supported.");
    }

}


Index: ContextHelper.java
===================================================================
RCS file: /cvsroot/mc4j/mc4j/src/org/mc4j/console/dashboard/context/ContextHelper.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ContextHelper.java	7 Feb 2004 16:10:41 -0000	1.5
--- ContextHelper.java	8 Apr 2004 20:28:36 -0000	1.6
***************
*** 134,137 ****
--- 134,141 ----
          }
  
+         if (ContextHelper.typeFromString(identifier) == ContextType.MESSAGE_MAP) {
+             return (new MessageMapFormat()).format(ContextHelper.attributeNameFromString(identifier), displayObjects);
+         }
+ 
          //Gather some information from the identifier String
          //to prepare for handling backwardCompatibility mode and
***************
*** 252,256 ****
                  throw new IllegalArgumentException(errorMsg);
              }
!             else{
                  //This is the catch-all error case
                  String errorMsg =
--- 256,264 ----
                  throw new IllegalArgumentException(errorMsg);
              }
!             else if (sourceType.equals(ContextType.MESSAGE_MAP)) {
!                 currentAttribute =
!                     (new MessageMapFormat()).format(currentAttributeName, (Map) source);
! 
!             } else {
                  //This is the catch-all error case
                  String errorMsg =

Index: ContextType.java
===================================================================
RCS file: /cvsroot/mc4j/mc4j/src/org/mc4j/console/dashboard/context/ContextType.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ContextType.java	7 Feb 2004 16:10:41 -0000	1.3
--- ContextType.java	8 Apr 2004 20:28:37 -0000	1.4
***************
*** 36,39 ****
--- 36,40 ----
      public static final ContextType LIST    = new ContextType (3, "List");
      public static final ContextType LITERAL = new ContextType (4,"Literal");
+     public static final ContextType MESSAGE_MAP = new ContextType (5, "Message");
  
      /**
***************
*** 68,72 ****
              return ContextType.LITERAL;
          }
!         else {
              return ContextType.INVALID;
          }
--- 69,75 ----
              return ContextType.LITERAL;
          }
!         else if (name.equals(ContextType.MESSAGE_MAP.name)) {
!             return ContextType.MESSAGE_MAP;
!         } else {
              return ContextType.INVALID;
          }

[Mc4j-cvs] mc4j build.xml,1.32,1.33

[Greg H. <gh...@us...>]

Update of /cvsroot/mc4j/mc4j
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31840

Modified Files:
	build.xml 
Log Message:
Install the dashboard into a jar for the classpath for the internal entity resolver to find.

Index: build.xml
===================================================================
RCS file: /cvsroot/mc4j/mc4j/build.xml,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** build.xml	7 Apr 2004 20:47:51 -0000	1.32
--- build.xml	8 Apr 2004 15:09:35 -0000	1.33
***************
*** 157,160 ****
--- 157,165 ----
              </fileset>
  
+             <!-- Purposly leave place it in a dashboards package so we don't have to load it from the default pkg -->
+             <fileset dir="application">
+                 <include name="dashboards/*.dtd"/>
+             </fileset>
+ 
              <zipfileset src="lib/regexp.jar"><exclude name="META-INF/MANIFEST.MF"/></zipfileset>
  
***************
*** 189,192 ****
--- 194,198 ----
          </copy>
  
+         <!--
          <copy todir="${application.install}" overwrite="yes">
              <fileset dir="application/dashboards">
***************
*** 194,197 ****
--- 200,204 ----
              </fileset>
          </copy>
+         -->
  
          <!-- install the common library of shared files (images only) -->
***************
*** 486,493 ****
      <target name="build-docs" depends="init" description="Generates html documentation tree">
          <!-- **** Copy needed resources **** -->
!         <copy todir="docs">
              <fileset dir="${doc.build.dir}">
                  <include name="*.css"/>
              </fileset>
          </copy>
  
--- 493,503 ----
      <target name="build-docs" depends="init" description="Generates html documentation tree">
          <!-- **** Copy needed resources **** -->
!         <copy todir="docs" overwrite="yes" >
              <fileset dir="${doc.build.dir}">
                  <include name="*.css"/>
              </fileset>
+              <fileset dir="application/dashboards">
+                 <include name="*.dtd"/>
+             </fileset>
          </copy>
  

[Mc4j-cvs] mc4j/src/org/mc4j/console/dashboard DashboardComponent.java,1.5,1.6 DashboardLoader.java,1.1,1.2 DashboardManager.java,1.1,1.2

[Greg H. <gh...@us...>]

Update of /cvsroot/mc4j/mc4j/src/org/mc4j/console/dashboard
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31678/src/org/mc4j/console/dashboard

Modified Files:
	DashboardComponent.java DashboardLoader.java 
	DashboardManager.java 
Log Message:
Better error handling.
Added a custom entity resolver so you don't need a net connection to get dashboards to validate.

Index: DashboardManager.java
===================================================================
RCS file: /cvsroot/mc4j/mc4j/src/org/mc4j/console/dashboard/DashboardManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DashboardManager.java	7 Apr 2004 02:53:04 -0000	1.1
--- DashboardManager.java	8 Apr 2004 15:08:49 -0000	1.2
***************
*** 35,39 ****
  
  import org.mc4j.console.bean.MBeanNode;
- import org.mc4j.console.util.ExceptionUtility;
  
  /**
--- 35,38 ----
***************
*** 97,111 ****
  
          for (int i = 0; i < dashboardFiles.length; i++) {
!             try {
!                 IOProvider.getDefault().getIO("Dashboard debugging",false).getOut().
!                     println("Parsing dashboard: " + dashboardFiles[i].getName());
! 
!                 Dashboard dashboard = DashboardLoader.getInstance().buildDashboard(dashboardFiles[i]);
! 
                  this.dashboardDocuments.add(dashboard);
  
-             } catch (Exception e) {
-                 System.out.println(ExceptionUtility.printStackTracesToString(e));
-             }
          }
          StatusDisplayer.getDefault().setStatusText(oldStatus);
--- 96,104 ----
  
          for (int i = 0; i < dashboardFiles.length; i++) {
!                 
!             Dashboard dashboard = DashboardLoader.getInstance().buildDashboard(dashboardFiles[i]);
!             if (dashboard != null)
                  this.dashboardDocuments.add(dashboard);
  
          }
          StatusDisplayer.getDefault().setStatusText(oldStatus);

Index: DashboardComponent.java
===================================================================
RCS file: /cvsroot/mc4j/mc4j/src/org/mc4j/console/dashboard/DashboardComponent.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** DashboardComponent.java	7 Apr 2004 02:55:30 -0000	1.5
--- DashboardComponent.java	8 Apr 2004 15:08:47 -0000	1.6
***************
*** 29,33 ****
   * @version $Revision$($Author$ / $Date$)
   */
! public interface DashboardComponent extends Refreshable{
      
      void setContext(Map context);
--- 29,33 ----
   * @version $Revision$($Author$ / $Date$)
   */
! public interface DashboardComponent extends Refreshable {
      
      void setContext(Map context);

Index: DashboardLoader.java
===================================================================
RCS file: /cvsroot/mc4j/mc4j/src/org/mc4j/console/dashboard/DashboardLoader.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DashboardLoader.java	7 Apr 2004 03:04:25 -0000	1.1
--- DashboardLoader.java	8 Apr 2004 15:08:49 -0000	1.2
***************
*** 30,33 ****
--- 30,34 ----
  
  import org.openide.ErrorManager;
+ import org.openide.windows.IOProvider;
  
  import org.mc4j.console.dashboard.match.BeanCondition;
***************
*** 38,42 ****
--- 39,45 ----
  import org.w3c.dom.Element;
  import org.w3c.dom.NodeList;
+ import org.xml.sax.InputSource;
  import org.xml.sax.SAXException;
+ import org.xml.sax.helpers.DefaultHandler;
  
  /**
***************
*** 73,76 ****
--- 76,81 ----
          Dashboard dashboard = null;
          try {
+             //IOProvider.getDefault().getIO("Dashboard debugging",false).getOut().
+             //    println("Parsing dashboard: " + dashboardFile.getName());
  
              Document document = buildDocument(new FileInputStream(dashboardFile));
***************
*** 94,99 ****
--- 99,108 ----
  
          } catch(SAXException se) {
+             IOProvider.getDefault().getIO("Dashboard debugging",false).getOut().
+                 println("Dashboard parsing failed on: " + dashboardFile.getName() + " " + se);
              ErrorManager.getDefault().notify(se);
          } catch(FileNotFoundException fnfe) {
+             IOProvider.getDefault().getIO("Dashboard debugging",false).getOut().
+                 println("Dashboard parsing failed on: " + dashboardFile.getName() + " " + fnfe);
              ErrorManager.getDefault().notify(fnfe);
          } catch(IOException ioe) {
***************
*** 193,202 ****
--- 202,261 ----
          try {
              builder = factory.newDocumentBuilder();
+             builder.setEntityResolver(new DTDClasspathEntityResolver());
          } catch (ParserConfigurationException pce) {
              System.out.println(pce);
          }
+ 
          Document document = builder.parse(is);
          return document;
      }
  
+ 
+     public static class DTDClasspathEntityResolver extends DefaultHandler {
+ 
+         public DTDClasspathEntityResolver() {
+             super();
+         }
+ 
+         /**
+          * <p>
+          * Will attempt to resolve an entity by checking for it in the classpath.
+          * </p>
+          *
+          * @param publicId The public identifier of the external entity
+          *        being referenced, or null if none was supplied
+          * @param systemId The system identifier of the external entity being
+          *        referenced.
+          * @return An InputSource object describing the new input source, or
+          *         null to request that the parser open a regular URI connection
+          *         to the system identifier.
+          * @throws SAXException indicates an error resolving the entity
+          */
+         public InputSource resolveEntity(String publicId, String systemId)
+             throws SAXException {
+ 
+             InputSource inputSource = null;
+ 
+ 
+             if ("http://mc4j.sourceforge.net/Dashboard_1_0.dtd".equals(systemId)) {
+ 
+                 InputStream inputStream =
+                     getClass().getClassLoader().getResourceAsStream("dashboards/Dashboard_1_0.dtd");
+ 
+                 if (inputStream != null) {
+                     inputSource = new InputSource(inputStream);
+                 }
+             }
+             if (inputSource != null) {
+                 return inputSource;
+             } else {
+                 try {
+                     return super.resolveEntity(publicId, systemId);
+                 } catch (Exception e) {
+                     // TODO GH: FIXME! IMPORTANT!
+                     throw new UnsupportedOperationException("TODO: GH!");
+                 }
+             }
+         }
+     }
  }

[Mc4j-cvs] mc4j/application/dashboards BasicMBean.xml,1.7,1.8 RelationsGraph.xml,1.3,1.4 RelationsGraph2.xml,1.3,1.4

[Greg H. <gh...@us...>]

Update of /cvsroot/mc4j/mc4j/application/dashboards
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31192/application/dashboards

Modified Files:
	BasicMBean.xml RelationsGraph.xml RelationsGraph2.xml 
Log Message:
Updated to the new public dtd definition.

Index: RelationsGraph.xml
===================================================================
RCS file: /cvsroot/mc4j/mc4j/application/dashboards/RelationsGraph.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** RelationsGraph.xml	7 Apr 2004 03:20:25 -0000	1.3
--- RelationsGraph.xml	8 Apr 2004 15:07:17 -0000	1.4
***************
*** 1,4 ****
  <?xml version="1.0" encoding="UTF-8"?>
! <!DOCTYPE Dashboard SYSTEM "Dashboard.dtd">
  
  <!--
--- 1,4 ----
  <?xml version="1.0" encoding="UTF-8"?>
! <!DOCTYPE Dashboard PUBLIC "-//MC4J//DTD Dashboard 1.0//EN" "http://mc4j.sourceforge.net/Dashboard_1_0.dtd">
  
  <!--

Index: RelationsGraph2.xml
===================================================================
RCS file: /cvsroot/mc4j/mc4j/application/dashboards/RelationsGraph2.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** RelationsGraph2.xml	7 Apr 2004 03:20:25 -0000	1.3
--- RelationsGraph2.xml	8 Apr 2004 15:07:17 -0000	1.4
***************
*** 1,4 ****
  <?xml version="1.0" encoding="UTF-8"?>
! <!DOCTYPE Dashboard SYSTEM "Dashboard.dtd">
  
  <!--
--- 1,4 ----
  <?xml version="1.0" encoding="UTF-8"?>
! <!DOCTYPE Dashboard PUBLIC "-//MC4J//DTD Dashboard 1.0//EN" "http://mc4j.sourceforge.net/Dashboard_1_0.dtd">
  
  <!--

Index: BasicMBean.xml
===================================================================
RCS file: /cvsroot/mc4j/mc4j/application/dashboards/BasicMBean.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** BasicMBean.xml	8 Apr 2004 02:51:40 -0000	1.7
--- BasicMBean.xml	8 Apr 2004 15:07:17 -0000	1.8
***************
*** 1,4 ****
  <?xml version="1.0" encoding="UTF-8"?>
! <!DOCTYPE Dashboard SYSTEM "Dashboard.dtd">
  
  <!--
--- 1,4 ----
  <?xml version="1.0" encoding="UTF-8"?>
! <!DOCTYPE Dashboard PUBLIC "-//MC4J//DTD Dashboard 1.0//EN" "http://mc4j.sourceforge.net/Dashboard_1_0.dtd">
  
  <!--