Title: [2591] branches/v2_1/openejb2/modules/openejb-builder/src/test/org/openejb/deployment: Child configurations are now included in the main configuration.
- Revision
- 2591
- Author
- dain
- Date
- 2006-04-01 21:06:49 -0500 (Sat, 01 Apr 2006)
Log Message
Child configurations are now included in the main configuration. This means that ear's will again contain their war file
s nested as before.
Added the concept of "additional configurations" to the deployment context, which contain additional configurations creted during the deployment process. These additional configurations are installed as separate entries in the repo. J2EE ap
p clients are currently the only user of this feature.
Modified Paths
Diff
Modified: branches/v2_1/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/DeploymentHelper.java (2590 => 2591)
--- branches/v2_1/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/DeploymentHelper.java 2006-04-01 16:58:35 UTC (rev 2590)
+++ branches/v2_1/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/DeploymentHelper.java 2006-04-02 02:06:49 UTC (rev 2591)
@@ -323,7 +323,7 @@
}
}
- public URL resolve(Artifact configId, URI uri) throws NoSuchConfigException, MalformedURLException {
+ public URL resolve(Artifact configId, String moduleName, URI uri) throws NoSuchConfigException, MalformedURLException {
File file = (File) locations.get(configId);
if (file == null) {
return baseURL;
Modified: branches/v2_1/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/DeploymentTestSuite.java (2590 => 2591)
--- branches/v2_1/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/DeploymentTestSuite.java 2006-04-01 16:58:35 UTC (rev 2590)
+++ branches/v2_1/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/DeploymentTestSuite.java 2006-04-02 02:06:49 UTC (rev 2591)
@@ -54,6 +54,7 @@
import java.sql.Statement;
import java.util.jar.JarFile;
import java.util.Collections;
+import java.util.List;
import java.rmi.MarshalledObject;
import javax.sql.DataSource;
@@ -159,7 +160,8 @@
try {
jarFile = DeploymentUtil.createJarFile(moduleFile);
Object plan = earConfigBuilder.getDeploymentPlan(null, jarFile);
- configurationData = earConfigBuilder.buildConfiguration(plan, jarFile, Collections.singleton(deploymentHelper.configStore), deploymentHelper.configStore);
+ List configurationDatas = earConfigBuilder.buildConfiguration(plan, jarFile, Collections.singleton(deploymentHelper.configStore), deploymentHelper.configStore);
+ configurationData = (ConfigurationData) configurationDatas.get(0);
// copy the configuration to force gbeans to serialize
configurationData = (ConfigurationData) new MarshalledObject(configurationData).get();
configurationData.setConfigurationStore(deploymentHelper.configStore);
