[jboss-cvs] JBossAS SVN: r67631 - in trunk/testsuite/src/resources/cluster: ejb2/basic/META-INF and 1 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Thu Nov 29 17:43:50 EST 2007


Author: bstansberry at jboss.com
Date: 2007-11-29 17:43:50 -0500 (Thu, 29 Nov 2007)
New Revision: 67631

Modified:
   trunk/testsuite/src/resources/cluster/ejb2/basic/META-INF/jboss.xml
   trunk/testsuite/src/resources/cluster/ejb2/basic/retry-jboss.xml
   trunk/testsuite/src/resources/cluster/partition/META-INF/jboss.xml
Log:
Fix container-configuration configs to not assume any hard-coded defaults -- they don't exist with unified metadata

Modified: trunk/testsuite/src/resources/cluster/ejb2/basic/META-INF/jboss.xml
===================================================================
--- trunk/testsuite/src/resources/cluster/ejb2/basic/META-INF/jboss.xml	2007-11-29 21:53:19 UTC (rev 67630)
+++ trunk/testsuite/src/resources/cluster/ejb2/basic/META-INF/jboss.xml	2007-11-29 22:43:50 UTC (rev 67631)
@@ -8,10 +8,10 @@
    <enterprise-beans>
       <session>
          <ejb-name>nextgen_StatelessSession</ejb-name>
-         <configuration-name>Clustered Stateless SessionBean</configuration-name>
+         <configuration-name>Test Clustered Stateless SessionBean</configuration-name>
          <invoker-bindings>
             <invoker>
-               <invoker-proxy-binding-name>clustered-stateless-rmi-invoker</invoker-proxy-binding-name>
+               <invoker-proxy-binding-name>test-clustered-stateless-invoker</invoker-proxy-binding-name>
                <jndi-name>nextgen_StatelessSession</jndi-name>
             </invoker>
          </invoker-bindings>
@@ -19,10 +19,10 @@
       </session>
       <session>
          <ejb-name>nextgen_StatefulSession</ejb-name>
-         <configuration-name>Clustered Stateful SessionBean</configuration-name>
+         <configuration-name>Test Clustered Stateful SessionBean</configuration-name>
          <invoker-bindings>
             <invoker>
-               <invoker-proxy-binding-name>clustered-stateful-rmi-invoker</invoker-proxy-binding-name>
+               <invoker-proxy-binding-name>test-clustered-stateful-invoker</invoker-proxy-binding-name>
                <jndi-name>nextgen_StatefulSession</jndi-name>
             </invoker>
          </invoker-bindings>
@@ -30,10 +30,10 @@
       </session>
       <session>
          <ejb-name>ExpiredStatefulSession</ejb-name>
-         <configuration-name>Clustered Expired Stateful SessionBean</configuration-name>
+         <configuration-name>Test Clustered Expired Stateful SessionBean</configuration-name>
          <invoker-bindings>
             <invoker>
-               <invoker-proxy-binding-name>clustered-stateful-rmi-invoker</invoker-proxy-binding-name>
+               <invoker-proxy-binding-name>test-clustered-stateful-invoker</invoker-proxy-binding-name>
                <jndi-name>nextgen_ExpiredStatefulSession</jndi-name>
             </invoker>
          </invoker-bindings>
@@ -41,10 +41,10 @@
       </session>
       <session>
          <ejb-name>nextgen_TxSession</ejb-name>
-         <configuration-name>Clustered Stateless SessionBean</configuration-name>
+         <configuration-name>Test Clustered Stateless SessionBean</configuration-name>
          <invoker-bindings>
             <invoker>
-               <invoker-proxy-binding-name>clustered-stateless-rmi-invoker</invoker-proxy-binding-name>
+               <invoker-proxy-binding-name>test-clustered-stateless-invoker</invoker-proxy-binding-name>
                <jndi-name>nextgen_TxSession</jndi-name>
             </invoker>
          </invoker-bindings>
@@ -52,10 +52,10 @@
       </session>
       <entity>
          <ejb-name>nextgen_EnterpriseEntity</ejb-name>
