[jboss-cvs] JBossAS SVN: r63814 - in trunk/testsuite: src/main/org/jboss/test/cluster/partition/test and 2 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Tue Jul 3 23:58:49 EDT 2007


Author: bstansberry at jboss.com
Date: 2007-07-03 23:58:49 -0400 (Tue, 03 Jul 2007)
New Revision: 63814

Added:
   trunk/testsuite/src/resources/cluster/partition/META-INF/ejb-jar.xml
   trunk/testsuite/src/resources/cluster/partition/META-INF/jboss.xml
   trunk/testsuite/src/resources/cluster/partition/partition-restart-beans.xml
Modified:
   trunk/testsuite/imports/sections/cluster.xml
   trunk/testsuite/src/main/org/jboss/test/cluster/partition/test/PartitionRestartUnitTestCase.java
Log:
[JBAS-4512] PartitionRestartUnitTestCase should have its own Partition

Modified: trunk/testsuite/imports/sections/cluster.xml
===================================================================
--- trunk/testsuite/imports/sections/cluster.xml	2007-07-04 03:58:45 UTC (rev 63813)
+++ trunk/testsuite/imports/sections/cluster.xml	2007-07-04 03:58:49 UTC (rev 63814)
@@ -56,8 +56,29 @@
           <include name="org/jboss/test/cluster/partition/*"/>
        </fileset>
     </jar>
+      
+      <!-- MC beans for testing partition restart -->
+      <copy todir="${build.lib}"
+         file="${build.resources}/cluster/partition/partition-restart-beans.xml"
+         overwrite="true"/>
+      
+      <!-- EJBs for testing partition restart -->
+      <jar destfile="${build.lib}/partition-restart.jar">
+         <fileset dir="${build.classes}">
+            <patternset refid="jboss.test.util.ejb.set"/>
+            <include name="org/jboss/test/testbean/interfaces/**"/>
+            <include name="org/jboss/test/testbeancluster/interfaces/**"/>
+            <include name="org/jboss/test/testbean/bean/**"/>
+            <include name="org/jboss/test/testbeancluster/bean/**"/>
+            <include name="org/jboss/test/testbeancluster/proxy/**"/>
+            <include name="org/somepackage/**"/>
+         </fileset>
+         <fileset dir="${build.resources}/cluster/partition">
+            <include name="META-INF/*.xml"/>
+         </fileset>
+      </jar>
     
-    <!--beans for testing HASingletonElectionPolicy -->
+      <!--beans for testing HASingletonElectionPolicy -->
    	<copy todir="${build.lib}"
    	   file="${build.resources}/ha/electionpolicy/ha-electionpolicy-beans.xml"
    	   overwrite="true"/>

Modified: trunk/testsuite/src/main/org/jboss/test/cluster/partition/test/PartitionRestartUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/partition/test/PartitionRestartUnitTestCase.java	2007-07-04 03:58:45 UTC (rev 63813)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/partition/test/PartitionRestartUnitTestCase.java	2007-07-04 03:58:49 UTC (rev 63814)
@@ -56,7 +56,7 @@
 
    public static Test suite() throws Exception
    {
-      Test t1 = JBossClusteredTestCase.getDeploySetup(PartitionRestartUnitTestCase.class, "testbeancluster.jar");
+      Test t1 = JBossClusteredTestCase.getDeploySetup(PartitionRestartUnitTestCase.class, "partition-restart-beans.xml, partition-restart.jar");
       return t1;
    }   
    
