[jboss-cvs] JBossAS SVN: r83431 - in trunk: testsuite/src/resources/cluster/hasingleton/deployer and 1 other directory.

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

Author: bstansberry at jboss.com
Date: 2009-01-26 16:29:00 -0500 (Mon, 26 Jan 2009)
New Revision: 83431

Modified:
   trunk/cluster/src/etc/deploy-hasingleton-jboss-beans.xml
   trunk/testsuite/src/resources/cluster/hasingleton/deployer/test-deploy-hasingleton-jboss-beans.xml
Log:
[JBAS-5563] Switch to using new HASingletonProfileManager

Modified: trunk/cluster/src/etc/deploy-hasingleton-jboss-beans.xml
===================================================================
--- trunk/cluster/src/etc/deploy-hasingleton-jboss-beans.xml	2009-01-26 20:29:05 UTC (rev 83430)
+++ trunk/cluster/src/etc/deploy-hasingleton-jboss-beans.xml	2009-01-26 21:29:00 UTC (rev 83431)
@@ -11,21 +11,30 @@
 
    <!-- 
     |
-    | Deployment scanner that can be called by an HASingletonController
+    | Interface to the ProfileService that can be called by an HASingletonController.
+    | Creates ProfileService sub-profile from the given list of URIs and then
+    | activates/deactivates the profile when called by the HASingletonController.
     |
    -->
-   <bean name="HASingletonDeploymentScanner" class="org.jboss.ha.singleton.HASingletonDeploymentScanner">
+   <bean name="HASingletonProfileManager" class="org.jboss.ha.singleton.HASingletonProfileManager">
       
-      <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss:service=HASingletonDeploymentScanner,partition=${jboss.partition.name:DefaultPartition}", exposedInterface=org.jboss.ha.singleton.HASingletonDeploymentScannerMBean.class, registerDirectly=true)</annotation>
+      <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss:service=HASingletonProfileManager,partition=${jboss.partition.name:DefaultPartition}", exposedInterface=org.jboss.ha.singleton.HASingletonProfileManagerMBean.class, registerDirectly=true)</annotation>
          
       <property name="profileService"><inject bean="ProfileService"/></property>
-      <property name="filterInstance"><inject bean="DeploymentFilter"/></property>
-      <property name="mainDeployer"><inject bean="MainDeployer"/></property>
+      <property name="profileFactory"><inject bean="ProfileFactory"/></property>
+      
+      <!-- Build a profile from the contents of these URIs -->
+      <property name="URIList">
+         <list elementClass="java.net.URI">
+            <value>${jboss.server.home.url}deploy-hasingleton</value>
+         </list>
+      </property>
    </bean>
  
    <!--
     |
-    | Use the deployer service on the singleton node. 
+    | Tracks who the HASingleton master is and notifies the HASingletonProfileManager
+    | when it becomes the master or is no longer the master.
     |
    -->
    <bean name="HASingletonDeployer" 
@@ -39,11 +48,9 @@
       <depends>HASingletonDeployerBarrierController</depends>
       
       <property name="HAPartition"><inject bean="HAPartition"/></property>
-      <property name="target"><inject bean="HASingletonDeploymentScanner"/></property>
-      <property name="targetStartMethod">deploySingletons</property>
-      <property name="targetStartMethodArgument">${jboss.server.home.url}deploy-hasingleton</property>
-      <property name="targetStopMethod">undeploySingletons</property>
-      <property name="targetStopMethodArgument">${jboss.server.home.url}deploy-hasingleton</property>
+      <property name="target"><inject bean="HASingletonProfileManager"/></property>
+      <property name="targetStartMethod">activateProfile</property>
+      <property name="targetStopMethod">releaseProfile</property>
       
       <!-- whether to register thread context classloader for the RPC handler, default is false -->
       <!--<property name="registerThreadContextClassLoader">false</property>--> 
@@ -63,9 +70,9 @@
 
    <!--
     | A BarrierController that controls the lifecycle of a Barrier mbean
-    | based on notifications received by the HASingletonController above.
+    | based on JMX notifications issued by the HASingletonController above.
     |
-    | Services deployed normally inside ./deploy or ./farm that want to be
+    | Services deployed normally inside ./deploy that want to be
     | started/stopped whenever the content of ./deploy-hasingleton/ gets
     | deployed/undeployed, or else, whenever the current node becomes the
     | master, need only specify a dependency on the Barrier:

Modified: trunk/testsuite/src/resources/cluster/hasingleton/deployer/test-deploy-hasingleton-jboss-beans.xml
===================================================================
--- trunk/testsuite/src/resources/cluster/hasingleton/deployer/test-deploy-hasingleton-jboss-beans.xml	2009-01-26 20:29:05 UTC (rev 83430)
+++ trunk/testsuite/src/resources/cluster/hasingleton/deployer/test-deploy-hasingleton-jboss-beans.xml	2009-01-26 21:29:00 UTC (rev 83431)
@@ -9,13 +9,17 @@
 <!--                                                                       -->
 <!-- ===================================================================== -->
 
-   <bean name="TestHASingletonDeploymentScanner" class="org.jboss.ha.singleton.HASingletonDeploymentScanner">
+   <bean name="TestHASingletonProfileManager" class="org.jboss.ha.singleton.HASingletonProfileManager">
       
-      <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss:service=TestHASingletonDeploymentScanner,partition=${jboss.partition.name:DefaultPartition}", exposedInterface=org.jboss.ha.singleton.HASingletonDeploymentScannerMBean.class, registerDirectly=true)</annotation>
-         
+      <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss:service=TestHASingletonProfileManager,partition=${jboss.partition.name:DefaultPartition}", exposedInterface=org.jboss.ha.singleton.HASingletonProfileManagerMBean.class, registerDirectly=true)</annotation>
+               
       <property name="profileService"><inject bean="ProfileService"/></property>
-      <property name="filterInstance"><inject bean="DeploymentFilter"/></property>
-      <property name="mainDeployer"><inject bean="MainDeployer"/></property>
+      <property name="profileFactory"><inject bean="ProfileFactory"/></property>
+      <property name="URIList">
+         <list elementClass="java.net.URI">
+            <value>${jboss.server.home.url}test-hasingleton</value>
+         </list>
+      </property>
    </bean>
  
    <bean name="TestHASingletonDeployer" 
@@ -27,11 +31,15 @@
       <depends>TestHASingletonDeploymentBarrierController</depends>  
       
       <property name="HAPartition"><inject bean="HAPartition"/></property>
-      <property name="target"><inject bean="TestHASingletonDeploymentScanner"/></property>
+      <property name="target"><inject bean="TestHASingletonProfileManager"/></property>
+      <!-- 
       <property name="targetStartMethod">deploySingletons</property>
       <property name="targetStartMethodArgument">${jboss.server.home.url}test-hasingleton</property>
       <property name="targetStopMethod">undeploySingletons</property>
       <property name="targetStopMethodArgument">${jboss.server.home.url}test-hasingleton</property>
+      -->
+      <property name="targetStartMethod">activateProfile</property>
+      <property name="targetStopMethod">releaseProfile</property>
       
       <!-- whether to register thread context classloader for the RPC handler, default is false -->
       <!--<property name="registerThreadContextClassLoader">false</property>-->