dain 2004/04/15 22:34:09
Modified: modules/core/src/test/org/openejb/entity
BasicBMPEntityContainerTest.java
BasicCMPEntityContainerTest.java
Log:
Changed container id to a String
Simplified requirements to create an EJBProxyFactory
EJBProxyFactory is now constructed in the GenericEJBContainer constructor
Change ProxyRefAddress to store the class names instead of a proxy info
object; this allows the construction of an ejb-ref without knowing the
container type
Merged stateless and stateful object base classes into a single class,
which simplifies proxy construction
Revision Changes Path
1.4 +2 -2
openejb/modules/core/src/test/org/openejb/entity/BasicBMPEntityContainerTest.java
Index: BasicBMPEntityContainerTest.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/core/src/test/org/openejb/entity/BasicBMPEntityContainerTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- BasicBMPEntityContainerTest.java 10 Apr 2004 06:51:39 -0000 1.3
+++ BasicBMPEntityContainerTest.java 16 Apr 2004 02:34:09 -0000 1.4
@@ -131,7 +131,7 @@
BMPContainerBuilder builder = new BMPContainerBuilder();
builder.setClassLoader(this.getClass().getClassLoader());
- builder.setContainerId(CONTAINER_NAME);
+ builder.setContainerId(CONTAINER_NAME.getCanonicalName());
builder.setEJBName("MockEJB");
builder.setBeanClassName(MockBMPEJB.class.getName());
builder.setHomeInterfaceName(MockHome.class.getName());
1.7 +8 -2
openejb/modules/core/src/test/org/openejb/entity/BasicCMPEntityContainerTest.java
Index: BasicCMPEntityContainerTest.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/core/src/test/org/openejb/entity/BasicCMPEntityContainerTest.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- BasicCMPEntityContainerTest.java 12 Apr 2004 04:11:52 -0000 1.6
+++ BasicCMPEntityContainerTest.java 16 Apr 2004 02:34:09 -0000 1.7
@@ -69,6 +69,7 @@
import junit.framework.TestCase;
import org.axiondb.jdbc.AxionDataSource;
import org.openejb.MockTransactionManager;
+import org.openejb.ContainerIndex;
import org.openejb.deployment.TransactionPolicySource;
import org.openejb.dispatch.InterfaceMethodSignature;
import org.openejb.entity.cmp.CMPContainerBuilder;
@@ -84,6 +85,7 @@
private static final ObjectName CONTAINER_NAME =
JMXUtil.getObjectName("geronimo.test:ejb=Mock");
private static final ObjectName TM_NAME =
JMXUtil.getObjectName("geronimo.test:role=TransactionManager");
private static final ObjectName TCA_NAME =
JMXUtil.getObjectName("geronimo.test:role=TrackedConnectionAssociator");
+ private static final ObjectName CI_NAME =
JMXUtil.getObjectName("geronimo.test:role=ContainerIndex");
private Kernel kernel;
private GBeanMBean container;
@@ -367,7 +369,7 @@
CMPContainerBuilder builder = new CMPContainerBuilder();
builder.setClassLoader(this.getClass().getClassLoader());
- builder.setContainerId(CONTAINER_NAME);
+ builder.setContainerId(CONTAINER_NAME.getCanonicalName());
builder.setEJBName("MockEJB");
builder.setBeanClassName(MockCMPEJB.class.getName());
builder.setHomeInterfaceName(MockHome.class.getName());
@@ -406,6 +408,10 @@
GBeanMBean trackedConnectionAssociator = new
GBeanMBean(ConnectionTrackingCoordinator.GBEAN_INFO);
start(TCA_NAME, trackedConnectionAssociator);
+ GBeanMBean containerIndex = new GBeanMBean(ContainerIndex.GBEAN_INFO);
+ containerIndex.setReferencePatterns("EJBContainers",
Collections.singleton(CONTAINER_NAME));
+ start(CI_NAME, containerIndex);
+
//start the ejb container
container.setReferencePatterns("TransactionManager",
Collections.singleton(TM_NAME));
container.setReferencePatterns("TrackedConnectionAssociator",
Collections.singleton(TCA_NAME));
