[jboss-cvs] JBossAS SVN: r103568 - in trunk/system/src: main/java/org/jboss/system/server/jmx and 1 other directory.

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

Author: smarlow at redhat.com
Date: 2010-04-06 08:08:46 -0400 (Tue, 06 Apr 2010)
New Revision: 103568

Modified:
   trunk/system/src/assembly/client.xml
   trunk/system/src/main/java/org/jboss/system/server/jmx/JMXConnector.java
Log:
JBAS-7827 legacy references to jmx/rmi/RMIAdaptor

Modified: trunk/system/src/assembly/client.xml
===================================================================
--- trunk/system/src/assembly/client.xml	2010-04-06 12:07:00 UTC (rev 103567)
+++ trunk/system/src/assembly/client.xml	2010-04-06 12:08:46 UTC (rev 103568)
@@ -13,8 +13,9 @@
         <include>org/jboss/deployment/IncompleteDeploymentException*</include>
         <include>org/jboss/deployment/Deployer*</include>
         <include>org/jboss/system/Service.class</include>
+        <include>org/jboss/system/server/jmx/JMXAdapter.class</include>
         <include>**/*MBean.class</include>
       </includes>
     </fileSet>
   </fileSets>
-</assembly>
\ No newline at end of file
+</assembly>

Modified: trunk/system/src/main/java/org/jboss/system/server/jmx/JMXConnector.java
===================================================================
--- trunk/system/src/main/java/org/jboss/system/server/jmx/JMXConnector.java	2010-04-06 12:07:00 UTC (rev 103567)
+++ trunk/system/src/main/java/org/jboss/system/server/jmx/JMXConnector.java	2010-04-06 12:08:46 UTC (rev 103568)
@@ -51,6 +51,7 @@
    private String hostname= "localhost";
    private static final String RMI_BIND_NAME =  "jmxrmi";
    private static final String JNDI_BIND_NAME = "jmx/invoker/RMIAdaptor";
+   private static final String LEGACY_BIND_NAME = "jmx/rmi/RMIAdaptor";
    private MBeanServer mbeanServer = ManagementFactory.getPlatformMBeanServer();
    private InitialContext context;
 
@@ -130,6 +131,7 @@
       Reference reference = new Reference(MBeanServerConnection.class.getName(), JMXAdapter.class.getName(), null);
       reference.add(new StringRefAddr("JMXServiceURL", url.toString()));
       Util.rebind(context, JNDI_BIND_NAME, reference);
+      Util.rebind(context, LEGACY_BIND_NAME, reference);
       //Object test = Util.lookup(context, JNDI_BIND_NAME, MBeanServerConnection.class);
       //log.info("test = " + test);
    }
@@ -138,6 +140,7 @@
       registry.unbind(RMI_BIND_NAME);
       adapter.stop();
       Util.unbind(context, JNDI_BIND_NAME);
+      Util.unbind(context, LEGACY_BIND_NAME);
    }
 
 }