Author: dblevins
Date: Mon Apr 11 10:31:02 2011
New Revision: 1091014

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

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

Copied: 
openejb/trunk/openejb3/examples/transaction-rollback/src/main/java/org/superbiz/txrollback/Movies.java
 (from r1090810, 
openejb/trunk/openejb3/examples/transaction-rollback/src/main/java/org/superbiz/txrollback/MoviesImpl.java)
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb3/examples/transaction-rollback/src/main/java/org/superbiz/txrollback/Movies.java?p2=openejb/trunk/openejb3/examples/transaction-rollback/src/main/java/org/superbiz/txrollback/Movies.java&p1=openejb/trunk/openejb3/examples/transaction-rollback/src/main/java/org/superbiz/txrollback/MoviesImpl.java&r1=1090810&r2=1091014&rev=1091014&view=diff
==============================================================================
--- 
openejb/trunk/openejb3/examples/transaction-rollback/src/main/java/org/superbiz/txrollback/MoviesImpl.java
 (original)
+++ 
openejb/trunk/openejb3/examples/transaction-rollback/src/main/java/org/superbiz/txrollback/Movies.java
 Mon Apr 11 10:31:02 2011
@@ -26,8 +26,8 @@ import javax.persistence.Query;
 import java.util.List;
 
 //START SNIPPET: code
-@Stateless(name = "Movies")
-public class MoviesImpl implements Movies {
+@Stateless
+public class Movies {
 
     @PersistenceContext(unitName = "movie-unit", type = 
PersistenceContextType.TRANSACTION)
     private EntityManager entityManager;

Modified: 
openejb/trunk/openejb3/examples/transaction-rollback/src/test/java/org/superbiz/txrollback/MoviesTest.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb3/examples/transaction-rollback/src/test/java/org/superbiz/txrollback/MoviesTest.java?rev=1091014&r1=1091013&r2=1091014&view=diff
==============================================================================
--- 
openejb/trunk/openejb3/examples/transaction-rollback/src/test/java/org/superbiz/txrollback/MoviesTest.java
 (original)
+++ 
openejb/trunk/openejb3/examples/transaction-rollback/src/test/java/org/superbiz/txrollback/MoviesTest.java
 Mon Apr 11 10:31:02 2011
@@ -21,6 +21,7 @@ import org.apache.openejb.api.LocalClien
 
 import javax.annotation.Resource;
 import javax.ejb.EJB;
+import javax.ejb.embeddable.EJBContainer;
 import javax.naming.Context;
 import javax.naming.InitialContext;
 import javax.persistence.EntityManager;
@@ -31,8 +32,6 @@ import java.util.List;
 import java.util.Properties;
 
 //START SNIPPET: code
-
-@LocalClient
 public class MoviesTest extends TestCase {
 
     @EJB
@@ -44,24 +43,21 @@ public class MoviesTest extends TestCase
     @PersistenceContext
     private EntityManager entityManager;
 
-    private InitialContext initialContext;
+    private EJBContainer ejbContainer;
 
     public void setUp() throws Exception {
         Properties p = new Properties();
-        p.put(Context.INITIAL_CONTEXT_FACTORY, 
"org.apache.openejb.client.LocalInitialContextFactory");
         p.put("movieDatabase", "new://Resource?type=DataSource");
         p.put("movieDatabase.JdbcDriver", "org.hsqldb.jdbcDriver");
         p.put("movieDatabase.JdbcUrl", "jdbc:hsqldb:mem:moviedb" + 
System.currentTimeMillis());
-        p.put("openejb.embedded.initialcontext.close", "DESTROY");
-
-        initialContext = new InitialContext(p);
 
-        initialContext.bind("inject", this);
+        ejbContainer = EJBContainer.createEJBContainer(p);
+        ejbContainer.getContext().bind("inject", this);
     }
 
     @Override
     protected void tearDown() throws Exception {
-        initialContext.close();
+        ejbContainer.close();
     }
 
     /**


Reply via email to