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

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

Author: bdecoste
Date: 2007-12-05 14:23:49 -0500 (Wed, 05 Dec 2007)
New Revision: 67956

Modified:
   trunk/ejb3/build-test.xml
Log:
[EJBTHREE-1120] merged tests from Branch_4_2

Modified: trunk/ejb3/build-test.xml
===================================================================
--- trunk/ejb3/build-test.xml	2007-12-05 19:12:53 UTC (rev 67955)
+++ trunk/ejb3/build-test.xml	2007-12-05 19:23:49 UTC (rev 67956)
@@ -2120,7 +2120,20 @@
 
       <build-simple-jar name="ejbthree986"/>
    </target>
+	
+   <target name="ejbthree994"
+      description="Builds a simple jar files."
+      depends="compile-classes">
+      
+      <build-simple-jar name="ejbthree994"/>
 
+      <copy todir="${build.lib}">
+         <fileset dir="${resources}/test/ejbthree994">
+            <include name="ejbthree994-connectors-service.xml"/>
+         </fileset>
+      </copy>
+   </target>
+
    <target name="ejbthree989"
       description="Builds a simple jar file."
       depends="compile-classes">
@@ -3051,7 +3064,23 @@
          </fileset>
       </jar>
    </target>
+	
+   <target name="ejbthree1090"
+      description="Builds all jar files."
+      depends="compile-classes">
 
+      <mkdir dir="${build.lib}"/>
+
+      <jar jarfile="${build.lib}/ejbthree1090-test.jar">
+         <fileset dir="${build.classes}">
+            <include name="org/jboss/ejb3/test/ejbthree1090/*.class"/>
+         </fileset>
+         <fileset dir="${resources}/test/ejbthree1090">
+            <include name="*.xml"/>
+         </fileset>
+      </jar>
+   </target>
+
    <target name="ejbcontext"
       description="Builds all jar files."
       depends="compile-classes">
@@ -3248,6 +3277,22 @@
 	  <copy file="${build.lib}/stateless-test.jar" tofile="${build.lib}/stateless-test.ejb3"/>
    </target>
 	
+   <target name="ejbthree1092"
+      description="Builds all jar files."
+      depends="compile-classes">
+
+      <mkdir dir="${build.lib}"/>
+
+      <jar jarfile="${build.lib}/ejbthree1092-test.jar">
+         <fileset dir="${build.classes}">
+            <include name="org/jboss/ejb3/test/ejbthree1092/*.class"/>
+         </fileset>
+         <fileset dir="${resources}/test/ejbthree1092">
+            <include name="META-INF/*.xml"/>
+         </fileset>
+      </jar>
+   </target>
+
    <target name="statelesscreation"
       description="Builds all jar files."
       depends="compile-classes">
@@ -3789,6 +3834,20 @@
 	        <include name="testlocal-beans.xml"/>
 	     </fileset>
 	  </copy>
+	
+	  <jar jarfile="${build.lib}/ejbthree1136.jar">
+	      <fileset dir="${build.classes}">
+	         <include name="org/jboss/ejb3/test/ejbthree1136/DoNothing*.class"/>
+	      </fileset>
+	  </jar>
+	  <jar destfile="${build.lib}/ejbthree1136.sar">
+	      <metainf dir="${build.resources}/test/ejbthree1136">
+	         <include name="jboss-service.xml"/>
+	      </metainf>
+	      <fileset dir="${build.classes}">
+	         <include name="org/jboss/ejb3/test/ejbthree1136/SFSB*.class"/>
+	      </fileset>
+	  </jar>
    </target>
    
    <target name="jars" depends="mdbsessionpoolclear, removedislocal, statelesscreation, defaultremotebindings, localfromremote, clusteredjms, entityoptimisticlocking, concurrentnaming, propertyreplacement, persistenceunits, appclient, tck5sec, invalidtxmdb, descriptortypo, libdeployment, homeinterface, arjuna, mdbtransactions, unauthenticatedprincipal, clusteredservice, invoker, classloader,
@@ -3799,11 +3858,11 @@
       ejbthree832, ejbthree921, ejbthree936,
       ejbthree939,
       ejbthree953, ejbthree957, ejbthree959, ejbthree963, ejbthree967, ejbthree971, ejbthree973, ejbthree985, ejbthree986,
-      ejbthree989, ejbthree1020, ejbthree1023, ejbthree1025, ejbthree1040,
+      ejbthree989, ejbthree994, ejbthree1020, ejbthree1023, ejbthree1025, ejbthree1040,
       ejbthree1057, ejbthree1060,
       ejbthree1062,
-      ejbthree1066, ejbthree1071, ejbthree1075, ejbthree1082, ejbthree1119, ejbthree1122, ejbthree1123, ejbthree1127,
-      ejbthree1146, jaxws,
+      ejbthree1066, ejbthree1071, ejbthree1075, ejbthree1082, ejbthree1090, ejbthree1092, ejbthree1119, ejbthree1122, ejbthree1123, ejbthree1127,
+      ejbthree1146, jaxws, jbas4489,
       aspectdomain, ejbcontext, schema, mail, scopedclassloader, dependency,
       securitydomain, enventry, security5,
       jms/managed, naming, bmt, jca/inflowmdb, pool, jms, security, reference21_30, factory, dd/web, txexceptions,
@@ -4470,6 +4529,12 @@
    </target>
 
    <target name="no-start-jboss-ejb-tests" depends="init" description="Execute all tests">
+	  <antcall target="test" inheritRefs="true">
+         <param name="test" value="ejbthree1090"/>
+      </antcall>
+	  <antcall target="test" inheritRefs="true">
+         <param name="test" value="ejbthree1092"/>
+      </antcall>
       <antcall target="test" inheritRefs="true">
          <param name="test" value="webservices"/>
       </antcall>
@@ -4740,6 +4805,9 @@
       <antcall target="test" inheritRefs="true">
          <param name="test" value="ejbthree986"/>
       </antcall>
+	  <antcall target="test" inheritRefs="true">
+         <param name="test" value="ejbthree994"/>
+      </antcall>
       <antcall target="test" inheritRefs="true">
          <param name="test" value="ejbthree989"/>
       </antcall>
@@ -5094,7 +5162,12 @@
          <param name="jvmargs" value=""/>
          <param name="test.extension" value="${buddy-replication-extension}"/> 
       </antcall>
-
+	
+	  <antcall target="test-with-jvmargs" inheritRefs="true">
+         <param name="test" value="ejbthree1136"/>
+         <param name="jvmargs" value=""/>
+         <param name="test.extension" value="${buddy-replication-extension}"/> 
+      </antcall>
    </target>
 	
    <target name="statelesscreation-test">