[rhq] Branch 'rhq-on-as7' - modules/enterprise

Jay Shaughnessy jshaughn at fedoraproject.org
Fri Aug 31 20:13:02 UTC 2012


 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/CoreServer.java      |    2 -
 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/CoreServerMBean.java |    3 --
 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/LookupUtil.java      |   13 ++++++----
 3 files changed, 10 insertions(+), 8 deletions(-)

New commits:
commit 05f02675f22b288f86f18834b79b9cb4e564eb1a
Author: Jay Shaughnessy <jshaughn at jshaughn.csb>
Date:   Fri Aug 31 16:10:39 2012 -0400

    The default MBean server for AS7 is the platform MBeanServer, not the
    "JBoss" MBeanServer.
    - Undeprecate CoreServer and CoreServerMBean and provide it with the
      new, proper MBeanServer.
    
    It's possible we may need to tweak the info provided given attributes
    provided by, and relevant to, AS7.

diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/CoreServer.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/CoreServer.java
index 58ed92f..e6f6c8c 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/CoreServer.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/CoreServer.java
@@ -39,7 +39,7 @@ import org.rhq.core.domain.common.ProductInfo;
 import org.rhq.core.util.ObjectNameFactory;
 
 /**
- * @deprecated use new management API to get things like install dir
+ * Get information about RHQ's underlying AS Server.
  */
 public class CoreServer implements CoreServerMBean {
     private static final String PRODUCT_INFO_PROPERTIES_RESOURCE_PATH =
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/CoreServerMBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/CoreServerMBean.java
index b630aa2..fda3abf 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/CoreServerMBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/CoreServerMBean.java
@@ -24,8 +24,7 @@ import java.util.Date;
 import org.rhq.core.domain.common.ProductInfo;
 
 /**
- * An MBean that exposes various core server global attributes (version, uptime, etc.).
- * @deprecated use new management API to get things like install dir
+ * An MBean that exposes various global attributes of the underlying AS Server (version, uptime, etc.).
  */
 public interface CoreServerMBean {
     /**
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/LookupUtil.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/LookupUtil.java
index d690d1d..6c82e91 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/LookupUtil.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/LookupUtil.java
@@ -18,6 +18,8 @@
  */
 package org.rhq.enterprise.server.util;
 
+import java.lang.management.ManagementFactory;
+
 import javax.management.MBeanServer;
 import javax.management.MalformedObjectNameException;
 import javax.naming.InitialContext;
@@ -617,15 +619,16 @@ public final class LookupUtil {
     }
     
     public static CoreServerMBean getCoreServer() {
-        MBeanServer jBossMBeanServer = MBeanServerLocator.locateJBoss();
-        CoreServerMBean jonServer;
+        // The default MBean server for AS7 is the platform MBeanServer
+        MBeanServer defaultMBeanServer = ManagementFactory.getPlatformMBeanServer();
+        CoreServerMBean rhqServer;
         try {
-            jonServer = (CoreServerMBean) MBeanProxyExt.create(CoreServerMBean.class, CoreServerMBean.OBJECT_NAME,
-                jBossMBeanServer);
+            rhqServer = (CoreServerMBean) MBeanProxyExt.create(CoreServerMBean.class, CoreServerMBean.OBJECT_NAME,
+                defaultMBeanServer);
         } catch (MalformedObjectNameException e) {
             throw new RuntimeException(e);
         }
-        return jonServer;
+        return rhqServer;
     }
 
     public static PluginDeploymentScannerMBean getPluginDeploymentScanner() {




More information about the rhq-commits mailing list