From: Thomas D. <tho...@jb...> - 2006-04-26 21:28:09
|
User: tdiesler Date: 06/04/26 17:28:04 Modified: jbosstest Tag: Branch_4_0 build.xml Log: Set webservice.classpath depending on the client jar Revision Changes Path No revision No revision 1.406.2.176 +8 -11 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.175 retrieving revision 1.406.2.176 diff -u -b -r1.406.2.175 -r1.406.2.176 --- build.xml 26 Apr 2006 14:39:34 -0000 1.406.2.175 +++ build.xml 26 Apr 2006 21:28:03 -0000 1.406.2.176 @@ -12,7 +12,7 @@ <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.406.2.175 2006/04/26 14:39:34 kkhan Exp $ --> +<!-- $Id: build.xml,v 1.406.2.176 2006/04/26 21:28:03 tdiesler Exp $ --> <project default="main" name="JBoss/Testsuite" xmlns:server="http://jboss.org/ns/test/ant/server"> @@ -213,24 +213,21 @@ <path refid="dependentmodule.classpath"/> </path> - <!-- Set classpath for the webservice stack depending on the marker file --> + <!-- Set webservice.classpath depending on the 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="webservice.classpath" value="jbossws.classpath" file="${jboss.home}/client/jbossws-client.jar"/> <path id="jboss-ws4ee.classpath"> - <pathelement path="${jboss.webservice.lib}/jboss-ws4ee.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.jbossws14.lib}/jbossws14.jar"/> - <pathelement path="${jboss.jbossws14.lib}/jbossws14-client.jar"/> + <pathelement path="${jboss.home}/client/jbossws14-client.jar"/> </path> <path id="jbossws.classpath"> - <pathelement path="${jboss.jbossws.lib}/jbossws.jar"/> - <pathelement path="${jboss.jbossws.lib}/jbossws-client.jar"/> + <pathelement path="${jboss.home}/client/jbossws-client.jar"/> </path> - <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="webservice.classpath" value="jbossws.classpath" file="${jboss.home}/client/jbossws-client.jar"/> <path id="webservice.classpath" refid="${webservice.classpath}"/> <!-- classpath and local.classpath must have a value using with a path --> |