[jboss-cvs] JBossAS SVN: r64223 - in trunk/testsuite/src/resources/cluster: cross-server and 12 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Jul 23 22:42:02 EDT 2007
Author: bstansberry at jboss.com
Date: 2007-07-23 22:42:02 -0400 (Mon, 23 Jul 2007)
New Revision: 64223
Added:
trunk/testsuite/src/resources/cluster/ejb2/
trunk/testsuite/src/resources/cluster/ejb2/basic/
trunk/testsuite/src/resources/cluster/ejb2/basic/META-INF/
trunk/testsuite/src/resources/cluster/ejb2/basic/application.xml
trunk/testsuite/src/resources/cluster/ejb2/basic/cif-ds.xml
trunk/testsuite/src/resources/cluster/ejb2/basic/cif-ejb-jar.xml
trunk/testsuite/src/resources/cluster/ejb2/basic/cif-jboss.xml
trunk/testsuite/src/resources/cluster/ejb2/basic/jboss-app.xml
trunk/testsuite/src/resources/cluster/ejb2/basic/jbosscmp-jdbc.xml
trunk/testsuite/src/resources/cluster/ejb2/basic/pooledha-ejb-jar.xml
trunk/testsuite/src/resources/cluster/ejb2/basic/pooledha-jboss.xml
trunk/testsuite/src/resources/cluster/ejb2/basic/retry-application.xml
trunk/testsuite/src/resources/cluster/ejb2/basic/retry-ejb-jar.xml
trunk/testsuite/src/resources/cluster/ejb2/basic/retry-jboss.xml
trunk/testsuite/src/resources/cluster/ejb2/basic/retry-jbosscmp-jdbc.xml
trunk/testsuite/src/resources/cluster/hasingleton/
trunk/testsuite/src/resources/cluster/hasingleton/electionpolicy/
trunk/testsuite/src/resources/cluster/invokerha/
trunk/testsuite/src/resources/cluster/invokerha/META-INF/
Modified:
trunk/testsuite/src/resources/cluster/cross-server/ejb-jar.xml
trunk/testsuite/src/resources/cluster/drm/jboss-service.xml
trunk/testsuite/src/resources/cluster/ds/jboss-service.xml
trunk/testsuite/src/resources/cluster/ejb2/basic/META-INF/ejb-jar.xml
trunk/testsuite/src/resources/cluster/invokerha/META-INF/jboss-service.xml
trunk/testsuite/src/resources/cluster/partition/META-INF/ejb-jar.xml
trunk/testsuite/src/resources/cluster/partition/jboss-beans.xml
trunk/testsuite/src/resources/cluster/rpc-cl/jboss-service.xml
trunk/testsuite/src/resources/cluster/rpc/jboss-service.xml
Log:
[JBAS-4552] Move cluster tests into cluster package
[JBAS-4553] Reorg cluster tests to prevent unnecessary repetition
Modified: trunk/testsuite/src/resources/cluster/cross-server/ejb-jar.xml
===================================================================
--- trunk/testsuite/src/resources/cluster/cross-server/ejb-jar.xml 2007-07-24 02:41:17 UTC (rev 64222)
+++ trunk/testsuite/src/resources/cluster/cross-server/ejb-jar.xml 2007-07-24 02:42:02 UTC (rev 64223)
@@ -9,18 +9,18 @@
<session>
<description>Test client stateless session bean target</description>
<ejb-name>cluster.ejb.CalledHome</ejb-name>
- <home>org.jboss.test.cluster.ejb.CalledHome</home>
- <remote>org.jboss.test.cluster.ejb.CalledRemote</remote>
- <ejb-class>org.jboss.test.cluster.ejb.CalledBean</ejb-class>
+ <home>org.jboss.test.cluster.ejb2.crossserver.CalledHome</home>
+ <remote>org.jboss.test.cluster.ejb2.crossserver.CalledRemote</remote>
+ <ejb-class>org.jboss.test.cluster.ejb2.crossserver.CalledBean</ejb-class>
<session-type>Stateless</session-type>
<transaction-type>Container</transaction-type>
</session>
<session>
<description>Remote ejb stateless session bean target</description>
<ejb-name>cluster.ejb.CalleeHome</ejb-name>
- <home>org.jboss.test.cluster.ejb.CalleeHome</home>
- <remote>org.jboss.test.cluster.ejb.CalleeRemote</remote>
- <ejb-class>org.jboss.test.cluster.ejb.CalleeBean</ejb-class>
+ <home>org.jboss.test.cluster.ejb2.crossserver.CalleeHome</home>
+ <remote>org.jboss.test.cluster.ejb2.crossserver.CalleeRemote</remote>
+ <ejb-class>org.jboss.test.cluster.ejb2.crossserver.CalleeBean</ejb-class>
<session-type>Stateful</session-type>
<transaction-type>Container</transaction-type>
</session>
Modified: trunk/testsuite/src/resources/cluster/drm/jboss-service.xml
===================================================================
--- trunk/testsuite/src/resources/cluster/drm/jboss-service.xml 2007-07-24 02:41:17 UTC (rev 64222)
+++ trunk/testsuite/src/resources/cluster/drm/jboss-service.xml 2007-07-24 02:42:02 UTC (rev 64223)
@@ -4,7 +4,7 @@
"http://www.jboss.org/j2ee/dtd/jboss-service_3_2.dtd">
<server>
- <mbean code="org.jboss.test.cluster.drm.DRMUser"
+ <mbean code="org.jboss.test.cluster.hapartition.drm.DRMUser"
name="jboss.test:service=DRMTestCase"
xmbean-dd="">
<xmbean>
Modified: trunk/testsuite/src/resources/cluster/ds/jboss-service.xml
===================================================================
--- trunk/testsuite/src/resources/cluster/ds/jboss-service.xml 2007-07-24 02:41:17 UTC (rev 64222)
+++ trunk/testsuite/src/resources/cluster/ds/jboss-service.xml 2007-07-24 02:42:02 UTC (rev 64223)
@@ -4,7 +4,7 @@
"http://www.jboss.org/j2ee/dtd/jboss-service_3_2.dtd">
<server>
- <mbean code="org.jboss.test.cluster.ds.DistributedStateUser"
+ <mbean code="org.jboss.test.cluster.hapartition.ds.DistributedStateUser"
name="jboss.test:service=DistributedStateTestCase"
xmbean-dd="">
<xmbean>
Copied: trunk/testsuite/src/resources/cluster/ejb2/basic/META-INF (from rev 64055, trunk/testsuite/src/resources/testbeancluster/META-INF)
Modified: trunk/testsuite/src/resources/cluster/ejb2/basic/META-INF/ejb-jar.xml
===================================================================
--- trunk/testsuite/src/resources/testbeancluster/META-INF/ejb-jar.xml 2007-07-13 23:07:56 UTC (rev 64055)
+++ trunk/testsuite/src/resources/cluster/ejb2/basic/META-INF/ejb-jar.xml 2007-07-24 02:42:02 UTC (rev 64223)
@@ -9,9 +9,9 @@
<session>
<description>Nextgen test bean stateless</description>
<ejb-name>nextgen_StatelessSession</ejb-name>
- <home>org.jboss.test.testbeancluster.interfaces.StatelessSessionHome</home>
- <remote>org.jboss.test.testbeancluster.interfaces.StatelessSession</remote>
- <ejb-class>org.jboss.test.testbeancluster.bean.StatelessSessionBean</ejb-class>
+ <home>org.jboss.test.cluster.ejb2.basic.interfaces.StatelessSessionHome</home>
+ <remote>org.jboss.test.cluster.ejb2.basic.interfaces.StatelessSession</remote>
+ <ejb-class>org.jboss.test.cluster.ejb2.basic.bean.StatelessSessionBean</ejb-class>
<session-type>Stateless</session-type>
<transaction-type>Container</transaction-type>
</session>
@@ -19,8 +19,8 @@
<description>Nextgen test bean stateful</description>
<ejb-name>nextgen_StatefulSession</ejb-name>
<home>org.jboss.test.testbean.interfaces.StatefulSessionHome</home>
- <remote>org.jboss.test.testbeancluster.interfaces.StatefulSession</remote>
- <ejb-class>org.jboss.test.testbeancluster.bean.StatefulSessionBean</ejb-class>
+ <remote>org.jboss.test.cluster.ejb2.basic.interfaces.StatefulSession</remote>
+ <ejb-class>org.jboss.test.cluster.ejb2.basic.bean.StatefulSessionBean</ejb-class>
<session-type>Stateful</session-type>
<transaction-type>Container</transaction-type>
</session>
@@ -43,8 +43,8 @@
<description>Nextgen test bean stateful</description>
<ejb-name>ExpiredStatefulSession</ejb-name>
<home>org.jboss.test.testbean.interfaces.StatefulSessionHome</home>
- <remote>org.jboss.test.testbeancluster.interfaces.StatefulSession</remote>
- <ejb-class>org.jboss.test.testbeancluster.bean.StatefulSessionBean</ejb-class>
+ <remote>org.jboss.test.cluster.ejb2.basic.interfaces.StatefulSession</remote>
+ <ejb-class>org.jboss.test.cluster.ejb2.basic.bean.StatefulSessionBean</ejb-class>
<session-type>Stateful</session-type>
<transaction-type>Container</transaction-type>
</session>
@@ -114,9 +114,9 @@
<entity>
<description>Entity PK bean</description>
<ejb-name>nextgen_EntityPK</ejb-name>
- <local-home>org.jboss.test.testbeancluster.interfaces.EntityPKHome</local-home>
- <local>org.jboss.test.testbeancluster.interfaces.EntityPK</local>
- <ejb-class>org.jboss.test.testbeancluster.bean.EntityPKBean</ejb-class>
+ <local-home>org.jboss.test.cluster.ejb2.basic.interfaces.EntityPKHome</local-home>
+ <local>org.jboss.test.cluster.ejb2.basic.interfaces.EntityPK</local>
+ <ejb-class>org.jboss.test.cluster.ejb2.basic.bean.EntityPKBean</ejb-class>
<persistence-type>Container</persistence-type>
<prim-key-class>org.jboss.test.testbean.interfaces.AComplexPK</prim-key-class>
<reentrant>False</reentrant>
Copied: trunk/testsuite/src/resources/cluster/ejb2/basic/application.xml (from rev 64055, trunk/testsuite/src/resources/testbeancluster/application.xml)
===================================================================
--- trunk/testsuite/src/resources/cluster/ejb2/basic/application.xml (rev 0)
+++ trunk/testsuite/src/resources/cluster/ejb2/basic/application.xml 2007-07-24 02:42:02 UTC (rev 64223)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE application PUBLIC
+ "-//Sun Microsystems, Inc.//DTD J2EE Application 1.3//EN"
+ "http://java.sun.com/dtd/application_1_3.dtd">
+
+<application>
+ <display-name>CIF test ear</display-name>
+ <module>
+ <ejb>test-cif.jar</ejb>
+ </module>
+</application>
\ No newline at end of file
Copied: trunk/testsuite/src/resources/cluster/ejb2/basic/cif-ds.xml (from rev 64055, trunk/testsuite/src/resources/testbeancluster/cif-ds.xml)
===================================================================
--- trunk/testsuite/src/resources/cluster/ejb2/basic/cif-ds.xml (rev 0)
+++ trunk/testsuite/src/resources/cluster/ejb2/basic/cif-ds.xml 2007-07-24 02:42:02 UTC (rev 64223)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<datasources>
+ <local-tx-datasource>
+ <jndi-name>CIFTestDS</jndi-name>
+
+ <connection-url>jdbc:hsqldb:hsql://localhost:1701</connection-url>
+ <driver-class>org.hsqldb.jdbcDriver</driver-class>
+ <user-name>sa</user-name>
+ <password></password>
+ <min-pool-size>1</min-pool-size>
+ <max-pool-size>20</max-pool-size>
+ <idle-timeout-minutes>0</idle-timeout-minutes>
+ <track-statements/>
+ </local-tx-datasource>
+</datasources>
Copied: trunk/testsuite/src/resources/cluster/ejb2/basic/cif-ejb-jar.xml (from rev 64055, trunk/testsuite/src/resources/testbeancluster/cif-ejb-jar.xml)
===================================================================
--- trunk/testsuite/src/resources/cluster/ejb2/basic/cif-ejb-jar.xml (rev 0)
+++ trunk/testsuite/src/resources/cluster/ejb2/basic/cif-ejb-jar.xml 2007-07-24 02:42:02 UTC (rev 64223)
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE ejb-jar
+ PUBLIC "-//Sun Microsystems, Inc.//DTD Enterprise JavaBeans 2.0//EN"
+ "http://java.sun.com/dtd/ejb-jar_2_0.dtd">
+
+<ejb-jar>
+ <enterprise-beans>
+
+ <session>
+ <description></description>
+ <ejb-name>cif.StatefulSession</ejb-name>
+ <home>org.jboss.test.cluster.ejb2.basic.interfaces.SessionToEntityHome</home>
+ <remote>org.jboss.test.cluster.ejb2.basic.interfaces.SessionToEntity</remote>
+ <ejb-class>org.jboss.test.cluster.ejb2.basic.bean.SessionToEntityBean</ejb-class>
+ <session-type>Stateful</session-type>
+ <transaction-type>Container</transaction-type>
+ <ejb-local-ref>
+ <ejb-ref-name>ejb/EntityPKHome</ejb-ref-name>
+ <ejb-ref-type>Entity</ejb-ref-type>
+ <local-home>org.jboss.test.cluster.ejb2.basic.interfaces.EntityPKHome</local-home>
+ <local>org.jboss.test.cluster.ejb2.basic.interfaces.EntityPK</local>
+ <ejb-link>cif_CachedEntityPK</ejb-link>
+ </ejb-local-ref>
+ </session>
+
+ <entity>
+ <description>Entity PK bean</description>
+ <ejb-name>cif_CachedEntityPK</ejb-name>
+ <local-home>org.jboss.test.cluster.ejb2.basic.interfaces.EntityPKHome</local-home>
+ <local>org.jboss.test.cluster.ejb2.basic.interfaces.EntityPK</local>
+ <ejb-class>org.jboss.test.cluster.ejb2.basic.bean.EntityPKBean</ejb-class>
+ <persistence-type>Container</persistence-type>
+ <prim-key-class>org.jboss.test.testbean.interfaces.AComplexPK</prim-key-class>
+ <reentrant>False</reentrant>
+ <cmp-version>2.x</cmp-version>
+ <abstract-schema-name>CachedEntityPK</abstract-schema-name>
+ <cmp-field>
+ <field-name>aBoolean</field-name>
+ </cmp-field>
+ <cmp-field>
+ <field-name>anInt</field-name>
+ </cmp-field>
+ <cmp-field>
+ <field-name>aLong</field-name>
+ </cmp-field>
+ <cmp-field>
+ <field-name>aDouble</field-name>
+ </cmp-field>
+ <cmp-field>
+ <field-name>aString</field-name>
+ </cmp-field>
+ <cmp-field>
+ <field-name>otherField</field-name>
+ </cmp-field>
+ </entity>
+
+ </enterprise-beans>
+
+ <assembly-descriptor>
+ <container-transaction>
+ <method>
+ <ejb-name>cif.StatefulSession</ejb-name>
+ <method-name>*</method-name>
+ </method>
+ <method>
+ <ejb-name>cif_CachedEntityPK</ejb-name>
+ <method-name>*</method-name>
+ </method>
+ <trans-attribute>Required</trans-attribute>
+ </container-transaction>
+
+
+ </assembly-descriptor>
+</ejb-jar>
Copied: trunk/testsuite/src/resources/cluster/ejb2/basic/cif-jboss.xml (from rev 64055, trunk/testsuite/src/resources/testbeancluster/cif-jboss.xml)
===================================================================
--- trunk/testsuite/src/resources/cluster/ejb2/basic/cif-jboss.xml (rev 0)
+++ trunk/testsuite/src/resources/cluster/ejb2/basic/cif-jboss.xml 2007-07-24 02:42:02 UTC (rev 64223)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+ <!DOCTYPE jboss PUBLIC
+ "-//JBoss//DTD JBOSS 3.2//EN"
+ "http://www.jboss.org/j2ee/dtd/jboss_3_2.dtd">
+
+<jboss>
+ <enterprise-beans>
+ <session>
+ <ejb-name>cif.StatefulSession</ejb-name>
+ <clustered>true</clustered>
+ <cluster-config>
+ <partition-name>DefaultPartition</partition-name>
+ <home-load-balance-policy>org.jboss.ha.framework.interfaces.RandomRobin</home-load-balance-policy>
+ <bean-load-balance-policy>org.jboss.ha.framework.interfaces.RoundRobin</bean-load-balance-policy>
+ </cluster-config>
+ </session>
+ <entity>
+ <ejb-name>cif_CachedEntityPK</ejb-name>
+ <configuration-name>Standard CMP 2.x EntityBean with cache invalidation</configuration-name>
+ <cache-invalidation>true</cache-invalidation>
+ </entity>
+ </enterprise-beans>
+</jboss>
Copied: trunk/testsuite/src/resources/cluster/ejb2/basic/jboss-app.xml (from rev 64055, trunk/testsuite/src/resources/testbeancluster/jboss-app.xml)
===================================================================
--- trunk/testsuite/src/resources/cluster/ejb2/basic/jboss-app.xml (rev 0)
+++ trunk/testsuite/src/resources/cluster/ejb2/basic/jboss-app.xml 2007-07-24 02:42:02 UTC (rev 64223)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE jboss-app
+ PUBLIC "-//JBoss//DTD J2EE Application 1.4//EN"
+ "http://www.jboss.org/j2ee/dtd/jboss-app_4_0.dtd">
+
+<jboss-app>
+ <module>
+ <service>cif-ds.xml</service>
+ </module>
+</jboss-app>
\ No newline at end of file
Copied: trunk/testsuite/src/resources/cluster/ejb2/basic/jbosscmp-jdbc.xml (from rev 64055, trunk/testsuite/src/resources/testbeancluster/jbosscmp-jdbc.xml)
===================================================================
--- trunk/testsuite/src/resources/cluster/ejb2/basic/jbosscmp-jdbc.xml (rev 0)
+++ trunk/testsuite/src/resources/cluster/ejb2/basic/jbosscmp-jdbc.xml 2007-07-24 02:42:02 UTC (rev 64223)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE jbosscmp-jdbc PUBLIC
+ "-//JBoss//DTD JBOSSCMP-JDBC 3.2//EN"
+ "http://www.jboss.org/j2ee/dtd/jbosscmp-jdbc_3_2.dtd">
+
+<jbosscmp-jdbc>
+ <defaults>
+ <datasource>java:/CIFTestDS</datasource>
+ <datasource-mapping>Hypersonic SQL</datasource-mapping>
+ <create-table>true</create-table>
+ <remove-table>true</remove-table>
+ <pk-constraint>true</pk-constraint>
+ </defaults>
+</jbosscmp-jdbc>
Copied: trunk/testsuite/src/resources/cluster/ejb2/basic/pooledha-ejb-jar.xml (from rev 64055, trunk/testsuite/src/resources/testbeancluster/pooledha-ejb-jar.xml)
===================================================================
--- trunk/testsuite/src/resources/cluster/ejb2/basic/pooledha-ejb-jar.xml (rev 0)
+++ trunk/testsuite/src/resources/cluster/ejb2/basic/pooledha-ejb-jar.xml 2007-07-24 02:42:02 UTC (rev 64223)
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE ejb-jar
+ PUBLIC "-//Sun Microsystems, Inc.//DTD Enterprise JavaBeans 2.0//EN"
+ "http://java.sun.com/dtd/ejb-jar_2_0.dtd">
+
+<ejb-jar>
+ <enterprise-beans>
+
+ <session>
+ <description>Stateless session bean</description>
+ <ejb-name>pooledha_StatelessSession</ejb-name>
+ <home>org.jboss.test.cluster.ejb2.basic.interfaces.StatelessSessionHome</home>
+ <remote>org.jboss.test.cluster.ejb2.basic.interfaces.StatelessSession</remote>
+ <ejb-class>org.jboss.test.cluster.ejb2.basic.bean.StatelessSessionBean</ejb-class>
+ <session-type>Stateless</session-type>
+ <transaction-type>Container</transaction-type>
+ </session>
+ <session>
+ <description>Stateless session bean</description>
+ <ejb-name>pooled_StatelessSession</ejb-name>
+ <home>org.jboss.test.cluster.ejb2.basic.interfaces.StatelessSessionHome</home>
+ <remote>org.jboss.test.cluster.ejb2.basic.interfaces.StatelessSession</remote>
+ <ejb-class>org.jboss.test.cluster.ejb2.basic.bean.StatelessSessionBean</ejb-class>
+ <session-type>Stateless</session-type>
+ <transaction-type>Container</transaction-type>
+ </session>
+
+ <session>
+ <description>Stateful session bean</description>
+ <ejb-name>pooledha_StatefulSession</ejb-name>
+ <home>org.jboss.test.testbean.interfaces.StatefulSessionHome</home>
+ <remote>org.jboss.test.cluster.ejb2.basic.interfaces.StatefulSession</remote>
+ <ejb-class>org.jboss.test.cluster.ejb2.basic.bean.StatefulSessionBean</ejb-class>
+ <session-type>Stateful</session-type>
+ <transaction-type>Container</transaction-type>
+ </session>
+ </enterprise-beans>
+
+ <assembly-descriptor>
+
+ <container-transaction>
+ <method>
+ <ejb-name>pooledha_StatelessSession</ejb-name>
+ <method-name>*</method-name>
+ </method>
+ <method>
+ <ejb-name>pooledha_StatefulSession</ejb-name>
+ <method-name>*</method-name>
+ </method>
+ <trans-attribute>Required</trans-attribute>
+ </container-transaction>
+
+ </assembly-descriptor>
+</ejb-jar>
Copied: trunk/testsuite/src/resources/cluster/ejb2/basic/pooledha-jboss.xml (from rev 64055, trunk/testsuite/src/resources/testbeancluster/pooledha-jboss.xml)
===================================================================
--- trunk/testsuite/src/resources/cluster/ejb2/basic/pooledha-jboss.xml (rev 0)
+++ trunk/testsuite/src/resources/cluster/ejb2/basic/pooledha-jboss.xml 2007-07-24 02:42:02 UTC (rev 64223)
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE jboss PUBLIC
+ "-//JBoss//DTD JBOSS 4.0//EN"
+ "http://www.jboss.org/j2ee/dtd/jboss_4_0.dtd">
+
+<jboss>
+
+ <enterprise-beans>
+ <session>
+ <ejb-name>pooledha_StatelessSession</ejb-name>
+ <configuration-name>Pooled Stateless SessionBean</configuration-name>
+ <invoker-bindings>
+ <invoker>
+ <invoker-proxy-binding-name>pooledha-stateless-invoker</invoker-proxy-binding-name>
+ <jndi-name>pooledha_StatelessSession</jndi-name>
+ </invoker>
+ </invoker-bindings>
+ <clustered>true</clustered>
+ </session>
+ <session>
+ <ejb-name>pooled_StatelessSession</ejb-name>
+ <invoker-bindings>
+ <invoker>
+ <invoker-proxy-binding-name>stateless-pooled-invoker</invoker-proxy-binding-name>
+ <jndi-name>pooled_StatelessSession</jndi-name>
+ </invoker>
+ </invoker-bindings>
+ </session>
+ <session>
+ <ejb-name>pooledha_StatefulSession</ejb-name>
+ <configuration-name>Pooled Stateful SessionBean</configuration-name>
+ <invoker-bindings>
+ <invoker>
+ <invoker-proxy-binding-name>pooledha-stateful-invoker</invoker-proxy-binding-name>
+ <jndi-name>pooledha_StatefulSession</jndi-name>
+ </invoker>
+ </invoker-bindings>
+ <clustered>true</clustered>
+ </session>
+
+ </enterprise-beans>
+
+ <invoker-proxy-bindings>
+ <!-- Override default clustered invoker bindings -->
+ <invoker-proxy-binding>
+ <name>pooledha-stateless-invoker</name>
+ <invoker-mbean>jboss:service=invoker,type=pooledha</invoker-mbean>
+ <proxy-factory>org.jboss.proxy.ejb.ProxyFactoryHA</proxy-factory>
+ <proxy-factory-config>
+ <client-interceptors exposeContainer="true">
+ <home>
+ <interceptor>org.jboss.ha.framework.test.ExplicitFailoverClientInterceptor</interceptor>
+ <interceptor>org.jboss.proxy.ejb.HomeInterceptor</interceptor>
+ <interceptor>org.jboss.proxy.SecurityInterceptor</interceptor>
+ <interceptor>org.jboss.proxy.TransactionInterceptor</interceptor>
+ <interceptor>org.jboss.invocation.InvokerInterceptor</interceptor>
+ </home>
+ <bean>
+ <interceptor>org.jboss.ha.framework.test.ExplicitFailoverClientInterceptor</interceptor>
+ <interceptor>org.jboss.proxy.ejb.StatelessSessionInterceptor</interceptor>
+ <interceptor>org.jboss.proxy.SecurityInterceptor</interceptor>
+ <interceptor>org.jboss.proxy.TransactionInterceptor</interceptor>
+ <interceptor>org.jboss.invocation.InvokerInterceptor</interceptor>
+ </bean>
+ </client-interceptors>
+ </proxy-factory-config>
+ </invoker-proxy-binding>
+
+ <invoker-proxy-binding>
+ <name>pooledha-stateful-invoker</name>
+ <invoker-mbean>jboss:service=invoker,type=pooledha</invoker-mbean>
+ <proxy-factory>org.jboss.proxy.ejb.ProxyFactoryHA</proxy-factory>
+ <proxy-factory-config>
+ <client-interceptors exposeContainer="true">
+ <home>
+ <interceptor>org.jboss.ha.framework.test.ExplicitFailoverClientInterceptor</interceptor>
+ <interceptor>org.jboss.proxy.ejb.HomeInterceptor</interceptor>
+ <interceptor>org.jboss.proxy.SecurityInterceptor</interceptor>
+ <interceptor>org.jboss.proxy.TransactionInterceptor</interceptor>
+ <interceptor>org.jboss.invocation.InvokerInterceptor</interceptor>
+ </home>
+ <bean>
+ <interceptor>org.jboss.ha.framework.test.ExplicitFailoverClientInterceptor</interceptor>
+ <interceptor>org.jboss.proxy.ejb.StatefulSessionInterceptor</interceptor>
+ <interceptor>org.jboss.proxy.SecurityInterceptor</interceptor>
+ <interceptor>org.jboss.proxy.TransactionInterceptor</interceptor>
+ <interceptor>org.jboss.invocation.InvokerInterceptor</interceptor>
+ </bean>
+ </client-interceptors>
+ </proxy-factory-config>
+ </invoker-proxy-binding>
+
+ <invoker-proxy-binding>
+ <name>stateless-pooled-invoker</name>
+ <invoker-mbean>jboss:service=invoker,type=pooled</invoker-mbean>
+ <proxy-factory>org.jboss.proxy.ejb.ProxyFactory</proxy-factory>
+ <proxy-factory-config>
+ <client-interceptors>
+ <home>
+ <interceptor>org.jboss.proxy.ejb.HomeInterceptor</interceptor>
+ <interceptor>org.jboss.proxy.SecurityInterceptor</interceptor>
+ <interceptor>org.jboss.proxy.TransactionInterceptor</interceptor>
+ <interceptor>org.jboss.invocation.InvokerInterceptor</interceptor>
+ </home>
+ <bean>
+ <interceptor>org.jboss.proxy.ejb.StatelessSessionInterceptor</interceptor>
+ <interceptor>org.jboss.proxy.SecurityInterceptor</interceptor>
+ <interceptor>org.jboss.proxy.TransactionInterceptor</interceptor>
+ <interceptor>org.jboss.invocation.InvokerInterceptor</interceptor>
+ </bean>
+ </client-interceptors>
+ </proxy-factory-config>
+ </invoker-proxy-binding>
+
+ </invoker-proxy-bindings>
+
+ <container-configurations>
+ <container-configuration extends="Clustered Stateless SessionBean">
+ <container-name>Pooled Stateless SessionBean</container-name>
+ <invoker-proxy-binding-name>pooledha-stateless-invoker</invoker-proxy-binding-name>
+ </container-configuration>
+ <container-configuration extends="Clustered Stateful SessionBean">
+ <container-name>Pooled Stateful SessionBean</container-name>
+ <invoker-proxy-binding-name>pooledha-stateful-invoker</invoker-proxy-binding-name>
+ </container-configuration>
+ </container-configurations>
+</jboss>
Copied: trunk/testsuite/src/resources/cluster/ejb2/basic/retry-application.xml (from rev 64055, trunk/testsuite/src/resources/testbeancluster/retry-application.xml)
===================================================================
--- trunk/testsuite/src/resources/cluster/ejb2/basic/retry-application.xml (rev 0)
+++ trunk/testsuite/src/resources/cluster/ejb2/basic/retry-application.xml 2007-07-24 02:42:02 UTC (rev 64223)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<application>
+ <display-name>CIF test ear</display-name>
+ <module>
+ <ejb>test-retry.jar</ejb>
+ </module>
+</application>
\ No newline at end of file
Copied: trunk/testsuite/src/resources/cluster/ejb2/basic/retry-ejb-jar.xml (from rev 64055, trunk/testsuite/src/resources/testbeancluster/retry-ejb-jar.xml)
===================================================================
--- trunk/testsuite/src/resources/cluster/ejb2/basic/retry-ejb-jar.xml (rev 0)
+++ trunk/testsuite/src/resources/cluster/ejb2/basic/retry-ejb-jar.xml 2007-07-24 02:42:02 UTC (rev 64223)
@@ -0,0 +1,140 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE ejb-jar
+ PUBLIC "-//Sun Microsystems, Inc.//DTD Enterprise JavaBeans 2.0//EN"
+ "http://java.sun.com/dtd/ejb-jar_2_0.dtd">
+
+<ejb-jar>
+ <enterprise-beans>
+
+ <session>
+ <description>Nextgen test bean stateless</description>
+ <ejb-name>nextgen_StatelessSession_Retry</ejb-name>
+ <home>org.jboss.test.cluster.ejb2.basic.interfaces.StatelessSessionHome</home>
+ <remote>org.jboss.test.cluster.ejb2.basic.interfaces.StatelessSession</remote>
+ <ejb-class>org.jboss.test.cluster.ejb2.basic.bean.StatelessSessionBean</ejb-class>
+ <session-type>Stateless</session-type>
+ <transaction-type>Container</transaction-type>
+ </session>
+ <session>
+ <description>Nextgen test bean stateless</description>
+ <ejb-name>nextgen_StatelessSession_SingleRetry</ejb-name>
+ <home>org.jboss.test.cluster.ejb2.basic.interfaces.StatelessSessionHome</home>
+ <remote>org.jboss.test.cluster.ejb2.basic.interfaces.StatelessSession</remote>
+ <ejb-class>org.jboss.test.cluster.ejb2.basic.bean.StatelessSessionBean</ejb-class>
+ <session-type>Stateless</session-type>
+ <transaction-type>Container</transaction-type>
+ </session>
+
+ <session>
+ <description>Nextgen test bean stateful</description>
+ <ejb-name>nextgen_StatefulSession_Retry</ejb-name>
+ <home>org.jboss.test.testbean.interfaces.StatefulSessionHome</home>
+ <remote>org.jboss.test.cluster.ejb2.basic.interfaces.StatefulSession</remote>
+ <ejb-class>org.jboss.test.cluster.ejb2.basic.bean.StatefulSessionBean</ejb-class>
+ <session-type>Stateful</session-type>
+ <transaction-type>Container</transaction-type>
+ </session>
+ <session>
+ <description>Nextgen test bean stateful</description>
+ <ejb-name>nextgen_StatefulSession_SingleRetry</ejb-name>
+ <home>org.jboss.test.testbean.interfaces.StatefulSessionHome</home>
+ <remote>org.jboss.test.cluster.ejb2.basic.interfaces.StatefulSession</remote>
+ <ejb-class>org.jboss.test.cluster.ejb2.basic.bean.StatefulSessionBean</ejb-class>
+ <session-type>Stateful</session-type>
+ <transaction-type>Container</transaction-type>
+ </session>
+
+ <entity>
+ <description>Nextgen PK bean</description>
+ <ejb-name>nextgen_EntityPK_Retry</ejb-name>
+ <home>org.jboss.test.testbean.interfaces.EntityPKHome</home>
+ <remote>org.jboss.test.testbean.interfaces.EntityPK</remote>
+ <ejb-class>org.jboss.test.testbean.bean.EntityPKBean</ejb-class>
+ <persistence-type>Container</persistence-type>
+ <prim-key-class>org.jboss.test.testbean.interfaces.AComplexPK</prim-key-class>
+ <reentrant>False</reentrant>
+ <cmp-version>1.x</cmp-version>
+ <cmp-field>
+ <field-name>aBoolean</field-name>
+ </cmp-field>
+ <cmp-field>
+ <field-name>anInt</field-name>
+ </cmp-field>
+ <cmp-field>
+ <field-name>aLong</field-name>
+ </cmp-field>
+ <cmp-field>
+ <field-name>aDouble</field-name>
+ </cmp-field>
+ <cmp-field>
+ <field-name>aString</field-name>
+ </cmp-field>
+ <cmp-field>
+ <field-name>otherField</field-name>
+ </cmp-field>
+ </entity>
+
+ <entity>
+ <description>Nextgen PK bean</description>
+ <ejb-name>nextgen_EntityPK_SingleRetry</ejb-name>
+ <home>org.jboss.test.testbean.interfaces.EntityPKHome</home>
+ <remote>org.jboss.test.testbean.interfaces.EntityPK</remote>
+ <ejb-class>org.jboss.test.testbean.bean.EntityPKBean</ejb-class>
+ <persistence-type>Container</persistence-type>
+ <prim-key-class>org.jboss.test.testbean.interfaces.AComplexPK</prim-key-class>
+ <reentrant>False</reentrant>
+ <cmp-version>1.x</cmp-version>
+ <cmp-field>
+ <field-name>aBoolean</field-name>
+ </cmp-field>
+ <cmp-field>
+ <field-name>anInt</field-name>
+ </cmp-field>
+ <cmp-field>
+ <field-name>aLong</field-name>
+ </cmp-field>
+ <cmp-field>
+ <field-name>aDouble</field-name>
+ </cmp-field>
+ <cmp-field>
+ <field-name>aString</field-name>
+ </cmp-field>
+ <cmp-field>
+ <field-name>otherField</field-name>
+ </cmp-field>
+ </entity>
+
+ </enterprise-beans>
+
+ <assembly-descriptor>
+
+ <container-transaction>
+ <method>
+ <ejb-name>nextgen_StatefulSession_Retry</ejb-name>
+ <method-name>*</method-name>
+ </method>
+ <method>
+ <ejb-name>nextgen_StatefulSession_SingleRetry</ejb-name>
+ <method-name>*</method-name>
+ </method>
+ <method>
+ <ejb-name>nextgen_StatelessSession_Retry</ejb-name>
+ <method-name>*</method-name>
+ </method>
+ <method>
+ <ejb-name>nextgen_StatelessSession_SingleRetry</ejb-name>
+ <method-name>*</method-name>
+ </method>
+ <method>
+ <ejb-name>nextgen_EntityPK_Retry</ejb-name>
+ <method-name>*</method-name>
+ </method>
+ <method>
+ <ejb-name>nextgen_EntityPK_SingleRetry</ejb-name>
+ <method-name>*</method-name>
+ </method>
+ <trans-attribute>Required</trans-attribute>
+ </container-transaction>
+
+ </assembly-descriptor>
+</ejb-jar>
Copied: trunk/testsuite/src/resources/cluster/ejb2/basic/retry-jboss.xml (from rev 64055, trunk/testsuite/src/resources/testbeancluster/retry-jboss.xml)
===================================================================
--- trunk/testsuite/src/resources/cluster/ejb2/basic/retry-jboss.xml (rev 0)
+++ trunk/testsuite/src/resources/cluster/ejb2/basic/retry-jboss.xml 2007-07-24 02:42:02 UTC (rev 64223)
@@ -0,0 +1,337 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE jboss PUBLIC
+ "-//JBoss//DTD JBOSS 3.2//EN"
+ "http://www.jboss.org/j2ee/dtd/jboss_3_2.dtd">
+
+<jboss>
+
+ <enterprise-beans>
+ <session>
+ <ejb-name>nextgen_StatelessSession_Retry</ejb-name>
+ <configuration-name>Clustered Stateless SessionBean</configuration-name>
+ <invoker-bindings>
+ <invoker>
+ <invoker-proxy-binding-name>clustered-stateless-rmi-invoker-retry</invoker-proxy-binding-name>
+ <jndi-name>nextgen_StatelessSession_Retry</jndi-name>
+ </invoker>
+ </invoker-bindings>
+ <clustered>true</clustered>
+ </session>
+ <session>
+ <ejb-name>nextgen_StatelessSession_SingleRetry</ejb-name>
+ <configuration-name>Clustered Stateless SessionBean</configuration-name>
+ <invoker-bindings>
+ <invoker>
+ <invoker-proxy-binding-name>clustered-stateless-rmi-invoker-singleretry</invoker-proxy-binding-name>
+ <jndi-name>nextgen_StatelessSession_SingleRetry</jndi-name>
+ </invoker>
+ </invoker-bindings>
+ <clustered>true</clustered>
+ </session>
+ <session>
+ <ejb-name>nextgen_StatefulSession_Retry</ejb-name>
+ <configuration-name>Clustered Stateful SessionBean</configuration-name>
+ <invoker-bindings>
+ <invoker>
+ <invoker-proxy-binding-name>clustered-stateful-rmi-invoker-retry</invoker-proxy-binding-name>
+ <jndi-name>nextgen_StatefulSession_Retry</jndi-name>
+ </invoker>
+ </invoker-bindings>
+ <clustered>true</clustered>
+ </session>
+ <session>
+ <ejb-name>nextgen_StatefulSession_SingleRetry</ejb-name>
+ <configuration-name>Clustered Stateful SessionBean</configuration-name>
+ <invoker-bindings>
+ <invoker>
+ <invoker-proxy-binding-name>clustered-stateful-rmi-invoker-singleretry</invoker-proxy-binding-name>
+ <jndi-name>nextgen_StatefulSession_SingleRetry</jndi-name>
+ </invoker>
+ </invoker-bindings>
+ <clustered>true</clustered>
+ </session>
+
+ <entity>
+ <ejb-name>nextgen_EntityPK_Retry</ejb-name>
+ <configuration-name>Clustered CMP EntityBean</configuration-name>
+ <invoker-bindings>
+ <invoker>
+ <invoker-proxy-binding-name>clustered-entity-rmi-invoker-retry</invoker-proxy-binding-name>
+ <jndi-name>nextgen_EntityPK_Retry</jndi-name>
+ </invoker>
+ </invoker-bindings>
+ <clustered>true</clustered>
+ </entity>
+
+ <entity>
+ <ejb-name>nextgen_EntityPK_SingleRetry</ejb-name>
+ <configuration-name>Clustered CMP EntityBean</configuration-name>
+ <invoker-bindings>
+ <invoker>
+ <invoker-proxy-binding-name>clustered-entity-rmi-invoker-singleretry</invoker-proxy-binding-name>
+ <jndi-name>nextgen_EntityPK_SingleRetry</jndi-name>
+ </invoker>
+ </invoker-bindings>
+ <clustered>true</clustered>
+ </entity>
+
+
+ </enterprise-beans>
+
+ <invoker-proxy-bindings>
+ <!-- Override default clustered invoker bindings -->
+ <invoker-proxy-binding>
+ <name>clustered-stateless-rmi-invoker-retry</name>
+ <invoker-mbean>jboss:service=invoker,type=unifiedha</invoker-mbean>
+ <proxy-factory>org.jboss.proxy.ejb.ProxyFactoryHA</proxy-factory>
+ <proxy-factory-config>
+ <client-interceptors>
+ <home>
+ <interceptor>org.jboss.ha.framework.test.ExplicitFailoverClientInterceptor</interceptor>
+ <interceptor>org.jboss.proxy.ejb.HomeInterceptor</interceptor>
+ <interceptor>org.jboss.proxy.SecurityInterceptor</interceptor>
+ <interceptor>org.jboss.proxy.TransactionInterceptor</interceptor>
+ <interceptor>org.jboss.proxy.ejb.RetryInterceptor</interceptor>
+ <interceptor>org.jboss.ha.framework.test.ServiceUnavailableClientInterceptor</interceptor>
+ <interceptor>org.jboss.invocation.InvokerInterceptor</interceptor>
+ </home>
+ <bean>
+ <interceptor>org.jboss.ha.framework.test.ExplicitFailoverClientInterceptor</interceptor>
+ <interceptor>org.jboss.proxy.ejb.StatelessSessionInterceptor</interceptor>
+ <interceptor>org.jboss.proxy.SecurityInterceptor</interceptor>
+ <interceptor>org.jboss.proxy.TransactionInterceptor</interceptor>
+ <interceptor>org.jboss.proxy.ejb.RetryInterceptor</interceptor>
+ <interceptor>org.jboss.ha.framework.test.ServiceUnavailableClientInterceptor</interceptor>
+ <interceptor>org.jboss.invocation.InvokerInterceptor</interceptor>
+ </bean>
+ </client-interceptors>
+ </proxy-factory-config>
+ </invoker-proxy-binding>
+
+ <invoker-proxy-binding>
+ <name>clustered-stateless-rmi-invoker-singleretry</name>
+ <invoker-mbean>jboss:service=invoker,type=unifiedha</invoker-mbean>
+ <proxy-factory>org.jboss.proxy.ejb.ProxyFactoryHA</proxy-factory>
+ <proxy-factory-config>
+ <client-interceptors>
+ <home>
+ <interceptor>org.jboss.ha.framework.test.ExplicitFailoverClientInterceptor</interceptor>
+ <interceptor>org.jboss.proxy.ejb.HomeInterceptor</interceptor>
+ <interceptor>org.jboss.proxy.SecurityInterceptor</interceptor>
+ <interceptor>org.jboss.proxy.TransactionInterceptor</interceptor>
+ <interceptor>org.jboss.proxy.ejb.SingleRetryInterceptor</interceptor>
+ <interceptor>org.jboss.ha.framework.test.ServiceUnavailableClientInterceptor</interceptor>
+ <interceptor>org.jboss.invocation.InvokerInterceptor</interceptor>
+ </home>
+ <bean>
+ <interceptor>org.jboss.ha.framework.test.ExplicitFailoverClientInterceptor</interceptor>
+ <interceptor>org.jboss.proxy.ejb.StatelessSessionInterceptor</interceptor>
+ <interceptor>org.jboss.proxy.SecurityInterceptor</interceptor>
+ <interceptor>org.jboss.proxy.TransactionInterceptor</interceptor>
+ <interceptor>org.jboss.proxy.ejb.SingleRetryInterceptor</interceptor>
+ <interceptor>org.jboss.ha.framework.test.ServiceUnavailableClientInterceptor</interceptor>
+ <interceptor>org.jboss.invocation.InvokerInterceptor</interceptor>
+ </bean>
+ </client-interceptors>
+ </proxy-factory-config>
+ </invoker-proxy-binding>
+
+ <invoker-proxy-binding>
+ <name>clustered-stateful-rmi-invoker-retry</name>
+ <invoker-mbean>jboss:service=invoker,type=unifiedha</invoker-mbean>
+ <proxy-factory>org.jboss.proxy.ejb.ProxyFactoryHA</proxy-factory>
+ <proxy-factory-config>
+ <client-interceptors>
+ <home>
+ <interceptor>org.jboss.ha.framework.test.ExplicitFailoverClientInterceptor</interceptor>
+ <interceptor>org.jboss.proxy.ejb.HomeInterceptor</interceptor>
+ <interceptor>org.jboss.proxy.SecurityInterceptor</interceptor>
+ <interceptor>org.jboss.proxy.TransactionInterceptor</interceptor>
+ <interceptor>org.jboss.proxy.ejb.RetryInterceptor</interceptor>
+ <interceptor>org.jboss.ha.framework.test.ServiceUnavailableClientInterceptor</interceptor>
+ <interceptor>org.jboss.invocation.InvokerInterceptor</interceptor>
+ </home>
+ <bean>
+ <interceptor>org.jboss.ha.framework.test.ExplicitFailoverClientInterceptor</interceptor>
+ <interceptor>org.jboss.proxy.ejb.StatefulSessionInterceptor</interceptor>
+ <interceptor>org.jboss.proxy.SecurityInterceptor</interceptor>
+ <interceptor>org.jboss.proxy.TransactionInterceptor</interceptor>
+ <interceptor>org.jboss.proxy.ejb.RetryInterceptor</interceptor>
+ <interceptor>org.jboss.ha.framework.test.ServiceUnavailableClientInterceptor</interceptor>
+ <interceptor>org.jboss.invocation.InvokerInterceptor</interceptor>
+ </bean>
+ </client-interceptors>
+ </proxy-factory-config>
+ </invoker-proxy-binding>
+
+ <invoker-proxy-binding>
+ <name>clustered-stateful-rmi-invoker-singleretry</name>
+ <invoker-mbean>jboss:service=invoker,type=unifiedha</invoker-mbean>
+ <proxy-factory>org.jboss.proxy.ejb.ProxyFactoryHA</proxy-factory>
+ <proxy-factory-config>
+ <client-interceptors>
+ <home>
+ <interceptor>org.jboss.ha.framework.test.ExplicitFailoverClientInterceptor</interceptor>
+ <interceptor>org.jboss.proxy.ejb.HomeInterceptor</interceptor>
+ <interceptor>org.jboss.proxy.SecurityInterceptor</interceptor>
+ <interceptor>org.jboss.proxy.TransactionInterceptor</interceptor>
+ <interceptor>org.jboss.proxy.ejb.SingleRetryInterceptor</interceptor>
+ <interceptor>org.jboss.ha.framework.test.ServiceUnavailableClientInterceptor</interceptor>
+ <interceptor>org.jboss.invocation.InvokerInterceptor</interceptor>
+ </home>
+ <bean>
+ <interceptor>org.jboss.ha.framework.test.ExplicitFailoverClientInterceptor</interceptor>
+ <interceptor>org.jboss.proxy.ejb.StatefulSessionInterceptor</interceptor>
+ <interceptor>org.jboss.proxy.SecurityInterceptor</interceptor>
+ <interceptor>org.jboss.proxy.TransactionInterceptor</interceptor>
+ <interceptor>org.jboss.proxy.ejb.SingleRetryInterceptor</interceptor>
+ <interceptor>org.jboss.ha.framework.test.ServiceUnavailableClientInterceptor</interceptor>
+ <interceptor>org.jboss.invocation.InvokerInterceptor</interceptor>
+ </bean>
+ </client-interceptors>
+ </proxy-factory-config>
+ </invoker-proxy-binding>
+
+ <invoker-proxy-binding>
+ <name>clustered-entity-rmi-invoker-retry</name>
+ <invoker-mbean>jboss:service=invoker,type=unifiedha</invoker-mbean>
+ <proxy-factory>org.jboss.proxy.ejb.ProxyFactoryHA</proxy-factory>
+ <proxy-factory-config>
+ <client-interceptors>
+ <home>
+ <interceptor>org.jboss.ha.framework.test.ExplicitFailoverClientInterceptor</interceptor>
+ <interceptor>org.jboss.proxy.ejb.HomeInterceptor</interceptor>
+ <interceptor>org.jboss.proxy.SecurityInterceptor</interceptor>
+ <interceptor>org.jboss.proxy.TransactionInterceptor</interceptor>
+ <interceptor>org.jboss.proxy.ejb.RetryInterceptor</interceptor>
+ <interceptor>org.jboss.ha.framework.test.ServiceUnavailableClientInterceptor</interceptor>
+ <interceptor>org.jboss.invocation.InvokerInterceptor</interceptor>
+ </home>
+ <bean>
+ <interceptor>org.jboss.ha.framework.test.ExplicitFailoverClientInterceptor</interceptor>
+ <interceptor>org.jboss.proxy.ejb.EntityInterceptor</interceptor>
+ <interceptor>org.jboss.proxy.SecurityInterceptor</interceptor>
+ <interceptor>org.jboss.proxy.TransactionInterceptor</interceptor>
+ <interceptor>org.jboss.proxy.ejb.RetryInterceptor</interceptor>
+ <interceptor>org.jboss.ha.framework.test.ServiceUnavailableClientInterceptor</interceptor>
+ <interceptor>org.jboss.invocation.InvokerInterceptor</interceptor>
+ </bean>
+ <list-entity>
+ <interceptor>org.jboss.ha.framework.test.ExplicitFailoverClientInterceptor</interceptor>
+ <interceptor>org.jboss.proxy.ejb.ListEntityInterceptor</interceptor>
+ <interceptor>org.jboss.proxy.SecurityInterceptor</interceptor>
+ <interceptor>org.jboss.proxy.TransactionInterceptor</interceptor>
+ <interceptor>org.jboss.proxy.ejb.RetryInterceptor</interceptor>
+ <interceptor>org.jboss.ha.framework.test.ServiceUnavailableClientInterceptor</interceptor>
+ <interceptor>org.jboss.invocation.InvokerInterceptor</interceptor>
+ </list-entity>
+ </client-interceptors>
+ </proxy-factory-config>
+ </invoker-proxy-binding>
+
+ <invoker-proxy-binding>
+ <name>clustered-entity-rmi-invoker-singleretry</name>
+ <invoker-mbean>jboss:service=invoker,type=unifiedha</invoker-mbean>
+ <proxy-factory>org.jboss.proxy.ejb.ProxyFactoryHA</proxy-factory>
+ <proxy-factory-config>
+ <client-interceptors>
+ <home>
+ <interceptor>org.jboss.ha.framework.test.ExplicitFailoverClientInterceptor</interceptor>
+ <interceptor>org.jboss.proxy.ejb.HomeInterceptor</interceptor>
+ <interceptor>org.jboss.proxy.SecurityInterceptor</interceptor>
+ <interceptor>org.jboss.proxy.TransactionInterceptor</interceptor>
+ <interceptor>org.jboss.proxy.ejb.SingleRetryInterceptor</interceptor>
+ <interceptor>org.jboss.ha.framework.test.ServiceUnavailableClientInterceptor</interceptor>
+ <interceptor>org.jboss.invocation.InvokerInterceptor</interceptor>
+ </home>
+ <bean>
+ <interceptor>org.jboss.ha.framework.test.ExplicitFailoverClientInterceptor</interceptor>
+ <interceptor>org.jboss.proxy.ejb.EntityInterceptor</interceptor>
+ <interceptor>org.jboss.proxy.SecurityInterceptor</interceptor>
+ <interceptor>org.jboss.proxy.TransactionInterceptor</interceptor>
+ <interceptor>org.jboss.proxy.ejb.RetryInterceptor</interceptor>
+ <interceptor>org.jboss.ha.framework.test.ServiceUnavailableClientInterceptor</interceptor>
+ <interceptor>org.jboss.invocation.InvokerInterceptor</interceptor>
+ </bean>
+ <list-entity>
+ <interceptor>org.jboss.ha.framework.test.ExplicitFailoverClientInterceptor</interceptor>
+ <interceptor>org.jboss.proxy.ejb.ListEntityInterceptor</interceptor>
+ <interceptor>org.jboss.proxy.SecurityInterceptor</interceptor>
+ <interceptor>org.jboss.proxy.TransactionInterceptor</interceptor>
+ <interceptor>org.jboss.proxy.ejb.SingleRetryInterceptor</interceptor>
+ <interceptor>org.jboss.ha.framework.test.ServiceUnavailableClientInterceptor</interceptor>
+ <interceptor>org.jboss.invocation.InvokerInterceptor</interceptor>
+ </list-entity>
+ </client-interceptors>
+ </proxy-factory-config>
+ </invoker-proxy-binding>
+
+ </invoker-proxy-bindings>
+
+
+ <container-configurations>
+ <container-configuration>
+ <container-name>Clustered CMP EntityBean</container-name>
+ <call-logging>true</call-logging>
+ <container-interceptors>
+ <interceptor>org.jboss.ejb.plugins.ProxyFactoryFinderInterceptor</interceptor>
+ <interceptor>org.jboss.ha.framework.test.ExplicitFailoverServerInterceptor</interceptor> <!-- must be before CleanShutdown -->
+ <interceptor>org.jboss.ejb.plugins.CleanShutdownInterceptor</interceptor>
+ <interceptor>org.jboss.ejb.plugins.LogInterceptor</interceptor>
+ <interceptor>org.jboss.ejb.plugins.security.PreSecurityInterceptor</interceptor>
+ <interceptor>org.jboss.ejb.plugins.SecurityInterceptor</interceptor>
+ <interceptor>org.jboss.ejb.plugins.TxInterceptorCMT</interceptor>
+ <interceptor>org.jboss.ejb.plugins.EntityCreationInterceptor</interceptor>
+ <interceptor>org.jboss.ejb.plugins.EntityLockInterceptor</interceptor>
+ <interceptor>org.jboss.ejb.plugins.EntityInstanceInterceptor</interceptor>
+ <interceptor>org.jboss.ejb.plugins.EntityReentranceInterceptor</interceptor>
+ <interceptor>org.jboss.resource.connectionmanager.CachedConnectionInterceptor</interceptor>
+ <interceptor>org.jboss.ejb.plugins.EntitySynchronizationInterceptor</interceptor>
+ </container-interceptors>
+ <commit-option>A</commit-option>
+ </container-configuration>
+
+ <container-configuration>
+ <container-name>Clustered Stateless SessionBean</container-name>
+ <call-logging>true</call-logging>
+ <container-interceptors>
+ <interceptor>org.jboss.ejb.plugins.ProxyFactoryFinderInterceptor</interceptor>
+ <interceptor>org.jboss.ha.framework.test.ExplicitFailoverServerInterceptor</interceptor> <!-- must be before CleanShutdown -->
+ <interceptor>org.jboss.ejb.plugins.CleanShutdownInterceptor</interceptor>
+ <interceptor>org.jboss.ejb.plugins.LogInterceptor</interceptor>
+ <interceptor>org.jboss.ejb.plugins.security.PreSecurityInterceptor</interceptor>
+ <interceptor>org.jboss.ejb.plugins.SecurityInterceptor</interceptor>
+ <!-- CMT -->
+ <interceptor transaction="Container">org.jboss.ejb.plugins.TxInterceptorCMT</interceptor>
+ <interceptor transaction="Container">org.jboss.ejb.plugins.StatelessSessionInstanceInterceptor</interceptor>
+ <!-- BMT -->
+ <interceptor transaction="Bean">org.jboss.ejb.plugins.StatelessSessionInstanceInterceptor</interceptor>
+ <interceptor transaction="Bean">org.jboss.ejb.plugins.TxInterceptorBMT</interceptor>
+ <interceptor>org.jboss.resource.connectionmanager.CachedConnectionInterceptor</interceptor>
+ </container-interceptors>
+ </container-configuration>
+
+ <container-configuration>
+ <container-name>Clustered Stateful SessionBean</container-name>
+ <call-logging>true</call-logging>
+ <container-interceptors>
+ <interceptor>org.jboss.ejb.plugins.ProxyFactoryFinderInterceptor</interceptor>
+ <interceptor>org.jboss.ha.framework.test.ExplicitFailoverServerInterceptor</interceptor> <!-- must be before CleanShutdown -->
+ <interceptor>org.jboss.ejb.plugins.CleanShutdownInterceptor</interceptor>
+ <interceptor>org.jboss.ejb.plugins.LogInterceptor</interceptor>
+ <interceptor>org.jboss.ejb.plugins.security.PreSecurityInterceptor</interceptor>
+ <!-- CMT -->
+ <interceptor transaction="Container">org.jboss.ejb.plugins.TxInterceptorCMT</interceptor>
+ <interceptor transaction="Container">org.jboss.ejb.plugins.StatefulSessionInstanceInterceptor</interceptor>
+ <!-- BMT -->
+ <interceptor transaction="Bean">org.jboss.ejb.plugins.StatefulSessionInstanceInterceptor</interceptor>
+ <interceptor transaction="Bean">org.jboss.ejb.plugins.TxInterceptorBMT</interceptor>
+ <interceptor>org.jboss.ejb.plugins.SecurityInterceptor</interceptor>
+ <interceptor>org.jboss.resource.connectionmanager.CachedConnectionInterceptor</interceptor>
+ <interceptor>org.jboss.ejb.plugins.StatefulHASessionSynchronisationInterceptor</interceptor>
+ </container-interceptors>
+ </container-configuration>
+
+ </container-configurations>
+
+</jboss>
Copied: trunk/testsuite/src/resources/cluster/ejb2/basic/retry-jbosscmp-jdbc.xml (from rev 64055, trunk/testsuite/src/resources/testbeancluster/retry-jbosscmp-jdbc.xml)
===================================================================
--- trunk/testsuite/src/resources/cluster/ejb2/basic/retry-jbosscmp-jdbc.xml (rev 0)
+++ trunk/testsuite/src/resources/cluster/ejb2/basic/retry-jbosscmp-jdbc.xml 2007-07-24 02:42:02 UTC (rev 64223)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE jbosscmp-jdbc PUBLIC
+ "-//JBoss//DTD JBOSSCMP-JDBC 3.2//EN"
+ "http://www.jboss.org/j2ee/dtd/jbosscmp-jdbc_3_2.dtd">
+
+<jbosscmp-jdbc>
+ <defaults>
+ <datasource>java:/CIFTestDS</datasource>
+ <datasource-mapping>Hypersonic SQL</datasource-mapping>
+ <create-table>true</create-table>
+ <remove-table>false</remove-table>
+ <pk-constraint>true</pk-constraint>
+ </defaults>
+</jbosscmp-jdbc>
Copied: trunk/testsuite/src/resources/cluster/hasingleton/electionpolicy (from rev 64055, trunk/testsuite/src/resources/ha/electionpolicy)
Copied: trunk/testsuite/src/resources/cluster/invokerha/META-INF (from rev 64055, trunk/testsuite/src/resources/jmx/ha/META-INF)
Modified: trunk/testsuite/src/resources/cluster/invokerha/META-INF/jboss-service.xml
===================================================================
--- trunk/testsuite/src/resources/jmx/ha/META-INF/jboss-service.xml 2007-07-13 23:07:56 UTC (rev 64055)
+++ trunk/testsuite/src/resources/cluster/invokerha/META-INF/jboss-service.xml 2007-07-24 02:42:02 UTC (rev 64223)
@@ -2,15 +2,25 @@
<server>
+ <!-- Our service -->
+ <mbean code="org.jboss.test.cluster.invokerha.HAService"
+ name="jboss.test:service=HAService">
+
+ <attribute name="SendRemoteLifecycleNotifications">false</attribute>
+ <!-- Use the default partition -->
+ <attribute name="HAPartition"><inject bean="HAPartition"/></attribute>
+
+ </mbean>
+
<!-- Create JRMPHA proxy for our service -->
<mbean code="org.jboss.proxy.generic.ProxyFactoryHA"
name="jboss.test:service=ProxyFactory,name=HAService,protocol=jrmpha">
<!-- Use the default partition -->
- <attribute name="Partition"><inject bean="HAPartition" state="Installed"/></attribute>
+ <attribute name="Partition"><inject bean="HAPartition"/></attribute>
- <!-- Use the standard JRMPInvoker from conf/jboss-service.xml -->
- <depends>JRMPInvokerHA</depends>
+ <!-- Use the UnifiedInvokerHA -->
+ <depends>UnifiedInvokerHA</depends>
<attribute name="InvokerName">jboss:service=invoker,type=jrmpha</attribute>
<!-- The load balancing policy -->
@@ -23,7 +33,7 @@
<attribute name="JndiName">jmx/HAService</attribute>
<!-- The interface exposed to the client -->
- <attribute name="ExportedInterface">org.jboss.test.jmx.ha.HAServiceRemote</attribute>
+ <attribute name="ExportedInterface">org.jboss.test.cluster.invokerha.HAServiceRemote</attribute>
<!-- Client side behaviour -->
<attribute name="ClientInterceptors">
@@ -33,11 +43,79 @@
</interceptors>
</attribute>
</mbean>
+
+ <!-- Unified version.
+ TODO We shouldn't need a separate service to expose a different
+ proxy. We do because of ProxyFactoryHA bases the FamilyClusterInfo name
+ on the service name.
+
+ <mbean code="org.jboss.test.cluster.invokerha.HAService"
+ name="jboss.test:service=HAService,type=unifiedha">
+
+ <attribute name="SendRemoteLifecycleNotifications">false</attribute>
+ <attribute name="HAPartition"><inject bean="HAPartition"/></attribute>
+
+ </mbean>
+ <mbean code="org.jboss.proxy.generic.ProxyFactoryHA"
+ name="jboss.test:service=ProxyFactory,name=HAService,protocol=unifiedha">
- <!-- Our service -->
- <mbean code="org.jboss.test.jmx.ha.HAService"
- name="jboss.test:service=HAService">
- <attribute name="SendRemoteLifecycleNotifications">false</attribute>
+ <attribute name="Partition"><inject bean="HAPartition"/></attribute>
+
+ <depends>JRMPInvokerHA</depends>
+ <attribute name="InvokerName">jboss:service=invoker,type=unifiedha</attribute>
+
+ <attribute name="LoadBalancePolicy">org.jboss.ha.framework.interfaces.RoundRobin</attribute>
+
+ <depends optional-attribute-name="TargetName">jboss.test:service=HAService,type=unifiedha</depends>
+
+ <attribute name="JndiName">jmx/HAServiceUnified</attribute>
+
+ <attribute name="ExportedInterface">org.jboss.test.cluster.invokerha.HAServiceRemote</attribute>
+
+ <attribute name="ClientInterceptors">
+ <interceptors>
+ <interceptor>org.jboss.proxy.ClientMethodInterceptor</interceptor>
+ <interceptor>org.jboss.invocation.InvokerInterceptor</interceptor>
+ </interceptors>
+ </attribute>
+ </mbean>
+ -->
+
+ <!-- Pooled version.
+ TODO We shouldn't need a separate service to expose a different
+ proxy. We do because of ProxyFactoryHA bases the FamilyClusterInfo name
+ on the service name.
+
+ <mbean code="org.jboss.test.cluster.invokerha.HAService"
+ name="jboss.test:service=HAService,type=pooledha">
+
+ <attribute name="SendRemoteLifecycleNotifications">false</attribute>
+ <attribute name="HAPartition"><inject bean="HAPartition"/></attribute>
+
</mbean>
+ <mbean code="org.jboss.proxy.generic.ProxyFactoryHA"
+ name="jboss.test:service=ProxyFactory,name=HAService,protocol=pooledha">
+
+ <attribute name="Partition"><inject bean="HAPartition"/></attribute>
+
+ <depends>PooledInvokerHA</depends>
+ <attribute name="InvokerName">jboss:service=invoker,type=pooledha</attribute>
+
+ <attribute name="LoadBalancePolicy">org.jboss.ha.framework.interfaces.RoundRobin</attribute>
+
+ <depends optional-attribute-name="TargetName">jboss.test:service=HAService,type=pooledha</depends>
+
+ <attribute name="JndiName">jmx/HAServicePooled</attribute>
+
+ <attribute name="ExportedInterface">org.jboss.test.cluster.invokerha.HAServiceRemote</attribute>
+
+ <attribute name="ClientInterceptors">
+ <interceptors>
+ <interceptor>org.jboss.proxy.ClientMethodInterceptor</interceptor>
+ <interceptor>org.jboss.invocation.InvokerInterceptor</interceptor>
+ </interceptors>
+ </attribute>
+ </mbean>
+ -->
</server>
Modified: trunk/testsuite/src/resources/cluster/partition/META-INF/ejb-jar.xml
===================================================================
--- trunk/testsuite/src/resources/cluster/partition/META-INF/ejb-jar.xml 2007-07-24 02:41:17 UTC (rev 64222)
+++ trunk/testsuite/src/resources/cluster/partition/META-INF/ejb-jar.xml 2007-07-24 02:42:02 UTC (rev 64223)
@@ -9,9 +9,9 @@
<session>
<description>Nextgen test bean stateless</description>
<ejb-name>nextgen_StatelessSession</ejb-name>
- <home>org.jboss.test.testbeancluster.interfaces.StatelessSessionHome</home>
- <remote>org.jboss.test.testbeancluster.interfaces.StatelessSession</remote>
- <ejb-class>org.jboss.test.testbeancluster.bean.StatelessSessionBean</ejb-class>
+ <home>org.jboss.test.cluster.ejb2.basic.interfaces.StatelessSessionHome</home>
+ <remote>org.jboss.test.cluster.ejb2.basic.interfaces.StatelessSession</remote>
+ <ejb-class>org.jboss.test.cluster.ejb2.basic.bean.StatelessSessionBean</ejb-class>
<session-type>Stateless</session-type>
<transaction-type>Container</transaction-type>
</session>
@@ -19,8 +19,8 @@
<description>Nextgen test bean stateful</description>
<ejb-name>nextgen_StatefulSession</ejb-name>
<home>org.jboss.test.testbean.interfaces.StatefulSessionHome</home>
- <remote>org.jboss.test.testbeancluster.interfaces.StatefulSession</remote>
- <ejb-class>org.jboss.test.testbeancluster.bean.StatefulSessionBean</ejb-class>
+ <remote>org.jboss.test.cluster.ejb2.basic.interfaces.StatefulSession</remote>
+ <ejb-class>org.jboss.test.cluster.ejb2.basic.bean.StatefulSessionBean</ejb-class>
<session-type>Stateful</session-type>
<transaction-type>Container</transaction-type>
</session>
@@ -43,8 +43,8 @@
<description>Nextgen test bean stateful</description>
<ejb-name>ExpiredStatefulSession</ejb-name>
<home>org.jboss.test.testbean.interfaces.StatefulSessionHome</home>
- <remote>org.jboss.test.testbeancluster.interfaces.StatefulSession</remote>
- <ejb-class>org.jboss.test.testbeancluster.bean.StatefulSessionBean</ejb-class>
+ <remote>org.jboss.test.cluster.ejb2.basic.interfaces.StatefulSession</remote>
+ <ejb-class>org.jboss.test.cluster.ejb2.basic.bean.StatefulSessionBean</ejb-class>
<session-type>Stateful</session-type>
<transaction-type>Container</transaction-type>
</session>
@@ -114,9 +114,9 @@
<entity>
<description>Entity PK bean</description>
<ejb-name>nextgen_EntityPK</ejb-name>
- <local-home>org.jboss.test.testbeancluster.interfaces.EntityPKHome</local-home>
- <local>org.jboss.test.testbeancluster.interfaces.EntityPK</local>
- <ejb-class>org.jboss.test.testbeancluster.bean.EntityPKBean</ejb-class>
+ <local-home>org.jboss.test.cluster.ejb2.basic.interfaces.EntityPKHome</local-home>
+ <local>org.jboss.test.cluster.ejb2.basic.interfaces.EntityPK</local>
+ <ejb-class>org.jboss.test.cluster.ejb2.basic.bean.EntityPKBean</ejb-class>
<persistence-type>Container</persistence-type>
<prim-key-class>org.jboss.test.testbean.interfaces.AComplexPK</prim-key-class>
<reentrant>False</reentrant>
Modified: trunk/testsuite/src/resources/cluster/partition/jboss-beans.xml
===================================================================
--- trunk/testsuite/src/resources/cluster/partition/jboss-beans.xml 2007-07-24 02:41:17 UTC (rev 64222)
+++ trunk/testsuite/src/resources/cluster/partition/jboss-beans.xml 2007-07-24 02:42:02 UTC (rev 64223)
@@ -95,12 +95,12 @@
<!-- Service to record and cache any failures in the partition -->
<bean name="BadProviderPartitionRecorder"
- class="org.jboss.test.cluster.partition.HAPartitionRecorder">
- <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss:service=BadProviderPartitionRecorder", exposedInterface=org.jboss.test.cluster.partition.HAPartitionRecorderMBean.class, registerDirectly=true)</annotation>
+ class="org.jboss.test.cluster.hapartition.state.HAPartitionRecorder">
+ <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss:service=BadProviderPartitionRecorder", exposedInterface=org.jboss.test.cluster.hapartition.state.HAPartitionRecorderMBean.class, registerDirectly=true)</annotation>
</bean>
<bean name="BadProviderPartition"
- class="org.jboss.test.cluster.partition.StartupTestClusterPartition">
+ class="org.jboss.test.cluster.hapartition.state.StartupTestClusterPartition">
<annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss:service=BadProviderPartition", exposedInterface=org.jboss.ha.framework.server.ClusterPartitionMBean.class)</annotation>
@@ -149,9 +149,9 @@
</bean>
<bean name="BadHAPartitionStateTransfer,returnState=false"
- class="org.jboss.test.cluster.partition.BadHAPartitionStateTransfer">
+ class="org.jboss.test.cluster.hapartition.state.BadHAPartitionStateTransfer">
- <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.test:service=BadHAPartitionStateTransfer,returnState=false", exposedInterface=org.jboss.test.cluster.partition.BadHAPartitionStateTransferMBean.class, registerDirectly=true)</annotation>
+ <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.test:service=BadHAPartitionStateTransfer,returnState=false", exposedInterface=org.jboss.test.cluster.hapartition.state.BadHAPartitionStateTransferMBean.class, registerDirectly=true)</annotation>
<supply>BadHAPartitionStateTransfer,returnState=false</supply>
@@ -168,12 +168,12 @@
<!-- Service to record and cache any failures in the partition -->
<bean name="BadStatePartitionRecorder"
- class="org.jboss.test.cluster.partition.HAPartitionRecorder">
- <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss:service=BadStatePartitionRecorder", exposedInterface=org.jboss.test.cluster.partition.HAPartitionRecorderMBean.class, registerDirectly=true)</annotation>
+ class="org.jboss.test.cluster.hapartition.state.HAPartitionRecorder">
+ <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss:service=BadStatePartitionRecorder", exposedInterface=org.jboss.test.cluster.hapartition.state.HAPartitionRecorderMBean.class, registerDirectly=true)</annotation>
</bean>
<bean name="BadStatePartition"
- class="org.jboss.test.cluster.partition.StartupTestClusterPartition">
+ class="org.jboss.test.cluster.hapartition.state.StartupTestClusterPartition">
<annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss:service=BadStatePartition", exposedInterface=org.jboss.ha.framework.server.ClusterPartitionMBean.class)</annotation>
@@ -222,11 +222,11 @@
</bean>
<bean name="BadHAPartitionStateTransfer,returnState=true"
- class="org.jboss.test.cluster.partition.BadHAPartitionStateTransfer">
+ class="org.jboss.test.cluster.hapartition.state.BadHAPartitionStateTransfer">
<supply>BadHAPartitionStateTransfer,returnState=true</supply>
- <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.test:service=BadHAPartitionStateTransfer,returnState=true", exposedInterface=org.jboss.test.cluster.partition.BadHAPartitionStateTransferMBean.class, registerDirectly=true)</annotation>
+ <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.test:service=BadHAPartitionStateTransfer,returnState=true", exposedInterface=org.jboss.test.cluster.hapartition.state.BadHAPartitionStateTransferMBean.class, registerDirectly=true)</annotation>
<!--property name="clusterPartition"><inject bean="BadStatePartition" state="Instantiated"/></property-->
@@ -241,12 +241,12 @@
<!-- Service to record and cache any failures in the partition -->
<bean name="NoStatePartitionRecorder"
- class="org.jboss.test.cluster.partition.HAPartitionRecorder">
- <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss:service=NoStatePartitionRecorder", exposedInterface=org.jboss.test.cluster.partition.HAPartitionRecorderMBean.class, registerDirectly=true)</annotation>
+ class="org.jboss.test.cluster.hapartition.state.HAPartitionRecorder">
+ <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss:service=NoStatePartitionRecorder", exposedInterface=org.jboss.test.cluster.hapartition.state.HAPartitionRecorderMBean.class, registerDirectly=true)</annotation>
</bean>
<bean name="NoStatePartition"
- class="org.jboss.test.cluster.partition.StartupTestClusterPartition">
+ class="org.jboss.test.cluster.hapartition.state.StartupTestClusterPartition">
<annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss:service=NoStatePartition", exposedInterface=org.jboss.ha.framework.server.ClusterPartitionMBean.class)</annotation>
@@ -291,12 +291,12 @@
<!-- Service to record and cache any failures in the partition -->
<bean name="GoodStatePartitionRecorder"
- class="org.jboss.test.cluster.partition.HAPartitionRecorder">
- <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss:service=GoodStatePartitionRecorder", exposedInterface=org.jboss.test.cluster.partition.HAPartitionRecorderMBean.class, registerDirectly=true)</annotation>
+ class="org.jboss.test.cluster.hapartition.state.HAPartitionRecorder">
+ <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss:service=GoodStatePartitionRecorder", exposedInterface=org.jboss.test.cluster.hapartition.state.HAPartitionRecorderMBean.class, registerDirectly=true)</annotation>
</bean>
<bean name="GoodStatePartition"
- class="org.jboss.test.cluster.partition.StartupTestClusterPartition">
+ class="org.jboss.test.cluster.hapartition.state.StartupTestClusterPartition">
<annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss:service=GoodStatePartition", exposedInterface=org.jboss.ha.framework.server.ClusterPartitionMBean.class)</annotation>
@@ -350,11 +350,11 @@
</bean>
<bean name="SimpleHAPartitionStateTransfer"
- class="org.jboss.test.cluster.partition.SimpleHAPartitionStateTransfer">
+ class="org.jboss.test.cluster.hapartition.state.SimpleHAPartitionStateTransfer">
<supply>SimpleHAPartitionStateTransfer</supply>
- <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.test:service=SimpleHAPartitionStateTransfer", exposedInterface=org.jboss.test.cluster.partition.SimpleHAPartitionStateTransferMBean.class, registerDirectly=true)</annotation>
+ <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.test:service=SimpleHAPartitionStateTransfer", exposedInterface=org.jboss.test.cluster.hapartition.state.SimpleHAPartitionStateTransferMBean.class, registerDirectly=true)</annotation>
<!--property name="clusterPartition"><inject bean="GoodStatePartition" state="Instantiated"/></property-->
<property name="serviceHAName">SimpleHAPartitionStateTransfer</property>
@@ -362,7 +362,7 @@
</bean>
<bean name="CustomStateHAPartitionStateTransfer"
- class="org.jboss.test.cluster.partition.CustomStateHAPartitionStateTransfer">
+ class="org.jboss.test.cluster.hapartition.state.CustomStateHAPartitionStateTransfer">
<supply>CustomStateHAPartitionStateTransfer</supply>
Modified: trunk/testsuite/src/resources/cluster/rpc/jboss-service.xml
===================================================================
--- trunk/testsuite/src/resources/cluster/rpc/jboss-service.xml 2007-07-24 02:41:17 UTC (rev 64222)
+++ trunk/testsuite/src/resources/cluster/rpc/jboss-service.xml 2007-07-24 02:42:02 UTC (rev 64223)
@@ -1,14 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<server>
- <mbean code="org.jboss.test.cluster.rpc.RPCUser" name="jboss.test:service=RPCTestCase">
- <depends>HAPartition</depends>
- <attribute name="PartitionName">DefaultPartition</attribute>
+ <mbean code="org.jboss.test.cluster.hapartition.rpc.RPCUser" name="jboss.test:service=RPCTestCase">
+ <attribute name="HAPartition"><inject bean="HAPartition"/></attribute>
</mbean>
- <mbean code="org.jboss.test.cluster.rpc.RPCUser" name="jboss.test:service=RPCOneNodeTestCase">
- <depends>HAPartition</depends>
- <attribute name="PartitionName">DefaultPartition</attribute>
+ <mbean code="org.jboss.test.cluster.hapartition.rpc.RPCUser" name="jboss.test:service=RPCOneNodeTestCase">
+ <attribute name="HAPartition"><inject bean="HAPartition"/></attribute>
</mbean>
</server>
Modified: trunk/testsuite/src/resources/cluster/rpc-cl/jboss-service.xml
===================================================================
--- trunk/testsuite/src/resources/cluster/rpc-cl/jboss-service.xml 2007-07-24 02:41:17 UTC (rev 64222)
+++ trunk/testsuite/src/resources/cluster/rpc-cl/jboss-service.xml 2007-07-24 02:42:02 UTC (rev 64223)
@@ -3,14 +3,12 @@
<loader-repository>rpctestcase:loader=rpc-cl-tests.sar</loader-repository>
- <mbean code="org.jboss.test.cluster.rpc.RPCUser" name="jboss.test:service=RPCClassLoaderTestCase">
- <depends>HAPartition</depends>
- <attribute name="PartitionName">DefaultPartition</attribute>
+ <mbean code="org.jboss.test.cluster.hapartition.rpc.RPCUser" name="jboss.test:service=RPCClassLoaderTestCase">
+ <attribute name="HAPartition"><inject bean="HAPartition"/></attribute>
</mbean>
- <mbean code="org.jboss.test.cluster.rpc.RPCUser" name="jboss.test:service=RPCOneNodeClassLoaderTestCase">
- <depends>HAPartition</depends>
- <attribute name="PartitionName">DefaultPartition</attribute>
+ <mbean code="org.jboss.test.cluster.hapartition.rpc.RPCUser" name="jboss.test:service=RPCOneNodeClassLoaderTestCase">
+ <attribute name="HAPartition"><inject bean="HAPartition"/></attribute>
</mbean>
</server>
More information about the jboss-cvs-commits
mailing list