[jboss-cvs] JBossAS SVN: r60269 - branches/Branch_4_0/testsuite.

[jboss-cvs-commits at lists.jboss.org]

Author: thomas.diesler at jboss.com
Date: 2007-02-04 14:31:19 -0500 (Sun, 04 Feb 2007)
New Revision: 60269

Modified:
   branches/Branch_4_0/testsuite/build.xml
Log:
Fix webservice classpath

Modified: branches/Branch_4_0/testsuite/build.xml
===================================================================
--- branches/Branch_4_0/testsuite/build.xml	2007-02-04 18:01:59 UTC (rev 60268)
+++ branches/Branch_4_0/testsuite/build.xml	2007-02-04 19:31:19 UTC (rev 60269)
@@ -205,26 +205,25 @@
   <property name="release.id" value="${install.id}"/>
   <property name="install.root" value="${module.output}/${install.id}"/>
 
-  <!-- Set classpath for the webservice stack depending on ${jboss.dist.name} and client jar -->
+  <!-- Set classpath for the webservice stack depending on ${jboss.dist.name} and jdk version -->
   <property name="jboss.dist.name" value="jboss-${version.major}.${version.minor}.${version.revision}.${version.tag}"/>
   <property name="jboss.home" value="${module.root}/../build/output/${jboss.dist.name}"/>
-  <condition property="webservice.classpath" value="jbossws14.classpath">
-    <not>
-      <isset property="HAVE_JDK_1.5"/>
-    </not>
-  </condition>
   <condition property="webservice.classpath" value="jbossws.classpath">
     <isset property="HAVE_JDK_1.5"/>
   </condition>
+  <property name="webservice.classpath" value="jbossws14.classpath"/>
   <path id="jbossws14.classpath">
+    <pathelement path="${jboss.jbossws14.lib}/jbossws14-jboss40-integration.jar"/>
     <pathelement path="${jboss.jbossws14.lib}/jbossws14-client.jar"/>
     <pathelement path="${jboss.jbossws14.lib}/jboss-jaxrpc.jar"/>
     <pathelement path="${jboss.jbossws14.lib}/jboss-saaj.jar"/>
   </path>
   <path id="jbossws.classpath">
+    <pathelement path="${jboss.jbossws.lib}/jbossws-jboss40-integration.jar"/>
     <pathelement path="${jboss.jbossws.lib}/jbossws-client.jar"/>
-    <pathelement path="${jboss.jbossws14.lib}/jboss-jaxrpc.jar"/>
-    <pathelement path="${jboss.jbossws14.lib}/jboss-saaj.jar"/>
+    <pathelement path="${jboss.jbossws.lib}/jboss-jaxrpc.jar"/>
+    <pathelement path="${jboss.jbossws.lib}/jboss-jaxws.jar"/>
+    <pathelement path="${jboss.jbossws.lib}/jboss-saaj.jar"/>
   </path>
   <path id="webservice.classpath" refid="${webservice.classpath}"/>