[jboss-svn-commits] JBL Code SVN: r14668 - in labs/jbossesb/trunk/product/tools/console: management/src/main/java/org/jboss/soa/esb/monitoring/server and 1 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Aug 27 16:05:16 EDT 2007
Author: tcunning
Date: 2007-08-27 16:05:15 -0400 (Mon, 27 Aug 2007)
New Revision: 14668
Modified:
labs/jbossesb/trunk/product/tools/console/management-web/src/main/webapp/collect.jsp
labs/jbossesb/trunk/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/client/DataCollectorAction.java
labs/jbossesb/trunk/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/server/DataFiler.java
labs/jbossesb/trunk/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/server/DataFilerAction.java
labs/jbossesb/trunk/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/server/DataFilerJob.java
Log:
bug:JBESB-738
Formalize Command Message properties.
Modified: labs/jbossesb/trunk/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/client/DataCollectorAction.java
===================================================================
--- labs/jbossesb/trunk/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/client/DataCollectorAction.java 2007-08-27 20:03:53 UTC (rev 14667)
+++ labs/jbossesb/trunk/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/client/DataCollectorAction.java 2007-08-27 20:05:15 UTC (rev 14668)
@@ -36,6 +36,8 @@
import org.jboss.soa.esb.helpers.ConfigTree;
import org.jboss.soa.esb.listeners.RegistryUtil;
import org.jboss.soa.esb.message.Message;
+import org.jboss.soa.esb.message.body.content.MessageBodyTypeNames;
+
import org.jboss.soa.esb.message.format.MessageFactory;
import org.jboss.soa.esb.monitoring.StatisticsData;
@@ -49,6 +51,10 @@
public class DataCollectorAction extends AbstractActionLifecycle {
protected ConfigTree _config;
private static Logger logger = Logger.getLogger(DataCollectorAction.class);
+ public static String INTERNAL_CATEGORY = "JBossESB-Internal";
+ public static String DATACOLLECTORSERVICE_ACTION_NAME = "DataCollectorService";
+ public static String DATAFILERSERVICE_ACTION_NAME = "DataFilerService";
+
public DataCollectorAction(ConfigTree config) { _config = config; }
/**
@@ -58,23 +64,24 @@
* @throws Exception
*/
public Message collectStatistics(Message message) throws Exception {
- if (message.getProperties().getProperty("COMMAND_MESSAGE") != null) {
+ if (message.getProperties().getProperty(MessageBodyTypeNames.COMMAND_TYPE) != null) {
InitialContext ic = new InitialContext();
DataCollector dcollector = new DataCollector(ic);
dcollector.collectData();
StatisticsData data = dcollector.getData();
- List list = RegistryUtil.getEprs("JBossESB-Internal", "DataFilerService");
+ List list = RegistryUtil.getEprs(INTERNAL_CATEGORY, DATAFILERSERVICE_ACTION_NAME);
for (int i = 0; i < list.size(); i++) {
EPR epr = (EPR)list.get(i);
Message esbMessage = MessageFactory.getInstance().getMessage();
Call call = new Call();
call.setMessageID(new URI(UUID.randomUUID().toString()));
- esbMessage.getProperties().setProperty("COMMAND_MESSAGE", "foo");
+ esbMessage.getProperties().setProperty(MessageBodyTypeNames.COMMAND_TYPE, MessageBodyTypeNames.STATISTICS_RESPONSE);
esbMessage.getBody().add(data);
-
+ data.print();
+
DeliverOnlyCourier sender = null;
try {
sender = CourierFactory.getCourier(epr);
Modified: labs/jbossesb/trunk/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/server/DataFiler.java
===================================================================
--- labs/jbossesb/trunk/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/server/DataFiler.java 2007-08-27 20:03:53 UTC (rev 14667)
+++ labs/jbossesb/trunk/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/server/DataFiler.java 2007-08-27 20:05:15 UTC (rev 14668)
@@ -181,10 +181,12 @@
* Calls insertStatistics to insert each StatisticBean in the StatisticData object.
*/
public void persistData() {
- List list = data.getList();
- for (int i = 0; i < list.size(); i++) {
- StatisticsBean bean = (StatisticsBean) list.get(i);
- insertStatistics(bean);
+ if (data != null) {
+ List list = data.getList();
+ for (int i = 0; i < list.size(); i++) {
+ StatisticsBean bean = (StatisticsBean) list.get(i);
+ insertStatistics(bean);
+ }
}
}
}
Modified: labs/jbossesb/trunk/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/server/DataFilerAction.java
===================================================================
--- labs/jbossesb/trunk/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/server/DataFilerAction.java 2007-08-27 20:03:53 UTC (rev 14667)
+++ labs/jbossesb/trunk/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/server/DataFilerAction.java 2007-08-27 20:05:15 UTC (rev 14668)
@@ -25,6 +25,7 @@
import org.jboss.soa.esb.actions.AbstractActionLifecycle;
import org.jboss.soa.esb.helpers.ConfigTree;
import org.jboss.soa.esb.message.Message;
+import org.jboss.soa.esb.message.body.content.MessageBodyTypeNames;
import org.jboss.soa.esb.monitoring.StatisticsData;
/**
@@ -38,7 +39,10 @@
protected ConfigTree _config;
private static final Logger logger = Logger.getLogger(DataFilerAction.class);
-
+ public static String INTERNAL_CATEGORY = "JBossESB-Internal";
+ public static String DATACOLLECTORSERVICE_ACTION_NAME = "DataCollectorService";
+ public static String DATAFILERSERVICE_ACTION_NAME = "DataFilerService";
+
public DataFilerAction(ConfigTree config) { _config = config; }
/**
@@ -51,10 +55,10 @@
*/
public Message fileMessage(Message message) throws Exception {
if ((message.getProperties() != null) &&
- (message.getProperties().getProperty("COMMAND_MESSAGE") != null)) {
+ (message.getProperties().getProperty(MessageBodyTypeNames.COMMAND_TYPE) != null)) {
StatisticsData statData = (StatisticsData) message.getBody().get();
- logger.error("Filing Data!!!!!!");
- statData.print();
+ logger.debug("Filing data...");
+ //statData.print();
DataFiler df = new DataFiler(statData);
df.persistData();
} else {
Modified: labs/jbossesb/trunk/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/server/DataFilerJob.java
===================================================================
--- labs/jbossesb/trunk/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/server/DataFilerJob.java 2007-08-27 20:03:53 UTC (rev 14667)
+++ labs/jbossesb/trunk/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/server/DataFilerJob.java 2007-08-27 20:05:15 UTC (rev 14668)
@@ -34,6 +34,7 @@
import org.jboss.soa.esb.couriers.CourierFactory;
import org.jboss.soa.esb.listeners.RegistryUtil;
import org.jboss.soa.esb.message.Message;
+import org.jboss.soa.esb.message.body.content.MessageBodyTypeNames;
import org.jboss.soa.esb.message.format.MessageFactory;
import org.jboss.soa.esb.services.registry.RegistryException;
import org.jboss.soa.esb.services.registry.ServiceNotFoundException;
@@ -60,25 +61,18 @@
logger.error("Collect statistics from EPRs");
List list;
try {
- list = RegistryUtil.getEprs("JBossESB-Internal", "DataCollectorService");
+ list = RegistryUtil.getEprs(DataFilerAction.INTERNAL_CATEGORY, DataFilerAction.DATACOLLECTORSERVICE_ACTION_NAME);
if (list != null) {
for (int i = 0; i < list.size(); i++) {
EPR epr = (EPR)list.get(i);
Message esbMessage = MessageFactory.getInstance().getMessage();
sender = CourierFactory.getCourier(epr);
- esbMessage.getProperties().setProperty("COMMAND_MESSAGE", "foo");
+ esbMessage.getProperties().setProperty(MessageBodyTypeNames.COMMAND_TYPE, MessageBodyTypeNames.STATISTICS_REQUEST);
esbMessage.getBody().setByteArray("get statistics".getBytes());
URI uri = new URI(UUID.randomUUID().toString());
esbMessage.getHeader().getCall().setMessageID(uri);
- sender.deliver(esbMessage);
-
- Message noncmdMessage = MessageFactory.getInstance().getMessage();
- noncmdMessage.getBody().setByteArray("get statistics".getBytes());
-
- URI noncmdURI = new URI(UUID.randomUUID().toString());
- esbMessage.getHeader().getCall().setMessageID(noncmdURI);
- sender.deliver(noncmdMessage);
+ sender.deliver(esbMessage);
}
}
} catch (RegistryException e) {
Modified: labs/jbossesb/trunk/product/tools/console/management-web/src/main/webapp/collect.jsp
===================================================================
--- labs/jbossesb/trunk/product/tools/console/management-web/src/main/webapp/collect.jsp 2007-08-27 20:03:53 UTC (rev 14667)
+++ labs/jbossesb/trunk/product/tools/console/management-web/src/main/webapp/collect.jsp 2007-08-27 20:05:15 UTC (rev 14668)
@@ -6,30 +6,27 @@
org.jboss.internal.soa.esb.couriers.DeliverOnlyCourier,
org.jboss.soa.esb.listeners.RegistryUtil,
org.jboss.soa.esb.message.Message,
+ org.jboss.soa.esb.message.body.content.MessageBodyTypeNames,
org.jboss.soa.esb.message.format.MessageFactory,
+ org.jboss.soa.esb.monitoring.server.DataFilerAction,
java.net.URI,
java.util.*
"%>
<%
-List list = RegistryUtil.getEprs("JBossESB-Internal", "DataCollectorService");
+List list = RegistryUtil.getEprs(DataFilerAction.INTERNAL_CATEGORY, DataFilerAction.DATACOLLECTORSERVICE_ACTION_NAME);
if (list != null) {
for (int i = 0; i < list.size(); i++) {
EPR epr = (EPR)list.get(i);
Message esbMessage = MessageFactory.getInstance().getMessage();
DeliverOnlyCourier sender = CourierFactory.getCourier(epr);
- esbMessage.getProperties().setProperty("COMMAND_MESSAGE", "foo");
+ esbMessage.getProperties().setProperty(MessageBodyTypeNames.COMMAND_TYPE, MessageBodyTypeNames.STATISTICS_REQUEST);
+
esbMessage.getBody().setByteArray("get statistics".getBytes());
URI uri = new URI(UUID.randomUUID().toString());
esbMessage.getHeader().getCall().setMessageID(uri);
sender.deliver(esbMessage);
- Message noncmdMessage = MessageFactory.getInstance().getMessage();
- noncmdMessage.getBody().setByteArray("get statistics".getBytes());
-
- URI noncmdURI = new URI(UUID.randomUUID().toString());
- esbMessage.getHeader().getCall().setMessageID(noncmdURI);
- sender.deliver(noncmdMessage);
}
}
More information about the jboss-svn-commits
mailing list