djencks 2005/01/21 19:39:15
Modified:
modules/openejb-builder/src/test/org/openejb/deployment/entity/cmp/cmr
AbstractCMRTest.java
Log:
GERONIMO-450 progress: get the domain and J2EEServer for gbeans from the
parent config, or specify them explicitly if there is not parent. Also some
improvements in storing enhanced/generated classes in a config.
Revision Changes Path
1.8 +5 -6
openejb/modules/openejb-builder/src/test/org/openejb/deployment/entity/cmp/cmr/AbstractCMRTest.java
Index: AbstractCMRTest.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/openejb-builder/src/test/org/openejb/deployment/entity/cmp/cmr/AbstractCMRTest.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- AbstractCMRTest.java 27 Dec 2004 02:03:25 -0000 1.7
+++ AbstractCMRTest.java 22 Jan 2005 00:39:15 -0000 1.8
@@ -82,6 +82,7 @@
import org.openejb.deployment.DeploymentHelper;
import org.openejb.deployment.MockConnectionProxyFactory;
import org.openejb.deployment.OpenEJBModuleBuilder;
+import org.openejb.deployment.KernelHelper;
import org.openejb.dispatch.InterfaceMethodSignature;
import org.openejb.security.SecurityConfiguration;
import org.openejb.transaction.ContainerPolicy;
@@ -153,7 +154,7 @@
Connection c = ds.getConnection("root", null);
buildDBSchema(c);
- kernel =
DeploymentHelper.setUpKernelWithTransactionManager("ContainerManagedPersistenceTest");
+ kernel = DeploymentHelper.setUpKernelWithTransactionManager();
DeploymentHelper.setUpTimer(kernel);
tm = (TransactionManager)
kernel.getProxyManager().createProxy(DeploymentHelper.TRANSACTIONMANAGER_NAME,
TransactionManager.class);
@@ -178,10 +179,8 @@
EARContext earContext = new EARContext(tempDir,
new URI("test"),
ConfigurationModuleType.EJB,
- null,
- null,
- j2eeDomainName,
- j2eeServerName,
+ KernelHelper.DEFAULT_PARENTID,
+ kernel,
NameFactory.NULL,
null,
null,
