[jboss-cvs] jbossmx/src/resources/jgroups ...

[Brian Stansberry]

  User: bstansberry
  Date: 06/07/25 11:33:12

  Modified:    src/resources/jgroups   multiplexer-xmbean.xml
                        jboss-service.xml
  Log:
  [JBAS-3424] Ensure node name "additional_data" is present in multiplexed channel 
  
  Revision  Changes    Path
  1.2       +20 -3     jbossmx/src/resources/jgroups/multiplexer-xmbean.xml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: multiplexer-xmbean.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jbossmx/src/resources/jgroups/multiplexer-xmbean.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- multiplexer-xmbean.xml	9 May 2006 20:07:40 -0000	1.1
  +++ multiplexer-xmbean.xml	25 Jul 2006 15:33:12 -0000	1.2
  @@ -7,12 +7,16 @@
   <!--
       An example for setting up the JChannelFactory MBean
       Author: Bela Ban
  -    Version: $Id: multiplexer-xmbean.xml,v 1.1 2006/05/09 20:07:40 jerrygauth Exp $
  +    Version: $Id: multiplexer-xmbean.xml,v 1.2 2006/07/25 15:33:12 bstansberry Exp $
       -->
   <mbean>
   
       <description>JGroups Multiplexer</description>
  -    <class>org.jgroups.jmx.JChannelFactory</class>
  +    
  +    <!-- JBAS-3424 -- remove when JBAS-3425 is resolved -->
  +    <!--class>org.jgroups.jmx.JChannelFactory</class-->
  +    <class>org.jboss.ha.framework.server.JChannelFactory</class>
  +    
   
       <!-- Constructors -->
       <constructor>
  @@ -21,6 +25,19 @@
       </constructor>
   
       <!-- Attributes -->
  +    
  +    <!-- JBAS-3424 -- remove when JBAS-3425 is resolved -->
  +    <attribute access="read-write" getMethod="getNodeName" setMethod="setNodeName">
  +        <description>The unique name of the node across the partition.</description>
  +        <name>NodeName</name>
  +        <type>java.lang.String</type>
  +    </attribute>
  +    <attribute access="read-write" getMethod="getNodeAddress" setMethod="setNodeAddress">
  +        <description>The address used to determine the node name</description>
  +        <name>NodeAddress</name>
  +        <type>java.net.InetAddress</type>
  +    </attribute>
  +
       <attribute access="read-write" getMethod="getDomain" setMethod="setDomain">
           <description>The domain which is used as prefix for all channels and protocols exposed via JMX</description>
           <name>Domain</name>
  
  
  
  1.2       +5 -2      jbossmx/src/resources/jgroups/jboss-service.xml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: jboss-service.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jbossmx/src/resources/jgroups/jboss-service.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- jboss-service.xml	9 May 2006 20:07:40 -0000	1.1
  +++ jboss-service.xml	25 Jul 2006 15:33:12 -0000	1.2
  @@ -10,13 +10,16 @@
       <!--
       An example for setting up the JChannelFactory MBean
       Author: Bela Ban
  -    Version: $Id: jboss-service.xml,v 1.1 2006/05/09 20:07:40 jerrygauth Exp $
  +    Version: $Id: jboss-service.xml,v 1.2 2006/07/25 15:33:12 bstansberry Exp $
       -->
  -    <mbean code="org.jgroups.jmx.JChannelFactory" name="jgroups.mux:name=Multiplexer" xmbean-dd="resource:META-INF/multiplexer-xmbean.xml">
  +    <mbean code="org.jboss.ha.framework.server.JChannelFactory" name="jgroups.mux:name=Multiplexer" xmbean-dd="resource:META-INF/multiplexer-xmbean.xml">
           <attribute name="Domain">jgroups.mux</attribute>
           <attribute name="MultiplexerConfig">META-INF/multiplexer-stacks.xml</attribute>
           <attribute name="ExposeChannels">true</attribute>
           <attribute name="ExposeProtocols">true</attribute>
  +        
  +        <!-- The address used to determine the node name -->
  +        <attribute name="NodeAddress">${jboss.bind.address}</attribute>
       </mbean>