[Jboss-cvs] JBossAS SVN: r55363 - in branches/MC_VDF_WORK/system-jmx: . src/main/org/jboss/system src/tests/org/jboss/test/system/controller
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Aug 7 09:16:18 EDT 2006
Author: adrian at jboss.org
Date: 2006-08-07 09:16:10 -0400 (Mon, 07 Aug 2006)
New Revision: 55363
Modified:
branches/MC_VDF_WORK/system-jmx/.classpath
branches/MC_VDF_WORK/system-jmx/build-test.xml
branches/MC_VDF_WORK/system-jmx/src/main/org/jboss/system/ServiceCreator.java
branches/MC_VDF_WORK/system-jmx/src/tests/org/jboss/test/system/controller/ControllerTestDelegate.java
branches/MC_VDF_WORK/system-jmx/src/tests/org/jboss/test/system/controller/NewControllerTestDelegate.java
Log:
[JBAS-1841] - Basic test of injecting jmx objects into pojos.
Modified: branches/MC_VDF_WORK/system-jmx/.classpath
===================================================================
--- branches/MC_VDF_WORK/system-jmx/.classpath 2006-08-07 01:33:51 UTC (rev 55362)
+++ branches/MC_VDF_WORK/system-jmx/.classpath 2006-08-07 13:16:10 UTC (rev 55363)
@@ -1,20 +1,24 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src/main"/>
- <classpathentry output="output/eclipse-test-classes" kind="src" path="src/tests"/>
- <classpathentry kind="lib" path="src/resources/tests"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry combineaccessrules="false" kind="src" path="/j2se"/>
- <classpathentry combineaccessrules="false" kind="src" path="/mbeans"/>
- <classpathentry kind="lib" path="/thirdparty/dom4j/lib/dom4j.jar"/>
- <classpathentry combineaccessrules="false" kind="src" path="/system"/>
- <classpathentry kind="lib" path="/thirdparty/jboss/common/lib/jboss-common.jar"/>
- <classpathentry sourcepath="C:/svn/JBossMC/workspace/container/src/main" kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-container.jar"/>
- <classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-dependency.jar"/>
- <classpathentry sourcepath="C:/svn/JBossMC/workspace/kernel/src/main" kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-microcontainer.jar"/>
- <classpathentry kind="lib" path="/thirdparty/jboss/jbossxb/lib/jboss-xml-binding.jar"/>
- <classpathentry kind="lib" path="/thirdparty/oswego-concurrent/lib/concurrent.jar"/>
- <classpathentry kind="lib" path="/thirdparty/junit/lib/junit.jar"/>
- <classpathentry kind="lib" path="/thirdparty/jboss/test/lib/jboss-test.jar"/>
- <classpathentry kind="output" path="output/eclipse-classes"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src/main"/>
+ <classpathentry output="output/eclipse-test-classes" kind="src" path="src/tests"/>
+ <classpathentry kind="lib" path="src/resources/tests"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/j2se"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/mbeans"/>
+ <classpathentry kind="lib" path="/thirdparty/dom4j/lib/dom4j.jar"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/system"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/common/lib/jboss-common.jar"/>
+ <classpathentry sourcepath="C:/svn/JBossMC/workspace/container/src/main" kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-container.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-dependency.jar"/>
+ <classpathentry sourcepath="C:/svn/JBossMC/workspace/kernel/src/main" kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-microcontainer.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/jbossxb/lib/jboss-xml-binding.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/oswego-concurrent/lib/concurrent.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/junit/lib/junit.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/test/lib/jboss-test.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/apache-xerces/lib/resolver.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/apache-xerces/lib/xercesImpl.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/apache-xerces/lib/xml-apis.jar"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/jmx"/>
+ <classpathentry kind="output" path="output/eclipse-classes"/>
+</classpath>
Modified: branches/MC_VDF_WORK/system-jmx/build-test.xml
===================================================================
--- branches/MC_VDF_WORK/system-jmx/build-test.xml 2006-08-07 01:33:51 UTC (rev 55362)
+++ branches/MC_VDF_WORK/system-jmx/build-test.xml 2006-08-07 13:16:10 UTC (rev 55363)
@@ -70,6 +70,8 @@
<path refid="jboss.jbossxb.classpath" />
<path refid="jboss.common.classpath" />
<path refid="jboss.profiler.jvmti.classpath" />
+ <path refid="apache.xerces.classpath" />
+ <path refid="dom4j.dom4j.classpath" />
</path>
<!-- ======= -->
@@ -92,6 +94,7 @@
<path refid="jboss.microcontainer.classpath"/>
<path refid="jboss.j2se.classpath" />
<path refid="jboss.mbeans.classpath" />
+ <path refid="jboss.jmx.classpath" />
<path refid="jboss.system.classpath" />
<path refid="jboss.test.classpath" />
<pathelement location="output/classes" />
Modified: branches/MC_VDF_WORK/system-jmx/src/main/org/jboss/system/ServiceCreator.java
===================================================================
--- branches/MC_VDF_WORK/system-jmx/src/main/org/jboss/system/ServiceCreator.java 2006-08-07 01:33:51 UTC (rev 55362)
+++ branches/MC_VDF_WORK/system-jmx/src/main/org/jboss/system/ServiceCreator.java 2006-08-07 13:16:10 UTC (rev 55363)
@@ -31,8 +31,11 @@
import org.jboss.deployment.DeploymentException;
import org.jboss.logging.Logger;
+import org.jboss.mx.server.ServerConstants;
+import org.jboss.mx.server.registry.MBeanEntry;
import org.jboss.mx.service.ServiceConstants;
import org.jboss.mx.util.JMXExceptionDecoder;
+import org.jboss.mx.util.ObjectNameFactory;
import org.jboss.system.metadata.ServiceConstructorMetaData;
import org.jboss.system.metadata.ServiceMetaData;
import org.jboss.system.metadata.ServiceMetaDataParser;
@@ -54,6 +57,9 @@
/** Instance logger. */
private static final Logger log = Logger.getLogger(ServiceCreator.class);
+ /** The MBean Registry Object Name */
+ private static ObjectName MBEAN_REGISTRY = ObjectNameFactory.create(ServerConstants.MBEAN_REGISTRY);
+
/** The server */
private MBeanServer server;
@@ -189,9 +195,10 @@
loaderName,
constructor.getParameters(loader),
constructor.getSignature());
-
- log.debug("About to register MBean : " + objectName);
- return new ServiceInstance(instance, null); // FIXME need to get the resource
+
+ MBeanEntry entry = (MBeanEntry) server.invoke(MBEAN_REGISTRY, "get", new Object[] { objectName }, new String[] { ObjectName.class.getName() });
+ Object resource = entry.getResourceInstance();
+ return new ServiceInstance(instance, resource);
}
/**
Modified: branches/MC_VDF_WORK/system-jmx/src/tests/org/jboss/test/system/controller/ControllerTestDelegate.java
===================================================================
--- branches/MC_VDF_WORK/system-jmx/src/tests/org/jboss/test/system/controller/ControllerTestDelegate.java 2006-08-07 01:33:51 UTC (rev 55362)
+++ branches/MC_VDF_WORK/system-jmx/src/tests/org/jboss/test/system/controller/ControllerTestDelegate.java 2006-08-07 13:16:10 UTC (rev 55363)
@@ -35,6 +35,7 @@
import junit.framework.AssertionFailedError;
import org.jboss.deployment.IncompleteDeploymentException;
+import org.jboss.mx.server.ServerConstants;
import org.jboss.system.ServiceContext;
import org.jboss.system.ServiceControllerMBean;
import org.jboss.test.AbstractSystemTest;
@@ -74,8 +75,8 @@
{
super.setUp();
- //System.setProperty(ServerConstants.MBEAN_SERVER_BUILDER_CLASS_PROPERTY, ServerConstants.DEFAULT_MBEAN_SERVER_BUILDER_CLASS);
- server = MBeanServerFactory.createMBeanServer("jboss");
+ System.setProperty(ServerConstants.MBEAN_SERVER_BUILDER_CLASS_PROPERTY, ServerConstants.DEFAULT_MBEAN_SERVER_BUILDER_CLASS);
+ server = MBeanServerFactory.newMBeanServer("jboss");
serviceController = createServiceController();
server.registerMBean(serviceController, ServiceControllerMBean.OBJECT_NAME);
@@ -88,7 +89,7 @@
validate();
}
- public abstract ServiceControllerMBean createServiceController();
+ public abstract ServiceControllerMBean createServiceController() throws Exception;
public void tearDown() throws Exception
{
Modified: branches/MC_VDF_WORK/system-jmx/src/tests/org/jboss/test/system/controller/NewControllerTestDelegate.java
===================================================================
--- branches/MC_VDF_WORK/system-jmx/src/tests/org/jboss/test/system/controller/NewControllerTestDelegate.java 2006-08-07 01:33:51 UTC (rev 55362)
+++ branches/MC_VDF_WORK/system-jmx/src/tests/org/jboss/test/system/controller/NewControllerTestDelegate.java 2006-08-07 13:16:10 UTC (rev 55363)
@@ -42,7 +42,7 @@
super(clazz);
}
- public ServiceControllerMBean createServiceController()
+ public ServiceControllerMBean createServiceController() throws Exception
{
return new ServiceController();
}
More information about the jboss-cvs-commits
mailing list