[jboss-cvs] JBossAS SVN: r61421 - trunk/testsuite.

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

Author: mvecera at redhat.com
Date: 2007-03-19 05:33:42 -0400 (Mon, 19 Mar 2007)
New Revision: 61421

Modified:
   trunk/testsuite/build.xml
Log:
JBAS-3993 trunk patch. Found testsuite/imports/sections/cts.xml and classloader.xml already patched.

Modified: trunk/testsuite/build.xml
===================================================================
--- trunk/testsuite/build.xml	2007-03-19 06:55:03 UTC (rev 61420)
+++ trunk/testsuite/build.xml	2007-03-19 09:33:42 UTC (rev 61421)
@@ -258,7 +258,24 @@
    <property name="local.classpath" value=""/>
 
    <!-- Classpath to build and run 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.ejb3.classpath"/>
+      <path refid="jboss.ejb3x.classpath"/>
+      <path refid="jboss.jmx.classpath"/>
+      <path refid="jboss.jmx-remoting.classpath"/>
+      <path refid="jboss.test.classpath"/>
+      <path refid="thirdparty.classpath"/>
+   </path>
+
+   <!-- Classpath to build and 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"/>
@@ -273,7 +290,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 -->
@@ -378,14 +395,14 @@
        includeJavaRuntime="${javac.include.java.runtime}"
        failonerror="${javac.fail.onerror}">
        <src path="${source.java.5}"/>
-       <classpath refid="tests.classpath"/>
+       <classpath refid="tests.compile.classpath"/>
          <include name="org/jboss/test/aop/**"/>
      </javac>
 
       <!-- The aop tests use JDK 5 annotations, so make sure that the jboss-aop-jdk50.jar comes before the JDK1.4 style annotations defined in jboss-messaging-client.jar  -->
       <path id="annotations.classpath">
          <path refid="jboss.aop.classpath"/>
-         <path refid="tests.classpath"/>
+         <path refid="tests.compile.classpath"/>
       </path>
 
      <javac destdir="${build.classes}"
@@ -425,7 +442,7 @@
          <exclude name="org/jboss/test/recover/derby/**"/>
          <exclude name="org/jboss/test/xml/JaxpXPathBaseTestCase*" if="HAVE_JDK_1.4"/>
          <exclude name="org/jboss/test/aop/**"/>
-         <classpath refid="tests.classpath"/>
+         <classpath refid="tests.compile.classpath"/>
       </javac>
    </target>
 
@@ -440,7 +457,7 @@
          debug="${rmic.debug}"
          stubVersion="${rmic.stubVersion}"
          >
-         <classpath refid="tests.classpath"/>
+         <classpath refid="tests.compile.classpath"/>
          <patternset refid="rmic.includes" />
       </rmic>
    </target>