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

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

Author: thomas.diesler at jboss.com
Date: 2007-06-03 14:26:05 -0400 (Sun, 03 Jun 2007)
New Revision: 63324

Modified:
   branches/Branch_4_0/testsuite/build.xml
Log:
Remove dependency on webservice.classpath

Modified: branches/Branch_4_0/testsuite/build.xml
===================================================================
--- branches/Branch_4_0/testsuite/build.xml	2007-06-03 16:13:35 UTC (rev 63323)
+++ branches/Branch_4_0/testsuite/build.xml	2007-06-03 18:26:05 UTC (rev 63324)
@@ -110,6 +110,7 @@
     <path refid="jboss.remoting.classpath"/>
     <path refid="jboss.jbossretro.rt.classpath"/>
     <path refid="jboss.backport.concurrent.classpath"/>
+    <path refid="jboss.jbossws14.classpath"/>
     <path refid="jgroups.jgroups.classpath"/>
   	<path refid="joesnmp.joesnmp.classpath"/>
     <path refid="junit.junit.classpath"/>
@@ -209,26 +210,6 @@
   <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 jdk version -->
-  <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.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}"/>
-
   <!-- classpath and local.classpath must have a value using with a path -->
   <property name="classpath" value=""/>
   <property name="local.classpath" value=""/>
@@ -237,7 +218,6 @@
   <path id="thirdparty.classpath">
     <path refid="library.classpath"/>
     <path refid="dependentmodule.classpath"/>
-    <path refid="webservice.classpath"/>
   </path>
 
   <!-- Classpath to build the tests -->
@@ -269,7 +249,6 @@
   <!-- Classpath to build the tests -->
   <path id="javac.classpath">
     <path refid="thirdparty.classpath"/>
-    <path refid="webservice.classpath"/>
   </path>
 
   <!-- The classpath required to build javadocs. -->
@@ -2608,8 +2587,6 @@
   <target name="tests-webservice"
     description="Execute JBossWS Tests">
 
-    <echo message="webservice.classpath=${webservice.classpath}"/>
-
     <mkdir dir="${build.reports}"/>
     <junit dir="${module.output}"
       printsummary="${junit.printsummary}"