[jboss-svn-commits] JBL Code SVN: r23573 - in labs/jbossesb/branches/JBESB_4_4_GA_CP/product/tools/console: management/src/main/java/org/jboss/soa/esb/monitoring/pojo and 10 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Oct 24 03:20:46 EDT 2008
Author: tcunning
Date: 2008-10-24 03:20:46 -0400 (Fri, 24 Oct 2008)
New Revision: 23573
Modified:
labs/jbossesb/branches/JBESB_4_4_GA_CP/product/tools/console/management-esb/src/main/resources/hsqldb/create_database.sql
labs/jbossesb/branches/JBESB_4_4_GA_CP/product/tools/console/management-esb/src/main/resources/mysql/create_database.sql
labs/jbossesb/branches/JBESB_4_4_GA_CP/product/tools/console/management-esb/src/main/resources/oracle/create_database.sql
labs/jbossesb/branches/JBESB_4_4_GA_CP/product/tools/console/management-esb/src/main/resources/postgresql/create_database.sql
labs/jbossesb/branches/JBESB_4_4_GA_CP/product/tools/console/management-web/src/main/webapp/attribute.jsp
labs/jbossesb/branches/JBESB_4_4_GA_CP/product/tools/console/management/monitoring-mappings.hbm.xml
labs/jbossesb/branches/JBESB_4_4_GA_CP/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/pojo/JMXData.java
labs/jbossesb/branches/JBESB_4_4_GA_CP/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/server/DataFiler.java
labs/jbossesb/branches/JBESB_4_4_GA_CP/product/tools/console/management/src/main/resources/hsqldb/monitoring-mappings.hbm.xml
labs/jbossesb/branches/JBESB_4_4_GA_CP/product/tools/console/management/src/main/resources/mysql/monitoring-mappings.hbm.xml
labs/jbossesb/branches/JBESB_4_4_GA_CP/product/tools/console/management/src/main/resources/oracle/monitoring-mappings.hbm.xml
labs/jbossesb/branches/JBESB_4_4_GA_CP/product/tools/console/management/src/main/resources/postgresql/monitoring-mappings.hbm.xml
Log:
JBESB-2107
Change byte total metrics to long.
Modified: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/tools/console/management/monitoring-mappings.hbm.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_CP/product/tools/console/management/monitoring-mappings.hbm.xml 2008-10-24 05:39:36 UTC (rev 23572)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/product/tools/console/management/monitoring-mappings.hbm.xml 2008-10-24 07:20:46 UTC (rev 23573)
@@ -17,6 +17,7 @@
</id>
<many-to-one name="attribute" column="STATID"/>
<property name="statdate" type="java.util.Date" column="STATDATE"/>
+ <property name="bytevalue" type="java.lang.Long" column="bytevalue"/>
<property name="timevalue" type="java.lang.Float" column="timevalue"/>
<property name="countvalue" type="java.lang.Integer" column="countvalue"/>
<property name="textvalue" type="java.lang.String" column="textvalue"/>
Modified: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/pojo/JMXData.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_CP/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/pojo/JMXData.java 2008-10-24 05:39:36 UTC (rev 23572)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/pojo/JMXData.java 2008-10-24 07:20:46 UTC (rev 23573)
@@ -41,6 +41,7 @@
private String server;
private Date statdate;
private Float timevalue;
+ private Long bytevalue;
private Integer countvalue;
private String textvalue;
@@ -59,10 +60,11 @@
* @param countvalue count value
* @param textvalue test value
*/
- public JMXData(JMXAttribute attribute, String server, Date statdate, Float timevalue, Integer countvalue, String textvalue) {
+ public JMXData(JMXAttribute attribute, String server, Date statdate, Long bytevalue, Float timevalue, Integer countvalue, String textvalue) {
this.attribute = attribute;
this.server = server;
this.statdate = statdate;
+ this.bytevalue = bytevalue;
this.timevalue = timevalue;
this.countvalue = countvalue;
this.textvalue = textvalue;
@@ -136,6 +138,23 @@
* Time value getter.
* @return time value
*/
+ public Long getBytevalue() {
+ return this.bytevalue;
+ }
+
+ /**
+ * Time value mutator.
+ * @param timevalue time value
+ */
+ public void setBytevalue(Long bytevalue) {
+ this.bytevalue = bytevalue;
+ }
+
+
+ /**
+ * Time value getter.
+ * @return time value
+ */
public Float getTimevalue() {
return this.timevalue;
}
Modified: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/server/DataFiler.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_CP/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/server/DataFiler.java 2008-10-24 05:39:36 UTC (rev 23572)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/server/DataFiler.java 2008-10-24 07:20:46 UTC (rev 23573)
@@ -102,13 +102,16 @@
data = (Integer) f_sb.getData();
} catch (Exception e) {
}
- jmxd = new JMXData(null, f_sb.getServer(), f_sb.getCollectionTime(), null, data, null);
+ jmxd = new JMXData(null, f_sb.getServer(), f_sb.getCollectionTime(), null, null, data, null);
} else if (f_sb.getType().equals("long")) {
Long data = (Long) f_sb.getData();
- jmxd = new JMXData(null, f_sb.getServer(), f_sb.getCollectionTime(), null, new Integer(data.intValue()), null);
+ jmxd = new JMXData(null, f_sb.getServer(), f_sb.getCollectionTime(), data, null, null, null);
+ } else if (f_sb.getType().equals("java.lang.Long")) {
+ Long data = (Long) f_sb.getData();
+ jmxd = new JMXData(null, f_sb.getServer(), f_sb.getCollectionTime(), data, null, null, null);
} else if (f_sb.getType().equals("int")) {
Integer data = (Integer) f_sb.getData();
- jmxd = new JMXData(null, f_sb.getServer(), f_sb.getCollectionTime(), null, data, null);
+ jmxd = new JMXData(null, f_sb.getServer(), f_sb.getCollectionTime(), null, null, data, null);
} else {
logger.error ("ERROR - found type of " + f_sb.getType() + " for " + f_sb.getAttribute());
return;
@@ -117,18 +120,18 @@
if (f_sb.getType().equals("java.lang.Double")) {
Double tmp = (Double) f_sb.getData();
Float data = new Float(tmp.floatValue());
- jmxd = new JMXData(null, f_sb.getServer(), f_sb.getCollectionTime(), data, null, null);
+ jmxd = new JMXData(null, f_sb.getServer(), f_sb.getCollectionTime(), null, data, null, null);
} else if (f_sb.getType().equals("java.lang.Float")) {
Float data = (Float) f_sb.getData();
- jmxd = new JMXData(null, f_sb.getServer(), f_sb.getCollectionTime(), data, null, null);
+ jmxd = new JMXData(null, f_sb.getServer(), f_sb.getCollectionTime(), null, data, null, null);
} else if (f_sb.getType().equals("java.lang.Long")) {
Long temp = (Long) f_sb.getData();
Float data = new Float(temp.floatValue());
- jmxd = new JMXData(null, f_sb.getServer(), f_sb.getCollectionTime(), data, null, null);
+ jmxd = new JMXData(null, f_sb.getServer(), f_sb.getCollectionTime(), null, data, null, null);
} else if (f_sb.getType().equals("java.lang.Integer")) {
Integer temp = (Integer) f_sb.getData();
Float data = new Float(temp.floatValue());
- jmxd = new JMXData(null, f_sb.getServer(), f_sb.getCollectionTime(), data, null, null);
+ jmxd = new JMXData(null, f_sb.getServer(), f_sb.getCollectionTime(), null, data, null, null);
} else {
logger.error ("ERROR - found type of " + f_sb.getType() + " for " + f_sb.getAttribute());
return;
@@ -136,12 +139,12 @@
} else if (attr.getAttribute().matches("State")) {
if (f_sb.getType().equals("int")) {
Integer tmp = (Integer) f_sb.getData();
- jmxd = new JMXData(null, f_sb.getServer(), f_sb.getCollectionTime(), null, null, tmp.toString());
+ jmxd = new JMXData(null, f_sb.getServer(), f_sb.getCollectionTime(), null, null, null, tmp.toString());
}
} else {
if (f_sb.getType().equals("java.lang.String")) {
String data = (String) f_sb.getData();
- jmxd = new JMXData(null, f_sb.getServer(), f_sb.getCollectionTime(), null, null, data);
+ jmxd = new JMXData(null, f_sb.getServer(), f_sb.getCollectionTime(), null, null, null, data);
} else {
logger.error ("ERROR - found type of " + f_sb.getType() + " for " + f_sb.getAttribute());
return;
Modified: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/tools/console/management/src/main/resources/hsqldb/monitoring-mappings.hbm.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_CP/product/tools/console/management/src/main/resources/hsqldb/monitoring-mappings.hbm.xml 2008-10-24 05:39:36 UTC (rev 23572)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/product/tools/console/management/src/main/resources/hsqldb/monitoring-mappings.hbm.xml 2008-10-24 07:20:46 UTC (rev 23573)
@@ -18,6 +18,7 @@
<many-to-one name="attribute" column="STATID"/>
<property name="server" type="java.lang.String" column="SERVER"/>
<property name="statdate" type="timestamp" column="STATDATE"/>
+ <property name="bytevalue" type="java.lang.Long" column="bytevalue"/>
<property name="timevalue" type="java.lang.Float" column="timevalue"/>
<property name="countvalue" type="java.lang.Integer" column="countvalue"/>
<property name="textvalue" type="java.lang.String" column="textvalue"/>
Modified: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/tools/console/management/src/main/resources/mysql/monitoring-mappings.hbm.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_CP/product/tools/console/management/src/main/resources/mysql/monitoring-mappings.hbm.xml 2008-10-24 05:39:36 UTC (rev 23572)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/product/tools/console/management/src/main/resources/mysql/monitoring-mappings.hbm.xml 2008-10-24 07:20:46 UTC (rev 23573)
@@ -18,6 +18,7 @@
<many-to-one name="attribute" column="STATID"/>
<property name="server" type="java.lang.String" column="SERVER"/>
<property name="statdate" type="java.util.Date" column="STATDATE"/>
+ <property name="bytevalue" type="java.lang.Long" column="bytevalue"/>
<property name="timevalue" type="java.lang.Float" column="timevalue"/>
<property name="countvalue" type="java.lang.Integer" column="countvalue"/>
<property name="textvalue" type="java.lang.String" column="textvalue"/>
Modified: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/tools/console/management/src/main/resources/oracle/monitoring-mappings.hbm.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_CP/product/tools/console/management/src/main/resources/oracle/monitoring-mappings.hbm.xml 2008-10-24 05:39:36 UTC (rev 23572)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/product/tools/console/management/src/main/resources/oracle/monitoring-mappings.hbm.xml 2008-10-24 07:20:46 UTC (rev 23573)
@@ -22,6 +22,7 @@
<many-to-one name="attribute" column="STATID"/>
<property name="server" type="java.lang.String" column="SERVER"/>
<property name="statdate" type="java.util.Date" column="STATDATE"/>
+ <property name="bytevalue" type="java.lang.Long" column="bytevalue"/>
<property name="timevalue" type="java.lang.Float" column="timevalue"/>
<property name="countvalue" type="java.lang.Integer" column="countvalue"/>
<property name="textvalue" type="java.lang.String" column="textvalue"/>
Modified: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/tools/console/management/src/main/resources/postgresql/monitoring-mappings.hbm.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_CP/product/tools/console/management/src/main/resources/postgresql/monitoring-mappings.hbm.xml 2008-10-24 05:39:36 UTC (rev 23572)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/product/tools/console/management/src/main/resources/postgresql/monitoring-mappings.hbm.xml 2008-10-24 07:20:46 UTC (rev 23573)
@@ -20,6 +20,7 @@
<many-to-one name="attribute" column="STATID"/>
<property name="server" type="java.lang.String" column="SERVER"/>
<property name="statdate" type="java.util.Date" column="STATDATE"/>
+ <property name="bytevalue" type="java.lang.Long" column="bytevalue"/>
<property name="timevalue" type="java.lang.Float" column="timevalue"/>
<property name="countvalue" type="java.lang.Integer" column="countvalue"/>
<property name="textvalue" type="java.lang.String" column="textvalue"/>
Modified: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/tools/console/management-esb/src/main/resources/hsqldb/create_database.sql
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_CP/product/tools/console/management-esb/src/main/resources/hsqldb/create_database.sql 2008-10-24 05:39:36 UTC (rev 23572)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/product/tools/console/management-esb/src/main/resources/hsqldb/create_database.sql 2008-10-24 07:20:46 UTC (rev 23573)
@@ -41,6 +41,7 @@
STATID INTEGER,
SERVER VARCHAR(255),
STATDATE TIMESTAMP,
+BYTEVALUE BIGINT,
TIMEVALUE FLOAT,
COUNTVALUE INT,
TEXTVALUE VARCHAR(255),
Modified: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/tools/console/management-esb/src/main/resources/mysql/create_database.sql
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_CP/product/tools/console/management-esb/src/main/resources/mysql/create_database.sql 2008-10-24 05:39:36 UTC (rev 23572)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/product/tools/console/management-esb/src/main/resources/mysql/create_database.sql 2008-10-24 07:20:46 UTC (rev 23573)
@@ -11,6 +11,7 @@
STATID bigint,
SERVER varchar(255),
STATDATE datetime,
+ bytevalue bigint,
timevalue float,
countvalue integer,
textvalue text,
Modified: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/tools/console/management-esb/src/main/resources/oracle/create_database.sql
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_CP/product/tools/console/management-esb/src/main/resources/oracle/create_database.sql 2008-10-24 05:39:36 UTC (rev 23572)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/product/tools/console/management-esb/src/main/resources/oracle/create_database.sql 2008-10-24 07:20:46 UTC (rev 23573)
@@ -18,6 +18,7 @@
STATID number(19,0),
SERVER varchar2(255 char),
STATDATE timestamp,
+ bytevalue long,
timevalue float,
countvalue number(10,0),
textvalue varchar2(4000 char),
Modified: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/tools/console/management-esb/src/main/resources/postgresql/create_database.sql
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_CP/product/tools/console/management-esb/src/main/resources/postgresql/create_database.sql 2008-10-24 05:39:36 UTC (rev 23572)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/product/tools/console/management-esb/src/main/resources/postgresql/create_database.sql 2008-10-24 07:20:46 UTC (rev 23573)
@@ -10,6 +10,7 @@
STATID integer,
SERVER varchar(255),
STATDATE timestamp,
+ bytevalue bigint,
timevalue float,
countvalue integer,
textvalue text
Modified: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/tools/console/management-web/src/main/webapp/attribute.jsp
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_CP/product/tools/console/management-web/src/main/webapp/attribute.jsp 2008-10-24 05:39:36 UTC (rev 23572)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/product/tools/console/management-web/src/main/webapp/attribute.jsp 2008-10-24 07:20:46 UTC (rev 23573)
@@ -77,9 +77,11 @@
JMXData jmxd = (JMXData) dataList.get(i);
switch (attributeType) {
case StatisticsHelper.COUNT_ATTRIBUTE:
- case StatisticsHelper.BYTES_ATTRIBUTE:
tscp.addMinute(new Minute(jmxd.getStatdate()), jmxd.getCountvalue());
break;
+ case StatisticsHelper.BYTES_ATTRIBUTE:
+ tscp.addMinute(new Minute(jmxd.getStatdate()), jmxd.getBytevalue());
+ break;
case StatisticsHelper.TIME_ATTRIBUTE:
tscp.addMinute(new Minute(jmxd.getStatdate()), jmxd.getTimevalue());
break;
@@ -139,12 +141,18 @@
switch (attributeType) {
case StatisticsHelper.COUNT_ATTRIBUTE:
- case StatisticsHelper.BYTES_ATTRIBUTE:
%>
<tr>
<td><%=formatter.format(jmxd.getStatdate())%></td>
<td align="right"><%=jmxd.getCountvalue()%></td>
</tr>
+ <%
+ case StatisticsHelper.BYTES_ATTRIBUTE:
+ %>
+ <tr>
+ <td><%=formatter.format(jmxd.getStatdate())%></td>
+ <td align="right"><%=jmxd.getBytevalue()%></td>
+ </tr>
<%
break;
case StatisticsHelper.TIME_ATTRIBUTE:
More information about the jboss-svn-commits
mailing list