[jboss-cvs] JBossAS SVN: r88870 - in branches/JBPAPP_4_2_0_GA_CP: testsuite and 1 other directories.

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

Author: jcosta at redhat.com
Date: 2009-05-14 10:37:09 -0400 (Thu, 14 May 2009)
New Revision: 88870

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/build.xml
   branches/JBPAPP_4_2_0_GA_CP/testsuite/imports/sections/ejb30.xml
Log:
JBQA-1512 - Reverted the jar name for bank test and added compile-ejb3 target to testsuite/build.xml , which is executed before compile-classes

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-14 14:29:02 UTC (rev 88869)
+++ branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/bank/unit/BankDeploymentDescriptorTestCase.java	2009-05-14 14:37:09 UTC (rev 88870)
@@ -361,7 +361,7 @@
             new String[]{"java.lang.String", "java.lang.String"}
       );
       
-      return getDeploySetup(BankDeploymentDescriptorTestCase.class, "bank-ejb30.jar");
+      return getDeploySetup(BankDeploymentDescriptorTestCase.class, "bank.jar");
    }
 
 }

Modified: branches/JBPAPP_4_2_0_GA_CP/testsuite/build.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/testsuite/build.xml	2009-05-14 14:29:02 UTC (rev 88869)
+++ branches/JBPAPP_4_2_0_GA_CP/testsuite/build.xml	2009-05-14 14:37:09 UTC (rev 88870)
@@ -375,7 +375,7 @@
   |  different type of compile that needs to be performed, short of
   |  documentation compiles.
   -->
-  <target name="compile" depends="init, compile-classes, compile-compatibility-classes, compile-xmbean-dds, compile-stubs, compile-etc, compile-stylesheets, compile-resources"
+  <target name="compile" depends="init, compile-ejb3, compile-classes, compile-compatibility-classes, compile-xmbean-dds, compile-stubs, compile-etc, compile-stylesheets, compile-resources"
     description="Compile all source files."/>
 
   <!-- Compile all class files -->
@@ -3480,6 +3480,11 @@
     </junitreport>
   </target>
 
+  <!-- Compile the EJB3 resources, needed by compat matrix -->
+  <target name="compile-ejb3">
+  	<ant antfile="../ejb3/build-test.xml" target="main" inheritall="false" dir="../ejb3"/>
+  </target>
+
   <target name="tests-matrix" description="Executes only the version check compatibility suite. Use -Dmatrix-versions=[version container] for this task"
     depends="maybejars" if="matrix-versions">
 

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-14 14:29:02 UTC (rev 88869)
+++ branches/JBPAPP_4_2_0_GA_CP/testsuite/imports/sections/ejb30.xml	2009-05-14 14:37:09 UTC (rev 88870)
@@ -9,7 +9,7 @@
 
         <mkdir dir="${build.lib}"/>
 
-        <jar jarfile="${build.lib}/bank-ejb30.jar">
+        <jar jarfile="${build.lib}/bank.jar">
             <fileset dir="${build.classes}">
                 <include name="org/jboss/ejb3/test/bank/**/*.class"/>
             </fileset>