[jboss-cvs] JBossAS SVN: r60201 - trunk/aspects/src/main/org/jboss/aop/deployers.

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

Author: kabir.khan at jboss.com
Date: 2007-02-02 12:06:58 -0500 (Fri, 02 Feb 2007)
New Revision: 60201

Modified:
   trunk/aspects/src/main/org/jboss/aop/deployers/AbstractAspectManager.java
Log:
Remove dependency from AspectManager on the JMXKernel.mbeanServer

Modified: trunk/aspects/src/main/org/jboss/aop/deployers/AbstractAspectManager.java
===================================================================
--- trunk/aspects/src/main/org/jboss/aop/deployers/AbstractAspectManager.java	2007-02-02 16:34:58 UTC (rev 60200)
+++ trunk/aspects/src/main/org/jboss/aop/deployers/AbstractAspectManager.java	2007-02-02 17:06:58 UTC (rev 60201)
@@ -51,7 +51,7 @@
 {
    final static String BASE_ASPECTS_XML = "base-aspects.xml";
    AspectManagerService delegate = null;
-   MBeanServer server;
+//   MBeanServer server;
    String bootstrapXml;
    
    public AbstractAspectManager(String bootstrapXml)
@@ -84,7 +84,8 @@
          throw new RuntimeException("Problem starting AspectManager", e);
       }
    }
-   
+
+   /*
    public void setMbeanServer(MBeanServer server)
    {
       this.server = server;
@@ -94,6 +95,7 @@
    {
       return server;
    }
+   */
    
    public AspectManager getAspectManager()
    {
@@ -153,14 +155,6 @@
     */
    public void start() throws Exception
    {
-      try
-      {
-         server.registerMBean(delegate, new ObjectName("jboss.aop:service=AspectManager"));
-      }
-      catch (Exception e)
-      {
-         throw new RuntimeException("Problem registering jboss.aop:service=AspectManager with JMXServer", e);
-      }
       delegate.start();
    }
 
@@ -175,35 +169,35 @@
     */
    public void destroy()
    {
-      if (this.server == null)
-      {
-         try
-         {
-            if (bootstrapXml != null)
-            {
-               InputStream in = new BufferedInputStream(new ByteArrayInputStream(bootstrapXml.getBytes()));
-               try
-               {
-                  Document doc = AspectXmlLoader.loadDocument(new BufferedInputStream(in));
-                  AspectXmlLoader loader = new AspectXmlLoader();
-                  loader.setManager(getAspectManager());
-                  loader.deployXML(doc, null);
-               }
-               finally
-               {
-                  if (in != null)
-                  {
-                     in.close();
-                  }
-               }
-            }
-            server.unregisterMBean(new ObjectName("jboss.aop:service=AspectManager"));
-         }
-         catch (Exception e)
-         {
-            throw new RuntimeException("Problem unregistering jboss.aop:service=AspectManager with JMXServer", e);
-         }
-      }
+//      if (this.server == null)
+//      {
+//         try
+//         {
+//            if (bootstrapXml != null)
+//            {
+//               InputStream in = new BufferedInputStream(new ByteArrayInputStream(bootstrapXml.getBytes()));
+//               try
+//               {
+//                  Document doc = AspectXmlLoader.loadDocument(new BufferedInputStream(in));
+//                  AspectXmlLoader loader = new AspectXmlLoader();
+//                  loader.setManager(getAspectManager());
+//                  loader.deployXML(doc, null);
+//               }
+//               finally
+//               {
+//                  if (in != null)
+//                  {
+//                     in.close();
+//                  }
+//               }
+//            }
+//            server.unregisterMBean(new ObjectName("jboss.aop:service=AspectManager"));
+//         }
+//         catch (Exception e)
+//         {
+//            throw new RuntimeException("Problem unregistering jboss.aop:service=AspectManager with JMXServer", e);
+//         }
+//      }
       delegate.destroy();
    }