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

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

Author: kabir.khan at jboss.com
Date: 2008-09-30 11:23:17 -0400 (Tue, 30 Sep 2008)
New Revision: 78960

Modified:
   projects/aop/trunk/asintegration-core/src/main/org/jboss/aop/asintegration/core/AspectManagerServiceDelegate.java
   projects/aop/trunk/asintegration-jmx/src/main/org/jboss/aop/deployment/AbstractAspectManagerService.java
   projects/aop/trunk/asintegration-jmx/src/main/org/jboss/aop/deployment/AbstractAspectManagerServiceMBean.java
   projects/aop/trunk/asintegration-mc/src/main/org/jboss/aop/deployers/AbstractAspectManager.java
Log:
[JBAOP-652] Add some more operations to AspectManagerservice MBean

Modified: projects/aop/trunk/asintegration-core/src/main/org/jboss/aop/asintegration/core/AspectManagerServiceDelegate.java
===================================================================
--- projects/aop/trunk/asintegration-core/src/main/org/jboss/aop/asintegration/core/AspectManagerServiceDelegate.java	2008-09-30 15:22:29 UTC (rev 78959)
+++ projects/aop/trunk/asintegration-core/src/main/org/jboss/aop/asintegration/core/AspectManagerServiceDelegate.java	2008-09-30 15:23:17 UTC (rev 78960)
@@ -55,6 +55,7 @@
 import org.jboss.aop.instrument.InstrumentorFactory;
 import org.jboss.aop.instrument.TransformerCommon;
 import org.jboss.aop.introduction.InterfaceIntroduction;
+import org.jboss.aop.pointcut.Pointcut;
 import org.jboss.logging.Logger;
 import org.jboss.system.server.ServerConfig;
 import org.w3c.dom.Document;
@@ -694,11 +695,36 @@
       StringBuffer buffer = new StringBuffer("");
       for (String name : factories.keySet())
       {
-         buffer.append(name + "<br>");
+         AdviceBinding binding = factories.get(name);
+         StringBuilder detail = new StringBuilder();
+         if (binding != null)
+         {
+            detail.append(binding.getPointcut());
+            detail.append("{");
+            InterceptorFactory[] ifactories = binding.getInterceptorFactories();
+            for (InterceptorFactory ifactory : ifactories)
+            {
+               detail.append(ifactory.getName());
+            }
+            detail.append("}");
+         }
+         buffer.append("<b>" + name + "</b> - " + detail.toString() + "<br>");
       }
       return buffer.toString();
    }
 
+   public String pointcuts()
+   {
+      Map<String, Pointcut> pointcuts = manager.getPointcuts();
+      StringBuffer buffer = new StringBuffer("");
+      for (String name : pointcuts.keySet())
+      {
+         Pointcut pointcut = pointcuts.get(name);
+         buffer.append("<b>" + name + "</b> - " + pointcut + "<br>");
+      }
+      return buffer.toString();
+   }
+
    public String registeredClassLoaders()
    {
       Map<ClassLoader, ClassPool> loaders = AspectManager.getRegisteredCLs();

Modified: projects/aop/trunk/asintegration-jmx/src/main/org/jboss/aop/deployment/AbstractAspectManagerService.java
===================================================================
--- projects/aop/trunk/asintegration-jmx/src/main/org/jboss/aop/deployment/AbstractAspectManagerService.java	2008-09-30 15:22:29 UTC (rev 78959)
+++ projects/aop/trunk/asintegration-jmx/src/main/org/jboss/aop/deployment/AbstractAspectManagerService.java	2008-09-30 15:23:17 UTC (rev 78960)
@@ -287,6 +287,11 @@
       return delegate.bindings();
    }
 
+   public String pointcuts()
+   {
+      return delegate.pointcuts();
+   }
+
    public String registeredClassLoaders()
    {
       return delegate.registeredClassLoaders();

Modified: projects/aop/trunk/asintegration-jmx/src/main/org/jboss/aop/deployment/AbstractAspectManagerServiceMBean.java
===================================================================
--- projects/aop/trunk/asintegration-jmx/src/main/org/jboss/aop/deployment/AbstractAspectManagerServiceMBean.java	2008-09-30 15:22:29 UTC (rev 78959)
+++ projects/aop/trunk/asintegration-jmx/src/main/org/jboss/aop/deployment/AbstractAspectManagerServiceMBean.java	2008-09-30 15:23:17 UTC (rev 78960)
@@ -92,6 +92,8 @@
     */
   java.lang.String bindings() ;
 
+  java.lang.String pointcuts();
+  
    /**
     * The temporary directory to which dyn class files are written
     */

Modified: projects/aop/trunk/asintegration-mc/src/main/org/jboss/aop/deployers/AbstractAspectManager.java
===================================================================
--- projects/aop/trunk/asintegration-mc/src/main/org/jboss/aop/deployers/AbstractAspectManager.java	2008-09-30 15:22:29 UTC (rev 78959)
+++ projects/aop/trunk/asintegration-mc/src/main/org/jboss/aop/deployers/AbstractAspectManager.java	2008-09-30 15:23:17 UTC (rev 78960)
@@ -56,10 +56,12 @@
    
    protected abstract AspectManagerServiceDelegate createDelegate();
    
-   AspectManagerServiceDelegate getDelegate()
+   public AspectManagerServiceDelegate getDelegate()
    {
       return delegate;
    }
+   
+   
    /**
     * @return
     * @see org.jboss.aop.asintegration.core.AspectManagerServiceDelegate#aspectDefinitions()