You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2010/12/27 08:23:48 UTC

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

Author: djencks
Date: Mon Dec 27 07:23:48 2010
New Revision: 1053012

URL: http://svn.apache.org/viewvc?rev=1053012&view=rev
Log:
GERONIMO-5050 handle BeanManager resources

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=1053012&r1=1053011&r2=1053012&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 Mon Dec 27 07:23:48 2010
@@ -284,6 +284,9 @@ public class AdminObjectRefBuilder exten
         if ("javax.validation.ValidatorFactory".equals(type)) {
             return new JndiReference("java:comp/ValidatorFactory");
         }
+        if ("javax.enterprise.inject.spi.BeanManager".equals(type)) {
+            return new JndiReference("java:comp/BeanManager");
+        }
         if ("javax.transaction.TransactionSynchronizationRegistry".equals(type)) {
             return new JndiReference("java:comp/TransactionSynchronizationRegistry");
         }
@@ -433,7 +436,8 @@ public class AdminObjectRefBuilder exten
                 "javax.ejb.EntityContext", 
                 "javax.ejb.TimerService", 
                 "javax.validation.Validator", 
-                "javax.validation.ValidatorFactory", 
+                "javax.validation.ValidatorFactory",
+                "javax.enterprise.inject.spi.BeanManager",
                 "javax.transaction.UserTransaction", 
                 "javax.transaction.TransactionManager", 
                 "javax.transaction.TransactionSynchronizationRegistry",