You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by xu...@apache.org on 2011/09/22 10:00:32 UTC

svn commit: r1173982 - /geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/AdminObjectRefBuilder.java

Author: xuhaihong
Date: Thu Sep 22 08:00:32 2011
New Revision: 1173982

URL: http://svn.apache.org/viewvc?rev=1173982&view=rev
Log:
GERONIMO-6169 Recursive lookup while the default comp entry is configured

Modified:
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/AdminObjectRefBuilder.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=1173982&r1=1173981&r2=1173982&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 Thu Sep 22 08:00:32 2011
@@ -87,6 +87,19 @@ public class AdminObjectRefBuilder exten
     private static final QNameSet GER_ADMIN_OBJECT_REF_QNAME_SET = QNameSet.singleton(GER_ADMIN_OBJECT_REF_QNAME);
     private static final QName GER_MESSAGE_DESTINATION_QNAME = GerMessageDestinationDocument.type.getDocumentElementName();
     private static final QNameSet GER_MESSAGE_DESTINATION_QNAME_SET = QNameSet.singleton(GER_MESSAGE_DESTINATION_QNAME);
+    private static final Set<String> DEFAULT_COMP_JNDI_NAMES = new HashSet<String>();
+    static {
+        DEFAULT_COMP_JNDI_NAMES.add("java:comp/EJBContext");
+        DEFAULT_COMP_JNDI_NAMES.add("java:comp/WebServiceContext");
+        DEFAULT_COMP_JNDI_NAMES.add("java:comp/TimerService");
+        DEFAULT_COMP_JNDI_NAMES.add("java:comp/Validator");
+        DEFAULT_COMP_JNDI_NAMES.add("java:comp/ValidatorFactory");
+        DEFAULT_COMP_JNDI_NAMES.add("java:comp/BeanManager");
+        DEFAULT_COMP_JNDI_NAMES.add("java:comp/TransactionSynchronizationRegistry");
+        DEFAULT_COMP_JNDI_NAMES.add("java:comp/TransactionManager");
+        DEFAULT_COMP_JNDI_NAMES.add("java:comp/Bundle");
+        DEFAULT_COMP_JNDI_NAMES.add("java:comp/BundleContext");
+    }
 
     public AdminObjectRefBuilder(
             @ParamAttribute(name = "defaultEnvironment") Environment defaultEnvironment,
@@ -271,6 +284,11 @@ public class AdminObjectRefBuilder exten
         if (type.equals("javax.transaction.UserTransaction")) {
             return new UserTransactionReference();
         }
+
+        if(DEFAULT_COMP_JNDI_NAMES.contains(name)) {
+            return null;
+        }
+
         if ("javax.ejb.EJBContext".equals(type) ||
                 "javax.ejb.EntityContext".equals(type) ||
                 "javax.ejb.MessageDrivenContext".equals(type) ||