-         <configuration-name>Clustered CMP EntityBean</configuration-name>
+         <configuration-name>Test Clustered CMP EntityBean</configuration-name>
          <invoker-bindings>
             <invoker>
-               <invoker-proxy-binding-name>clustered-entity-rmi-invoker</invoker-proxy-binding-name>
+               <invoker-proxy-binding-name>test-clustered-entity-invoker</invoker-proxy-binding-name>
                <jndi-name>nextgen_EnterpriseEntity</jndi-name>
             </invoker>
          </invoker-bindings>
@@ -63,10 +63,10 @@
       </entity>
       <entity>
          <ejb-name>nextgen_EntityBMP</ejb-name>
-         <configuration-name>Clustered BMP EntityBean</configuration-name>
+         <configuration-name>Test Clustered BMP EntityBean</configuration-name>
          <invoker-bindings>
             <invoker>
-               <invoker-proxy-binding-name>clustered-entity-rmi-invoker</invoker-proxy-binding-name>
+               <invoker-proxy-binding-name>test-clustered-entity-invoker</invoker-proxy-binding-name>
                <jndi-name>nextgen_EntityBMP</jndi-name>
             </invoker>
          </invoker-bindings>
@@ -74,10 +74,10 @@
       </entity>
       <entity>
          <ejb-name>nextgen_EntityPK</ejb-name>
-         <configuration-name>Clustered CMP EntityBean</configuration-name>
+         <configuration-name>Test Clustered CMP EntityBean</configuration-name>
          <invoker-bindings>
             <invoker>
-               <invoker-proxy-binding-name>clustered-entity-rmi-invoker</invoker-proxy-binding-name>
+               <invoker-proxy-binding-name>test-clustered-entity-invoker</invoker-proxy-binding-name>
                <jndi-name>nextgen_EntityPK</jndi-name>
             </invoker>
          </invoker-bindings>
@@ -89,7 +89,7 @@
    <invoker-proxy-bindings>
       <!-- Override default clustered invoker bindings -->
       <invoker-proxy-binding>
-         <name>clustered-entity-rmi-invoker</name>
+         <name>test-clustered-entity-invoker</name>
          <invoker-mbean>jboss:service=invoker,type=unifiedha</invoker-mbean>
          <proxy-factory>org.jboss.proxy.ejb.ProxyFactoryHA</proxy-factory>
          <proxy-factory-config>
@@ -120,7 +120,7 @@
       </invoker-proxy-binding>
 
       <invoker-proxy-binding>
-         <name>clustered-stateless-rmi-invoker</name>
+         <name>test-clustered-stateless-invoker</name>
          <invoker-mbean>jboss:service=invoker,type=unifiedha</invoker-mbean>
          <proxy-factory>org.jboss.proxy.ejb.ProxyFactoryHA</proxy-factory>
          <proxy-factory-config>
@@ -144,7 +144,7 @@
       </invoker-proxy-binding>
 
       <invoker-proxy-binding>
-         <name>clustered-stateful-rmi-invoker</name>
+         <name>test-clustered-stateful-invoker</name>
          <invoker-mbean>jboss:service=invoker,type=unifiedha</invoker-mbean>
          <proxy-factory>org.jboss.proxy.ejb.ProxyFactoryHA</proxy-factory>
          <proxy-factory-config>
@@ -170,8 +170,8 @@
 
 
    <container-configurations>
-      <container-configuration>
-         <container-name>Clustered CMP EntityBean</container-name>
+      <container-configuration extends="Clustered CMP EntityBean">
+         <container-name>Test Clustered CMP EntityBean</container-name>
          <call-logging>true</call-logging>
          <container-interceptors>
             <interceptor>org.jboss.ejb.plugins.ProxyFactoryFinderInterceptor</interceptor>
@@ -192,8 +192,8 @@
          <commit-option>A</commit-option>
       </container-configuration>
 
-      <container-configuration>
-         <container-name>Clustered Stateless SessionBean</container-name>
+      <container-configuration extends="Clustered Stateless SessionBean">
+         <container-name>Test Clustered Stateless SessionBean</container-name>
          <call-logging>true</call-logging>
          <container-interceptors>
             <interceptor>org.jboss.ejb.plugins.ProxyFactoryFinderInterceptor</interceptor>
