[Mc4j-cvs] mc4j/application/dashboards/geronimo Geronimo_ServerInfo.html,1.1,1.2 Geronimo_ServerInfo

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

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

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

Index: Geronimo_ServerInfo.html
===================================================================
RCS file: /cvsroot/mc4j/mc4j/application/dashboards/geronimo/Geronimo_ServerInfo.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Geronimo_ServerInfo.html	13 Oct 2004 04:52:45 -0000	1.1
--- Geronimo_ServerInfo.html	12 Apr 2006 19:14:14 -0000	1.2
***************
*** 1,4 ****
--- 1,9 ----
  <html>
  
+ <head>
+     <style type="text/css">
+ 
+     </style>
+ </head>
  
  <body style="margin: 0px">

Index: Geronimo_ServerInfo.xml
===================================================================
RCS file: /cvsroot/mc4j/mc4j/application/dashboards/geronimo/Geronimo_ServerInfo.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Geronimo_ServerInfo.xml	13 Oct 2004 04:52:45 -0000	1.1
--- Geronimo_ServerInfo.xml	12 Apr 2006 19:14:14 -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="Geronimo Server Info">
    <Description>This dashboard displays basic information relating to the
      overall execution of a Geronimo server.</Description>
--- 7,11 ----
  -->
  
! <Dashboard version="2.0" name="Geronimo Server Info" standardHeader="true" refreshControl="true">
    <Description>This dashboard displays basic information relating to the
      overall execution of a Geronimo server.</Description>
***************
*** 15,19 ****
  
          <BeanMatch id="GeronimoJ2EEServer" type="Single">
!             <Condition type="BeanObjectNameCondition" filter="j2eeType=J2EEServer"/>
          </BeanMatch>
  
--- 15,19 ----
  
          <BeanMatch id="GeronimoJ2EEServer" type="Single">
!             <Condition type="BeanObjectNameRegexCondition" filter="j2eeType=J2EEServer"/>
          </BeanMatch>
  
***************
*** 21,30 ****
  
          <BeanMatch id="JVM" type="Single">
!             <Condition type="BeanObjectNameCondition" filter="j2eeType=JVM"/>
          </BeanMatch>
  
  
          <BeanMatch id="GeronimoSystemInfo" type="Single">
!             <Condition type="BeanObjectNameCondition" filter="geronimo.system:role=ServerInfo"/>
          </BeanMatch>
  
--- 21,30 ----
  
          <BeanMatch id="JVM" type="Single">
!             <Condition type="BeanObjectNameRegexCondition" filter="j2eeType=JVM"/>
          </BeanMatch>
  
  
          <BeanMatch id="GeronimoSystemInfo" type="Single">
!             <Condition type="BeanObjectNameRegexCondition" filter="geronimo.system:role=ServerInfo"/>
          </BeanMatch>
  
***************
*** 36,40 ****
    <Content>
        <Component type="org.mc4j.console.dashboard.components.html.HtmlDashboardComponent">
!           <Attribute name="htmlDocumentName" value="(Literal)Geronimo/Geronimo_ServerInfo.html"/>
  
          <Content>
--- 36,40 ----
    <Content>
        <Component type="org.mc4j.console.dashboard.components.html.HtmlDashboardComponent">
!           <Attribute name="htmlDocumentName" value="'Geronimo/Geronimo_ServerInfo.html'"/>
  
          <Content>
***************
*** 44,58 ****
              <Component id="memoryMeter" type="org.mc4j.console.dashboard.components.NumericAttributeGaugeMeter">
                  <Constraint type="BorderConstraints" direction="CENTER"/>
!                 <Attribute name="beanNode" value="JVM"/>
!                 <Attribute name="maxAttributeName" value="(Literal)maxMemory"/>
!                 <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>
  
--- 44,58 ----
              <Component id="memoryMeter" type="org.mc4j.console.dashboard.components.NumericAttributeGaugeMeter">
                  <Constraint type="BorderConstraints" direction="CENTER"/>
!                 <Attribute name="bean" value="#JVM"/>
!                 <Attribute name="maxAttributeName" value="'maxMemory'"/>
!                 <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>
  
***************
*** 60,67 ****
  
              <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>
              -->
--- 60,67 ----
  
              <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>
              -->

[Mc4j-cvs] mc4j/application/dashboards/geronimo Geronimo_ServerInfo.html,1.1,1.2 Geronimo_ServerInfo

[Mc4j-cvs] mc4j/application/dashboards/geronimo Geronimo_ServerInfo.html,1.1,1.2 Geronimo_ServerInfo.xml,1.1,1.2