[rhq] Branch 'rhq-on-as7' - modules/enterprise
mazz
mazz at fedoraproject.org
Fri Aug 17 01:06:56 UTC 2012
modules/enterprise/server/jar/src/main/java/org/jboss/system/ServiceMBean.java | 7 +
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/CoreServer.java | 10 +-
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/CoreServerMBean.java | 9 --
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/LookupUtil.java | 10 ++
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/core/CoreServerServiceImplTest.java | 40 ----------
5 files changed, 26 insertions(+), 50 deletions(-)
New commits:
commit 13f7a80fdf5f4c2a5639b45998ccaffdad6e9e5c
Author: John Mazzitelli <mazz at redhat.com>
Date: Thu Aug 16 21:06:53 2012 -0400
get MBean services to deploy - add a blank ServiceMBean to workaround JBossAS JIRA AS7-887
diff --git a/modules/enterprise/server/jar/src/main/java/org/jboss/system/ServiceMBean.java b/modules/enterprise/server/jar/src/main/java/org/jboss/system/ServiceMBean.java
new file mode 100644
index 0000000..0130cbf
--- /dev/null
+++ b/modules/enterprise/server/jar/src/main/java/org/jboss/system/ServiceMBean.java
@@ -0,0 +1,7 @@
+package org.jboss.system;
+
+// see https://issues.jboss.org/browse/AS7-887
+// we can delete this once that is fixed
+public interface ServiceMBean {
+
+}
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 4da4f55..58ed92f 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
@@ -33,13 +33,15 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.jboss.mx.util.MBeanServerLocator;
-import org.jboss.system.ServiceMBeanSupport;
import org.jboss.system.server.ServerConfig;
import org.rhq.core.domain.common.ProductInfo;
import org.rhq.core.util.ObjectNameFactory;
-public class CoreServer extends ServiceMBeanSupport implements CoreServerMBean {
+/**
+ * @deprecated use new management API to get things like install dir
+ */
+public class CoreServer implements CoreServerMBean {
private static final String PRODUCT_INFO_PROPERTIES_RESOURCE_PATH =
"org/rhq/enterprise/server/core/ProductInfo.properties";
@@ -69,8 +71,7 @@ public class CoreServer extends ServiceMBeanSupport implements CoreServerMBean {
private Date bootTime;
- @Override
- protected void createService() throws Exception {
+ protected void start() throws Exception {
this.buildProps = loadBuildProperties();
this.bootTime = new Date();
@@ -81,7 +82,6 @@ public class CoreServer extends ServiceMBeanSupport implements CoreServerMBean {
log.info("Version=[" + version + "], Build Number=[" + buildNumber + "], Build Date=[" + buildDate + "]");
}
- @Override
public String getName() {
return "RHQ Server";
}
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 33c105d..b630aa2 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
@@ -21,20 +21,17 @@ package org.rhq.enterprise.server.core;
import java.io.File;
import java.util.Date;
-import javax.management.ObjectName;
-
-import org.jboss.mx.util.ObjectNameFactory;
-import org.jboss.system.ServiceMBean;
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
*/
-public interface CoreServerMBean extends ServiceMBean {
+public interface CoreServerMBean {
/**
* The name of this MBean when deployed.
*/
- ObjectName OBJECT_NAME = ObjectNameFactory.create("rhq:service=CoreServer");
+ String OBJECT_NAME = "rhq:service=CoreServer";
/**
* Returns the version of the core RHQ server.
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 e49498c..304ca93 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
@@ -19,6 +19,7 @@
package org.rhq.enterprise.server.util;
import javax.management.MBeanServer;
+import javax.management.MalformedObjectNameException;
import javax.naming.InitialContext;
import javax.naming.NamingException;
import javax.persistence.EntityManager;
@@ -613,8 +614,13 @@ public final class LookupUtil {
public static CoreServerMBean getCoreServer() {
MBeanServer jBossMBeanServer = MBeanServerLocator.locateJBoss();
- CoreServerMBean jonServer = (CoreServerMBean) MBeanProxyExt.create(CoreServerMBean.class,
- CoreServerMBean.OBJECT_NAME, jBossMBeanServer);
+ CoreServerMBean jonServer;
+ try {
+ jonServer = (CoreServerMBean) MBeanProxyExt.create(CoreServerMBean.class, CoreServerMBean.OBJECT_NAME,
+ jBossMBeanServer);
+ } catch (MalformedObjectNameException e) {
+ throw new RuntimeException(e);
+ }
return jonServer;
}
diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/core/CoreServerServiceImplTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/core/CoreServerServiceImplTest.java
index b331d36..5992ea1 100644
--- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/core/CoreServerServiceImplTest.java
+++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/core/CoreServerServiceImplTest.java
@@ -27,6 +27,7 @@ import java.util.List;
import java.util.Properties;
import javax.management.MBeanServer;
+import javax.management.ObjectName;
import javax.persistence.Query;
import org.testng.annotations.AfterGroups;
@@ -131,7 +132,7 @@ public class CoreServerServiceImplTest extends AbstractEJB3Test {
// mock up our core server MBean that provides information about where the jboss home dir is
MBeanServer mbs = getJBossMBeanServer();
DummyCoreServer mbean = new DummyCoreServer();
- mbs.registerMBean(mbean, CoreServerMBean.OBJECT_NAME);
+ mbs.registerMBean(mbean, new ObjectName(CoreServerMBean.OBJECT_NAME));
// in order to register, we need to mock out the agent version file used by the server
// to determine the agent version it supports.
@@ -173,7 +174,7 @@ public class CoreServerServiceImplTest extends AbstractEJB3Test {
// shutdown our mock mbean server
MBeanServer mbs = getJBossMBeanServer();
- mbs.unregisterMBean(CoreServerMBean.OBJECT_NAME);
+ mbs.unregisterMBean(new ObjectName(CoreServerMBean.OBJECT_NAME));
unprepareForTestAgents();
@@ -461,41 +462,6 @@ public class CoreServerServiceImplTest extends AbstractEJB3Test {
class DummyCoreServer implements DummyCoreServerMBean {
@Override
- public String getName() {
- return "CoreServer";
- }
-
- @Override
- public int getState() {
- return 0;
- }
-
- @Override
- public String getStateString() {
- return "";
- }
-
- @Override
- public void jbossInternalLifecycle(String arg0) throws Exception {
- }
-
- @Override
- public void create() throws Exception {
- }
-
- @Override
- public void destroy() {
- }
-
- @Override
- public void start() throws Exception {
- }
-
- @Override
- public void stop() {
- }
-
- @Override
public String getVersion() {
return null;
}
More information about the rhq-commits
mailing list