[jbossws-commits] JBossWS SVN: r6716 - framework/trunk/testsuite/test/ant-import.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Mon Apr 28 06:08:21 EDT 2008
Author: thomas.diesler at jboss.com
Date: 2008-04-28 06:08:20 -0400 (Mon, 28 Apr 2008)
New Revision: 6716
Modified:
framework/trunk/testsuite/test/ant-import/build-testsuite.xml
Log:
Move all test inititialization to the prepare target
Modified: framework/trunk/testsuite/test/ant-import/build-testsuite.xml
===================================================================
--- framework/trunk/testsuite/test/ant-import/build-testsuite.xml 2008-04-28 08:03:34 UTC (rev 6715)
+++ framework/trunk/testsuite/test/ant-import/build-testsuite.xml 2008-04-28 10:08:20 UTC (rev 6716)
@@ -10,82 +10,78 @@
<project>
- <!-- Define jboss.home -->
- <condition property="jboss.home" value="${jboss421.home}">
- <equals arg1="${jbossws.integration.target}" arg2="jboss421"/>
- </condition>
- <condition property="jboss.home" value="${jboss422.home}">
- <equals arg1="${jbossws.integration.target}" arg2="jboss422"/>
- </condition>
- <condition property="jboss.home" value="${jboss423.home}">
- <equals arg1="${jbossws.integration.target}" arg2="jboss423"/>
- </condition>
- <condition property="jboss.home" value="${jboss500.home}">
- <equals arg1="${jbossws.integration.target}" arg2="jboss500"/>
- </condition>
- <condition property="jboss.home" value="${jboss501.home}">
- <equals arg1="${jbossws.integration.target}" arg2="jboss501"/>
- </condition>
-
<!-- ================================================================== -->
- <!-- Setup -->
+ <!-- Initialization -->
<!-- ================================================================== -->
- <!-- Verify required properties that must be set before this file is imported -->
- <fail message="Tests output dir not set." unless="tests.output.dir"/>
-
- <!-- Verify availabililty of tools.jar -->
- <condition property="tools.jar" value="${java.home}/lib/tools.jar">
- <available file="${java.home}/lib/tools.jar"/>
- </condition>
- <condition property="tools.jar" value="${java.home}/../lib/tools.jar">
- <available file="${java.home}/../lib/tools.jar"/>
- </condition>
- <!-- [JBWS-2113] tools.jar not available on Mac OS X -->
- <condition property="tools.jar" value="${java.home}/../Classes/classes.jar">
- <available file="${java.home}/../Classes/classes.jar"/>
- </condition>
- <fail message="Not available: ${java.home}/lib/tools.jar, ${java.home}/../lib/tools.jar" unless="tools.jar"/>
-
- <!-- Use -Ddebug=true for remote debugging -->
- <condition property="remote.debug.line" value="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005">
- <isset property="debug"/>
- </condition>
- <condition property="remote.debug.line" value="">
- <not>
+ <target name="tests-prepare" depends="prepare">
+
+ <!-- Define jboss.home -->
+ <condition property="jboss.home" value="${jboss421.home}">
+ <equals arg1="${jbossws.integration.target}" arg2="jboss421"/>
+ </condition>
+ <condition property="jboss.home" value="${jboss422.home}">
+ <equals arg1="${jbossws.integration.target}" arg2="jboss422"/>
+ </condition>
+ <condition property="jboss.home" value="${jboss423.home}">
+ <equals arg1="${jbossws.integration.target}" arg2="jboss423"/>
+ </condition>
+ <condition property="jboss.home" value="${jboss500.home}">
+ <equals arg1="${jbossws.integration.target}" arg2="jboss500"/>
+ </condition>
+ <condition property="jboss.home" value="${jboss501.home}">
+ <equals arg1="${jbossws.integration.target}" arg2="jboss501"/>
+ </condition>
+
+ <!-- Verify required properties that must be set before this file is imported -->
+ <fail message="Tests output dir not set." unless="tests.output.dir"/>
+
+ <!-- Verify availabililty of tools.jar -->
+ <condition property="tools.jar" value="${java.home}/lib/tools.jar">
+ <available file="${java.home}/lib/tools.jar"/>
+ </condition>
+ <condition property="tools.jar" value="${java.home}/../lib/tools.jar">
+ <available file="${java.home}/../lib/tools.jar"/>
+ </condition>
+ <!-- [JBWS-2113] tools.jar not available on Mac OS X -->
+ <condition property="tools.jar" value="${java.home}/../Classes/classes.jar">
+ <available file="${java.home}/../Classes/classes.jar"/>
+ </condition>
+ <fail message="Not available: ${java.home}/lib/tools.jar, ${java.home}/../lib/tools.jar" unless="tools.jar"/>
+
+ <!-- Use -Ddebug=true for remote debugging -->
+ <condition property="remote.debug.line" value="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005">
<isset property="debug"/>
- </not>
- </condition>
-
- <!-- Set a hostname property based on COMPUTERNAME for win32, HOSTNAME
- otherwise and initialize the node0/node1 cluster hostnames to localhost
- and ${hostname} by default. If you cannot route multicast traffic between
- localhost and hostname, then you need to specify node0 and node1 binding
- in the local.properties that can in order to be able to run the clustering
- tests.
- -->
- <property environment="env"/>
- <condition property="hostname" value="${env.COMPUTERNAME}">
- <os family="windows"/>
- </condition>
- <condition property="hostname" value="${env.HOSTNAME}">
- <not>
+ </condition>
+ <condition property="remote.debug.line" value="">
+ <not>
+ <isset property="debug"/>
+ </not>
+ </condition>
+
+ <!-- Set a hostname property based on COMPUTERNAME for win32, HOSTNAME
+ otherwise and initialize the node0/node1 cluster hostnames to localhost
+ and ${hostname} by default. If you cannot route multicast traffic between
+ localhost and hostname, then you need to specify node0 and node1 binding
+ in the local.properties that can in order to be able to run the clustering
+ tests.
+ -->
+ <property environment="env"/>
+ <condition property="hostname" value="${env.COMPUTERNAME}">
<os family="windows"/>
- </not>
- </condition>
-
- <!-- node0 defaults -->
- <property name="node0" value="${jboss.bind.address}"/>
- <property name="node0.http.url" value="http://${node0}:8080"/>
- <property name="node0.jndi.url" value="jnp://${node0}:1099"/>
- <property name="node0.hajndi.url" value="jnp://${node0}:1100"/>
-
- <!-- ================================================================== -->
- <!-- Initialization -->
- <!-- ================================================================== -->
-
- <target name="tests-prepare">
+ </condition>
+ <condition property="hostname" value="${env.HOSTNAME}">
+ <not>
+ <os family="windows"/>
+ </not>
+ </condition>
+ <!-- node0 defaults -->
+ <property name="node0" value="${jboss.bind.address}"/>
+ <property name="node0.http.url" value="http://${node0}:8080"/>
+ <property name="node0.jndi.url" value="jnp://${node0}:1099"/>
+ <property name="node0.hajndi.url" value="jnp://${node0}:1100"/>
+
<mkdir dir="${tests.output.dir}/test-log"/>
<delete file="${tests.output.dir}/test-log/test.log"/>
@@ -172,9 +168,8 @@
<pathelement location="${jboss.client}/jboss-ejb3-client.jar"/>
<pathelement location="${jboss.client}/jboss-remoting.jar"/>
<pathelement location="${jboss.client}/jboss-xml-binding.jar"/>
+ <pathelement location="${jboss.client}/jbossws-jboss42.jar"/>
<pathelement location="${jboss.client}/jbossws-jboss421.jar"/>
- <pathelement location="${jboss.client}/jbossws-jboss422.jar"/>
- <pathelement location="${jboss.client}/jbossws-jboss423.jar"/>
<pathelement location="${jboss.client}/jbossall-client.jar"/>
<pathelement location="${jboss.client}/log4j.jar"/>
<pathelement location="${jboss.client}/mail.jar"/>
@@ -234,8 +229,7 @@
<pathelement location="${jboss.client}/jboss-wsit-tools.jar"/>
<pathelement location="${jboss.client}/jboss-xml-binding.jar"/>
<pathelement location="${jboss.client}/jbossall-client.jar"/>
- <pathelement location="${jboss.client}/jbossws-jboss500.jar"/>
- <pathelement location="${jboss.client}/jbossws-jboss501.jar"/>
+ <pathelement location="${jboss.client}/jbossws-jboss50.jar"/>
<pathelement location="${jboss.client}/jaxws-tools.jar"/>
<pathelement location="${jboss.client}/jboss-wsit-tools.jar"/>
<pathelement location="${jboss.client}/log4j.jar"/>
More information about the jbossws-commits
mailing list