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

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

Author: kabir.khan at jboss.com
Date: 2010-01-05 14:18:09 -0500 (Tue, 05 Jan 2010)
New Revision: 99044

Modified:
   projects/kernel/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/LifecycleBinding.java
   projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/annotations/LifecycleAnnotationPlugin.java
Log:
Tidy up logging

Modified: projects/kernel/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/LifecycleBinding.java
===================================================================
--- projects/kernel/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/LifecycleBinding.java	2010-01-05 19:10:07 UTC (rev 99043)
+++ projects/kernel/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/LifecycleBinding.java	2010-01-05 19:18:09 UTC (rev 99044)
@@ -23,6 +23,7 @@
 
 import java.lang.annotation.Annotation;
 
+import org.apache.log4j.Logger;
 import org.jboss.annotation.factory.AnnotationCreator;
 import org.jboss.aop.AspectManager;
 import org.jboss.aop.microcontainer.integration.LifecycleAspectDependencyBuilderListItem;
@@ -42,6 +43,7 @@
  */
 public class LifecycleBinding
 {
+   private final static Logger log = Logger.getLogger(LifecycleBinding.class);
    protected String name;
    protected AspectManager manager;   
    private String classes;
@@ -98,8 +100,8 @@
          throw new IllegalArgumentException("The 'expr' attribute has been deprecated. Only the name of an annotation in the 'classes' attribute work now.");
       if (classes == null)
          throw new IllegalArgumentException("Null 'classes' attribute.");
-      if (manager == null)
-         throw new IllegalArgumentException("Null manager");
+      if (manager != null)
+         log.warn("The use of manager has been deprecated and is unnecessary");
       if (callbackBean == null)
          throw new IllegalArgumentException("Null callback bean");
       if (state == null)

Modified: projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/annotations/LifecycleAnnotationPlugin.java
===================================================================
--- projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/annotations/LifecycleAnnotationPlugin.java	2010-01-05 19:10:07 UTC (rev 99043)
+++ projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/annotations/LifecycleAnnotationPlugin.java	2010-01-05 19:18:09 UTC (rev 99044)
@@ -39,8 +39,6 @@
  */
 public class LifecycleAnnotationPlugin<C extends Annotation> extends ClassAnnotationPlugin<C>
 {
-   Logger log = Logger.getLogger(LifecycleAnnotationPlugin.class);
-   
    private final DependencyBuilderListItem item;
    
    public LifecycleAnnotationPlugin(Class<C> annotation, DependencyBuilderListItem item)