- Revision
- 2532
- Author
- dain
- Date
- 2006-03-09 22:07:00 -0500 (Thu, 09 Mar 2006)
Log Message
All configuration lifecycle code has been centralized in configuration manager.
ConfigurationManager uses reference counting on starts and loads of a configuration.
Configuration load, start, stop, and unload operations are all recursive.
Introduced Dependency type which hold an Artifact and an ImportType (enum of ALL, CLASSES or SERVICES).
Environment only holds a single collection of Dependency types, instead of three collections (import, classes, and references).
The only import style artifact has been replaced with import type ALL, and the actual determination of an artifacts ability to contain services is delayed until start time.
Modified Paths
Diff
Modified: branches/v2_1/openejb2/modules/openejb-builder/src/java/org/openejb/deployment/OpenEJBModuleBuilder.java (2531 => 2532)
--- branches/v2_1/openejb2/modules/openejb-builder/src/java/org/openejb/deployment/OpenEJBModuleBuilder.java 2006-03-10 01:58:07 UTC (rev 2531)
+++ branches/v2_1/openejb2/modules/openejb-builder/src/java/org/openejb/deployment/OpenEJBModuleBuilder.java 2006-03-10 03:07:00 UTC (rev 2532)
@@ -291,7 +291,7 @@
return openejbEjbJar;
}
- public void installModule(JarFile earFile, EARContext earContext, Module module, ConfigurationStore configurationStore) throws DeploymentException {
+ public void installModule(JarFile earFile, EARContext earContext, Module module, ConfigurationStore configurationStore, Repository repository) throws DeploymentException {
JarFile moduleFile = module.getModuleFile();
try {
// extract the ejbJar file into a standalone packed jar file and add the contents to the output
Modified: branches/v2_1/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/CMPEntityBuilderTest.java (2531 => 2532)
--- branches/v2_1/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/CMPEntityBuilderTest.java 2006-03-10 01:58:07 UTC (rev 2531)
+++ branches/v2_1/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/CMPEntityBuilderTest.java 2006-03-10 03:07:00 UTC (rev 2532)
@@ -53,6 +53,7 @@
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
+import java.util.Collections;
import javax.management.ObjectName;
@@ -147,6 +148,7 @@
EARContext earContext = new EARContext(tempDir,
KernelHelper.ENVIRONMENT,
ConfigurationModuleType.EJB,
+ Collections.singleton(repository),
kernel,
"null",
null,
@@ -191,6 +193,7 @@
EARContext earContext = new EARContext(tempDir,
KernelHelper.ENVIRONMENT,
ConfigurationModuleType.EJB,
+ Collections.singleton(repository),
kernel,
"null",
null,
@@ -236,6 +239,7 @@
EARContext earContext = new EARContext(tempDir,
KernelHelper.ENVIRONMENT,
ConfigurationModuleType.EJB,
+ Collections.singleton(repository),
kernel,
"null",
null,
Modified: branches/v2_1/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/entity/cmp/cmr/AbstractCMRTest.java (2531 => 2532)
--- branches/v2_1/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/entity/cmp/cmr/AbstractCMRTest.java 2006-03-10 01:58:07 UTC (rev 2531)
+++ branches/v2_1/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/entity/cmp/cmr/AbstractCMRTest.java 2006-03-10 03:07:00 UTC (rev 2532)
@@ -49,7 +49,6 @@
import java.io.File;
-import java.net.URI;
import java.sql.Connection;
import java.util.HashMap;
import java.util.HashSet;
@@ -170,13 +169,15 @@
EARContext earContext = new EARContext(tempDir,
KernelHelper.ENVIRONMENT,
ConfigurationModuleType.EJB,
+ null,
kernel,
NameFactory.NULL,
null,
null,
null,
null,
- null, null);
+ null,
+ null);
ClassLoader cl = Thread.currentThread().getContextClassLoader();
Schemata schemata = builder.buildCMPSchema(earContext, j2eeContext, ejbJarType, openejbJarType, cl, pkGen, ds);
Modified: branches/v2_1/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/entity/cmp/ejbql/EJBQLTest.java (2531 => 2532)
--- branches/v2_1/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/entity/cmp/ejbql/EJBQLTest.java 2006-03-10 01:58:07 UTC (rev 2531)
+++ branches/v2_1/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/entity/cmp/ejbql/EJBQLTest.java 2006-03-10 03:07:00 UTC (rev 2532)
@@ -56,6 +56,7 @@
import java.util.HashMap;
import java.util.HashSet;
import java.util.Set;
+import java.util.Collections;
import javax.management.MalformedObjectNameException;
import javax.management.ObjectName;
@@ -194,13 +195,15 @@
EARContext earContext = new EARContext(tempDir,
KernelHelper.ENVIRONMENT,
ConfigurationModuleType.EJB,
+ Collections.singleton(repository),
kernel,
NameFactory.NULL,
null,
null,
null,
null,
- null, null);
+ null,
+ null);
ClassLoader cl = Thread.currentThread().getContextClassLoader();
Schemata schemata = builder.buildCMPSchema(earContext, j2eeContext, ejbJarType, openejbJarType, cl, pkGen, ds);
