Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 76827 invoked from network); 8 Jun 2010 16:15:37 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 8 Jun 2010 16:15:37 -0000 Received: (qmail 71598 invoked by uid 500); 8 Jun 2010 16:15:37 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 71480 invoked by uid 500); 8 Jun 2010 16:15:37 -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 71471 invoked by uid 99); 8 Jun 2010 16:15:37 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 08 Jun 2010 16:15:37 +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; Tue, 08 Jun 2010 16:15:32 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id B543A2388994; Tue, 8 Jun 2010 16:15:11 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r952716 - in /geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/gbean: GBeanInfoBuilder.java annotation/AnnotationGBeanInfoBuilder.java annotation/ParamReference.java annotation/Reference.java Date: Tue, 08 Jun 2010 16:15:11 -0000 To: scm@geronimo.apache.org From: djencks@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100608161511.B543A2388994@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: djencks Date: Tue Jun 8 16:15:11 2010 New Revision: 952716 URL: http://svn.apache.org/viewvc?rev=952716&view=rev Log: GERONIMO-5374 make defaults for @ParameterReference and @Reference work the same as GBeanInfoBuilder Modified: geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/gbean/GBeanInfoBuilder.java geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/gbean/annotation/AnnotationGBeanInfoBuilder.java geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/gbean/annotation/ParamReference.java geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/gbean/annotation/Reference.java Modified: geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/gbean/GBeanInfoBuilder.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/gbean/GBeanInfoBuilder.java?rev=952716&r1=952715&r2=952716&view=diff ============================================================================== --- geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/gbean/GBeanInfoBuilder.java (original) +++ geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/gbean/GBeanInfoBuilder.java Tue Jun 8 16:15:11 2010 @@ -473,8 +473,8 @@ public class GBeanInfoBuilder { // build the reference infos now that we know the constructor types Set referenceInfos = new HashSet(); - for (Iterator iterator = references.entrySet().iterator(); iterator.hasNext();) { - Map.Entry entry = (Map.Entry) iterator.next(); + for (Object o : references.entrySet()) { + Map.Entry entry = (Map.Entry) o; String referenceName = (String) entry.getKey(); RefInfo refInfo = (RefInfo) entry.getValue(); String referenceType = refInfo.getJavaType(); Modified: geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/gbean/annotation/AnnotationGBeanInfoBuilder.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/gbean/annotation/AnnotationGBeanInfoBuilder.java?rev=952716&r1=952715&r2=952716&view=diff ============================================================================== --- geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/gbean/annotation/AnnotationGBeanInfoBuilder.java (original) +++ geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/gbean/annotation/AnnotationGBeanInfoBuilder.java Tue Jun 8 16:15:11 2010 @@ -144,6 +144,9 @@ public class AnnotationGBeanInfoBuilder String name = reference.name(); Class referenceType = getGenericActualType(genericTypes[index], parameterType); String namingType = reference.namingType(); + if (namingType.equals("")) { + namingType = null; + } infoBuilder.addReference(name, referenceType, namingType); cstrNames[index] = name; annotationFound = true; @@ -199,11 +202,15 @@ public class AnnotationGBeanInfoBuilder Class type = method.getParameterTypes()[0]; Class referenceType = getGenericActualType(method.getGenericParameterTypes()[0], type); String name = getName(method); - GReferenceInfo referenceInfo = new GReferenceInfo(name, + String namingType = reference.namingType(); + if (namingType.equals("")) { + namingType = null; + } + GReferenceInfo referenceInfo = new GReferenceInfo(name, referenceType.getName(), type.getName(), method.getName(), - reference.namingType()); + namingType); infoBuilder.addReference(referenceInfo); } } Modified: geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/gbean/annotation/ParamReference.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/gbean/annotation/ParamReference.java?rev=952716&r1=952715&r2=952716&view=diff ============================================================================== --- geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/gbean/annotation/ParamReference.java (original) +++ geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/gbean/annotation/ParamReference.java Tue Jun 8 16:15:11 2010 @@ -36,5 +36,5 @@ import java.lang.annotation.Target; public @interface ParamReference { String name(); - String namingType() default "GBean"; + String namingType() default ""; } Modified: geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/gbean/annotation/Reference.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/gbean/annotation/Reference.java?rev=952716&r1=952715&r2=952716&view=diff ============================================================================== --- geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/gbean/annotation/Reference.java (original) +++ geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/gbean/annotation/Reference.java Tue Jun 8 16:15:11 2010 @@ -34,5 +34,5 @@ import java.lang.annotation.Target; @Retention(value = RUNTIME) @Target(value = {METHOD}) public @interface Reference { - String namingType() default "GBeanInfo"; + String namingType() default ""; }