From scm-return-45082-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org Mon Dec 27 07:24:12 2010 Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 78869 invoked from network); 27 Dec 2010 07:24:12 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 27 Dec 2010 07:24:12 -0000 Received: (qmail 80676 invoked by uid 500); 27 Dec 2010 07:24:12 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 80544 invoked by uid 500); 27 Dec 2010 07:24:10 -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 80537 invoked by uid 99); 27 Dec 2010 07:24:09 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 27 Dec 2010 07:24:09 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 27 Dec 2010 07:24:09 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 9B6A2238890A; Mon, 27 Dec 2010 07:23:48 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: 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 Date: Mon, 27 Dec 2010 07:23:48 -0000 To: scm@geronimo.apache.org From: djencks@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20101227072348.9B6A2238890A@eris.apache.org> 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",