From: Thomas D. <tho...@jb...> - 2006-04-29 14:38:30
|
User: tdiesler Date: 06/04/29 10:38:27 Modified: jbosstest Tag: Branch_4_0 build.xml Log: Migrate ws4ee incompatible tests to branches/jbossws-1.0 Revision Changes Path No revision No revision 1.406.2.181 +11 -5 jbosstest/build.xml (In the diff below, changes in quantity of whitespace are not shown.) Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.406.2.180 retrieving revision 1.406.2.181 diff -u -b -r1.406.2.180 -r1.406.2.181 --- build.xml 29 Apr 2006 08:28:09 -0000 1.406.2.180 +++ build.xml 29 Apr 2006 14:38:27 -0000 1.406.2.181 @@ -12,7 +12,7 @@ <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.406.2.180 2006/04/29 08:28:09 tdiesler Exp $ --> +<!-- $Id: build.xml,v 1.406.2.181 2006/04/29 14:38:27 tdiesler Exp $ --> <project default="main" name="JBoss/Testsuite" xmlns:server="http://jboss.org/ns/test/ant/server"> @@ -209,14 +209,20 @@ <!-- Set classpath for the webservice stack depending client jar --> <property name="jboss.home" value="${module.root}/../build/output/jboss-${version.major}.${version.minor}.${version.revision}.${version.tag}"/> - <available property="webservice.classpath" value="jboss-ws4ee.classpath" file="${jboss.home}/client/jboss-ws4ee-client.jar"/> - <available property="webservice.classpath" value="jbossws14.classpath" file="${jboss.home}/client/jbossws14-client.jar"/> + <available property="jboss-ws4ee.available" file="${jboss.home}/client/jboss-ws4ee-client.jar"/> + <available property="jbossws14.available" file="${jboss.home}/client/jbossws14-client.jar"/> + <condition property="webservice.classpath" value="jboss-ws4ee.classpath"> + <isset property="jboss-ws4ee.available"/> + </condition> + <condition property="webservice.classpath" value="jbossws14.classpath"> + <isset property="jbossws14.available"/> + </condition> <path id="jboss-ws4ee.classpath"> - <pathelement path="${jboss.home}/client/jboss-ws4ee-client.jar"/> + <pathelement path="${jboss.webservice.lib}/jboss-ws4ee-client.jar"/> <pathelement path="${jboss.jaxrpc.lib}/axis-ws4ee.jar"/> </path> <path id="jbossws14.classpath"> - <pathelement path="${jboss.home}/client/jbossws14-client.jar"/> + <pathelement path="${jboss.jbossws14.lib}/jbossws14-client.jar"/> </path> <path id="webservice.classpath" refid="${webservice.classpath}"/> |