Author: dblevins
Date: Fri Apr 8 21:26:40 2011
New Revision: 1090453
URL: http://svn.apache.org/viewvc?rev=1090453&view=rev
Log:
Updated for EJB 3.1
Added:
openejb/trunk/openejb3/examples/simple-singleton/src/main/java/org/superbiz/registry/ComponentRegistry.java
- copied, changed from r1088039,
openejb/trunk/openejb3/examples/simple-singleton/src/main/java/org/superbiz/registry/ComponentRegistryBean.java
openejb/trunk/openejb3/examples/simple-singleton/src/main/java/org/superbiz/registry/PropertyRegistry.java
- copied, changed from r1088039,
openejb/trunk/openejb3/examples/simple-singleton/src/main/java/org/superbiz/registry/PropertyRegistryBean.java
openejb/trunk/openejb3/examples/simple-singleton/src/test/java/org/superbiz/registry/ComponentRegistryTest.java
- copied, changed from r1088039,
openejb/trunk/openejb3/examples/simple-singleton/src/test/java/org/superbiz/registry/ComponentRegistryBeanTest.java
openejb/trunk/openejb3/examples/simple-singleton/src/test/java/org/superbiz/registry/PropertiesRegistryTest.java
- copied, changed from r1088039,
openejb/trunk/openejb3/examples/simple-singleton/src/test/java/org/superbiz/registry/PropertiesRegistryBeanTest.java
Removed:
openejb/trunk/openejb3/examples/simple-singleton/src/main/java/org/superbiz/registry/ComponentRegistryBean.java
openejb/trunk/openejb3/examples/simple-singleton/src/main/java/org/superbiz/registry/PropertyRegistryBean.java
openejb/trunk/openejb3/examples/simple-singleton/src/main/resources/
openejb/trunk/openejb3/examples/simple-singleton/src/test/java/org/superbiz/registry/ComponentRegistryBeanTest.java
openejb/trunk/openejb3/examples/simple-singleton/src/test/java/org/superbiz/registry/PropertiesRegistryBeanTest.java
Copied:
openejb/trunk/openejb3/examples/simple-singleton/src/main/java/org/superbiz/registry/ComponentRegistry.java
(from r1088039,
openejb/trunk/openejb3/examples/simple-singleton/src/main/java/org/superbiz/registry/ComponentRegistryBean.java)
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/examples/simple-singleton/src/main/java/org/superbiz/registry/ComponentRegistry.java?p2=openejb/trunk/openejb3/examples/simple-singleton/src/main/java/org/superbiz/registry/ComponentRegistry.java&p1=openejb/trunk/openejb3/examples/simple-singleton/src/main/java/org/superbiz/registry/ComponentRegistryBean.java&r1=1088039&r2=1090453&rev=1090453&view=diff
==============================================================================
---
openejb/trunk/openejb3/examples/simple-singleton/src/main/java/org/superbiz/registry/ComponentRegistryBean.java
(original)
+++
openejb/trunk/openejb3/examples/simple-singleton/src/main/java/org/superbiz/registry/ComponentRegistry.java
Fri Apr 8 21:26:40 2011
@@ -28,7 +28,7 @@ import java.util.ArrayList;
@Singleton
@Lock(READ)
-public class ComponentRegistryBean implements ComponentRegistry {
+public class ComponentRegistry {
private final Map<Class, Object> components = new HashMap<Class, Object>();
Copied:
openejb/trunk/openejb3/examples/simple-singleton/src/main/java/org/superbiz/registry/PropertyRegistry.java
(from r1088039,
openejb/trunk/openejb3/examples/simple-singleton/src/main/java/org/superbiz/registry/PropertyRegistryBean.java)
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/examples/simple-singleton/src/main/java/org/superbiz/registry/PropertyRegistry.java?p2=openejb/trunk/openejb3/examples/simple-singleton/src/main/java/org/superbiz/registry/PropertyRegistry.java&p1=openejb/trunk/openejb3/examples/simple-singleton/src/main/java/org/superbiz/registry/PropertyRegistryBean.java&r1=1088039&r2=1090453&rev=1090453&view=diff
==============================================================================
---
openejb/trunk/openejb3/examples/simple-singleton/src/main/java/org/superbiz/registry/PropertyRegistryBean.java
(original)
+++
openejb/trunk/openejb3/examples/simple-singleton/src/main/java/org/superbiz/registry/PropertyRegistry.java
Fri Apr 8 21:26:40 2011
@@ -17,18 +17,20 @@
package org.superbiz.registry;
//START SNIPPET: code
-import static javax.ejb.ConcurrencyManagementType.BEAN;
-import javax.ejb.Singleton;
-import javax.ejb.ConcurrencyManagement;
-import javax.ejb.Startup;
+
import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
+import javax.ejb.ConcurrencyManagement;
+import javax.ejb.Singleton;
+import javax.ejb.Startup;
import java.util.Properties;
+import static javax.ejb.ConcurrencyManagementType.BEAN;
+
@Singleton
-@ConcurrencyManagement(BEAN)
@Startup
-public class PropertyRegistryBean implements PropertyRegistry {
+@ConcurrencyManagement(BEAN)
+public class PropertyRegistry {
// Note the java.util.Properties object is a thread-safe
// collections that uses synchronization. If it didn't
Copied:
openejb/trunk/openejb3/examples/simple-singleton/src/test/java/org/superbiz/registry/ComponentRegistryTest.java
(from r1088039,
openejb/trunk/openejb3/examples/simple-singleton/src/test/java/org/superbiz/registry/ComponentRegistryBeanTest.java)
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/examples/simple-singleton/src/test/java/org/superbiz/registry/ComponentRegistryTest.java?p2=openejb/trunk/openejb3/examples/simple-singleton/src/test/java/org/superbiz/registry/ComponentRegistryTest.java&p1=openejb/trunk/openejb3/examples/simple-singleton/src/test/java/org/superbiz/registry/ComponentRegistryBeanTest.java&r1=1088039&r2=1090453&rev=1090453&view=diff
==============================================================================
---
openejb/trunk/openejb3/examples/simple-singleton/src/test/java/org/superbiz/registry/ComponentRegistryBeanTest.java
(original)
+++
openejb/trunk/openejb3/examples/simple-singleton/src/test/java/org/superbiz/registry/ComponentRegistryTest.java
Fri Apr 8 21:26:40 2011
@@ -18,26 +18,28 @@ package org.superbiz.registry;
import junit.framework.TestCase;
+import javax.ejb.embeddable.EJBContainer;
import javax.naming.Context;
-import javax.naming.InitialContext;
-import java.util.Properties;
-import java.util.Date;
import java.net.URI;
+import java.util.Date;
//START SNIPPET: code
-public class ComponentRegistryBeanTest extends TestCase {
+public class ComponentRegistryTest extends TestCase {
public void test() throws Exception {
- Properties props = new Properties();
- props.setProperty(Context.INITIAL_CONTEXT_FACTORY,
"org.apache.openejb.client.LocalInitialContextFactory");
- InitialContext context = new InitialContext(props);
+ final Context context = EJBContainer.createEJBContainer().getContext();
// Both references below will point to the exact same instance
- ComponentRegistry one = (ComponentRegistry)
context.lookup("ComponentRegistryBeanLocal");
+ ComponentRegistry one = (ComponentRegistry)
context.lookup("java:global/simple-singleton/ComponentRegistry");
+
+ ComponentRegistry two = (ComponentRegistry)
context.lookup("java:global/simple-singleton/ComponentRegistry");
- ComponentRegistry two = (ComponentRegistry)
context.lookup("ComponentRegistryBeanLocal");
+ // Let's prove both references point to the same instance
+
+
+ // Set a URL into 'one' and retrieve it from 'two'
URI expectedUri = new URI("foo://bar/baz");
@@ -48,6 +50,8 @@ public class ComponentRegistryBeanTest e
assertSame(expectedUri, actualUri);
+ // Set a Date into 'two' and retrieve it from 'one'
+
Date expectedDate = new Date();
two.setComponent(Date.class, expectedDate);
Copied:
openejb/trunk/openejb3/examples/simple-singleton/src/test/java/org/superbiz/registry/PropertiesRegistryTest.java
(from r1088039,
openejb/trunk/openejb3/examples/simple-singleton/src/test/java/org/superbiz/registry/PropertiesRegistryBeanTest.java)
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/examples/simple-singleton/src/test/java/org/superbiz/registry/PropertiesRegistryTest.java?p2=openejb/trunk/openejb3/examples/simple-singleton/src/test/java/org/superbiz/registry/PropertiesRegistryTest.java&p1=openejb/trunk/openejb3/examples/simple-singleton/src/test/java/org/superbiz/registry/PropertiesRegistryBeanTest.java&r1=1088039&r2=1090453&rev=1090453&view=diff
==============================================================================
---
openejb/trunk/openejb3/examples/simple-singleton/src/test/java/org/superbiz/registry/PropertiesRegistryBeanTest.java
(original)
+++
openejb/trunk/openejb3/examples/simple-singleton/src/test/java/org/superbiz/registry/PropertiesRegistryTest.java
Fri Apr 8 21:26:40 2011
@@ -18,21 +18,18 @@ package org.superbiz.registry;
import junit.framework.TestCase;
+import javax.ejb.embeddable.EJBContainer;
import javax.naming.Context;
-import javax.naming.InitialContext;
-import java.util.Properties;
-public class PropertiesRegistryBeanTest extends TestCase {
+public class PropertiesRegistryTest extends TestCase {
public void test() throws Exception {
- Properties props = new Properties();
- props.setProperty(Context.INITIAL_CONTEXT_FACTORY,
"org.apache.openejb.client.LocalInitialContextFactory");
- InitialContext context = new InitialContext(props);
+ Context context = EJBContainer.createEJBContainer().getContext();
- PropertyRegistry one = (PropertyRegistry)
context.lookup("PropertyRegistryBeanLocal");
+ PropertyRegistry one = (PropertyRegistry)
context.lookup("java:global/simple-singleton/PropertyRegistry");
- PropertyRegistry two = (PropertyRegistry)
context.lookup("PropertyRegistryBeanLocal");
+ PropertyRegistry two = (PropertyRegistry)
context.lookup("java:global/simple-singleton/PropertyRegistry");
one.setProperty("url", "http://superbiz.org";);
