[jboss-cvs] JBossAS SVN: r58599 - trunk/testsuite
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Sat Nov 18 06:52:27 EST 2006
Author: bstansberry at jboss.com
Date: 2006-11-18 06:52:27 -0500 (Sat, 18 Nov 2006)
New Revision: 58599
Modified:
trunk/testsuite/build.xml
Log:
BR enabled SSO tests (for now)
Modified: trunk/testsuite/build.xml
===================================================================
--- trunk/testsuite/build.xml 2006-11-18 11:51:00 UTC (rev 58598)
+++ trunk/testsuite/build.xml 2006-11-18 11:52:27 UTC (rev 58599)
@@ -957,14 +957,14 @@
<server:start name="cluster-${jboss-junit-configuration}-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"/>
</antcall>
-
+
<echo message="Going to call target tests-clustering-unit for HTTP tests (ASYNC, with BR)"/>
<antcall target="tests-clustering-unit">
@@ -979,6 +979,7 @@
<sleep seconds="4"/>
+
<echo message="Going to call target tests-clustering-unit again for FIELD granularity tests (ASYNC, with BR)"/>
<antcall target="tests-clustering-field-configure" inheritRefs="true"/>
@@ -997,7 +998,7 @@
<server:stop name="cluster-field-${jboss-junit-configuration}-1"/>
<sleep seconds="4"/>
-
+
<echo message="Going to call target tests-clustering-unit again with new configuration (SYNC, with BR)"/>
<antcall target="tests-clustering-sync-configure"/>
@@ -1200,68 +1201,45 @@
<target name="tomcat-sso-clustered-tests"
description="Tomcat tests requiring clustered SSO configured">
- <!-- Create the sso enabled tomcat config starting with the default config
- -->
- <create-config baseconf="all" newconf="tomcat-sso-cluster0"
- newconf-src="tomcat-sso-cluster">
- <patternset>
- <include name="conf/**"/>
- <include name="deploy/jbossweb*.sar/**"/>
- <include name="deploy/jmx-invoker-service.xml"/>
- <include name="deploy/ear-deployer.xml"/>
- <include name="deploy/ejb-deployer.xml"/>
- <include name="deploy/ejb3.deployer/**"/>
- <include name="deploy/hsqldb-ds.xml"/>
- <include name="deploy/jbossjca-service.xml"/>
- <include name="deploy/jboss-local-jdbc.rar"/>
- <include name="deploy/jboss-jdbc-metadata.sar"/>
- <!-- Whichever AOP Deployer they built -->
- <include name="deploy/jboss-aop*.deployer/**"/>
- <include name="deploy/tc6-cluster.sar/**"/>
- <include name="deploy/jgroups-multiplexer.sar/**"/>
- <include name="deploy/jbossws*.sar/**"/>
- <include name="lib/**"/>
- </patternset>
- </create-config>
- <create-config baseconf="all" newconf="tomcat-sso-cluster1"
- newconf-src="tomcat-sso-cluster">
- <patternset>
- <include name="conf/**"/>
- <include name="deploy/jbossweb*.sar/**"/>
- <include name="deploy/jmx-invoker-service.xml"/>
- <include name="deploy/ear-deployer.xml"/>
- <include name="deploy/ejb-deployer.xml"/>
- <include name="deploy/ejb3.deployer/**"/>
- <include name="deploy/hsqldb-ds.xml"/>
- <include name="deploy/jbossjca-service.xml"/>
- <include name="deploy/jboss-local-jdbc.rar"/>
- <include name="deploy/jboss-jdbc-metadata.sar"/>
- <!-- Whichever AOP Deployer they built -->
- <include name="deploy/jboss-aop*.deployer/**"/>
- <include name="deploy/tc6-cluster.sar/**"/>
- <include name="deploy/jgroups-multiplexer.sar/**"/>
- <include name="deploy/jbossws*.sar/**"/>
- <include name="lib/**"/>
- </patternset>
- </create-config>
+ <!-- Create the sso enabled tomcat config starting with the all config -->
+ <create-cluster-sso-node newconf="tomcat-sso-cluster0"/>
+ <create-cluster-sso-node newconf="tomcat-sso-cluster1"/>
+
+ <echo message="Modifying the node0 and node1 Tomcat configuration for REPL_SYNC/UseJK"/>
+ <http-cluster-node-config-change conf="tomcat-sso-cluster0" useBuddyRepl="false"/>
+ <http-cluster-node-config-change conf="tomcat-sso-cluster1" useBuddyRepl="false"/>
- <!--
- <echo message="Modifying the node0 and node1 Tomcat configuration for REPL_SYNC/UseJK"/>
- <http-cluster-node-config-change conf="tomcat-sso-cluster0" useBuddyRepl="true"/>
- <http-cluster-node-config-change conf="tomcat-sso-cluster1" useBuddyRepl="true"/>
- -->
+ <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:start name="tomcat-sso-cluster0"/>
- <server:start name="tomcat-sso-cluster1"/>
- <echo message="Nodes have started, waiting for cluster to stablize..."/>
- <sleep seconds="10" />
- <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"/>
- <server:stop name="tomcat-sso-cluster0"/>
- <server:stop name="tomcat-sso-cluster1"/>
+ <!-- Do it again with BR enabled -->
+
+ <create-cluster-sso-node newconf="tomcat-sso-cluster-br0"/>
+ <create-cluster-sso-node newconf="tomcat-sso-cluster-br1"/>
+
+ <echo message="Modifying the node0 and node1 Tomcat configuration for REPL_SYNC/UseJK"/>
+ <http-cluster-node-config-change conf="tomcat-sso-cluster-br0" useBuddyRepl="true"/>
+ <http-cluster-node-config-change conf="tomcat-sso-cluster-br1" useBuddyRepl="true"/>
+
+ <server:start name="tomcat-sso-cluster-br0"/>
+ <server:start name="tomcat-sso-cluster-br1"/>
+
+ <antcall target="tests-clustering-unit">
+ <param name="cluster.includes.refid" value="tc-sso-clustered.includes"/>
+ <param name="jboss-junit-configuration" value="tomcat-sso-cluster-br"/>
+ </antcall>
+
+ <server:stop name="tomcat-sso-cluster-br0"/>
+ <server:stop name="tomcat-sso-cluster-br1"/>
+
</target>
<!-- Tests that require the attribute "UseJBossWebLoader" set to true -->
More information about the jboss-cvs-commits
mailing list