Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 18215 invoked from network); 23 May 2007 22:09:52 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 23 May 2007 22:09:52 -0000 Received: (qmail 95168 invoked by uid 500); 23 May 2007 22:09:53 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 95144 invoked by uid 500); 23 May 2007 22:09:53 -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 95128 invoked by uid 99); 23 May 2007 22:09:53 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 23 May 2007 15:09:53 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME 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; Wed, 23 May 2007 15:09:46 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id A15D61A981A; Wed, 23 May 2007 15:09:26 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r541099 - /geronimo/server/trunk/modules/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/ResourceRefBuilder.java Date: Wed, 23 May 2007 22:09:26 -0000 To: scm@geronimo.apache.org From: djencks@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070523220926.A15D61A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: djencks Date: Wed May 23 15:09:25 2007 New Revision: 541099 URL: http://svn.apache.org/viewvc?view=rev&rev=541099 Log: GERONIMO-3138 Whole lotta orbs going on Modified: geronimo/server/trunk/modules/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/ResourceRefBuilder.java Modified: geronimo/server/trunk/modules/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/ResourceRefBuilder.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/ResourceRefBuilder.java?view=diff&rev=541099&r1=541098&r2=541099 ============================================================================== --- geronimo/server/trunk/modules/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/ResourceRefBuilder.java (original) +++ geronimo/server/trunk/modules/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/ResourceRefBuilder.java Wed May 23 15:09:25 2007 @@ -138,7 +138,7 @@ } catch (MalformedURLException e) { throw new DeploymentException("Could not convert " + gerResourceRef.getUrl() + " to URL", e); } - } else if (iface == ORB.class) { + } else if (ORB.class.isAssignableFrom(iface)) { CorbaGBeanNameSource corbaGBeanNameSource = (CorbaGBeanNameSource) corbaGBeanNameSourceCollection.getElement(); if (corbaGBeanNameSource == null) { throw new DeploymentException("No orb setup but there is a orb reference"); @@ -285,13 +285,11 @@ String resourceType = getResourceType(annotation, method, field); if (resourceType.equals("javax.sql.DataSource") || - resourceType.equals("javax.jms.ConnectionFactory") || - resourceType.equals("javax.jms.QueueConnectionFactory") || - resourceType.equals("javax.jms.TopicConnectionFactory") || resourceType.equals("javax.mail.Session") || resourceType.equals("java.net.URL") || - resourceType.equals("javax.resource.cci.ConnectionFactory") || + resourceType.equals("org.omg.CORBA.ORB") || resourceType.equals("org.omg.CORBA_2_3.ORB") || + resourceType.equals("org.omg.CORBA_2_4.ORB") || resourceType.endsWith("ConnectionFactory")) { log.debug("processResource(): found");