[jboss-cvs] JBossAS SVN: r79764 - in trunk: cluster/src/etc and 5 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Mon Oct 20 16:19:03 EDT 2008


Author: bstansberry at jboss.com
Date: 2008-10-20 16:19:03 -0400 (Mon, 20 Oct 2008)
New Revision: 79764

Added:
   trunk/cluster/src/etc/ha-legacy-jboss-beans.xml
Removed:
   trunk/cluster/src/etc/ha-legacy-service.xml
   trunk/testsuite/src/resources/cluster/ejb2/passexp/partition-passexp-service.xml
   trunk/testsuite/src/resources/cluster/partition/partition-restart-service.xml
Modified:
   trunk/build/build-distr.xml
   trunk/testsuite/imports/sections/cluster.xml
   trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/test/PartitionRestartUnitTestCase.java
   trunk/testsuite/src/resources/cluster/ejb2/passexp/META-INF/partition-passexp-jboss-beans.xml
   trunk/testsuite/src/resources/cluster/partition/partition-restart-jboss-beans.xml
Log:
[JBAS-6090] Reapply r79491 commit

Modified: trunk/build/build-distr.xml
===================================================================
--- trunk/build/build-distr.xml	2008-10-20 20:13:58 UTC (rev 79763)
+++ trunk/build/build-distr.xml	2008-10-20 20:19:03 UTC (rev 79764)
@@ -1001,7 +1001,7 @@
         <include name="cluster-jboss-beans.xml"/>
         <include name="deploy-hasingleton-jboss-beans.xml"/>
         <include name="hajndi-jboss-beans.xml"/>
-        <include name="ha-legacy-service.xml"/>
+        <include name="ha-legacy-jboss-beans.xml"/>
       </fileset>
     </copy>
     <mkdir dir="${install.server}/all/deploy/cluster/jgroups-channelfactory.sar"/>

Copied: trunk/cluster/src/etc/ha-legacy-jboss-beans.xml (from rev 79491, trunk/cluster/src/etc/ha-legacy-jboss-beans.xml)
===================================================================
--- trunk/cluster/src/etc/ha-legacy-jboss-beans.xml	                        (rev 0)
+++ trunk/cluster/src/etc/ha-legacy-jboss-beans.xml	2008-10-20 20:19:03 UTC (rev 79764)
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ===================================================================== -->
+<!--                                                                       -->
+<!-- High Availability for legacy services (e.g. EJB2)                     -->
+<!--                                                                       -->
+<!-- ===================================================================== -->
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+   <!-- ==================================================================== -->
+   <!-- HA Detached Invoker using JRMP for transport                         -->
+   <!-- ==================================================================== -->
+
+   <bean name="JRMPInvokerHA"
+         class="org.jboss.invocation.jrmp.server.JRMPInvokerHA">
+          
+      <depends>jboss:service=TransactionManager</depends>
+      <depends>HAPartition</depends>
+      
+      <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>
+      
+      <property name="serverAddress">${jboss.bind.address}</property>
+      <property name="RMIObjectPort">
+          <!-- Get the port from the ServiceBindingManager -->
+         <value-factory bean="ServiceBindingManager" method="getIntBinding" 
+            parameter="jboss:service=invoker,type=jrmpha"/>
+      </property>
+      
+      <!--
+      <property name="RMIObjectPort">0</property>
+      <property name="RMIClientSocketFactory">custom</property>
+      <property name="RMIServerSocketFactory">custom</property>
+      -->
+   </bean>
+
+   <!-- ==================================================================== -->
+   <!-- HA Detached Invoker using pooled socket-based transport              -->
+   <!-- ==================================================================== -->
+
+   <bean name="PooledInvokerHA"
+         class="org.jboss.invocation.pooled.server.PooledInvokerHA">
+          
+      <depends>jboss:service=TransactionManager</depends>
+      <depends>HAPartition</depends>
+      
+      <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss:service=invoker,type=pooledha", exposedInterface=org.jboss.invocation.pooled.server.PooledInvokerMBean.class, registerDirectly=true)</annotation>
+      
+      <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">
+         <!-- Get the port from the ServiceBindingManager -->
+         <value-factory bean="ServiceBindingManager" method="getIntBinding" 
+            parameter="jboss:service=invoker,type=pooledha"/>
+      </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>
+
+   <!-- ==================================================================== -->
+   <!-- HA Detached Invoker using JBoss Remoting for transport               -->
+   <!-- ==================================================================== -->
+
+   <bean name="UnifiedInvokerHA"
+         class="org.jboss.invocation.unified.server.UnifiedInvokerHA">
+      
+      <depends>jboss:service=TransactionManager</depends>       
+      <depends>HAPartition</depends>
+      
+      <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss:service=invoker,type=unifiedha", exposedInterface=org.jboss.invocation.unified.server.UnifiedInvokerMBean.class, registerDirectly=true)</annotation>
+      
+      <property name="connector"><inject bean="jboss.remoting:service=Connector,transport=socket"/></property>
+   </bean>
+   
+   <!-- ==================================================================== -->
+   <!-- HA Session State Service for EJB2 SFSBs                              -->
+   <!-- ==================================================================== -->
+
+   <bean name="HASessionStateService"
+         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>
+      
+      <!--  Partition used for group RPCs -->
+      <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>
+
+   <!-- ==================================================================== -->
+   <!-- Distributed EJB2 entity 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>
+      
+      <!--  Partition used for group RPCs -->
+      <property name="HAPartition"><inject bean="HAPartition"/></property>
+      <property name="invalidationManager"><inject bean="jboss.cache:service=InvalidationManager"/></property>
+      <property name="bridgeName">DefaultJGBridge</property>
+      
+   </bean>
+
+</deployment>
\ No newline at end of file

