[webbeans-commits] Webbeans SVN: r2460 - 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 webbeans-commits at lists.jboss.org
Fri Apr 17 07:46:22 EDT 2009


Author: pete.muir at jboss.org
Date: 2009-04-17 07:46:22 -0400 (Fri, 17 Apr 2009)
New Revision: 2460

Removed:
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/ejb/SimpleBean.java
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/java/org/jboss/jsr299/tck/tests/xml/resource/ejb/RemoteEjbInterface.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:
Use jboss specific names - later we will generalize this

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-17 11:44:06 UTC (rev 2459)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/ejb/InjectionOfEjbTest.java	2009-04-17 11:46:22 UTC (rev 2460)
@@ -56,8 +56,7 @@
    })
    public void testEjbInjectionByXml()
    {
-      SimpleBean bean = getCurrentManager().getInstanceByType(SimpleBean.class);
-      assert bean.getRemoteEjb() != null;
-      bean.getRemoteEjb().hello();
+      RemoteEjbInterface remoteEjbInterface = getCurrentManager().getInstanceByType(RemoteEjbInterface.class);
+      assert remoteEjbInterface.hello().equals("hi!");
    }
 }

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-17 11:44:06 UTC (rev 2459)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/ejb/RemoteEjb.java	2009-04-17 11:46:22 UTC (rev 2460)
@@ -6,8 +6,9 @@
 public class RemoteEjb implements RemoteEjbInterface
 {
 
-   public void hello()
+   public String hello()
    {
+      return "hi!";
    }
 
 }

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/ejb/RemoteEjbInterface.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/ejb/RemoteEjbInterface.java	2009-04-17 11:44:06 UTC (rev 2459)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/ejb/RemoteEjbInterface.java	2009-04-17 11:46:22 UTC (rev 2460)
@@ -5,5 +5,5 @@
 @Remote
 public interface RemoteEjbInterface
 {
-   public void hello();
+   public String hello();
 }

Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/ejb/SimpleBean.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/ejb/SimpleBean.java	2009-04-17 11:44:06 UTC (rev 2459)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/ejb/SimpleBean.java	2009-04-17 11:46:22 UTC (rev 2460)
@@ -1,11 +0,0 @@
-package org.jboss.jsr299.tck.tests.xml.resource.ejb;
-
-class SimpleBean
-{
-   private RemoteEjbInterface remoteEjb = null;
-
-   public RemoteEjbInterface getRemoteEjb()
-   {
-      return remoteEjb;
-   }
-}

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-17 11:44:06 UTC (rev 2459)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/ejb/beans.xml	2009-04-17 11:46:22 UTC (rev 2460)
@@ -4,9 +4,9 @@
       <Standard />
       <Production />
    </Deploy>
-   <test:SimpleBean>
+   <test:RemoteEjbInterface>
       <EJB>
-         <name>ejb/MyRemoteEjb</name>
+         <mappedName>org.jboss.jsr299.tck.tests.xml.resource.ejb.InjectionOfEjbTest/MyRemoteEjb/remote-org.jboss.jsr299.tck.tests.xml.resource.ejb.RemoteEjbInterface</mappedName>
       </EJB>
-   </test:SimpleBean>
+   </test:RemoteEjbInterface>
 </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-17 11:44:06 UTC (rev 2459)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/ejb/ejb-jar.xml	2009-04-17 11:46:22 UTC (rev 2460)
@@ -4,16 +4,5 @@
          xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/ejb-jar_3_0.xsd"
          version="3.0">
 
-   <enterprise-beans>
-      <!-- EJB reference required when beans.xml references another EJB component using <EJB> -->
-      <session>
-         <ejb-name>MyRemoteEjb</ejb-name>
-         <ejb-ref>
-            <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>
-   </enterprise-beans>
+
 </ejb-jar>

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-17 11:44:06 UTC (rev 2459)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/ejb/web.xml	2009-04-17 11:46:22 UTC (rev 2460)
@@ -8,7 +8,6 @@
     <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>




More information about the weld-commits mailing list