[jboss-cvs] JBossAS SVN: r59572 - trunk/ejb3.

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

Author: bstansberry at jboss.com
Date: 2007-01-11 22:23:41 -0500 (Thu, 11 Jan 2007)
New Revision: 59572

Modified:
   trunk/ejb3/build-test.xml
Log:
Enable EJBTHREE-798 tests
Make sure all needed jars are on the one-test classpath

Modified: trunk/ejb3/build-test.xml
===================================================================
--- trunk/ejb3/build-test.xml	2007-01-12 03:21:16 UTC (rev 59571)
+++ trunk/ejb3/build-test.xml	2007-01-12 03:23:41 UTC (rev 59572)
@@ -2862,8 +2862,6 @@
          </fileset>
       </jar>
 
-      <!-- FIXME Uncomment when clustering test changes are committed
-
       <jar jarfile="${build.lib}/clusteredentity-classloader-test.jar">
          <fileset dir="${build.classes}">
             <include name="org/jboss/ejb3/test/clusteredentity/classloader/*.class"/>
@@ -2905,7 +2903,6 @@
          <include name="META-INF/application.xml"/>
        </fileset>
     </jar>
-	-->
    
    </target>
 
@@ -3107,18 +3104,39 @@
 
 
          <jvmarg line="${jvmargs}" />
-
          <classpath>
             <path refid="asm.asm.classpath"/>
             <path refid="hibernate.hibernate.classpath"/>
             <pathelement location="${build.classes}"/>
+            <path refid="${client.run.classpath}"/>
             <pathelement location="${resources}/test"/>
-            <path refid="${client.run.classpath}"/>
             <path refid="jboss.jbossws.classpath"/>
             <path refid="apache.xerces.classpath"/>
             <path refid="sun.jaf.classpath"/>
             <path refid="sun.javamail.classpath"/>
             <path refid="apache.httpclient.classpath"/>
+            <path refid="jboss.server.classpath"/>
+            <path refid="jboss.security.classpath"/>
+            <path refid="jboss.naming.classpath"/>
+            <path refid="trove.classpath"/>
+            <path refid="jboss.common.core.classpath"/>
+            <path refid="jboss.common.logging.spi.classpath"/>
+            <path refid="jboss.common.logging.log4j.classpath"/>
+            <path refid="jboss.common.logging.jdk.classpath"/>
+            <path refid="jboss.aop.classpath"/>
+            <path refid="jboss.aspects.classpath"/>
+            <path refid="jboss.jbossxb.classpath"/>
+         	<!-- for Corba -->
+            <path refid="jboss.iiop.classpath"/>
+         	<path refid="jacorb.jacorb.classpath"/>
+         	<path refid="apache.avalon.classpath"/>
+         	<path refid="apache.avalon.logkit.classpath"/>
+
+            <!-- EJBTHREE-485 needs javassist -->
+            <path refid="javassist.classpath"/>
+            
+            <!-- For clustered entities -->
+            <path refid="hsqldb.hsqldb.classpath"/>
          </classpath>
 
          <formatter type="xml" usefile="true"/>