[jboss-cvs] JBossAS SVN: r88275 - in branches/JBPAPP_4_2_0_GA_CP: testsuite/imports/sections and 1 other directory.

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

Author: jcosta at redhat.com
Date: 2009-05-06 12:15:15 -0400 (Wed, 06 May 2009)
New Revision: 88275

Modified:
   branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/bank/unit/BankDeploymentDescriptorTestCase.java
   branches/JBPAPP_4_2_0_GA_CP/testsuite/imports/sections/ejb30.xml
Log:
JBQA-1512 - Fixed the execution of EJB3 in compatbility matrix.

Modified: branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/bank/unit/BankDeploymentDescriptorTestCase.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/bank/unit/BankDeploymentDescriptorTestCase.java	2009-05-06 16:01:15 UTC (rev 88274)
+++ branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/bank/unit/BankDeploymentDescriptorTestCase.java	2009-05-06 16:15:15 UTC (rev 88275)
@@ -361,8 +361,8 @@
             new String[]{"java.lang.String", "java.lang.String"}
       );
       
-      return getDeploySetup(BankDeploymentDescriptorTestCase.class, "bank.jar");
+      return getDeploySetup(BankDeploymentDescriptorTestCase.class, "bank-ejb30.jar");
    }
 
 }
- 
\ No newline at end of file
+ 

Modified: branches/JBPAPP_4_2_0_GA_CP/testsuite/imports/sections/ejb30.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/testsuite/imports/sections/ejb30.xml	2009-05-06 16:01:15 UTC (rev 88274)
+++ branches/JBPAPP_4_2_0_GA_CP/testsuite/imports/sections/ejb30.xml	2009-05-06 16:15:15 UTC (rev 88275)
@@ -1,20 +1,26 @@
 <project name="tests-ejb30-jars">
-	<target name="_jars-ejb30">
-		<mkdir dir="${build.lib}"/>
+    <target name="_jars-ejb30">
+        
+        <copy todir="${build.classes}">
+            <fileset dir="../ejb3/output/test-classes">
+                <include name="org/jboss/ejb3/test/bank/**/*.class"/>
+            </fileset>
+        </copy>
 
-		<jar jarfile="${build.lib}/bank-ejb30.jar">
-			<fileset dir="${build.classes}">
-				<include name="org/jboss/ejb3/test/bank/*.class"/>
-			</fileset>
-			<fileset dir="${build.classes}">
-				<include name="org/jboss/ejb3/test/bank/ejbutil/*.class"/>
-			</fileset>
-			<fileset dir="../ejb3/src/resources/test/bank/">
-				<include name="META-INF/*.xml"/>
-				<include name="bank-ejb3-interceptors-aop.xml"/>
-				<include name="users.properties"/>
-				<include name="roles.properties"/>
-			</fileset>
-		</jar>
-	</target>
+        <mkdir dir="${build.lib}"/>
+
+        <jar jarfile="${build.lib}/bank-ejb30.jar">
+            <fileset dir="${build.classes}">
+                <include name="org/jboss/ejb3/test/bank/**/*.class"/>
+            </fileset>
+
+            <fileset dir="../ejb3/src/resources/test/bank">
+                <include name="META-INF/*.xml"/>
+                <include name="bank-ejb3-interceptors-aop.xml"/>
+                <include name="users.properties"/>
+                <include name="roles.properties"/>
+            </fileset>
+        </jar>
+
+    </target>
 </project>