svn commit: r525008 - in /incubator/openejb/trunk/openejb3/container: openejb-core/src/main/java/org/apache/openejb/config/OpenEjb2CmpConversion.java openejb-jee/src/main/java/org/apache/openejb/jee/EjbJar.java

[da...@apache.org]

Author: dain
Date: Mon Apr  2 20:03:13 2007
New Revision: 525008

URL: http://svn.apache.org/viewvc?view=rev&rev=525008
Log:
Corba jndi refs need to go onto mapped name

Modified:
    incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/OpenEjb2CmpConversion.java
    incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/EjbJar.java

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/OpenEjb2CmpConversion.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/OpenEjb2CmpConversion.java?view=diff&rev=525008&r1=525007&r2=525008
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/OpenEjb2CmpConversion.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/OpenEjb2CmpConversion.java Mon Apr  2 20:03:13 2007
@@ -62,13 +62,14 @@
 import org.apache.openejb.jee.EnterpriseBean;
 import org.apache.openejb.jee.ActivationConfigProperty;
 import org.apache.openejb.jee.ActivationConfig;
+import org.apache.openejb.jee.EjbRef;
 
 public class OpenEjb2CmpConversion implements DynamicDeployer {
     public AppModule deploy(AppModule appModule) {
         for (EjbModule ejbModule : appModule.getEjbModules()) {
             Object altDD = getOpenejbJarType(ejbModule);
             if (altDD instanceof OpenejbJarType) {
-                convertEjbRefs(ejbModule.getOpenejbJar(), (OpenejbJarType) altDD);
+                convertEjbRefs(ejbModule.getEjbJar(), ejbModule.getOpenejbJar(), (OpenejbJarType) altDD);
                 convertMdbConfigs(ejbModule.getEjbJar(), (OpenejbJarType) altDD);
                 mergeEntityMappings(appModule.getCmpMappings(), ejbModule.getOpenejbJar(), (OpenejbJarType) altDD);
             }
@@ -101,12 +102,21 @@
         return null;
     }
 
-    public void convertEjbRefs(OpenejbJar openejbJar, OpenejbJarType openejbJarType) {
-        Map<String, EjbDeployment> deployments =  new TreeMap<String, EjbDeployment>();
-        for (EjbDeployment deployment : openejbJar.getEjbDeployment()) {
-            deployments.put(deployment.getEjbName(), deployment);
-        }
+    public void convertEjbRefs(EjbJar ejbJar, OpenejbJar openejbJar, OpenejbJarType openejbJarType) {
+        Map<String, EnterpriseBean> ejbs = ejbJar.getEnterpriseBeansByEjbName();
+        Map<String, EjbDeployment> deployments =  openejbJar.getDeploymentsByEjbName();
+
         for (org.apache.openejb.jee.oejb2.EnterpriseBean enterpriseBean : openejbJarType.getEnterpriseBeans()) {
+            EnterpriseBean ejb = ejbs.get(enterpriseBean.getEjbName());
+            if (ejb == null) {
+                // todo warn no such ejb in the ejb-jar.xml
+                continue;
+            }
+            Map<String,EjbRef> ejbRefs =  new TreeMap<String,EjbRef>();
+            for (EjbRef ref : ejb.getEjbRef()) {
+                ejbRefs.put(ref.getEjbRefName(), ref);
+            }
+
             EjbDeployment deployment = deployments.get(enterpriseBean.getEjbName());
             if (deployment == null) {
                 // todo warn no such ejb in the ejb-jar.xml
@@ -127,8 +137,10 @@
 
                 String nsCorbaloc = refType.getNsCorbaloc();
                 if (nsCorbaloc != null) {
-                    EjbLink ejbLink = new EjbLink(refName, "jndi:" + nsCorbaloc);
-                    deployment.getEjbLink().add(ejbLink);
+                    EjbRef ref = ejbRefs.get(refName);
+                    if (ref != null) {
+                        ref.setMappedName("jndi:" + nsCorbaloc);
+                    }
                 } else {
                     PatternType pattern = refType.getPattern();
                     addEjbLink(deployment, refName, pattern);

Modified: incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/EjbJar.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/EjbJar.java?view=diff&rev=525008&r1=525007&r2=525008
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/EjbJar.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/EjbJar.java Mon Apr  2 20:03:13 2007
@@ -165,6 +165,10 @@
         return enterpriseBeans.get(ejbName);
     }
 
+    public Map<String,EnterpriseBean> getEnterpriseBeansByEjbName() {
+        return enterpriseBeans;
+    }
+    
     public Interceptor[] getInterceptors() {
         if (interceptors == null) return null;
         return interceptors.getInterceptor();