svn commit: r518564 - /geronimo/server/trunk/modules/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/deployment/CorbaModuleBuilderExtension.java

[ri...@apache.org]

Author: rickmcguire
Date: Thu Mar 15 03:27:08 2007
New Revision: 518564

URL: http://svn.apache.org/viewvc?view=rev&rev=518564
Log:
GERONIMO-2974 CorbaModuleBuilderExtension using the vendorDD before it's available.


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

Modified: geronimo/server/trunk/modules/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/deployment/CorbaModuleBuilderExtension.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/deployment/CorbaModuleBuilderExtension.java?view=diff&rev=518564&r1=518563&r2=518564
==============================================================================
--- geronimo/server/trunk/modules/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/deployment/CorbaModuleBuilderExtension.java (original)
+++ geronimo/server/trunk/modules/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/deployment/CorbaModuleBuilderExtension.java Thu Mar 15 03:27:08 2007
@@ -19,6 +19,7 @@
 import java.util.Collection;
 import java.util.Map;
 import java.util.HashMap;
+import java.util.List;
 import java.util.jar.JarFile;
 import java.io.File;
 import java.net.URI;
@@ -49,6 +50,9 @@
 import org.apache.geronimo.openejb.deployment.EjbModule;
 import org.apache.openejb.assembler.classic.EnterpriseBeanInfo;
 
+import org.apache.openejb.jee.oejb2.GeronimoEjbJarType; 
+import org.apache.openejb.jee.oejb2.TssLinkType; 
+
 import org.apache.geronimo.openejb.xbeans.ejbjar.OpenejbGeronimoEjbJarType;
 import org.apache.geronimo.openejb.xbeans.ejbjar.OpenejbTssLinkType;
 
@@ -93,14 +97,15 @@
         }
         
         // if we have a default environment specified, we merge it in, but only if 
-        // this module has tss links. 
+        // this module has tss links.  The vendorDD isn't available yet, so we'll have to look at the  
+        // jaxb version of this information now. 
         if (this.defaultEnvironment != null) {
-            EjbModule ejbModule = (EjbModule) module;
-            OpenejbGeronimoEjbJarType jarInfo = ejbModule.getVendorDD(); 
-
-            if (jarInfo != null) {
-                OpenejbTssLinkType[] links = jarInfo.getTssLinkArray(); 
-                if (links != null && links.length > 0) {
+            EjbModule ejbModule = (EjbModule)module;
+            GeronimoEjbJarType geronimoEjbJarType = (GeronimoEjbJarType) ejbModule.getEjbModule().getAltDDs().get("geronimo-openejb.xml");
+            
+            if (geronimoEjbJarType != null) {
+                List<TssLinkType> links = geronimoEjbJarType.getTssLink(); 
+                if (links != null && links.size() > 0) {
                     EnvironmentBuilder.mergeEnvironments(environment, this.defaultEnvironment);
                 }
             }