Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 39982 invoked from network); 8 Nov 2007 21:21:58 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 8 Nov 2007 21:21:58 -0000 Received: (qmail 29683 invoked by uid 500); 8 Nov 2007 21:21:46 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 29648 invoked by uid 500); 8 Nov 2007 21:21:46 -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 29637 invoked by uid 99); 8 Nov 2007 21:21:46 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 08 Nov 2007 13:21:46 -0800 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 08 Nov 2007 21:22:32 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 5AB2D1A9832; Thu, 8 Nov 2007 13:21:35 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r593326 - /geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbRefBuilder.java Date: Thu, 08 Nov 2007 21:21:35 -0000 To: scm@geronimo.apache.org From: jbohn@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20071108212135.5AB2D1A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jbohn Date: Thu Nov 8 13:21:34 2007 New Revision: 593326 URL: http://svn.apache.org/viewvc?rev=593326&view=rev Log: improve on the hack from 592559 and make it actually work 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=593326&r1=593325&r2=593326&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 Nov 8 13:21:34 2007 @@ -49,10 +49,8 @@ import org.apache.geronimo.xbeans.geronimo.naming.GerPatternType; import org.apache.geronimo.xbeans.geronimo.naming.GerEjbLocalRefDocument; import org.apache.geronimo.xbeans.geronimo.naming.GerEjbLocalRefType; -import org.apache.openejb.Injection; import org.apache.openejb.OpenEJBException; import org.apache.openejb.assembler.classic.EjbJarInfo; -import org.apache.openejb.assembler.classic.InjectionBuilder; import org.apache.openejb.assembler.classic.JndiEncBuilder; import org.apache.openejb.assembler.classic.JndiEncInfo; import org.apache.openejb.config.JndiEncInfoBuilder; @@ -149,13 +147,7 @@ } else { jndiEncInfo = jndiEncInfoBuilder.build(consumer, "GeronimoEnc", module.getTargetPath()); } -// JndiEncBuilder jndiEncBuilder = new JndiEncBuilder(jndiEncInfo, module.getName()); - // determind the injections - InjectionBuilder injectionBuilder = new InjectionBuilder(getClass().getClassLoader()); - List injections = injectionBuilder.buildInjections(jndiEncInfo); - - // build the enc - JndiEncBuilder jndiEncBuilder = new JndiEncBuilder(jndiEncInfo, injections, module.getName(), getClass().getClassLoader()); + JndiEncBuilder jndiEncBuilder = new JndiEncBuilder(jndiEncInfo, null, module.getName(), getClass().getClassLoader()); map = jndiEncBuilder.buildMap(); } catch (OpenEJBException e) {