Deleted: trunk/cluster/src/etc/ha-legacy-service.xml
===================================================================
--- trunk/cluster/src/etc/ha-legacy-service.xml	2008-10-20 20:13:58 UTC (rev 79763)
+++ trunk/cluster/src/etc/ha-legacy-service.xml	2008-10-20 20:19:03 UTC (rev 79764)
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ===================================================================== -->
-<!--                                                                       -->
-<!-- High Availability for legacy services (e.g. EJB2)                     -->
-<!--                                                                       -->
-<!-- ===================================================================== -->
-
-<server>
-
-   <!-- ==================================================================== -->
-   <!-- HA Detached Invoker using JRMP for transport                         -->
-   <!-- ==================================================================== -->
-
-   <mbean code="org.jboss.invocation.jrmp.server.JRMPInvokerHA"
-      name="jboss:service=invoker,type=jrmpha">
-          
-      <depends>jboss:service=TransactionManager</depends>
-      <depends>HAPartition</depends>
-      
-      <attribute name="ServerAddress">${jboss.bind.address}</attribute>
-      <attribute name="RMIObjectPort">
-          <!-- Get the port from the ServiceBindingManager -->
-         <value-factory bean="ServiceBindingManager" method="getIntBinding" 
-            parameter="jboss:service=invoker,type=jrmpha"/>
-      </attribute>
-      
-      <!--
-      <attribute name="RMIObjectPort">0</attribute>
-      <attribute name="RMIClientSocketFactory">custom</attribute>
-      <attribute name="RMIServerSocketFactory">custom</attribute>
-      -->
-   </mbean>
-
-   <!-- ==================================================================== -->
-   <!-- HA Detached Invoker using pooled socket-based transport              -->
-   <!-- ==================================================================== -->
-
-   <mbean name="jboss:service=invoker,type=pooledha"
-          code="org.jboss.invocation.pooled.server.PooledInvokerHA">
-          
-      <depends>jboss:service=TransactionManager</depends>
-      <depends>HAPartition</depends>
-      
-      <attribute name="NumAcceptThreads">1</attribute>
-      <attribute name="MaxPoolSize">300</attribute>
-      <attribute name="ClientMaxPoolSize">300</attribute>
-      <attribute name="SocketTimeout">60000</attribute>
-      <attribute name="ServerBindAddress">${jboss.bind.address}</attribute>
-      <attribute name="ServerBindPort">
-         <!-- Get the port from the ServiceBindingManager -->
-         <value-factory bean="ServiceBindingManager" method="getIntBinding" 
-            parameter="jboss:service=invoker,type=pooledha"/>
-      </attribute>
-      <attribute name="ClientConnectAddress">${jboss.bind.address}</attribute>
-      <attribute name="ClientConnectPort">0</attribute>
-      <attribute name="EnableTcpNoDelay">false</attribute>
-      <attribute name="TransactionManagerService">jboss:service=TransactionManager</attribute>
-
-   </mbean>
-
-   <!-- ==================================================================== -->
-   <!-- HA Detached Invoker using JBoss Remoting for transport               -->
-   <!-- ==================================================================== -->
-
-   <mbean code="org.jboss.invocation.unified.server.UnifiedInvokerHA"
-      name="jboss:service=invoker,type=unifiedha">
-      
-      <depends>jboss:service=TransactionManager</depends>       
-      <depends>HAPartition</depends>
-      
-      <attribute name="Connector"><inject bean="jboss.remoting:service=Connector,transport=socket"/></attribute>
-   </mbean>
-   
-   <!-- ==================================================================== -->
-   <!-- HA Session State Service for EJB2 SFSBs                              -->
-   <!-- ==================================================================== -->
-
-   <mbean code="org.jboss.ha.hasessionstate.server.HASessionStateService"
-      name="jboss:service=HASessionState">
-      
-      <!--  Partition used for group RPCs -->
-      <attribute name="HAPartition"><inject bean="HAPartition"/></attribute>
-      
-      <!-- JNDI name under which the service is bound -->
-      <attribute name="JndiName">/HASessionState/Default</attribute>
-      <!-- Max delay before cleaning unreclaimed state.
-           Defaults to 30*60*1000 => 30 minutes -->
-      <attribute name="BeanCleaningDelay">0</attribute>
-      
-   </mbean>
-
-   <!-- ==================================================================== -->
-   <!-- Distributed EJB2 entity cache invalidation                           -->
-   <!-- ==================================================================== -->
-
-   <mbean code="org.jboss.cache.invalidation.bridges.JGCacheInvalidationBridge"
-      name="jboss.cache:service=InvalidationBridge,type=JavaGroups">
-      
-      <!--  Partition used for group RPCs -->
-      <attribute name="HAPartition"><inject bean="HAPartition"/></attribute>
-      <attribute name="InvalidationManager"><inject bean="jboss.cache:service=InvalidationManager"/></attribute>
-      <attribute name="BridgeName">DefaultJGBridge</attribute>
-      
-   </mbean>
-
-</server>

