djencks 2005/06/01 22:57:02
Modified: modules/openejb-builder/src/test/org/openejb/deployment/entity
BasicBMPEntityContainerTest.java
BasicCMPEntityContainerTest.java
Log:
GERONIMO-659 Make the ejb container point to the TSS gbean, not the TSS to
the ejb container. Also GERONIMO-658, use nice short config to find the TSS
bean
Revision Changes Path
1.7 +2 -5
openejb/modules/openejb-builder/src/test/org/openejb/deployment/entity/BasicBMPEntityContainerTest.java
Index: BasicBMPEntityContainerTest.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/openejb-builder/src/test/org/openejb/deployment/entity/BasicBMPEntityContainerTest.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- BasicBMPEntityContainerTest.java 15 Apr 2005 05:36:53 -0000 1.6
+++ BasicBMPEntityContainerTest.java 2 Jun 2005 02:57:02 -0000 1.7
@@ -47,7 +47,6 @@
*/
package org.openejb.deployment.entity;
-import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import javax.ejb.EJBObject;
@@ -154,11 +153,9 @@
}
});
builder.setComponentContext(new HashMap());
- container = builder.createConfiguration();
+ container = builder.createConfiguration(CONTAINER_NAME,
DeploymentHelper.TRANSACTIONCONTEXTMANAGER_NAME,
DeploymentHelper.TRACKEDCONNECTIONASSOCIATOR_NAME, null);
//start the ejb container
- container.setReferencePatterns("TransactionContextManager",
Collections.singleton(DeploymentHelper.TRANSACTIONCONTEXTMANAGER_NAME));
- container.setReferencePatterns("TrackedConnectionAssociator",
Collections.singleton(DeploymentHelper.TRACKEDCONNECTIONASSOCIATOR_NAME));
container.setReferencePattern("Timer",
DeploymentHelper.TRANSACTIONALTIMER_NAME);
start(CONTAINER_NAME, container);
}
1.14 +2 -5
openejb/modules/openejb-builder/src/test/org/openejb/deployment/entity/BasicCMPEntityContainerTest.java
Index: BasicCMPEntityContainerTest.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/openejb-builder/src/test/org/openejb/deployment/entity/BasicCMPEntityContainerTest.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- BasicCMPEntityContainerTest.java 8 May 2005 19:37:14 -0000 1.13
+++ BasicCMPEntityContainerTest.java 2 Jun 2005 02:57:02 -0000 1.14
@@ -68,7 +68,6 @@
import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
import org.apache.geronimo.kernel.Kernel;
import org.apache.geronimo.kernel.jmx.JMXUtil;
-import org.apache.geronimo.kernel.Kernel;
import org.axiondb.jdbc.AxionDataSource;
import org.openejb.ContainerIndex;
import org.openejb.deployment.CMPContainerBuilder;
@@ -453,7 +452,7 @@
CacheTable cacheTable = new CacheTable("MockEJB", slots, null,
createCommand, storeCommand, removeCommand);
globalSchema.addCacheTable(cacheTable);
- container = builder.createConfiguration();
+ container = builder.createConfiguration(CONTAINER_NAME,
DeploymentHelper.TRANSACTIONCONTEXTMANAGER_NAME,
DeploymentHelper.TRACKEDCONNECTIONASSOCIATOR_NAME, null);
GBeanData containerIndex = new GBeanData(ContainerIndex.GBEAN_INFO);
containerIndex.setReferencePatterns("EJBContainers",
Collections.singleton(CONTAINER_NAME));
@@ -465,8 +464,6 @@
kernel.startGBean(connectionProxyFactoryObjectName);
//start the ejb container
- container.setReferencePatterns("TransactionContextManager",
Collections.singleton(DeploymentHelper.TRANSACTIONCONTEXTMANAGER_NAME));
- container.setReferencePatterns("TrackedConnectionAssociator",
Collections.singleton(DeploymentHelper.TRACKEDCONNECTIONASSOCIATOR_NAME));
container.setReferencePattern("Timer",
DeploymentHelper.TRANSACTIONALTIMER_NAME);
start(CONTAINER_NAME, container);
