[jboss-cvs] JBossAS SVN: r104293 - projects/profileservice/trunk/plugins/src/main/java/org/jboss/profileservice/plugins/management/util.

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

Author: emuckenhuber
Date: 2010-04-28 11:13:48 -0400 (Wed, 28 Apr 2010)
New Revision: 104293

Modified:
   projects/profileservice/trunk/plugins/src/main/java/org/jboss/profileservice/plugins/management/util/ManagedObjectProcessor.java
Log:
process ManagedComponents before merging runtime ManagedObjects.

Modified: projects/profileservice/trunk/plugins/src/main/java/org/jboss/profileservice/plugins/management/util/ManagedObjectProcessor.java
===================================================================
--- projects/profileservice/trunk/plugins/src/main/java/org/jboss/profileservice/plugins/management/util/ManagedObjectProcessor.java	2010-04-28 12:52:33 UTC (rev 104292)
+++ projects/profileservice/trunk/plugins/src/main/java/org/jboss/profileservice/plugins/management/util/ManagedObjectProcessor.java	2010-04-28 15:13:48 UTC (rev 104293)
@@ -110,6 +110,30 @@
       {
          log.trace("ID for ManagedObject: "+key+", attachmentName: "+mo.getAttachmentName());
       }
+      
+      // Create ManagedComponents for ManagedObjects annotated with ManagementComponent
+      ManagementComponent mc = getAnnotation(mo, ManagementComponent.class);
+      if (mc != null)
+      {
+         ComponentType type = new ComponentType(mc.type(), mc.subtype());
+         MutableManagedComponent comp = new ManagedComponentImpl(type, md, mo);
+         if(comp.getComponentName() != null)
+         {
+            // create proxy
+            comp = createManagedComponentProxy(comp.getComponentName(), comp);
+         }
+         if(trace)
+         {
+            log.trace("Processing ManagementComponent("+mo.getName()+"): "+comp);
+         }
+         if(md != null && md.getComponent(mo.getName()) == null)
+         {
+            md.addComponent(mo.getName(), comp);
+         }
+         context.addManagedComponent(comp);
+         updateRunState(null, comp);
+      }
+      
       processManagedObject(key, mo, md, context);
    }
 
@@ -138,29 +162,6 @@
       // Check for unresolved refs
       checkForReferences(key, mo);
 
-      // Create ManagedComponents for ManagedObjects annotated with ManagementComponent
-      ManagementComponent mc = getAnnotation(mo, ManagementComponent.class);
-      if (mc != null)
-      {
-         ComponentType type = new ComponentType(mc.type(), mc.subtype());
-         MutableManagedComponent comp = new ManagedComponentImpl(type, md, mo);
-         if(comp.getComponentName() != null)
-         {
-            // create proxy
-            comp = createManagedComponentProxy(comp.getComponentName(), comp);
-         }
-         if(trace)
-         {
-            log.trace("Processing ManagementComponent("+mo.getName()+"): "+comp);
-         }
-         if(md != null && md.getComponent(mo.getName()) == null)
-         {
-            md.addComponent(mo.getName(), comp);
-         }
-         context.addManagedComponent(comp);
-         updateRunState(null, comp);
-      }
-
       // Scan for @ManagementObjectRef
       // Process nested ManagedObjects
       for(ManagedProperty prop : mo.getProperties().values())