Author: genspring Date: Thu Mar 17 02:31:54 2011 New Revision: 1082375 URL: http://svn.apache.org/viewvc?rev=1082375&view=rev Log: Enable geronimo DD ejblink definition for ejbref. Modified: geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbRefBuilder.java 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=1082375&r1=1082374&r2=1082375&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 Thu Mar 17 02:31:54 2011 @@ -249,21 +249,26 @@ public class EjbRefBuilder extends Abstr spec_ejbRef.setMappedName(getStringValue(spec_ejbRef.getMappedName())); // handle external refs - if (ejbRefType != null) { - if (ejbRefType.getPattern() != null) { - // external ear ref - // set mapped name to the deploymentId of the external ref - GerPatternType pattern = ejbRefType.getPattern(); - String module = pattern.getModule(); - if (module == null) { - module = pattern.getArtifactId(); - } - String ejbName = pattern.getName(); - String deploymentId = module.trim() + "/" + ejbName; - spec_ejbRef.setMappedName(deploymentId.trim()); + + if (ejbRefType.getPattern() != null) { + // external ear ref + // set mapped name to the deploymentId of the external ref + GerPatternType pattern = ejbRefType.getPattern(); + String module = pattern.getModule(); + if (module == null) { + module = pattern.getArtifactId(); } + String ejbName = pattern.getName(); + String deploymentId = module.trim() + "/" + ejbName; + spec_ejbRef.setMappedName(deploymentId.trim()); } + if (ejbRefType.getEjbLink() != null) { + spec_ejbRef.setEjbLink(getStringValue(ejbRefType.getEjbLink())); + } + + + // openejb handling of injection-targets if (spec_ejbRef.getInjectionTarget() != null) { for (InjectionTarget injectionTargetType : spec_ejbRef.getInjectionTarget()) {