[Jboss-cvs] JBossAS SVN: r54989 - trunk/cluster/src/resources/jgroups

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

Author: bstansberry at jboss.com
Date: 2006-08-01 14:47:49 -0400 (Tue, 01 Aug 2006)
New Revision: 54989

Modified:
   trunk/cluster/src/resources/jgroups/jboss-service.xml
   trunk/cluster/src/resources/jgroups/multiplexer-xmbean.xml
Log:
Switch back to the std JG JChannelFactory

Modified: trunk/cluster/src/resources/jgroups/jboss-service.xml
===================================================================
--- trunk/cluster/src/resources/jgroups/jboss-service.xml	2006-08-01 17:47:17 UTC (rev 54988)
+++ trunk/cluster/src/resources/jgroups/jboss-service.xml	2006-08-01 18:47:49 UTC (rev 54989)
@@ -12,14 +12,16 @@
     Author: Bela Ban
     Version: $Id$
     -->
-    <mbean code="org.jboss.ha.framework.server.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" -->
+    <mbean code="org.jgroups.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 -->
+        <!-- The address used to determine the node name
         <attribute name="NodeAddress">${jboss.bind.address}</attribute>
+         -->
     </mbean>
 
 

Modified: trunk/cluster/src/resources/jgroups/multiplexer-xmbean.xml
===================================================================
--- trunk/cluster/src/resources/jgroups/multiplexer-xmbean.xml	2006-08-01 17:47:17 UTC (rev 54988)
+++ trunk/cluster/src/resources/jgroups/multiplexer-xmbean.xml	2006-08-01 18:47:49 UTC (rev 54989)
@@ -13,11 +13,12 @@
 
     <description>JGroups Multiplexer</description>
     
-    <!-- JBAS-3424 remove when JBAS-3425 is resolved -->
-    <!--class>org.jgroups.jmx.JChannelFactory</class-->
+    
+    <class>org.jgroups.jmx.JChannelFactory</class>
+    <!-- JBAS-3424 remove when JBAS-3425 is resolved
     <class>org.jboss.ha.framework.server.JChannelFactory</class>
+     -->
     
-    
     <!-- Constructors -->
     <constructor>
         <description>The default constructor</description>
@@ -26,7 +27,7 @@
 
     <!-- Attributes -->
     
-    <!-- JBAS-3424 remove when JBAS-3425 is resolved -->
+    <!-- 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>
@@ -37,7 +38,8 @@
         <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>