[jboss-cvs] JBossAS SVN: r70267 - in projects/aop/trunk/asintegration/src/main/org/jboss/aop: deployment and 1 other directory.

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

Author: stalep
Date: 2008-02-29 08:54:47 -0500 (Fri, 29 Feb 2008)
New Revision: 70267

Modified:
   projects/aop/trunk/asintegration/src/main/org/jboss/aop/deployers/AbstractAspectManager.java
   projects/aop/trunk/asintegration/src/main/org/jboss/aop/deployment/AspectManagerService.java
   projects/aop/trunk/asintegration/src/main/org/jboss/aop/deployment/AspectManagerServiceMBean.java
Log:
[JBAOP-532] Added support for includedInvisibleAnnotations


Modified: projects/aop/trunk/asintegration/src/main/org/jboss/aop/deployers/AbstractAspectManager.java
===================================================================
--- projects/aop/trunk/asintegration/src/main/org/jboss/aop/deployers/AbstractAspectManager.java	2008-02-29 13:51:59 UTC (rev 70266)
+++ projects/aop/trunk/asintegration/src/main/org/jboss/aop/deployers/AbstractAspectManager.java	2008-02-29 13:54:47 UTC (rev 70267)
@@ -251,6 +251,15 @@
    {
       return delegate.getInclude();
    }
+   
+   /**
+    * @return
+    * @see org.jboss.aop.deployment.AspectManagerService#getIncludedInvisibleAnnotations()
+    */
+   public String getIncludedInvisibleAnnotations()
+   {
+      return delegate.getIncludedInvisibleAnnotations();
+   }
 
    /**
     * @return
@@ -558,6 +567,15 @@
    {
       delegate.setInclude(include);
    }
+   
+   /**
+    * @param include
+    * @see org.jboss.aop.deployment.AspectManagerService#setIncludedInvisibleAnnotations(java.lang.String)
+    */
+   public void setIncludedInvisibleAnnotations(String iia)
+   {
+      delegate.setIncludedInvisibleAnnotations(iia);
+   }
 
    /**
     * @param instrumentor

Modified: projects/aop/trunk/asintegration/src/main/org/jboss/aop/deployment/AspectManagerService.java
===================================================================
--- projects/aop/trunk/asintegration/src/main/org/jboss/aop/deployment/AspectManagerService.java	2008-02-29 13:51:59 UTC (rev 70266)
+++ projects/aop/trunk/asintegration/src/main/org/jboss/aop/deployment/AspectManagerService.java	2008-02-29 13:54:47 UTC (rev 70267)
@@ -26,6 +26,7 @@
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.Iterator;
+import java.util.List;
 import java.util.Map;
 import java.util.StringTokenizer;
 
@@ -90,6 +91,7 @@
    protected String exclude;
    protected String include;
    protected String ignore;
+   protected String includedInvisibleAnnotations;
    private String baseXml = "base-aop.xml";
    //When running with JBoss 5 registration with MBeanServer happens after the service has been started
    boolean registerHappensAfterStart;
@@ -348,6 +350,22 @@
       }
       AspectManager.instance().setIgnore(list);
    }
+   
+   public String getIncludedInvisibleAnnotations()
+   {
+      return includedInvisibleAnnotations;
+   }
+   
+   public void setIncludedInvisibleAnnotations(String ia)
+   {
+      List<String> iiaList = new ArrayList<String>();
+      if(ia != null)
+      {
+         for(String inc : ia.split(","))
+           iiaList.add(inc.trim());
+      }
+      AspectManager.instance().setIncludedInvisibleAnnotations(iiaList);
+   }
 
 
    /**

Modified: projects/aop/trunk/asintegration/src/main/org/jboss/aop/deployment/AspectManagerServiceMBean.java
===================================================================
--- projects/aop/trunk/asintegration/src/main/org/jboss/aop/deployment/AspectManagerServiceMBean.java	2008-02-29 13:51:59 UTC (rev 70266)
+++ projects/aop/trunk/asintegration/src/main/org/jboss/aop/deployment/AspectManagerServiceMBean.java	2008-02-29 13:54:47 UTC (rev 70267)
@@ -110,6 +110,10 @@
    String getInclude();
 
    void setInclude(String include);
+   
+   String getIncludedInvisibleAnnotations();
+   
+   void setIncludedInvisibleAnnotations(String ia);
 
    boolean getPrune();