Author: dblevins
Date: Sun Apr 10 17:20:59 2011
New Revision: 1090838

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

Added:
    
openejb/trunk/openejb3/examples/simple-stateful/src/main/java/org/superbiz/counter/Counter.java
   (contents, props changed)
      - copied, changed from r1090810, 
openejb/trunk/openejb3/examples/simple-stateful/src/main/java/org/superbiz/counter/CounterImpl.java
    
openejb/trunk/openejb3/examples/simple-stateful/src/test/java/org/superbiz/counter/CounterTest.java
   (contents, props changed)
      - copied, changed from r1090810, 
openejb/trunk/openejb3/examples/simple-stateful/src/test/java/org/superbiz/counter/CounterImplTest.java
Removed:
    
openejb/trunk/openejb3/examples/simple-stateful/src/main/java/org/superbiz/counter/CounterImpl.java
    
openejb/trunk/openejb3/examples/simple-stateful/src/main/java/org/superbiz/counter/CounterLocal.java
    
openejb/trunk/openejb3/examples/simple-stateful/src/main/java/org/superbiz/counter/CounterRemote.java
    openejb/trunk/openejb3/examples/simple-stateful/src/main/resources/
    
openejb/trunk/openejb3/examples/simple-stateful/src/test/java/org/superbiz/counter/CounterImplTest.java

Copied: 
openejb/trunk/openejb3/examples/simple-stateful/src/main/java/org/superbiz/counter/Counter.java
 (from r1090810, 
openejb/trunk/openejb3/examples/simple-stateful/src/main/java/org/superbiz/counter/CounterImpl.java)
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb3/examples/simple-stateful/src/main/java/org/superbiz/counter/Counter.java?p2=openejb/trunk/openejb3/examples/simple-stateful/src/main/java/org/superbiz/counter/Counter.java&p1=openejb/trunk/openejb3/examples/simple-stateful/src/main/java/org/superbiz/counter/CounterImpl.java&r1=1090810&r2=1090838&rev=1090838&view=diff
==============================================================================
--- 
openejb/trunk/openejb3/examples/simple-stateful/src/main/java/org/superbiz/counter/CounterImpl.java
 (original)
+++ 
openejb/trunk/openejb3/examples/simple-stateful/src/main/java/org/superbiz/counter/Counter.java
 Sun Apr 10 17:20:59 2011
@@ -34,10 +34,14 @@ import javax.ejb.Stateful;
  */
 //START SNIPPET: code
 @Stateful
-public class CounterImpl implements CounterLocal, CounterRemote {
+public class Counter {
 
     private int count = 0;
 
+    public int count() {
+        return count;
+    }
+
     public int increment() {
         return ++count;
     }

Propchange: 
openejb/trunk/openejb3/examples/simple-stateful/src/main/java/org/superbiz/counter/Counter.java
------------------------------------------------------------------------------
    svn:keywords = Date Rev Author Id Revision HeadURL

Copied: 
openejb/trunk/openejb3/examples/simple-stateful/src/test/java/org/superbiz/counter/CounterTest.java
 (from r1090810, 
openejb/trunk/openejb3/examples/simple-stateful/src/test/java/org/superbiz/counter/CounterImplTest.java)
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb3/examples/simple-stateful/src/test/java/org/superbiz/counter/CounterTest.java?p2=openejb/trunk/openejb3/examples/simple-stateful/src/test/java/org/superbiz/counter/CounterTest.java&p1=openejb/trunk/openejb3/examples/simple-stateful/src/test/java/org/superbiz/counter/CounterImplTest.java&r1=1090810&r2=1090838&rev=1090838&view=diff
==============================================================================
--- 
openejb/trunk/openejb3/examples/simple-stateful/src/test/java/org/superbiz/counter/CounterImplTest.java
 (original)
+++ 
openejb/trunk/openejb3/examples/simple-stateful/src/test/java/org/superbiz/counter/CounterTest.java
 Sun Apr 10 17:20:59 2011
@@ -18,59 +18,39 @@ package org.superbiz.counter;
 
 import junit.framework.TestCase;
 
+import javax.ejb.embeddable.EJBContainer;
 import javax.naming.Context;
 import javax.naming.InitialContext;
 import java.util.Properties;
 
-public class CounterImplTest extends TestCase {
+public class CounterTest extends TestCase {
 
-    //START SNIPPET: setup
-    private InitialContext initialContext;
+    //START SNIPPET: local
+    public void test() throws Exception {
 
-    protected void setUp() throws Exception {
-        Properties properties = new Properties();
-        properties.setProperty(Context.INITIAL_CONTEXT_FACTORY, 
"org.apache.openejb.client.LocalInitialContextFactory");
+        final Context context = EJBContainer.createEJBContainer().getContext();
 
-        initialContext = new InitialContext(properties);
-    }
-    //END SNIPPET: setup       
+        Counter counterA = (Counter) 
context.lookup("java:global/simple-stateful/Counter");
 
-    /**
-     * Lookup the Counter bean via its remote home interface
-     *
-     * @throws Exception
-     */
-    //START SNIPPET: remote    
-    public void testCounterViaRemoteInterface() throws Exception {
-        Object object = initialContext.lookup("CounterImplRemote");
-
-        assertNotNull(object);
-        assertTrue(object instanceof CounterRemote);
-        CounterRemote counter = (CounterRemote) object;
-        assertEquals(0, counter.reset());
-        assertEquals(1, counter.increment());
-        assertEquals(2, counter.increment());
-        assertEquals(0, counter.reset());
-    }
-    //END SNIPPET: remote      
+        assertEquals(0, counterA.count());
+        assertEquals(0, counterA.reset());
+        assertEquals(1, counterA.increment());
+        assertEquals(2, counterA.increment());
+        assertEquals(0, counterA.reset());
+
+        counterA.increment();
+        counterA.increment();
+        counterA.increment();
+        counterA.increment();
+
+        assertEquals(4, counterA.count());
+
+        // Get a new counter
+        Counter counterB = (Counter) 
context.lookup("java:global/simple-stateful/Counter");
 
-    /**
-     * Lookup the Counter bean via its local home interface
-     *
-     * @throws Exception
-     */
-    //START SNIPPET: local     
-    public void testCounterViaLocalInterface() throws Exception {
-        Object object = initialContext.lookup("CounterImplLocal");
-
-        assertNotNull(object);
-        assertTrue(object instanceof CounterLocal);
-        CounterLocal counter = (CounterLocal) object;
-        assertEquals(0, counter.reset());
-        assertEquals(1, counter.increment());
-        assertEquals(2, counter.increment());
-        assertEquals(0, counter.reset());
+        // The new bean instance starts out at 0
+        assertEquals(0, counterB.count());
     }
-    //END SNIPPET: local       
+    //END SNIPPET: local
 
 }

Propchange: 
openejb/trunk/openejb3/examples/simple-stateful/src/test/java/org/superbiz/counter/CounterTest.java
------------------------------------------------------------------------------
    svn:keywords = Date Rev Author Id Revision HeadURL


Reply via email to