[jboss-cvs] JBossAS SVN: r57177 - branches/Branch_4_0/testsuite

[jboss-cvs-commits at lists.jboss.org]

Author: bstansberry at jboss.com
Date: 2006-09-25 22:06:29 -0400 (Mon, 25 Sep 2006)
New Revision: 57177

Modified:
   branches/Branch_4_0/testsuite/build.xml
Log:
[JBAS-3487] Test ClusteredSSO with BR enabled

Modified: branches/Branch_4_0/testsuite/build.xml
===================================================================
--- branches/Branch_4_0/testsuite/build.xml	2006-09-26 02:04:40 UTC (rev 57176)
+++ branches/Branch_4_0/testsuite/build.xml	2006-09-26 02:06:29 UTC (rev 57177)
@@ -1331,51 +1331,17 @@
 
   <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/hsqldb-ds.xml"/>
-        <include name="deploy/jbossjca-service.xml"/>
-        <include name="deploy/jboss-local-jdbc.rar"/>
-        <include name="deploy/jboss-jdbc-metadata.sar"/>
-        <include name="deploy/jboss-aop*.deployer/**"/>
-        <include name="deploy/tc5-cluster.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/hsqldb-ds.xml"/>
-        <include name="deploy/jbossjca-service.xml"/>
-        <include name="deploy/jboss-local-jdbc.rar"/>
-        <include name="deploy/jboss-jdbc-metadata.sar"/>
-        <include name="deploy/jboss-aop*.deployer/**"/>
-        <include name="deploy/tc5-cluster.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"/>
 
     <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"/>
@@ -1383,6 +1349,27 @@
 
     <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"/>
+    </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 -->