[jboss-cvs] JBossAS SVN: r65663 - branches/Branch_4_2/ejb3.

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

Author: bdecoste
Date: 2007-09-27 17:33:27 -0400 (Thu, 27 Sep 2007)
New Revision: 65663

Modified:
   branches/Branch_4_2/ejb3/build-test.xml
Log:
[JBAS-4572] shutdown correct confs

Modified: branches/Branch_4_2/ejb3/build-test.xml
===================================================================
--- branches/Branch_4_2/ejb3/build-test.xml	2007-09-27 19:52:44 UTC (rev 65662)
+++ branches/Branch_4_2/ejb3/build-test.xml	2007-09-27 21:33:27 UTC (rev 65663)
@@ -4109,32 +4109,35 @@
 
 
    <target name="ssl-simple-test" depends="init">
-     <!--create-config baseconf="default" newconf="ejb3-ssl" jboss.dist="${ejb3.dist}">
+     <create-config baseconf="all" newconf="ejb3-ssl" jboss.dist="${ejb3.dist}">
          <patternset>
             <include name="conf/**"/>
             <include name="deploy*/**"/>
             <include name="lib/**"/>
          </patternset>
-      </create-config-->
+      </create-config>
 
       <!--
          We are using the simplest remoting sslsocket configuration possible, we
          need to tell JBoss to use the supplied keystore via system properties
       -->
       <property name="ssl-args" value="-Djavax.net.ssl.keyStore=${ejb3.dist}/server/ejb3-ssl/conf/localhost.keystore -Djavax.net.ssl.keyStorePassword=opensource ${ejb3.jboss.jvmargs}"/>
-      <!--start-jboss conf="ejb3-ssl" host="${node0}" jvmargs="${ssl-args}" jboss.dist="${ejb3.dist}"/>
-      <wait-on-host/-->
+      <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">
@@ -4260,7 +4263,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">
@@ -4281,7 +4284,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">
@@ -4574,7 +4577,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/>