[jboss-cvs] JBossAS SVN: r85239 - in trunk: testsuite/src/main/org/jboss/test/profileservice/test and 1 other directory.

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

Author: emuckenhuber
Date: 2009-03-04 11:23:53 -0500 (Wed, 04 Mar 2009)
New Revision: 85239

Modified:
   trunk/system/src/main/org/jboss/system/server/profileservice/ProfileServiceBootstrap.java
   trunk/testsuite/src/main/org/jboss/test/profileservice/test/ServerManagedObjectsTestCase.java
Log:
port r85132, JBAS-5529, update the ServerInfo component to have a name of jboss.system:type=ServerInfo

Modified: trunk/system/src/main/org/jboss/system/server/profileservice/ProfileServiceBootstrap.java
===================================================================
--- trunk/system/src/main/org/jboss/system/server/profileservice/ProfileServiceBootstrap.java	2009-03-04 16:20:31 UTC (rev 85238)
+++ trunk/system/src/main/org/jboss/system/server/profileservice/ProfileServiceBootstrap.java	2009-03-04 16:23:53 UTC (rev 85239)
@@ -57,6 +57,7 @@
 import org.jboss.managed.api.ManagedProperty;
 import org.jboss.managed.api.MutableManagedObject;
 import org.jboss.managed.api.annotation.ManagementComponent;
+import org.jboss.managed.api.annotation.ManagementObject;
 import org.jboss.managed.api.annotation.ViewUse;
 import org.jboss.managed.api.factory.ManagedObjectFactory;
 import org.jboss.managed.plugins.DefaultFieldsImpl;
@@ -409,11 +410,17 @@
                ManagedObject bmdMO = mof.initManagedObject(bmd, compUnit.getMetaData());
                if(bmdMO == null)
                   continue;
+
+               Map<String, Annotation> moAnns = bmdMO.getAnnotations();
+               ManagementObject mo = (ManagementObject) moAnns.get(ManagementObject.class.getName());
                // Reset the name to the bean name
                if(bmdMO instanceof MutableManagedObject)
                {
                   MutableManagedObject mmo = (MutableManagedObject) bmdMO;
-                  mmo.setName(bmd.getName());
+                  if(mo != null && mo.name().length() > 0)
+                     mmo.setName(mo.name());
+                  else
+                     mmo.setName(bmd.getName());
                   mmo.setParent(kdMO);
                   // Add an alias property
                   Set<Object> bmdAliases = bmd.getAliases();
@@ -449,7 +456,6 @@
                log.debug("Created ManagedObject: "+bmdMO+" for bean: "+bmd.getName());
 
                ComponentType type = KnownComponentTypes.MCBean.Any.getType();
-               Map<String, Annotation> moAnns = bmdMO.getAnnotations();
                ManagementComponent mc = (ManagementComponent) moAnns.get(ManagementComponent.class.getName());
                if(mc != null)
                {

Modified: trunk/testsuite/src/main/org/jboss/test/profileservice/test/ServerManagedObjectsTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/profileservice/test/ServerManagedObjectsTestCase.java	2009-03-04 16:20:31 UTC (rev 85238)
+++ trunk/testsuite/src/main/org/jboss/test/profileservice/test/ServerManagedObjectsTestCase.java	2009-03-04 16:23:53 UTC (rev 85239)
@@ -67,14 +67,15 @@
       ManagementView mgtView = getManagementView();
       ComponentType type = KnownComponentTypes.MCBean.Any.getType();
       getLog().debug("MCBeans: "+mgtView.getComponentsForType(type));
-      ManagedComponent mc = mgtView.getComponent("ServerInfo", type);
+      ManagedComponent mc = mgtView.getComponent("jboss.system:type=ServerInfo", type);
       assertNotNull(mc);
       // Serach by alias for the jmx name
       AliasMatcher matcher = new AliasMatcher();
       Set<ManagedComponent> mcs = mgtView.getMatchingComponents("jboss.system:type=ServerInfo", type, matcher);
+      log.debug("jboss.system:type=ServerInfo components: "+mcs);
       assertEquals("Found one MC for alias", 1, mcs.size());
       Map<String, ManagedProperty> props = mc.getProperties();
-      getLog().info(props.keySet());
+      getLog().info(props);
       // , activeThreadGroupCount, hostAddress, OSVersion, javaVMName, totalMemory, activeThreadCount, alias, hostName, javaVMVendor, javaVendor, javaVMVersion, OSName, javaVersion
       // maxMemory
       ManagedProperty maxMemory = props.get("maxMemory");
@@ -84,10 +85,23 @@
       ManagedProperty freeMemory = props.get("freeMemory");
       long freeMemoryValue = getLong(freeMemory);
       assertTrue("freeMemory > 1MB", freeMemoryValue > 1024*1024);
+      // TotalMemory
+      ManagedProperty totalMemory = props.get("totalMemory");
+      long totalMemoryValue = getLong(totalMemory);
+      assertTrue("totalMemory > 1MB", totalMemoryValue > 1024*1024);
       // availableProcessors
       ManagedProperty availableProcessors = props.get("availableProcessors");
       long availableProcessorsValue = getLong(availableProcessors);
       assertTrue("availableProcessors > 0", availableProcessorsValue > 0);
+      // ActiveThreadCount
+      ManagedProperty activeThreadCount = props.get("activeThreadCount");
+      long activeThreadCountValue = getLong(activeThreadCount);
+      assertTrue("activeThreadCount > 0", activeThreadCountValue > 0);
+      // ActiveThreadGroupCount
+      ManagedProperty activeThreadGroupCount = props.get("activeThreadGroupCount");
+      long activeThreadGroupCountValue = getLong(activeThreadGroupCount);
+      assertTrue("activeThreadGroupCount > 0", activeThreadGroupCountValue > 0);
+      
       // The bean state
       ManagedProperty state = props.get("state");
       assertNotNull("state", state);
@@ -119,7 +133,7 @@
 
       // Validate properties, [buildOS, buildID, config, buildNumber, startDate, buildDate, versionName, buildJVM, versionNumber, version]
       Map<String, ManagedProperty> props = mc.getProperties();
-      getLog().info(props.keySet());
+      getLog().info(props);
       ManagedProperty buildOS = mc.getProperty("buildOS");
       assertNotNull(buildOS);
       ManagedProperty buildID = mc.getProperty("buildID");
@@ -144,6 +158,10 @@
       assertNotNull(config);
    }
 
+   /**
+    * 
+    * @throws Exception
+    */
    public void testServerConfig()
       throws Exception
    {