[portal-commits] JBoss Portal SVN: r10297 - in modules/web/trunk/web/src/test: resources/config and 1 other directory.

Author: prabhat.jha(a)jboss.com Date: 2008-03-17 14:31:09 -0400 (Mon, 17 Mar 2008) New Revision: 10297 Modified: modules/web/trunk/web/src/test/build.xml modules/web/trunk/web/src/test/resources/config/servers.xml Log: adding jboss 4.2.2 to the server list Modified: modules/web/trunk/web/src/test/build.xml =================================================================== --- modules/web/trunk/web/src/test/build.xml 2008-03-17 16:50:00 UTC (rev 10296) +++ modules/web/trunk/web/src/test/build.xml 2008-03-17 18:31:09 UTC (rev 10297) @@ -56,6 +56,14 @@ <property environment="env"/> <!--If properties are not in command line check if they are set in env--> + <condition property="JBOSS_4_2_2_HOME" value="${env.JBOSS_4_2_2_HOME}"> + <and> + <isset property="env.JBOSS_4_2_2_HOME"/> + <not> + <isset property="JBOSS_4_2_2_HOME"/> + </not> + </and> + </condition> <condition property="JBOSS_4_2_1_HOME" value="${env.JBOSS_4_2_1_HOME}"> <and> <isset property="env.JBOSS_4_2_1_HOME"/> @@ -81,7 +89,7 @@ </and> </condition> - <fail message="Please set the environment variable JBOSS_4_2_0_HOME or JBOSS_4_2_1_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"> <condition> <and> <not> @@ -90,6 +98,9 @@ <not> <isset property="JBOSS_4_2_1_HOME"/> </not> + <not> + <isset property="JBOSS_4_2_2_HOME"/> + </not> </and> </condition> </fail> @@ -470,6 +481,13 @@ <param name="test.jboss-4.2.home.variable-name" value="JBOSS_4_2_1_HOME"/> <param name="test.archive.path" value="${test.temp.lib}/jboss-4.2-container-servlet/test-spi-server.war"/> </antcall> + <antcall target="tests.jboss-4.2.container-servlet"> + <param name="test.id" value="JBoss-4_2_2-spi-container-servlet"/> + <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}"/> + <param name="test.jboss-4.2.home.variable-name" value="JBOSS_4_2_2_HOME"/> + <param name="test.archive.path" value="${test.temp.lib}/jboss-4.2-container-servlet/test-spi-server.war"/> + </antcall> <antcall target="tests.jboss-4.2.generic"> <param name="test.id" value="JBoss-4_2_0-spi-generic"/> <param name="test.jboss-4.2.name" value="RemoteJBoss_4_2_0"/> @@ -484,6 +502,14 @@ <param name="test.jboss-4.2.home.variable-name" value="JBOSS_4_2_1_HOME"/> <param name="test.archive.path" value="${test.temp.lib}/jboss-4.2-generic/test-spi-server.war"/> </antcall> + <antcall target="tests.jboss-4.2.generic"> + <param name="test.id" value="JBoss-4_2_2-spi-generic"/> + <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}"/> + <param name="test.jboss-4.2.home.variable-name" value="JBOSS_4_2_2_HOME"/> + <param name="test.archive.path" value="${test.temp.lib}/jboss-4.2-generic/test-spi-server.war"/> + </antcall> + <antcall target="tests.jboss-4.2.container-servlet"> <param name="test.id" value="JBoss-4_2_0-request-container-servlet"/> <param name="test.jboss-4.2.name" value="RemoteJBoss_4_2_0"/> @@ -498,6 +524,14 @@ <param name="test.jboss-4.2.home.variable-name" value="JBOSS_4_2_1_HOME"/> <param name="test.archive.path" value="${test.temp.lib}/jboss-4.2-container-servlet/test-request-server.war"/> </antcall> + <antcall target="tests.jboss-4.2.container-servlet"> + <param name="test.id" value="JBoss-4_2_2-request-container-servlet"/> + <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}"/> + <param name="test.jboss-4.2.home.variable-name" value="JBOSS_4_2_2_HOME"/> + <param name="test.archive.path" value="${test.temp.lib}/jboss-4.2-container-servlet/test-request-server.war"/> + </antcall> + </target> @@ -657,4 +691,4 @@ </target> -</project> \ No newline at end of file +</project> Modified: modules/web/trunk/web/src/test/resources/config/servers.xml =================================================================== --- modules/web/trunk/web/src/test/resources/config/servers.xml 2008-03-17 16:50:00 UTC (rev 10296) +++ modules/web/trunk/web/src/test/resources/config/servers.xml 2008-03-17 18:31:09 UTC (rev 10297) @@ -57,4 +57,22 @@ </deployer> </node> </server> + <server> + <server-name>RemoteJBoss_4_2_2</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> </servers>