@@ -212,8 +212,8 @@
          </container-interceptors>
       </container-configuration>
 
-      <container-configuration>
-         <container-name>Clustered Stateful SessionBean</container-name>
+      <container-configuration extends="Clustered Stateful SessionBean">
+         <container-name>Test Clustered Stateful SessionBean</container-name>
          <call-logging>true</call-logging>
          <container-interceptors>
             <interceptor>org.jboss.ejb.plugins.ProxyFactoryFinderInterceptor</interceptor>
@@ -234,7 +234,24 @@
       </container-configuration>
 
       <container-configuration extends="Clustered Stateful SessionBean">
-         <container-name>Clustered Expired Stateful SessionBean</container-name>
+         <container-name>Test Clustered Expired 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-cache-conf>
             <cache-policy>org.jboss.ejb.plugins.LRUStatefulContextCachePolicy</cache-policy>
             <cache-policy-conf>
@@ -255,8 +272,8 @@
          </cluster-config>
       </container-configuration>
 
-      <container-configuration>
-         <container-name>Clustered BMP EntityBean</container-name>
+      <container-configuration extends="Clustered BMP EntityBean">
+         <container-name>Test Clustered BMP EntityBean</container-name>
          <call-logging>true</call-logging>
          <container-interceptors>
             <interceptor>org.jboss.ejb.plugins.ProxyFactoryFinderInterceptor</interceptor>

Modified: trunk/testsuite/src/resources/cluster/ejb2/basic/retry-jboss.xml
===================================================================
--- trunk/testsuite/src/resources/cluster/ejb2/basic/retry-jboss.xml	2007-11-29 21:53:19 UTC (rev 67630)
+++ trunk/testsuite/src/resources/cluster/ejb2/basic/retry-jboss.xml	2007-11-29 22:43:50 UTC (rev 67631)
@@ -8,7 +8,7 @@
    <enterprise-beans>
       <session>
          <ejb-name>nextgen_StatelessSession_Retry</ejb-name>
-         <configuration-name>Clustered Stateless SessionBean</configuration-name>
+         <configuration-name>Retry Clustered Stateless SessionBean</configuration-name>
          <invoker-bindings>
             <invoker>
                <invoker-proxy-binding-name>clustered-stateless-rmi-invoker-retry</invoker-proxy-binding-name>
@@ -19,7 +19,7 @@
       </session>
       <session>
          <ejb-name>nextgen_StatelessSession_SingleRetry</ejb-name>
-         <configuration-name>Clustered Stateless SessionBean</configuration-name>
+         <configuration-name>Retry Clustered Stateless SessionBean</configuration-name>
          <invoker-bindings>
             <invoker>
                <invoker-proxy-binding-name>clustered-stateless-rmi-invoker-singleretry</invoker-proxy-binding-name>
@@ -30,7 +30,7 @@
       </session>
       <session>
          <ejb-name>nextgen_StatefulSession_Retry</ejb-name>
-         <configuration-name>Clustered Stateful SessionBean</configuration-name>
+         <configuration-name>Retry Clustered Stateful SessionBean</configuration-name>
          <invoker-bindings>
             <invoker>
                <invoker-proxy-binding-name>clustered-stateful-rmi-invoker-retry</invoker-proxy-binding-name>
@@ -41,7 +41,7 @@
       </session>
       <session>
          <ejb-name>nextgen_StatefulSession_SingleRetry</ejb-name>
-         <configuration-name>Clustered Stateful SessionBean</configuration-name>
+         <configuration-name>Retry Clustered Stateful SessionBean</configuration-name>
          <invoker-bindings>
             <invoker>
                <invoker-proxy-binding-name>clustered-stateful-rmi-invoker-singleretry</invoker-proxy-binding-name>
@@ -53,7 +53,7 @@
       
       <entity>
          <ejb-name>nextgen_EntityPK_Retry</ejb-name>