Modified: trunk/testsuite/imports/sections/cluster.xml
===================================================================
--- trunk/testsuite/imports/sections/cluster.xml	2008-10-20 20:13:58 UTC (rev 79763)
+++ trunk/testsuite/imports/sections/cluster.xml	2008-10-20 20:19:03 UTC (rev 79764)
@@ -64,10 +64,6 @@
       <copy todir="${build.lib}"
          file="${build.resources}/cluster/partition/partition-restart-jboss-beans.xml"
          overwrite="true"/>
-      <!-- JMX beans for testing partition restart -->
-      <copy todir="${build.lib}"
-         file="${build.resources}/cluster/partition/partition-restart-service.xml"
-         overwrite="true"/>
       
       <!-- EJBs for testing partition restart -->
       <jar destfile="${build.lib}/partition-restart.jar">
@@ -636,7 +632,6 @@
          <fileset dir="${build.resources}/cluster/ejb2/passexp">
             <include name="META-INF/partition-passexp-jboss-beans.xml"/>
             <include name="META-INF/passexp-stacks.xml"/>
-            <include name="partition-passexp-service.xml"/>
          </fileset>
       </jar>
 

Modified: trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/test/PartitionRestartUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/test/PartitionRestartUnitTestCase.java	2008-10-20 20:13:58 UTC (rev 79763)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/test/PartitionRestartUnitTestCase.java	2008-10-20 20:19:03 UTC (rev 79764)
@@ -56,7 +56,7 @@
 
    public static Test suite() throws Exception
    {
-      Test t1 = JBossClusteredTestCase.getDeploySetup(PartitionRestartUnitTestCase.class, "partition-restart-jboss-beans.xml, partition-restart-service.xml, partition-restart.jar");
+      Test t1 = JBossClusteredTestCase.getDeploySetup(PartitionRestartUnitTestCase.class, "partition-restart-jboss-beans.xml, partition-restart.jar");
       return t1;
    }   
    

