[jboss-cvs] JBossAS SVN: r64226 - trunk/testsuite/src/resources/testbeancluster.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Jul 23 22:43:10 EDT 2007
Author: bstansberry at jboss.com
Date: 2007-07-23 22:43:10 -0400 (Mon, 23 Jul 2007)
New Revision: 64226
Removed:
trunk/testsuite/src/resources/testbeancluster/META-INF/
trunk/testsuite/src/resources/testbeancluster/application.xml
trunk/testsuite/src/resources/testbeancluster/cif-ds.xml
trunk/testsuite/src/resources/testbeancluster/cif-ejb-jar.xml
trunk/testsuite/src/resources/testbeancluster/cif-jboss.xml
trunk/testsuite/src/resources/testbeancluster/jboss-app.xml
trunk/testsuite/src/resources/testbeancluster/jbosscmp-jdbc.xml
trunk/testsuite/src/resources/testbeancluster/pooledha-ejb-jar.xml
trunk/testsuite/src/resources/testbeancluster/pooledha-jboss.xml
trunk/testsuite/src/resources/testbeancluster/retry-application.xml
trunk/testsuite/src/resources/testbeancluster/retry-ejb-jar.xml
trunk/testsuite/src/resources/testbeancluster/retry-jboss.xml
trunk/testsuite/src/resources/testbeancluster/retry-jbosscmp-jdbc.xml
Log:
[JBAS-4552] Move cluster tests into cluster package
Deleted: trunk/testsuite/src/resources/testbeancluster/application.xml
===================================================================
--- trunk/testsuite/src/resources/testbeancluster/application.xml 2007-07-24 02:42:45 UTC (rev 64225)
+++ trunk/testsuite/src/resources/testbeancluster/application.xml 2007-07-24 02:43:10 UTC (rev 64226)
@@ -1,12 +0,0 @@
-<?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
Deleted: trunk/testsuite/src/resources/testbeancluster/cif-ds.xml
===================================================================
--- trunk/testsuite/src/resources/testbeancluster/cif-ds.xml 2007-07-24 02:42:45 UTC (rev 64225)
+++ trunk/testsuite/src/resources/testbeancluster/cif-ds.xml 2007-07-24 02:43:10 UTC (rev 64226)
@@ -1,16 +0,0 @@
-<?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>
Deleted: trunk/testsuite/src/resources/testbeancluster/cif-ejb-jar.xml
===================================================================
--- trunk/testsuite/src/resources/testbeancluster/cif-ejb-jar.xml 2007-07-24 02:42:45 UTC (rev 64225)
+++ trunk/testsuite/src/resources/testbeancluster/cif-ejb-jar.xml 2007-07-24 02:43:10 UTC (rev 64226)
@@ -1,74 +0,0 @@
-<?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.testbeancluster.interfaces.SessionToEntityHome</home>
- <remote>org.jboss.test.testbeancluster.interfaces.SessionToEntity</remote>
- <ejb-class>org.jboss.test.testbeancluster.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.testbeancluster.interfaces.EntityPKHome</local-home>
- <local>org.jboss.test.testbeancluster.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.testbeancluster.interfaces.EntityPKHome</local-home>
- <local>org.jboss.test.testbeancluster.interfaces.EntityPK</local>
- <ejb-class>org.jboss.test.testbeancluster.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>
Deleted: trunk/testsuite/src/resources/testbeancluster/cif-jboss.xml
===================================================================
--- trunk/testsuite/src/resources/testbeancluster/cif-jboss.xml 2007-07-24 02:42:45 UTC (rev 64225)
+++ trunk/testsuite/src/resources/testbeancluster/cif-jboss.xml 2007-07-24 02:43:10 UTC (rev 64226)
@@ -1,23 +0,0 @@
-<?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>
Deleted: trunk/testsuite/src/resources/testbeancluster/jboss-app.xml
===================================================================
--- trunk/testsuite/src/resources/testbeancluster/jboss-app.xml 2007-07-24 02:42:45 UTC (rev 64225)
+++ trunk/testsuite/src/resources/testbeancluster/jboss-app.xml 2007-07-24 02:43:10 UTC (rev 64226)
@@ -1,10 +0,0 @@
-<?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
Deleted: trunk/testsuite/src/resources/testbeancluster/jbosscmp-jdbc.xml
===================================================================
--- trunk/testsuite/src/resources/testbeancluster/jbosscmp-jdbc.xml 2007-07-24 02:42:45 UTC (rev 64225)
+++ trunk/testsuite/src/resources/testbeancluster/jbosscmp-jdbc.xml 2007-07-24 02:43:10 UTC (rev 64226)
@@ -1,15 +0,0 @@
-<?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>
Deleted: trunk/testsuite/src/resources/testbeancluster/pooledha-ejb-jar.xml
===================================================================
--- trunk/testsuite/src/resources/testbeancluster/pooledha-ejb-jar.xml 2007-07-24 02:42:45 UTC (rev 64225)
+++ trunk/testsuite/src/resources/testbeancluster/pooledha-ejb-jar.xml 2007-07-24 02:43:10 UTC (rev 64226)
@@ -1,54 +0,0 @@
-<?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.testbeancluster.interfaces.StatelessSessionHome</home>
- <remote>org.jboss.test.testbeancluster.interfaces.StatelessSession</remote>
- <ejb-class>org.jboss.test.testbeancluster.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.testbeancluster.interfaces.StatelessSessionHome</home>
- <remote>org.jboss.test.testbeancluster.interfaces.StatelessSession</remote>
- <ejb-class>org.jboss.test.testbeancluster.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.testbeancluster.interfaces.StatefulSession</remote>
- <ejb-class>org.jboss.test.testbeancluster.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>
Deleted: trunk/testsuite/src/resources/testbeancluster/pooledha-jboss.xml
===================================================================
--- trunk/testsuite/src/resources/testbeancluster/pooledha-jboss.xml 2007-07-24 02:42:45 UTC (rev 64225)
+++ trunk/testsuite/src/resources/testbeancluster/pooledha-jboss.xml 2007-07-24 02:43:10 UTC (rev 64226)
@@ -1,127 +0,0 @@
-<?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>
Deleted: trunk/testsuite/src/resources/testbeancluster/retry-application.xml
===================================================================
--- trunk/testsuite/src/resources/testbeancluster/retry-application.xml 2007-07-24 02:42:45 UTC (rev 64225)
+++ trunk/testsuite/src/resources/testbeancluster/retry-application.xml 2007-07-24 02:43:10 UTC (rev 64226)
@@ -1,8 +0,0 @@
-<?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
Deleted: trunk/testsuite/src/resources/testbeancluster/retry-ejb-jar.xml
===================================================================
--- trunk/testsuite/src/resources/testbeancluster/retry-ejb-jar.xml 2007-07-24 02:42:45 UTC (rev 64225)
+++ trunk/testsuite/src/resources/testbeancluster/retry-ejb-jar.xml 2007-07-24 02:43:10 UTC (rev 64226)
@@ -1,140 +0,0 @@
-<?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.testbeancluster.interfaces.StatelessSessionHome</home>
- <remote>org.jboss.test.testbeancluster.interfaces.StatelessSession</remote>
- <ejb-class>org.jboss.test.testbeancluster.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.testbeancluster.interfaces.StatelessSessionHome</home>
- <remote>org.jboss.test.testbeancluster.interfaces.StatelessSession</remote>
- <ejb-class>org.jboss.test.testbeancluster.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.testbeancluster.interfaces.StatefulSession</remote>
- <ejb-class>org.jboss.test.testbeancluster.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.testbeancluster.interfaces.StatefulSession</remote>
- <ejb-class>org.jboss.test.testbeancluster.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>
Deleted: trunk/testsuite/src/resources/testbeancluster/retry-jboss.xml
===================================================================
--- trunk/testsuite/src/resources/testbeancluster/retry-jboss.xml 2007-07-24 02:42:45 UTC (rev 64225)
+++ trunk/testsuite/src/resources/testbeancluster/retry-jboss.xml 2007-07-24 02:43:10 UTC (rev 64226)
@@ -1,337 +0,0 @@
-<?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>
Deleted: trunk/testsuite/src/resources/testbeancluster/retry-jbosscmp-jdbc.xml
===================================================================
--- trunk/testsuite/src/resources/testbeancluster/retry-jbosscmp-jdbc.xml 2007-07-24 02:42:45 UTC (rev 64225)
+++ trunk/testsuite/src/resources/testbeancluster/retry-jbosscmp-jdbc.xml 2007-07-24 02:43:10 UTC (rev 64226)
@@ -1,15 +0,0 @@
-<?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>
More information about the jboss-cvs-commits
mailing list