Diff
Modified: branches/v2_1/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/DeploymentHelper.java (2609 => 2610)
--- branches/v2_1/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/DeploymentHelper.java 2006-04-17 00:39:58 UTC (rev 2609)
+++ branches/v2_1/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/DeploymentHelper.java 2006-04-18 06:50:58 UTC (rev 2610)
@@ -50,7 +50,6 @@
import java.io.File;
import java.io.IOException;
import java.net.MalformedURLException;
-import java.net.URI;
import java.net.URL;
import java.util.Collections;
import java.util.HashMap;
@@ -81,6 +80,7 @@
import org.apache.geronimo.kernel.config.ConfigurationStore;
import org.apache.geronimo.kernel.config.ConfigurationUtil;
import org.apache.geronimo.kernel.config.EditableKernelConfigurationManager;
+import org.apache.geronimo.kernel.config.IOUtil;
import org.apache.geronimo.kernel.config.InvalidConfigException;
import org.apache.geronimo.kernel.config.NoSuchConfigException;
import org.apache.geronimo.kernel.config.NullConfigurationStore;
@@ -314,12 +314,13 @@
}
}
- public URL resolve(Artifact configId, String moduleName, URI uri) throws NoSuchConfigException, MalformedURLException {
+ public Set resolve(Artifact configId, String moduleName, String pattern) throws NoSuchConfigException, MalformedURLException {
File file = (File) locations.get(configId);
if (file == null) {
- return baseURL;
+ throw new NoSuchConfigException(configId);
}
- return new URL(file.toURL(), uri.toString());
+ Set matches = IOUtil.search(file, pattern);
+ return matches;
}
public final static GBeanInfo GBEAN_INFO;
Modified: branches/v2_1/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/DeploymentTestSuite.java (2609 => 2610)
--- branches/v2_1/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/DeploymentTestSuite.java 2006-04-17 00:39:58 UTC (rev 2609)
+++ branches/v2_1/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/DeploymentTestSuite.java 2006-04-18 06:50:58 UTC (rev 2610)
@@ -54,7 +54,6 @@
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;
@@ -71,7 +70,6 @@
import org.apache.geronimo.j2ee.deployment.EARConfigBuilder;
import org.apache.geronimo.j2ee.deployment.WebServiceBuilder;
import org.apache.geronimo.kernel.Kernel;
-import org.apache.geronimo.kernel.config.Configuration;
import org.apache.geronimo.kernel.config.ConfigurationData;
import org.openejb.server.axis.WSContainerGBean;
import org.tranql.sql.jdbc.JDBCUtil;
@@ -163,7 +161,7 @@
jarFile = DeploymentUtil.createJarFile(moduleFile);
Object plan = earConfigBuilder.getDeploymentPlan(null, jarFile);
context = earConfigBuilder.buildConfiguration(false, plan, jarFile, Collections.singleton(deploymentHelper.configStore), deploymentHelper.configStore);
- configurationData = (ConfigurationData) context.getConfigurationData();
+ configurationData = context.getConfigurationData();
// copy the configuration to force gbeans to serialize
configurationData = (ConfigurationData) new MarshalledObject(configurationData).get();
configurationData.setConfigurationStore(deploymentHelper.configStore);
@@ -200,11 +198,11 @@
// start the configuration
- Configuration configuration = deploymentHelper.configurationManager.loadConfiguration(configurationData);
- deploymentHelper.configurationManager.startConfiguration(configuration);
+ deploymentHelper.configurationManager.loadConfiguration(configurationData);
+ deploymentHelper.configurationManager.startConfiguration(configurationData.getId());
// get the configuration classloader
- applicationClassLoader = configuration.getConfigurationClassLoader();
+ applicationClassLoader = deploymentHelper.configurationManager.getConfiguration(configurationData.getId()).getConfigurationClassLoader();
} catch (Error e) {
DeploymentUtil.recursiveDelete(tempDir);
throw e;
Modified: branches/v2_1/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/entity/BasicBMPEntityContainerTest.java (2609 => 2610)
--- branches/v2_1/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/entity/BasicBMPEntityContainerTest.java 2006-04-17 00:39:58 UTC (rev 2609)
+++ branches/v2_1/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/entity/BasicBMPEntityContainerTest.java 2006-04-18 06:50:58 UTC (rev 2610)
@@ -47,23 +47,17 @@
*/
package org.openejb.deployment.entity;
-import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import javax.ejb.EJBObject;
-import junit.framework.TestCase;
-import org.apache.geronimo.gbean.AbstractName;
import org.apache.geronimo.gbean.AbstractNameQuery;
import org.apache.geronimo.gbean.GBeanData;
-import org.apache.geronimo.kernel.Kernel;
-import org.apache.geronimo.kernel.repository.Artifact;
import org.apache.geronimo.kernel.repository.Dependency;
import org.apache.geronimo.kernel.repository.ImportType;
import org.apache.geronimo.kernel.config.ConfigurationData;
import org.apache.geronimo.kernel.config.ConfigurationManager;
import org.apache.geronimo.kernel.config.ConfigurationUtil;
-import org.apache.geronimo.kernel.config.Configuration;
import org.openejb.deployment.BMPContainerBuilder;
import org.openejb.deployment.DeploymentHelper;
import org.openejb.dispatch.InterfaceMethodSignature;
@@ -164,12 +158,12 @@
container);
container.setReferencePattern("Timer", txTimerName);
- ConfigurationData config = new ConfigurationData(testConfigurationArtifact, kernel.getNaming());
- config.getEnvironment().addDependency(new Dependency(baseId, ImportType.ALL));
- config.addGBean(container);
+ ConfigurationData configurationData = new ConfigurationData(testConfigurationArtifact, kernel.getNaming());
+ configurationData.getEnvironment().addDependency(new Dependency(baseId, ImportType.ALL));
+ configurationData.addGBean(container);
ConfigurationManager configurationManager = ConfigurationUtil.getConfigurationManager(kernel);
- Configuration configuration = configurationManager.loadConfiguration(config);
- configurationManager.startConfiguration(configuration);
+ configurationManager.loadConfiguration(configurationData);
+ configurationManager.startConfiguration(testConfigurationArtifact);
}
protected void tearDown() throws Exception {
Modified: branches/v2_1/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/entity/BasicCMPEntityContainerTest.java (2609 => 2610)
--- branches/v2_1/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/entity/BasicCMPEntityContainerTest.java 2006-04-17 00:39:58 UTC (rev 2609)
+++ branches/v2_1/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/entity/BasicCMPEntityContainerTest.java 2006-04-18 06:50:58 UTC (rev 2610)
@@ -47,41 +47,32 @@
*/
package org.openejb.deployment.entity;
+import java.io.PrintWriter;
+import java.io.Serializable;
import java.rmi.NoSuchObjectException;
import java.sql.Connection;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
-import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
-import java.io.Serializable;
-import java.io.PrintWriter;
-
import javax.ejb.NoSuchObjectLocalException;
import javax.ejb.ObjectNotFoundException;
import javax.sql.DataSource;
import junit.framework.AssertionFailedError;
-import junit.framework.TestCase;
-import org.apache.geronimo.gbean.AbstractName;
import org.apache.geronimo.gbean.AbstractNameQuery;
import org.apache.geronimo.gbean.GBeanData;
-import org.apache.geronimo.kernel.Kernel;
-import org.apache.geronimo.kernel.repository.Dependency;
-import org.apache.geronimo.kernel.repository.ImportType;
import org.apache.geronimo.kernel.config.ConfigurationData;
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.repository.Dependency;
+import org.apache.geronimo.kernel.repository.ImportType;
import org.axiondb.jdbc.AxionDataSource;
-import org.openejb.ContainerIndex;
-import org.openejb.entity.cmp.CMPEJBContainer;
import org.openejb.deployment.CMPContainerBuilder;
import org.openejb.deployment.DeploymentHelper;
-import org.openejb.deployment.DeploymentTestContants;
-import org.openejb.deployment.MockConnectionProxyFactory;
import org.openejb.dispatch.InterfaceMethodSignature;
+import org.openejb.entity.cmp.CMPEJBContainer;
import org.openejb.proxy.EJBProxyFactory;
import org.openejb.transaction.TransactionPolicySource;
import org.openejb.transaction.TransactionPolicyType;
@@ -461,12 +452,12 @@
null, container);
container.setReferencePattern("Timer", txTimerName);
- ConfigurationData config = new ConfigurationData(testConfigurationArtifact, kernel.getNaming());
- config.getEnvironment().addDependency(new Dependency(baseId, ImportType.ALL));
- config.addGBean(container);
+ ConfigurationData configurationData = new ConfigurationData(testConfigurationArtifact, kernel.getNaming());
+ configurationData.getEnvironment().addDependency(new Dependency(baseId, ImportType.ALL));
+ configurationData.addGBean(container);
ConfigurationManager configurationManager = ConfigurationUtil.getConfigurationManager(kernel);
- Configuration configuration = configurationManager.loadConfiguration(config);
- configurationManager.startConfiguration(configuration);
+ configurationManager.loadConfiguration(configurationData);
+ configurationManager.startConfiguration(testConfigurationArtifact);
}
protected void tearDown() throws Exception {
@@ -476,6 +467,7 @@
}
private static class WrapperDataSource implements DataSource, Serializable {
+ private static final long serialVersionUID = -1035588858939680910L;
private transient DataSource ds;
public Connection getConnection() throws SQLException {
Modified: branches/v2_1/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/entity/cmp/cmr/AbstractCMRTest.java (2609 => 2610)
--- branches/v2_1/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/entity/cmp/cmr/AbstractCMRTest.java 2006-04-17 00:39:58 UTC (rev 2609)
+++ branches/v2_1/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/entity/cmp/cmr/AbstractCMRTest.java 2006-04-18 06:50:58 UTC (rev 2610)
@@ -49,7 +49,6 @@
import java.io.File;
-import java.io.IOException;
import java.sql.Connection;
import java.util.Collections;
import java.util.HashMap;
@@ -63,12 +62,11 @@
import org.apache.geronimo.gbean.GBeanData;
import org.apache.geronimo.j2ee.deployment.EARContext;
import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
-import org.apache.geronimo.kernel.config.Configuration;
import org.apache.geronimo.kernel.config.ConfigurationData;
import org.apache.geronimo.kernel.config.ConfigurationManager;
import org.apache.geronimo.kernel.config.ConfigurationModuleType;
import org.apache.geronimo.kernel.config.ConfigurationUtil;
-import org.apache.geronimo.kernel.config.InvalidConfigException;
+import org.apache.geronimo.kernel.config.LifecycleException;
import org.apache.geronimo.kernel.config.NoSuchConfigException;
import org.apache.geronimo.kernel.repository.Artifact;
import org.apache.geronimo.kernel.repository.Dependency;
@@ -233,18 +231,19 @@
return container;
}
- private void buildAndStartConfiguration(String name, GBeanData containers[]) throws NoSuchConfigException, IOException, InvalidConfigException {
+ private void buildAndStartConfiguration(String name, GBeanData containers[]) throws NoSuchConfigException, LifecycleException {
// Wrap the GBeanData in a configuration
- ConfigurationData config = new ConfigurationData(new Artifact("test", name, "42", "car"), kernel.getNaming());
- config.getEnvironment().addDependency(new Dependency(baseId, ImportType.ALL));
+ Artifact configurationId = new Artifact("test", name, "42", "car");
+ ConfigurationData configurationData = new ConfigurationData(configurationId, kernel.getNaming());
+ configurationData.getEnvironment().addDependency(new Dependency(baseId, ImportType.ALL));
for (int i = 0; i < containers.length; i++) {
- config.addGBean(containers[i]);
+ configurationData.addGBean(containers[i]);
}
// Start the configuration
ConfigurationManager configurationManager = ConfigurationUtil.getConfigurationManager(kernel);
- Configuration configuration = configurationManager.loadConfiguration(config);
- configurationManager.startConfiguration(configuration);
+ configurationManager.loadConfiguration(configurationData);
+ configurationManager.startConfiguration(configurationId);
}
protected void tearDown() throws Exception {
Modified: branches/v2_1/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/entity/cmp/ejbql/EJBQLTest.java (2609 => 2610)
--- branches/v2_1/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/entity/cmp/ejbql/EJBQLTest.java 2006-04-17 00:39:58 UTC (rev 2609)
+++ branches/v2_1/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/entity/cmp/ejbql/EJBQLTest.java 2006-04-18 06:50:58 UTC (rev 2610)
@@ -68,7 +68,6 @@
import org.apache.geronimo.kernel.config.ConfigurationData;
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.repository.Environment;
import org.apache.geronimo.kernel.repository.Repository;
import org.apache.geronimo.kernel.repository.Artifact;
@@ -254,14 +253,15 @@
container.setAbstractName(containerName);
// Wrap the GBeanData in a configuration
- ConfigurationData config = new ConfigurationData(new Artifact("some", "test", "42", "car"), kernel.getNaming());
- config.getEnvironment().addDependency(new Dependency(baseId, ImportType.ALL));
- config.addGBean(container);
+ Artifact configurationId = new Artifact("some", "test", "42", "car");
+ ConfigurationData configurationData = new ConfigurationData(configurationId, kernel.getNaming());
+ configurationData.getEnvironment().addDependency(new Dependency(baseId, ImportType.ALL));
+ configurationData.addGBean(container);
// Start the configuration
ConfigurationManager configurationManager = ConfigurationUtil.getConfigurationManager(kernel);
- Configuration configuration = configurationManager.loadConfiguration(config);
- configurationManager.startConfiguration(configuration);
+ configurationManager.loadConfiguration(configurationData);
+ configurationManager.startConfiguration(configurationId);
}
protected void tearDown() throws Exception {
Modified: branches/v2_1/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/mdb/BasicMDBContainerTest.java (2609 => 2610)
--- branches/v2_1/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/mdb/BasicMDBContainerTest.java 2006-04-17 00:39:58 UTC (rev 2609)
+++ branches/v2_1/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/mdb/BasicMDBContainerTest.java 2006-04-18 06:50:58 UTC (rev 2610)
@@ -44,13 +44,10 @@
*/
package org.openejb.deployment.mdb;
-import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
-import org.apache.geronimo.gbean.AbstractName;
import org.apache.geronimo.gbean.GBeanData;
-import org.apache.geronimo.kernel.config.Configuration;
import org.apache.geronimo.kernel.config.ConfigurationData;
import org.apache.geronimo.kernel.config.ConfigurationManager;
import org.apache.geronimo.kernel.config.ConfigurationUtil;
@@ -94,12 +91,12 @@
container.setReferencePattern("TransactionContextManager", tcmName);
container.setReferencePattern("TrackedConnectionAssociator", ctcName);
- ConfigurationData config = new ConfigurationData(testConfigurationArtifact, kernel.getNaming());
- config.getEnvironment().addDependency(new Dependency(baseId, ImportType.ALL));
- config.addGBean(container);
+ ConfigurationData configurationData = new ConfigurationData(testConfigurationArtifact, kernel.getNaming());
+ configurationData.getEnvironment().addDependency(new Dependency(baseId, ImportType.ALL));
+ configurationData.addGBean(container);
ConfigurationManager configurationManager = ConfigurationUtil.getConfigurationManager(kernel);
- Configuration configuration = configurationManager.loadConfiguration(config);
- configurationManager.startConfiguration(configuration);
+ configurationManager.loadConfiguration(configurationData);
+ configurationManager.startConfiguration(testConfigurationArtifact);
}
protected void tearDown() throws Exception {
Modified: branches/v2_1/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/slsb/BasicStatelessContainerTest.java (2609 => 2610)
--- branches/v2_1/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/slsb/BasicStatelessContainerTest.java 2006-04-17 00:39:58 UTC (rev 2609)
+++ branches/v2_1/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/slsb/BasicStatelessContainerTest.java 2006-04-18 06:50:58 UTC (rev 2610)
@@ -52,20 +52,19 @@
import org.apache.geronimo.gbean.AbstractNameQuery;
import org.apache.geronimo.gbean.GBeanData;
+import org.apache.geronimo.kernel.config.ConfigurationData;
+import org.apache.geronimo.kernel.config.ConfigurationManager;
+import org.apache.geronimo.kernel.config.ConfigurationUtil;
import org.apache.geronimo.kernel.repository.Artifact;
import org.apache.geronimo.kernel.repository.Dependency;
import org.apache.geronimo.kernel.repository.ImportType;
-import org.apache.geronimo.kernel.config.ConfigurationData;
-import org.apache.geronimo.kernel.config.ConfigurationUtil;
-import org.apache.geronimo.kernel.config.ConfigurationManager;
-import org.apache.geronimo.kernel.config.Configuration;
+import org.openejb.GenericEJBContainer;
import org.openejb.deployment.DeploymentHelper;
import org.openejb.deployment.StatelessContainerBuilder;
import org.openejb.dispatch.InterfaceMethodSignature;
import org.openejb.proxy.EJBProxyReference;
import org.openejb.transaction.TransactionPolicySource;
import org.openejb.transaction.TransactionPolicyType;
-import org.openejb.GenericEJBContainer;
/**
* @version $Revision$ $Date$
@@ -190,14 +189,15 @@
container.setAbstractName(CONTAINER_NAME);
// Wrap the GBeanData in a configuration
- ConfigurationData config = new ConfigurationData(new Artifact("some", "test", "42", "car"), kernel.getNaming());
- config.getEnvironment().addDependency(new Dependency(baseId, ImportType.ALL));
- config.addGBean(container);
+ Artifact configurationId = new Artifact("some", "test", "42", "car");
+ ConfigurationData configurationData = new ConfigurationData(configurationId, kernel.getNaming());
+ configurationData.getEnvironment().addDependency(new Dependency(baseId, ImportType.ALL));
+ configurationData.addGBean(container);
// Start the configuration
ConfigurationManager configurationManager = ConfigurationUtil.getConfigurationManager(kernel);
- Configuration configuration = configurationManager.loadConfiguration(config);
- configurationManager.startConfiguration(configuration);
+ configurationManager.loadConfiguration(configurationData);
+ configurationManager.startConfiguration(configurationId);
}
protected void tearDown() throws Exception {
