geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r516547 - /geronimo/server/trunk/modules/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/ResourceRefBuilder.java
Date Fri, 09 Mar 2007 20:46:12 GMT
Author: djencks
Date: Fri Mar  9 12:46:12 2007
New Revision: 516547

URL: http://svn.apache.org/viewvc?view=rev&rev=516547
Log:
GERONIMO-2837 Minor bug fix to ResourceRefBuilder, it now works for the listed cf types. 
Still needs to be converted to just look for a target

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=516547&r1=516546&r2=516547
==============================================================================
--- 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
Fri Mar  9 12:46:12 2007
@@ -251,17 +251,6 @@
         public boolean processResource(AnnotatedApp annotatedApp, Resource annotation, Class
cls, Method method, Field field) {
             String resourceName = getResourceName(annotation, method, field);
             String resourceType = getResourceType(annotation, method, field);
-            boolean isResourceRef = false;
-            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.endsWith("ConnectionFactory")) {
-                isResourceRef = true;
-            } else
             if (resourceType.equals("javax.sql.DataSource") ||
                     resourceType.equals("javax.jms.ConnectionFactory") ||
                     resourceType.equals("javax.jms.QueueConnectionFactory") ||
@@ -304,7 +293,8 @@
                             FullyQualifiedClassType qualifiedClass = resourceRef.addNewResType();
                             qualifiedClass.setStringValue(resourceType);
                             resourceRef.setResType(qualifiedClass);
-                        } else if (method != null || field != null) {
+                        }
+                        if (method != null || field != null) {
                             // injectionTarget
                             InjectionTargetType injectionTarget = resourceRef.addNewInjectionTarget();
                             configureInjectionTarget(injectionTarget, method, field);



Mime
View raw message