[webbeans-commits] Webbeans SVN: r2448 - in tck/trunk/impl/src/main: resources/org/jboss/jsr299/tck/tests/xml/resource/ejb and 1 other directory.

[webbeans-commits at lists.jboss.org]

Author: dallen6
Date: 2009-04-16 16:35:51 -0400 (Thu, 16 Apr 2009)
New Revision: 2448

Modified:
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/ejb/InjectionOfEjbTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/ejb/RemoteEjb.java
   tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/ejb/beans.xml
   tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/ejb/ejb-jar.xml
   tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/ejb/web.xml
Log:
Changed naming conventions for EJB for portability of the test

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/ejb/InjectionOfEjbTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/ejb/InjectionOfEjbTest.java	2009-04-16 19:48:25 UTC (rev 2447)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/ejb/InjectionOfEjbTest.java	2009-04-16 20:35:51 UTC (rev 2448)
@@ -26,6 +26,7 @@
 import org.jboss.testharness.impl.packaging.PackagingType;
 import org.jboss.testharness.impl.packaging.Resource;
 import org.jboss.testharness.impl.packaging.Resources;
+import org.jboss.testharness.impl.packaging.ear.EjbJarXml;
 import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
 import org.testng.annotations.Test;
 
@@ -39,10 +40,10 @@
 @Packaging(PackagingType.EAR)
 @IntegrationTest
 @Resources({
-   @Resource(source="web.xml", destination="WEB-INF/web.xml"),
-   @Resource(source="ejb-jar.xml", destination="META-INF/ejb-jar.xml")
+   @Resource(source="web.xml", destination="WEB-INF/web.xml")
 })
 @BeansXml("beans.xml")
+ at EjbJarXml("ejb-jar.xml")
 public class InjectionOfEjbTest extends AbstractJSR299Test
 {
    @Test(groups = { "xml", "broken" })

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/ejb/RemoteEjb.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/ejb/RemoteEjb.java	2009-04-16 19:48:25 UTC (rev 2447)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/ejb/RemoteEjb.java	2009-04-16 20:35:51 UTC (rev 2448)
@@ -2,7 +2,7 @@
 
 import javax.ejb.Stateless;
 
- at Stateless(name="MyRemoteEjb")
+ at Stateless(name="MyRemoteEjb", mappedName="ejb/MyRemoteEjb")
 public class RemoteEjb implements RemoteEjbInterface
 {
 

Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/ejb/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/ejb/beans.xml	2009-04-16 19:48:25 UTC (rev 2447)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/ejb/beans.xml	2009-04-16 20:35:51 UTC (rev 2448)
@@ -6,7 +6,7 @@
    </Deploy>
    <test:SimpleBean>
       <EJB>
-         <name>xml-resource-ejb/MyRemoteEjb/remote</name>
+         <name>ejb/MyRemoteEjb</name>
       </EJB>
    </test:SimpleBean>
 </Beans>

Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/ejb/ejb-jar.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/ejb/ejb-jar.xml	2009-04-16 19:48:25 UTC (rev 2447)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/ejb/ejb-jar.xml	2009-04-16 20:35:51 UTC (rev 2448)
@@ -9,9 +9,10 @@
       <session>
          <ejb-name>MyRemoteEjb</ejb-name>
          <ejb-ref>
-            <ejb-ref-name>xml-resource-ejb/MyRemoteEjb/remote</ejb-ref-name>
+            <ejb-ref-name>ejb/MyRemoteEjb</ejb-ref-name>
             <ejb-ref-type>Session</ejb-ref-type>
-            <remote>org.jboss.seam.example.booking.Authenticator</remote>
+            <remote>org.jboss.jsr299.tck.tests.xml.resource.ejb.RemoteEjbInterface</remote>
+            <mapped-name>ejb/MyRemoteEjb</mapped-name>
          </ejb-ref>
       </session>
    </enterprise-beans>

Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/ejb/web.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/ejb/web.xml	2009-04-16 19:48:25 UTC (rev 2447)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/ejb/web.xml	2009-04-16 20:35:51 UTC (rev 2448)
@@ -5,9 +5,10 @@
  <display-name>Session Context Tests</display-name>
  
  <ejb-ref>
-    <ejb-ref-name>xml-resource-ejb/MyRemoteEjb/remote</ejb-ref-name>
+    <ejb-ref-name>ejb/MyRemoteEjb</ejb-ref-name>
     <ejb-ref-type>Session</ejb-ref-type>
     <remote>org.jboss.jsr299.tck.tests.xml.resource.ejb.RemoteEjbInterface</remote>
+    <mapped-name>ejb/MyRemoteEjb</mapped-name>
  </ejb-ref>
   
  <session-config>