svn commit: r1091016 - in /openejb/trunk/openejb3/examples/testing-transactions/src: main/java/org/superbiz/injection/tx/ main/resources/META-INF/ test/java/org/superbiz/injection/tx/ test/resources/

[dblevins]

Author: dblevins
Date: Mon Apr 11 10:41:10 2011
New Revision: 1091016

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

Added:
    
openejb/trunk/openejb3/examples/testing-transactions/src/main/java/org/superbiz/injection/tx/Movies.java
      - copied, changed from r1090810, 
openejb/trunk/openejb3/examples/testing-transactions/src/main/java/org/superbiz/injection/tx/MoviesImpl.java
Removed:
    
openejb/trunk/openejb3/examples/testing-transactions/src/main/java/org/superbiz/injection/tx/MoviesImpl.java
    
openejb/trunk/openejb3/examples/testing-transactions/src/main/resources/META-INF/ejb-jar.xml
    openejb/trunk/openejb3/examples/testing-transactions/src/test/resources/
Modified:
    
openejb/trunk/openejb3/examples/testing-transactions/src/test/java/org/superbiz/injection/tx/MoviesTest.java

Copied: 
openejb/trunk/openejb3/examples/testing-transactions/src/main/java/org/superbiz/injection/tx/Movies.java
 (from r1090810, 
openejb/trunk/openejb3/examples/testing-transactions/src/main/java/org/superbiz/injection/tx/MoviesImpl.java)
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb3/examples/testing-transactions/src/main/java/org/superbiz/injection/tx/Movies.java?p2=openejb/trunk/openejb3/examples/testing-transactions/src/main/java/org/superbiz/injection/tx/Movies.java&p1=openejb/trunk/openejb3/examples/testing-transactions/src/main/java/org/superbiz/injection/tx/MoviesImpl.java&r1=1090810&r2=1091016&rev=1091016&view=diff
==============================================================================
--- 
openejb/trunk/openejb3/examples/testing-transactions/src/main/java/org/superbiz/injection/tx/MoviesImpl.java
 (original)
+++ 
openejb/trunk/openejb3/examples/testing-transactions/src/main/java/org/superbiz/injection/tx/Movies.java
 Mon Apr 11 10:41:10 2011
@@ -29,7 +29,7 @@ import static javax.ejb.TransactionAttri
 //START SNIPPET: code
 @Stateful(name = "Movies")
 @TransactionAttribute(MANDATORY)
-public class MoviesImpl implements Movies {
+public class Movies {
 
     @PersistenceContext(unitName = "movie-unit", type = 
PersistenceContextType.TRANSACTION)
     private EntityManager entityManager;

Modified: 
openejb/trunk/openejb3/examples/testing-transactions/src/test/java/org/superbiz/injection/tx/MoviesTest.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb3/examples/testing-transactions/src/test/java/org/superbiz/injection/tx/MoviesTest.java?rev=1091016&r1=1091015&r2=1091016&view=diff
==============================================================================
--- 
openejb/trunk/openejb3/examples/testing-transactions/src/test/java/org/superbiz/injection/tx/MoviesTest.java
 (original)
+++ 
openejb/trunk/openejb3/examples/testing-transactions/src/test/java/org/superbiz/injection/tx/MoviesTest.java
 Mon Apr 11 10:41:10 2011
@@ -18,10 +18,10 @@ package org.superbiz.injection.tx;
 
 import junit.framework.TestCase;
 
+import javax.ejb.EJB;
 import javax.ejb.Stateless;
 import javax.ejb.TransactionAttribute;
-import javax.naming.Context;
-import javax.naming.InitialContext;
+import javax.ejb.embeddable.EJBContainer;
 import java.util.List;
 import java.util.Properties;
 import java.util.concurrent.Callable;
@@ -31,25 +31,23 @@ import static javax.ejb.TransactionAttri
 //START SNIPPET: code
 
 public class MoviesTest extends TestCase {
-    private Context context;
+
+    @EJB
+    private Movies movies;
+
+    @EJB
+    private Caller transactionalCaller;
 
     protected void setUp() throws Exception {
-        Properties p = new Properties();
-        p.put(Context.INITIAL_CONTEXT_FACTORY, 
"org.apache.openejb.client.LocalInitialContextFactory");
+        final Properties p = new Properties();
         p.put("movieDatabase", "new://Resource?type=DataSource");
         p.put("movieDatabase.JdbcDriver", "org.hsqldb.jdbcDriver");
         p.put("movieDatabase.JdbcUrl", "jdbc:hsqldb:mem:moviedb");
 
-        p.put("movieDatabaseUnmanaged", "new://Resource?type=DataSource");
-        p.put("movieDatabaseUnmanaged.JdbcDriver", "org.hsqldb.jdbcDriver");
-        p.put("movieDatabaseUnmanaged.JdbcUrl", "jdbc:hsqldb:mem:moviedb");
-        p.put("movieDatabaseUnmanaged.JtaManaged", "false");
-
-        context = new InitialContext(p);
+        EJBContainer.createEJBContainer(p).getContext().bind("inject", this);
     }
 
     private void doWork() throws Exception {
-        Movies movies = (Movies) context.lookup("MoviesLocal");
 
         movies.addMovie(new Movie("Quentin Tarantino", "Reservoir Dogs", 
1992));
         movies.addMovie(new Movie("Joel Coen", "Fargo", 1996));
@@ -66,9 +64,7 @@ public class MoviesTest extends TestCase
     }
 
     public void testWithTransaction() throws Exception {
-        Caller transactionBean = (Caller) 
context.lookup("TransactionBeanLocal");
-
-        transactionBean.call(new Callable() {
+        transactionalCaller.call(new Callable() {
             public Object call() throws Exception {
                 doWork();
                 return null;
@@ -93,10 +89,6 @@ public class MoviesTest extends TestCase
     /**
      * This little bit of magic allows our test code to execute in
      * the scope of a container controlled transaction.
-     * <p/>
-     * The src/test/resource/META-INF/ejb-jar.xml will cause this
-     * EJB to be automatically discovered and deployed when
-     * OpenEJB boots up.
      */
     @Stateless
     @TransactionAttribute(REQUIRES_NEW)