[jboss-cvs] JBossAS SVN: r65453 - in trunk/cluster/src: resources/jgroups and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Sep 18 13:08:24 EDT 2007
Author: bstansberry at jboss.com
Date: 2007-09-18 13:08:23 -0400 (Tue, 18 Sep 2007)
New Revision: 65453
Modified:
trunk/cluster/src/main/org/jboss/ha/framework/server/JChannelFactory.java
trunk/cluster/src/resources/jgroups/multiplexer-beans.xml
Log:
[JBAS-4728] Don't use org.jgroups.jmx.JChannelFactory as a wrapper around our pojo factory
Modified: trunk/cluster/src/main/org/jboss/ha/framework/server/JChannelFactory.java
===================================================================
--- trunk/cluster/src/main/org/jboss/ha/framework/server/JChannelFactory.java 2007-09-18 16:37:16 UTC (rev 65452)
+++ trunk/cluster/src/main/org/jboss/ha/framework/server/JChannelFactory.java 2007-09-18 17:08:23 UTC (rev 65453)
@@ -42,6 +42,7 @@
* @version $Revision$
*/
public class JChannelFactory extends org.jgroups.JChannelFactory
+ implements org.jgroups.jmx.JChannelFactoryMBean
{
protected static Logger log = Logger.getLogger(JChannelFactory.class);
Modified: trunk/cluster/src/resources/jgroups/multiplexer-beans.xml
===================================================================
--- trunk/cluster/src/resources/jgroups/multiplexer-beans.xml 2007-09-18 16:37:16 UTC (rev 65452)
+++ trunk/cluster/src/resources/jgroups/multiplexer-beans.xml 2007-09-18 17:08:23 UTC (rev 65453)
@@ -7,7 +7,9 @@
on any shared channel -->
<bean name="JChannelFactory" class="org.jboss.ha.framework.server.JChannelFactory">
- <property name="domain">jboss.jgroups</property>
+ <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.jgroups:service=MultiplexerChannelFactory", exposedInterface=org.jgroups.jmx.JChannelFactoryMBean.class, registerDirectly=false)</annotation>
+
+ <property name="domain">jboss.jgroups</property>
<property name="multiplexerConfig">META-INF/multiplexer-stacks.xml</property>
<property name="exposeChannels">true</property>
<property name="exposeProtocols">true</property>
@@ -18,16 +20,5 @@
<!-- Naming Service Port is used to generate a unique node name -->
<property name="namingServicePort"><inject bean="jboss:service=Naming" property="Port"/></property>
</bean>
-
- <!-- The JMX wrapper for the factory -->
- <bean name="JChannelFactoryJMXWrapper" class="org.jgroups.jmx.JChannelFactory">
-
- <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.jgroups:service=MultiplexerChannelFactory", exposedInterface=org.jgroups.jmx.JChannelFactoryMBean.class, registerDirectly=true)</annotation>
-
- <constructor>
- <parameter><inject bean="JChannelFactory"/></parameter>
- </constructor>
-
- </bean>
</deployment>
More information about the jboss-cvs-commits
mailing list