[jboss-cvs] JBossAS SVN: r86763 - in projects/microcontainer/trunk/kernel/src/main/java/org/jboss: kernel/plugins/annotations and 1 other directory.

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

Author: alesj
Date: 2009-04-03 15:08:31 -0400 (Fri, 03 Apr 2009)
New Revision: 86763

Modified:
   projects/microcontainer/trunk/kernel/src/main/java/org/jboss/beans/metadata/api/annotations/MCAnnotations.java
   projects/microcontainer/trunk/kernel/src/main/java/org/jboss/kernel/plugins/annotations/CommonAnnotationAdapter.java
Log:
[JBMICROCONT-422]; ignore annotations lookup is set explicitly.

Modified: projects/microcontainer/trunk/kernel/src/main/java/org/jboss/beans/metadata/api/annotations/MCAnnotations.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/java/org/jboss/beans/metadata/api/annotations/MCAnnotations.java	2009-04-03 18:56:12 UTC (rev 86762)
+++ projects/microcontainer/trunk/kernel/src/main/java/org/jboss/beans/metadata/api/annotations/MCAnnotations.java	2009-04-03 19:08:31 UTC (rev 86763)
@@ -41,5 +41,12 @@
     *
     * @return the possible annotation classes
     */
-   Class<? extends Annotation>[] value(); 
+   Class<? extends Annotation>[] value();
+
+   /**
+    * Should we ignore IoC annotations lookup.
+    *
+    * @return true if we should ignore IoC annotations scan,
+    */
+   boolean ignore() default false;
 }

Modified: projects/microcontainer/trunk/kernel/src/main/java/org/jboss/kernel/plugins/annotations/CommonAnnotationAdapter.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/java/org/jboss/kernel/plugins/annotations/CommonAnnotationAdapter.java	2009-04-03 18:56:12 UTC (rev 86762)
+++ projects/microcontainer/trunk/kernel/src/main/java/org/jboss/kernel/plugins/annotations/CommonAnnotationAdapter.java	2009-04-03 19:08:31 UTC (rev 86763)
@@ -246,6 +246,14 @@
 
       // limit the annotations
       MCAnnotations annotations = retrieval.getAnnotation(MCAnnotations.class);
+      if (annotations != null && annotations.ignore())
+      {
+         if (trace)
+            log.trace("Ignoring annotations lookup");
+
+         return;
+      }
+
       Collection<Class<? extends Annotation>> annotationClasses = (annotations != null ? Arrays.asList(annotations.value()) : null);
 
       // class