[openejb-scm] [2602] branches/v2_1/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/DeploymentTestSuite.java: Commit for Kevan, change from List to DeploymentContext return from deployer

[djencks]

Title: [2602] branches/v2_1/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/DeploymentTestSuite.java: Commit for Kevan, change from List to DeploymentContext return from deployer

Revision

2602

Author

djencks

Date

2006-04-13 11:32:06 -0400 (Thu, 13 Apr 2006)

Log Message

Commit for Kevan, change from List to DeploymentContext return from deployer

Modified Paths

branches/v2_1/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/DeploymentTestSuite.java

Diff

Modified: branches/v2_1/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/DeploymentTestSuite.java (2601 => 2602)

--- branches/v2_1/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/DeploymentTestSuite.java	2006-04-13 00:53:58 UTC (rev 2601)
+++ branches/v2_1/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/DeploymentTestSuite.java	2006-04-13 15:32:06 UTC (rev 2602)
@@ -64,6 +64,7 @@
 import junit.framework.TestResult;
 import junit.framework.TestSuite;
 import org.apache.geronimo.axis.builder.AxisBuilder;
+import org.apache.geronimo.deployment.DeploymentContext;
 import org.apache.geronimo.deployment.util.DeploymentUtil;
 import org.apache.geronimo.gbean.AbstractNameQuery;
 import org.apache.geronimo.gbean.GBeanData;
@@ -157,15 +158,19 @@
 
             JarFile jarFile = null;
             ConfigurationData configurationData = null;
+            DeploymentContext context = null;
             try {
                 jarFile = DeploymentUtil.createJarFile(moduleFile);
                 Object plan = earConfigBuilder.getDeploymentPlan(null, jarFile);
-                List configurationDatas = earConfigBuilder.buildConfiguration(false, plan, jarFile, Collections.singleton(deploymentHelper.configStore), deploymentHelper.configStore);
-                configurationData = (ConfigurationData) configurationDatas.get(0);
+                context = earConfigBuilder.buildConfiguration(false, plan, jarFile, Collections.singleton(deploymentHelper.configStore), deploymentHelper.configStore);
+                configurationData = (ConfigurationData) context.getConfigurationData();
                 // copy the configuration to force gbeans to serialize
                 configurationData = (ConfigurationData) new MarshalledObject(configurationData).get();
                 configurationData.setConfigurationStore(deploymentHelper.configStore);
             } finally {
+                if (context != null) {
+                    context.close();
+                }
                 if (jarFile != null) {
                     jarFile.close();
                 }