[jboss-cvs] JBossAS SVN: r68452 - trunk/profileservice/src/main/org/jboss/profileservice/management.

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

Author: alesj
Date: 2007-12-20 08:01:32 -0500 (Thu, 20 Dec 2007)
New Revision: 68452

Modified:
   trunk/profileservice/src/main/org/jboss/profileservice/management/ManagementViewImpl.java
Log:
Recursive managed deployment check.

Modified: trunk/profileservice/src/main/org/jboss/profileservice/management/ManagementViewImpl.java
===================================================================
--- trunk/profileservice/src/main/org/jboss/profileservice/management/ManagementViewImpl.java	2007-12-20 12:42:49 UTC (rev 68451)
+++ trunk/profileservice/src/main/org/jboss/profileservice/management/ManagementViewImpl.java	2007-12-20 13:01:32 UTC (rev 68452)
@@ -166,41 +166,52 @@
          try
          {
             ManagedDeployment md = mainDeployer.getManagedDeployment(name);
-            log.debug(name+" ManagedDeployment: " + md);
-            Map<String, ManagedObject> mos = md.getManagedObjects();
-            log.debug(name+" ManagedObjects: " + mos);
-            for(ManagedObject mo : mos.values())
-            {
-               processManagedObject(mo, md);
-            }
-            managedDeployments.put(name, md);
-            List<ManagedDeployment> mdChildren = md.getChildren();
-            if(mdChildren != null)
-            {
-               for(ManagedDeployment child : mdChildren)
-               {
-                  log.debug("Child "+child.getSimpleName()+" ManagedDeployment: " + child);
-                  Map<String, ManagedObject> childMOs = child.getManagedObjects();
-                  log.debug("Child "+child.getSimpleName()+" ManagedObjects: " + childMOs);                  
-                  for(ManagedObject mo : childMOs.values())
-                  {
-                     processManagedObject(mo, child);
-                  }
-                  managedDeployments.put(child.getName(), child);
-               }
-            }
+            processManagedDeployment(md, 0, log.isTraceEnabled());
          }
          catch(Exception e)
          {
-            log.warn("Failed to create ManagedDeployment for: "+name, e);
+            log.warn("Failed to create ManagedDeployment for: " + name, e);
          }
       }
    }
+
    /**
-    * 
-    * @param mo
-    * @param md - 
+    * Process managed deployment.
+    *
+    * @param md the managed deployment
+    * @param level depth level
+    * @param trace is trace enabled
+    * @throws Exception for any error
     */
+   protected void processManagedDeployment(ManagedDeployment md, int level, boolean trace) throws Exception
+   {
+      String name = md.getName();
+      if (trace)
+         log.trace(name + " ManagedDeployment_" + level + ": " + md);
+      Map<String, ManagedObject> mos = md.getManagedObjects();
+      if (trace)
+         log.trace(name + " ManagedObjects_ " + level + ": " + mos);
+      for(ManagedObject mo : mos.values())
+      {
+         processManagedObject(mo, md);
+      }
+      managedDeployments.put(name, md);
+      List<ManagedDeployment> mdChildren = md.getChildren();
+      if(mdChildren != null && mdChildren.isEmpty() == false)
+      {
+         for(ManagedDeployment mdChild : mdChildren)
+         {
+            processManagedDeployment(mdChild, level + 1, trace);
+         }
+      }
+   }
+
+   /**
+    * Process managed object.
+    *
+    * @param mo the managed object
+    * @param md the managed deployment
+    */
    protected void processManagedObject(ManagedObject mo, ManagedDeployment md)
       throws Exception
    {