[openejb-scm] [2585] branches/v2_1/openejb2/modules/openejb-builder/src/java/org/openejb/deployment/MdbBuilder.java: jetty and tomcat servers start: tomcat server works.

[djencks]

Title: [2585] branches/v2_1/openejb2/modules/openejb-builder/src/java/org/openejb/deployment/MdbBuilder.java: jetty and tomcat servers start: tomcat server works.

Revision

2585

Author

djencks

Date

2006-03-26 19:56:03 -0500 (Sun, 26 Mar 2006)

Log Message

jetty and tomcat servers start: tomcat server works.

Modified Paths

• branches/v2_1/openejb2/modules/openejb-builder/src/java/org/openejb/deployment/MdbBuilder.java

Diff

Modified: branches/v2_1/openejb2/modules/openejb-builder/src/java/org/openejb/deployment/MdbBuilder.java (2584 => 2585)

--- branches/v2_1/openejb2/modules/openejb-builder/src/java/org/openejb/deployment/MdbBuilder.java	2006-03-25 17:42:36 UTC (rev 2584)
+++ branches/v2_1/openejb2/modules/openejb-builder/src/java/org/openejb/deployment/MdbBuilder.java	2006-03-27 00:56:03 UTC (rev 2585)
@@ -111,7 +111,6 @@
             AbstractName messageDrivenAbstractName = earContext.getNaming().createChildName(moduleBaseName, ejbName, NameFactory.MESSAGE_DRIVEN_BEAN);
             AbstractName activationSpecName = earContext.getNaming().createChildName(messageDrivenAbstractName, ejbName, NameFactory.JCA_ACTIVATION_SPEC);
 
-            //TODO configid need canonical form
             String containerId = messageDrivenAbstractName.toURI().toString();
             addActivationSpecWrapperGBean(earContext,
                     ejbModule.getModuleURI(),
@@ -233,15 +232,15 @@
                                                String messageListenerInterfaceName,
                                                String containerId) throws DeploymentException {
         RefContext refContext = earContext.getRefContext();
-        AbstractNameQuery resourceAdapterModuleQuery = getResourceAdapterNameQuery(resourceAdapter, NameFactory.RESOURCE_ADAPTER_MODULE);
-        GBeanData activationSpecInfo = refContext.getActivationSpecInfo(resourceAdapterModuleQuery, messageListenerInterfaceName, earContext.getConfiguration());
+//        AbstractNameQuery resourceAdapterModuleQuery = getResourceAdapterNameQuery(resourceAdapter, NameFactory.RESOURCE_ADAPTER_MODULE);
+        AbstractNameQuery resourceAdapterInstanceQuery = getResourceAdapterNameQuery(resourceAdapter, NameFactory.JCA_RESOURCE_ADAPTER);
+        GBeanData activationSpecInfo = refContext.getActivationSpecInfo(resourceAdapterInstanceQuery, messageListenerInterfaceName, earContext.getConfiguration());
 
         if (activationSpecInfo == null) {
-            throw new DeploymentException("no activation spec found for resource adapter: " + resourceAdapterModuleQuery + " and message listener type: " + messageListenerInterfaceName);
+            throw new DeploymentException("no activation spec found for resource adapter: " + resourceAdapterInstanceQuery + " and message listener type: " + messageListenerInterfaceName);
         }
         activationSpecInfo = new GBeanData(activationSpecInfo);
         activationSpecInfo.setAttribute("containerId", containerId);
-        AbstractNameQuery resourceAdapterInstanceQuery = getResourceAdapterNameQuery(resourceAdapter, NameFactory.JCA_RESOURCE_ADAPTER);
         activationSpecInfo.setReferencePattern("ResourceAdapterWrapper", resourceAdapterInstanceQuery);
         if (openejbActivationConfigProperties != null) {
             for (int i = 0; i < openejbActivationConfigProperties.length; i++) {