[jboss-svn-commits] JBL Code SVN: r16774 - in labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring: client and 1 other directory.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Sat Nov 24 01:47:54 EST 2007
Author: kevin.conner at jboss.com
Date: 2007-11-24 01:47:54 -0500 (Sat, 24 Nov 2007)
New Revision: 16774
Removed:
labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/JMXTest.java
Modified:
labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/client/DataCollector.java
labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/client/Invoker.java
labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/client/OperationsCollector.java
Log:
Changed to use locator as these are co-located with MBeanServer: JBESB-1358
Deleted: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/JMXTest.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/JMXTest.java 2007-11-24 06:16:07 UTC (rev 16773)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/JMXTest.java 2007-11-24 06:47:54 UTC (rev 16774)
@@ -1,57 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.soa.esb.monitoring;
-
-import javax.naming.*;
-
-import org.jboss.soa.esb.monitoring.client.DataCollector;
-
-import java.util.*;
-
-/**
- * JMXTest is a simple command line test of the DataCollector.
- *
- * @author <a href="mailto:tcunning at redhat.com">Tom Cunningham</a>
- * @since Version 4.2
- */
-public class JMXTest {
- public JMXTest() {
- }
-
- /**
- * @param args the command line arguments
- */
- @SuppressWarnings("unchecked")
- public static void main(String[] args) throws Exception
- {
- Hashtable environment = new Hashtable();
- environment.put(Context.INITIAL_CONTEXT_FACTORY, "org.jnp.interfaces.NamingContextFactory");
- environment.put(Context.URL_PKG_PREFIXES, "org.jboss.naming:org.jnp.interfaces");
- environment.put(Context.PROVIDER_URL, "jnp://127.0.0.1:1099");
- InitialContext ic = new InitialContext(environment);
-
- DataCollector dcollector = new DataCollector(ic);
- dcollector.collectData();
- StatisticsData data = dcollector.getData();
- data.print();
- }
-}
Modified: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/client/DataCollector.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/client/DataCollector.java 2007-11-24 06:16:07 UTC (rev 16773)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/client/DataCollector.java 2007-11-24 06:47:54 UTC (rev 16774)
@@ -43,6 +43,7 @@
import org.apache.log4j.Logger;
import org.hibernate.Session;
+import org.jboss.mx.util.MBeanServerLocator;
import org.jboss.soa.esb.monitoring.MonitoringSessionFactory;
import org.jboss.soa.esb.monitoring.StatisticsBean;
import org.jboss.soa.esb.monitoring.StatisticsData;
@@ -66,20 +67,16 @@
public DataCollector() {
try {
context = new InitialContext();
- server = (MBeanServerConnection) context.lookup("jmx/invoker/RMIAdaptor");
} catch (NamingException e) {
logger.error("", e);
}
+ server = MBeanServerLocator.locateJBoss();
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);
- }
+ server = MBeanServerLocator.locateJBoss();
data = new StatisticsData();
}
Modified: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/client/Invoker.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/client/Invoker.java 2007-11-24 06:16:07 UTC (rev 16773)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/client/Invoker.java 2007-11-24 06:47:54 UTC (rev 16774)
@@ -13,20 +13,15 @@
import javax.naming.NamingException;
import org.apache.log4j.Logger;
+import org.jboss.mx.util.MBeanServerLocator;
import org.jboss.soa.esb.message.body.content.ServiceControlCommand;
public class Invoker {
Logger logger = Logger.getLogger(Invoker.class);
- private Context context;
private MBeanServerConnection server;
public Invoker() {
- try {
- context = new InitialContext();
- server = (MBeanServerConnection) context.lookup("jmx/invoker/RMIAdaptor");
- } catch (NamingException e) {
- logger.error("", e);
- }
+ server = MBeanServerLocator.locateJBoss();
}
public Object invoke(ServiceControlCommand obean) {
Modified: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/client/OperationsCollector.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/client/OperationsCollector.java 2007-11-24 06:16:07 UTC (rev 16773)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/client/OperationsCollector.java 2007-11-24 06:47:54 UTC (rev 16774)
@@ -22,6 +22,7 @@
import org.apache.log4j.Logger;
import org.hibernate.Session;
+import org.jboss.mx.util.MBeanServerLocator;
import org.jboss.soa.esb.message.body.content.ServiceControlCommand;
import org.jboss.soa.esb.monitoring.MonitoringSessionFactory;
import org.jboss.soa.esb.monitoring.OperationsData;
@@ -37,20 +38,16 @@
public OperationsCollector() {
try {
context = new InitialContext();
- server = (MBeanServerConnection) context.lookup("jmx/invoker/RMIAdaptor");
} catch (NamingException e) {
logger.error("", e);
}
+ server = MBeanServerLocator.locateJBoss();
data = new OperationsData();
}
public OperationsCollector(Context f_context) {
context = f_context;
- try {
- server = (MBeanServerConnection) context.lookup("jmx/invoker/RMIAdaptor");
- } catch (NamingException e) {
- logger.error("", e);
- }
+ server = MBeanServerLocator.locateJBoss();
data = new OperationsData();
}
More information about the jboss-svn-commits
mailing list