[jboss-cvs] JBossAS SVN: r66814 - branches/JBPAPP_4_2/ejb3.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Nov 7 05:20:43 EST 2007
Author: wolfc
Date: 2007-11-07 05:20:43 -0500 (Wed, 07 Nov 2007)
New Revision: 66814
Modified:
branches/JBPAPP_4_2/ejb3/build-test.xml
Log:
JBPAPP-370: merged 65663
Modified: branches/JBPAPP_4_2/ejb3/build-test.xml
===================================================================
--- branches/JBPAPP_4_2/ejb3/build-test.xml 2007-11-07 10:11:56 UTC (rev 66813)
+++ branches/JBPAPP_4_2/ejb3/build-test.xml 2007-11-07 10:20:43 UTC (rev 66814)
@@ -4116,16 +4116,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">
@@ -4246,7 +4249,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">
@@ -4267,7 +4270,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">
@@ -4534,7 +4537,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/>
More information about the jboss-cvs-commits
mailing list