[jboss-cvs] JBossAS SVN: r114616 - branches/JBPAPP_5/cluster/src/etc.

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

Author: dereed
Date: 2013-12-19 13:31:03 -0500 (Thu, 19 Dec 2013)
New Revision: 114616

Modified:
   branches/JBPAPP_5/cluster/src/etc/ha-legacy-jboss-beans.xml
   branches/JBPAPP_5/cluster/src/etc/hapartition-jboss-beans.xml
Log:
[JBPAPP-10937] Fix state transfer for EJB2 SFSB with deployment dependencies


Modified: branches/JBPAPP_5/cluster/src/etc/ha-legacy-jboss-beans.xml
===================================================================
--- branches/JBPAPP_5/cluster/src/etc/ha-legacy-jboss-beans.xml	2013-12-19 18:15:56 UTC (rev 114615)
+++ branches/JBPAPP_5/cluster/src/etc/ha-legacy-jboss-beans.xml	2013-12-19 18:31:03 UTC (rev 114616)
@@ -94,8 +94,10 @@
       
       <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss:service=HASessionState", exposedInterface=org.jboss.ha.hasessionstate.server.HASessionStateServiceMBean.class, registerDirectly=true)</annotation>
       
+      <demand state="Started" targetState="Started">HAPartition</demand>
+
       <!--  Partition used for group RPCs -->
-      <property name="HAPartition"><inject bean="HAPartition"/></property>
+      <property name="HAPartition"><inject bean="HAPartition" state="Created"/></property>
       
       <!-- JNDI name under which the service is bound -->
       <property name="jndiName">/HASessionState/Default</property>
@@ -121,4 +123,4 @@
       
    </bean>
 
-</deployment>
\ No newline at end of file
+</deployment>

Modified: branches/JBPAPP_5/cluster/src/etc/hapartition-jboss-beans.xml
===================================================================
--- branches/JBPAPP_5/cluster/src/etc/hapartition-jboss-beans.xml	2013-12-19 18:15:56 UTC (rev 114615)
+++ branches/JBPAPP_5/cluster/src/etc/hapartition-jboss-beans.xml	2013-12-19 18:31:03 UTC (rev 114616)
@@ -24,6 +24,7 @@
    		 class="org.jboss.ha.framework.server.ClusterPartition">     
 
       <depends>jboss:service=Naming</depends>
+      <demand state="Start" targetState="Create">HASessionStateService</demand>
     	 
       <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss:service=HAPartition,partition=${jboss.partition.name:DefaultPartition}", exposedInterface=org.jboss.ha.framework.server.ClusterPartitionMBean.class, registerDirectly=true)</annotation>