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

[db...@apache.org]

Author: dblevins
Date: Mon Sep 24 14:08:19 2007
New Revision: 578970

URL: http://svn.apache.org/viewvc?rev=578970&view=rev
Log:
Blank out the EjbJar before configuration to ensure alt DDs can be supported

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?rev=578970&r1=578969&r2=578970&view=diff
==============================================================================
--- 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 Mon Sep 24 14:08:19 2007
@@ -200,6 +200,7 @@
 
         // add the ejb-jar.xml altDD plan
         if (specDDUrl != null) {
+            ejbModule.setEjbJar(null);
             ejbModule.getAltDDs().put("ejb-jar.xml", specDDUrl);
         }
 
@@ -501,7 +502,7 @@
             TemporaryClassLoader temporaryClassLoader = new TemporaryClassLoader(new URL[0], classLoader);
 
             // create an openejb app module for the ear containing all ejb modules
-            AppModule appModule = new AppModule(classLoader, ejbModule.getEjbModule().getModuleId());
+            AppModule appModule = new AppModule(classLoader, earContext.getConfigID().toString());
             for (EjbModule module : earData.getEjbModuels()) {
                 module.setClassLoader(temporaryClassLoader);
                 appModule.getEjbModules().add(module.getEjbModule());