[jboss-cvs] JBossAS SVN: r106093 - in branches/Branch_No_Multicast/testsuite: imports and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Jun 16 13:51:42 EDT 2010
Author: bstansberry at jboss.com
Date: 2010-06-16 13:51:42 -0400 (Wed, 16 Jun 2010)
New Revision: 106093
Modified:
branches/Branch_No_Multicast/testsuite/build.xml
branches/Branch_No_Multicast/testsuite/imports/config/tests-clustering.xml
branches/Branch_No_Multicast/testsuite/imports/server-config.xml
branches/Branch_No_Multicast/testsuite/src/main/org/jboss/test/cluster/defaultcfg/test/ChannelFactoryManagedObjectsTestCase.java
Log:
[JBPAPP-4482] Switch build order so cluster-ec2 uses patched "production". Add a tests-ec2 target
Modified: branches/Branch_No_Multicast/testsuite/build.xml
===================================================================
--- branches/Branch_No_Multicast/testsuite/build.xml 2010-06-16 17:19:30 UTC (rev 106092)
+++ branches/Branch_No_Multicast/testsuite/build.xml 2010-06-16 17:51:42 UTC (rev 106093)
@@ -1552,7 +1552,6 @@
<antcall target="tests-clustering-all-stacks"/>
<antcall target="tomcat-ssl-tests"/>
<antcall target="tomcat-sso-tests"/>
- <antcall target="tomcat-sso-clustered-tests"/>
<antcall target="tomcat-webctx-tests"/>
<antcall target="tomcat-federation-tests"/>
<antcall target="tests-binding-manager"/>
@@ -1570,7 +1569,6 @@
<antcall target="tests-aop-scoped"/>
<antcall target="jrmp-invoker-tests"/>
<antcall target="pooled-invoker-tests"/>
- <antcall target="tests-clustered-profileservice"/>
<antcall target="tests-jts" />
<!-- Run classloader leak tests in isolation
@@ -1649,6 +1647,24 @@
<antcall target="jboss-all-config-tests" inheritrefs="true"/>
<antcall target="tests-clustering-ec2" inheritrefs="true"/>
+
+ <antcall target="tests-report"/>
+ <!-- JBAS-5918 https://issues.apache.org/bugzilla/show_bug.cgi?id=41368
+ <record name="${basedir}/output/tests.log" action="stop"/>
+ -->
+ <condition property="servers.shutdown.failed">
+ <and>
+ <not><isset property="servers.shutdown.nocheck"/></not>
+ <isfileselected file="output/tests.log">
+ <or>
+ <contains text="Unable to shutdown server properly"/>
+ <not><contains text="[server:stop]"/></not>
+ </or>
+ </isfileselected>
+ </and>
+ </condition>
+ <fail message="Some servers failed to shutdown cleanly."
+ if="servers.shutdown.failed"/>
</target>
<target name="smoke-tests"
@@ -1753,36 +1769,6 @@
<server:stop name="tomcat-sso"/>
</target>
- <target name="tomcat-sso-clustered-tests"
- description="Tomcat tests requiring clustered SSO configured">
-
- <!-- Default jgroups stack to use -->
- <property name="jboss-junit-configuration" value="udp"/>
- <!-- Default configuration to build the test config from -->
- <property name="baseconf" value="all"/>
- <!-- Create the sso enabled tomcat config starting with the all config -->
- <create-cluster-sso-node newconf="tomcat-sso-cluster0" baseconf="${baseconf}"/>
- <create-cluster-sso-node newconf="tomcat-sso-cluster1" baseconf="${baseconf}"/>
-
- <echo message="Modifying the node0 and node1 Tomcat configuration for REPL_SYNC/UseJK"/>
- <http-cluster-node-config-change conf="tomcat-sso-cluster0"/>
- <http-cluster-node-config-change conf="tomcat-sso-cluster1"/>
-
-
- <server:start name="tomcat-sso-cluster0"/>
- <server:start name="tomcat-sso-cluster1"/>
-
- <antcall target="tests-clustering-unit">
- <param name="cluster.includes.refid" value="tc-sso-clustered.includes"/>
- <param name="jboss-junit-configuration" value="tomcat-sso-cluster"/>
- </antcall>
-
- <server:stop name="tomcat-sso-cluster0"/>
- <server:stop name="tomcat-sso-cluster1"/>
-
- <!-- BuddyReplication enabled tests are eliminated as that's not a valid usage -->
- </target>
-
<!-- Tests that require the attribute "UseJBossWebLoader" set to true -->
<target name="tomcat-webctx-tests"
description="Tomcat tests requiring classloader set to the web loader">
@@ -3383,7 +3369,9 @@
<target name="tests-jbossmessaging-cluster"
description="Run JBM in cluster" unless="build.ewp">
- <!-- Default configuration to build the test config from -->
+ <!-- Default jgroups stack to use -->
+ <property name="jboss.default.jgroups.stack" value="udp"/>
+ <!-- Default configuration to build the test config from -->
<property name="baseconf" value="all"/>
<delete dir="${jboss.dist}/server/jbm-cluster1" />
@@ -4180,7 +4168,7 @@
<!-- Test the default UDP stack -->
<antcall target="tests-clustering-configure">
- <param name="jboss-junit-configuration" value="udp"/>
+ <param name="jboss.default.jgroups.stack" value="udp"/>
</antcall>
<server:start name="cluster-udp-0"/>
<server:start name="cluster-udp-1"/>
@@ -4189,7 +4177,7 @@
<!-- Test a TCP stack.-->
<antcall target="tests-clustering-configure">
- <param name="jboss-junit-configuration" value="tcp"/>
+ <param name="jboss.default.jgroups.stack" value="tcp"/>
</antcall>
<server:start name="cluster-tcp-0"/>
<server:start name="cluster-tcp-1"/>
@@ -4199,7 +4187,7 @@
<!-- Test the field UDP stack -->
<antcall target="tests-clustering-field-configure">
<param name="cluster.includes.refid" value="cluster.field.includes"/>
- <param name="jboss-junit-configuration" value="udp"/>
+ <param name="jboss.default.jgroups.stack" value="udp"/>
<param name="jbosstest.cluster.node0.config" value="cluster-field-udp-0"/>
<param name="jbosstest.cluster.node1.config" value="cluster-field-udp-1"/>
</antcall>
@@ -4211,7 +4199,7 @@
<!-- Test the field TCP stack -->
<antcall target="tests-clustering-field-configure">
<param name="cluster.includes.refid" value="cluster.field.includes"/>
- <param name="jboss-junit-configuration" value="tcp"/>
+ <param name="jboss.default.jgroups.stack" value="tcp"/>
<param name="jbosstest.cluster.node0.config" value="cluster-field-tcp-0"/>
<param name="jbosstest.cluster.node1.config" value="cluster-field-tcp-1"/>
</antcall>
Modified: branches/Branch_No_Multicast/testsuite/imports/config/tests-clustering.xml
===================================================================
--- branches/Branch_No_Multicast/testsuite/imports/config/tests-clustering.xml 2010-06-16 17:19:30 UTC (rev 106092)
+++ branches/Branch_No_Multicast/testsuite/imports/config/tests-clustering.xml 2010-06-16 17:51:42 UTC (rev 106093)
@@ -105,39 +105,51 @@
description="Execute clustering tests requiring two nodes.">
<!-- Test the default UDP stack. Run all the tests. -->
<antcall target="tests-clustering">
- <param name="jboss-junit-configuration" value="udp"/>
+ <param name="jboss.default.jgroups.stack" value="udp"/>
</antcall>
<!-- Test a TCP stack but with a more limited set of tests.-->
<antcall target="tests-clustering-multicfg">
- <param name="jboss-junit-configuration" value="tcp"/>
+ <param name="jboss.default.jgroups.stack" value="tcp"/>
</antcall>
<!-- Test a TCPGOSSIP stack but with a more limited set of tests..
<antcall target="create-tcpgossip-test-configs-directories"/>
<antcall target="tests-clustering-multicfg">
- <param name="jboss-junit-configuration" value="tcpgossip"/>
+ <param name="jboss.default.jgroups.stack" value="tcpgossip"/>
</antcall>
-->
<!-- Test a TCP_NIO stack but with a more limited set of tests..
BES 2007/09/06 Eliminated pending final JGroups merge of TCP/TCP_NIO
<antcall target="tests-clustering-multicfg">
- <param name="jboss-junit-configuration" value="tcp_nio"/>
+ <param name="jboss.default.jgroups.stack" value="tcp_nio"/>
</antcall>
-->
<!-- Test user transaction sticky with default stack. Left out of the
other clustering tests because it needs a separate different configuration.
-->
- <antcall target="tests-clustered-ustxsticky"/>
+ <antcall target="tests-clustered-ustxsticky">
+ <param name="jboss.default.jgroups.stack" value="udp"/>
+ </antcall>
+ <antcall target="tests-clustered-profileservice">
+ <param name="jboss.default.jgroups.stack" value="udp"/>
+ </antcall>
+ <antcall target="tomcat-sso-clustered-tests">
+ <param name="jboss.default.jgroups.stack" value="udp"/>
+ </antcall>
</target>
-
+ <target name="foo">
+ <antcall target="tests-clustered-profileservice">
+ <param name="jboss.default.jgroups.stack" value="tcp"/>
+ </antcall>
+ </target>
<target name="tests-clustering-tcpgossip"
description="Execute clustering tests against a TCPGOSSIP-based configuration.">
<!-- Test a TCPGOSSIP stack but with a more limited set of tests..-->
<antcall target="create-tcpgossip-test-configs-directories"/>
<antcall target="tests-clustering-multicfg">
- <param name="jboss-junit-configuration" value="tcpgossip"/>
+ <param name="jboss.default.jgroups.stack" value="tcpgossip"/>
</antcall>
</target>
@@ -145,10 +157,10 @@
<target name="tests-clustering-multicfg">
<!-- If protocol stack wasn't passed in, set to default now -->
- <property name="jboss-junit-configuration" value="udp"/>
+ <property name="jboss.default.jgroups.stack" value="udp"/>
<antcall target="tests-clustering">
- <param name="jboss-junit-configuration" value="${jboss-junit-configuration}"/>
+ <param name="jboss.default.jgroups.stack" value="${jboss.default.jgroups.stack}"/>
<param name="cluster.non.http.includes" value="cluster.multicfg.non.http.includes"/>
<param name="cluster.http.includes" value="cluster.multicfg.http.includes"/>
<param name="cluster.http.field.includes" value="cluster.multicfg.http.field.includes"/>
@@ -157,12 +169,12 @@
</target>
- <!-- Depending on the value of the ${jboss-junit-configuration} variable, uses different JGroups stacks -->
+ <!-- Depending on the value of the ${jboss.default.jgroups.stack} variable, uses different JGroups stacks -->
<target name="tests-clustering"
description="Execute clustering tests requiring two nodes.">
<!-- If configuration values weren't passed in, set them to defaults now -->
- <property name="jboss-junit-configuration" value="udp"/>
+ <property name="jboss.default.jgroups.stack" value="udp"/>
<property name="cluster.non.http.includes" value="cluster.defaultcfg.non.http.includes"/>
<property name="cluster.http.includes" value="cluster.defaultcfg.http.includes"/>
<property name="cluster.http.field.includes" value="cluster.defaultcfg.http.field.includes"/>
@@ -170,41 +182,41 @@
<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.default.jgroups.stack}-0"/>
+ <server:start name="cluster-${jboss.default.jgroups.stack}-1"/>
<echo message="Going to call target tests-clustering-unit for non-HTTP tests"/>
<antcall target="tests-clustering-unit">
<param name="cluster.includes.refid" value="${cluster.non.http.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"/>
+ <param name="jboss-junit-configuration" value="Default-${jboss.default.jgroups.stack}"/>
+ <param name="jbosstest.cluster.node0.config" value="cluster-${jboss.default.jgroups.stack}-0"/>
+ <param name="jbosstest.cluster.node1.config" value="cluster-${jboss.default.jgroups.stack}-1"/>
</antcall>
<echo message="Going to call target tests-clustering-unit for HTTP tests (ASYNC, no BR)"/>
<antcall target="tests-clustering-unit">
<param name="cluster.includes.refid" value="${cluster.http.includes}"/>
- <param name="jboss-junit-configuration" value="Default-${jboss-junit-configuration}"/>
+ <param name="jboss-junit-configuration" value="Default-${jboss.default.jgroups.stack}"/>
<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"/>
+ <param name="jbosstest.cluster.node0.config" value="cluster-${jboss.default.jgroups.stack}-0"/>
+ <param name="jbosstest.cluster.node1.config" value="cluster-${jboss.default.jgroups.stack}-1"/>
</antcall>
<echo message="Going to call target tests-clustering-unit again for FIELD granularity tests (ASYNC, no BR)"/>
<antcall target="tests-clustering-unit">
<param name="cluster.includes.refid" value="${cluster.http.field.includes}"/>
- <param name="jboss-junit-configuration" value="Default-${jboss-junit-configuration}"/>
+ <param name="jboss-junit-configuration" value="Default-${jboss.default.jgroups.stack}"/>
<param name="jbosstest.cluster.web.cache.config" value="field-granularity-session-cache"/>
<param name="jbosstest.cluster.web.cache.pojo" value="true"/>
- <param name="jbosstest.cluster.node0.config" value="cluster-${jboss-junit-configuration}-0"/>
- <param name="jbosstest.cluster.node1.config" value="cluster-${jboss-junit-configuration}-1"/>
+ <param name="jbosstest.cluster.node0.config" value="cluster-${jboss.default.jgroups.stack}-0"/>
+ <param name="jbosstest.cluster.node1.config" value="cluster-${jboss.default.jgroups.stack}-1"/>
</antcall>
- <server:stop name="cluster-${jboss-junit-configuration}-0"/>
- <server:stop name="cluster-${jboss-junit-configuration}-1"/>
+ <server:stop name="cluster-${jboss.default.jgroups.stack}-0"/>
+ <server:stop name="cluster-${jboss.default.jgroups.stack}-1"/>
<sleep seconds="4"/>
@@ -212,38 +224,38 @@
<antcall target="tests-clustering-sync-configure"/>
- <server:start name="cluster-${jboss-junit-configuration}-SYNC-0"/>
- <server:start name="cluster-${jboss-junit-configuration}-SYNC-1"/>
+ <server:start name="cluster-${jboss.default.jgroups.stack}-SYNC-0"/>
+ <server:start name="cluster-${jboss.default.jgroups.stack}-SYNC-1"/>
<antcall target="tests-clustering-unit">
<param name="cluster.includes.refid" value="${cluster.http.jk.includes}"/>
- <param name="jboss-junit-configuration" value="SyncModeNUseJvm-${jboss-junit-configuration}"/>
+ <param name="jboss-junit-configuration" value="SyncModeNUseJvm-${jboss.default.jgroups.stack}"/>
<param name="jbosstest.cluster.web.cache.config" value="sync-standard-session-cache"/>
- <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"/>
+ <param name="jbosstest.cluster.node0.config" value="cluster-${jboss.default.jgroups.stack}-SYNC-0"/>
+ <param name="jbosstest.cluster.node1.config" value="cluster-${jboss.default.jgroups.stack}-SYNC-1"/>
</antcall>
<antcall target="tests-clustering-unit">
<param name="cluster.includes.refid" value="${cluster.http.includes}"/>
- <param name="jboss-junit-configuration" value="SyncModeNUseJvm-${jboss-junit-configuration}"/>
+ <param name="jboss-junit-configuration" value="SyncModeNUseJvm-${jboss.default.jgroups.stack}"/>
<param name="jbosstest.cluster.web.cache.config" value="sync-standard-session-cache"/>
- <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"/>
+ <param name="jbosstest.cluster.node0.config" value="cluster-${jboss.default.jgroups.stack}-SYNC-0"/>
+ <param name="jbosstest.cluster.node1.config" value="cluster-${jboss.default.jgroups.stack}-SYNC-1"/>
</antcall>
<echo message="Going to call target tests-clustering-unit again for FIELD granularity tests (SYNC, no BR)"/>
<antcall target="tests-clustering-unit">
<param name="cluster.includes.refid" value="${cluster.http.field.includes}"/>
- <param name="jboss-junit-configuration" value="SyncModeNUseJvm-${jboss-junit-configuration}"/>
+ <param name="jboss-junit-configuration" value="SyncModeNUseJvm-${jboss.default.jgroups.stack}"/>
<param name="jbosstest.cluster.web.cache.config" value="sync-field-granularity-session-cache"/>
<param name="jbosstest.cluster.web.cache.pojo" value="true"/>
- <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"/>
+ <param name="jbosstest.cluster.node0.config" value="cluster-${jboss.default.jgroups.stack}-SYNC-0"/>
+ <param name="jbosstest.cluster.node1.config" value="cluster-${jboss.default.jgroups.stack}-SYNC-1"/>
</antcall>
- <server:stop name="cluster-${jboss-junit-configuration}-SYNC-0"/>
- <server:stop name="cluster-${jboss-junit-configuration}-SYNC-1"/>
+ <server:stop name="cluster-${jboss.default.jgroups.stack}-SYNC-0"/>
+ <server:stop name="cluster-${jboss.default.jgroups.stack}-SYNC-1"/>
<sleep seconds="4"/>
@@ -251,49 +263,49 @@
<antcall target="tests-clustering-br-configure"/>
- <server:start name="cluster-${jboss-junit-configuration}-BR-0"/>
- <server:start name="cluster-${jboss-junit-configuration}-BR-1"/>
+ <server:start name="cluster-${jboss.default.jgroups.stack}-BR-0"/>
+ <server:start name="cluster-${jboss.default.jgroups.stack}-BR-1"/>
<echo message="Going to call target tests-clustering-unit again with new configuration (SYNC, BR)"/>
<antcall target="tests-clustering-unit">
<param name="cluster.includes.refid" value="${cluster.http.includes}"/>
- <param name="jboss-junit-configuration" value="BuddyReplEnabled-${jboss-junit-configuration}"/>
+ <param name="jboss-junit-configuration" value="BuddyReplEnabled-${jboss.default.jgroups.stack}"/>
<param name="jbosstest.cluster.web.cache.config" value="br-enabled-sync-standard-session-cache"/>
<param name="jbosstest.cluster.web.cache.br" value="true"/>
- <param name="jbosstest.cluster.node0.config" value="cluster-${jboss-junit-configuration}-BR-0"/>
- <param name="jbosstest.cluster.node1.config" value="cluster-${jboss-junit-configuration}-BR-1"/>
+ <param name="jbosstest.cluster.node0.config" value="cluster-${jboss.default.jgroups.stack}-BR-0"/>
+ <param name="jbosstest.cluster.node1.config" value="cluster-${jboss.default.jgroups.stack}-BR-1"/>
</antcall>
<echo message="Going to call target tests-clustering-unit again for FIELD granularity tests with new configuration (SYNC, BR)"/>
<antcall target="tests-clustering-unit">
<param name="cluster.includes.refid" value="${cluster.http.field.includes}"/>
- <param name="jboss-junit-configuration" value="BuddyReplEnabled-${jboss-junit-configuration}"/>
+ <param name="jboss-junit-configuration" value="BuddyReplEnabled-${jboss.default.jgroups.stack}"/>
<param name="jbosstest.cluster.web.cache.config" value="br-enabled-sync-field-granularity-session-cache"/>
<param name="jbosstest.cluster.web.cache.br" value="true"/>
<param name="jbosstest.cluster.web.cache.pojo" value="true"/>
- <param name="jbosstest.cluster.node0.config" value="cluster-${jboss-junit-configuration}-BR-0"/>
- <param name="jbosstest.cluster.node1.config" value="cluster-${jboss-junit-configuration}-BR-1"/>
+ <param name="jbosstest.cluster.node0.config" value="cluster-${jboss.default.jgroups.stack}-BR-0"/>
+ <param name="jbosstest.cluster.node1.config" value="cluster-${jboss.default.jgroups.stack}-BR-1"/>
</antcall>
- <server:stop name="cluster-${jboss-junit-configuration}-BR-0"/>
- <server:stop name="cluster-${jboss-junit-configuration}-BR-1"/>
+ <server:stop name="cluster-${jboss.default.jgroups.stack}-BR-0"/>
+ <server:stop name="cluster-${jboss.default.jgroups.stack}-BR-1"/>
</target>
<target name="tests-clustering-configure" unless="${tests.clustering.skip.startup}">
<!-- Default configuration to build the test config from -->
<property name="baseconf" value="all"/>
- <create-cluster-node-from-baseconf conf="cluster-${jboss-junit-configuration}-0" baseconf="${baseconf}"/>
- <create-cluster-node-from-baseconf conf="cluster-${jboss-junit-configuration}-1" baseconf="${baseconf}"/>
+ <create-cluster-node-from-baseconf conf="cluster-${jboss.default.jgroups.stack}-0" baseconf="${baseconf}"/>
+ <create-cluster-node-from-baseconf conf="cluster-${jboss.default.jgroups.stack}-1" baseconf="${baseconf}"/>
</target>
<target name="tests-clustering-field-configure" unless="${tests.clustering.skip.startup}">
<!-- Default configuration to build the test config from -->
<property name="baseconf" value="all"/>
- <create-cluster-node-from-baseconf conf="cluster-field-${jboss-junit-configuration}-0" baseconf="${baseconf}"/>
- <create-cluster-node-from-baseconf conf="cluster-field-${jboss-junit-configuration}-1" baseconf="${baseconf}"/>
+ <create-cluster-node-from-baseconf conf="cluster-field-${jboss.default.jgroups.stack}-0" baseconf="${baseconf}"/>
+ <create-cluster-node-from-baseconf conf="cluster-field-${jboss.default.jgroups.stack}-1" baseconf="${baseconf}"/>
</target>
<target name="tests-clustering-sync-configure" unless="${tests.clustering.skip.startup}">
@@ -301,12 +313,12 @@
<!-- Default configuration to build the test config from -->
<property name="baseconf" value="all"/>
- <create-cluster-node-from-baseconf conf="cluster-${jboss-junit-configuration}-SYNC-0" baseconf="${baseconf}"/>
- <create-cluster-node-from-baseconf conf="cluster-${jboss-junit-configuration}-SYNC-1" baseconf="${baseconf}"/>
+ <create-cluster-node-from-baseconf conf="cluster-${jboss.default.jgroups.stack}-SYNC-0" baseconf="${baseconf}"/>
+ <create-cluster-node-from-baseconf conf="cluster-${jboss.default.jgroups.stack}-SYNC-1" baseconf="${baseconf}"/>
<echo message="Modifying the node0 and node1 Tomcat configuration for JK"/>
- <http-cluster-node-config-change conf="cluster-${jboss-junit-configuration}-SYNC-0"/>
- <http-cluster-node-config-change conf="cluster-${jboss-junit-configuration}-SYNC-1"/>
+ <http-cluster-node-config-change conf="cluster-${jboss.default.jgroups.stack}-SYNC-0"/>
+ <http-cluster-node-config-change conf="cluster-${jboss.default.jgroups.stack}-SYNC-1"/>
</target>
<target name="tests-clustering-field-sync-configure" unless="${tests.clustering.skip.startup}">
@@ -314,12 +326,12 @@
<!-- Default configuration to build the test config from -->
<property name="baseconf" value="all"/>
- <create-cluster-node-from-baseconf conf="cluster-field-${jboss-junit-configuration}-SYNC-0" baseconf="${baseconf}"/>
- <create-cluster-node-from-baseconf conf="cluster-field-${jboss-junit-configuration}-SYNC-1" baseconf="${baseconf}"/>
+ <create-cluster-node-from-baseconf conf="cluster-field-${jboss.default.jgroups.stack}-SYNC-0" baseconf="${baseconf}"/>
+ <create-cluster-node-from-baseconf conf="cluster-field-${jboss.default.jgroups.stack}-SYNC-1" baseconf="${baseconf}"/>
<echo message="Modifying the node0 and node1 Tomcat configuration for JK"/>
- <http-cluster-node-config-change conf="cluster-field-${jboss-junit-configuration}-SYNC-0"/>
- <http-cluster-node-config-change conf="cluster-field-${jboss-junit-configuration}-SYNC-1"/>
+ <http-cluster-node-config-change conf="cluster-field-${jboss.default.jgroups.stack}-SYNC-0"/>
+ <http-cluster-node-config-change conf="cluster-field-${jboss.default.jgroups.stack}-SYNC-1"/>
</target>
<target name="tests-clustering-br-configure" unless="${tests.clustering.skip.startup}">
@@ -327,12 +339,12 @@
<!-- Default configuration to build the test config from -->
<property name="baseconf" value="all"/>
- <create-cluster-node-from-baseconf conf="cluster-${jboss-junit-configuration}-BR-0" baseconf="${baseconf}"/>
- <create-cluster-node-from-baseconf conf="cluster-${jboss-junit-configuration}-BR-1" baseconf="${baseconf}"/>
+ <create-cluster-node-from-baseconf conf="cluster-${jboss.default.jgroups.stack}-BR-0" baseconf="${baseconf}"/>
+ <create-cluster-node-from-baseconf conf="cluster-${jboss.default.jgroups.stack}-BR-1" baseconf="${baseconf}"/>
<echo message="Modifying the node0 and node1 Tomcat configuration for JK"/>
- <http-cluster-node-config-change conf="cluster-${jboss-junit-configuration}-BR-0"/>
- <http-cluster-node-config-change conf="cluster-${jboss-junit-configuration}-BR-1"/>
+ <http-cluster-node-config-change conf="cluster-${jboss.default.jgroups.stack}-BR-0"/>
+ <http-cluster-node-config-change conf="cluster-${jboss.default.jgroups.stack}-BR-1"/>
</target>
<target name="tests-clustering-field-br-configure" unless="${tests.clustering.skip.startup}">
@@ -340,12 +352,12 @@
<!-- Default configuration to build the test config from -->
<property name="baseconf" value="all"/>
- <create-cluster-node-from-baseconf conf="cluster-field-${jboss-junit-configuration}-BR-0" baseconf="${baseconf}"/>
- <create-cluster-node-from-baseconf conf="cluster-field-${jboss-junit-configuration}-BR-1" baseconf="${baseconf}"/>
+ <create-cluster-node-from-baseconf conf="cluster-field-${jboss.default.jgroups.stack}-BR-0" baseconf="${baseconf}"/>
+ <create-cluster-node-from-baseconf conf="cluster-field-${jboss.default.jgroups.stack}-BR-1" baseconf="${baseconf}"/>
<echo message="Modifying the node0 and node1 Tomcat configuration for JK"/>
- <http-cluster-node-config-change conf="cluster-field-${jboss-junit-configuration}-BR-0"/>
- <http-cluster-node-config-change conf="cluster-field-${jboss-junit-configuration}-BR-1"/>
+ <http-cluster-node-config-change conf="cluster-field-${jboss.default.jgroups.stack}-BR-0"/>
+ <http-cluster-node-config-change conf="cluster-field-${jboss.default.jgroups.stack}-BR-1"/>
</target>
<target name="tests-clustered-classloader-leak">
@@ -374,7 +386,7 @@
<target name="tests-clustered-profileservice">
<!-- Default jgroups stack to use -->
- <property name="jboss-junit-configuration" value="udp"/>
+ <property name="jboss.default.jgroups.stack" value="udp"/>
<!-- Default configuration to build the test config from -->
<property name="baseconf" value="all"/>
@@ -389,7 +401,7 @@
<antcall target="tests-clustering-unit">
<param name="cluster.includes.refid" value="cluster.profileservice.includes"/>
- <param name="jboss-junit-configuration" value="ClusteredProfileService"/>
+ <param name="jboss-junit-configuration" value="Default-${jboss.default.jgroups.stack}"/>
<param name="jbosstest.cluster.node0.config" value="cluster-profilesvc-0"/>
<param name="jbosstest.cluster.node1.config" value="cluster-profilesvc-1"/>
</antcall>
@@ -402,7 +414,7 @@
<target name="tests-clustered-ustxsticky">
<!-- Default jgroups stack to use -->
- <property name="jboss-junit-configuration" value="udp"/>
+ <property name="jboss.default.jgroups.stack" value="udp"/>
<!-- Default configuration to build the test config from -->
<property name="baseconf" value="all"/>
@@ -417,7 +429,7 @@
<antcall target="tests-clustering-unit">
<param name="cluster.includes.refid" value="cluster.ustxsticky.includes"/>
- <param name="jboss-junit-configuration" value="ClusteredUsTxSticky"/>
+ <param name="jboss-junit-configuration" value="Default-${jboss.default.jgroups.stack}"/>
<param name="jbosstest.cluster.node0.config" value="cluster-ustxsticky-0"/>
<param name="jbosstest.cluster.node1.config" value="cluster-ustxsticky-1"/>
</antcall>
@@ -430,14 +442,24 @@
<target name="tests-clustering-ec2">
<!-- Default jgroups stack to use -->
- <property name="jboss-junit-configuration" value="tcp"/>
+ <property name="jboss.default.jgroups.stack" value="tcp"/>
<!-- Default configuration to build the test config from -->
<property name="baseconf" value="cluster-ec2"/>
-
- <antcall target="tests-clustering" inheritrefs="true"/>
+
+ <!-- Create tests-configs content for cluster-tcp-0/1 from the cluster-udp content -->
+ <mkdir dir="${build.resources}/test-configs/cluster-tcp-0"/>
+ <copy todir="${build.resources}/test-configs/cluster-tcp-0">
+ <fileset dir="${build.resources}/test-configs/cluster-udp-0" />
+ </copy>
+ <mkdir dir="${build.resources}/test-configs/cluster-tcp-1"/>
+ <copy todir="${build.resources}/test-configs/cluster-tcp-1">
+ <fileset dir="${build.resources}/test-configs/cluster-udp-1" />
+ </copy>
+ <antcall target="tests-clustering-configure" inheritRefs="true"/>
+ <!--<antcall target="tests-clustering" inheritrefs="true"/>
<antcall target="tests-clustered-profileservice" inheritrefs="true"/>
<antcall target="tests-clustered-ustxsticky" inheritrefs="true"/>
- <antcall target="tomcat-sso-clustered-tests" inheritrefs="true"/>
+ <antcall target="tomcat-sso-clustered-tests" inheritrefs="true"/>-->
</target>
<!--
@@ -496,6 +518,36 @@
<fileset dir="${build.resources}/test-configs/cluster-tcpgossip-1"/>
</copy>
</target>
+
+ <target name="tomcat-sso-clustered-tests"
+ description="Tomcat tests requiring clustered SSO configured">
+
+ <!-- Default jgroups stack to use -->
+ <property name="jboss.default.jgroups.stack" value="udp"/>
+ <!-- Default configuration to build the test config from -->
+ <property name="baseconf" value="all"/>
+ <!-- Create the sso enabled tomcat config starting with the all config -->
+ <create-cluster-sso-node newconf="tomcat-sso-cluster0" baseconf="${baseconf}"/>
+ <create-cluster-sso-node newconf="tomcat-sso-cluster1" baseconf="${baseconf}"/>
+
+ <echo message="Modifying the node0 and node1 Tomcat configuration for REPL_SYNC/UseJK"/>
+ <http-cluster-node-config-change conf="tomcat-sso-cluster0"/>
+ <http-cluster-node-config-change conf="tomcat-sso-cluster1"/>
+
+
+ <server:start name="tomcat-sso-cluster0"/>
+ <server:start name="tomcat-sso-cluster1"/>
+
+ <antcall target="tests-clustering-unit">
+ <param name="cluster.includes.refid" value="tc-sso-clustered.includes"/>
+ <param name="jboss-junit-configuration" value="Default-${jboss.default.jgroups.stack}"/>
+ </antcall>
+
+ <server:stop name="tomcat-sso-cluster0"/>
+ <server:stop name="tomcat-sso-cluster1"/>
+
+ <!-- BuddyReplication enabled tests are eliminated as that's not a valid usage -->
+ </target>
<!-- Executes a set of tests in a clustered environment -->
@@ -575,247 +627,247 @@
<!-- Launches a test assuming the AS instances are already running -->
<target name="one-cluster-test-nostart" if="test">
- <property name="jboss-junit-configuration" value="udp"/>
+ <property name="jboss.default.jgroups.stack" value="udp"/>
<echo message="Going to call target tests-clustering-unit for ${test}"/>
<antcall target="tests-clustering-unit">
<param name="cluster.includes.refid" value="one.test.includes"/>
- <param name="jboss-junit-configuration" value="Default-${jboss-junit-configuration}"/>
+ <param name="jboss-junit-configuration" value="Default-${jboss.default.jgroups.stack}"/>
<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"/>
+ <param name="jbosstest.cluster.node0.config" value="cluster-${jboss.default.jgroups.stack}-0"/>
+ <param name="jbosstest.cluster.node1.config" value="cluster-${jboss.default.jgroups.stack}-1"/>
</antcall>
</target>
<target name="one-cluster-test-nostart-field" if="test">
- <property name="jboss-junit-configuration" value="udp"/>
+ <property name="jboss.default.jgroups.stack" value="udp"/>
<echo message="Going to call target tests-clustering-unit for ${test}"/>
<antcall target="tests-clustering-unit">
<param name="cluster.includes.refid" value="one.test.includes"/>
- <param name="jboss-junit-configuration" value="Default-${jboss-junit-configuration}"/>
+ <param name="jboss-junit-configuration" value="Default-${jboss.default.jgroups.stack}"/>
<param name="jbosstest.cluster.web.cache.config" value="field-granularity-session-cache"/>
<param name="jbosstest.cluster.web.cache.pojo" value="true"/>
- <param name="jbosstest.cluster.node0.config" value="cluster-field-${jboss-junit-configuration}-0"/>
- <param name="jbosstest.cluster.node1.config" value="cluster-field-${jboss-junit-configuration}-1"/>
+ <param name="jbosstest.cluster.node0.config" value="cluster-field-${jboss.default.jgroups.stack}-0"/>
+ <param name="jbosstest.cluster.node1.config" value="cluster-field-${jboss.default.jgroups.stack}-1"/>
</antcall>
</target>
<target name="one-cluster-test" if="test">
- <property name="jboss-junit-configuration" value="udp"/>
+ <property name="jboss.default.jgroups.stack" 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"/>
+ <server:start name="cluster-${jboss.default.jgroups.stack}-0"/>
+ <server:start name="cluster-${jboss.default.jgroups.stack}-1"/>
<echo message="Going to call target tests-clustering-unit for ${test}"/>
<antcall target="tests-clustering-unit">
<param name="cluster.includes.refid" value="one.test.includes"/>
- <param name="jboss-junit-configuration" value="Default-${jboss-junit-configuration}"/>
+ <param name="jboss-junit-configuration" value="Default-${jboss.default.jgroups.stack}"/>
<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"/>
+ <param name="jbosstest.cluster.node0.config" value="cluster-${jboss.default.jgroups.stack}-0"/>
+ <param name="jbosstest.cluster.node1.config" value="cluster-${jboss.default.jgroups.stack}-1"/>
</antcall>
- <server:stop name="cluster-${jboss-junit-configuration}-0"/>
- <server:stop name="cluster-${jboss-junit-configuration}-1"/>
+ <server:stop name="cluster-${jboss.default.jgroups.stack}-0"/>
+ <server:stop name="cluster-${jboss.default.jgroups.stack}-1"/>
</target>
<target name="one-cluster-test-field" if="test">
- <property name="jboss-junit-configuration" value="udp"/>
+ <property name="jboss.default.jgroups.stack" value="udp"/>
<antcall target="tests-clustering-field-configure" inheritRefs="true"/>
- <server:start name="cluster-field-${jboss-junit-configuration}-0"/>
- <server:start name="cluster-field-${jboss-junit-configuration}-1"/>
+ <server:start name="cluster-field-${jboss.default.jgroups.stack}-0"/>
+ <server:start name="cluster-field-${jboss.default.jgroups.stack}-1"/>
<echo message="Going to call target tests-clustering-unit for ${test}"/>
<antcall target="tests-clustering-unit">
<param name="cluster.includes.refid" value="one.test.includes"/>
- <param name="jboss-junit-configuration" value="Default-${jboss-junit-configuration}"/>
+ <param name="jboss-junit-configuration" value="Default-${jboss.default.jgroups.stack}"/>
<param name="jbosstest.cluster.web.cache.config" value="field-granularity-session-cache"/>
<param name="jbosstest.cluster.web.cache.pojo" value="true"/>
- <param name="jbosstest.cluster.node0.config" value="cluster-field-${jboss-junit-configuration}-0"/>
- <param name="jbosstest.cluster.node1.config" value="cluster-field-${jboss-junit-configuration}-1"/>
+ <param name="jbosstest.cluster.node0.config" value="cluster-field-${jboss.default.jgroups.stack}-0"/>
+ <param name="jbosstest.cluster.node1.config" value="cluster-field-${jboss.default.jgroups.stack}-1"/>
</antcall>
- <server:stop name="cluster-field-${jboss-junit-configuration}-0"/>
- <server:stop name="cluster-field-${jboss-junit-configuration}-1"/>
+ <server:stop name="cluster-field-${jboss.default.jgroups.stack}-0"/>
+ <server:stop name="cluster-field-${jboss.default.jgroups.stack}-1"/>
</target>
<target name="one-cluster-test-br" if="test">
- <property name="jboss-junit-configuration" value="udp"/>
+ <property name="jboss.default.jgroups.stack" value="udp"/>
<antcall target="tests-clustering-br-configure" inheritRefs="true"/>
- <server:start name="cluster-${jboss-junit-configuration}-BR-0"/>
- <server:start name="cluster-${jboss-junit-configuration}-BR-1"/>
+ <server:start name="cluster-${jboss.default.jgroups.stack}-BR-0"/>
+ <server:start name="cluster-${jboss.default.jgroups.stack}-BR-1"/>
<echo message="Going to call target tests-clustering-unit for ${test}"/>
<antcall target="tests-clustering-unit">
<param name="cluster.includes.refid" value="one.test.includes"/>
- <param name="jboss-junit-configuration" value="BuddyReplEnabled-${jboss-junit-configuration}"/>
+ <param name="jboss-junit-configuration" value="BuddyReplEnabled-${jboss.default.jgroups.stack}"/>
<param name="jbosstest.cluster.web.cache.config" value="br-enabled-sync-standard-session-cache"/>
<param name="jbosstest.cluster.web.cache.br" value="true"/>
- <param name="jbosstest.cluster.node0.config" value="cluster-${jboss-junit-configuration}-BR-0"/>
- <param name="jbosstest.cluster.node1.config" value="cluster-${jboss-junit-configuration}-BR-1"/>
+ <param name="jbosstest.cluster.node0.config" value="cluster-${jboss.default.jgroups.stack}-BR-0"/>
+ <param name="jbosstest.cluster.node1.config" value="cluster-${jboss.default.jgroups.stack}-BR-1"/>
</antcall>
- <server:stop name="cluster-${jboss-junit-configuration}-BR-0"/>
- <server:stop name="cluster-${jboss-junit-configuration}-BR-1"/>
+ <server:stop name="cluster-${jboss.default.jgroups.stack}-BR-0"/>
+ <server:stop name="cluster-${jboss.default.jgroups.stack}-BR-1"/>
</target>
<target name="one-cluster-test-field-br" if="test">
- <property name="jboss-junit-configuration" value="udp"/>
+ <property name="jboss.default.jgroups.stack" value="udp"/>
<antcall target="tests-clustering-field-br-configure" inheritRefs="true"/>
- <server:start name="cluster-field-${jboss-junit-configuration}-BR-0"/>
- <server:start name="cluster-field-${jboss-junit-configuration}-BR-1"/>
+ <server:start name="cluster-field-${jboss.default.jgroups.stack}-BR-0"/>
+ <server:start name="cluster-field-${jboss.default.jgroups.stack}-BR-1"/>
<echo message="Going to call target tests-clustering-unit for ${test}"/>
<antcall target="tests-clustering-unit">
<param name="cluster.includes.refid" value="one.test.includes"/>
- <param name="jboss-junit-configuration" value="BuddyReplEnabled-${jboss-junit-configuration}"/>
+ <param name="jboss-junit-configuration" value="BuddyReplEnabled-${jboss.default.jgroups.stack}"/>
<param name="jbosstest.cluster.web.cache.config" value="br-enabled-sync-field-granularity-session-cache"/>
<param name="jbosstest.cluster.web.cache.br" value="true"/>
<param name="jbosstest.cluster.web.cache.pojo" value="true"/>
- <param name="jbosstest.cluster.node0.config" value="cluster-field-${jboss-junit-configuration}-BR-0"/>
- <param name="jbosstest.cluster.node1.config" value="cluster-field-${jboss-junit-configuration}-BR-1"/>
+ <param name="jbosstest.cluster.node0.config" value="cluster-field-${jboss.default.jgroups.stack}-BR-0"/>
+ <param name="jbosstest.cluster.node1.config" value="cluster-field-${jboss.default.jgroups.stack}-BR-1"/>
</antcall>
- <server:stop name="cluster-field-${jboss-junit-configuration}-BR-0"/>
- <server:stop name="cluster-field-${jboss-junit-configuration}-BR-1"/>
+ <server:stop name="cluster-field-${jboss.default.jgroups.stack}-BR-0"/>
+ <server:stop name="cluster-field-${jboss.default.jgroups.stack}-BR-1"/>
</target>
<!-- Runs only the non-http tests -->
<target name="tests-clustering-non-http">
- <property name="jboss-junit-configuration" value="udp"/>
+ <property name="jboss.default.jgroups.stack" 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"/>
+ <server:start name="cluster-${jboss.default.jgroups.stack}-0"/>
+ <server:start name="cluster-${jboss.default.jgroups.stack}-1"/>
<echo message="Going to call target tests-clustering-unit for ${test}"/>
<antcall target="tests-clustering-unit">
<param name="cluster.includes.refid" value="cluster.defaultcfg.non.http.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"/>
+ <param name="jboss-junit-configuration" value="Default-${jboss.default.jgroups.stack}"/>
+ <param name="jbosstest.cluster.node0.config" value="cluster-${jboss.default.jgroups.stack}-0"/>
+ <param name="jbosstest.cluster.node1.config" value="cluster-${jboss.default.jgroups.stack}-1"/>
</antcall>
- <server:stop name="cluster-${jboss-junit-configuration}-0"/>
- <server:stop name="cluster-${jboss-junit-configuration}-1"/>
+ <server:stop name="cluster-${jboss.default.jgroups.stack}-0"/>
+ <server:stop name="cluster-${jboss.default.jgroups.stack}-1"/>
</target>
<!-- Runs only the basic http tests (ASYNC, no BR) -->
<target name="tests-clustering-http">
- <property name="jboss-junit-configuration" value="udp"/>
+ <property name="jboss.default.jgroups.stack" 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"/>
+ <server:start name="cluster-${jboss.default.jgroups.stack}-0"/>
+ <server:start name="cluster-${jboss.default.jgroups.stack}-1"/>
<antcall target="tests-clustering-unit">
<param name="cluster.includes.refid" value="cluster.defaultcfg.http.includes"/>
- <param name="jboss-junit-configuration" value="Default-${jboss-junit-configuration}"/>
+ <param name="jboss-junit-configuration" value="Default-${jboss.default.jgroups.stack}"/>
<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"/>
+ <param name="jbosstest.cluster.node0.config" value="cluster-${jboss.default.jgroups.stack}-0"/>
+ <param name="jbosstest.cluster.node1.config" value="cluster-${jboss.default.jgroups.stack}-1"/>
</antcall>
- <server:stop name="cluster-${jboss-junit-configuration}-0"/>
- <server:stop name="cluster-${jboss-junit-configuration}-1"/>
+ <server:stop name="cluster-${jboss.default.jgroups.stack}-0"/>
+ <server:stop name="cluster-${jboss.default.jgroups.stack}-1"/>
</target>
<!-- Runs only the basic http tests (ASYNC, with BR) -->
<target name="tests-clustering-http-br">
- <property name="jboss-junit-configuration" value="udp"/>
+ <property name="jboss.default.jgroups.stack" value="udp"/>
<antcall target="tests-clustering-br-configure" inheritRefs="true"/>
- <server:start name="cluster-${jboss-junit-configuration}-BR-0"/>
- <server:start name="cluster-${jboss-junit-configuration}-BR-1"/>
+ <server:start name="cluster-${jboss.default.jgroups.stack}-BR-0"/>
+ <server:start name="cluster-${jboss.default.jgroups.stack}-BR-1"/>
<antcall target="tests-clustering-unit">
<param name="cluster.includes.refid" value="cluster.defaultcfg.http.includes"/>
- <param name="jboss-junit-configuration" value="BuddyReplEnabled-${jboss-junit-configuration}"/>
+ <param name="jboss-junit-configuration" value="BuddyReplEnabled-${jboss.default.jgroups.stack}"/>
<param name="jbosstest.cluster.web.cache.config" value="br-enabled-sync-standard-session-cache"/>
<param name="jbosstest.cluster.web.cache.br" value="true"/>
- <param name="jbosstest.cluster.node0.config" value="cluster-${jboss-junit-configuration}-BR-0"/>
- <param name="jbosstest.cluster.node1.config" value="cluster-${jboss-junit-configuration}-BR-1"/>
+ <param name="jbosstest.cluster.node0.config" value="cluster-${jboss.default.jgroups.stack}-BR-0"/>
+ <param name="jbosstest.cluster.node1.config" value="cluster-${jboss.default.jgroups.stack}-BR-1"/>
</antcall>
- <server:stop name="cluster-${jboss-junit-configuration}-BR-0"/>
- <server:stop name="cluster-${jboss-junit-configuration}-BR-1"/>
+ <server:stop name="cluster-${jboss.default.jgroups.stack}-BR-0"/>
+ <server:stop name="cluster-${jboss.default.jgroups.stack}-BR-1"/>
</target>
<!-- Runs only the basic field tests (ASYNC, no BR) -->
<target name="tests-clustering-field">
- <property name="jboss-junit-configuration" value="udp"/>
+ <property name="jboss.default.jgroups.stack" value="udp"/>
<antcall target="tests-clustering-field-configure" inheritRefs="true"/>
- <server:start name="cluster-field-${jboss-junit-configuration}-0"/>
- <server:start name="cluster-field-${jboss-junit-configuration}-1"/>
+ <server:start name="cluster-field-${jboss.default.jgroups.stack}-0"/>
+ <server:start name="cluster-field-${jboss.default.jgroups.stack}-1"/>
<antcall target="tests-clustering-unit">
<param name="cluster.includes.refid" value="cluster.defaultcfg.http.field.includes"/>
- <param name="jboss-junit-configuration" value="Default-${jboss-junit-configuration}"/>
+ <param name="jboss-junit-configuration" value="Default-${jboss.default.jgroups.stack}"/>
<param name="jbosstest.cluster.web.cache.config" value="field-granularity-session-cache"/>
<param name="jbosstest.cluster.web.cache.pojo" value="true"/>
- <param name="jbosstest.cluster.node0.config" value="cluster-field-${jboss-junit-configuration}-0"/>
- <param name="jbosstest.cluster.node1.config" value="cluster-field-${jboss-junit-configuration}-1"/>
+ <param name="jbosstest.cluster.node0.config" value="cluster-field-${jboss.default.jgroups.stack}-0"/>
+ <param name="jbosstest.cluster.node1.config" value="cluster-field-${jboss.default.jgroups.stack}-1"/>
</antcall>
- <server:stop name="cluster-field-${jboss-junit-configuration}-0"/>
- <server:stop name="cluster-field-${jboss-junit-configuration}-1"/>
+ <server:stop name="cluster-field-${jboss.default.jgroups.stack}-0"/>
+ <server:stop name="cluster-field-${jboss.default.jgroups.stack}-1"/>
</target>
<!-- Runs only the basic field tests (SYNC, with BR) -->
<target name="tests-clustering-field-br">
- <property name="jboss-junit-configuration" value="udp"/>
+ <property name="jboss.default.jgroups.stack" value="udp"/>
<antcall target="tests-clustering-field-br-configure" inheritRefs="true"/>
- <server:start name="cluster-field-${jboss-junit-configuration}-BR-0"/>
- <server:start name="cluster-field-${jboss-junit-configuration}-BR-1"/>
+ <server:start name="cluster-field-${jboss.default.jgroups.stack}-BR-0"/>
+ <server:start name="cluster-field-${jboss.default.jgroups.stack}-BR-1"/>
<antcall target="tests-clustering-unit">
<param name="cluster.includes.refid" value="cluster.defaultcfg.http.field.includes"/>
- <param name="jboss-junit-configuration" value="BuddyReplEnabled-${jboss-junit-configuration}"/>
+ <param name="jboss-junit-configuration" value="BuddyReplEnabled-${jboss.default.jgroups.stack}"/>
<param name="jbosstest.cluster.web.cache.config" value="br-enabled-sync-field-granularity-session-cache"/>
<param name="jbosstest.cluster.web.cache.br" value="true"/>
<param name="jbosstest.cluster.web.cache.pojo" value="true"/>
- <param name="jbosstest.cluster.node0.config" value="cluster-field-${jboss-junit-configuration}-BR-0"/>
- <param name="jbosstest.cluster.node1.config" value="cluster-field-${jboss-junit-configuration}-BR-1"/>
+ <param name="jbosstest.cluster.node0.config" value="cluster-field-${jboss.default.jgroups.stack}-BR-0"/>
+ <param name="jbosstest.cluster.node1.config" value="cluster-field-${jboss.default.jgroups.stack}-BR-1"/>
</antcall>
- <server:stop name="cluster-field-${jboss-junit-configuration}-BR-0"/>
- <server:stop name="cluster-field-${jboss-junit-configuration}-BR-1"/>
+ <server:stop name="cluster-field-${jboss.default.jgroups.stack}-BR-0"/>
+ <server:stop name="cluster-field-${jboss.default.jgroups.stack}-BR-1"/>
</target>
Modified: branches/Branch_No_Multicast/testsuite/imports/server-config.xml
===================================================================
--- branches/Branch_No_Multicast/testsuite/imports/server-config.xml 2010-06-16 17:19:30 UTC (rev 106092)
+++ branches/Branch_No_Multicast/testsuite/imports/server-config.xml 2010-06-16 17:51:42 UTC (rev 106093)
@@ -953,7 +953,7 @@
<sysproperty key="jboss.messaging.ServerPeerID" value="0" />
<sysproperty key="xb.builder.useUnorderedSequence" value="true" />
<!-- Allow this config to be used to test the cluster-ec2 profile -->
- <sysproperty key="jboss.default.jgroups.stack" value="${jboss-junit-configuration}" />
+ <sysproperty key="jboss.default.jgroups.stack" value="${jboss.default.jgroups.stack}" />
<sysproperty key="jboss.jgroups.s3_ping.access_key" value="${s3_ping.access_key}" />
<sysproperty key="jboss.jgroups.s3_ping.secret_access_key" value="${s3_ping.secret_access_key}" />
<sysproperty key="jboss.jgroups.s3_ping.bucket" value="${s3_ping.bucket}" />
@@ -970,7 +970,7 @@
<sysproperty key="jboss.messaging.ServerPeerID" value="1" />
<sysproperty key="xb.builder.useUnorderedSequence" value="true" />
<!-- Allow this config to be used to test the cluster-ec2 profile -->
- <sysproperty key="jboss.default.jgroups.stack" value="${jboss-junit-configuration}" />
+ <sysproperty key="jboss.default.jgroups.stack" value="${jboss.default.jgroups.stack}" />
<sysproperty key="jboss.jgroups.s3_ping.access_key" value="${s3_ping.access_key}" />
<sysproperty key="jboss.jgroups.s3_ping.secret_access_key" value="${s3_ping.secret_access_key}" />
<sysproperty key="jboss.jgroups.s3_ping.bucket" value="${s3_ping.bucket}" />
@@ -1108,7 +1108,7 @@
<sysproperty key="jboss.partition.name" value="${partitionName}"/>
<sysproperty key="xb.builder.useUnorderedSequence" value="true" />
<!-- Allow this config to be used to test the cluster-ec2 profile -->
- <sysproperty key="jboss.default.jgroups.stack" value="${jboss-junit-configuration}" />
+ <sysproperty key="jboss.default.jgroups.stack" value="${jboss.default.jgroups.stack}" />
<sysproperty key="jboss.jgroups.s3_ping.access_key" value="${s3_ping.access_key}" />
<sysproperty key="jboss.jgroups.s3_ping.secret_access_key" value="${s3_ping.secret_access_key}" />
<sysproperty key="jboss.jgroups.s3_ping.bucket" value="${s3_ping.bucket}" />
@@ -1127,7 +1127,7 @@
<sysproperty key="jboss.partition.name" value="${partitionName}"/>
<sysproperty key="xb.builder.useUnorderedSequence" value="true" />
<!-- Allow this config to be used to test the cluster-ec2 profile -->
- <sysproperty key="jboss.default.jgroups.stack" value="${jboss-junit-configuration}" />
+ <sysproperty key="jboss.default.jgroups.stack" value="${jboss.default.jgroups.stack}" />
<sysproperty key="jboss.jgroups.s3_ping.access_key" value="${s3_ping.access_key}" />
<sysproperty key="jboss.jgroups.s3_ping.secret_access_key" value="${s3_ping.secret_access_key}" />
<sysproperty key="jboss.jgroups.s3_ping.bucket" value="${s3_ping.bucket}" />
@@ -1146,7 +1146,7 @@
<sysproperty key="jboss.partition.name" value="${partitionName}"/>
<sysproperty key="xb.builder.useUnorderedSequence" value="true" />
<!-- Allow this config to be used to test the cluster-ec2 profile -->
- <sysproperty key="jboss.default.jgroups.stack" value="${jboss-junit-configuration}" />
+ <sysproperty key="jboss.default.jgroups.stack" value="${jboss.default.jgroups.stack}" />
<sysproperty key="jboss.jgroups.s3_ping.access_key" value="${s3_ping.access_key}" />
<sysproperty key="jboss.jgroups.s3_ping.secret_access_key" value="${s3_ping.secret_access_key}" />
<sysproperty key="jboss.jgroups.s3_ping.bucket" value="${s3_ping.bucket}" />
@@ -1165,7 +1165,7 @@
<sysproperty key="jboss.partition.name" value="${partitionName}"/>
<sysproperty key="xb.builder.useUnorderedSequence" value="true" />
<!-- Allow this config to be used to test the cluster-ec2 profile -->
- <sysproperty key="jboss.default.jgroups.stack" value="${jboss-junit-configuration}" />
+ <sysproperty key="jboss.default.jgroups.stack" value="${jboss.default.jgroups.stack}" />
<sysproperty key="jboss.jgroups.s3_ping.access_key" value="${s3_ping.access_key}" />
<sysproperty key="jboss.jgroups.s3_ping.secret_access_key" value="${s3_ping.secret_access_key}" />
<sysproperty key="jboss.jgroups.s3_ping.bucket" value="${s3_ping.bucket}" />
@@ -1201,7 +1201,7 @@
<sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
<sysproperty key="java.net.preferIPv4Stack" value="true" />
<sysproperty key="xb.builder.useUnorderedSequence" value="true" />
- <sysproperty key="jboss.default.jgroups.stack" value="${jboss-junit-configuration}" />
+ <sysproperty key="jboss.default.jgroups.stack" value="${jboss.default.jgroups.stack}" />
</server>
<server name="jbm-cluster2" host="${node1}">
@@ -1216,7 +1216,7 @@
<sysproperty key="java.net.preferIPv4Stack" value="true" />
<sysproperty key="jboss.messaging.ServerPeerID" value="1" />
<sysproperty key="xb.builder.useUnorderedSequence" value="true" />
- <sysproperty key="jboss.default.jgroups.stack" value="${jboss-junit-configuration}" />
+ <sysproperty key="jboss.default.jgroups.stack" value="${jboss.default.jgroups.stack}" />
</server>
<server name="web" host="${node0}" serverUrl="${node0.jndi.http.url}">
Modified: branches/Branch_No_Multicast/testsuite/src/main/org/jboss/test/cluster/defaultcfg/test/ChannelFactoryManagedObjectsTestCase.java
===================================================================
--- branches/Branch_No_Multicast/testsuite/src/main/org/jboss/test/cluster/defaultcfg/test/ChannelFactoryManagedObjectsTestCase.java 2010-06-16 17:19:30 UTC (rev 106092)
+++ branches/Branch_No_Multicast/testsuite/src/main/org/jboss/test/cluster/defaultcfg/test/ChannelFactoryManagedObjectsTestCase.java 2010-06-16 17:51:42 UTC (rev 106093)
@@ -156,7 +156,9 @@
prop = mc.getProperty("protocolStackConfigurations");
assertNotNull("ChannelFactory has property protocolStackConfigurations", prop);
metaVal = prop.getValue();
- ManagedObjectTestUtil.validateProtocolStackConfigurations(metaVal, new String[]{"udp", "tcp"});
+ String defaultStack = System.getProperty("jboss.default.jgroups.stack", "udp");
+ String[] expectedStacks = new String[]{defaultStack, "jbm-control", "jbm-data"};
+ ManagedObjectTestUtil.validateProtocolStackConfigurations(metaVal, expectedStacks);
prop = mc.getProperty("openChannels");
assertNotNull("ChannelFactory has property openChannels", prop);
More information about the jboss-cvs-commits
mailing list