[jboss-cvs] JBossAS SVN: r103654 - in trunk: server/src/etc/deploy and 1 other directories.

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

Author: smarlow at redhat.com
Date: 2010-04-07 15:45:13 -0400 (Wed, 07 Apr 2010)
New Revision: 103654

Modified:
   trunk/server/src/etc/conf/all/bindingservice.beans/META-INF/bindings-jboss-beans.xml
   trunk/server/src/etc/deploy/jmx-jboss-beans.xml
   trunk/system/src/main/java/org/jboss/system/server/jmx/JMXConnector.java
Log:
JBAS-7873 binding service support for RMIJRMPServerImpl

Modified: trunk/server/src/etc/conf/all/bindingservice.beans/META-INF/bindings-jboss-beans.xml
===================================================================
--- trunk/server/src/etc/conf/all/bindingservice.beans/META-INF/bindings-jboss-beans.xml	2010-04-07 19:43:54 UTC (rev 103653)
+++ trunk/server/src/etc/conf/all/bindingservice.beans/META-INF/bindings-jboss-beans.xml	2010-04-07 19:45:13 UTC (rev 103654)
@@ -245,6 +245,13 @@
                <property name="description">RMI/JRMP socket for connecting to the JMX MBeanServer</property>
             </bean>
 
+            <bean class="org.jboss.services.binding.ServiceBindingMetadata">
+               <property name="serviceName">jboss.remoting:service=JMXConnectorServer,protocol=rmiServer</property>
+               <property name="port">1091</property>
+               <property name="description">RMI server socket</property>
+            </bean>
+
+
             <!-- ********************* deploy/ejb3-connectors-service.xml **************** -->
 
             <!-- EJB3 wants to have the service create its own ServiceBinding object

Modified: trunk/server/src/etc/deploy/jmx-jboss-beans.xml
===================================================================
--- trunk/server/src/etc/deploy/jmx-jboss-beans.xml	2010-04-07 19:43:54 UTC (rev 103653)
+++ trunk/server/src/etc/deploy/jmx-jboss-beans.xml	2010-04-07 19:45:13 UTC (rev 103654)
@@ -29,13 +29,23 @@
       </property>
 
       <!-- specify the port that the JMX connector is looked up through (used in JMXServiceURL) -->
-      <!-- commenting this out, will use 1090 as default and will conflict -->
+      <!-- commenting this out, will use 1090 as default -->
           <property name="rmiRegistryPort" class="int">
           <!-- Get the port from the ServiceBindingManager -->
           <value-factory bean="ServiceBindingManager" method="getIntBinding" 
           parameter="jboss.remoting:service=JMXConnectorServer,protocol=rmi"/>
        </property>
 
+
+      <!-- specify the port that the RMI server listens to  -->
+      <!-- commenting this out, will use 1091 as default -->
+      <property name="rmiServerPort" class="int">
+      <!-- Get the port from the ServiceBindingManager -->
+      <value-factory bean="ServiceBindingManager" method="getIntBinding"
+      parameter="jboss.remoting:service=JMXConnectorServer,protocol=rmiServer"/>
+      </property>
+
+
       <!-- specify the mbean server that is used internally, this shouldn't be changed here. -->
       <property name="mbeanServer" class="javax.management.MBeanServer"><inject bean="JMXKernel" property="mbeanServer" /></property>
       <property name="context" class="javax.naming.InitialContext"><inject bean="InitialContext"/></property>

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-07 19:43:54 UTC (rev 103653)
+++ trunk/system/src/main/java/org/jboss/system/server/jmx/JMXConnector.java	2010-04-07 19:45:13 UTC (rev 103654)
@@ -52,6 +52,7 @@
 
    /* start of configurable settings */
    private int rmiRegistryPort=1090;  // create a RMI registry at this port
+   private int rmiServerPort=1091;    // rmi server will listen on this port
    private String hostname= "localhost";
    private static final String RMI_BIND_NAME =  "jmxrmi";
    private static final String JNDI_BIND_NAME = "jmx/invoker/RMIAdaptor";
@@ -104,6 +105,14 @@
       this.rmiRegistryPort = rmiRegistryPort;
    }
 
+   public int getRmiServerPort() {
+      return rmiServerPort;
+   }
+
+   public void setRmiServerPort(int rmiServerPort) {
+      this.rmiServerPort = rmiServerPort;
+   }
+
    public String getHostname() {
       return hostname;
    }
@@ -124,7 +133,7 @@
       HashMap env = new HashMap();
       if( securityDomain != null)
          env.put(RMIConnectorServer.AUTHENTICATOR, new JMXConnectorAuthenticator( securityDomain) );
-      rmiServer = new RMIJRMPServerImpl( 0, null, null, env);
+      rmiServer = new RMIJRMPServerImpl(rmiServerPort, null, null, env);
       JMXServiceURL url = new JMXServiceURL("service:jmx:rmi://" + hostname);
       adapter = new RMIConnectorServer(url, env, rmiServer, mbeanServer);
       adapter.start();