[jboss-cvs] JBossAS SVN: r80120 - projects/jboss-man/trunk/managed/src/main/java/org/jboss/managed/api/annotation.

[jboss-cvs-commits at lists.jboss.org]

Author: scott.stark at jboss.org
Date: 2008-10-27 16:33:50 -0400 (Mon, 27 Oct 2008)
New Revision: 80120

Modified:
   projects/jboss-man/trunk/managed/src/main/java/org/jboss/managed/api/annotation/AnnotationDefaults.java
   projects/jboss-man/trunk/managed/src/main/java/org/jboss/managed/api/annotation/ManagementComponent.java
Log:
JBMAN-30, restrict ManagementComponent to member type in complex annotation type declaration.

Modified: projects/jboss-man/trunk/managed/src/main/java/org/jboss/managed/api/annotation/AnnotationDefaults.java
===================================================================
--- projects/jboss-man/trunk/managed/src/main/java/org/jboss/managed/api/annotation/AnnotationDefaults.java	2008-10-27 18:39:29 UTC (rev 80119)
+++ projects/jboss-man/trunk/managed/src/main/java/org/jboss/managed/api/annotation/AnnotationDefaults.java	2008-10-27 20:33:50 UTC (rev 80120)
@@ -30,7 +30,7 @@
  */
 public class AnnotationDefaults
 {
-   @ManagementComponent(type="", subtype="")
+   @ManagementObject(name="AnnotationDefaults", componentType=@ManagementComponent(type="", subtype=""))
    private static class COMP_TYPE_CLASS {}
    /** The ManagementComponent uninitialized default */
    public static final ManagementComponent COMP_TYPE = defaultCompType();
@@ -43,7 +43,8 @@
     */
    public static synchronized ManagementComponent defaultCompType()
    {
-      return COMP_TYPE_CLASS.class.getAnnotation(ManagementComponent.class);
+      ManagementObject mo = COMP_TYPE_CLASS.class.getAnnotation(ManagementObject.class);
+      return mo.componentType();
    }
 
 }

Modified: projects/jboss-man/trunk/managed/src/main/java/org/jboss/managed/api/annotation/ManagementComponent.java
===================================================================
--- projects/jboss-man/trunk/managed/src/main/java/org/jboss/managed/api/annotation/ManagementComponent.java	2008-10-27 18:39:29 UTC (rev 80119)
+++ projects/jboss-man/trunk/managed/src/main/java/org/jboss/managed/api/annotation/ManagementComponent.java	2008-10-27 20:33:50 UTC (rev 80120)
@@ -21,7 +21,6 @@
  */
 package org.jboss.managed.api.annotation;
 
-import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
@@ -33,7 +32,7 @@
  * @author Scott.Stark at jboss.org
  * @version $Revision$
  */
- at Target({ElementType.TYPE})
+ at Target({})
 @Retention(RetentionPolicy.RUNTIME)
 public @interface ManagementComponent
 {