-         <configuration-name>Clustered CMP EntityBean</configuration-name>
+         <configuration-name>Retry Clustered CMP EntityBean</configuration-name>
          <invoker-bindings>
             <invoker>
                <invoker-proxy-binding-name>clustered-entity-rmi-invoker-retry</invoker-proxy-binding-name>
@@ -65,7 +65,7 @@
       
       <entity>
          <ejb-name>nextgen_EntityPK_SingleRetry</ejb-name>
-         <configuration-name>Clustered CMP EntityBean</configuration-name>
+         <configuration-name>Retry Clustered CMP EntityBean</configuration-name>
          <invoker-bindings>
             <invoker>
                <invoker-proxy-binding-name>clustered-entity-rmi-invoker-singleretry</invoker-proxy-binding-name>
@@ -270,8 +270,8 @@
 
 
    <container-configurations>
-      <container-configuration>
-         <container-name>Clustered CMP EntityBean</container-name>
+      <container-configuration extends="Clustered CMP EntityBean">
+         <container-name>Retry Clustered CMP EntityBean</container-name>
          <call-logging>true</call-logging>
          <container-interceptors>
             <interceptor>org.jboss.ejb.plugins.ProxyFactoryFinderInterceptor</interceptor>
@@ -291,8 +291,8 @@
          <commit-option>A</commit-option>
       </container-configuration>
 
-      <container-configuration>
-         <container-name>Clustered Stateless SessionBean</container-name>
+      <container-configuration extends="Clustered Stateless SessionBean">
+         <container-name>Retry Clustered Stateless SessionBean</container-name>
          <call-logging>true</call-logging>
          <container-interceptors>
             <interceptor>org.jboss.ejb.plugins.ProxyFactoryFinderInterceptor</interceptor>
@@ -311,8 +311,8 @@
          </container-interceptors>
       </container-configuration>
 
-      <container-configuration>
-         <container-name>Clustered Stateful SessionBean</container-name>
+      <container-configuration extends="Clustered Stateful SessionBean">
+         <container-name>Retry Clustered Stateful SessionBean</container-name>
          <call-logging>true</call-logging>
          <container-interceptors>
             <interceptor>org.jboss.ejb.plugins.ProxyFactoryFinderInterceptor</interceptor>

Modified: trunk/testsuite/src/resources/cluster/partition/META-INF/jboss.xml
===================================================================
--- trunk/testsuite/src/resources/cluster/partition/META-INF/jboss.xml	2007-11-29 21:53:19 UTC (rev 67630)
+++ trunk/testsuite/src/resources/cluster/partition/META-INF/jboss.xml	2007-11-29 22:43:50 UTC (rev 67631)
@@ -8,7 +8,7 @@
    <enterprise-beans>
       <session>
          <ejb-name>nextgen_StatelessSession</ejb-name>
-         <configuration-name>Clustered Stateless SessionBean</configuration-name>
+         <configuration-name>Restart Clustered Stateless SessionBean</configuration-name>
          <invoker-bindings>
             <invoker>
                <invoker-proxy-binding-name>clustered-stateless-restart-invoker</invoker-proxy-binding-name>
@@ -22,7 +22,7 @@
       </session>
       <session>
          <ejb-name>nextgen_StatefulSession</ejb-name>
-         <configuration-name>Clustered Stateful SessionBean</configuration-name>
+         <configuration-name>Restart Clustered Stateful SessionBean</configuration-name>
          <invoker-bindings>
             <invoker>
                <invoker-proxy-binding-name>clustered-stateful-restart-invoker</invoker-proxy-binding-name>
@@ -36,7 +36,7 @@
       </session>
       <session>
          <ejb-name>ExpiredStatefulSession</ejb-name>
-         <configuration-name>Clustered Expired Stateful SessionBean</configuration-name>
+         <configuration-name>Restart Clustered Expired Stateful SessionBean</configuration-name>
          <invoker-bindings>
             <invoker>
                <invoker-proxy-binding-name>clustered-stateful-restart-invoker</invoker-proxy-binding-name>
@@ -50,7 +50,7 @@
       </session>
       <session>
          <ejb-name>nextgen_TxSession</ejb-name>
