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

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

Author: bdecoste
Date: 2007-07-16 19:16:54 -0400 (Mon, 16 Jul 2007)
New Revision: 64085

Modified:
   trunk/ejb3/build-test.xml
Log:
[EJBTHREE-1009] merged in tests from 4.2

Modified: trunk/ejb3/build-test.xml
===================================================================
--- trunk/ejb3/build-test.xml	2007-07-16 23:16:29 UTC (rev 64084)
+++ trunk/ejb3/build-test.xml	2007-07-16 23:16:54 UTC (rev 64085)
@@ -2394,7 +2394,41 @@
          </fileset>
       </jar>
    </target>
+	
+   <target name="entityoptimisticlocking"
+      description="Builds all jar files."
+      depends="compile-classes">
 
+      <mkdir dir="${build.lib}"/>
+
+      <jar jarfile="${build.lib}/entityoptimisticlocking-test.jar">
+         <fileset dir="${build.classes}">
+            <include name="org/jboss/ejb3/test/entity/*.class"/>
+         </fileset>
+         <fileset dir="${resources}/test/entityoptimisticlocking">
+            <include name="META-INF/persistence.xml"/>
+         </fileset>
+      </jar>
+   </target>
+   
+   <target name="persistenceunits"
+      description="Builds all jar files."
+      depends="compile-classes">
+
+      <mkdir dir="${build.lib}"/>
+
+      <jar jarfile="${build.lib}/persistenceunits-test.jar">
+         <fileset dir="${build.classes}">
+            <include name="org/jboss/ejb3/test/persistenceunits/*.class"/>
+         </fileset>
+         <fileset dir="${resources}/test/persistenceunits">
+            <include name="META-INF/persistence.xml"/>
+            <include name="*.xml"/>
+            <include name="*.jar"/>
+         </fileset>
+      </jar>
+   </target>
+
    <target name="timestampentity"
       description="Builds all jar files."
       depends="compile-classes">
@@ -2989,6 +3023,41 @@
    	
 	  <copy file="${build.lib}/stateless-test.jar" tofile="${build.lib}/stateless-test.ejb3"/>
    </target>
+	
+   <target name="concurrentnaming"
+      description="Builds all jar files."
+      depends="compile-classes">
+
+      <mkdir dir="${build.lib}"/>
+
+      <jar jarfile="${build.lib}/concurrentnaming-test.jar">
+         <fileset dir="${build.classes}">
+            <include name="org/jboss/ejb3/test/concurrentnaming/*.class"/>
+         </fileset>
+      </jar>
+   </target>
+
+   <target name="propertyreplacement"
+      description="Builds all jar files."
+      depends="compile-classes">
+
+      <mkdir dir="${build.lib}"/>
+
+      <jar jarfile="${build.lib}/propertyreplacement-test.jar">
+         <fileset dir="${build.classes}">
+            <include name="org/jboss/ejb3/test/propertyreplacement/*.class"/>
+         </fileset>
+         <fileset dir="${resources}/test/propertyreplacement">
+            <include name="META-INF/*.xml"/>
+         </fileset>
+      </jar>
+      
+      <copy todir="${build.lib}">
+         <fileset dir="${resources}/test/propertyreplacement">
+            <include name="*.xml"/>
+         </fileset>
+      </copy>
+   </target>
    
    <target name="invoker"
       description="Builds all jar files."
@@ -3396,7 +3465,7 @@
 	  </copy>
    </target>
    
-   <target name="jars" depends="clusteredjms, appclient, tck5sec, invalidtxmdb, descriptortypo, libdeployment, homeinterface, timestampentity, arjuna, mdbtransactions, unauthenticatedprincipal, clusteredservice, invoker, classloader, 
+   <target name="jars" depends="clusteredjms, entityoptimisticlocking, concurrentnaming, propertyreplacement, persistenceunits, appclient, tck5sec, invalidtxmdb, descriptortypo, libdeployment, homeinterface, timestampentity, arjuna, mdbtransactions, unauthenticatedprincipal, clusteredservice, invoker, classloader, 
       circulardependency, jsp, timerdependency, servicedependency, servlet, stateless14, webservices, ear, ejbthree440, 
       ejbthree454, ejbthree653, ejbthree670, ejbthree712, ejbthree724, ejbthree751, ejbthree832, ejbthree921, ejbthree936, 
       ejbthree939,
@@ -4135,9 +4204,15 @@
       <antcall target="test" inheritRefs="true">
          <param name="test" value="stateless"/>
       </antcall>
+	  <antcall target="test" inheritRefs="true">
+	      <param name="test" value="concurrentnaming"/>
+	  </antcall>
       <antcall target="test" inheritRefs="true">
          <param name="test" value="homeinterface"/>
       </antcall>
+	  <antcall target="test" inheritRefs="true">
+		 <param name="test" value="propertyreplacement"/>
+      </antcall>
       <antcall target="test" inheritRefs="true">
          <param name="test" value="deployer"/>
       </antcall>
@@ -4330,7 +4405,13 @@
       <antcall target="test" inheritRefs="true">
          <param name="test" value="entity"/>
       </antcall>
+	  <antcall target="test" inheritRefs="true">
+         <param name="test" value="entityoptimisticlocking"/>
+      </antcall>
       <antcall target="test" inheritRefs="true">
+         <param name="test" value="persistenceunits"/>
+      </antcall>
+      <antcall target="test" inheritRefs="true">
          <param name="test" value="manytomany"/>
       </antcall>
       <antcall target="test" inheritRefs="true">