[jboss-cvs] JBossAS SVN: r76412 - trunk/testsuite/src/resources/cluster/hasingleton/deployer.

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

Author: adrian at jboss.org
Date: 2008-07-29 08:37:19 -0400 (Tue, 29 Jul 2008)
New Revision: 76412

Added:
   trunk/testsuite/src/resources/cluster/hasingleton/deployer/test-deploy-hasingleton-jboss-beans.xml
Removed:
   trunk/testsuite/src/resources/cluster/hasingleton/deployer/test-deploy-hasingleton-beans.xml
Log:
[JBAS-5803] beans.xml -> jboss-beans.xml

Deleted: trunk/testsuite/src/resources/cluster/hasingleton/deployer/test-deploy-hasingleton-beans.xml
===================================================================
--- trunk/testsuite/src/resources/cluster/hasingleton/deployer/test-deploy-hasingleton-beans.xml	2008-07-29 12:36:37 UTC (rev 76411)
+++ trunk/testsuite/src/resources/cluster/hasingleton/deployer/test-deploy-hasingleton-beans.xml	2008-07-29 12:37:19 UTC (rev 76412)
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
-<!-- ===================================================================== -->
-<!--                                                                       -->
-<!--  This service ensures that exactly one node in the cluster            -->
-<!--  deploys the services under "test-hasingleton"    		         	   -->
-<!--                                                                       -->
-<!-- ===================================================================== -->
-
-   <bean name="TestHASingletonDeploymentScanner" class="org.jboss.ha.singleton.HASingletonDeploymentScanner">
-      
-      <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>
-         
-      <property name="profileService"><inject bean="ProfileService"/></property>
-      <property name="filterInstance"><inject bean="DeploymentFilter"/></property>
-      <property name="mainDeployer"><inject bean="MainDeployer"/></property>
-   </bean>
- 
-   <bean name="TestHASingletonDeployer" 
-   		 class="org.jboss.ha.singleton.HASingletonController">  
-      
-      <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.ha:service=TestHASingletonDeployer", exposedInterface=org.jboss.ha.singleton.HASingletonControllerMBean.class, registerDirectly=true)</annotation>       
-      
-      <depends>HAPartition</depends>
-      
-      <property name="HAPartition"><inject bean="HAPartition"/></property>
-      <property name="target"><inject bean="TestHASingletonDeploymentScanner"/></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>
-      
-      <!-- whether to register thread context classloader for the RPC handler, default is false -->
-      <!--<property name="registerThreadContextClassLoader">false</property>--> 
-      
-      <!-- Whether the singleton should be restarted (i.e. invoke the TargetStopMethod and then the
-           TargetStartMethod) if a cluster merge occurs while this node is the singleton master.
-           A cluster merge means there may have been more than one singleton master during the period
-           when communication between some or all of the nodes in the cluster was disrupted; hence the
-           surviving master may not be aware of state changes made by another master. Restarting the
-           singleton gives it a signal that it should refresh its internal state from any external
-           store.
-           By default this is set to true.
-      -->
-      <property name="restartOnMerge">true</property>  
-      
-   </bean>
-   
-</deployment>

Copied: trunk/testsuite/src/resources/cluster/hasingleton/deployer/test-deploy-hasingleton-jboss-beans.xml (from rev 76411, trunk/testsuite/src/resources/cluster/hasingleton/deployer/test-deploy-hasingleton-beans.xml)
===================================================================
--- trunk/testsuite/src/resources/cluster/hasingleton/deployer/test-deploy-hasingleton-jboss-beans.xml	                        (rev 0)
+++ trunk/testsuite/src/resources/cluster/hasingleton/deployer/test-deploy-hasingleton-jboss-beans.xml	2008-07-29 12:37:19 UTC (rev 76412)
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+<!-- ===================================================================== -->
+<!--                                                                       -->
+<!--  This service ensures that exactly one node in the cluster            -->
+<!--  deploys the services under "test-hasingleton"    		         	   -->
+<!--                                                                       -->
+<!-- ===================================================================== -->
+
+   <bean name="TestHASingletonDeploymentScanner" class="org.jboss.ha.singleton.HASingletonDeploymentScanner">
+      
+      <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>
+         
+      <property name="profileService"><inject bean="ProfileService"/></property>
+      <property name="filterInstance"><inject bean="DeploymentFilter"/></property>
+      <property name="mainDeployer"><inject bean="MainDeployer"/></property>
+   </bean>
+ 
+   <bean name="TestHASingletonDeployer" 
+   		 class="org.jboss.ha.singleton.HASingletonController">  
+      
+      <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.ha:service=TestHASingletonDeployer", exposedInterface=org.jboss.ha.singleton.HASingletonControllerMBean.class, registerDirectly=true)</annotation>       
+      
+      <depends>HAPartition</depends>
+      
+      <property name="HAPartition"><inject bean="HAPartition"/></property>
+      <property name="target"><inject bean="TestHASingletonDeploymentScanner"/></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>
+      
+      <!-- whether to register thread context classloader for the RPC handler, default is false -->
+      <!--<property name="registerThreadContextClassLoader">false</property>--> 
+      
+      <!-- Whether the singleton should be restarted (i.e. invoke the TargetStopMethod and then the
+           TargetStartMethod) if a cluster merge occurs while this node is the singleton master.
+           A cluster merge means there may have been more than one singleton master during the period
+           when communication between some or all of the nodes in the cluster was disrupted; hence the
+           surviving master may not be aware of state changes made by another master. Restarting the
+           singleton gives it a signal that it should refresh its internal state from any external
+           store.
+           By default this is set to true.
+      -->
+      <property name="restartOnMerge">true</property>  
+      
+   </bean>
+   
+</deployment>