[portal-commits] JBoss Portal SVN: r11929 - in modules/web/trunk/web/src/test: resources/config and 1 other directory.
Author: thomas.heute(a)jboss.com
Date: 2008-09-18 07:07:59 -0400 (Thu, 18 Sep 2008)
New Revision: 11929
Modified:
modules/web/trunk/web/src/test/build.xml
modules/web/trunk/web/src/test/resources/config/servers.xml
Log:
Added 4.2.3
Modified: modules/web/trunk/web/src/test/build.xml
===================================================================
--- modules/web/trunk/web/src/test/build.xml 2008-09-18 06:20:52 UTC (rev 11928)
+++ modules/web/trunk/web/src/test/build.xml 2008-09-18 11:07:59 UTC (rev 11929)
@@ -68,6 +68,14 @@
<property environment="env"/>
<!--If properties are not in command line check if they are set in env-->
+ <condition property="JBOSS_4_2_3_HOME"
value="${env.JBOSS_4_2_3_HOME}">
+ <and>
+ <isset property="env.JBOSS_4_2_3_HOME"/>
+ <not>
+ <isset property="JBOSS_4_2_3_HOME"/>
+ </not>
+ </and>
+ </condition>
<condition property="JBOSS_4_2_2_HOME"
value="${env.JBOSS_4_2_2_HOME}">
<and>
<isset property="env.JBOSS_4_2_2_HOME"/>
@@ -117,7 +125,7 @@
</and>
</condition>
- <fail message="Please set the environment variable JBOSS_4_2_0_HOME or
JBOSS_4_2_1_HOME or JBOSS_4_2_2_HOME">
+ <fail message="Please set the environment variable JBOSS_4_2_0_HOME or
JBOSS_4_2_1_HOME or JBOSS_4_2_2_HOME or JBOSS_4_2_3_HOME">
<condition>
<and>
<not>
@@ -129,9 +137,12 @@
<not>
<isset property="JBOSS_4_2_1_HOME"/>
</not>
- <not>
+ <not>
<isset property="JBOSS_4_2_2_HOME"/>
</not>
+ <not>
+ <isset property="JBOSS_4_2_3_HOME"/>
+ </not>
</and>
</condition>
</fail>
@@ -714,6 +725,10 @@
<param name="test.jboss-4.2.name"
value="RemoteJBoss_4_2_2"/>
<param name="test.jboss-4.2.home"
value="${JBOSS_4_2_2_HOME}"/>
</antcall>
+ <antcall target="tests.jboss-4.2.spi">
+ <param name="test.jboss-4.2.name"
value="RemoteJBoss_4_2_3"/>
+ <param name="test.jboss-4.2.home"
value="${JBOSS_4_2_3_HOME}"/>
+ </antcall>
<!-- endpoint tests -->
@@ -729,6 +744,10 @@
<param name="test.jboss-4.2.name"
value="RemoteJBoss_4_2_2"/>
<param name="test.jboss-4.2.home"
value="${JBOSS_4_2_2_HOME}"/>
</antcall>
+ <antcall target="tests.jboss-4.2.endpoint">
+ <param name="test.jboss-4.2.name"
value="RemoteJBoss_4_2_3"/>
+ <param name="test.jboss-4.2.home"
value="${JBOSS_4_2_3_HOME}"/>
+ </antcall>
</target>
<target name="cargo.jboss-5.0.start" depends="cargo.setup">
Modified: modules/web/trunk/web/src/test/resources/config/servers.xml
===================================================================
--- modules/web/trunk/web/src/test/resources/config/servers.xml 2008-09-18 06:20:52 UTC
(rev 11928)
+++ modules/web/trunk/web/src/test/resources/config/servers.xml 2008-09-18 11:07:59 UTC
(rev 11929)
@@ -79,7 +79,7 @@
</deployer>
</node>
</server>
- <server>
+ <server>
<server-name>RemoteJBoss_4_2_2</server-name>
<node>
<node-id>default</node-id>
@@ -98,6 +98,24 @@
</node>
</server>
<server>
+ <server-name>RemoteJBoss_4_2_3</server-name>
+ <node>
+ <node-id>default</node-id>
+ <service>
+ <service-name>TestDriverServer</service-name>
+
<interface>org.jboss.unit.remote.driver.RemoteTestDriver</interface>
+ <uri>socket://localhost:5400</uri>
+ </service>
+ <deployer>
+ <remote>
+ <name>jboss4x</name>
+ <host>localhost</host>
+ <port>8080</port>
+ </remote>
+ </deployer>
+ </node>
+ </server>
+ <server>
<server-name>RemoteJBoss_5_0</server-name>
<node>
<node-id>default</node-id>