[jboss-cvs] JBossAS SVN: r69147 - in trunk/testsuite/imports: config and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Sun Jan 20 13:10:49 EST 2008
Author: bstansberry at jboss.com
Date: 2008-01-20 13:10:49 -0500 (Sun, 20 Jan 2008)
New Revision: 69147
Modified:
trunk/testsuite/imports/config/tests-clustering.xml
trunk/testsuite/imports/server-config.xml
Log:
[JBAS-5160] Use total replication by default for HttpSession replication
Modified: trunk/testsuite/imports/config/tests-clustering.xml
===================================================================
--- trunk/testsuite/imports/config/tests-clustering.xml 2008-01-20 18:09:26 UTC (rev 69146)
+++ trunk/testsuite/imports/config/tests-clustering.xml 2008-01-20 18:10:49 UTC (rev 69147)
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!--
- | Targets that create separate server configurations
+ | Targets that run the clustering tests
-->
<!-- $Id$ -->
@@ -225,41 +225,41 @@
<sleep seconds="4"/>
- <echo message="Going to call target tests-clustering-unit again with new configuration (SYNC, no BR)"/>
+ <echo message="Going to call target tests-clustering-unit again with new configuration (SYNC, BR)"/>
- <antcall target="tests-clustering-total-configure"/>
+ <antcall target="tests-clustering-br-configure"/>
- <server:start name="cluster-${jboss-junit-configuration}-TOTAL-0"/>
- <server:start name="cluster-${jboss-junit-configuration}-TOTAL-1"/>
+ <server:start name="cluster-${jboss-junit-configuration}-BR-0"/>
+ <server:start name="cluster-${jboss-junit-configuration}-BR-1"/>
<antcall target="tests-clustering-unit">
<param name="cluster.includes.refid" value="${cluster.http.includes}"/>
- <param name="jboss-junit-configuration" value="BuddyReplDisabled-${jboss-junit-configuration}"/>
- <param name="jbosstest.cluster.node0.config" value="cluster-${jboss-junit-configuration}-TOTAL-0"/>
- <param name="jbosstest.cluster.node1.config" value="cluster-${jboss-junit-configuration}-TOTAL-1"/>
+ <param name="jboss-junit-configuration" value="BuddyReplEnabled-${jboss-junit-configuration}"/>
+ <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"/>
</antcall>
- <server:stop name="cluster-${jboss-junit-configuration}-TOTAL-0"/>
- <server:stop name="cluster-${jboss-junit-configuration}-TOTAL-1"/>
+ <server:stop name="cluster-${jboss-junit-configuration}-BR-0"/>
+ <server:stop name="cluster-${jboss-junit-configuration}-BR-1"/>
<sleep seconds="4"/>
<echo message="Going to call target tests-clustering-unit again for FIELD granularity tests with new configuration (SYNC, no BR)"/>
- <antcall target="tests-clustering-field-total-configure"/>
+ <antcall target="tests-clustering-field-br-configure"/>
- <server:start name="cluster-field-${jboss-junit-configuration}-TOTAL-0"/>
- <server:start name="cluster-field-${jboss-junit-configuration}-TOTAL-1"/>
+ <server:start name="cluster-field-${jboss-junit-configuration}-BR-0"/>
+ <server:start name="cluster-field-${jboss-junit-configuration}-BR-1"/>
<antcall target="tests-clustering-unit">
<param name="cluster.includes.refid" value="${cluster.http.field.includes}"/>
- <param name="jboss-junit-configuration" value="BuddyReplDisabled-${jboss-junit-configuration}"/>
- <param name="jbosstest.cluster.node0.config" value="cluster-field-${jboss-junit-configuration}-TOTAL-0"/>
- <param name="jbosstest.cluster.node1.config" value="cluster-field-${jboss-junit-configuration}-TOTAL-1"/>
+ <param name="jboss-junit-configuration" value="BuddyReplEnabled-${jboss-junit-configuration}"/>
+ <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"/>
</antcall>
- <server:stop name="cluster-field-${jboss-junit-configuration}-TOTAL-0"/>
- <server:stop name="cluster-field-${jboss-junit-configuration}-TOTAL-1"/>
+ <server:stop name="cluster-field-${jboss-junit-configuration}-BR-0"/>
+ <server:stop name="cluster-field-${jboss-junit-configuration}-BR-1"/>
</target>
@@ -282,8 +282,8 @@
<create-cluster-node conf="cluster-${jboss-junit-configuration}-SYNC-1"/>
<echo message="Modifying the node0 and node1 Tomcat configuration for REPL_SYNC/UseJK"/>
- <http-cluster-node-config-change conf="cluster-${jboss-junit-configuration}-SYNC-0" useBuddyRepl="true"/>
- <http-cluster-node-config-change conf="cluster-${jboss-junit-configuration}-SYNC-1" useBuddyRepl="true"/>
+ <http-cluster-node-config-change conf="cluster-${jboss-junit-configuration}-SYNC-0" useBuddyRepl="false"/>
+ <http-cluster-node-config-change conf="cluster-${jboss-junit-configuration}-SYNC-1" useBuddyRepl="false"/>
</target>
<target name="tests-clustering-field-sync-configure" unless="${tests.clustering.skip.startup}">
@@ -295,30 +295,30 @@
<http-cluster-field-node-config-change conf="cluster-field-${jboss-junit-configuration}-SYNC-1"/>
<echo message="Modifying the node0 and node1 Tomcat configuration for REPL_SYNC/UseJK"/>
- <http-cluster-node-config-change conf="cluster-field-${jboss-junit-configuration}-SYNC-0" useBuddyRepl="true"/>
- <http-cluster-node-config-change conf="cluster-field-${jboss-junit-configuration}-SYNC-1" useBuddyRepl="true"/>
+ <http-cluster-node-config-change conf="cluster-field-${jboss-junit-configuration}-SYNC-0" useBuddyRepl="false"/>
+ <http-cluster-node-config-change conf="cluster-field-${jboss-junit-configuration}-SYNC-1" useBuddyRepl="false"/>
</target>
- <target name="tests-clustering-total-configure" unless="${tests.clustering.skip.startup}">
- <create-cluster-node conf="cluster-${jboss-junit-configuration}-TOTAL-0"/>
- <create-cluster-node conf="cluster-${jboss-junit-configuration}-TOTAL-1"/>
+ <target name="tests-clustering-br-configure" unless="${tests.clustering.skip.startup}">
+ <create-cluster-node conf="cluster-${jboss-junit-configuration}-BR-0"/>
+ <create-cluster-node conf="cluster-${jboss-junit-configuration}-BR-1"/>
- <echo message="Modifying the node0 and node1 Tomcat configuration for REPL_SYNC/UseJK/TOTAL"/>
- <http-cluster-node-config-change conf="cluster-${jboss-junit-configuration}-TOTAL-0" useBuddyRepl="false"/>
- <http-cluster-node-config-change conf="cluster-${jboss-junit-configuration}-TOTAL-1" useBuddyRepl="false"/>
+ <echo message="Modifying the node0 and node1 Tomcat configuration for REPL_SYNC/UseJK/BR"/>
+ <http-cluster-node-config-change conf="cluster-${jboss-junit-configuration}-BR-0" useBuddyRepl="true"/>
+ <http-cluster-node-config-change conf="cluster-${jboss-junit-configuration}-BR-1" useBuddyRepl="true"/>
</target>
- <target name="tests-clustering-field-total-configure" unless="${tests.clustering.skip.startup}">
- <create-cluster-node conf="cluster-field-${jboss-junit-configuration}-TOTAL-0"/>
- <create-cluster-node conf="cluster-field-${jboss-junit-configuration}-TOTAL-1"/>
+ <target name="tests-clustering-field-br-configure" unless="${tests.clustering.skip.startup}">
+ <create-cluster-node conf="cluster-field-${jboss-junit-configuration}-BR-0"/>
+ <create-cluster-node conf="cluster-field-${jboss-junit-configuration}-BR-1"/>
<echo message="Modifying the node0 and node1 Tomcat configuration for FIELD"/>
- <http-cluster-field-node-config-change conf="cluster-field-${jboss-junit-configuration}-TOTAL-0"/>
- <http-cluster-field-node-config-change conf="cluster-field-${jboss-junit-configuration}-TOTAL-1"/>
+ <http-cluster-field-node-config-change conf="cluster-field-${jboss-junit-configuration}-BR-0"/>
+ <http-cluster-field-node-config-change conf="cluster-field-${jboss-junit-configuration}-BR-1"/>
- <echo message="Modifying the node0 and node1 Tomcat configuration for REPL_SYNC/UseJK/TOTAL"/>
- <http-cluster-node-config-change conf="cluster-field-${jboss-junit-configuration}-TOTAL-0" useBuddyRepl="false"/>
- <http-cluster-node-config-change conf="cluster-field-${jboss-junit-configuration}-TOTAL-1" useBuddyRepl="false"/>
+ <echo message="Modifying the node0 and node1 Tomcat configuration for REPL_SYNC/UseJK/BR"/>
+ <http-cluster-node-config-change conf="cluster-field-${jboss-junit-configuration}-BR-0" useBuddyRepl="true"/>
+ <http-cluster-node-config-change conf="cluster-field-${jboss-junit-configuration}-BR-1" useBuddyRepl="true"/>
</target>
<!-- Executes a set of tests in a clustered environment -->
@@ -467,14 +467,14 @@
<server:stop name="cluster-field-${jboss-junit-configuration}-1"/>
</target>
- <target name="one-cluster-test-total" if="test">
+ <target name="one-cluster-test-br" if="test">
<property name="jboss-junit-configuration" value="udp"/>
- <antcall target="tests-clustering-total-configure" inheritRefs="true"/>
+ <antcall target="tests-clustering-br-configure" inheritRefs="true"/>
- <server:start name="cluster-${jboss-junit-configuration}-TOTAL-0"/>
- <server:start name="cluster-${jboss-junit-configuration}-TOTAL-1"/>
+ <server:start name="cluster-${jboss-junit-configuration}-BR-0"/>
+ <server:start name="cluster-${jboss-junit-configuration}-BR-1"/>
<echo message="Going to call target tests-clustering-unit for ${test}"/>
@@ -485,18 +485,18 @@
<param name="jbosstest.cluster.node1.config" value="cluster-${jboss-junit-configuration}-1"/>
</antcall>
- <server:stop name="cluster-${jboss-junit-configuration}-TOTAL-0"/>
- <server:stop name="cluster-${jboss-junit-configuration}-TOTAL-1"/>
+ <server:stop name="cluster-${jboss-junit-configuration}-BR-0"/>
+ <server:stop name="cluster-${jboss-junit-configuration}-BR-1"/>
</target>
- <target name="one-cluster-test-field-total" if="test">
+ <target name="one-cluster-test-field-br" if="test">
<property name="jboss-junit-configuration" value="udp"/>
- <antcall target="tests-clustering-field-total-configure" inheritRefs="true"/>
+ <antcall target="tests-clustering-field-br-configure" inheritRefs="true"/>
- <server:start name="cluster-field-${jboss-junit-configuration}-TOTAL-0"/>
- <server:start name="cluster-field-${jboss-junit-configuration}-TOTAL-1"/>
+ <server:start name="cluster-field-${jboss-junit-configuration}-BR-0"/>
+ <server:start name="cluster-field-${jboss-junit-configuration}-BR-1"/>
<echo message="Going to call target tests-clustering-unit for ${test}"/>
@@ -507,8 +507,8 @@
<param name="jbosstest.cluster.node1.config" value="cluster-field-${jboss-junit-configuration}-1"/>
</antcall>
- <server:stop name="cluster-field-${jboss-junit-configuration}-TOTAL-0"/>
- <server:stop name="cluster-field-${jboss-junit-configuration}-TOTAL-1"/>
+ <server:stop name="cluster-field-${jboss-junit-configuration}-BR-0"/>
+ <server:stop name="cluster-field-${jboss-junit-configuration}-BR-1"/>
</target>
<!-- Runs only the non-http tests -->
Modified: trunk/testsuite/imports/server-config.xml
===================================================================
--- trunk/testsuite/imports/server-config.xml 2008-01-20 18:09:26 UTC (rev 69146)
+++ trunk/testsuite/imports/server-config.xml 2008-01-20 18:10:49 UTC (rev 69147)
@@ -297,7 +297,7 @@
<sysproperty key="jboss.multiplexer.stack" value="udp-sync" />
<sysproperty key="server.peer.id" value="1" />
</server>
- <server name="cluster-udp-TOTAL-0" host="${node0}">
+ <server name="cluster-udp-BR-0" host="${node0}">
<jvmarg value="-Xms128m" />
<jvmarg value="-Xmx512m" />
<jvmarg value="-XX:MaxPermSize=512m" />
@@ -308,7 +308,7 @@
<sysproperty key="jboss.multiplexer.stack" value="udp-sync" />
<sysproperty key="server.peer.id" value="0" />
</server>
- <server name="cluster-udp-TOTAL-1" host="${node1}">
+ <server name="cluster-udp-BR-1" host="${node1}">
<jvmarg value="-Xms128m" />
<jvmarg value="-Xmx512m" />
<jvmarg value="-XX:MaxPermSize=512m" />
@@ -319,7 +319,7 @@
<sysproperty key="jboss.multiplexer.stack" value="udp-sync" />
<sysproperty key="server.peer.id" value="1" />
</server>
- <server name="cluster-field-udp-TOTAL-0" host="${node0}">
+ <server name="cluster-field-udp-BR-0" host="${node0}">
<jvmarg value="-Xms128m" />
<jvmarg value="-Xmx512m" />
<jvmarg value="-XX:MaxPermSize=512m" />
@@ -330,7 +330,7 @@
<sysproperty key="jboss.multiplexer.stack" value="udp-sync" />
<sysproperty key="server.peer.id" value="0" />
</server>
- <server name="cluster-field-udp-TOTAL-1" host="${node1}">
+ <server name="cluster-field-udp-BR-1" host="${node1}">
<jvmarg value="-Xms128m" />
<jvmarg value="-Xmx512m" />
<jvmarg value="-XX:MaxPermSize=512m" />
@@ -451,7 +451,7 @@
<sysproperty key="jgroups.tcpping.initial_hosts" value="${node0}[7650],${node1}[7650]"/>
<sysproperty key="server.peer.id" value="1" />
</server>
- <server name="cluster-tcp-TOTAL-0" host="${node0}">
+ <server name="cluster-tcp-BR-0" host="${node0}">
<jvmarg value="-Xms128m" />
<jvmarg value="-Xmx512m" />
<jvmarg value="-XX:MaxPermSize=512m" />
@@ -462,7 +462,7 @@
<sysproperty key="jgroups.tcpping.initial_hosts" value="${node0}[7650],${node1}[7650]"/>
<sysproperty key="server.peer.id" value="0" />
</server>
- <server name="cluster-tcp-TOTAL-1" host="${node1}">
+ <server name="cluster-tcp-BR-1" host="${node1}">
<jvmarg value="-Xms128m" />
<jvmarg value="-Xmx512m" />
<jvmarg value="-XX:MaxPermSize=512m" />
@@ -473,7 +473,7 @@
<sysproperty key="jgroups.tcpping.initial_hosts" value="${node0}[7650],${node1}[7650]"/>
<sysproperty key="server.peer.id" value="1" />
</server>
- <server name="cluster-field-tcp-TOTAL-0" host="${node0}">
+ <server name="cluster-field-tcp-BR-0" host="${node0}">
<jvmarg value="-Xms128m" />
<jvmarg value="-Xmx512m" />
<jvmarg value="-XX:MaxPermSize=512m" />
@@ -484,7 +484,7 @@
<sysproperty key="jgroups.tcpping.initial_hosts" value="${node0}[7650],${node1}[7650]"/>
<sysproperty key="server.peer.id" value="0" />
</server>
- <server name="cluster-field-tcp-TOTAL-1" host="${node1}">
+ <server name="cluster-field-tcp-BR-1" host="${node1}">
<jvmarg value="-Xms128m" />
<jvmarg value="-Xmx512m" />
<jvmarg value="-XX:MaxPermSize=512m" />
@@ -583,7 +583,7 @@
<sysproperty key="jgroups.tcpping.initial_hosts" value="${node0}[7750],${node1}[7750]"/>
<sysproperty key="server.peer.id" value="1" />
</server>
- <server name="cluster-tcp_nio-TOTAL-0" host="${node0}">
+ <server name="cluster-tcp_nio-BR-0" host="${node0}">
<jvmarg value="-Xms128m" />
<jvmarg value="-Xmx512m" />
<jvmarg value="-XX:MaxPermSize=512m" />
@@ -594,7 +594,7 @@
<sysproperty key="jgroups.tcpping.initial_hosts" value="${node0}[7750],${node1}[7750]"/>
<sysproperty key="server.peer.id" value="0" />
</server>
- <server name="cluster-tcp_nio-TOTAL-1" host="${node1}">
+ <server name="cluster-tcp_nio-BR-1" host="${node1}">
<jvmarg value="-Xms128m" />
<jvmarg value="-Xmx512m" />
<jvmarg value="-XX:MaxPermSize=512m" />
@@ -605,7 +605,7 @@
<sysproperty key="jgroups.tcpping.initial_hosts" value="${node0}[7750],${node1}[7750]"/>
<sysproperty key="server.peer.id" value="1" />
</server>
- <server name="cluster-field-tcp_nio-TOTAL-0" host="${node0}">
+ <server name="cluster-field-tcp_nio-BR-0" host="${node0}">
<jvmarg value="-Xms128m" />
<jvmarg value="-Xmx512m" />
<jvmarg value="-XX:MaxPermSize=512m" />
@@ -616,7 +616,7 @@
<sysproperty key="jgroups.tcpping.initial_hosts" value="${node0}[7750],${node1}[7750]"/>
<sysproperty key="server.peer.id" value="0" />
</server>
- <server name="cluster-field-tcp_nio-TOTAL-1" host="${node1}">
+ <server name="cluster-field-tcp_nio-BR-1" host="${node1}">
<jvmarg value="-Xms128m" />
<jvmarg value="-Xmx512m" />
<jvmarg value="-XX:MaxPermSize=512m" />
More information about the jboss-cvs-commits
mailing list