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

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

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

Modified Files:
	WebSphere_ServerDashboard.xml 
Log Message:
Merging EMS into head for the 2.0 release work

Index: WebSphere_ServerDashboard.xml
===================================================================
RCS file: /cvsroot/mc4j/mc4j/application/dashboards/websphere/WebSphere_ServerDashboard.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** WebSphere_ServerDashboard.xml	19 Jan 2005 14:17:02 -0000	1.1
--- WebSphere_ServerDashboard.xml	12 Apr 2006 19:14:16 -0000	1.2
***************
*** 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">
  
  <!--
--- 1,4 ----
  <?xml version="1.0" encoding="UTF-8"?>
! <!DOCTYPE Dashboard PUBLIC "-//MC4J//DTD Dashboard 2.0//EN" "http://mc4j.org/Dashboard_2_0.dtd">
  
  <!--
***************
*** 7,11 ****
  -->
  
! <Dashboard version="1.0" name="JBoss Server Dashboard">
    <Description>This dashboard displays basic information relating to the
      overall execution of a WebSphere server.</Description>
--- 7,11 ----
  -->
  
! <Dashboard version="2.0" name="JBoss Server Dashboard">
    <Description>This dashboard displays basic information relating to the
      overall execution of a WebSphere server.</Description>
***************
*** 27,32 ****
  
          <BeanMatch id="ServerBean" type="Single">
!             <Condition type="BeanObjectNameCondition" filter="WebSphere:"/>
!             <Condition type="BeanObjectNameCondition" filter="type=Server"/>
          </BeanMatch>
  
--- 27,32 ----
  
          <BeanMatch id="ServerBean" type="Single">
!             <Condition type="BeanObjectNameRegexCondition" filter="WebSphere:"/>
!             <Condition type="BeanObjectNameRegexCondition" filter="type=Server"/>
          </BeanMatch>
  
***************
*** 46,51 ****
          -->
          <BeanMatch id="JVMBean" type="Single">
!             <Condition type="BeanObjectNameCondition" filter="WebSphere:"/>
!             <Condition type="BeanObjectNameCondition" filter="type=JVM"/>
          </BeanMatch>
  
--- 46,51 ----
          -->
          <BeanMatch id="JVMBean" type="Single">
!             <Condition type="BeanObjectNameRegexCondition" filter="WebSphere:"/>
!             <Condition type="BeanObjectNameRegexCondition" filter="type=JVM"/>
          </BeanMatch>
  
***************
*** 56,60 ****
    <Content>
        <Component type="org.mc4j.console.dashboard.components.html.HtmlDashboardComponent">
!           <Attribute name="htmlDocumentName" value="(Literal)WebSphere/WebSphere_ServerDashboard.html"/>
  
          <Content>
--- 56,60 ----
    <Content>
        <Component type="org.mc4j.console.dashboard.components.html.HtmlDashboardComponent">
!           <Attribute name="htmlDocumentName" value="'WebSphere/WebSphere_ServerDashboard.html'"/>
  
          <Content>
***************
*** 67,81 ****
              <Component id="memoryMeter" type="org.mc4j.console.dashboard.components.NumericAttributeGaugeMeter">
                  <Constraint type="BorderConstraints" direction="CENTER"/>
!                 <Attribute name="beanNode" value="JVMBean"/>
!                 <Attribute name="maxAttributeName" value="(Literal)heapSize"/>
!                 <Attribute name="currentAttributeName" value="(Literal)freeMemory"/>
!                 <Attribute name="label" value="(Literal)Free Memory"/>
!                 <Attribute name="updateInterval" value="(Literal)1000"/>
!                 <Attribute name="warningPoint" value="(Literal)0.15"/>
!                 <Attribute name="criticalPoint" value="(Literal)0.05"/>
!                 <Attribute name="title" value="(Literal)Available Memory"/>
!                 <Attribute name="units" value="(Literal)MB"/>
!                 <Attribute name="opaque" value="(Literal)false"/>
!                 <Attribute name="unitConverter" value="(Literal)org.mc4j.console.util.unit.ByteToMegaByteConverter"/>
              </Component>
              -->
--- 67,81 ----
              <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>
              -->
***************
*** 83,93 ****
              <!--
              <Component id="memoryMeter" type="org.mc4j.console.dashboard.components.NumericAttributeMeter">
!                 <Attribute name="beanNode" value="JBossServerInfoBean"/>
!                 <Attribute name="preferredSize" value="(Literal)150,150"/>
!                 <Attribute name="maxAttributeName" value="(Literal)MaxMemory"/>
!                 <Attribute name="currentAttributeName" value="(Literal)FreeMemory"/>
!                 <Attribute name="minimumSize" value="(Literal)50,50"/>
!                 <Attribute name="label" value="(Literal)Free Memory"/>
!                 <Attribute name="updateInterval" value="(Literal)1000"/>
  
              </Component>
--- 83,93 ----
              <!--
              <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>
***************
*** 95,102 ****
  
              <Component type="org.mc4j.console.dashboard.components.NumericAttributeGraph">
!                 <Attribute name="beanNode" 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="(Literal)100,100"/>
!                 <Attribute name="attributeName" value="(Literal)FreeMemory"/>
              </Component>
              -->
--- 95,102 ----
  
              <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>
              -->