Modified: trunk/testsuite/src/resources/cluster/ejb2/passexp/META-INF/partition-passexp-jboss-beans.xml
===================================================================
--- trunk/testsuite/src/resources/cluster/ejb2/passexp/META-INF/partition-passexp-jboss-beans.xml	2008-10-20 20:13:58 UTC (rev 79763)
+++ trunk/testsuite/src/resources/cluster/ejb2/passexp/META-INF/partition-passexp-jboss-beans.xml	2008-10-20 20:19:03 UTC (rev 79764)
@@ -231,4 +231,55 @@
       -->
    </bean>
    
+   <!-- ==================================================================== -->
+   <!-- HA Detached Invoker using JBoss Remoting for transport               -->
+   <!-- ==================================================================== -->
+
+   <bean name="PassExpUnifiedInvokerHA"
+         class="org.jboss.invocation.unified.server.UnifiedInvokerHA">
+      
+      <depends>jboss:service=TransactionManager</depends>       
+      <depends>PassExpPartition</depends>
+      
+      <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss:service=invoker,type=unifiedha,partitionName=PassExpPartition", exposedInterface=org.jboss.invocation.unified.server.UnifiedInvokerMBean.class, registerDirectly=true)</annotation>
+      
+      <property name="connector"><inject bean="PassExpConnector"/></property>
+   </bean>
+   
+   <!-- ==================================================================== -->
+   <!-- HA Session State Service for EJB2 SFSBs                              -->
+   <!-- ==================================================================== -->
+
+   <bean name="PassExpHASessionStateService"
+         class="org.jboss.ha.hasessionstate.server.HASessionStateService">
+      
+      <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss:service=HASessionState,partitionName=PassExpPartition", exposedInterface=org.jboss.ha.hasessionstate.server.HASessionStateServiceMBean.class, registerDirectly=true)</annotation>
+      
+      <!--  Partition used for group RPCs -->
+      <property name="HAPartition"><inject bean="PassExpPartition"/></property>
+      
+      <!-- JNDI name under which the service is bound -->
+      <property name="jndiName">/HASessionState/PassExpPartition</property>
+      <!-- Max delay before cleaning unreclaimed state.
+           Defaults to 30*60*1000 => 30 minutes -->
+      <property name="beanCleaningDelay">0</property>
+      
+   </bean>
+
+   <!-- ==================================================================== -->
+   <!-- Distributed EJB2 entity cache invalidation                           -->
+   <!-- ==================================================================== -->
+
+   <bean name="PassExpJGCacheInvalidationBridge"
+        class="org.jboss.cache.invalidation.bridges.JGCacheInvalidationBridge">
+      
+      <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.cache:service=InvalidationBridge,type=JavaGroups,partitionName=PassExpPartition", exposedInterface=org.jboss.cache.invalidation.bridges.JGCacheInvalidationBridgeMBean.class, registerDirectly=true)</annotation>
+      
+      <!--  Partition used for group RPCs -->
+      <property name="HAPartition"><inject bean="PassExpPartition"/></property>
+      <property name="invalidationManager"><inject bean="jboss.cache:service=InvalidationManager"/></property>
+      <property name="bridgeName">PassExpJGBridge</property>
+      
+   </bean>
+   
 </deployment>

