Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 10457 invoked from network); 3 Feb 2009 09:29:46 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 3 Feb 2009 09:29:46 -0000 Received: (qmail 16124 invoked by uid 500); 3 Feb 2009 09:29:46 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 16084 invoked by uid 500); 3 Feb 2009 09:29: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 16075 invoked by uid 99); 3 Feb 2009 09:29:46 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 03 Feb 2009 01:29:46 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Tue, 03 Feb 2009 09:29:45 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id F329F238896F; Tue, 3 Feb 2009 09:29:24 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r740258 - /geronimo/plugins/tuscany/trunk/geronimo-tuscany-implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/invocation/EjbImplementationInvoker.java Date: Tue, 03 Feb 2009 09:29:24 -0000 To: scm@geronimo.apache.org From: vamsic007@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090203092924.F329F238896F@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: vamsic007 Date: Tue Feb 3 09:29:24 2009 New Revision: 740258 URL: http://svn.apache.org/viewvc?rev=740258&view=rev Log: Replace strings with constants from NameFactory. Modified: geronimo/plugins/tuscany/trunk/geronimo-tuscany-implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/invocation/EjbImplementationInvoker.java Modified: geronimo/plugins/tuscany/trunk/geronimo-tuscany-implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/invocation/EjbImplementationInvoker.java URL: http://svn.apache.org/viewvc/geronimo/plugins/tuscany/trunk/geronimo-tuscany-implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/invocation/EjbImplementationInvoker.java?rev=740258&r1=740257&r2=740258&view=diff ============================================================================== --- geronimo/plugins/tuscany/trunk/geronimo-tuscany-implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/invocation/EjbImplementationInvoker.java (original) +++ geronimo/plugins/tuscany/trunk/geronimo-tuscany-implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/invocation/EjbImplementationInvoker.java Tue Feb 3 09:29:24 2009 @@ -27,6 +27,7 @@ import org.apache.geronimo.gbean.AbstractName; import org.apache.geronimo.gbean.AbstractNameQuery; +import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory; import org.apache.geronimo.kernel.Kernel; import org.apache.geronimo.kernel.KernelRegistry; import org.apache.geronimo.kernel.repository.Artifact; @@ -83,7 +84,7 @@ beanName = ejbLink.substring(ejbLink.indexOf("#")+1); moduleName = ejbLink.substring(0, ejbLink.indexOf("#")); } - map.put("name", beanName); + map.put(NameFactory.J2EE_NAME, beanName); AbstractNameQuery query = new AbstractNameQuery(artifact, map); Set gbeans = kernel.listGBeans(query); AbstractName ejbGbeanName = null; @@ -92,7 +93,7 @@ } else { for(Iterator itr = gbeans.iterator(); itr.hasNext();) { AbstractName temp = itr.next(); - if(moduleName.equals(ejbGbeanName.getNameProperty("EJBModule"))) { + if(moduleName.equals(ejbGbeanName.getNameProperty(NameFactory.EJB_MODULE))) { ejbGbeanName = temp; break; }