Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 80248 invoked from network); 13 Jul 2010 00:01:37 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 13 Jul 2010 00:01:37 -0000 Received: (qmail 78394 invoked by uid 500); 13 Jul 2010 00:01:37 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 78347 invoked by uid 500); 13 Jul 2010 00:01:37 -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 78338 invoked by uid 99); 13 Jul 2010 00:01:37 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 13 Jul 2010 00:01:37 +0000 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, 13 Jul 2010 00:01:33 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id A404923889B1; Tue, 13 Jul 2010 00:00:40 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r963537 - in /geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment: AdminObjectRefBuilder.java ResourceRefBuilder.java Date: Tue, 13 Jul 2010 00:00:40 -0000 To: scm@geronimo.apache.org From: djencks@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100713000040.A404923889B1@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: djencks Date: Tue Jul 13 00:00:40 2010 New Revision: 963537 URL: http://svn.apache.org/viewvc?rev=963537&view=rev Log: GERONIMO-5445 use aries jndi with osgi service lookup instead of kernel gbean registry lookup in java: jndi Modified: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/AdminObjectRefBuilder.java geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/ResourceRefBuilder.java Modified: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/AdminObjectRefBuilder.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/AdminObjectRefBuilder.java?rev=963537&r1=963536&r2=963537&view=diff ============================================================================== --- geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/AdminObjectRefBuilder.java (original) +++ geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/AdminObjectRefBuilder.java Tue Jul 13 00:00:40 2010 @@ -32,6 +32,7 @@ import javax.naming.StringRefAddr; import javax.xml.namespace.QName; import org.apache.geronimo.common.DeploymentException; import org.apache.geronimo.common.UnresolvedReferenceException; +import org.apache.geronimo.gbean.AbstractName; import org.apache.geronimo.gbean.AbstractNameQuery; import org.apache.geronimo.gbean.annotation.GBean; import org.apache.geronimo.gbean.annotation.ParamAttribute; @@ -44,7 +45,6 @@ import org.apache.geronimo.kernel.config import org.apache.geronimo.kernel.repository.Environment; import org.apache.geronimo.naming.deployment.AbstractNamingBuilder; import org.apache.geronimo.naming.reference.JndiReference; -import org.apache.geronimo.naming.reference.ResourceReferenceFactory; import org.apache.geronimo.naming.reference.UserTransactionReference; import org.apache.geronimo.xbeans.geronimo.naming.GerMessageDestinationDocument; import org.apache.geronimo.xbeans.geronimo.naming.GerMessageDestinationType; @@ -268,7 +268,7 @@ public class AdminObjectRefBuilder exten } try { AbstractNameQuery containerId = getAdminObjectContainerId(name, gerResourceEnvRef); - ResourceReferenceFactory ref = buildAdminObjectReference(module, containerId, iface); + Reference ref = buildAdminObjectReference(module, containerId); return ref; } catch (UnresolvedReferenceException e) { throw new DeploymentException("Unable to resolve resource env reference '" + name + "' (" + (e.isMultiple() ? "found multiple matching resources" : "no matching resources found") + ")", e); @@ -308,7 +308,7 @@ public class AdminObjectRefBuilder exten //try to resolve ref based only matching resource-ref-name //throws exception if it can't locate ref. AbstractNameQuery containerId = buildAbstractNameQuery(null, moduleURI, linkName, NameFactory.JCA_ADMIN_OBJECT, NameFactory.RESOURCE_ADAPTER_MODULE); - ResourceReferenceFactory ref = buildAdminObjectReference(module, containerId, iface); + Reference ref = buildAdminObjectReference(module, containerId); return ref; } @@ -344,14 +344,15 @@ public class AdminObjectRefBuilder exten } - private ResourceReferenceFactory buildAdminObjectReference(Module module, AbstractNameQuery containerId, Class iface) throws DeploymentException { + private Reference buildAdminObjectReference(Module module, AbstractNameQuery containerId) throws DeploymentException { Configuration localConfiguration = module.getEarContext().getConfiguration(); try { - localConfiguration.findGBean(containerId); + AbstractName abstractName = localConfiguration.findGBean(containerId); + String osgiJndiName = "aries:services/" + module.getEarContext().getNaming().toOsgiJndiName(abstractName); + return new JndiReference(osgiJndiName); } catch (GBeanNotFoundException e) { throw new DeploymentException("Can not resolve admin object ref " + containerId + " in configuration " + localConfiguration.getId(), e); } - return new ResourceReferenceFactory(module.getConfigId(), containerId, iface); } private static AbstractNameQuery getAdminObjectContainerId(String name, GerResourceEnvRefType gerResourceEnvRef) { Modified: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/ResourceRefBuilder.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/ResourceRefBuilder.java?rev=963537&r1=963536&r2=963537&view=diff ============================================================================== --- geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/ResourceRefBuilder.java (original) +++ geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/ResourceRefBuilder.java Tue Jul 13 00:00:40 2010 @@ -31,7 +31,6 @@ import java.util.Map; import java.util.Set; import javax.annotation.Resource; -import javax.resource.ResourceException; import javax.xml.namespace.QName; import org.apache.geronimo.common.DeploymentException; import org.apache.geronimo.deployment.service.EnvironmentBuilder; @@ -57,7 +56,6 @@ import org.apache.geronimo.naming.deploy import org.apache.geronimo.naming.deployment.ResourceEnvironmentSetter; import org.apache.geronimo.naming.reference.JndiReference; import org.apache.geronimo.naming.reference.ORBReference; -import org.apache.geronimo.naming.reference.ResourceReferenceFactory; import org.apache.geronimo.naming.reference.URLReference; import org.apache.geronimo.xbeans.geronimo.naming.GerPatternType; import org.apache.geronimo.xbeans.geronimo.naming.GerResourceRefDocument; @@ -70,7 +68,6 @@ import org.apache.openejb.jee.ResourceRe import org.apache.openejb.jee.Text; import org.apache.xmlbeans.QNameSet; import org.apache.xmlbeans.XmlObject; -import org.omg.CORBA.ORB; import org.osgi.framework.Bundle; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -218,9 +215,11 @@ public class ResourceRefBuilder extends try { AbstractNameQuery containerId = getResourceContainerId(name, j2eeType, null, gerResourceRef); - module.getEarContext().findGBean(containerId); + AbstractName abstractName = module.getEarContext().findGBean(containerId); + String osgiJndiName = "aries:services/" + module.getEarContext().getNaming().toOsgiJndiName(abstractName); - return new ResourceReferenceFactory(module.getConfigId(), containerId, iface); + return new JndiReference(osgiJndiName); + //ResourceReferenceFactory(module.getConfigId(), containerId, iface); } catch (GBeanNotFoundException e) { StringBuffer errorMessage = new StringBuffer("Unable to resolve resource reference '"); errorMessage.append(name);