[Mc4j-cvs] mc4j/application/dashboards/websphere WebSphere_ServerDashboard.xml,1.2,1.3

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

Update of /cvsroot/mc4j/mc4j/application/dashboards/websphere
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv32360/application/dashboards/websphere

Modified Files:
	WebSphere_ServerDashboard.xml 
Log Message:
Visual tweaks

Index: WebSphere_ServerDashboard.xml
===================================================================
RCS file: /cvsroot/mc4j/mc4j/application/dashboards/websphere/WebSphere_ServerDashboard.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** WebSphere_ServerDashboard.xml	12 Apr 2006 19:14:16 -0000	1.2
--- WebSphere_ServerDashboard.xml	22 May 2006 02:38:52 -0000	1.3
***************
*** 7,13 ****
  -->
  
! <Dashboard version="2.0" name="JBoss Server Dashboard">
!   <Description>This dashboard displays basic information relating to the
!     overall execution of a WebSphere server.</Description>
  
      <DashboardMatch type="Global" location="/WebSphere">
--- 7,13 ----
  -->
  
! <Dashboard version="2.0" name="WebSphere Server Dashboard" standardHeader="true" autoRefresh="true" refreshControl="true">
!     <Description>Basic information of a WebSphere Application Server
!     </Description>
  
      <DashboardMatch type="Global" location="/WebSphere">
***************
*** 26,32 ****
          -->
  
!         <BeanMatch id="ServerBean" type="Single">
!             <Condition type="BeanObjectNameRegexCondition" filter="WebSphere:"/>
!             <Condition type="BeanObjectNameRegexCondition" filter="type=Server"/>
          </BeanMatch>
  
--- 26,31 ----
          -->
  
!         <BeanMatch id="Server" type="Single">
!             <Condition type="BeanObjectNameRegexCondition" filter="WebSphere:.*type=Server,.*"/>
          </BeanMatch>
  
***************
*** 45,51 ****
              cell=gregh
          -->
!         <BeanMatch id="JVMBean" type="Single">
!             <Condition type="BeanObjectNameRegexCondition" filter="WebSphere:"/>
!             <Condition type="BeanObjectNameRegexCondition" filter="type=JVM"/>
          </BeanMatch>
  
--- 44,49 ----
              cell=gregh
          -->
!         <BeanMatch id="JVM" type="Single">
!             <Condition type="BeanObjectNameRegexCondition" filter="WebSphere:.*type=JVM.*"/>
          </BeanMatch>
  
***************
*** 53,108 ****
  
  
!   <LayoutManager type="java.awt.BorderLayout"/>
!   <Content>
!       <Component type="org.mc4j.console.dashboard.components.html.HtmlDashboardComponent">
!           <Attribute name="htmlDocumentName" value="'WebSphere/WebSphere_ServerDashboard.html'"/>
! 
!         <Content>
! 
  
  
  
!             <!--
!             TODO GH: Doesn't work since IBM returns strings
!             <Component id="memoryMeter" type="org.mc4j.console.dashboard.components.NumericAttributeGaugeMeter">
!                 <Constraint type="BorderConstraints" direction="CENTER"/>
!                 <Attribute name="bean" value="#JVMBean"/>
!                 <Attribute name="maxAttributeName" value="'heapSize'"/>
!                 <Attribute name="currentAttributeName" value="'freeMemory'"/>
!                 <Attribute name="label" value="'Free Memory'"/>
!                 <Attribute name="updateInterval" value="'1000'"/>
!                 <Attribute name="warningPoint" value="'0.15'"/>
!                 <Attribute name="criticalPoint" value="'0.05'"/>
!                 <Attribute name="title" value="'Available Memory'"/>
!                 <Attribute name="units" value="'MB'"/>
!                 <Attribute name="opaque" value="'false'"/>
!                 <Attribute name="unitConverter" value="'org.mc4j.console.util.unit.ByteToMegaByteConverter'"/>
!             </Component>
!             -->
  
!             <!--
!             <Component id="memoryMeter" type="org.mc4j.console.dashboard.components.NumericAttributeMeter">
!                 <Attribute name="bean" value="#JBossServerInfoBean"/>
!                 <Attribute name="preferredSize" value="'150,150'"/>
!                 <Attribute name="maxAttributeName" value="'MaxMemory'"/>
!                 <Attribute name="currentAttributeName" value="'FreeMemory'"/>
!                 <Attribute name="minimumSize" value="'50,50'"/>
!                 <Attribute name="label" value="'Free Memory'"/>
!                 <Attribute name="updateInterval" value="'0'"/>
  
!             </Component>
  
  
!             <Component type="org.mc4j.console.dashboard.components.NumericAttributeGraph">
!                 <Attribute name="bean" value="#JBossServerInfoBean"/>
!                 <Constraint type="java.awt.GridBagConstraints" anchor="NORTH" gridx="1" gridy="2" widthx="2" weightx="0.5" weighty="0.5" fill="BOTH" insets="3,3,3,3"/>
!                 <Attribute name="preferredSize" value="'100,100'"/>
!                 <Attribute name="attributeName" value="'FreeMemory'"/>
!             </Component>
!             -->
!         </Content>
  
!       </Component>
  
!   </Content>
  </Dashboard>
--- 51,83 ----
  
  
!     <LayoutManager type="java.awt.BorderLayout"/>
!     <Content>
!         <Component type="org.mc4j.console.dashboard.components.html.HtmlDashboardComponent">
!             <Attribute name="html">
!                 <![CDATA[
  
+ <html>
  
+ <h1>${Server.platformName} ${Server.platformVersion}</h1>
  
! ${Server.serverVersion}
  
! <table>
! <tr>
! <td><b>Process Id:</b></td><td>${Server.pid}</td>
! <td><b>VM:</b></td><td>${JVM.javaVendor} ${JVM.javaVersion}</td>
! </tr>
! </table>
! </html>
  
!             ]]>
!             </Attribute>
  
+             <Content>
  
!             </Content>
  
!         </Component>
  
!     </Content>
  </Dashboard>