Modified: branches/v2_1/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/DeploymentTestContants.java (2526 => 2527)
--- branches/v2_1/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/DeploymentTestContants.java 2006-03-02 11:18:52 UTC (rev 2526)
+++ branches/v2_1/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/DeploymentTestContants.java 2006-03-03 04:02:24 UTC (rev 2527)
@@ -69,7 +69,6 @@
* @version $Revision$ $Date$
*/
public interface DeploymentTestContants {
- public static final ObjectName CONFIGURATION_OBJECT_NAME = IGNORE.createConfigurationObjectName();
public static final ObjectName CONNECTION_OBJECT_NAME = IGNORE.createConnectionObjectName();
public static final String DOMAIN_NAME = DeploymentHelper.DOMAIN_NAME;
public static final String SERVER_NAME = DeploymentHelper.SERVER_NAME;
Modified: branches/v2_1/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/DeploymentTestSuite.java (2526 => 2527)
--- branches/v2_1/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/DeploymentTestSuite.java 2006-03-02 11:18:52 UTC (rev 2526)
+++ branches/v2_1/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/DeploymentTestSuite.java 2006-03-03 04:02:24 UTC (rev 2527)
@@ -47,6 +47,18 @@
*/
package org.openejb.deployment;
+import java.io.File;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.sql.Connection;
+import java.sql.Statement;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.jar.JarFile;
+import javax.management.ObjectName;
+import javax.sql.DataSource;
+
import junit.extensions.TestDecorator;
import junit.framework.Protectable;
import junit.framework.TestResult;
@@ -61,26 +73,15 @@
import org.apache.geronimo.kernel.Kernel;
import org.apache.geronimo.kernel.config.ConfigurationData;
import org.apache.geronimo.kernel.config.ConfigurationStore;
-import org.apache.geronimo.kernel.config.ManageableAttributeStore;
+import org.apache.geronimo.kernel.config.ConfigurationManager;
+import org.apache.geronimo.kernel.config.ConfigurationUtil;
+import org.apache.geronimo.kernel.config.Configuration;
import org.apache.geronimo.kernel.management.State;
-import org.apache.geronimo.system.configuration.ExecutableConfigurationUtil;
import org.apache.geronimo.system.serverinfo.BasicServerInfo;
import org.openejb.ContainerIndex;
import org.openejb.server.axis.WSContainerGBean;
import org.tranql.sql.jdbc.JDBCUtil;
-import javax.management.ObjectName;
-import javax.sql.DataSource;
-import java.io.File;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.sql.Connection;
-import java.sql.Statement;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.jar.JarFile;
-
/**
* @version $Revision$ $Date$
*/
@@ -92,6 +93,8 @@
private DataSource dataSource;
private ClassLoader applicationClassLoader;
private ConfigurationStore configurationStore = new KernelHelper.MockConfigStore();
+ private ConfigurationManager configurationManager;
+ private Configuration configuration;
protected DeploymentTestSuite(Class testClass, File moduleFile) {
super(new TestSuite(testClass));
@@ -191,15 +194,6 @@
}
}
- // start the configuration
- GBeanData config = ExecutableConfigurationUtil.getConfigurationGBeanData(configurationData);
- config.setName(CONFIGURATION_OBJECT_NAME);
- config.setAttribute("environment", configurationData.getEnvironment());
- config.setReferencePattern("Repositories", new ObjectName("*:name=Repository,*"));
- config.setReferencePattern("ArtifactManager", new ObjectName("*:name=ArtifactManager,*"));
- config.setReferencePattern("ArtifactResolver", new ObjectName("*:name=ArtifactResolver,*"));
- config.setAttribute("configurationStore", configurationStore);
-
ObjectName containerIndexObjectName = ObjectName.getInstance(DOMAIN_NAME + ":type=ContainerIndex");
GBeanData containerIndexGBean = new GBeanData(containerIndexObjectName, ContainerIndex.GBEAN_INFO);
Set ejbContainerNames = new HashSet();
@@ -238,16 +232,14 @@
JDBCUtil.close(connection);
}
- // load the configuration
- kernel.loadGBean(config, cl);
- kernel.startGBean(CONFIGURATION_OBJECT_NAME);
// start the configuration
- kernel.invoke(CONFIGURATION_OBJECT_NAME, "loadGBeans", new Object[] {null}, new String[] {ManageableAttributeStore.class.getName()});
- kernel.invoke(CONFIGURATION_OBJECT_NAME, "startRecursiveGBeans");
+ configurationManager = ConfigurationUtil.getConfigurationManager(kernel);
+ configuration = configurationManager.loadConfiguration(configurationData, configurationStore);
+ configurationManager.startConfiguration(configuration);
- assertRunning(kernel, CONFIGURATION_OBJECT_NAME);
- applicationClassLoader = (ClassLoader) kernel.getAttribute(CONFIGURATION_OBJECT_NAME, "configurationClassLoader");
+ // get the configuration classloader
+ applicationClassLoader = configuration.getConfigurationClassLoader();
} catch (Error e) {
DeploymentUtil.recursiveDelete(tempDir);
throw e;
@@ -264,10 +256,14 @@
return;
}
try {
- kernel.stopGBean(CONFIGURATION_OBJECT_NAME);
- } catch (GBeanNotFoundException ignored) {
+ configurationManager.stopConfiguration(configuration);
+ } catch (Exception ignored) {
}
try {
+ configurationManager.unloadConfiguration(configuration);
+ } catch (Exception ignored) {
+ }
+ try {
kernel.stopGBean(CONNECTION_OBJECT_NAME);
} catch (GBeanNotFoundException ignored) {
}
Modified: branches/v2_1/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/KernelHelper.java (2526 => 2527)
--- branches/v2_1/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/KernelHelper.java 2006-03-02 11:18:52 UTC (rev 2526)
+++ branches/v2_1/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/KernelHelper.java 2006-03-03 04:02:24 UTC (rev 2527)
@@ -73,27 +73,27 @@
kernel.loadGBean(store, KernelHelper.class.getClassLoader());
kernel.startGBean(store.getName());
- GBeanData manager = new GBeanData(JMXUtil.getObjectName("foo:name=ArtifactManager"), DefaultArtifactManager.GBEAN_INFO);
- kernel.loadGBean(manager, KernelHelper.class.getClassLoader());
- kernel.startGBean(manager.getName());
+ GBeanData artifactManager = new GBeanData(JMXUtil.getObjectName("foo:name=ArtifactManager"), DefaultArtifactManager.GBEAN_INFO);
+ kernel.loadGBean(artifactManager, KernelHelper.class.getClassLoader());
+ kernel.startGBean(artifactManager.getName());
- GBeanData resolver = new GBeanData(JMXUtil.getObjectName("foo:name=ArtifactResolver"), DefaultArtifactResolver.GBEAN_INFO);
- resolver.setReferencePattern("ArtifactManager", manager.getName());
-// resolver.setReferencePattern("Repositories", repository.getName());
- kernel.loadGBean(resolver, KernelHelper.class.getClassLoader());
- kernel.startGBean(resolver.getName());
+ GBeanData artifactResolver = new GBeanData(JMXUtil.getObjectName("foo:name=ArtifactResolver"), DefaultArtifactResolver.GBEAN_INFO);
+ artifactResolver.setReferencePattern("ArtifactManager", artifactManager.getName());
+ kernel.loadGBean(artifactResolver, KernelHelper.class.getClassLoader());
+ kernel.startGBean(artifactResolver.getName());
ObjectName configurationManagerName = new ObjectName(":j2eeType=ConfigurationManager,name=Basic");
GBeanData configurationManagerData = new GBeanData(configurationManagerName, ConfigurationManagerImpl.GBEAN_INFO);
configurationManagerData.setReferencePattern("Stores", store.getName());
+ configurationManagerData.setReferencePattern("ArtifactManager", artifactManager.getName());
+ configurationManagerData.setReferencePattern("ArtifactResolver", artifactResolver.getName());
kernel.loadGBean(configurationManagerData, KernelHelper.class.getClassLoader());
kernel.startGBean(configurationManagerName);
ConfigurationManager configurationManager = (ConfigurationManager) kernel.getProxyManager().createProxy(configurationManagerName, ConfigurationManager.class);
Artifact artifact = DEFAULT_ENVIRONMENT.getConfigId();
- configurationManager.load(artifact);
- configurationManager.loadGBeans(artifact);
- configurationManager.start(artifact);
+ configurationManager.loadConfiguration(artifact);
+ configurationManager.startConfiguration(artifact);
return kernel;
}
