geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From genspr...@apache.org
Subject svn commit: r1084111 - in /geronimo/server/trunk/plugins: corba/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/deployment/ openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/
Date Tue, 22 Mar 2011 09:20:30 GMT
Author: genspring
Date: Tue Mar 22 09:20:30 2011
New Revision: 1084111

URL: http://svn.apache.org/viewvc?rev=1084111&view=rev
Log:
GERONIMO-5867 ejb corba call does not work
1, Don't handle the nsCorbaloc in EjbRefBilder, leave it to OpenEjbCorbaRefBuilder
2, Move OpenEjbCorbaRefBuilder below EjbRefBuilder by increase OpenEjbCorbaRefBuilder's priosity
number.

Modified:
    geronimo/server/trunk/plugins/corba/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/deployment/OpenEjbCorbaRefBuilder.java
    geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbRefBuilder.java

Modified: geronimo/server/trunk/plugins/corba/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/deployment/OpenEjbCorbaRefBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/corba/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/deployment/OpenEjbCorbaRefBuilder.java?rev=1084111&r1=1084110&r2=1084111&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/corba/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/deployment/OpenEjbCorbaRefBuilder.java
(original)
+++ geronimo/server/trunk/plugins/corba/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/deployment/OpenEjbCorbaRefBuilder.java
Tue Mar 22 09:20:30 2011
@@ -173,5 +173,10 @@ public class OpenEjbCorbaRefBuilder exte
         }
         return refMap;
     }
+    
+    @Override
+    public int getPriority() {
+        return 55;
+    }    
 
 }

Modified: geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbRefBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbRefBuilder.java?rev=1084111&r1=1084110&r2=1084111&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbRefBuilder.java
(original)
+++ geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbRefBuilder.java
Tue Mar 22 09:20:30 2011
@@ -222,6 +222,10 @@ public class EjbRefBuilder extends Abstr
 
             // merge info in alt-DD to spec DD.
             if (ejbRefType != null) {
+                
+                if (ejbRefType.getNsCorbaloc() != null) {
+                   continue;
+                }
 
                 // ejb-ref-name
                 spec_ejbRef.setEjbRefName(refName);
@@ -249,7 +253,7 @@ public class EjbRefBuilder extends Abstr
                 spec_ejbRef.setMappedName(getStringValue(spec_ejbRef.getMappedName()));
 
                 // handle external refs
-
+                
                 if (ejbRefType.getPattern() != null) {
                     // external ear ref
                     // set mapped name to the deploymentId of the external ref



Mime
View raw message