[jboss-cvs] JBossAS SVN: r108299 - in projects/ejb3/trunk/testsuite: src/test/java/org/jboss/ejb3/test/service/unit and 1 other directory.

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

Author: jaikiran
Date: 2010-09-23 11:54:35 -0400 (Thu, 23 Sep 2010)
New Revision: 108299

Modified:
   projects/ejb3/trunk/testsuite/build-test.xml
   projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/service/unit/ServiceUnitTestCase.java
Log:
Fix org.jboss.ejb3.test.service.unit.ServiceUnitTestCase

Modified: projects/ejb3/trunk/testsuite/build-test.xml
===================================================================
--- projects/ejb3/trunk/testsuite/build-test.xml	2010-09-23 15:46:18 UTC (rev 108298)
+++ projects/ejb3/trunk/testsuite/build-test.xml	2010-09-23 15:54:35 UTC (rev 108299)
@@ -3797,14 +3797,7 @@
 
       <mkdir dir="${build.lib}"/>
 
-      <jar jarfile="${build.lib}/service-test.sar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/service/Tester*.class"/>
-         </fileset>
-         <fileset dir="${resources}/test/service">
-            <include name="META-INF/jboss-service.xml"/>
-         </fileset>
-      </jar>
+     
       <jar jarfile="${build.lib}/service-test.jar">
          <fileset dir="${build.classes}">
             <include name="org/jboss/ejb3/test/service/*.class"/>
@@ -3813,6 +3806,7 @@
             <include name="META-INF/ejb-jar.xml"/>
             <include name="META-INF/jboss.xml"/>
             <include name="META-INF/persistence.xml"/>
+			<include name="META-INF/jboss-service.xml"/>             
          </fileset>
          <fileset dir="${resources}/test">
             <include name="users.properties"/>

Modified: projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/service/unit/ServiceUnitTestCase.java
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/service/unit/ServiceUnitTestCase.java	2010-09-23 15:46:18 UTC (rev 108298)
+++ projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/service/unit/ServiceUnitTestCase.java	2010-09-23 15:54:35 UTC (rev 108299)
@@ -508,7 +508,7 @@
 
    public static Test suite() throws Exception
    {
-      return new TestSetup(getDeploySetup(ServiceUnitTestCase.class, "service-test.sar, service-test.jar"))
+      return new TestSetup(getDeploySetup(ServiceUnitTestCase.class, "service-test.jar"))
       {
          @Override
          protected void setUp() throws Exception