Author: dain
Date: Fri Mar 30 13:14:36 2007
New Revision: 524261

URL: http://svn.apache.org/viewvc?view=rev&rev=524261
Log:
Declare a dependency from the ejb module to resource adapters used by the mdbs

Modified:
    geronimo/server/trunk/modules/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java

Modified: geronimo/server/trunk/modules/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java?view=diff&rev=524261&r1=524260&r2=524261
==============================================================================
--- geronimo/server/trunk/modules/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java (original)
+++ geronimo/server/trunk/modules/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java Fri Mar 30 13:14:36 2007
@@ -594,7 +594,7 @@
         ComponentPermissions componentPermissions = ejbDeploymentBuilder.buildComponentPermissions();
         earContext.addSecurityContext(ejbModule.getEjbJarInfo().moduleId, componentPermissions);
 
-        setMdbContainerIds(earContext, ejbModule);
+        setMdbContainerIds(earContext, ejbModule, ejbModuleGBeanData);
 
         for (ModuleBuilderExtension builder : moduleBuilderExtensions) {
             try {
@@ -606,7 +606,7 @@
         }
     }
 
-    private void setMdbContainerIds(EARContext earContext, EjbModule ejbModule) throws DeploymentException {
+    private void setMdbContainerIds(EARContext earContext, EjbModule ejbModule, GBeanData ejbModuleGBeanData) throws DeploymentException {
         Object altDD = ejbModule.getEjbModule().getAltDDs().get("openejb-jar.xml");
         if (!(altDD instanceof OpenejbJarType)) {
             return;
@@ -654,6 +654,10 @@
             } else {
                 messageDrivenBeanInfo.containerId = resourceAdapterAbstractName.getObjectName().toString() + "-" + messageDrivenBeanInfo.mdbInterface;
             }
+
+            // add a dependency from the module to the ra so we can be assured the mdb
+            // container exists when this app is started
+            ejbModuleGBeanData.addDependency(resourceAdapterAbstractName);
         }
     }