[jboss-cvs] JBossAS SVN: r69782 - branches/JBPAPP_4_2_0_GA_CP/ejb3.

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

Author: bdecoste
Date: 2008-02-11 15:19:37 -0500 (Mon, 11 Feb 2008)
New Revision: 69782

Modified:
   branches/JBPAPP_4_2_0_GA_CP/ejb3/build-test.xml
Log:
[JBPAPP-621] [JBPAPP-604] [JBPAPP-586] [JBPAPP-585]

Modified: branches/JBPAPP_4_2_0_GA_CP/ejb3/build-test.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/ejb3/build-test.xml	2008-02-11 20:16:47 UTC (rev 69781)
+++ branches/JBPAPP_4_2_0_GA_CP/ejb3/build-test.xml	2008-02-11 20:19:37 UTC (rev 69782)
@@ -1618,7 +1618,7 @@
       </jar>
    </target>
 	
-   <!--target name="jaccpropagation"
+   <target name="jaccpropagation"
       description="Builds all jar files."
       depends="compile-classes">
 
@@ -1650,7 +1650,7 @@
             <include name="jaccpropagation-security-service.xml"/>
          </fileset>
       </copy>
-   </target-->
+   </target>
 
    <target name="servlet"
       description="Builds all jar files."
@@ -2394,6 +2394,38 @@
          </fileset>
       </jar>
 	
+	  <jar jarfile="${build.lib}/persistenceunitscope1.jar">
+         <fileset dir="${build.classes}">
+            <include name="org/jboss/ejb3/test/persistenceunits/Entity1.class"/>
+	        <include name="org/jboss/ejb3/test/persistenceunits/Entity2.class"/>
+         </fileset>
+	     <fileset dir="${resources}/test/persistenceunits">
+		    <include name="entity2-ds.xml"/>
+	     </fileset>
+		 <!--fileset dir="${resources}/test/persistenceunits">
+            <include name="META-INF/persistence.xml"/>
+         </fileset-->
+      </jar>
+	
+	  <jar jarfile="${build.lib}/persistenceunitscope2.jar">
+         <fileset dir="${build.classes}">
+	        <include name="org/jboss/ejb3/test/persistenceunits/Entity1.class"/>
+		    <include name="org/jboss/ejb3/test/persistenceunits/Entity2.class"/>
+         </fileset>
+	     <!--fileset dir="${resources}/test/persistenceunits">
+            <include name="META-INF/persistence.xml"/>
+         </fileset-->
+      </jar>
+	
+	  <jar jarfile="${build.lib}/persistenceunitscope-slsb.jar">
+         <fileset dir="${build.classes}">
+	        <include name="org/jboss/ejb3/test/persistenceunits/EntityTest*.class"/>
+         </fileset>
+	     <!--fileset dir="${resources}/test/persistenceunits">
+            <include name="META-INF/persistence.xml"/>
+         </fileset-->
+      </jar>
+	
 	  <ear earfile="${build.lib}/persistenceunitscope-test.ear" appxml="${resources}/test/persistenceunits/application.xml">
          <zipfileset dir="${build.lib}" prefix="lib">
             <include name="persistenceunitscope.jar"/>
@@ -2403,6 +2435,26 @@
          </fileset>
       </ear>
    	
+   	  <ear earfile="${build.lib}/persistenceunitscope-test1.ear" appxml="${resources}/test/persistenceunits/application1.xml">
+         <zipfileset dir="${build.lib}" prefix="lib">
+            <include name="persistenceunitscope1.jar"/>
+	        <include name="persistenceunitscope-slsb.jar"/>
+         </zipfileset>
+	     <fileset dir="${resources}/test/persistenceunits">
+            <include name="META-INF/persistence.xml"/>
+         </fileset>
+      </ear>
+	
+	  <ear earfile="${build.lib}/persistenceunitscope-test2.ear" appxml="${resources}/test/persistenceunits/application2.xml">
+         <zipfileset dir="${build.lib}" prefix="lib">
+            <include name="persistenceunitscope2.jar"/>
+	        <include name="persistenceunitscope-slsb.jar"/>
+         </zipfileset>
+	     <!--fileset dir="${resources}/test/persistenceunits">
+            <include name="META-INF/persistence.xml"/>
+         </fileset-->
+      </ear>
+   	
    	  <jar jarfile="${build.lib}/persistenceunitsharedentity1.jar">
          <fileset dir="${build.classes}">
             <include name="org/jboss/ejb3/test/persistenceunits/Entity*.class"/>
@@ -3625,7 +3677,7 @@
       circulardependency, jsp, timerdependency, servicedependency, servlet, stateless14, webservices, ear, ejbthree440, 
       ejbthree454, ejbthree653, ejbthree670, ejbthree712, ejbthree724, ejbthree751, ejbthree785, ejbthree832, ejbthree921,
       ejbthree959, ejbthree963, ejbthree994, ejbthree1023, ejbthree1025, ejbthree1062,
-      jbas4489, epcpropagation, 
+      jbas4489, epcpropagation, jaccpropagation, 
       aspectdomain, ejbcontext, schema, mail, scopedclassloader, dependency, jaxws,
       pkg, securitydomain, enventry, 
       jms/managed, naming, bmt, jca/inflowmdb, pool, jms, security, reference21_30, factory, dd/web, txexceptions, 
@@ -3653,9 +3705,9 @@
       <delete file="${build.testlog}/test.log"/>
 
      <!-- These tests need extra stuff on classpath -->
-      <!--condition property="client.run.classpath" value="security.client.classpath">
+      <condition property="client.run.classpath" value="security.client.classpath">
          <equals arg1="${test}" arg2="jaccpropagation"/>
-      </condition-->
+      </condition>
 	  <condition property="client.run.classpath" value="security.client.classpath">
          <equals arg1="${test}" arg2="security"/>
       </condition>