svn commit: r1090835 - in /openejb/trunk/openejb3/examples/jpa-hibernate/src: main/java/org/superbiz/injection/h3jpa/ main/resources/META-INF/ test/java/org/superbiz/injection/h3jpa/

[dblevins]

Author: dblevins
Date: Sun Apr 10 17:10:18 2011
New Revision: 1090835

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

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

Copied: 
openejb/trunk/openejb3/examples/jpa-hibernate/src/main/java/org/superbiz/injection/h3jpa/Movies.java
 (from r1090810, 
openejb/trunk/openejb3/examples/jpa-hibernate/src/main/java/org/superbiz/injection/h3jpa/MoviesImpl.java)
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb3/examples/jpa-hibernate/src/main/java/org/superbiz/injection/h3jpa/Movies.java?p2=openejb/trunk/openejb3/examples/jpa-hibernate/src/main/java/org/superbiz/injection/h3jpa/Movies.java&p1=openejb/trunk/openejb3/examples/jpa-hibernate/src/main/java/org/superbiz/injection/h3jpa/MoviesImpl.java&r1=1090810&r2=1090835&rev=1090835&view=diff
==============================================================================
--- 
openejb/trunk/openejb3/examples/jpa-hibernate/src/main/java/org/superbiz/injection/h3jpa/MoviesImpl.java
 (original)
+++ 
openejb/trunk/openejb3/examples/jpa-hibernate/src/main/java/org/superbiz/injection/h3jpa/Movies.java
 Sun Apr 10 17:10:18 2011
@@ -23,8 +23,8 @@ import javax.persistence.PersistenceCont
 import javax.persistence.Query;
 import java.util.List;
 
-@Stateful(name = "Movies")
-public class MoviesImpl implements Movies {
+@Stateful
+public class Movies {
 
     @PersistenceContext(unitName = "movie-unit", type = 
PersistenceContextType.EXTENDED)
     private EntityManager entityManager;

Modified: 
openejb/trunk/openejb3/examples/jpa-hibernate/src/test/java/org/superbiz/injection/h3jpa/MoviesTest.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb3/examples/jpa-hibernate/src/test/java/org/superbiz/injection/h3jpa/MoviesTest.java?rev=1090835&r1=1090834&r2=1090835&view=diff
==============================================================================
--- 
openejb/trunk/openejb3/examples/jpa-hibernate/src/test/java/org/superbiz/injection/h3jpa/MoviesTest.java
 (original)
+++ 
openejb/trunk/openejb3/examples/jpa-hibernate/src/test/java/org/superbiz/injection/h3jpa/MoviesTest.java
 Sun Apr 10 17:10:18 2011
@@ -18,8 +18,8 @@ package org.superbiz.injection.h3jpa;
 
 import junit.framework.TestCase;
 
+import javax.ejb.embeddable.EJBContainer;
 import javax.naming.Context;
-import javax.naming.InitialContext;
 import java.util.List;
 import java.util.Properties;
 
@@ -29,20 +29,13 @@ import java.util.Properties;
 public class MoviesTest extends TestCase {
 
     public void test() 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 context = new InitialContext(p);
-
-        Movies movies = (Movies) context.lookup("MoviesLocal");
+        final Context context = 
EJBContainer.createEJBContainer(p).getContext();
+        Movies movies = (Movies) 
context.lookup("java:global/jpa-hibernate/Movies");
 
         movies.addMovie(new Movie("Quentin Tarantino", "Reservoir Dogs", 
1992));
         movies.addMovie(new Movie("Joel Coen", "Fargo", 1996));