Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 30868 invoked from network); 17 Mar 2011 02:32:21 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 17 Mar 2011 02:32:21 -0000 Received: (qmail 88642 invoked by uid 500); 17 Mar 2011 02:32:20 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 88605 invoked by uid 500); 17 Mar 2011 02:32:20 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 88598 invoked by uid 99); 17 Mar 2011 02:32:20 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 17 Mar 2011 02:32:20 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 17 Mar 2011 02:32:17 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 5594423888CD; Thu, 17 Mar 2011 02:31:54 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1082375 - /geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbRefBuilder.java Date: Thu, 17 Mar 2011 02:31:54 -0000 To: scm@geronimo.apache.org From: genspring@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110317023154.5594423888CD@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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()) {