Author: thomas.diesler(a)jboss.com Date: 2006-12-21 10:27:39 -0500 (Thu, 21 Dec 2006) New Revision: 1703 Modified: branches/tdiesler/trunk/jbossws/src/test/build.xml Log: partial commit Modified: branches/tdiesler/trunk/jbossws/src/test/build.xml =================================================================== --- branches/tdiesler/trunk/jbossws/src/test/build.xml 2006-12-21 15:10:37 UTC (rev 1702) +++ branches/tdiesler/trunk/jbossws/src/test/build.xml 2006-12-21 15:27:39 UTC (rev 1703) @@ -44,7 +44,14 @@ </not> </condition> - <property name="jboss.home" value="${jboss50.home}"/> + <!-- Define jboss.home --> + <condition property="jboss.home" value="${jboss50.home}"> + <equals arg1="${jboss.integration.target}" arg2="jboss50"/> + </condition> + <condition property="jboss.home" value="${jboss42.home}"> + <equals arg1="${jboss.integration.target}" arg2="jboss42"/> + </condition> + <property name="jboss.client" value="${jboss.home}/client"/> <property name="jboss.lib" value="${jboss.home}/lib"/> <property name="jboss.server" value="${jboss.home}/server/${jboss.server.instance}"/> @@ -144,7 +151,7 @@ <pathelement location="${jboss.server.lib}/jboss.jar"/> <pathelement location="${jboss.server.deploy}/ejb3.deployer/jboss-annotations-ejb3.jar"/> <pathelement location="${jboss.server.deploy}/ejb3.deployer/jboss-ejb3x.jar"/> - <pathelement location="${build.lib.dir}/jbossws-jboss50-integration.jar"/> + <pathelement location="${build.lib.dir}/jbossws-${jboss.integration.target}-integration.jar"/> <pathelement location="${build.lib.dir}/jbossws-tomcat-integration.jar"/> </path> @@ -154,7 +161,7 @@ --> <path id="test.client.classpath"> <path refid="jbossws.client.classpath"/> - <pathelement location="${build.lib.dir}/jbossws-jboss50-integration.jar"/> + <pathelement location="${build.lib.dir}/jbossws-${jboss.integration.target}-integration.jar"/> <pathelement location="${build.lib.dir}/jbossws-tomcat-integration.jar"/> <pathelement location="${jboss.client}/jboss-aspect-jdk50-client.jar"/> <pathelement location="${jboss.client}/jboss-aop-jdk50-client.jar"/>