[jboss-cvs] JBossAS SVN: r69513 - in trunk/cluster/src: main/org/jboss/cache/invalidation/bridges and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Jan 31 17:31:19 EST 2008
Author: bstansberry at jboss.com
Date: 2008-01-31 17:31:18 -0500 (Thu, 31 Jan 2008)
New Revision: 69513
Modified:
trunk/cluster/src/etc/cluster-beans.xml
trunk/cluster/src/main/org/jboss/cache/invalidation/bridges/JGCacheInvalidationBridgeMBean.java
Log:
[JBAS-5193] Separate HAPartition deployment from other cluster services
[JBAS-5195] Convert HA-JNDI and HA Detached invokers back to mbeans
Modified: trunk/cluster/src/etc/cluster-beans.xml
===================================================================
--- trunk/cluster/src/etc/cluster-beans.xml 2008-01-31 22:31:02 UTC (rev 69512)
+++ trunk/cluster/src/etc/cluster-beans.xml 2008-01-31 22:31:18 UTC (rev 69513)
@@ -1,5 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
-
+
+<!-- ==================================================================== -->
+<!-- Core HAParition Service Used for intra-cluster group RPCs -->
+<!-- ==================================================================== -->
+
<deployment xmlns="urn:jboss:bean-deployer:2.0">
<!-- ==================================================================== -->
@@ -136,140 +140,4 @@
</bean>
-
- <!-- ==================================================================== -->
- <!-- HA Session State Service for EJB2 SFSB -->
- <!-- ==================================================================== -->
-
- <bean name="HASessionState"
- class="org.jboss.ha.hasessionstate.server.HASessionStateService">
-
- <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss:service=HASessionState", exposedInterface=org.jboss.ha.hasessionstate.server.HASessionStateServiceMBean.class, registerDirectly=true)</annotation>
-
- <depends>HAPartition</depends>
-
- <property name="HAPartition"><inject bean="HAPartition"/></property>
- <!-- JNDI name under which the service is bound -->
- <property name="jndiName">/HASessionState/Default</property>
- <!-- Max delay before cleaning unreclaimed state.
- Defaults to 30*60*1000 => 30 minutes -->
- <property name="beanCleaningDelay">0</property>
-
- </bean>
-
- <!-- ==================================================================== -->
- <!-- HA JNDI -->
- <!-- ==================================================================== -->
-
- <bean name="HAJNDI" class="org.jboss.ha.jndi.HANamingService">
-
- <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss:service=HAJNDI", exposedInterface=org.jboss.ha.jndi.HANamingServiceMBean.class, registerDirectly=true)</annotation>
-
- <depends>HAPartition</depends>
-
- <property name="HAPartition"><inject bean="HAPartition"/></property>
- <property name="clusteredCache"><inject bean="DefaultPartition-HAPartitionCache" property="cache"/></property>
-
- <!-- Bind address of bootstrap and HA-JNDI RMI endpoints -->
- <property name="bindAddress">${jboss.bind.address}</property>
- <!-- Port on which the HA-JNDI stub is made available -->
- <property name="port">1100</property>
- <!-- RmiPort to be used by the HA-JNDI service once bound. 0 => auto. -->
- <property name="rmiPort">1101</property>
- <!-- Accept backlog of the bootstrap socket -->
- <property name="backlog">50</property>
- <!-- The thread pool service used to control the bootstrap and
- auto discovery lookups -->
- <property name="lookupPool"><inject bean="jboss.system:service=ThreadPool"/></property>
-
- <!-- A flag to disable the auto discovery via multicast -->
- <property name="discoveryDisabled">false</property>
- <!-- Set the auto-discovery bootstrap multicast bind address. If not
- specified and a BindAddress is specified, the BindAddress will be used. -->
- <property name="autoDiscoveryBindAddress">${jboss.bind.address}</property>
- <!-- Multicast Address and group port used for auto-discovery -->
- <property name="autoDiscoveryAddress">${jboss.partition.udpGroup:230.0.0.4}</property>
- <property name="autoDiscoveryGroup">1102</property>
- <!-- The TTL (time-to-live) for autodiscovery IP multicast packets -->
- <property name="autoDiscoveryTTL">16</property>
- <!-- The load balancing policy for HA-JNDI -->
- <property name="loadBalancePolicy">org.jboss.ha.framework.interfaces.RoundRobin</property>
-
- <!-- Client socket factory to be used for client-server
- RMI invocations during JNDI queries
- <property name="clientSocketFactory">custom</property>
- -->
- <!-- Server socket factory to be used for client-server
- RMI invocations during JNDI queries
- <property name="serverSocketFactory">custom</property>
- -->
- </bean>
-
- <bean name="JRMPInvokerHA"
- class="org.jboss.invocation.jrmp.server.JRMPInvokerHA">
-
- <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss:service=invoker,type=jrmpha", exposedInterface=org.jboss.invocation.jrmp.server.JRMPInvokerMBean.class, registerDirectly=true)</annotation>
-
- <depends>HAPartition</depends>
-
- <property name="serverAddress">${jboss.bind.address}</property>
- <property name="RMIObjectPort">4447</property>
-
- <!--
- <property name="RMIObjectPort">0</property>
- <property name="RMIClientSocketFactory">custom</property>
- <property name="RMIServerSocketFactory">custom</property>
- -->
- </bean>
-
- <bean name="PooledInvokerHA"
- class="org.jboss.invocation.pooled.server.PooledInvokerHA">
-
- <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss:service=invoker,type=pooledha", exposedInterface=org.jboss.system.ServiceMBean.class, registerDirectly=true)</annotation>
-
- <depends>jboss:service=TransactionManager</depends>
- <depends>HAPartition</depends>
-
- <property name="numAcceptThreads">1</property>
- <property name="maxPoolSize">300</property>
- <property name="clientMaxPoolSize">300</property>
- <property name="socketTimeout">60000</property>
- <property name="serverBindAddress">${jboss.bind.address}</property>
- <property name="serverBindPort">4448</property>
- <property name="clientConnectAddress">${jboss.bind.address}</property>
- <property name="clientConnectPort">0</property>
- <property name="enableTcpNoDelay">false</property>
- <property name="transactionManagerService">jboss:service=TransactionManager</property>
-
- </bean>
-
- <bean name="UnifiedInvokerHA"
- class="org.jboss.invocation.unified.server.UnifiedInvokerHA">
-
- <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss:service=invoker,type=unifiedha", exposedInterface=org.jboss.system.ServiceMBean.class, registerDirectly=true)</annotation>
-
- <depends>jboss:service=TransactionManager</depends>
- <depends>HAPartition</depends>
-
- <property name="connector"><inject bean="jboss.remoting:service=Connector,transport=socket"/></property>
-
- </bean>
-
- <!-- ==================================================================== -->
- <!-- Distributed cache invalidation -->
- <!-- ==================================================================== -->
-
- <bean name="JGCacheInvalidationBridge"
- class="org.jboss.cache.invalidation.bridges.JGCacheInvalidationBridge">
-
- <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.cache:service=InvalidationBridge,type=JavaGroups", exposedInterface=org.jboss.cache.invalidation.bridges.JGCacheInvalidationBridgeMBean.class, registerDirectly=true)</annotation>
-
- <depends>HAPartition</depends>
-
- <property name="HAPartition"><inject bean="HAPartition"/></property>
- <property name="invalidationManager"><inject bean="jboss.cache:service=InvalidationManager"/></property>
- <property name="bridgeName">DefaultJGBridge</property>
-
- </bean>
-
</deployment>
Modified: trunk/cluster/src/main/org/jboss/cache/invalidation/bridges/JGCacheInvalidationBridgeMBean.java
===================================================================
--- trunk/cluster/src/main/org/jboss/cache/invalidation/bridges/JGCacheInvalidationBridgeMBean.java 2008-01-31 22:31:02 UTC (rev 69512)
+++ trunk/cluster/src/main/org/jboss/cache/invalidation/bridges/JGCacheInvalidationBridgeMBean.java 2008-01-31 22:31:18 UTC (rev 69513)
@@ -21,6 +21,7 @@
*/
package org.jboss.cache.invalidation.bridges;
+import org.jboss.cache.invalidation.InvalidationManagerMBean;
import org.jboss.ha.framework.interfaces.HAPartition;
import org.jboss.system.ServiceMBean;
@@ -90,4 +91,14 @@
*/
public void setBridgeName(String name);
+ /**
+ * Get the InvalidationManager
+ */
+ public InvalidationManagerMBean getInvalidationManager();
+
+ /**
+ * Set the InvalidationManager
+ */
+ public void setInvalidationManager(InvalidationManagerMBean manager);
+
}
More information about the jboss-cvs-commits
mailing list