Deleted: trunk/testsuite/src/resources/cluster/ejb2/passexp/partition-passexp-service.xml
===================================================================
--- trunk/testsuite/src/resources/cluster/ejb2/passexp/partition-passexp-service.xml	2008-10-20 20:13:58 UTC (rev 79763)
+++ trunk/testsuite/src/resources/cluster/ejb2/passexp/partition-passexp-service.xml	2008-10-20 20:19:03 UTC (rev 79764)
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ===================================================================== -->
-<!--                                                                       -->
-<!-- High Availability for legacy services (e.g. EJB2)                     -->
-<!--                                                                       -->
-<!-- ===================================================================== -->
-
-<server>
-   
-   <!-- ==================================================================== -->
-   <!-- HA Detached Invoker using JBoss Remoting for transport               -->
-   <!-- ==================================================================== -->
-
-   <mbean code="org.jboss.invocation.unified.server.UnifiedInvokerHA"
-      name="jboss:service=invoker,type=unifiedha,partitionName=PassExpPartition">
-      
-      <depends>jboss:service=TransactionManager</depends>       
-      <depends>PassExpPartition</depends>
-      
-      <attribute name="Connector"><inject bean="PassExpConnector"/></attribute>
-   </mbean>
-   
-   <!-- ==================================================================== -->
-   <!-- HA Session State Service for EJB2 SFSBs                              -->
-   <!-- ==================================================================== -->
-
-   <mbean code="org.jboss.ha.hasessionstate.server.HASessionStateService"
-      name="jboss:service=HASessionState,partitionName=PassExpPartition">
-      
-      <!--  Partition used for group RPCs -->
-      <attribute name="HAPartition"><inject bean="PassExpPartition"/></attribute>
-      
-      <!-- JNDI name under which the service is bound -->
-      <attribute name="JndiName">/HASessionState/PassExpPartition</attribute>
-      <!-- Max delay before cleaning unreclaimed state.
-           Defaults to 30*60*1000 => 30 minutes -->
-      <attribute name="BeanCleaningDelay">0</attribute>
-      
-   </mbean>
-
-   <!-- ==================================================================== -->
-   <!-- Distributed EJB2 entity cache invalidation                           -->
-   <!-- ==================================================================== -->
-
-   <mbean code="org.jboss.cache.invalidation.bridges.JGCacheInvalidationBridge"
-      name="jboss.cache:service=InvalidationBridge,type=JavaGroups,partitionName=PassExpPartition">
-      
-      <!--  Partition used for group RPCs -->
-      <attribute name="HAPartition"><inject bean="PassExpPartition"/></attribute>
-      <attribute name="InvalidationManager"><inject bean="jboss.cache:service=InvalidationManager"/></attribute>
-      <attribute name="BridgeName">PassExpJGBridge</attribute>
-      
-   </mbean>
-
-</server>

Modified: trunk/testsuite/src/resources/cluster/partition/partition-restart-jboss-beans.xml
===================================================================
--- trunk/testsuite/src/resources/cluster/partition/partition-restart-jboss-beans.xml	2008-10-20 20:13:58 UTC (rev 79763)
+++ trunk/testsuite/src/resources/cluster/partition/partition-restart-jboss-beans.xml	2008-10-20 20:19:03 UTC (rev 79764)
@@ -220,4 +220,55 @@
       -->
    </bean>
    
