geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
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 GMT
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(): <resource-ref> found");



Mime
View raw message