[jboss-cvs] JBossAS SVN: r109544 - in trunk/testsuite: src/main/org/jboss/test/cluster/ejb3/clusteredsession and 11 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Nov 29 15:52:23 EST 2010
Author: pferraro
Date: 2010-11-29 15:52:22 -0500 (Mon, 29 Nov 2010)
New Revision: 109544
Modified:
trunk/testsuite/imports/config/tests-clustering.xml
trunk/testsuite/src/main/org/jboss/test/cluster/ejb3/clusteredsession/IgnoreReplicationStatefulBean.java
trunk/testsuite/src/main/org/jboss/test/cluster/ejb3/clusteredsession/OptimizedStatefulBean.java
trunk/testsuite/src/main/org/jboss/test/cluster/ejb3/clusteredsession/OverrideAnnotationStatefulBean.java
trunk/testsuite/src/main/org/jboss/test/cluster/ejb3/clusteredsession/OverrideStatefulBean.java
trunk/testsuite/src/main/org/jboss/test/cluster/ejb3/clusteredsession/StatefulBean.java
trunk/testsuite/src/main/org/jboss/test/cluster/ejb3/clusteredsession/ejbthree1136/DoNothingBean.java
trunk/testsuite/src/main/org/jboss/test/cluster/ejb3/clusteredsession/ejbthree1346/DisableClusteredAnnotationStatefulBean.java
trunk/testsuite/src/main/org/jboss/test/cluster/ejb3/clusteredsession/ejbthree921/MyStatefulBean.java
trunk/testsuite/src/main/org/jboss/test/cluster/ejb3/clusteredsession/nested/base/ClusteredDeepNestedStatefulBean.java
trunk/testsuite/src/main/org/jboss/test/cluster/ejb3/clusteredsession/nested/base/std/ClusteredLocalNestedStatefulBean.java
trunk/testsuite/src/main/org/jboss/test/cluster/ejb3/clusteredsession/nested/base/std/ClusteredParentStatefulBean.java
trunk/testsuite/src/main/org/jboss/test/cluster/ejb3/clusteredsession/nested/base/std/ClusteredRemoteNestedStatefulBean.java
trunk/testsuite/src/main/org/jboss/test/cluster/ejb3/clusteredsession/nested/base/xpc/ClusteredDeepNestedContainedBean.java
trunk/testsuite/src/main/org/jboss/test/cluster/ejb3/clusteredsession/nested/base/xpc/ClusteredLocalContainedBean.java
trunk/testsuite/src/main/org/jboss/test/cluster/ejb3/clusteredsession/nested/base/xpc/ClusteredRemoteContainedBean.java
trunk/testsuite/src/main/org/jboss/test/cluster/ejb3/clusteredsession/nested/base/xpc/ClusteredShoppingCartBean.java
trunk/testsuite/src/main/org/jboss/test/cluster/ejb3/stateful/ClusteredStatefulBean.java
trunk/testsuite/src/main/org/jboss/test/cluster/ejb3/stateful/StatefulClusteredTimeoutBean.java
trunk/testsuite/src/resources/cluster/ejb3/clusteredsession/META-INF/jboss.xml
trunk/testsuite/src/resources/cluster/ejb3/clusteredsession/ejbthree1346/META-INF/jboss.xml
trunk/testsuite/src/resources/cluster/ejb3/clusteredsession/islocal/META-INF/jboss.xml
trunk/testsuite/src/resources/cluster/ejb3/clusteredsession/scoped/META-INF/jboss.xml
Log:
Add SYNC + DIST variants of clustered SFSB tests.
Modified: trunk/testsuite/imports/config/tests-clustering.xml
===================================================================
--- trunk/testsuite/imports/config/tests-clustering.xml 2010-11-29 19:02:18 UTC (rev 109543)
+++ trunk/testsuite/imports/config/tests-clustering.xml 2010-11-29 20:52:22 UTC (rev 109544)
@@ -74,8 +74,7 @@
<!-- Modify this patternset to get a custom set of tests to run via the
tests-cluster-custom target -->
<patternset id="cluster.custom.includes">
- <include name="org/jboss/test/cluster/**/BuddyReplication*UnitTestCase.class"/>
- <!--exclude name="org/jboss/test/cluster/ejb3/clusteredsession/unit/ForeignPartitionLocalInterceptorUnitTestCase.class"/-->
+ <include name="org/jboss/test/cluster/**/BuddyReplication*UnitTestCase.class"/>
</patternset>
<!--
@@ -148,22 +147,23 @@
<param name="jbosstest.cluster.node0.config" value="cluster-${jboss-junit-configuration}-0"/>
<param name="jbosstest.cluster.node1.config" value="cluster-${jboss-junit-configuration}-1"/>
</antcall>
-
- <echo message="Going to call target tests-clustering-unit for HTTP tests (REPL_ASYNC)"/>
+ <echo message="Going to call target tests-clustering-unit for EJB3 tests (REPL_ASYNC)"/>
+
<antcall target="tests-clustering-unit" inheritRefs="true">
- <param name="cluster.includes.refid" value="${cluster.http.includes}"/>
+ <param name="cluster.includes.refid" value="${cluster.ejb3.includes}"/>
<param name="jboss-junit-configuration" value="Default-${jboss-junit-configuration}"/>
- <param name="jbosstest.cluster.web.cache.config" value="standard-session-cache"/>
+ <param name="jbosstest.cluster.ejb3.cache.config" value="sfsb-cache"/>
<param name="jbosstest.cluster.node0.config" value="cluster-${jboss-junit-configuration}-0"/>
<param name="jbosstest.cluster.node1.config" value="cluster-${jboss-junit-configuration}-1"/>
</antcall>
+
+ <echo message="Going to call target tests-clustering-unit for HTTP tests (REPL_ASYNC)"/>
- <echo message="Going to call target tests-clustering-unit for EJB3 tests"/>
-
<antcall target="tests-clustering-unit" inheritRefs="true">
- <param name="cluster.includes.refid" value="${cluster.ejb3.includes}"/>
+ <param name="cluster.includes.refid" value="${cluster.http.includes}"/>
<param name="jboss-junit-configuration" value="Default-${jboss-junit-configuration}"/>
+ <param name="jbosstest.cluster.web.cache.config" value="standard-session-cache"/>
<param name="jbosstest.cluster.node0.config" value="cluster-${jboss-junit-configuration}-0"/>
<param name="jbosstest.cluster.node1.config" value="cluster-${jboss-junit-configuration}-1"/>
</antcall>
@@ -181,6 +181,14 @@
<server:start name="cluster-${jboss-junit-configuration}-SYNC-1"/>
<antcall target="tests-clustering-unit" inheritRefs="true">
+ <param name="cluster.includes.refid" value="${cluster.ejb3.includes}"/>
+ <param name="jboss-junit-configuration" value="Default-${jboss-junit-configuration}"/>
+ <param name="jbosstest.cluster.ejb3.cache.config" value="sfsb-cache/sync"/>
+ <param name="jbosstest.cluster.node0.config" value="cluster-${jboss-junit-configuration}-SYNC-0"/>
+ <param name="jbosstest.cluster.node1.config" value="cluster-${jboss-junit-configuration}-SYNC-1"/>
+ </antcall>
+
+ <antcall target="tests-clustering-unit" inheritRefs="true">
<param name="cluster.includes.refid" value="${cluster.http.jk.includes}"/>
<param name="jboss-junit-configuration" value="SYNC-${jboss-junit-configuration}"/>
<param name="jbosstest.cluster.web.cache.config" value="standard-session-cache/sync"/>
@@ -209,6 +217,22 @@
<server:start name="cluster-${jboss-junit-configuration}-DIST-1"/>
<antcall target="tests-clustering-unit" inheritRefs="true">
+ <param name="cluster.includes.refid" value="${cluster.ejb3.includes}"/>
+ <param name="jboss-junit-configuration" value="Default-${jboss-junit-configuration}"/>
+ <param name="jbosstest.cluster.ejb3.cache.config" value="sfsb-cache/dist"/>
+ <param name="jbosstest.cluster.node0.config" value="cluster-${jboss-junit-configuration}-DIST-0"/>
+ <param name="jbosstest.cluster.node1.config" value="cluster-${jboss-junit-configuration}-DIST-1"/>
+ </antcall>
+
+ <antcall target="tests-clustering-unit" inheritRefs="true">
+ <param name="cluster.includes.refid" value="${cluster.http.jk.includes}"/>
+ <param name="jboss-junit-configuration" value="DIST-${jboss-junit-configuration}"/>
+ <param name="jbosstest.cluster.web.cache.config" value="standard-session-cache/dist"/>
+ <param name="jbosstest.cluster.node0.config" value="cluster-${jboss-junit-configuration}-DIST-0"/>
+ <param name="jbosstest.cluster.node1.config" value="cluster-${jboss-junit-configuration}-DIST-1"/>
+ </antcall>
+
+ <antcall target="tests-clustering-unit" inheritRefs="true">
<param name="cluster.includes.refid" value="${cluster.http.includes}"/>
<param name="jboss-junit-configuration" value="DIST-${jboss-junit-configuration}"/>
<param name="jbosstest.cluster.web.cache.config" value="standard-session-cache/dist"/>
@@ -490,28 +514,52 @@
<server:stop name="cluster-${jboss-junit-configuration}-DIST-1"/>
</target>
- <!-- Runs the EJB3 tests -->
+ <!-- Runs the EJB3 tests (REPL_ASYNC) -->
<target name="tests-clustering-ejb3" depends="init">
- <property name="jboss-junit-configuration" value="udp"/>
+ <property name="jboss-junit-configuration" value="udp"/>
- <antcall target="tests-clustering-configure" inheritRefs="true"/>
+ <antcall target="tests-clustering-configure" inheritRefs="true"/>
- <server:start name="cluster-${jboss-junit-configuration}-0"/>
- <server:start name="cluster-${jboss-junit-configuration}-1"/>
+ <server:start name="cluster-${jboss-junit-configuration}-0"/>
+ <server:start name="cluster-${jboss-junit-configuration}-1"/>
- <echo message="Going to call target tests-clustering-unit for ${test}"/>
+ <echo message="Going to call target tests-clustering-unit for ${test}"/>
- <antcall target="tests-clustering-unit" inheritRefs="true">
- <param name="cluster.includes.refid" value="cluster.ejb3.includes"/>
- <param name="jboss-junit-configuration" value="Default-${jboss-junit-configuration}"/>
- <param name="jbosstest.cluster.node0.config" value="cluster-${jboss-junit-configuration}-0"/>
- <param name="jbosstest.cluster.node1.config" value="cluster-${jboss-junit-configuration}-1"/>
- </antcall>
+ <antcall target="tests-clustering-unit" inheritRefs="true">
+ <param name="cluster.includes.refid" value="cluster.ejb3.includes"/>
+ <param name="jboss-junit-configuration" value="Default-${jboss-junit-configuration}"/>
+ <param name="jbosstest.cluster.sfsb.cache.config" value="sfsb-cache"/>
+ <param name="jbosstest.cluster.node0.config" value="cluster-${jboss-junit-configuration}-0"/>
+ <param name="jbosstest.cluster.node1.config" value="cluster-${jboss-junit-configuration}-1"/>
+ </antcall>
- <server:stop name="cluster-${jboss-junit-configuration}-0"/>
- <server:stop name="cluster-${jboss-junit-configuration}-1"/>
- </target>
+ <server:stop name="cluster-${jboss-junit-configuration}-0"/>
+ <server:stop name="cluster-${jboss-junit-configuration}-1"/>
+ </target>
+ <!-- Runs the EJB3 tests (DIST_SYNC) -->
+ <target name="tests-clustering-ejb3-dist" depends="init">
+ <property name="jboss-junit-configuration" value="udp"/>
+
+ <antcall target="tests-clustering-configure" inheritRefs="true"/>
+
+ <server:start name="cluster-${jboss-junit-configuration}-0"/>
+ <server:start name="cluster-${jboss-junit-configuration}-1"/>
+
+ <echo message="Going to call target tests-clustering-unit for ${test}"/>
+
+ <antcall target="tests-clustering-unit" inheritRefs="true">
+ <param name="cluster.includes.refid" value="cluster.ejb3.includes"/>
+ <param name="jboss-junit-configuration" value="DIST-${jboss-junit-configuration}"/>
+ <param name="jbosstest.cluster.sfsb.cache.config" value="sfsb-cache/dist"/>
+ <param name="jbosstest.cluster.node0.config" value="cluster-${jboss-junit-configuration}-DIST-0"/>
+ <param name="jbosstest.cluster.node1.config" value="cluster-${jboss-junit-configuration}-DIST-1"/>
+ </antcall>
+
+ <server:stop name="cluster-${jboss-junit-configuration}-0"/>
+ <server:stop name="cluster-${jboss-junit-configuration}-1"/>
+ </target>
+
<!-- Runs only the non-http tests -->
<target name="tests-clustering-non-http" depends="init">
@@ -572,7 +620,7 @@
<antcall target="tests-clustering-unit" inheritRefs="true">
<param name="cluster.includes.refid" value="cluster.defaultcfg.http.includes"/>
<param name="jboss-junit-configuration" value="Default-${jboss-junit-configuration}"/>
- <param name="jboss.test.cluster.web.cache.config" value="standard-session-cache"/>
+ <param name="jbosstest.cluster.web.cache.config" value="standard-session-cache"/>
<param name="jbosstest.cluster.node0.config" value="cluster-${jboss-junit-configuration}-0"/>
<param name="jbosstest.cluster.node1.config" value="cluster-${jboss-junit-configuration}-1"/>
</antcall>
@@ -592,9 +640,17 @@
<server:start name="cluster-${jboss-junit-configuration}-DIST-1"/>
<antcall target="tests-clustering-unit" inheritRefs="true">
+ <param name="cluster.includes.refid" value="cluster.defaultcfg.http.jk.includes"/>
+ <param name="jboss-junit-configuration" value="DIST-${jboss-junit-configuration}"/>
+ <param name="jbosstest.cluster.web.cache.config" value="standard-session-cache/dist"/>
+ <param name="jbosstest.cluster.node0.config" value="cluster-${jboss-junit-configuration}-DIST-0"/>
+ <param name="jbosstest.cluster.node1.config" value="cluster-${jboss-junit-configuration}-DIST-1"/>
+ </antcall>
+
+ <antcall target="tests-clustering-unit" inheritRefs="true">
<param name="cluster.includes.refid" value="cluster.defaultcfg.http.includes"/>
<param name="jboss-junit-configuration" value="DIST-${jboss-junit-configuration}"/>
- <param name="jboss.test.cluster.web.cache.config" value="standard-session-cache/dist"/>
+ <param name="jbosstest.cluster.web.cache.config" value="standard-session-cache/dist"/>
<param name="jbosstest.cluster.node0.config" value="cluster-${jboss-junit-configuration}-DIST-0"/>
<param name="jbosstest.cluster.node1.config" value="cluster-${jboss-junit-configuration}-DIST-1"/>
</antcall>
Modified: trunk/testsuite/src/main/org/jboss/test/cluster/ejb3/clusteredsession/IgnoreReplicationStatefulBean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/ejb3/clusteredsession/IgnoreReplicationStatefulBean.java 2010-11-29 19:02:18 UTC (rev 109543)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/ejb3/clusteredsession/IgnoreReplicationStatefulBean.java 2010-11-29 20:52:22 UTC (rev 109544)
@@ -35,7 +35,7 @@
*/
@Stateful(name="testIgnoreReplicationStateful")
@Clustered
- at CacheConfig(maxSize=1000, idleTimeoutSeconds=1, replicationIsPassivation=false) // this will get evicted the second time eviction thread wakes up
+ at CacheConfig(name = "${jbosstest.cluster.sfsb.cache.config:sfsb-cache}", maxSize=1000, idleTimeoutSeconds=1, replicationIsPassivation=false) // this will get evicted the second time eviction thread wakes up
@Remote(StatefulRemote.class)
public class IgnoreReplicationStatefulBean extends NonAnnotationStatefulBean
{
Modified: trunk/testsuite/src/main/org/jboss/test/cluster/ejb3/clusteredsession/OptimizedStatefulBean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/ejb3/clusteredsession/OptimizedStatefulBean.java 2010-11-29 19:02:18 UTC (rev 109543)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/ejb3/clusteredsession/OptimizedStatefulBean.java 2010-11-29 20:52:22 UTC (rev 109544)
@@ -36,7 +36,7 @@
*/
@Stateful(name="testOptimizedStateful")
@Clustered
- at CacheConfig(maxSize=1000, idleTimeoutSeconds=1) // this will get evicted the second time eviction thread wakes up
+ at CacheConfig(name = "${jbosstest.cluster.sfsb.cache.config:sfsb-cache}", maxSize=1000, idleTimeoutSeconds=1) // this will get evicted the second time eviction thread wakes up
@Remote(StatefulRemote.class)
public class OptimizedStatefulBean
extends NonAnnotationStatefulBean
Modified: trunk/testsuite/src/main/org/jboss/test/cluster/ejb3/clusteredsession/OverrideAnnotationStatefulBean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/ejb3/clusteredsession/OverrideAnnotationStatefulBean.java 2010-11-29 19:02:18 UTC (rev 109543)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/ejb3/clusteredsession/OverrideAnnotationStatefulBean.java 2010-11-29 20:52:22 UTC (rev 109544)
@@ -24,6 +24,7 @@
import javax.ejb.Remote;
import javax.ejb.Stateful;
+import org.jboss.ejb3.annotation.CacheConfig;
import org.jboss.ejb3.annotation.Clustered;
/**
@@ -34,6 +35,7 @@
*/
@Stateful(name="OverrideAnnotationStateful")
@Clustered(partition="BogusPartition")
+ at CacheConfig(name = "${jbosstest.cluster.sfsb.cache.config:sfsb-cache}")
@Remote(StatefulRemote.class)
public class OverrideAnnotationStatefulBean extends NonAnnotationStatefulBean
{
Modified: trunk/testsuite/src/main/org/jboss/test/cluster/ejb3/clusteredsession/OverrideStatefulBean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/ejb3/clusteredsession/OverrideStatefulBean.java 2010-11-29 19:02:18 UTC (rev 109543)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/ejb3/clusteredsession/OverrideStatefulBean.java 2010-11-29 20:52:22 UTC (rev 109544)
@@ -34,7 +34,7 @@
*/
@Stateful(name="OverrideStateful")
@Clustered(partition="BogusPartition", loadBalancePolicy="BogusPolicy")
- at CacheConfig(maxSize=1000, idleTimeoutSeconds=2)
+ at CacheConfig(name = "${jbosstest.cluster.sfsb.cache.config:sfsb-cache}", maxSize=1000, idleTimeoutSeconds=2)
@Remote(OverrideStatefulRemote.class)
public class OverrideStatefulBean implements OverrideStatefulRemote
{
Modified: trunk/testsuite/src/main/org/jboss/test/cluster/ejb3/clusteredsession/StatefulBean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/ejb3/clusteredsession/StatefulBean.java 2010-11-29 19:02:18 UTC (rev 109543)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/ejb3/clusteredsession/StatefulBean.java 2010-11-29 20:52:22 UTC (rev 109544)
@@ -35,7 +35,7 @@
*/
@Stateful(name="testStateful")
@Clustered
- at CacheConfig(maxSize=1000, idleTimeoutSeconds=3) // this will get evicted the second time eviction thread wakes up
+ at CacheConfig(name = "${jbosstest.cluster.sfsb.cache.config:sfsb-cache}", maxSize=1000, idleTimeoutSeconds=3) // this will get evicted the second time eviction thread wakes up
@Remote(StatefulRemote.class)
public class StatefulBean extends NonAnnotationStatefulBean
{
Modified: trunk/testsuite/src/main/org/jboss/test/cluster/ejb3/clusteredsession/ejbthree1136/DoNothingBean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/ejb3/clusteredsession/ejbthree1136/DoNothingBean.java 2010-11-29 19:02:18 UTC (rev 109543)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/ejb3/clusteredsession/ejbthree1136/DoNothingBean.java 2010-11-29 20:52:22 UTC (rev 109544)
@@ -23,6 +23,7 @@
import javax.ejb.Stateful;
+import org.jboss.ejb3.annotation.CacheConfig;
import org.jboss.ejb3.annotation.Clustered;
/**
@@ -34,6 +35,7 @@
*/
@Stateful
@Clustered
+ at CacheConfig(name = "${jbosstest.cluster.sfsb.cache.config:sfsb-cache}")
public class DoNothingBean implements DoNothingRemote
{
/** The serialVersionUID */
Modified: trunk/testsuite/src/main/org/jboss/test/cluster/ejb3/clusteredsession/ejbthree1346/DisableClusteredAnnotationStatefulBean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/ejb3/clusteredsession/ejbthree1346/DisableClusteredAnnotationStatefulBean.java 2010-11-29 19:02:18 UTC (rev 109543)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/ejb3/clusteredsession/ejbthree1346/DisableClusteredAnnotationStatefulBean.java 2010-11-29 20:52:22 UTC (rev 109544)
@@ -24,6 +24,7 @@
import javax.ejb.Remote;
import javax.ejb.Stateful;
+import org.jboss.ejb3.annotation.CacheConfig;
import org.jboss.ejb3.annotation.Clustered;
/**
@@ -34,6 +35,7 @@
*/
@Stateful(name="DisableClusteredAnnotationStateful")
@Clustered(partition="BogusPartition")
+ at CacheConfig(name = "${jbosstest.cluster.sfsb.cache.config:sfsb-cache}")
@Remote(DisableClusteredAnnotationRemote.class)
public class DisableClusteredAnnotationStatefulBean extends DisableClusteredAnnotationBase
{
Modified: trunk/testsuite/src/main/org/jboss/test/cluster/ejb3/clusteredsession/ejbthree921/MyStatefulBean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/ejb3/clusteredsession/ejbthree921/MyStatefulBean.java 2010-11-29 19:02:18 UTC (rev 109543)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/ejb3/clusteredsession/ejbthree921/MyStatefulBean.java 2010-11-29 20:52:22 UTC (rev 109544)
@@ -31,6 +31,7 @@
import javax.persistence.PersistenceContext;
import javax.persistence.PersistenceContextType;
+import org.jboss.ejb3.annotation.CacheConfig;
import org.jboss.ejb3.annotation.Clustered;
import org.jboss.logging.Logger;
@@ -39,6 +40,7 @@
*
*/
@Clustered
+ at CacheConfig(name = "${jbosstest.cluster.sfsb.cache.config:sfsb-cache}")
@Stateful
@Remote(MyStateful.class)
@Interceptors({ExplicitFailoverInterceptor.class})
Modified: trunk/testsuite/src/main/org/jboss/test/cluster/ejb3/clusteredsession/nested/base/ClusteredDeepNestedStatefulBean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/ejb3/clusteredsession/nested/base/ClusteredDeepNestedStatefulBean.java 2010-11-29 19:02:18 UTC (rev 109543)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/ejb3/clusteredsession/nested/base/ClusteredDeepNestedStatefulBean.java 2010-11-29 20:52:22 UTC (rev 109544)
@@ -38,7 +38,7 @@
*/
@Stateful(name="testDeepNestedStateful")
@Clustered
- at CacheConfig(maxSize=10000, idleTimeoutSeconds=1, replicationIsPassivation=false)
+ at CacheConfig(name = "${jbosstest.cluster.sfsb.cache.config:sfsb-cache}", maxSize=10000, idleTimeoutSeconds=1, replicationIsPassivation=false)
@Local(DeepNestedStateful.class)
public class ClusteredDeepNestedStatefulBean extends DeepNestedStatefulBean
{
Modified: trunk/testsuite/src/main/org/jboss/test/cluster/ejb3/clusteredsession/nested/base/std/ClusteredLocalNestedStatefulBean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/ejb3/clusteredsession/nested/base/std/ClusteredLocalNestedStatefulBean.java 2010-11-29 19:02:18 UTC (rev 109543)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/ejb3/clusteredsession/nested/base/std/ClusteredLocalNestedStatefulBean.java 2010-11-29 20:52:22 UTC (rev 109544)
@@ -28,7 +28,7 @@
*/
@Clustered
@Stateful(name="testLocalNestedStateful")
- at CacheConfig(maxSize=10000, idleTimeoutSeconds=1)
+ at CacheConfig(name = "${jbosstest.cluster.sfsb.cache.config:sfsb-cache}", maxSize=10000, idleTimeoutSeconds=1)
@Local(NestedStateful.class)
public class ClusteredLocalNestedStatefulBean extends NestedStatefulBean
{
Modified: trunk/testsuite/src/main/org/jboss/test/cluster/ejb3/clusteredsession/nested/base/std/ClusteredParentStatefulBean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/ejb3/clusteredsession/nested/base/std/ClusteredParentStatefulBean.java 2010-11-29 19:02:18 UTC (rev 109543)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/ejb3/clusteredsession/nested/base/std/ClusteredParentStatefulBean.java 2010-11-29 20:52:22 UTC (rev 109544)
@@ -28,7 +28,7 @@
*/
@Clustered
@Stateful(name="testParentStateful")
- at CacheConfig(maxSize=1000, idleTimeoutSeconds=1) // this will get evicted the second time eviction thread wakes up
+ at CacheConfig(name = "${jbosstest.cluster.sfsb.cache.config:sfsb-cache}", maxSize=1000, idleTimeoutSeconds=1) // this will get evicted the second time eviction thread wakes up
@Remote(ParentStatefulRemote.class)
public class ClusteredParentStatefulBean extends ParentStatefulBean
{
Modified: trunk/testsuite/src/main/org/jboss/test/cluster/ejb3/clusteredsession/nested/base/std/ClusteredRemoteNestedStatefulBean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/ejb3/clusteredsession/nested/base/std/ClusteredRemoteNestedStatefulBean.java 2010-11-29 19:02:18 UTC (rev 109543)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/ejb3/clusteredsession/nested/base/std/ClusteredRemoteNestedStatefulBean.java 2010-11-29 20:52:22 UTC (rev 109544)
@@ -28,7 +28,7 @@
*/
@Clustered
@Stateful(name="testNestedStateful")
- at CacheConfig(maxSize=1000, idleTimeoutSeconds=1)
+ at CacheConfig(name = "${jbosstest.cluster.sfsb.cache.config:sfsb-cache}", maxSize=1000, idleTimeoutSeconds=1)
@Remote(NestedStateful.class)
public class ClusteredRemoteNestedStatefulBean extends OptimizedNestedStatefulBean
{
Modified: trunk/testsuite/src/main/org/jboss/test/cluster/ejb3/clusteredsession/nested/base/xpc/ClusteredDeepNestedContainedBean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/ejb3/clusteredsession/nested/base/xpc/ClusteredDeepNestedContainedBean.java 2010-11-29 19:02:18 UTC (rev 109543)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/ejb3/clusteredsession/nested/base/xpc/ClusteredDeepNestedContainedBean.java 2010-11-29 20:52:22 UTC (rev 109544)
@@ -38,7 +38,7 @@
*/
@Stateful(name="testDeepNestedContained")
@Clustered
- at CacheConfig(maxSize=10000, idleTimeoutSeconds=1, replicationIsPassivation=false)
+ at CacheConfig(name = "${jbosstest.cluster.sfsb.cache.config:sfsb-cache}", maxSize=10000, idleTimeoutSeconds=1, replicationIsPassivation=false)
@Local(DeepNestedContained.class)
public class ClusteredDeepNestedContainedBean extends DeepNestedContainedBean
{
Modified: trunk/testsuite/src/main/org/jboss/test/cluster/ejb3/clusteredsession/nested/base/xpc/ClusteredLocalContainedBean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/ejb3/clusteredsession/nested/base/xpc/ClusteredLocalContainedBean.java 2010-11-29 19:02:18 UTC (rev 109543)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/ejb3/clusteredsession/nested/base/xpc/ClusteredLocalContainedBean.java 2010-11-29 20:52:22 UTC (rev 109544)
@@ -38,7 +38,7 @@
*/
@Stateful(name="testLocalShoppingCartContained")
@Clustered
- at CacheConfig(maxSize = 1000, idleTimeoutSeconds = 1)
+ at CacheConfig(name = "${jbosstest.cluster.sfsb.cache.config:sfsb-cache}", maxSize = 1000, idleTimeoutSeconds = 1)
@Local(Contained.class)
public class ClusteredLocalContainedBean extends ContainedBean
{
Modified: trunk/testsuite/src/main/org/jboss/test/cluster/ejb3/clusteredsession/nested/base/xpc/ClusteredRemoteContainedBean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/ejb3/clusteredsession/nested/base/xpc/ClusteredRemoteContainedBean.java 2010-11-29 19:02:18 UTC (rev 109543)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/ejb3/clusteredsession/nested/base/xpc/ClusteredRemoteContainedBean.java 2010-11-29 20:52:22 UTC (rev 109544)
@@ -38,7 +38,7 @@
*/
@Stateful(name="testShoppingCartContained")
@Clustered
- at CacheConfig(maxSize = 1000, idleTimeoutSeconds = 1)
+ at CacheConfig(name = "${jbosstest.cluster.sfsb.cache.config:sfsb-cache}", maxSize = 1000, idleTimeoutSeconds = 1)
@Remote(Contained.class)
public class ClusteredRemoteContainedBean extends ContainedBean
{
Modified: trunk/testsuite/src/main/org/jboss/test/cluster/ejb3/clusteredsession/nested/base/xpc/ClusteredShoppingCartBean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/ejb3/clusteredsession/nested/base/xpc/ClusteredShoppingCartBean.java 2010-11-29 19:02:18 UTC (rev 109543)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/ejb3/clusteredsession/nested/base/xpc/ClusteredShoppingCartBean.java 2010-11-29 20:52:22 UTC (rev 109544)
@@ -43,7 +43,7 @@
@Stateful(name="testShoppingCart")
@Remote(ShoppingCart.class)
@Clustered
- at CacheConfig(maxSize = 1000, idleTimeoutSeconds = 1)
+ at CacheConfig(name = "${jbosstest.cluster.sfsb.cache.config:sfsb-cache}", maxSize = 1000, idleTimeoutSeconds = 1)
public class ClusteredShoppingCartBean extends ShoppingCartBean
{
/** The serialVersionUID */
Modified: trunk/testsuite/src/main/org/jboss/test/cluster/ejb3/stateful/ClusteredStatefulBean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/ejb3/stateful/ClusteredStatefulBean.java 2010-11-29 19:02:18 UTC (rev 109543)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/ejb3/stateful/ClusteredStatefulBean.java 2010-11-29 20:52:22 UTC (rev 109544)
@@ -57,7 +57,7 @@
@RemoteBinding(jndiBinding = "ClusteredStateful",
interceptorStack="RemoteBindingStatefulSessionClientInterceptors",
factory = RemoteBindingDefaults.PROXY_FACTORY_STATEFUL_REMOTE)
- at CacheConfig(maxSize = 1000, idleTimeoutSeconds = 1, name="jboss.cache:service=EJB3SFSBClusteredCache")
+ at CacheConfig(name = "${jbosstest.cluster.sfsb.cache.config:sfsb-cache}", maxSize = 1000, idleTimeoutSeconds = 1)
@SecurityDomain("test")
@Resources({@Resource(name="jdbc/ds", mappedName="java:/DefaultDS")})
@Clustered
Modified: trunk/testsuite/src/main/org/jboss/test/cluster/ejb3/stateful/StatefulClusteredTimeoutBean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/ejb3/stateful/StatefulClusteredTimeoutBean.java 2010-11-29 19:02:18 UTC (rev 109543)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/ejb3/stateful/StatefulClusteredTimeoutBean.java 2010-11-29 20:52:22 UTC (rev 109544)
@@ -34,7 +34,7 @@
*/
@Stateful
@Remote(StatefulTimeout.class)
- at CacheConfig(removalTimeoutSeconds = 1)
+ at CacheConfig(name = "${jbosstest.cluster.sfsb.cache.config:sfsb-cache}", removalTimeoutSeconds = 1)
@Clustered
public class StatefulClusteredTimeoutBean implements StatefulTimeout
{
Modified: trunk/testsuite/src/resources/cluster/ejb3/clusteredsession/META-INF/jboss.xml
===================================================================
--- trunk/testsuite/src/resources/cluster/ejb3/clusteredsession/META-INF/jboss.xml 2010-11-29 19:02:18 UTC (rev 109543)
+++ trunk/testsuite/src/resources/cluster/ejb3/clusteredsession/META-INF/jboss.xml 2010-11-29 20:52:22 UTC (rev 109544)
@@ -14,6 +14,9 @@
<partition-name>DefaultPartition</partition-name>
<load-balance-policy>org.jboss.ha.framework.interfaces.RandomRobin</load-balance-policy>
</cluster-config>
+ <cache-config>
+ <cache-name>${jbosstest.cluster.sfsb.cache.config:sfsb-cache}</cache-name>
+ </cache-config>
</session>
<session>
<ejb-name>NonAnnotationStateful</ejb-name>
@@ -22,6 +25,9 @@
<partition-name>${jboss.partition.name:DefaultPartition}</partition-name>
<load-balance-policy>org.jboss.ha.framework.interfaces.FirstAvailableIdenticalAllProxies</load-balance-policy>
</cluster-config>
+ <cache-config>
+ <cache-name>${jbosstest.cluster.sfsb.cache.config:sfsb-cache}</cache-name>
+ </cache-config>
</session>
<session>
<ejb-name>OverrideAnnotationStateful</ejb-name>
@@ -30,6 +36,9 @@
<partition-name>${jboss.partition.name:DefaultPartition}</partition-name>
<load-balance-policy>org.jboss.ha.framework.interfaces.FirstAvailableIdenticalAllProxies</load-balance-policy>
</cluster-config>
+ <cache-config>
+ <cache-name>${jbosstest.cluster.sfsb.cache.config:sfsb-cache}</cache-name>
+ </cache-config>
</session>
<session>
<ejb-name>EjbJarOverrideAnnotationStateful</ejb-name>
@@ -38,6 +47,9 @@
<partition-name>${jboss.partition.name:DefaultPartition}</partition-name>
<load-balance-policy>org.jboss.ha.framework.interfaces.FirstAvailableIdenticalAllProxies</load-balance-policy>
</cluster-config>
+ <cache-config>
+ <cache-name>${jbosstest.cluster.sfsb.cache.config:sfsb-cache}</cache-name>
+ </cache-config>
</session>
</enterprise-beans>
</jboss>
\ No newline at end of file
Modified: trunk/testsuite/src/resources/cluster/ejb3/clusteredsession/ejbthree1346/META-INF/jboss.xml
===================================================================
--- trunk/testsuite/src/resources/cluster/ejb3/clusteredsession/ejbthree1346/META-INF/jboss.xml 2010-11-29 19:02:18 UTC (rev 109543)
+++ trunk/testsuite/src/resources/cluster/ejb3/clusteredsession/ejbthree1346/META-INF/jboss.xml 2010-11-29 20:52:22 UTC (rev 109544)
@@ -1,21 +1,19 @@
<?xml version="1.0"?>
-<jboss
- xmlns="http://www.jboss.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.jboss.com/xml/ns/javaee
- http://www.jboss.org/j2ee/schema/jboss_5_0.xsd"
- version="3.0">
- <enterprise-beans>
-
- <session>
- <ejb-name>DisableClusteredAnnotationStateless</ejb-name>
- <clustered>false</clustered>
- </session>
-
- <session>
- <ejb-name>DisableClusteredAnnotationStateful</ejb-name>
- <clustered>false</clustered>
- </session>
-
- </enterprise-beans>
- </jboss>
\ No newline at end of file
+<jboss xmlns="http://www.jboss.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.jboss.com/xml/ns/javaee http://www.jboss.org/j2ee/schema/jboss_5_0.xsd" version="3.0">
+ <enterprise-beans>
+ <session>
+ <ejb-name>DisableClusteredAnnotationStateless</ejb-name>
+ <clustered>false</clustered>
+ <cache-config>
+ <cache-name>${jbosstest.cluster.sfsb.cache.config:sfsb-cache}</cache-name>
+ </cache-config>
+ </session>
+ <session>
+ <ejb-name>DisableClusteredAnnotationStateful</ejb-name>
+ <clustered>false</clustered>
+ <cache-config>
+ <cache-name>${jbosstest.cluster.sfsb.cache.config:sfsb-cache}</cache-name>
+ </cache-config>
+ </session>
+ </enterprise-beans>
+</jboss>
\ No newline at end of file
Modified: trunk/testsuite/src/resources/cluster/ejb3/clusteredsession/islocal/META-INF/jboss.xml
===================================================================
--- trunk/testsuite/src/resources/cluster/ejb3/clusteredsession/islocal/META-INF/jboss.xml 2010-11-29 19:02:18 UTC (rev 109543)
+++ trunk/testsuite/src/resources/cluster/ejb3/clusteredsession/islocal/META-INF/jboss.xml 2010-11-29 20:52:22 UTC (rev 109544)
@@ -21,6 +21,9 @@
<cluster-config>
<partition-name>${clusteredsession.islocal.partition:DefaultPartition}</partition-name>
</cluster-config>
+ <cache-config>
+ <cache-name>${jbosstest.cluster.sfsb.cache.config:sfsb-cache}</cache-name>
+ </cache-config>
</session>
<session>
<ejb-name>ClusteredStateless</ejb-name>
Modified: trunk/testsuite/src/resources/cluster/ejb3/clusteredsession/scoped/META-INF/jboss.xml
===================================================================
--- trunk/testsuite/src/resources/cluster/ejb3/clusteredsession/scoped/META-INF/jboss.xml 2010-11-29 19:02:18 UTC (rev 109543)
+++ trunk/testsuite/src/resources/cluster/ejb3/clusteredsession/scoped/META-INF/jboss.xml 2010-11-29 20:52:22 UTC (rev 109544)
@@ -17,6 +17,9 @@
<partition-name>DefaultPartition</partition-name>
<load-balance-policy>org.jboss.ha.framework.interfaces.RandomRobin</load-balance-policy>
</cluster-config>
+ <cache-config>
+ <cache-name>${jbosstest.cluster.sfsb.cache.config:sfsb-cache}</cache-name>
+ </cache-config>
</session>
<session>
<ejb-name>NonAnnotationStateful</ejb-name>
@@ -25,6 +28,9 @@
<partition-name>${jboss.partition.name:DefaultPartition}</partition-name>
<load-balance-policy>org.jboss.ha.framework.interfaces.FirstAvailableIdenticalAllProxies</load-balance-policy>
</cluster-config>
+ <cache-config>
+ <cache-name>${jbosstest.cluster.sfsb.cache.config:sfsb-cache}</cache-name>
+ </cache-config>
</session>
<session>
<ejb-name>OverrideAnnotationStateful</ejb-name>
@@ -33,6 +39,9 @@
<partition-name>${jboss.partition.name:DefaultPartition}</partition-name>
<load-balance-policy>org.jboss.ha.framework.interfaces.FirstAvailableIdenticalAllProxies</load-balance-policy>
</cluster-config>
+ <cache-config>
+ <cache-name>${jbosstest.cluster.sfsb.cache.config:sfsb-cache}</cache-name>
+ </cache-config>
</session>
<session>
<ejb-name>EjbJarOverrideAnnotationStateful</ejb-name>
@@ -41,6 +50,9 @@
<partition-name>${jboss.partition.name:DefaultPartition}</partition-name>
<load-balance-policy>org.jboss.ha.framework.interfaces.FirstAvailableIdenticalAllProxies</load-balance-policy>
</cluster-config>
+ <cache-config>
+ <cache-name>${jbosstest.cluster.sfsb.cache.config:sfsb-cache}</cache-name>
+ </cache-config>
</session>
<session>
<ejb-name>NonClusteredStateful</ejb-name>
@@ -50,6 +62,7 @@
<!--cache-type>SimpleStatefulCache</cache-type-->
<cache-max-size>1000</cache-max-size>
<idle-timeout-seconds>100</idle-timeout-seconds>
+ <cache-name>${jbosstest.cluster.sfsb.cache.config:sfsb-cache}</cache-name>
</cache-config>
</session>
</enterprise-beans>
More information about the jboss-cvs-commits
mailing list