+   <!-- ==================================================================== -->
+   <!-- HA Detached Invoker using JBoss Remoting for transport               -->
+   <!-- ==================================================================== -->
+
+   <bean name="RestartUnifiedInvokerHA"
+         class="org.jboss.invocation.unified.server.UnifiedInvokerHA">
+      
+      <depends>jboss:service=TransactionManager</depends>       
+      <depends>RestartPartition</depends>
+      
+      <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss:service=invoker,type=unifiedha,partitionName=RestartPartition", exposedInterface=org.jboss.invocation.unified.server.UnifiedInvokerMBean.class, registerDirectly=true)</annotation>
+      
+      <property name="connector"><inject bean="RestartConnector"/></property>
+   </bean>
+   
+   <!-- ==================================================================== -->
+   <!-- HA Session State Service for EJB2 SFSBs                              -->
+   <!-- ==================================================================== -->
+
+   <bean name="RestartHASessionStateService"
+         class="org.jboss.ha.hasessionstate.server.HASessionStateService">
+      
+      <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss:service=HASessionState,partitionName=RestartPartition", exposedInterface=org.jboss.ha.hasessionstate.server.HASessionStateServiceMBean.class, registerDirectly=true)</annotation>
+      
+      <!--  Partition used for group RPCs -->
+      <property name="HAPartition"><inject bean="RestartPartition"/></property>
+      
+      <!-- JNDI name under which the service is bound -->
+      <property name="jndiName">/HASessionState/RestartPartition</property>
+      <!-- Max delay before cleaning unreclaimed state.
+           Defaults to 30*60*1000 => 30 minutes -->
+      <property name="beanCleaningDelay">0</property>
+      
+   </bean>
+
+   <!-- ==================================================================== -->
+   <!-- Distributed EJB2 entity cache invalidation                           -->
+   <!-- ==================================================================== -->
+
+   <bean name="RestartJGCacheInvalidationBridge"
+        class="org.jboss.cache.invalidation.bridges.JGCacheInvalidationBridge">
+      
+      <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.cache:service=InvalidationBridge,type=JavaGroups,partitionName=RestartPartition", exposedInterface=org.jboss.cache.invalidation.bridges.JGCacheInvalidationBridgeMBean.class, registerDirectly=true)</annotation>
+      
+      <!--  Partition used for group RPCs -->
+      <property name="HAPartition"><inject bean="RestartPartition"/></property>
+      <property name="invalidationManager"><inject bean="jboss.cache:service=InvalidationManager"/></property>
+      <property name="bridgeName">RestartJGBridge</property>
+      
+   </bean>
+   
 </deployment>

Deleted: trunk/testsuite/src/resources/cluster/partition/partition-restart-service.xml
===================================================================
--- trunk/testsuite/src/resources/cluster/partition/partition-restart-service.xml	2008-10-20 20:13:58 UTC (rev 79763)
+++ trunk/testsuite/src/resources/cluster/partition/partition-restart-service.xml	2008-10-20 20:19:03 UTC (rev 79764)
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ===================================================================== -->
-<!--                                                                       -->
-<!-- High Availability for legacy services (e.g. EJB2)                     -->
-<!--                                                                       -->
-<!-- ===================================================================== -->
-
-<server>
-   
-   <!-- ==================================================================== -->
-   <!-- HA Detached Invoker using JBoss Remoting for transport               -->
-   <!-- ==================================================================== -->
-
-   <mbean code="org.jboss.invocation.unified.server.UnifiedInvokerHA"
-      name="jboss:service=invoker,type=unifiedha,partitionName=RestartPartition">
-      
-      <depends>jboss:service=TransactionManager</depends>       
-      <depends>RestartPartition</depends>
-      
-      <attribute name="Connector"><inject bean="RestartConnector"/></attribute>
-   </mbean>
-   
-   <!-- ==================================================================== -->
-   <!-- HA Session State Service for EJB2 SFSBs                              -->
-   <!-- ==================================================================== -->
-
-   <mbean code="org.jboss.ha.hasessionstate.server.HASessionStateService"
-      name="jboss:service=HASessionState,partitionName=RestartPartition">
-      
-      <!--  Partition used for group RPCs -->
-      <attribute name="HAPartition"><inject bean="RestartPartition"/></attribute>
-      
-      <!-- JNDI name under which the service is bound -->
-      <attribute name="JndiName">/HASessionState/RestartPartition</attribute>
-      <!-- Max delay before cleaning unreclaimed state.
-           Defaults to 30*60*1000 => 30 minutes -->
-      <attribute name="BeanCleaningDelay">0</attribute>
-      
-   </mbean>
-
-   <!-- ==================================================================== -->
-   <!-- Distributed EJB2 entity cache invalidation                           -->
-   <!-- ==================================================================== -->
-
-   <mbean code="org.jboss.cache.invalidation.bridges.JGCacheInvalidationBridge"
-      name="jboss.cache:service=InvalidationBridge,type=JavaGroups,partitionName=RestartPartition">
-      
-      <!--  Partition used for group RPCs -->
-      <attribute name="HAPartition"><inject bean="RestartPartition"/></attribute>
-      <attribute name="InvalidationManager"><inject bean="jboss.cache:service=InvalidationManager"/></attribute>
-      <attribute name="BridgeName">RestartJGBridge</attribute>
-      
-   </mbean>
-
-</server>




More information about the jboss-cvs-commits mailing list