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

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

Author: dimitris at jboss.org
Date: 2007-05-10 17:12:35 -0400 (Thu, 10 May 2007)
New Revision: 62973

Modified:
   branches/Branch_4_2/testsuite/build.xml
Log:
don't include jboss.jar and jboss-test.jar in the classpath of the compatibility tests. They should be copied to the client lib dir from their respective versions.

Modified: branches/Branch_4_2/testsuite/build.xml
===================================================================
--- branches/Branch_4_2/testsuite/build.xml	2007-05-10 19:52:25 UTC (rev 62972)
+++ branches/Branch_4_2/testsuite/build.xml	2007-05-10 21:12:35 UTC (rev 62973)
@@ -105,7 +105,7 @@
     <path refid="apache.log4j.classpath"/>
     <path refid="apache.scout.classpath"/>
     <path refid="apache.xerces.classpath"/>
-  	<path refid="apache.xml.commons.classpath"/>
+    <path refid="apache.xml.commons.classpath"/>
     <path refid="dom4j.dom4j.classpath"/>
     <path refid="hibernate3.classpath"/>
     <path refid="hsqldb.hsqldb.classpath"/>
@@ -2835,7 +2835,7 @@
     <test-compatibility-pooledInvokers client-version="4_0_4_GA" client-jdk="${jdk14}" serialization-flag="-Djboss.remoting.pre_2_0_compatible=true" client-serialization-flag="-Dnone"/>
     <test-compatibility-pooledInvokers client-version="4_0_5_GA" client-jdk="${jdk14}" serialization-flag="-Djboss.remoting.pre_2_0_compatible=true" client-serialization-flag="-Dnone"/>
     <test-compatibility-pooledInvokers client-version="4_0_x" client-jdk="${jdk14}" serialization-flag="-Djboss.remoting.pre_2_0_compatible=true" client-serialization-flag="-Dnone"/>
-    <test-compatibility-pooledInvokers client-version="4_2_x" client-jdk="${jdk15}" serialization-flag="-Dnone" client-serialization-flag="-Dnone"/>
+    <test-compatibility-pooledInvokers client-version="4_2_x" client-jdk="${jdk15}" serialization-flag="-Dnone" client-serialization-flag="-Dnone"/>    
   </target>
 
   <macrodef name="test-compatibility-pooledInvokers">
@@ -2935,7 +2935,12 @@
         <pathelement location="${build.classes14}"/>
         <pathelement location="${build.resources}"/>
         <fileset dir="${current-version-dir}" includes="*.jar"/>
-        <path refid="thirdparty.classpath"/>
+        <!-- The following classes are needed for the test
+        org/jboss/test/JBossTestCase (from jboss-test.jar)
+
+        org/jboss/ejb/plugins/cmp/jdbc/metadata/JDBCQueryMetaData
+        org/jboss/metadata/ClientMetaData (both from jboss.jar)
+        -->
       </classpath>
       <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter" usefile="${junit.formatter.usefile}"
         extension="-${test-name}_${matrix-configuration}.xml"/>