[jboss-cvs] JBossAS SVN: r70716 - in projects/ejb3/trunk: core and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Mar 10 23:25:26 EDT 2008
Author: ALRubinger
Date: 2008-03-10 23:25:26 -0400 (Mon, 10 Mar 2008)
New Revision: 70716
Modified:
projects/ejb3/trunk/build/pom.xml
projects/ejb3/trunk/core/build-test.xml
Log:
[EJBTHREE-1211] Delegate JBossAS Start/Stop to ServerManager component via jboss-test
Modified: projects/ejb3/trunk/build/pom.xml
===================================================================
--- projects/ejb3/trunk/build/pom.xml 2008-03-11 03:17:19 UTC (rev 70715)
+++ projects/ejb3/trunk/build/pom.xml 2008-03-11 03:25:26 UTC (rev 70716)
@@ -117,7 +117,7 @@
<version.org.jboss_jboss-common-core>2.2.1.GA</version.org.jboss_jboss-common-core>
<version.org.jboss_jboss-metadata>1.0.0.Beta6</version.org.jboss_jboss-metadata>
<version.org.jboss_jboss-transaction-spi>5.0.0.Beta4</version.org.jboss_jboss-transaction-spi>
- <version.org.jboss_jboss-test>1.0.5.GA</version.org.jboss_jboss-test>
+ <version.org.jboss_jboss-test>1.0.6-SNAPSHOT</version.org.jboss_jboss-test>
<version.org.jboss.aop_jboss-aop>2.0.0.CR7</version.org.jboss.aop_jboss-aop>
<version.org.jboss.aop_jboss-aop-aspects>2.0.0.CR7</version.org.jboss.aop_jboss-aop-aspects>
<version.org.jboss.cluster_jboss-ha-client>1.0.0.GA</version.org.jboss.cluster_jboss-ha-client>
Modified: projects/ejb3/trunk/core/build-test.xml
===================================================================
--- projects/ejb3/trunk/core/build-test.xml 2008-03-11 03:17:19 UTC (rev 70715)
+++ projects/ejb3/trunk/core/build-test.xml 2008-03-11 03:25:26 UTC (rev 70716)
@@ -120,43 +120,87 @@
<pathelement path="${location.dependencies.lib.jboss-test:jboss-test}"/>
</path>
- <!-- Import the jboss server run targets -->
- <import file="${location.dependencies.unpacked.jboss-test:jboss.test}/server-config.xml" />
+ <!-- Import the jboss server run targets -->
+ <import file="${location.dependencies.unpacked.jboss-test:jboss.test}/server-config.xml" />
- <property name="ejb3.jboss.jvmargs" value="-Xmx512m -Djava.net.preferIPv4Stack=true"/>
+ <!-- Define common JVM Arguments for all EJB3 JBossAS Runtimes -->
+ <property name="ejb3.jboss.jvmargs" value="-Xmx512m -Djava.net.preferIPv4Stack=true"/>
+
+ <!-- Define JVM Arguments for specific EJB3 JBossAS Runtimes -->
+ <property name="ssl-args" value="-Djavax.net.ssl.keyStore=${jboss.dist}/server/ejb3-ssl/conf/localhost.keystore -Djavax.net.ssl.keyStorePassword=opensource"/>
+
+ <!--
+
+ Define Server Configurations for EJB3 Integration Tests
+
+ -->
+ <server:config javaHome="${env.JAVA_HOME}" jbossHome="${jboss.dist}" udpGroup="${udpGroup}">
+
+ <!-- ejb3-ssl -->
+ <server name="ejb3-ssl" host="${node0}">
+ <jvmarg value="${ejb3.jboss.jvmargs}" />
+ <jvmarg value="${ssl-args}" />
+ </server>
+
+ <!-- ejb3-ssl-advanced -->
+ <server name="ejb3-ssl-advanced" host="${node0}">
+ <jvmarg value="${ejb3.jboss.jvmargs}" />
+ </server>
+
+ <!-- invoker -->
+ <server name="invoker" host="${node0}">
+ <jvmarg value="${ejb3.jboss.jvmargs}" />
+ </server>
+
+ <!-- ejb3-jacc -->
+ <server name="ejb3-jacc" host="${node0}">
+ <jvmarg value="${ejb3.jboss.jvmargs}" />
+ </server>
+
+ <!-- statelesscreation -->
+ <server name="statelesscreation" host="${node0}">
+ <jvmarg value="${ejb3.jboss.jvmargs}" />
+ </server>
+
+ <!-- removedislocal -->
+ <server name="removedislocal" host="${node0}">
+ <jvmarg value="${ejb3.jboss.jvmargs}" />
+ </server>
+
+ <!-- localfromremote1 -->
+ <server name="localfromremote1" host="${node0}">
+ <jvmarg value="${ejb3.jboss.jvmargs}" />
+ </server>
+
+ <!-- localfromremote2 -->
+ <server name="localfromremote2" host="${node0}">
+ <jvmarg value="${ejb3.jboss.jvmargs}" />
+ </server>
+
+ <!-- clusteredjms -->
+ <server name="clusteredjms" host="${node0}">
+ <jvmarg value="${ejb3.jboss.jvmargs}" />
+ <jvmarg value="-Djgroups.bind_addr=${node1.jgroups.bind_addr}" />
+ </server>
+
+ <!-- clusteredjms2 -->
+ <server name="clusteredjms2" host="${node1}">
+ <jvmarg value="${ejb3.jboss.jvmargs}" />
+ <jvmarg value="-Djgroups.bind_addr=${node0.jgroups.bind_addr}" />
+ </server>
+
+ <!-- libdeployment -->
+ <server name="libdeployment" host="${node0}">
+ <jvmarg value="${ejb3.jboss.jvmargs}" />
+ </server>
+
+ <!-- statefulproxyfactoryoverride -->
+ <server name="statefulproxyfactoryoverride" host="${node0}">
+ <jvmarg value="${ejb3.jboss.jvmargs}" />
+ </server>
- <macrodef name="wait-on-host">
- <attribute name="seconds" default="180"/>
- <attribute name="host" default="${node0}"/>
- <sequential>
- <echo>Waiting for @{host} to start (max wait @{seconds} seconds)...</echo>
- <waitfor maxwait="@{seconds}" maxwaitunit="second"
- checkevery="5" checkeveryunit="second" timeoutproperty="startup.timeout">
- <http url="http://@{host}:8080/"/>
- </waitfor>
- <fail message="Timeout waiting for nodes to start" if="startup.timeout"/>
- </sequential>
- </macrodef>
+ </server:config>
- <macrodef name="wait-on-shutdown">
- <attribute name="seconds" default="180"/>
- <attribute name="conf"/>
- <sequential>
- <echo message="Waiting for '@{conf}' server to stop..."/>
- <waitfor maxwait="@{seconds}" maxwaitunit="second"
- checkevery="5" checkeveryunit="second" timeoutproperty="shutdown.timeout">
- <available file="server.log">
- <filepath>
- <fileset dir="${jboss.dist}/server/@{conf}/log/" includes="server.log">
- <contains text="[org.jboss.bootstrap.microcontainer.ServerImpl] (JBoss Shutdown Hook) Shutdown complete"/>
- </fileset>
- </filepath>
- </available>
- </waitfor>
- <fail message="Timeout waiting for '@{conf}' server to shutdown." if="shutdown.timeout"/>
- </sequential>
- </macrodef>
-
<!-- =================== -->
<!-- Basic Configuration -->
<!-- =================== -->
@@ -206,11 +250,11 @@
<!-- EJB3 Interceptors -->
<pathelement path="${artifact.ejb3.interceptors}" />
- <!-- EJB3 Interceptors -->
- <pathelement path="${artifact.ejb3.extapi}" />
+ <!-- EJB3 Interceptors -->
+ <pathelement path="${artifact.ejb3.extapi}" />
- <!-- EJB3 Interceptors -->
- <pathelement path="${artifact.ejb3.extapiimpl}" />
+ <!-- EJB3 Interceptors -->
+ <pathelement path="${artifact.ejb3.extapiimpl}" />
</path>
@@ -5283,15 +5327,13 @@
</patternset>
</create-config>
- <start-jboss conf="libdeployment" host="${node0}" jvmargs="${ejb3.jboss.jvmargs}"/>
- <wait-on-host/>
+ <server:start name="libdeployment" />
<antcall target="test" inheritRefs="true">
<param name="test" value="libdeployment"/>
</antcall>
- <stop-jboss/>
- <wait-on-shutdown conf="libdeployment"/>
+ <server:stop name="libdeployment" />
</target>
<target name="statefulproxyfactoryoverride-test" depends="init">
@@ -5304,15 +5346,13 @@
</patternset>
</create-config>
- <start-jboss conf="statefulproxyfactoryoverride" host="${node0}" jvmargs="${ejb3.jboss.jvmargs}"/>
- <wait-on-host/>
+ <server:start name="statefulproxyfactoryoverride" />
<antcall target="test" inheritRefs="true">
<param name="test" value="statefulproxyfactoryoverride"/>
</antcall>
- <stop-jboss/>
- <wait-on-shutdown conf="statefulproxyfactoryoverride"/>
+ <server:stop name="statefulproxyfactoryoverride" />
</target>
<target name="ssl-simple-test" depends="init">
@@ -5323,15 +5363,9 @@
<include name="lib/**"/>
</patternset>
</create-config>
+
+ <server:start name="ejb3-ssl"/>
- <!--
- 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="${ejb3.jboss.jvmargs} -Djavax.net.ssl.keyStore=${jboss.dist}/server/ejb3-ssl/conf/localhost.keystore -Djavax.net.ssl.keyStorePassword=opensource"/>
- <start-jboss conf="ejb3-ssl" host="${node0}" jvmargs="${ssl-args}"/>
- <wait-on-host/>
-
<!-- Tell client to use the supplied truststore -->
<property name="jvmargs" value="-Djavax.net.ssl.trustStore=${resources}/test/ssl/localhost.truststore -Djavax.net.ssl.trustStorePassword=opensource"/>
@@ -5340,8 +5374,7 @@
<param name="jvmargs" value="${jvmargs}"/>
</antcall>
- <stop-jboss/>
- <wait-on-shutdown conf="ejb3-ssl"/>
+ <server:stop name="ejb3-ssl"/>
</target>
<target name="ssl-advanced-test" depends="init">
@@ -5352,13 +5385,9 @@
<include name="lib/**"/>
</patternset>
</create-config>
+
+ <server:start name="ejb3-ssl-advanced"/>
- <!--
- "Advanced" remoting sslsocket configuration contains keystore info
- -->
- <start-jboss conf="ejb3-ssl-advanced" host="${node0}" jvmargs="${ejb3.jboss.jvmargs}"/>
- <wait-on-host/>
-
<!-- Tell client to use the supplied truststore -->
<property name="jvmargs" value="-Djavax.net.ssl.trustStore=${resources}/test/ssl/localhost.truststore -Djavax.net.ssl.trustStorePassword=opensource"/>
@@ -5367,8 +5396,7 @@
<param name="jvmargs" value="${jvmargs}"/>
</antcall>
- <stop-jboss/>
- <wait-on-shutdown conf="ejb3-ssl-advanced"/>
+ <server:stop name="ejb3-ssl-advanced"/>
</target>
<target name="invoker-test" depends="init">
@@ -5379,23 +5407,16 @@
<include name="lib/**"/>
</patternset>
</create-config>
+
+ <server:start name="invoker" />
- <start-jboss conf="invoker" host="${node0}" jvmargs="${ejb3.jboss.jvmargs}"/>
- <wait-on-host/>
-
<property name="jvmargs" value=""/>
- <!--antcall target="test-with-jvmargs" inheritRefs="true">
- <param name="test" value="invoker"/>
- <param name="jvmargs" value="${jvmargs}"/>
- </antcall-->
-
<antcall target="test" inheritRefs="true">
<param name="test" value="invoker"/>
</antcall>
- <stop-jboss/>
- <wait-on-shutdown conf="invoker"/>
+ <server:stop name="invoker" />
</target>
<target name="jacc-test" depends="init">
@@ -5406,13 +5427,14 @@
<include name="lib/**"/>
</patternset>
</create-config>
- <start-jboss conf="ejb3-jacc" host="${node0}" jvmargs="${ejb3.jboss.jvmargs}"/>
- <wait-on-host/>
+
+ <server:start name="ejb3-jacc"/>
+
<antcall target="test" inheritRefs="true">
<param name="test" value="jacc"/>
</antcall>
- <stop-jboss/>
- <wait-on-shutdown conf="ejb3-jacc"/>
+
+ <server:stop name="ejb3-jacc"/>
</target>
<!-- ================================================================== -->
@@ -5464,16 +5486,14 @@
</patternset>
</create-config>
- <start-jboss conf="statelesscreation" host="${node0}" jvmargs="${ejb3.jboss.jvmargs}"/>
- <wait-on-host/>
+ <server:start name="statelesscreation" />
<antcall target="test-with-jvmargs" inheritRefs="true">
<param name="test" value="statelesscreation"/>
<param name="jvmargs" value=""/>
</antcall>
- <stop-jboss url="${node0.jndi.url}"/>
- <wait-on-shutdown conf="statelesscreation"/>
+ <server:stop name="statelesscreation" />
</target>
<target name="removedislocal-test">
@@ -5485,16 +5505,14 @@
</patternset>
</create-config>
- <start-jboss conf="removedislocal" host="${node0}" jvmargs="${ejb3.jboss.jvmargs}"/>
- <wait-on-host/>
+ <server:start name="removedislocal" />
<antcall target="test-with-jvmargs" inheritRefs="true">
<param name="test" value="removedislocal"/>
<param name="jvmargs" value=""/>
</antcall>
- <stop-jboss url="${node0.jndi.url}"/>
- <wait-on-shutdown conf="removedislocal"/>
+ <server:stop name="removedislocal" />
</target>
<target name="multi-instance-localfromremote-test">
@@ -5512,20 +5530,20 @@
<include name="lib/**"/>
</patternset>
</create-config>
+
+ <server:start name="localfromremote1" />
+ <server:start name="localfromremote2" />
- <start-jboss conf="localfromremote1" host="${node0}" jvmargs="${ejb3.jboss.jvmargs}"/>
- <start-jboss conf="localfromremote2" host="${node0}" jvmargs="${ejb3.jboss.jvmargs}"/>
+ <antcall target="tests-multi-instance-wait"/>
- <antcall target="tests-multi-instance-wait"/>
+ <antcall target="test-with-jvmargs" inheritRefs="true">
+ <param name="test" value="localfromremote"/>
+ <param name="jvmargs" value=""/>
+ </antcall>
- <antcall target="test-with-jvmargs" inheritRefs="true">
- <param name="test" value="localfromremote"/>
- <param name="jvmargs" value=""/>
- </antcall>
+ <server:stop name="localfromremote1" />
+ <server:stop name="localfromremote2" />
- <stop-jboss url="${node0.jndi.url}"/>
- <stop-jboss url="${node0.jndi.port1.url}"/>
-
</target>
<target name="clustered-jms-test">
@@ -5544,10 +5562,10 @@
<exclude name="deploy/mdbtest-service.xml"/>
</patternset>
</create-config>
+
+ <server:start name="clusteredjms" />
+ <server:start name="clusteredjms2" />
- <start-jboss conf="clusteredjms" host="${node0}" jvmargs="${ejb3.jboss.jvmargs} -Djgroups.bind_addr=${node1.jgroups.bind_addr}"/>
- <start-jboss conf="clusteredjms2" host="${node1}" jvmargs="${ejb3.jboss.jvmargs} -Djgroups.bind_addr=${node0.jgroups.bind_addr}"/>
-
<antcall target="tests-clustering-wait"/>
<antcall target="test-with-jvmargs" inheritRefs="true">
@@ -5555,11 +5573,8 @@
<param name="jvmargs" value=""/>
</antcall>
- <stop-jboss url="${node0.jndi.url}"/>
- <stop-jboss url="${node1.jndi.url}"/>
-
- <wait-on-shutdown conf="clusteredjms"/>
- <wait-on-shutdown conf="clusteredjms2"/>
+ <server:stop name="clusteredjms" />
+ <server:stop name="clusteredjms2" />
</target>
<!-- A macro for turning off buddy replication in a node -->
@@ -5744,13 +5759,11 @@
<target name="iiop-tests" depends="init" description="Execute all tests">
- <start-jboss conf="all" host="${node0}" jvmargs="${ejb3.jboss.jvmargs}"/>
- <wait-on-host/>
+ <server:start name="all" />
<antcall target="no-start-jboss-iiop-tests" inheritRefs="true"/>
- <stop-jboss/>
- <wait-on-shutdown conf="all"/>
+ <server:stop name="all" />
</target>
<target name="no-start-jboss-iiop-tests" depends="init" description="Execute all iiop tests">
More information about the jboss-cvs-commits
mailing list