[jboss-cvs] JBossAS SVN: r69725 - projects/ejb3/trunk/core.

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

Author: ALRubinger
Date: 2008-02-08 02:07:40 -0500 (Fri, 08 Feb 2008)
New Revision: 69725

Modified:
   projects/ejb3/trunk/core/build-test.xml
Log:
Added proper client libraries, jndi.properties to JUnit CP; Tests now execute (first sweep) 

Modified: projects/ejb3/trunk/core/build-test.xml
===================================================================
--- projects/ejb3/trunk/core/build-test.xml	2008-02-08 06:52:48 UTC (rev 69724)
+++ projects/ejb3/trunk/core/build-test.xml	2008-02-08 07:07:40 UTC (rev 69725)
@@ -87,6 +87,9 @@
   <property name="location.dependencies.unpacked.jboss-test:jboss.test" value="${location.dependencies.unpacked}/jboss-test"/>
   <property name="location.dependencies.lib" value="${location.dependencies}/lib"/>
   <property name="location.dependencies.lib.jboss-test:jboss-test" value="${location.dependencies.lib}/jboss-test.jar"/>
+  <property name="location.dependencies.lib.junit:junit" value="${location.dependencies.lib}/junit.jar"/>
+  <property name="location.client.lib" value="${JBOSS_HOME}/client"/>
+  <property name="location.client.lib.jbossall" value="${location.client.lib}/jbossall-client.jar"/>
     
   <!-- Define the Path to Server Task Definitions, used by the JBoss Server Run targets -->
   <path id="server.taskdef.classpath">  
@@ -248,7 +251,7 @@
    <!-- Where source files live -->
    <property name="source.java" value="${module.source}/test/java"/>
    <property name="source.etc" value="${module.source}/etc"/>
-   <property name="resources" value="${module.source}/test/resources"/>
+   <property name="resources" value="${location.resources.test}"/>
    <property name="source.stylesheets" value="{location.dependency.unpacked.testsuite}/src/stylesheets"/>
 
    <!-- Where build generated files will go -->
@@ -3972,10 +3975,8 @@
 
          <classpath>
            
-           <!-- Include all dependencies -->
-           <fileset dir="${location.dependencies.lib}">
-             <include name="**/*.jar"/>
-           </fileset>
+           <!-- JBoss Client Binaries -->
+           <pathelement path="${location.client.lib.jbossall}" />
            
            <!-- EJB3 TestSuite -->
            <pathelement path="${location.artifact.tests}" />
@@ -3983,6 +3984,12 @@
            <!-- JBoss Test Project -->
            <pathelement path="${location.dependencies.lib.jboss-test:jboss-test}" />
            
+           <!-- JUnit -->
+           <pathelement path="${location.dependencies.lib.junit:junit}" />
+           
+           <!-- Root of jndi.properties -->
+           <pathelement location="${resources}/test"/>
+           
             <!-- <path refid="hibernate.hibernate.classpath"/> 
             <pathelement location="${build.classes}"/>
             <path refid="${client.run.classpath}"/>