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

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

Author: mvecera at redhat.com
Date: 2007-03-19 06:27:02 -0400 (Mon, 19 Mar 2007)
New Revision: 61426

Modified:
   branches/Branch_4_2/testsuite/build.xml
Log:
JBAS-3993 patch for Branch_4_2

Modified: branches/Branch_4_2/testsuite/build.xml
===================================================================
--- branches/Branch_4_2/testsuite/build.xml	2007-03-19 10:04:38 UTC (rev 61425)
+++ branches/Branch_4_2/testsuite/build.xml	2007-03-19 10:27:02 UTC (rev 61426)
@@ -229,8 +229,21 @@
     <path refid="dependentmodule.classpath"/>
   </path>
 
-  <!-- Classpath to build and run the tests -->
+  <!-- Classpath to build the tests -->
+  <path id="tests.compile.classpath">
+    <pathelement path="${classpath}"/>
+    <pathelement path="${local.classpath}"/>
+    <pathelement path="${project.tools}/lib/ant.jar"/>
+    <pathelement path="${project.tools}/lib/ant-junit.jar"/>
+    <path refid="jboss.jmx.classpath"/>
+    <path refid="thirdparty.classpath"/>
+  </path>
+
+  <!-- Classpath to run the tests -->
   <path id="tests.classpath">
+    <fileset dir="${jboss.dist}/client">
+      <include name="**/*.jar"/>
+    </fileset>
     <pathelement path="${classpath}"/>
     <pathelement path="${local.classpath}"/>
     <pathelement path="${project.tools}/lib/ant.jar"/>
@@ -246,7 +259,7 @@
 
   <!-- The classpath required to build javadocs. -->
   <path id="javadoc.classpath">
-    <path refid="tests.classpath"/>
+    <path refid="tests.compile.classpath"/>
   </path>
 
   <!-- Packages to include when generating api documentation -->
@@ -348,7 +361,7 @@
     <path id="annotations.classpath">
       <pathelement path="${jboss.aop.lib}/jboss-aop-jdk50.jar"/>
       <pathelement path="${jboss.aspects.lib}/jboss-aspect-library-jdk50.jar"/>
-      <path refid="tests.classpath"/>
+      <path refid="tests.compile.classpath"/>
     </path>
     <javac destdir="${build.classes}" optimize="${javac.optimize}" source="1.5" target="1.5" debug="${javac.debug}" depend="${javac.depend}" verbose="${javac.verbose}"
       deprecation="${javac.deprecation}" includeAntRuntime="${javac.include.ant.runtime}" includeJavaRuntime="${javac.include.java.runtime}"
@@ -367,14 +380,14 @@
       <src path="${build.gen-src}"/>
       <exclude name="org/jboss/test/aop/bean/Annotated*" if="HAVE_JDK_1.5"/>
       <exclude name="org/jboss/test/xml/JaxpXPathBaseTestCase*" if="HAVE_JDK_1.4"/>
-      <classpath refid="tests.classpath"/>
+      <classpath refid="tests.compile.classpath"/>
     </javac>
   </target>
 
   <target name="compile-stubs">
     <rmic base="${build.classes}" sourcebase="${build.classes}" verify="${rmic.verify}" iiop="${rmic.iiop}" iiopopts="${rmic.iiopopts}" idl="${rmic.idl}"
       idlopts="${rmic.idlops}" debug="${rmic.debug}" stubVersion="${rmic.stubVersion}">
-      <classpath refid="tests.classpath"/>
+      <classpath refid="tests.compile.classpath"/>
       <patternset refid="rmic.includes"/>
     </rmic>
   </target>