@@ -127,7 +127,7 @@
    
    protected void restartPartition(RMIAdaptor adaptor) throws Exception
    {
-      ObjectName partition = new ObjectName("jboss:service=DefaultPartition");
+      ObjectName partition = new ObjectName("jboss:service=RestartPartition");
       
       Object[] params = new Object[0];
       String[] types = new String[0];

Added: trunk/testsuite/src/resources/cluster/partition/META-INF/ejb-jar.xml
===================================================================
--- trunk/testsuite/src/resources/cluster/partition/META-INF/ejb-jar.xml	                        (rev 0)
+++ trunk/testsuite/src/resources/cluster/partition/META-INF/ejb-jar.xml	2007-07-04 03:58:49 UTC (rev 63814)
@@ -0,0 +1,240 @@
+<?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</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</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 BMT stateful</description>
+         <ejb-name>BMTStateful</ejb-name>
+         <home>org.jboss.test.testbean.interfaces.BMTStatefulHome</home>
+         <remote>org.jboss.test.testbean.interfaces.BMTStateful</remote>
+         <ejb-class>org.jboss.test.testbean.bean.BMTStatefulBean</ejb-class>
+         <session-type>Stateful</session-type>
+         <transaction-type>Bean</transaction-type>
+         <resource-ref>
+            <description>A jdbc connection for the BMT bean</description>
+            <res-ref-name>jdbc/myDatabase</res-ref-name>
+            <res-type>javax.sql.DataSource</res-type>
+            <res-auth>Container</res-auth>
+         </resource-ref>
+      </session>
+      <session>
+         <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>
+         <session-type>Stateful</session-type>
+         <transaction-type>Container</transaction-type>
+      </session>
+      <session>
+         <description>Nextgen test bean BMT stateless</description>
+         <ejb-name>BMTStateless</ejb-name>
+         <home>org.jboss.test.testbean.interfaces.BMTStatelessHome</home>
+         <remote>org.jboss.test.testbean.interfaces.BMTStateless</remote>
+         <ejb-class>org.jboss.test.testbean.bean.BMTStatelessBean</ejb-class>
+         <session-type>Stateless</session-type>
+         <transaction-type>Bean</transaction-type>
+      </session>
+      <session>
+         <description>Nextgen test bean TX stateful</description>
+         <ejb-name>nextgen_TxSession</ejb-name>
+         <home>org.jboss.test.testbean.interfaces.TxSessionHome</home>
+         <remote>org.jboss.test.testbean.interfaces.TxSession</remote>
+         <ejb-class>org.jboss.test.testbean.bean.TxSessionBean</ejb-class>
+         <session-type>Stateless</session-type>
+         <transaction-type>Container</transaction-type>
+      </session>
+      <entity>
+         <description>Nextgen test bean entity </description>
+         <ejb-name>nextgen_EnterpriseEntity</ejb-name>
+         <home>org.jboss.test.testbean.interfaces.EnterpriseEntityHome</home>
+         <remote>org.jboss.test.testbean.interfaces.EnterpriseEntity</remote>
+         <ejb-class>org.jboss.test.testbean.bean.EnterpriseEntityBean</ejb-class>
+         <persistence-type>Container</persistence-type>
+         <prim-key-class>java.lang.String</prim-key-class>
+         <reentrant>False</reentrant>
+         <cmp-version>1.x</cmp-version>
+         <cmp-field>
+            <field-name>name</field-name>
+         </cmp-field>
+         <cmp-field>
+            <field-name>otherField</field-name>
+         </cmp-field>
+         <primkey-field>name</primkey-field>
+      </entity>
+
+      <entity>
+         <description>Nextgen BMP bean</description>
+         <ejb-name>nextgen_EntityBMP</ejb-name>
+         <home>org.jboss.test.testbean.interfaces.EntityBMPHome</home>
+         <remote>org.jboss.test.testbean.interfaces.EntityBMP</remote>
+         <ejb-class>org.jboss.test.testbean.bean.EntityBMPBean</ejb-class>
+         <persistence-type>Bean</persistence-type>
+         <prim-key-class>java.lang.String</prim-key-class>
+         <reentrant>False</reentrant>
+         <primkey-field>name</primkey-field>
+         <ejb-ref>
+            <description>An EJB ref for this bean to test</description>
+            <ejb-ref-name>ejb/myEJBRef</ejb-ref-name>
+            <ejb-ref-type>Session</ejb-ref-type>
+            <home>org.jboss.test.testbean.interfaces.StatelessSessionHome</home>
+            <remote>org.jboss.test.testbean.interfaces.StatelessSession</remote>
+            <ejb-link>nextgen_StatelessSession</ejb-link>
+         </ejb-ref>
+         <resource-ref>
+            <description>A jdbc connection for the BMP bean</description>
+            <res-ref-name>jdbc/myDatabase</res-ref-name>
+            <res-type>javax.sql.DataSource</res-type>
+            <res-auth>Container</res-auth>
+         </resource-ref>
+      </entity>
+
+      <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>
+         <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>EntityPK</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>nextgen_EnterpriseEntity</ejb-name>
+            <method-name>*</method-name>
+         </method>
+         <method>
+            <ejb-name>nextgen_EntityBMP</ejb-name>
+            <method-name>*</method-name>
+         </method>
+         <method>
+            <ejb-name>nextgen_StatefulSession</ejb-name>
+            <method-name>*</method-name>
+         </method>
+         <method>
+            <ejb-name>nextgen_StatelessSession</ejb-name>
+            <method-name>*</method-name>
+         </method>
+         <method>
+            <ejb-name>nextgen_EntityPK</ejb-name>
+            <method-name>*</method-name>
+         </method>
+         <method>
+            <ejb-name>nextgen_TxSession</ejb-name>
+            <method-name>txRequired</method-name>
+         </method>
+         <trans-attribute>Required</trans-attribute>
+      </container-transaction>
+
+
+      <container-transaction>
+         <method>
+            <ejb-name>nextgen_TxSession</ejb-name>
+            <method-name>requiredToSupports</method-name>
+         </method>
+         <trans-attribute>Required</trans-attribute>
+      </container-transaction>
+      <container-transaction>
+         <method>
+            <ejb-name>nextgen_TxSession</ejb-name>
+            <method-name>requiredToNotSupported</method-name>
+         </method>
+         <trans-attribute>Required</trans-attribute>
+      </container-transaction>
+      <container-transaction>
+         <method>
+            <ejb-name>nextgen_TxSession</ejb-name>
+            <method-name>requiredToRequiresNew</method-name>
+         </method>
+         <trans-attribute>Required</trans-attribute>
+      </container-transaction>
+
+      <container-transaction>
+         <method>
+            <ejb-name>nextgen_TxSession</ejb-name>
+            <method-name>txSupports</method-name>
+         </method>
+         <trans-attribute>Supports</trans-attribute>
+      </container-transaction>
+
+      <container-transaction>
+         <method>
+            <ejb-name>nextgen_TxSession</ejb-name>
+            <method-name>txMandatory</method-name>
+         </method>
+         <trans-attribute>Mandatory</trans-attribute>
+      </container-transaction>
+
+      <container-transaction>
+         <method>
+            <ejb-name>nextgen_TxSession</ejb-name>
+            <method-name>txRequiresNew</method-name>
+         </method>
+         <trans-attribute>REQUIRESNEW</trans-attribute>
+      </container-transaction>
+
+      <container-transaction>
+         <method>
+            <ejb-name>nextgen_TxSession</ejb-name>
+            <method-name>txNever</method-name>
+         </method>
+         <trans-attribute>Never</trans-attribute>
+      </container-transaction>
+
+      <container-transaction>
+         <method>
+            <ejb-name>nextgen_TxSession</ejb-name>
+            <method-name>txNotSupported</method-name>
+         </method>
+         <trans-attribute>Not_Supported</trans-attribute>
+      </container-transaction>
+
+   </assembly-descriptor>
+</ejb-jar>


Property changes on: trunk/testsuite/src/resources/cluster/partition/META-INF/ejb-jar.xml
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + native

Added: trunk/testsuite/src/resources/cluster/partition/META-INF/jboss.xml
===================================================================
--- trunk/testsuite/src/resources/cluster/partition/META-INF/jboss.xml	                        (rev 0)
+++ trunk/testsuite/src/resources/cluster/partition/META-INF/jboss.xml	2007-07-04 03:58:49 UTC (rev 63814)
@@ -0,0 +1,301 @@
+<?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</ejb-name>
+         <configuration-name>Clustered Stateless SessionBean</configuration-name>
+         <invoker-bindings>
+            <invoker>
+               <invoker-proxy-binding-name>clustered-stateless-restart-invoker</invoker-proxy-binding-name>
+               <jndi-name>nextgen_StatelessSession</jndi-name>
+            </invoker>
+         </invoker-bindings>
+         <clustered>true</clustered>
+         <cluster-config>
+            <partition-name>RestartPartition</partition-name>
+         </cluster-config>
+      </session>
+      <session>
+         <ejb-name>nextgen_StatefulSession</ejb-name>
+         <configuration-name>Clustered Stateful SessionBean</configuration-name>
+         <invoker-bindings>
+            <invoker>
+               <invoker-proxy-binding-name>clustered-stateful-restart-invoker</invoker-proxy-binding-name>
+               <jndi-name>nextgen_StatefulSession</jndi-name>
+            </invoker>
+         </invoker-bindings>
+         <clustered>true</clustered>
+         <cluster-config>
+            <partition-name>RestartPartition</partition-name>
+         </cluster-config>
+      </session>
+      <session>
+         <ejb-name>ExpiredStatefulSession</ejb-name>
+         <configuration-name>Clustered Expired Stateful SessionBean</configuration-name>
+         <invoker-bindings>
+            <invoker>
+               <invoker-proxy-binding-name>clustered-stateful-restart-invoker</invoker-proxy-binding-name>
+               <jndi-name>nextgen_ExpiredStatefulSession</jndi-name>
+            </invoker>
+         </invoker-bindings>
+         <clustered>true</clustered>
+         <cluster-config>
+            <partition-name>RestartPartition</partition-name>
+         </cluster-config>
+      </session>
+      <session>
+         <ejb-name>nextgen_TxSession</ejb-name>
+         <configuration-name>Clustered Stateless SessionBean</configuration-name>
+         <invoker-bindings>
+            <invoker>
+               <invoker-proxy-binding-name>clustered-stateless-restart-invoker</invoker-proxy-binding-name>
+               <jndi-name>nextgen_TxSession</jndi-name>
+            </invoker>
+         </invoker-bindings>
+         <clustered>true</clustered>
+         <cluster-config>
+            <partition-name>RestartPartition</partition-name>
+         </cluster-config>
+      </session>
+      <entity>
+         <ejb-name>nextgen_EnterpriseEntity</ejb-name>
+         <configuration-name>Clustered CMP EntityBean</configuration-name>
+         <invoker-bindings>
+            <invoker>
+               <invoker-proxy-binding-name>clustered-entity-restart-invoker</invoker-proxy-binding-name>
+               <jndi-name>nextgen_EnterpriseEntity</jndi-name>
+            </invoker>
+         </invoker-bindings>
+         <clustered>true</clustered>
+         <cluster-config>
+            <partition-name>RestartPartition</partition-name>
+         </cluster-config>
+      </entity>
+      <entity>
+         <ejb-name>nextgen_EntityBMP</ejb-name>
+         <configuration-name>Clustered BMP EntityBean</configuration-name>
+         <invoker-bindings>
+            <invoker>
+               <invoker-proxy-binding-name>clustered-entity-restart-invoker</invoker-proxy-binding-name>
+               <jndi-name>nextgen_EntityBMP</jndi-name>
+            </invoker>
+         </invoker-bindings>
+         <clustered>true</clustered>
+         <cluster-config>
+            <partition-name>RestartPartition</partition-name>
+         </cluster-config>
+      </entity>
+      <entity>
+         <ejb-name>nextgen_EntityPK</ejb-name>
+         <configuration-name>Clustered CMP EntityBean</configuration-name>
+         <invoker-bindings>
+            <invoker>
+               <invoker-proxy-binding-name>clustered-entity-restart-invoker</invoker-proxy-binding-name>
+               <jndi-name>nextgen_EntityPK</jndi-name>
+            </invoker>
+         </invoker-bindings>
+         <clustered>true</clustered>
+         <cluster-config>
+            <partition-name>RestartPartition</partition-name>
+         </cluster-config>
+      </entity>
+
+   </enterprise-beans>
+
+   <invoker-proxy-bindings>
+      <!-- Override default clustered invoker bindings -->
+      <invoker-proxy-binding>
+         <name>clustered-entity-restart-invoker</name>
+         <invoker-mbean>jboss:service=invoker,type=unifiedha,partitionName=RestartPartition</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.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.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.invocation.InvokerInterceptor</interceptor>
+               </list-entity>
+            </client-interceptors>
+         </proxy-factory-config>
+      </invoker-proxy-binding>
+
+      <invoker-proxy-binding>
+         <name>clustered-stateless-restart-invoker</name>
+         <invoker-mbean>jboss:service=invoker,type=unifiedha,partitionName=RestartPartition</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.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>clustered-stateful-restart-invoker</name>
+         <invoker-mbean>jboss:service=invoker,type=unifiedha,partitionName=RestartPartition</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.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-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>
+            <interceptor>org.jboss.ejb.plugins.cmp.jdbc.JDBCRelationInterceptor</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-configuration extends="Clustered Stateful SessionBean">
+         <container-name>Clustered Expired Stateful SessionBean</container-name>
+         <container-cache-conf>
+            <cache-policy>org.jboss.ejb.plugins.LRUStatefulContextCachePolicy</cache-policy>
+            <cache-policy-conf>
+               <min-capacity>50</min-capacity>
+               <max-capacity>1000000</max-capacity>
+               <remover-period>5</remover-period>
+               <max-bean-life>30</max-bean-life>
+               <overager-period>2</overager-period>
+               <max-bean-age>5</max-bean-age>
+               <resizer-period>1</resizer-period>
+               <max-cache-miss-period>60</max-cache-miss-period>
+               <min-cache-miss-period>1</min-cache-miss-period>
+               <cache-load-factor>0.75</cache-load-factor>
+            </cache-policy-conf>
+         </container-cache-conf>
+         <cluster-config>
+            <bean-load-balance-policy>org.jboss.ha.framework.interfaces.RandomRobin</bean-load-balance-policy>
+         </cluster-config>
+      </container-configuration>
+
+      <container-configuration>
+         <container-name>Clustered BMP 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-configurations>
+
+</jboss>


Property changes on: trunk/testsuite/src/resources/cluster/partition/META-INF/jboss.xml
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + native

Added: trunk/testsuite/src/resources/cluster/partition/partition-restart-beans.xml
===================================================================
--- trunk/testsuite/src/resources/cluster/partition/partition-restart-beans.xml	                        (rev 0)
+++ trunk/testsuite/src/resources/cluster/partition/partition-restart-beans.xml	2007-07-04 03:58:49 UTC (rev 63814)
@@ -0,0 +1,261 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+   
+   <!-- ==================================================================== -->
+   <!-- Shared cache for JBoss cluster services                              -->
+   <!-- ==================================================================== -->
+   
+   <!-- 
+        The HAPartitionCache instance defined here is shared by JBoss cluster services that
+        use JBossCache as their underlying data store.  Currently the services that share this 
+        cache are HAJNDI and DistributedState.  It is possible to change the cluster name but this 
+        isn't recommended since it will be more difficult for others to recognize that the renamed 
+        cluster is the one used by JBoss cluster services.  
+   -->
+   
+   <!-- First we create a Configuration object for the cache -->
+   <bean name="RestartPartition-HAPartitionCacheConfig" 
+   		class="org.jboss.cache.config.Configuration">
+        
+        <!-- Externally injected services -->  
+        <property name="runtimeConfig">
+           <bean name="RestartPartition-HAPartitionCacheRuntimeConfig" class="org.jboss.cache.config.RuntimeConfig">
+              <property name="transactionManager"><inject bean="jboss:service=TransactionManager" property="TransactionManager"/></property>
+              <property name="muxChannelFactory"><inject bean="JChannelFactory"/></property>
+           </bean>
+        </property>
+        
+        <property name="multiplexerStack">${jboss.multiplexer.stack:udp}</property>
+
+        <!-- Valid isolation levels are 
+                              SERIALIZABLE
+                              REPEATABLE_READ (default)
+                              READ_COMMITTED
+                              READ_UNCOMMITTED
+                              NONE
+        -->
+        <property name="isolationLevelString">REPEATABLE_READ</property>
+
+        <!-- Valid modes are LOCAL, REPL_ASYNC and REPL_SYNC -->
+        <property name="cacheModeString">REPL_SYNC</property>
+
+        <!-- Just used for async repl: use a replication queue -->
+        <property name="useReplQueue">false</property>
+
+        <!-- Replication interval for replication queue (in ms) -->
+        <property name="replQueueInterval">0</property>
+
+        <!-- Max number of elements which trigger replication -->
+        <property name="replQueueMaxElements">10</property>
+
+        <!-- Name of cluster. Needs to be the same for all nodes in clusters, 
+          in order to find each other -->
+        <property name="clusterName">RestartPartition-HAPartitionCache</property>
+
+        <!-- Whether or not to fetch state on joining a cluster  -->
+        <property name="fetchInMemoryState">true</property>
+
+        <!-- The max amount of time (in milliseconds) we wait until the
+            initial state (ie. the contents of the cache) are retrieved from
+            existing members in a clustered environment -->
+        <property name="initialStateRetrievalTimeout">5000</property>
+
+        <!-- Number of milliseconds to wait until all responses for a
+            synchronous call have been received. -->
+        <property name="syncReplTimeout">20000</property>
+
+        <!-- Max number of milliseconds to wait for a lock acquisition -->
+        <property name="lockAcquisitionTimeout">15000</property>
+        
+        <property name="exposeManagementStatistics">true</property>
+
+    </bean>
+    
+   <!-- Add a handle to the cache to JMX -->
+   <bean name="RestartPartition-HAPartitionCache" class="org.jboss.cache.jmx.CacheJmxWrapper">
+      <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.cache:service=HAPartitionCache,partitionName=RestartPartition", exposedInterface=org.jboss.cache.jmx.CacheJmxWrapperMBean.class, registerDirectly=true)</annotation>
+      
+      <property name="configuration"><inject bean="RestartPartition-HAPartitionCacheConfig"/></property>
+        
+   </bean>
+
+   <!-- ==================================================================== -->
+   <!-- DistributedState Service, a legacy wrapper around JBoss Cache        -->
+   <!-- ==================================================================== -->
+
+   <bean name="RestartDistributedState"
+   		 class="org.jboss.ha.framework.server.DistributedStateImpl">
+      
+      <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss:service=DistributedState,partitionName=RestartPartition", exposedInterface=org.jboss.ha.framework.server.DistributedStateImplMBean.class, registerDirectly=true)</annotation>
+      
+          
+      <property name="clusteredCache"><inject bean="RestartPartition-HAPartitionCache" property="cache"/></property>
+      
+   </bean>
+
+   <!-- ==================================================================== -->
+   <!-- Cluster Partition: defines cluster                                   -->
+   <!-- ==================================================================== -->
+
+   <bean name="RestartPartition"
+   		 class="org.jboss.ha.framework.server.ClusterPartition">     
+   		 
+    <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss:service=RestartPartition", exposedInterface=org.jboss.ha.framework.server.ClusterPartitionMBean.class)</annotation>
+      
+   	<constructor>
+   	   <parameter>
+            <bean name="RestartPartition-ClusterPartitionConfig" class="org.jboss.ha.framework.server.ClusterPartitionConfig">   
+               
+               <!-- ClusterPartition requires a Cache for state management -->
+               <property name="clusteredCache"><inject bean="RestartPartition-HAPartitionCache" property="cache"/></property>
+               
+               <property name="distributedState"><inject bean="RestartDistributedState"/></property>
+                
+               <!-- Name of the partition being built -->
+               <property name="partitionName">RestartPartition</property>
+         
+               <!-- The address used to determine the node name -->
+               <property name="nodeAddress">${jboss.bind.address}</property>
+         
+               <!-- Inject the naming service port as an aid in creating a nodeUniqueId.  Not needed if nodeUniqueId is set -->
+               <property name="namingServicePort"><inject bean="jboss:service=Naming" property="Port"/></property>
+               
+               <!-- Determine if deadlock detection is enabled -->
+               <property name="deadlockDetection">false</property>
+              
+               <!-- Max time (in ms) to wait for state transfer to complete. Increase for large states -->
+               <property name="stateTransferTimeout">30000</property>
+              
+               <!-- Max time (in ms) to wait for RPC calls to complete. -->
+               <property name="methodCallTimeout">60000</property>            
+               
+            </bean>
+         </parameter>
+      </constructor>
+      
+   </bean>
+   
+   
+   <!-- ==================================================================== -->
+   <!-- HA Session State Service for EJB2 SFSB                               -->
+   <!-- ==================================================================== -->
+
+   <bean name="RestartHASessionState"
+   		 class="org.jboss.ha.hasessionstate.server.HASessionStateService">
+   	
+     <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss:service=HASessionState,partitionName=RestartPartition", exposedInterface=org.jboss.ha.hasessionstate.server.HASessionStateServiceMBean.class, registerDirectly=true)</annotation>
+      	       
+     <depends>RestartPartition</depends>
+      	 
+  	   <property name="clusterPartition"><inject bean="RestartPartition"/></property>
+      <!-- JNDI name under which the service is bound -->
+      <property name="jndiName">/HASessionState/RestartPartition</property>
+      <!-- Max delay before cleaning unreclaimed state.
+           Defaults to 30*60*1000 => 30 minutes -->
+      <property name="beanCleaningDelay">0</property>
+      
+   </bean>
+
+   <!-- ==================================================================== -->
+   <!-- HA JNDI                                                              -->
+   <!-- ==================================================================== -->
+
+   <bean name="RestartHAJNDI" class="org.jboss.ha.jndi.HANamingService">
+   	
+   	<annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss:service=HAJNDI,partitionName=RestartPartition", exposedInterface=org.jboss.ha.jndi.HANamingServiceMBean.class, registerDirectly=true)</annotation>
+      
+      <depends>RestartPartition</depends>
+      	       
+      <property name="clusterPartition"><inject bean="RestartPartition"/></property>
+      
+      <!-- Bind address of bootstrap and HA-JNDI RMI endpoints -->
+      <property name="bindAddress">${jboss.bind.address}</property>
+      <!-- Port on which the HA-JNDI stub is made available -->
+      <property name="port">11100</property>
+      <!-- RmiPort to be used by the HA-JNDI service once bound. 0 => auto. -->
+      <property name="rmiPort">11101</property>
+      <!-- Accept backlog of the bootstrap socket -->
+      <property name="backlog">50</property>
+      <!-- The thread pool service used to control the bootstrap and
+      auto discovery lookups -->
+      <property name="lookupPool"><inject bean="jboss.system:service=ThreadPool"/></property>
+
+      <!-- A flag to disable the auto discovery via multicast -->
+      <property name="discoveryDisabled">false</property>
+      <!-- Set the auto-discovery bootstrap multicast bind address. If not 
+      specified and a BindAddress is specified, the BindAddress will be used. -->
+      <property name="autoDiscoveryBindAddress">${jboss.bind.address}</property>
+      <!-- Multicast Address and group port used for auto-discovery -->
+      <property name="autoDiscoveryAddress">${jboss.partition.udpGroup:230.0.0.4}</property>
+      <property name="autoDiscoveryGroup">11102</property>
+      <!-- The TTL (time-to-live) for autodiscovery IP multicast packets -->
+      <property name="autoDiscoveryTTL">16</property>
+      <!-- The load balancing policy for HA-JNDI -->
+      <property name="loadBalancePolicy">org.jboss.ha.framework.interfaces.RoundRobin</property>
+
+      <!-- Client socket factory to be used for client-server
+           RMI invocations during JNDI queries
+      <property name="clientSocketFactory">custom</property>
+      -->
+      <!-- Server socket factory to be used for client-server
+           RMI invocations during JNDI queries
+      <property name="serverSocketFactory">custom</property>
+      -->
+   </bean>
+   
+   <bean class="org.jboss.remoting.transport.Connector"
+          name="RestartConnector">
+
+       <constructor>
+          <!-- Remember that if you do use more than one param on the uri, will have to include as a CDATA, -->
+          <!-- otherwise, parser will complain. -->
+   	   <parameter><![CDATA[socket://${jboss.bind.address:localhost}:14446/?datatype=invocation&marshaller=org.jboss.invocation.unified.marshall.InvocationMarshaller&unmarshaller=org.jboss.invocation.unified.marshall.InvocationUnMarshaller&socketTimeout=60000&enableTcpNoDelay=true]]></parameter>
+   	   <parameter>
+   	     <map class="java.util.HashMap" keyClass="java.lang.String" valueClass="java.lang.String">
+   	     <entry><key>dataType</key><value>invocation</value></entry>
+   	     <entry><key>marshaller</key><value>org.jboss.invocation.unified.marshall.InvocationMarshaller</value></entry>
+   	     <entry><key>unmarshaller</key><value>org.jboss.invocation.unified.marshall.InvocationUnMarshaller</value></entry>
+   	     <entry><key>socketTimeout</key><value>600000</value></entry>
+   	     <entry><key>serverBindAddress</key><value>${jboss.bind.address:localhost}</value></entry>
+   	     <entry><key>serverBindPort</key><value>14446</value></entry>
+   	     <entry><key>enableTcpNoDelay</key><value>true</value></entry>
+   	     </map>
+   	   </parameter>
+   	 </constructor>
+   	 
+      <depends>jboss.remoting:service=NetworkRegistry</depends>
+   </bean>
+
+
+   <bean name="RestartUnifiedInvokerHA"
+   		 class="org.jboss.invocation.unified.server.UnifiedInvokerHA">
+   		 
+      <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss:service=invoker,type=unifiedha,partitionName=RestartPartition", exposedInterface=org.jboss.system.ServiceMBean.class, registerDirectly=true)</annotation>
+         
+      <depends>jboss:service=TransactionManager</depends>
+      <depends>RestartPartition</depends>
+      
+      <property name="connector"><inject bean="RestartConnector"/></property>
+	   
+   </bean>
+
+   <!-- ==================================================================== -->
+   <!-- Distributed cache invalidation                                       -->
+   <!-- ==================================================================== -->
+
+   <bean name="RestartJGCacheInvalidationBridge"
+   		 class="org.jboss.cache.invalidation.bridges.JGCacheInvalidationBridge">
+   		 
+      <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.cache:service=InvalidationBridge,type=JavaGroups,partitionName=RestartPartition", exposedInterface=org.jboss.cache.invalidation.bridges.JGCacheInvalidationBridgeMBean.class, registerDirectly=true)</annotation>
+      
+      <depends>RestartPartition</depends>
+      <depends>jboss.cache:service=InvalidationManager</depends>
+         
+      <property name="clusterPartition"><inject bean="RestartPartition"/></property>
+      <property name="invalidationManager">jboss.cache:service=InvalidationManager</property>
+      <property name="bridgeName">RestartJGBridge</property>
+      
+   </bean>
+   
+</deployment>


Property changes on: trunk/testsuite/src/resources/cluster/partition/partition-restart-beans.xml
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + native




More information about the jboss-cvs-commits mailing list