svn commit: r1091041 - in /openejb/trunk/openejb3/examples/lookup-of-ejbs-with-descriptor: pom.xml src/main/resources/META-INF/ejb-jar.xml src/test/java/org/superbiz/ejblookup/EjbDependencyTest.java

[dblevins]

Author: dblevins
Date: Mon Apr 11 11:41:50 2011
New Revision: 1091041

URL: http://svn.apache.org/viewvc?rev=1091041&view=rev
Log:
OPENEJB-1519: Update existing examples to EJB 3.1

Modified:
    openejb/trunk/openejb3/examples/lookup-of-ejbs-with-descriptor/pom.xml
    
openejb/trunk/openejb3/examples/lookup-of-ejbs-with-descriptor/src/main/resources/META-INF/ejb-jar.xml
    
openejb/trunk/openejb3/examples/lookup-of-ejbs-with-descriptor/src/test/java/org/superbiz/ejblookup/EjbDependencyTest.java

Modified: openejb/trunk/openejb3/examples/lookup-of-ejbs-with-descriptor/pom.xml
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb3/examples/lookup-of-ejbs-with-descriptor/pom.xml?rev=1091041&r1=1091040&r2=1091041&view=diff
==============================================================================
--- openejb/trunk/openejb3/examples/lookup-of-ejbs-with-descriptor/pom.xml 
(original)
+++ openejb/trunk/openejb3/examples/lookup-of-ejbs-with-descriptor/pom.xml Mon 
Apr 11 11:41:50 2011
@@ -56,7 +56,7 @@
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>javaee-api</artifactId>
-      <version>5.0-3</version>
+      <version>6.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -73,7 +73,7 @@
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>3.1.5-SNAPSHOT</version>
+      <version>4.0.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

Modified: 
openejb/trunk/openejb3/examples/lookup-of-ejbs-with-descriptor/src/main/resources/META-INF/ejb-jar.xml
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb3/examples/lookup-of-ejbs-with-descriptor/src/main/resources/META-INF/ejb-jar.xml?rev=1091041&r1=1091040&r2=1091041&view=diff
==============================================================================
--- 
openejb/trunk/openejb3/examples/lookup-of-ejbs-with-descriptor/src/main/resources/META-INF/ejb-jar.xml
 (original)
+++ 
openejb/trunk/openejb3/examples/lookup-of-ejbs-with-descriptor/src/main/resources/META-INF/ejb-jar.xml
 Mon Apr 11 11:41:50 2011
@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <ejb-jar xmlns="http://java.sun.com/xml/ns/javaee";>
+
+  <!-- Notice this changes the global jndi name -->
+  <module-name>wombat</module-name>
+
   <enterprise-beans>
+
     <session>
       <ejb-name>BlueBean</ejb-name>
       <business-local>org.superbiz.ejblookup.Friend</business-local>
@@ -13,6 +18,7 @@
         <ejb-link>RedBean</ejb-link>
       </ejb-local-ref>
     </session>
+
     <session>
       <ejb-name>RedBean</ejb-name>
       <business-local>org.superbiz.ejblookup.Friend</business-local>
@@ -25,5 +31,6 @@
         <ejb-link>BlueBean</ejb-link>
       </ejb-local-ref>
     </session>
+
   </enterprise-beans>
 </ejb-jar>

Modified: 
openejb/trunk/openejb3/examples/lookup-of-ejbs-with-descriptor/src/test/java/org/superbiz/ejblookup/EjbDependencyTest.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb3/examples/lookup-of-ejbs-with-descriptor/src/test/java/org/superbiz/ejblookup/EjbDependencyTest.java?rev=1091041&r1=1091040&r2=1091041&view=diff
==============================================================================
--- 
openejb/trunk/openejb3/examples/lookup-of-ejbs-with-descriptor/src/test/java/org/superbiz/ejblookup/EjbDependencyTest.java
 (original)
+++ 
openejb/trunk/openejb3/examples/lookup-of-ejbs-with-descriptor/src/test/java/org/superbiz/ejblookup/EjbDependencyTest.java
 Mon Apr 11 11:41:50 2011
@@ -18,6 +18,7 @@ package org.superbiz.ejblookup;
 
 import junit.framework.TestCase;
 
+import javax.ejb.embeddable.EJBContainer;
 import javax.naming.Context;
 import javax.naming.InitialContext;
 import java.util.Properties;
@@ -25,17 +26,15 @@ import java.util.Properties;
 //START SNIPPET: code
 public class EjbDependencyTest extends TestCase {
 
-    private InitialContext initialContext;
+    private Context context;
 
     protected void setUp() throws Exception {
-        Properties properties = new Properties();
-        properties.setProperty(Context.INITIAL_CONTEXT_FACTORY, 
"org.apache.openejb.client.LocalInitialContextFactory");
-        initialContext = new InitialContext(properties);
+        context = EJBContainer.createEJBContainer().getContext();
     }
 
     public void testRed() throws Exception {
 
-        Friend red = (Friend) initialContext.lookup("RedBeanLocal");
+        Friend red = (Friend) context.lookup("java:global/wombat/RedBean");
 
         assertNotNull(red);
         assertEquals("Red says, Hello!", red.sayHello());
@@ -45,7 +44,7 @@ public class EjbDependencyTest extends T
 
     public void testBlue() throws Exception {
 
-        Friend blue = (Friend) initialContext.lookup("BlueBeanLocal");
+        Friend blue = (Friend) context.lookup("java:global/wombat/BlueBean");
 
         assertNotNull(blue);
         assertEquals("Blue says, Hello!", blue.sayHello());