Return-Path: X-Original-To: apmail-geronimo-scm-archive@www.apache.org Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id D395D6348 for ; Thu, 16 Jun 2011 09:08:20 +0000 (UTC) Received: (qmail 85938 invoked by uid 500); 16 Jun 2011 09:08:20 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 85899 invoked by uid 500); 16 Jun 2011 09:08:20 -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 85892 invoked by uid 99); 16 Jun 2011 09:08:20 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 16 Jun 2011 09:08:20 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.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; Thu, 16 Jun 2011 09:08:18 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id A663D23889DA; Thu, 16 Jun 2011 09:07:57 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1136333 - /geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/ResourceRefBuilder.java Date: Thu, 16 Jun 2011 09:07:57 -0000 To: scm@geronimo.apache.org From: genspring@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110616090757.A663D23889DA@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: genspring Date: Thu Jun 16 09:07:57 2011 New Revision: 1136333 URL: http://svn.apache.org/viewvc?rev=1136333&view=rev Log: ManagedBean injection should consider the field type. Modified: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/ResourceRefBuilder.java Modified: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/ResourceRefBuilder.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/ResourceRefBuilder.java?rev=1136333&r1=1136332&r2=1136333&view=diff ============================================================================== --- geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/ResourceRefBuilder.java (original) +++ geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/ResourceRefBuilder.java Thu Jun 16 09:07:57 2011 @@ -212,6 +212,9 @@ public class ResourceRefBuilder extends } else if (iface.isAnnotationPresent(ManagedBean.class)) { ManagedBean managed = iface.getAnnotation(ManagedBean.class); String beanName = managed.value().length() == 0 ? iface.getSimpleName() : managed.value(); + if (iface != null) { + beanName = beanName + "!" + iface.getName(); + } return new JndiReference("java:module/" + beanName); } else { //determine jsr-77 type from interface