Diff
Modified: branches/v2_1/openejb2/modules/openejb-builder/src/java/org/openejb/deployment/AbstractContainerBuilder.java (2563 => 2564)
--- branches/v2_1/openejb2/modules/openejb-builder/src/java/org/openejb/deployment/AbstractContainerBuilder.java 2006-03-20 22:47:32 UTC (rev 2563)
+++ branches/v2_1/openejb2/modules/openejb-builder/src/java/org/openejb/deployment/AbstractContainerBuilder.java 2006-03-21 05:04:40 UTC (rev 2564)
@@ -506,7 +506,9 @@
gbean.setAttribute("userTransaction", getUserTransaction());
gbean.setAttribute("jndiNames", getJndiNames());
gbean.setAttribute("localJndiNames", getLocalJndiNames());
- gbean.setReferencePattern("Timer", timerName);
+ if (timerName != null) {
+ gbean.setReferencePattern("Timer", timerName);
+ }
gbean.setAttribute("defaultPrincipal", getDefaultPrincipal());
gbean.setAttribute("runAsSubject", getRunAs());
gbean.setAttribute("homeTxPolicyConfig", getHomeTxPolicyConfig());
Modified: branches/v2_1/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/DeploymentHelper.java (2563 => 2564)
--- branches/v2_1/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/DeploymentHelper.java 2006-03-20 22:47:32 UTC (rev 2563)
+++ branches/v2_1/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/DeploymentHelper.java 2006-03-21 05:04:40 UTC (rev 2564)
@@ -47,12 +47,12 @@
*/
package org.openejb.deployment;
+import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
+import java.util.LinkedHashMap;
import java.util.Map;
import java.util.Set;
-import java.util.LinkedHashMap;
-import javax.management.ObjectName;
import org.apache.geronimo.connector.ActivationSpecWrapperGBean;
import org.apache.geronimo.connector.ResourceAdapterModuleImplGBean;
@@ -60,8 +60,8 @@
import org.apache.geronimo.connector.outbound.connectiontracking.ConnectionTrackingCoordinatorGBean;
import org.apache.geronimo.connector.work.GeronimoWorkManagerGBean;
import org.apache.geronimo.gbean.AbstractName;
-import org.apache.geronimo.gbean.GBeanData;
import org.apache.geronimo.gbean.AbstractNameQuery;
+import org.apache.geronimo.gbean.GBeanData;
import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
import org.apache.geronimo.kernel.GBeanAlreadyExistsException;
import org.apache.geronimo.kernel.GBeanNotFoundException;
@@ -69,7 +69,6 @@
import org.apache.geronimo.kernel.Jsr77Naming;
import org.apache.geronimo.kernel.Kernel;
import org.apache.geronimo.kernel.Naming;
-import org.apache.geronimo.kernel.jmx.JMXUtil;
import org.apache.geronimo.kernel.repository.Artifact;
import org.apache.geronimo.pool.ThreadPool;
import org.apache.geronimo.timer.vm.VMStoreThreadPooledNonTransactionalTimer;
@@ -122,7 +121,7 @@
GBeanData tmGBean = new GBeanData(TRANSACTIONMANAGER_NAME, TransactionManagerImplGBean.GBEAN_INFO);
Set rmpatterns = new HashSet();
- rmpatterns.add(ObjectName.getInstance("geronimo.server:j2eeType=JCAManagedConnectionFactory,*"));
+ rmpatterns.add(new AbstractNameQuery(null, Collections.singletonMap("j2eeType", "JCAManagedConnectionFactory")));
tmGBean.setAttribute("defaultTransactionTimeoutSeconds", new Integer(10));
tmGBean.setReferencePattern("XidFactory", XIDFACTORY_NAME);
tmGBean.setReferencePatterns("ResourceManagers", rmpatterns);
Modified: branches/v2_1/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/slsb/BasicStatelessContainerTest.java (2563 => 2564)
--- branches/v2_1/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/slsb/BasicStatelessContainerTest.java 2006-03-20 22:47:32 UTC (rev 2563)
+++ branches/v2_1/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/slsb/BasicStatelessContainerTest.java 2006-03-21 05:04:40 UTC (rev 2564)
@@ -55,6 +55,11 @@
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.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.ContainerIndex;
import org.openejb.deployment.DeploymentHelper;
import org.openejb.deployment.StatelessContainerBuilder;
@@ -185,7 +190,12 @@
//start the ejb container
container.setReferencePattern("Timer", DeploymentHelper.TRANSACTIONALTIMER_NAME);
- start(DeploymentHelper.CONTAINER_NAME, container);
+ container.setAbstractName(DeploymentHelper.CONTAINER_NAME);
+ ConfigurationData config = new ConfigurationData(new Artifact("some", "test", "42", "car"), kernel.getNaming());
+ config.addGBean(container);
+ ConfigurationManager configurationManager = ConfigurationUtil.getConfigurationManager(kernel);
+ Configuration configuration = configurationManager.loadConfiguration(config);
+ configurationManager.startConfiguration(configuration);
AbstractName containerIndexname = kernel.getNaming().createRootName(DeploymentHelper.ARTIFACT, "ConatainerIndex", "ConatainerIndex");
GBeanData containerIndex = new GBeanData(containerIndexname, ContainerIndex.GBEAN_INFO);
@@ -200,12 +210,6 @@
super.tearDown();
}
- private void start(AbstractName name, GBeanData instance) throws Exception {
- instance.setAbstractName(name);
- kernel.loadGBean(instance, this.getClass().getClassLoader());
- kernel.startGBean(name);
- }
-
private void stop(AbstractName name) throws Exception {
kernel.stopGBean(name);
kernel.unloadGBean(name);
