[jboss-cvs] JBossAS SVN: r100960 - in projects/kernel/trunk/jmx-mc-int/src: test/java/org/jboss/test/system/controller/instantiate/test and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Feb 15 06:08:30 EST 2010
Author: alesj
Date: 2010-02-15 06:08:30 -0500 (Mon, 15 Feb 2010)
New Revision: 100960
Added:
projects/kernel/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/instantiate/test/ContextRegistryTestCase.java
projects/kernel/trunk/jmx-mc-int/src/test/resources/org/jboss/test/system/controller/instantiate/test/BasicRegistry_install.xml
Modified:
projects/kernel/trunk/jmx-mc-int/src/main/java/org/jboss/system/microcontainer/InstantiateAction.java
projects/kernel/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/instantiate/test/ControllerInstantiateTestSuite.java
Log:
[JBKERNEL-97]; register mbeans against context registry.
Modified: projects/kernel/trunk/jmx-mc-int/src/main/java/org/jboss/system/microcontainer/InstantiateAction.java
===================================================================
--- projects/kernel/trunk/jmx-mc-int/src/main/java/org/jboss/system/microcontainer/InstantiateAction.java 2010-02-15 08:58:42 UTC (rev 100959)
+++ projects/kernel/trunk/jmx-mc-int/src/main/java/org/jboss/system/microcontainer/InstantiateAction.java 2010-02-15 11:08:30 UTC (rev 100960)
@@ -25,6 +25,10 @@
import javax.management.ObjectName;
import org.jboss.dependency.spi.ControllerState;
+import org.jboss.dependency.spi.tracker.ContextRegistry;
+import org.jboss.kernel.Kernel;
+import org.jboss.kernel.spi.dependency.KernelController;
+import org.jboss.system.ServiceController;
import org.jboss.system.ServiceCreator;
import org.jboss.system.ServiceInstance;
import org.jboss.system.metadata.ServiceMetaData;
@@ -37,11 +41,25 @@
*
* @see ServiceControllerContextActions
* @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @author <a href="ales.justin at jboss.org">Ales Justin</a>
* @version $Revision$
*/
public class InstantiateAction extends ServiceControllerContextAction
{
/**
+ * Get context registry.
+ *
+ * @param context the current context
+ * @return the context registry
+ */
+ protected ContextRegistry getRegistry(ServiceControllerContext context)
+ {
+ ServiceController serviceController = context.getServiceController();
+ Kernel kernel = serviceController.getKernel();
+ return kernel.getController();
+ }
+
+ /**
* Creates an instance of the MBean from the metadata stored in the context,
* and registers it in the MBeanServer.
*
@@ -55,6 +73,9 @@
Object mbean = context.getTarget();
ServiceInstance instance = ServiceCreator.install(server, objectName, metaData, mbean);
context.setTarget(instance.getResource());
+
+ ContextRegistry registry = getRegistry(context);
+ registry.addInstantiatedContext(context);
}
/**
@@ -64,6 +85,9 @@
*/
public void uninstallAction(ServiceControllerContext context)
{
+ ContextRegistry registry = getRegistry(context);
+ registry.removeInstantiatedContext(context);
+
MBeanServer server = context.getServiceController().getMBeanServer();
ObjectName objectName = context.getObjectName();
ServiceCreator.uninstall(server, objectName);
Copied: projects/kernel/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/instantiate/test/ContextRegistryTestCase.java (from rev 100959, projects/kernel/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/instantiate/test/ConstructorArgsTest.java)
===================================================================
--- projects/kernel/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/instantiate/test/ContextRegistryTestCase.java (rev 0)
+++ projects/kernel/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/instantiate/test/ContextRegistryTestCase.java 2010-02-15 11:08:30 UTC (rev 100960)
@@ -0,0 +1,96 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.system.controller.instantiate.test;
+
+import junit.framework.Test;
+import org.jboss.dependency.spi.ControllerContext;
+import org.jboss.dependency.spi.tracker.ContextQueries;
+import org.jboss.kernel.Kernel;
+import org.jboss.system.ServiceController;
+import org.jboss.system.ServiceMBeanSupport;
+import org.jboss.test.AbstractTestDelegate;
+import org.jboss.test.system.controller.AbstractControllerTest;
+import org.jboss.test.system.controller.support.Simple;
+import org.jboss.test.system.controller.support.SimpleMBean;
+import org.jboss.test.system.controller.support.SimpleStandardMBeanInterface;
+
+import java.util.Set;
+
+/**
+ * ContextRegistryTestCase.
+ *
+ * @author <a href="ales.justin at jboss.org">Ales Justin</a>
+ */
+public class ContextRegistryTestCase extends AbstractControllerTest
+{
+ public ContextRegistryTestCase(String name)
+ {
+ super(name);
+ }
+
+ public static Test suite()
+ {
+ return suite(ContextRegistryTestCase.class);
+ }
+
+ public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
+ {
+ return getNewControllerDelegate(clazz);
+ }
+
+ protected void setUp() throws Exception
+ {
+ super.setUp();
+
+ assertInstall(SimpleMBean.OBJECT_NAME);
+ }
+
+ protected void tearDown() throws Exception
+ {
+ try
+ {
+ assertUninstall(SimpleMBean.OBJECT_NAME);
+ }
+ finally
+ {
+ super.tearDown();
+ }
+ }
+
+ public void testBasicRegistry() throws Throwable
+ {
+ // We expect it to be new ServiceController
+ ServiceController controller = assertInstanceOf(ServiceController.class, getController());
+ Kernel kernel = controller.getKernel();
+ ContextQueries queries = kernel.getController();
+ assertByType(queries.getInstantiatedContexts(Simple.class));
+ assertByType(queries.getInstantiatedContexts(SimpleMBean.class));
+ assertByType(queries.getInstantiatedContexts(SimpleStandardMBeanInterface.class));
+ assertByType(queries.getInstantiatedContexts(ServiceMBeanSupport.class));
+ }
+
+ protected void assertByType(Set<ControllerContext> contexts)
+ {
+ assertNotNull(contexts);
+ assertEquals(1, contexts.size());
+ }
+}
\ No newline at end of file
Modified: projects/kernel/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/instantiate/test/ControllerInstantiateTestSuite.java
===================================================================
--- projects/kernel/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/instantiate/test/ControllerInstantiateTestSuite.java 2010-02-15 08:58:42 UTC (rev 100959)
+++ projects/kernel/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/instantiate/test/ControllerInstantiateTestSuite.java 2010-02-15 11:08:30 UTC (rev 100960)
@@ -42,6 +42,7 @@
* Controller Instantiate Test Suite.
*
* @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @author <a href="ales.justin at jboss.org">Ales Justin</a>
* @version $Revision$
*/
public class ControllerInstantiateTestSuite extends TestSuite
@@ -74,7 +75,8 @@
suite.addTest(ConstructorArgsErrorOldUnitTestCase.suite());
suite.addTest(ConstructorArgsErrorNewUnitTestCase.suite());
suite.addTest(ConstructorArgsErrorPlainUnitTestCase.suite());
-
+ suite.addTest(ContextRegistryTestCase.suite());
+
return suite;
}
}
Copied: projects/kernel/trunk/jmx-mc-int/src/test/resources/org/jboss/test/system/controller/instantiate/test/BasicRegistry_install.xml (from rev 100959, projects/kernel/trunk/jmx-mc-int/src/test/resources/org/jboss/test/system/controller/instantiate/test/PlainMBeanOneArg_install.xml)
===================================================================
--- projects/kernel/trunk/jmx-mc-int/src/test/resources/org/jboss/test/system/controller/instantiate/test/BasicRegistry_install.xml (rev 0)
+++ projects/kernel/trunk/jmx-mc-int/src/test/resources/org/jboss/test/system/controller/instantiate/test/BasicRegistry_install.xml 2010-02-15 11:08:30 UTC (rev 100960)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<server>
+ <mbean name="jboss.test:type=test" code="org.jboss.test.system.controller.support.Simple">
+ <constructor>
+ <arg type="int" value="5"/>
+ </constructor>
+ </mbean>
+</server>
\ No newline at end of file
More information about the jboss-cvs-commits
mailing list