[jboss-cvs] JBossAS SVN: r103571 - projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/testing/internal.

[jboss-cvs-commits at lists.jboss.org]

Author: thomas.diesler at jboss.com
Date: 2010-04-06 09:52:41 -0400 (Tue, 06 Apr 2010)
New Revision: 103571

Modified:
   projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/testing/internal/RemoteRuntime.java
Log:
Use JSR160 JMXConnector. Deprecate jmx/invoker/RMIAdaptor JNDI binding.

Modified: projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/testing/internal/RemoteRuntime.java
===================================================================
--- projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/testing/internal/RemoteRuntime.java	2010-04-06 13:51:42 UTC (rev 103570)
+++ projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/testing/internal/RemoteRuntime.java	2010-04-06 13:52:41 UTC (rev 103571)
@@ -30,24 +30,29 @@
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 
 import javax.management.MBeanServerConnection;
 import javax.management.ObjectName;
 import javax.management.openmbean.CompositeData;
 import javax.management.openmbean.TabularData;
+import javax.management.remote.JMXConnector;
+import javax.management.remote.JMXConnectorFactory;
+import javax.management.remote.JMXServiceURL;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
 
 import org.jboss.logging.Logger;
+import org.jboss.osgi.jmx.JMXConstantsExt;
 import org.jboss.osgi.jmx.MBeanProxy;
 import org.jboss.osgi.jmx.ObjectNameFactory;
 import org.jboss.osgi.jmx.ServiceStateMBeanExt;
 import org.jboss.osgi.spi.util.BundleInfo;
 import org.jboss.osgi.testing.OSGiBundle;
 import org.jboss.osgi.testing.OSGiRuntime;
+import org.jboss.osgi.testing.OSGiRuntimeHelper;
 import org.jboss.osgi.testing.OSGiServiceReference;
-import org.jboss.osgi.testing.OSGiRuntimeHelper;
 import org.osgi.framework.BundleException;
 import org.osgi.jmx.framework.BundleStateMBean;
 import org.osgi.jmx.framework.ServiceStateMBean;
@@ -62,8 +67,6 @@
 {
    // Provide logging
    private static final Logger log = Logger.getLogger(RemoteRuntime.class);
-   
-   private MBeanServerConnection mbeanServer;
 
    public RemoteRuntime(OSGiRuntimeHelper helper)
    {
@@ -209,6 +212,30 @@
    @Override
    public MBeanServerConnection getMBeanServer()
    {
+      MBeanServerConnection mbeanServer = null;
+      try
+      {
+         String host = getServerHost();
+         String rmiPort = System.getProperty(JMXConstantsExt.REMOTE_JMX_RMI_PORT, "1098");
+
+         // Construct the JSR160 remote address  
+         JMXServiceURL address = new JMXServiceURL("service:jmx:rmi://" + host + "/jndi/rmi://" + host + ":" + rmiPort + "/jmxconnector");
+
+         // The environment map, null in this case
+         Map<String, ?> env = null;
+
+         // Create the JMXCconnectorServer
+         JMXConnector cntor = JMXConnectorFactory.connect(address, env);
+
+         // Obtain a "stub" for the remote MBeanServer
+         mbeanServer = cntor.getMBeanServerConnection();
+      }
+      catch (Exception ex)
+      {
+         log.warn("Cannot obtain MBeanServerConnection", ex);
+      }
+
+      // Fall back to the legacy JNDI name
       if (mbeanServer == null)
       {
          try
@@ -218,9 +245,10 @@
          }
          catch (NamingException ex)
          {
-            throw new IllegalStateException("Cannot obtain MBeanServerConnection", ex);
+            log.warn("Cannot obtain MBeanServerConnection", ex);
          }
       }
+      
       return mbeanServer;
    }