svn commit: r1091028 - in /openejb/trunk/openejb3/examples/testing-security-2/src: main/java/org/superbiz/injection/secure/ main/resources/META-INF/ test/java/org/superbiz/injection/secure/ test/resources/META-INF/

[dblevins]

Author: dblevins
Date: Mon Apr 11 11:17:02 2011
New Revision: 1091028

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

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

Copied: 
openejb/trunk/openejb3/examples/testing-security-2/src/main/java/org/superbiz/injection/secure/Movies.java
 (from r1090810, 
openejb/trunk/openejb3/examples/testing-security-2/src/main/java/org/superbiz/injection/secure/MoviesImpl.java)
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb3/examples/testing-security-2/src/main/java/org/superbiz/injection/secure/Movies.java?p2=openejb/trunk/openejb3/examples/testing-security-2/src/main/java/org/superbiz/injection/secure/Movies.java&p1=openejb/trunk/openejb3/examples/testing-security-2/src/main/java/org/superbiz/injection/secure/MoviesImpl.java&r1=1090810&r2=1091028&rev=1091028&view=diff
==============================================================================
--- 
openejb/trunk/openejb3/examples/testing-security-2/src/main/java/org/superbiz/injection/secure/MoviesImpl.java
 (original)
+++ 
openejb/trunk/openejb3/examples/testing-security-2/src/main/java/org/superbiz/injection/secure/Movies.java
 Mon Apr 11 11:17:02 2011
@@ -30,7 +30,7 @@ import javax.persistence.Query;
 import java.util.List;
 
 @Stateful(name = "Movies")
-public class MoviesImpl implements Movies {
+public class Movies implements Movies {
 
     @PersistenceContext(unitName = "movie-unit", type = 
PersistenceContextType.EXTENDED)
     private EntityManager entityManager;

Modified: 
openejb/trunk/openejb3/examples/testing-security-2/src/test/java/org/superbiz/injection/secure/MovieTest.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb3/examples/testing-security-2/src/test/java/org/superbiz/injection/secure/MovieTest.java?rev=1091028&r1=1091027&r2=1091028&view=diff
==============================================================================
--- 
openejb/trunk/openejb3/examples/testing-security-2/src/test/java/org/superbiz/injection/secure/MovieTest.java
 (original)
+++ 
openejb/trunk/openejb3/examples/testing-security-2/src/test/java/org/superbiz/injection/secure/MovieTest.java
 Mon Apr 11 11:17:02 2011
@@ -18,7 +18,9 @@ package org.superbiz.injection.secure;
 
 import junit.framework.TestCase;
 
+import javax.ejb.EJB;
 import javax.ejb.EJBAccessException;
+import javax.ejb.embeddable.EJBContainer;
 import javax.naming.Context;
 import javax.naming.InitialContext;
 import java.util.List;
@@ -26,7 +28,9 @@ import java.util.Properties;
 
 //START SNIPPET: code
 public class MovieTest extends TestCase {
-    private Context context;
+
+    @EJB
+    private Movies movies;
 
     protected void setUp() throws Exception {
 
@@ -34,17 +38,11 @@ public class MovieTest extends TestCase 
         //System.setProperty("log4j.category.OpenEJB.security", "debug");
 
         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");
 
-        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);
     }
 
     public void testAsManager() throws Exception {
@@ -56,8 +54,6 @@ public class MovieTest extends TestCase 
         InitialContext context = new InitialContext(p);
 
         try {
-            Movies movies = (Movies) context.lookup("MoviesLocal");
-
             movies.addMovie(new Movie("Quentin Tarantino", "Reservoir Dogs", 
1992));
             movies.addMovie(new Movie("Joel Coen", "Fargo", 1996));
             movies.addMovie(new Movie("Joel Coen", "The Big Lebowski", 1998));
@@ -84,8 +80,6 @@ public class MovieTest extends TestCase 
         InitialContext context = new InitialContext(p);
 
         try {
-            Movies movies = (Movies) context.lookup("MoviesLocal");
-
             movies.addMovie(new Movie("Quentin Tarantino", "Reservoir Dogs", 
1992));
             movies.addMovie(new Movie("Joel Coen", "Fargo", 1996));
             movies.addMovie(new Movie("Joel Coen", "The Big Lebowski", 1998));
@@ -110,8 +104,6 @@ public class MovieTest extends TestCase 
     }
 
     public void testUnauthenticated() throws Exception {
-        Movies movies = (Movies) context.lookup("MoviesLocal");
-
         try {
             movies.addMovie(new Movie("Quentin Tarantino", "Reservoir Dogs", 
1992));
             fail("Unauthenticated users should not be able to add movies");