[jboss-svn-commits] JBL Code SVN: r14287 - in labs/jbossesb/trunk/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring: server and 1 other directory.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Aug 15 23:04:45 EDT 2007
Author: tcunning
Date: 2007-08-15 23:04:44 -0400 (Wed, 15 Aug 2007)
New Revision: 14287
Removed:
labs/jbossesb/trunk/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/DataCollector.java
labs/jbossesb/trunk/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/DataFiler.java
Modified:
labs/jbossesb/trunk/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/server/DataFilerJob.java
Log:
bug:JBESB-738
Remove refactored DataCollector.java/DataFiler.java
Deleted: labs/jbossesb/trunk/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/DataCollector.java
===================================================================
--- labs/jbossesb/trunk/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/DataCollector.java 2007-08-16 03:01:34 UTC (rev 14286)
+++ labs/jbossesb/trunk/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/DataCollector.java 2007-08-16 03:04:44 UTC (rev 14287)
@@ -1,151 +0,0 @@
-package org.jboss.soa.esb.monitoring;
-
-import java.io.IOException;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-import java.util.Date;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import javax.management.MBeanAttributeInfo;
-import javax.management.MBeanInfo;
-import javax.management.MBeanServerConnection;
-import javax.management.MalformedObjectNameException;
-import javax.management.ObjectName;
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-
-import org.apache.log4j.Logger;
-import org.hibernate.Session;
-import org.hibernate.Transaction;
-import org.jboss.soa.esb.monitoring.pojo.JMXAttribute;
-import org.jboss.soa.esb.monitoring.pojo.JMXPattern;
-import org.jboss.soa.esb.monitoring.pojo.JMXData;
-
-public class DataCollector {
- Logger logger = Logger.getLogger(DataCollector.class);
- private Context context;
- private MBeanServerConnection server;
- private StatisticsData data;
-
- public DataCollector() {
- try {
- context = new InitialContext();
- server = (MBeanServerConnection) context.lookup("jmx/invoker/RMIAdaptor");
- } catch (NamingException e) {
- logger.error("", e);
- }
- data = new StatisticsData();
- }
-
- public DataCollector(Context f_context) {
- context = f_context;
- try {
- server = (MBeanServerConnection) context.lookup("jmx/invoker/RMIAdaptor");
- } catch (NamingException e) {
- logger.error("", e);
- }
- data = new StatisticsData();
-
- }
-
- public MBeanServerConnection getServer() {
- return server;
- }
-
- public List getClassPatterns() {
- Session sess = (Session) MonitoringSessionFactory.getInstance().openSession();
- sess.beginTransaction();
- List result = sess.createQuery("from JMXPattern").list();
- sess.close();
- return result;
- }
-
- public List<ObjectName> getObjectNames(JMXPattern jmc, MBeanServerConnection server) {
- List<ObjectName> list = new ArrayList<ObjectName>();
- ObjectName namePattern;
- try {
- namePattern = new ObjectName(jmc.getClasspattern());
- Set result = server.queryNames(namePattern, null);
- Iterator iter = result.iterator();
- while (iter.hasNext()) {
- ObjectName on = (ObjectName) iter.next();
- if (on.getKeyPropertyListString().contains(jmc.getKeyvalue())) {
- list.add(on);
- logger.info(jmc.getKeyvalue() + " matches " + on.getKeyPropertyListString());
- } else {
- logger.info(jmc.getKeyvalue() + " does not match " + on.getKeyPropertyListString());
- }
- }
- } catch (MalformedObjectNameException e) {
- logger.error("", e);
- } catch (NullPointerException e) {
- logger.error("", e);
- } catch (IOException e) {
- logger.error("", e);
- }
-
- return list;
- }
-
- /*
- public void insertAttribute(JMXAttribute attr, Date date,
- Float floatValue, Integer intValue, String stringValue) {
- JMXData jmxd = new JMXData(attr, date, floatValue, intValue, stringValue);
- logger.error("insert data(" + attr.getId() + ", " + date + ", " + floatValue
- + ", " + intValue + ", " + stringValue + ")");
- Session sess = (Session) MonitoringSessionFactory.getInstance().openSession();
- Transaction tx = sess.beginTransaction();
- sess.save(jmxd);
- tx.commit();
- sess.close();
- }
- */
-
- public void insertAttributes(ObjectName on) {
- MBeanInfo info = null;
- Date date = new Date(System.currentTimeMillis());
- InetAddress addr = null;
- try {
- addr = InetAddress.getLocalHost();
- } catch (UnknownHostException e) {
- logger.error("", e);
- }
-
- try {
- info = server.getMBeanInfo(on);
- MBeanAttributeInfo[] mai = info.getAttributes();
- for (int i = 0; i < mai.length; i++) {
- StatisticsBean sb = new StatisticsBean(on.toString(), mai[i].getName(),
- addr.getHostName(), date, mai[i].getType(),
- server.getAttribute(on, mai[i].getName()));
- if (sb.getData() != null) {
- ArrayList<StatisticsBean> list = (ArrayList<StatisticsBean>) data.getList();
- list.add(sb);
- }
- }
- } catch (Exception e) {
- logger.error("", e);
- }
- }
-
- public void insertData() {
- List jmxPatterns = getClassPatterns();
- for (int i = 0; i < jmxPatterns.size(); i++) {
- JMXPattern jmxc = (JMXPattern) jmxPatterns.get(i);
- List<ObjectName> objectNames = getObjectNames(jmxc, server);
- for (int j = 0; j < objectNames.size(); j++) {
- ObjectName on = (ObjectName) objectNames.get(j);
- insertAttributes(on);
- }
- }
- }
-
- public StatisticsData getData() {
- return data;
- }
-
-}
Deleted: labs/jbossesb/trunk/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/DataFiler.java
===================================================================
--- labs/jbossesb/trunk/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/DataFiler.java 2007-08-16 03:01:34 UTC (rev 14286)
+++ labs/jbossesb/trunk/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/DataFiler.java 2007-08-16 03:04:44 UTC (rev 14287)
@@ -1,90 +0,0 @@
-package org.jboss.soa.esb.monitoring;
-
-import java.util.List;
-
-import org.apache.log4j.Logger;
-import org.hibernate.Session;
-import org.hibernate.Transaction;
-import org.jboss.soa.esb.monitoring.pojo.*;
-
-public class DataFiler {
- private StatisticsData data;
- private static final Logger logger = Logger.getLogger(DataFiler.class);
-
- public DataFiler() {
- }
-
- public DataFiler(StatisticsData f_data) {
- data = f_data;
- }
-
- public JMXAttribute getAttribute(Session sess, String objectname, String attribute) {
- String query = "from JMXAttribute jmxa "
- + "where objectname = :objectname and attribute = :attribute";
-
- List result = sess.createQuery(query)
- .setString("objectname", objectname)
- .setString("attribute", attribute).list();
-
- if (result.size() > 0) {
- JMXAttribute jmxa = (JMXAttribute) result.get(0);
- return jmxa;
- }
- return null;
- }
-
- public void insertData(Session sess, StatisticsBean f_sb, JMXAttribute attr) {
- JMXData jmxd = null;
- if (f_sb.getType().equals("java.lang.String")) {
- String data = (String) f_sb.getData();
- jmxd = new JMXData(null, f_sb.getCollectionTime(), null, null, data);
- } else if (f_sb.getType().equals("java.lang.Float")) {
- Float data = (Float) f_sb.getData();
- jmxd = new JMXData(null, f_sb.getCollectionTime(), data, null, null);
- } else if (f_sb.getType().equals("java.lang.Integer")) {
- Integer data = (Integer) f_sb.getData();
- jmxd = new JMXData(null, f_sb.getCollectionTime(), null, data, null);
- } else if (f_sb.getType().equals("long")) {
- Long data = (Long) f_sb.getData();
- jmxd = new JMXData(null, f_sb.getCollectionTime(), null, new Integer(data.intValue()), null);
- } else if (f_sb.getType().equals("int")) {
- Integer data = (Integer) f_sb.getData();
- jmxd = new JMXData(null, f_sb.getCollectionTime(), null, data, null);
- } else {
- logger.error ("ERROR - found type of " + f_sb.getType() + " for " + f_sb.getAttribute());
- return;
- }
- jmxd.setAttribute(attr);
- try {
- sess.save(jmxd);
- } catch (Exception e) {
- logger.error("Problem saving " + jmxd.toString(), e);
- }
- }
-
- public void insertStatistics(StatisticsBean f_sb) {
- Session sess = (Session) MonitoringSessionFactory.getInstance().openSession();
- Transaction tx = sess.beginTransaction();
-
- JMXAttribute attr = getAttribute(sess, f_sb.getObjectName(), f_sb.getAttribute());
- if (attr == null) {
- attr = new JMXAttribute(f_sb.getObjectName(), f_sb.getAttribute());
- sess.save(attr);
- insertData(sess, f_sb, attr);
- } else {
- insertData(sess, f_sb, attr);
- }
- tx.commit();
-
- sess.flush();
- sess.close();
- }
-
- public void persistData() {
- 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/DataFilerJob.java
===================================================================
--- labs/jbossesb/trunk/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/server/DataFilerJob.java 2007-08-16 03:01:34 UTC (rev 14286)
+++ labs/jbossesb/trunk/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/server/DataFilerJob.java 2007-08-16 03:04:44 UTC (rev 14287)
@@ -15,6 +15,7 @@
import org.jboss.soa.esb.message.Message;
import org.jboss.soa.esb.message.format.MessageFactory;
import org.jboss.soa.esb.services.registry.RegistryException;
+import org.jboss.soa.esb.services.registry.ServiceNotFoundException;
import org.quartz.Job;
import org.quartz.JobExecutionContext;
import org.quartz.JobExecutionException;
@@ -54,14 +55,13 @@
} catch (RegistryException e) {
logger.error("", e);
} catch (CourierException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
+ logger.error("", e);
} catch (MalformedEPRException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
+ logger.error("", e);
} catch (URISyntaxException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
+ logger.error("", e);
+ } catch (ServiceNotFoundException e) {
+ logger.error("", e);
}
}
}
More information about the jboss-svn-commits
mailing list