[jboss-cvs] JBossAS SVN: r59339 - branches/Branch_4_2/testsuite

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

Author: thomas.diesler at jboss.com
Date: 2007-01-04 06:19:22 -0500 (Thu, 04 Jan 2007)
New Revision: 59339

Modified:
   branches/Branch_4_2/testsuite/build.xml
Log:
Fix tests-webservice

Modified: branches/Branch_4_2/testsuite/build.xml
===================================================================
--- branches/Branch_4_2/testsuite/build.xml	2007-01-04 11:15:32 UTC (rev 59338)
+++ branches/Branch_4_2/testsuite/build.xml	2007-01-04 11:19:22 UTC (rev 59339)
@@ -101,10 +101,12 @@
     <path refid="ibm.wsdl4j.classpath"/>
     <path refid="jacorb.jacorb.classpath"/>
     <path refid="javassist.classpath"/>
-    <path refid="jboss.remoting.classpath"/>
+    <path refid="jboss.backport.concurrent.classpath"/>
     <path refid="jboss.jbossretro.rt.classpath"/>
-    <path refid="jboss.backport.concurrent.classpath"/>
     <path refid="jboss.jbossws.classpath"/>
+    <path refid="jboss.jbossxb.classpath"/>
+    <path refid="jboss.microcontainer.classpath"/>
+    <path refid="jboss.remoting.classpath"/>
     <path refid="jgroups.jgroups.classpath"/>
     <path refid="joesnmp.joesnmp.classpath"/>
     <path refid="junit.junit.classpath"/>
@@ -113,13 +115,12 @@
     <path refid="objectweb.joramtests.classpath"/>
     <path refid="odmg.classpath"/>
     <path refid="oswego.concurrent.classpath"/>
+    <path refid="sun.jaxb.classpath"/>
     <path refid="sun.jaf.classpath"/>
     <path refid="sun.javamail.classpath"/>
     <path refid="sun.servlet.classpath"/>
     <path refid="trove.classpath"/>
     <path refid="wutka.dtdparser.classpath"/>
-    <path refid="jboss.jbossxb.classpath"/>
-    <path refid="jboss.microcontainer.classpath"/>
   </path>
   
   <!-- ======= -->
@@ -226,7 +227,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. -->
@@ -631,6 +631,7 @@
   </patternset>
   <patternset id="webservice.excludes">
     <include name="org/jboss/test/webservice/jbws309/*TestCase.class"/>
+    <include name="org/jboss/test/webservice/benchmark/**"/>
   </patternset>
   <!-- Tests needing xml binding setup -->
   <patternset id="jbossxb.includes">
@@ -2320,8 +2321,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}" haltonerror="${junit.haltonerror}" haltonfailure="${junit.haltonfailure}" fork="${junit.fork}"
       timeout="${junit.timeout}" showoutput="${junit.showoutput}" jvm="${junit.jvm}">
@@ -2359,7 +2358,8 @@
         
         <fileset dir="${build.classes}">
           <include name="org/jboss/test/webservice/**/*TestCase.class"/>
-          <exclude name="org/jboss/test/webservice/secure/**/*"/>
+          <exclude name="org/jboss/test/webservice/benchmark/**"/>
+          <exclude name="org/jboss/test/webservice/secure/**"/>
         </fileset>
       </batchtest>
     </junit>