[jboss-cvs] JBossAS SVN: r66900 - branches/JBPAPP_4_2_0_GA_CP/ejb3.

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

Author: wolfc
Date: 2007-11-09 03:42:22 -0500 (Fri, 09 Nov 2007)
New Revision: 66900

Modified:
   branches/JBPAPP_4_2_0_GA_CP/ejb3/build-test.xml
Log:
JBPAPP-370: merged 65663


Modified: branches/JBPAPP_4_2_0_GA_CP/ejb3/build-test.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/ejb3/build-test.xml	2007-11-09 05:44:53 UTC (rev 66899)
+++ branches/JBPAPP_4_2_0_GA_CP/ejb3/build-test.xml	2007-11-09 08:42:22 UTC (rev 66900)
@@ -4048,16 +4048,19 @@
       <start-jboss conf="ejb3-ssl" host="${node0}" jvmargs="${ssl-args}" jboss.dist="${ejb3.dist}"/>
       <wait-on-host/>
 
-      <!-- Tell client to use the supplied truststore -->
+      <antcall target="no-start-jboss-ssl-tests" inheritRefs="true"/>
+
+      <stop-jboss jboss.dist="${ejb3.dist}"/>
+      <wait-on-shutdown conf="ejb3-ssl"/>
+   </target>
+   
+   <target name="no-start-jboss-ssl-tests" depends="init" description="Execute all ssl tests">
       <property name="jvmargs" value="-Djavax.net.ssl.trustStore=${resources}/test/ssl/localhost.truststore -Djavax.net.ssl.trustStorePassword=opensource"/>
 
       <antcall target="test-with-jvmargs" inheritRefs="true">
          <param name="test" value="ssl"/>
          <param name="jvmargs" value="${jvmargs}"/>
       </antcall>
-
-      <stop-jboss jboss.dist="${ejb3.dist}"/>
-      <wait-on-shutdown conf="ejb3-ssl"/>
    </target>
 
    <target name="ssl-advanced-test" depends="init">
@@ -4178,7 +4181,7 @@
       </antcall>
       
       <stop-jboss url="${node0.jndi.url}" jboss.dist="${ejb3.dist}"/>
-      <wait-on-shutdown conf="all"/>
+      <wait-on-shutdown conf="statelesscreation"/>
    </target>
 	
    <target name="removedislocal-test">
@@ -4199,7 +4202,7 @@
       </antcall>
       
       <stop-jboss url="${node0.jndi.url}" jboss.dist="${ejb3.dist}"/>
-      <wait-on-shutdown conf="all"/>
+      <wait-on-shutdown conf="removedislocal"/>
    </target>
 	
    <target name="multi-instance-localfromremote-test">
@@ -4466,7 +4469,6 @@
    </target>
 
    <target name="iiop-tests" depends="init" description="Execute all tests">
-
       <start-jboss conf="all" host="${node0}" jboss.dist="${ejb3.dist}" jvmargs="${ejb3.jboss.jvmargs}"/>
       <wait-on-host/>