-         <configuration-name>Clustered Stateless SessionBean</configuration-name>
+         <configuration-name>Restart Clustered Stateless SessionBean</configuration-name>
          <invoker-bindings>
             <invoker>
                <invoker-proxy-binding-name>clustered-stateless-restart-invoker</invoker-proxy-binding-name>
@@ -64,7 +64,7 @@
       </session>
       <entity>
          <ejb-name>nextgen_EnterpriseEntity</ejb-name>
-         <configuration-name>Clustered CMP EntityBean</configuration-name>
+         <configuration-name>Restart Clustered CMP EntityBean</configuration-name>
          <invoker-bindings>
             <invoker>
                <invoker-proxy-binding-name>clustered-entity-restart-invoker</invoker-proxy-binding-name>
@@ -78,7 +78,7 @@
       </entity>
       <entity>
          <ejb-name>nextgen_EntityBMP</ejb-name>
-         <configuration-name>Clustered BMP EntityBean</configuration-name>
+         <configuration-name>Restart Clustered BMP EntityBean</configuration-name>
          <invoker-bindings>
             <invoker>
                <invoker-proxy-binding-name>clustered-entity-restart-invoker</invoker-proxy-binding-name>
@@ -92,7 +92,7 @@
       </entity>
       <entity>
          <ejb-name>nextgen_EntityPK</ejb-name>
-         <configuration-name>Clustered CMP EntityBean</configuration-name>
+         <configuration-name>Restart Clustered CMP EntityBean</configuration-name>
          <invoker-bindings>
             <invoker>
                <invoker-proxy-binding-name>clustered-entity-restart-invoker</invoker-proxy-binding-name>
@@ -191,8 +191,8 @@
 
 
    <container-configurations>
-      <container-configuration>
-         <container-name>Clustered CMP EntityBean</container-name>
+      <container-configuration extends="Clustered CMP EntityBean">
+         <container-name>Restart Clustered CMP EntityBean</container-name>
          <call-logging>true</call-logging>
          <container-interceptors>
             <interceptor>org.jboss.ejb.plugins.ProxyFactoryFinderInterceptor</interceptor>
@@ -213,8 +213,8 @@
          <commit-option>A</commit-option>
       </container-configuration>
 
-      <container-configuration>
-         <container-name>Clustered Stateless SessionBean</container-name>
+      <container-configuration extends="Clustered Stateless SessionBean">
+         <container-name>Restart Clustered Stateless SessionBean</container-name>
          <call-logging>true</call-logging>
          <container-interceptors>
             <interceptor>org.jboss.ejb.plugins.ProxyFactoryFinderInterceptor</interceptor>
@@ -233,8 +233,8 @@
          </container-interceptors>
       </container-configuration>
 
-      <container-configuration>
-         <container-name>Clustered Stateful SessionBean</container-name>
+      <container-configuration extends="Clustered Stateful SessionBean">
+         <container-name>Restart Clustered Stateful SessionBean</container-name>
          <call-logging>true</call-logging>
          <container-interceptors>
             <interceptor>org.jboss.ejb.plugins.ProxyFactoryFinderInterceptor</interceptor>
@@ -255,7 +255,24 @@
       </container-configuration>
 
       <container-configuration extends="Clustered Stateful SessionBean">
-         <container-name>Clustered Expired Stateful SessionBean</container-name>
+         <container-name>Restart Clustered Expired 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-cache-conf>
             <cache-policy>org.jboss.ejb.plugins.LRUStatefulContextCachePolicy</cache-policy>
             <cache-policy-conf>
@@ -276,8 +293,8 @@
          </cluster-config>
       </container-configuration>
 
-      <container-configuration>
-         <container-name>Clustered BMP EntityBean</container-name>
+      <container-configuration extends="Clustered BMP EntityBean">
+         <container-name>Restart Clustered BMP EntityBean</container-name>
          <call-logging>true</call-logging>
          <container-interceptors>
             <interceptor>org.jboss.ejb.plugins.ProxyFactoryFinderInterceptor</interceptor>




More information about the jboss-cvs-commits mailing list