[jboss-cvs] JBossAS SVN: r86477 - in projects/microcontainer/trunk: jmx-mc-int and 34 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Mon Mar 30 10:50:56 EDT 2009


Author: adrian at jboss.org
Date: 2009-03-30 10:50:55 -0400 (Mon, 30 Mar 2009)
New Revision: 86477

Added:
   projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/PlainControllerTestDelegate.java
   projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/basic/test/BasicPlainUnitTestCase.java
   projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/basic/test/DoubleInstallPlainUnitTestCase.java
   projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/classloader/
   projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/classloader/test/
   projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/classloader/test/ContextClassLoaderNewUnitTestCase.java
   projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/classloader/test/ContextClassLoaderPlainUnitTestCase.java
   projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/classloader/test/ContextClassLoaderTest.java
   projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/classloader/test/ControllerClassLoaderTestSuite.java
   projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/configure/attribute/test/AttributePlainUnitTestCase.java
   projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/configure/attribute/test/DependsAttributePlainUnitTestCase.java
   projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/configure/attribute/test/DependsListAttributePlainUnitTestCase.java
   projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/configure/test/ConfigureRedeployAfterErrorPlainUnitTestCase.java
   projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/configure/value/depends/test/DependencyValuePlainUnitTestCase.java
   projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/configure/value/dependslist/test/DependencyListValuePlainUnitTestCase.java
   projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/configure/value/element/test/ElementValuePlainUnitTestCase.java
   projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/configure/value/javabean/test/JavaBeanValuePlainUnitTestCase.java
   projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/configure/value/jbxb/test/JBXBValuePlainUnitTestCase.java
   projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/configure/value/text/test/TextValuePlainUnitTestCase.java
   projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/instantiate/plain/test/PlainMBeanPlainUnitTestCase.java
   projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/instantiate/plain/test/PlainMBeanRedeployAfterErrorPlainUnitTestCase.java
   projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/instantiate/standard/test/StandardMBeanPlainUnitTestCase.java
   projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/instantiate/standard/test/StandardMBeanRedeployAfterErrorPlainUnitTestCase.java
   projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/instantiate/test/ConstructorArgsErrorPlainUnitTestCase.java
   projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/instantiate/test/ConstructorArgsPlainUnitTestCase.java
   projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/basic/test/BasicDependencyDependsListNestedPlainUnitTestCase.java
   projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/basic/test/BasicDependencyDependsListPlainUnitTestCase.java
   projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/basic/test/BasicDependencyDependsNestedPlainUnitTestCase.java
   projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/basic/test/BasicDependencyDependsOptionalAttributeListNestedPlainUnitTestCase.java
   projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/basic/test/BasicDependencyDependsOptionalAttributeListPlainUnitTestCase.java
   projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/basic/test/BasicDependencyDependsOptionalAttributeNestedPlainUnitTestCase.java
   projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/basic/test/BasicDependencyDependsOptionalAttributePlainUnitTestCase.java
   projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/basic/test/BasicDependencyDependsPlainUnitTestCase.java
   projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/basic/test/BasicLifecyclePlainUnitTestCase.java
   projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/seperated/test/DependsBrokenConfigurePlainUnitTestCase.java
   projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/seperated/test/DependsBrokenCreatePlainUnitTestCase.java
   projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/seperated/test/DependsBrokenInstantiatePlainUnitTestCase.java
   projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/seperated/test/DependsBrokenStartPlainUnitTestCase.java
   projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/seperated/test/SeperatedDependencyDependsPlainUnitTestCase.java
   projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/test/LifecycleRedeployAfterErrorPlainUnitTestCase.java
   projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/parse/test/ErrorInParsePlainUnitTestCase.java
   projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/support/ContextClassLoader.java
   projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/support/ContextClassLoaderMBean.java
   projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/support/ContextClassLoaderTester.java
   projects/microcontainer/trunk/jmx-mc-int/src/test/resources/org/jboss/test/system/controller/classloader/
   projects/microcontainer/trunk/jmx-mc-int/src/test/resources/org/jboss/test/system/controller/classloader/test/
   projects/microcontainer/trunk/jmx-mc-int/src/test/resources/org/jboss/test/system/controller/classloader/test/ContextClassLoader.xml
Modified:
   projects/microcontainer/trunk/jmx-mc-int/pom.xml
   projects/microcontainer/trunk/jmx-mc-int/src/main/java/org/jboss/system/BarrierController.java
   projects/microcontainer/trunk/jmx-mc-int/src/main/java/org/jboss/system/BarrierControllerMBean.java
   projects/microcontainer/trunk/jmx-mc-int/src/main/java/org/jboss/system/InterceptorServiceMBean.java
   projects/microcontainer/trunk/jmx-mc-int/src/main/java/org/jboss/system/InterceptorServiceMBeanSupport.java
   projects/microcontainer/trunk/jmx-mc-int/src/main/java/org/jboss/system/InvalidAttributeException.java
   projects/microcontainer/trunk/jmx-mc-int/src/main/java/org/jboss/system/ListenerServiceMBean.java
   projects/microcontainer/trunk/jmx-mc-int/src/main/java/org/jboss/system/ListenerServiceMBeanSupport.java
   projects/microcontainer/trunk/jmx-mc-int/src/main/java/org/jboss/system/MissingAttributeException.java
   projects/microcontainer/trunk/jmx-mc-int/src/main/java/org/jboss/system/ServiceCreator.java
   projects/microcontainer/trunk/jmx-mc-int/src/main/java/org/jboss/system/ServiceDynamicMBeanSupport.java
   projects/microcontainer/trunk/jmx-mc-int/src/main/java/org/jboss/system/ServiceFactory.java
   projects/microcontainer/trunk/jmx-mc-int/src/main/java/org/jboss/system/ServiceMBean.java
   projects/microcontainer/trunk/jmx-mc-int/src/main/java/org/jboss/system/ServiceMBeanState.java
   projects/microcontainer/trunk/jmx-mc-int/src/main/java/org/jboss/system/metadata/ServiceConstructorMetaData.java
   projects/microcontainer/trunk/jmx-mc-int/src/main/java/org/jboss/system/metadata/ServiceMetaData.java
   projects/microcontainer/trunk/jmx-mc-int/src/main/java/org/jboss/system/microcontainer/ConfigureAction.java
   projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/AbstractSystemTest.java
   projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/AbstractControllerTest.java
   projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/ControllerTestDelegate.java
   projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/IncompleteDeploymentException.java
   projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/NewControllerTestDelegate.java
   projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/OldControllerTestDelegate.java
   projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/basic/test/BasicNewUnitTestCase.java
   projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/basic/test/BasicOldUnitTestCase.java
   projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/basic/test/ControllerBasicTestSuite.java
   projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/basic/test/DoubleInstallNewUnitTestCase.java
   projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/configure/attribute/test/AttributeNewUnitTestCase.java
   projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/configure/attribute/test/DependsAttributeNewUnitTestCase.java
   projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/configure/attribute/test/DependsAttributeOldUnitTestCase.java
   projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/configure/test/ConfigureRedeployAfterErrorNewUnitTestCase.java
   projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/configure/test/ConfigureRedeployAfterErrorOldUnitTestCase.java
   projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/configure/test/ControllerConfigureTestSuite.java
   projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/configure/value/ControllerConfigureValueTestSuite.java
   projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/configure/value/depends/test/DependencyValueNewUnitTestCase.java
   projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/configure/value/depends/test/DependencyValueOldUnitTestCase.java
   projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/configure/value/dependslist/test/DependencyListValueNewUnitTestCase.java
   projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/configure/value/dependslist/test/DependencyListValueOldUnitTestCase.java
   projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/configure/value/element/test/ElementValueNewUnitTestCase.java
   projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/configure/value/element/test/ElementValueOldUnitTestCase.java
   projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/configure/value/inject/test/NewInjectionValueUnitTestCase.java
   projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/configure/value/javabean/test/JavaBeanValueNewUnitTestCase.java
   projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/configure/value/javabean/test/JavaBeanValueOldUnitTestCase.java
   projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/configure/value/jbxb/test/JBXBValueNewUnitTestCase.java
   projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/configure/value/jbxb/test/JBXBValueOldUnitTestCase.java
   projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/configure/value/text/test/TextValueNewUnitTestCase.java
   projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/instantiate/plain/test/PlainMBeanNewUnitTestCase.java
   projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/instantiate/plain/test/PlainMBeanOldUnitTestCase.java
   projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/instantiate/plain/test/PlainMBeanRedeployAfterErrorNewUnitTestCase.java
   projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/instantiate/plain/test/PlainMBeanRedeployAfterErrorOldUnitTestCase.java
   projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/instantiate/standard/test/StandardMBeanNewUnitTestCase.java
   projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/instantiate/standard/test/StandardMBeanOldUnitTestCase.java
   projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/instantiate/standard/test/StandardMBeanRedeployAfterErrorNewUnitTestCase.java
   projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/instantiate/standard/test/StandardMBeanRedeployAfterErrorOldUnitTestCase.java
   projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/instantiate/test/ConstructorArgsErrorNewUnitTestCase.java
   projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/instantiate/test/ConstructorArgsErrorOldUnitTestCase.java
   projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/instantiate/test/ConstructorArgsNewUnitTestCase.java
   projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/instantiate/test/ConstructorArgsOldUnitTestCase.java
   projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/instantiate/test/ControllerInstantiateTestSuite.java
   projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/instantiate/test/NewNoMetaDataInstantiateUnitTestCase.java
   projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/integration/test/AbstractIntegrationTest.java
   projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/integration/test/IntegrationTestDelegate.java
   projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/legacy/OldServiceConfigurator.java
   projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/legacy/OldServiceController.java
   projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/legacy/OldServiceCreator.java
   projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/basic/test/BasicDependencyDependsListNestedNewUnitTestCase.java
   projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/basic/test/BasicDependencyDependsListNestedOldUnitTestCase.java
   projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/basic/test/BasicDependencyDependsListNewUnitTestCase.java
   projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/basic/test/BasicDependencyDependsListOldUnitTestCase.java
   projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/basic/test/BasicDependencyDependsNestedNewUnitTestCase.java
   projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/basic/test/BasicDependencyDependsNestedOldUnitTestCase.java
   projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/basic/test/BasicDependencyDependsNewUnitTestCase.java
   projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/basic/test/BasicDependencyDependsOldUnitTestCase.java
   projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/basic/test/BasicDependencyDependsOptionalAttributeListNestedNewUnitTestCase.java
   projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/basic/test/BasicDependencyDependsOptionalAttributeListNestedOldUnitTestCase.java
   projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/basic/test/BasicDependencyDependsOptionalAttributeListNewUnitTestCase.java
   projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/basic/test/BasicDependencyDependsOptionalAttributeListOldUnitTestCase.java
   projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/basic/test/BasicDependencyDependsOptionalAttributeNestedNewUnitTestCase.java
   projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/basic/test/BasicDependencyDependsOptionalAttributeNestedOldUnitTestCase.java
   projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/basic/test/BasicDependencyDependsOptionalAttributeNewUnitTestCase.java
   projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/basic/test/BasicDependencyDependsOptionalAttributeOldUnitTestCase.java
   projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/basic/test/BasicDependencyTest.java
   projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/basic/test/BasicLifecycleNewUnitTestCase.java
   projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/basic/test/BasicLifecycleOldUnitTestCase.java
   projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/basic/test/ControllerLifecycleBasicTestSuite.java
   projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/seperated/test/ControllerLifecycleSeperatedTestSuite.java
   projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/seperated/test/DependsBrokenConfigureNewUnitTestCase.java
   projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/seperated/test/DependsBrokenConfigureOldUnitTestCase.java
   projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/seperated/test/DependsBrokenCreateNewUnitTestCase.java
   projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/seperated/test/DependsBrokenCreateOldUnitTestCase.java
   projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/seperated/test/DependsBrokenInstantiateNewUnitTestCase.java
   projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/seperated/test/DependsBrokenInstantiateOldUnitTestCase.java
   projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/seperated/test/DependsBrokenStartNewUnitTestCase.java
   projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/seperated/test/DependsBrokenStartOldUnitTestCase.java
   projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/seperated/test/DependsBrokenTest.java
   projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/seperated/test/NewOnDemandDependencyTest.java
   projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/seperated/test/SeperatedDependencyDependsNewUnitTestCase.java
   projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/seperated/test/SeperatedDependencyDependsOldUnitTestCase.java
   projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/seperated/test/SeperatedDependencyTest.java
   projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/test/ControllerLifecycleTestSuite.java
   projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/test/LifecycleRedeployAfterErrorNewUnitTestCase.java
   projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/test/LifecycleRedeployAfterErrorOldUnitTestCase.java
   projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/parse/test/ControllerParseTestSuite.java
   projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/parse/test/ErrorInParseNewUnitTestCase.java
   projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/support/JavaBean.java
   projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/test/ControllerTestSuite.java
   projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/metadata/annotation/AnnotationUnitTestCase.java
   projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/metadata/value/alias/test/AliasValueUnitTestCase.java
   projects/microcontainer/trunk/pom.xml
Log:
Tests for using the JDK MBeanServer and other sourcecode tidyup

Modified: projects/microcontainer/trunk/jmx-mc-int/pom.xml
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/pom.xml	2009-03-30 14:20:22 UTC (rev 86476)
+++ projects/microcontainer/trunk/jmx-mc-int/pom.xml	2009-03-30 14:50:55 UTC (rev 86477)
@@ -62,6 +62,10 @@
       <artifactId>jboss-jmx</artifactId>
     </dependency>
     <dependency>
+      <groupId>org.jboss.mx</groupId>
+      <artifactId>jboss-mbeanserver</artifactId>
+    </dependency>
+    <dependency>
       <groupId>org.jboss.man</groupId>
       <artifactId>jboss-managed</artifactId>
       <optional>true</optional>

Modified: projects/microcontainer/trunk/jmx-mc-int/src/main/java/org/jboss/system/BarrierController.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/main/java/org/jboss/system/BarrierController.java	2009-03-30 14:20:22 UTC (rev 86476)
+++ projects/microcontainer/trunk/jmx-mc-int/src/main/java/org/jboss/system/BarrierController.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -44,10 +44,6 @@
  * to apply complex logic in deciding whether to initially start
  * the barrier (e.g. query some other mbean). 
  * 
- * @jmx:mbean
- *    extends="org.jboss.system.ListenerServiceMBean"
- *    name="jboss:service=BarrierController"
- * 
  * @author <a href="dimitris at jboss.org">Dimitris Andreadis</a>
  * @author Scott.Stark at jboss.org
  * @version $Revision$
@@ -247,6 +243,7 @@
     * setBarrierEnabledOnStartup(Boolean) has not been called.
     * 
     * The default implementation is to return false.
+    * @return true to enable at startup
     */
    protected Boolean enableOnStartup()
    {
@@ -338,8 +335,6 @@
 
    /**
     * Manually start the controlled barrier
-    * 
-    * @jmx:managed-operation
     */
    public void startBarrier()
    {
@@ -356,8 +351,6 @@
 
    /**
     * Manually stop the controlled barrier
-    * 
-    * @jmx:managed-operation
     */
    public void stopBarrier()
    {
@@ -394,17 +387,11 @@
    
    // Inner Class ---------------------------------------------------
    
-   /**
-    * The controlled barrier MBean interface
-    */
    public static interface BarrierMBean
    {
-      /** We just want to expose those attributes */
       ObjectName getBarrierController();
       String getStateString();
       int getState();
-      
-      /** Hook up with the ServiceController */
       void jbossInternalLifecycle(String method) throws Exception;
    }   
 
@@ -416,7 +403,6 @@
       /** The parent Controller */
       private ObjectName barrierController;
       
-      /** CTOR */
       public Barrier(ObjectName barrierController)
       {
          this.barrierController = barrierController;

Modified: projects/microcontainer/trunk/jmx-mc-int/src/main/java/org/jboss/system/BarrierControllerMBean.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/main/java/org/jboss/system/BarrierControllerMBean.java	2009-03-30 14:20:22 UTC (rev 86476)
+++ projects/microcontainer/trunk/jmx-mc-int/src/main/java/org/jboss/system/BarrierControllerMBean.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -34,26 +34,26 @@
 {
    // Attributes ----------------------------------------------------
 
-   /** The controlled barrier StateString */
+   /* The controlled barrier StateString */
    String getBarrierStateString();
    
-   /** The controlled barrier ObjectName */
+   /* The controlled barrier ObjectName */
    void setBarrierObjectName(ObjectName barrierName);
    ObjectName getBarrierObjectName();
    
-   /** The initial state of the barrier */
+   /* The initial state of the barrier */
    void setBarrierEnabledOnStartup(Boolean enableOnStartup);
    Boolean getBarrierEnabledOnStartup();
    
-   /** The notification subscription handback string that starts the barrier */
+   /* The notification subscription handback string that starts the barrier */
    void setStartBarrierHandback(String startHandback);
    String getStartBarrierHandback();
    
-   /** The notification subscription handback string that stops the barrier */
+   /* The notification subscription handback string that stops the barrier */
    void setStopBarrierHandback(String stopHandback);
    String getStopBarrierHandback();
    
-   /** The ability to dynamically subscribe for notifications */
+   /* The ability to dynamically subscribe for notifications */
    void setDynamicSubscriptions(Boolean dynamicSubscriptions);
    Boolean getDynamicSubscriptions();
    

Modified: projects/microcontainer/trunk/jmx-mc-int/src/main/java/org/jboss/system/InterceptorServiceMBean.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/main/java/org/jboss/system/InterceptorServiceMBean.java	2009-03-30 14:20:22 UTC (rev 86476)
+++ projects/microcontainer/trunk/jmx-mc-int/src/main/java/org/jboss/system/InterceptorServiceMBean.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -33,6 +33,7 @@
  * @author <a href="mailto:dimitris at jboss.org">Dimitris Andreadis</a>
  * @version $Revision$
 **/
+ at SuppressWarnings("unchecked")
 public interface InterceptorServiceMBean extends ServiceMBean
 {
    // Attributes ----------------------------------------------------
@@ -40,6 +41,7 @@
    /**
     * The ObjectNames of the MBeans implementing the operations
     * in the org.jboss.mx.server.Interceptable interface
+    * @param interceptables 
     */
    void setInterceptables(List interceptables);
    List getInterceptables();

Modified: projects/microcontainer/trunk/jmx-mc-int/src/main/java/org/jboss/system/InterceptorServiceMBeanSupport.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/main/java/org/jboss/system/InterceptorServiceMBeanSupport.java	2009-03-30 14:20:22 UTC (rev 86476)
+++ projects/microcontainer/trunk/jmx-mc-int/src/main/java/org/jboss/system/InterceptorServiceMBeanSupport.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -49,6 +49,7 @@
  * @author <a href="mailto:dimitris at jboss.org">Dimitris Andreadis</a>
  * @version $Revision$
  */
+ at SuppressWarnings("unchecked")
 public abstract class InterceptorServiceMBeanSupport extends ServiceMBeanSupport
    implements InterceptorServiceMBean
 {
@@ -227,6 +228,9 @@
    
    /**
     * Use this to forward the call
+    * @param invocation 
+    * @return the result
+    * @throws Throwable 
     */
    protected Object invokeNext(Invocation invocation) throws Throwable
    {
@@ -245,9 +249,6 @@
    
    // Override ------------------------------------------------------
    
-   /**
-    * Override
-    */
    protected Object invoke(Invocation invocation) throws Throwable
    {
       return invokeNext(invocation);

Modified: projects/microcontainer/trunk/jmx-mc-int/src/main/java/org/jboss/system/InvalidAttributeException.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/main/java/org/jboss/system/InvalidAttributeException.java	2009-03-30 14:20:22 UTC (rev 86476)
+++ projects/microcontainer/trunk/jmx-mc-int/src/main/java/org/jboss/system/InvalidAttributeException.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -30,6 +30,9 @@
 public class InvalidAttributeException
    extends ConfigurationException
 {
+   /** The serialVersionUID */
+   private static final long serialVersionUID = 785817154841571537L;
+
    /**
     * Construct a <tt>InvalidAttributeException</tt> with the 
     * specified detail message.

Modified: projects/microcontainer/trunk/jmx-mc-int/src/main/java/org/jboss/system/ListenerServiceMBean.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/main/java/org/jboss/system/ListenerServiceMBean.java	2009-03-30 14:20:22 UTC (rev 86476)
+++ projects/microcontainer/trunk/jmx-mc-int/src/main/java/org/jboss/system/ListenerServiceMBean.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -117,6 +117,7 @@
     * @see org.jboss.system.filterfactory.NotificationFilterSupportFactory
     *  
     * See also jboss-subscription.dtd
+    * @param list 
    **/
    public void setSubscriptionList(org.w3c.dom.Element list);
    

Modified: projects/microcontainer/trunk/jmx-mc-int/src/main/java/org/jboss/system/ListenerServiceMBeanSupport.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/main/java/org/jboss/system/ListenerServiceMBeanSupport.java	2009-03-30 14:20:22 UTC (rev 86476)
+++ projects/microcontainer/trunk/jmx-mc-int/src/main/java/org/jboss/system/ListenerServiceMBeanSupport.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -105,6 +105,7 @@
  *
  * @version $Revision$
 **/
+ at SuppressWarnings("unchecked")
 public abstract class ListenerServiceMBeanSupport
    extends ServiceMBeanSupport
    implements ListenerServiceMBean, NotificationListener
@@ -215,6 +216,7 @@
     *
     * @param dynamicSubscriptions indicates whether to monitor and subscribe
     *                             to new MBeans that match the specification.
+    * @throws Exception for any error
    **/
    public void subscribe(boolean dynamicSubscriptions)
       throws Exception
@@ -228,6 +230,7 @@
     * @param dynamicSubscriptions indicates whether to monitor and subscribe
     *                             to new MBeans that match the specification.
     * @param listener the receiver of the notifications.
+    * @throws Exception for any error
    **/
    public void subscribe(boolean dynamicSubscriptions, ObjectName listener)
       throws Exception
@@ -256,6 +259,7 @@
     * @param dynamicSubscriptions indicates whether to monitor and subscribe
     *                             to new MBeans that match the specification.
     * @param listener the receiver of the notifications.
+    * @throws Exception for any error
    **/
    public void subscribe(List subscriptionList, boolean dynamicSubscriptions, ObjectName listener)
       throws Exception
@@ -421,6 +425,8 @@
 
    /**
     * Override to add notification handling!
+    * @param notification 
+    * @param handback 
    **/
    public void handleNotification2(Notification notification, Object handback)
    {
@@ -773,9 +779,6 @@
       
       // Constructor ------------------------------------------------
       
-      /**
-       * Simple CTOR
-      **/
       public SubscriptionInfo(ObjectName objectName, Object handback, NotificationFilter filter)
       {
          this.objectName = objectName;
@@ -785,7 +788,7 @@
       
       // Accessors --------------------------------------------------
       /**
-       * Gets objectname
+       * @return Gets objectname
       **/
       public ObjectName getObjectName()
       {
@@ -793,7 +796,7 @@
       }
       
       /**
-       * Gets handback object
+       * @return Gets handback object
       **/
       public Object getHandback()
       {
@@ -801,7 +804,7 @@
       }
       
       /**
-       * Gets notification filter
+       * @return Gets notification filter
       **/
       public NotificationFilter getFilter()
       {

Modified: projects/microcontainer/trunk/jmx-mc-int/src/main/java/org/jboss/system/MissingAttributeException.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/main/java/org/jboss/system/MissingAttributeException.java	2009-03-30 14:20:22 UTC (rev 86476)
+++ projects/microcontainer/trunk/jmx-mc-int/src/main/java/org/jboss/system/MissingAttributeException.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -30,6 +30,9 @@
 public class MissingAttributeException
    extends ConfigurationException
 {
+   /** The serialVersionUID */
+   private static final long serialVersionUID = 2104972080882639099L;
+
    /**
     * Construct a <tt>MissingAttributeException</tt> with the specified detail 
     * message.

Modified: projects/microcontainer/trunk/jmx-mc-int/src/main/java/org/jboss/system/ServiceCreator.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/main/java/org/jboss/system/ServiceCreator.java	2009-03-30 14:20:22 UTC (rev 86476)
+++ projects/microcontainer/trunk/jmx-mc-int/src/main/java/org/jboss/system/ServiceCreator.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -22,16 +22,19 @@
 package org.jboss.system;
 
 import java.net.URL;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import javax.management.MBeanServer;
+import javax.management.NotCompliantMBeanException;
 import javax.management.ObjectInstance;
 import javax.management.ObjectName;
+import javax.management.ReflectionException;
 import javax.management.StandardMBean;
 
 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;
@@ -208,14 +211,26 @@
       
       // This is a standard or dynamic mbean
       log.debug("About to create bean: " + objectName + " with code: " + code);
-      ObjectInstance instance = server.createMBean(code,
-                                                   objectName,
-                                                   loaderName,
-                                                   constructor.getParameters(loader),
-                                                   constructor.getSignature());
+      Object resource = null;
+      try
+      {
+         resource = server.instantiate(code,
+                                       loaderName,
+                                       constructor.getParameters(loader),
+                                       constructor.getSignature());
+      }
+      catch (ReflectionException e)
+      {
+         // This hack is for backwards compatibility on the error messages
+         Throwable t = e.getCause();
+         if (t instanceof ClassNotFoundException)
+            throw e;
+         throw new NotCompliantMBeanException("Error in constructor for " + code + " " + e.toString());
+      }
 
-      MBeanEntry entry = (MBeanEntry) server.invoke(MBEAN_REGISTRY, "get", new Object[] { objectName }, new String[] { ObjectName.class.getName() });
-      Object resource = entry.getResourceInstance();
+      Map<String, Object> values = new HashMap<String, Object>();
+      values.put(ServerConstants.CLASSLOADER, loader);
+      ObjectInstance instance = (ObjectInstance) server.invoke(MBEAN_REGISTRY, "registerMBean", new Object[] { resource, objectName, values }, new String[] { Object.class.getName(), ObjectName.class.getName(), Map.class.getName() });
       return new ServiceInstance(instance, resource);
    }
 

Modified: projects/microcontainer/trunk/jmx-mc-int/src/main/java/org/jboss/system/ServiceDynamicMBeanSupport.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/main/java/org/jboss/system/ServiceDynamicMBeanSupport.java	2009-03-30 14:20:22 UTC (rev 86476)
+++ projects/microcontainer/trunk/jmx-mc-int/src/main/java/org/jboss/system/ServiceDynamicMBeanSupport.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -21,7 +21,6 @@
  */
 package org.jboss.system;
 
-import java.util.List;
 import javax.management.Attribute;
 import javax.management.AttributeList;
 import javax.management.AttributeNotFoundException;
@@ -41,8 +40,6 @@
 /**
  * <description>
  *
- * @see <related>
- *
  * @author  <a href="mailto:sacha.labourey at cogito-info.ch">Sacha Labourey</a>.
  * @version $Revision$
  *
@@ -71,7 +68,7 @@
       super();
    }
 
-   public ServiceDynamicMBeanSupport(Class type)
+   public ServiceDynamicMBeanSupport(Class<?> type)
    {
       super(type);
    }

Modified: projects/microcontainer/trunk/jmx-mc-int/src/main/java/org/jboss/system/ServiceFactory.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/main/java/org/jboss/system/ServiceFactory.java	2009-03-30 14:20:22 UTC (rev 86476)
+++ projects/microcontainer/trunk/jmx-mc-int/src/main/java/org/jboss/system/ServiceFactory.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -39,6 +39,7 @@
     * @param server    The MBeanServer instance
     * @param name      The name of the MBean that wishes to be managed by
     *                  the JBoss ServiceControl service.
+    * @return the service
     */
    Service createService(MBeanServer server, ObjectName name);
 }

Modified: projects/microcontainer/trunk/jmx-mc-int/src/main/java/org/jboss/system/ServiceMBean.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/main/java/org/jboss/system/ServiceMBean.java	2009-03-30 14:20:22 UTC (rev 86476)
+++ projects/microcontainer/trunk/jmx-mc-int/src/main/java/org/jboss/system/ServiceMBean.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -73,6 +73,9 @@
    int getState();
    String getStateString();
    
-   /** Detyped lifecycle invocation */
+   /** Detyped lifecycle invocation 
+    * @param method the lifecyle method
+    * @throws Exception for any error
+    */
    void jbossInternalLifecycle(String method) throws Exception;
 }

Modified: projects/microcontainer/trunk/jmx-mc-int/src/main/java/org/jboss/system/ServiceMBeanState.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/main/java/org/jboss/system/ServiceMBeanState.java	2009-03-30 14:20:22 UTC (rev 86476)
+++ projects/microcontainer/trunk/jmx-mc-int/src/main/java/org/jboss/system/ServiceMBeanState.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -37,6 +37,7 @@
  * @author <a href="dimitris at jboss.org">Dimitris Andreadis</a>
  * @version $Revision$
 **/
+ at SuppressWarnings("unchecked")
 public final class ServiceMBeanState
 {
    // ServiceMBean States

Modified: projects/microcontainer/trunk/jmx-mc-int/src/main/java/org/jboss/system/metadata/ServiceConstructorMetaData.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/main/java/org/jboss/system/metadata/ServiceConstructorMetaData.java	2009-03-30 14:20:22 UTC (rev 86476)
+++ projects/microcontainer/trunk/jmx-mc-int/src/main/java/org/jboss/system/metadata/ServiceConstructorMetaData.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -142,7 +142,7 @@
          if (signature[i] != null)
          {
             // See if it is a primitive type first
-            Class typeClass = Classes.getPrimitiveTypeForName(signature[i]);
+            Class<?> typeClass = Classes.getPrimitiveTypeForName(signature[i]);
             if (typeClass == null)
                typeClass = cl.loadClass(signature[i]);
 
@@ -153,8 +153,8 @@
                try
                {
                   // See if there is a ctor(String) for the type
-                  Class[] sig = {String.class};
-                  Constructor ctor = typeClass.getConstructor(sig);
+                  Class<?>[] sig = {String.class};
+                  Constructor<?> ctor = typeClass.getConstructor(sig);
                   Object[] args = {value};
                   realValue = ctor.newInstance(args);
                }

Modified: projects/microcontainer/trunk/jmx-mc-int/src/main/java/org/jboss/system/metadata/ServiceMetaData.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/main/java/org/jboss/system/metadata/ServiceMetaData.java	2009-03-30 14:20:22 UTC (rev 86476)
+++ projects/microcontainer/trunk/jmx-mc-int/src/main/java/org/jboss/system/metadata/ServiceMetaData.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -273,18 +273,18 @@
 
    /**
     * Add an attribute
-    * @param attribute
+    * @param attributeList
     */
-   public void addAttributes(List<ServiceAttributeMetaData> aAttributeList)
+   public void addAttributes(List<ServiceAttributeMetaData> attributeList)
    {
-      if(aAttributeList == null)
+      if(attributeList == null)
          throw new IllegalArgumentException("Null attribute");
       if(this.attributes.size() == 0)
-         this.attributes = aAttributeList;
+         this.attributes = attributeList;
       else
       {
          //Avoid duplicates
-         for(ServiceAttributeMetaData serviceAttributeMetaData: aAttributeList)
+         for(ServiceAttributeMetaData serviceAttributeMetaData: attributeList)
          {
             addAttribute(serviceAttributeMetaData);
          }   
@@ -293,11 +293,11 @@
    
    /**
     * Remove a list of Attributes
-    * @param aAttributeList
+    * @param attributeList
     */
-   public void removeAttributes(List<ServiceAttributeMetaData> aAttributeList)
+   public void removeAttributes(List<ServiceAttributeMetaData> attributeList)
    {
-      this.attributes.removeAll(aAttributeList);
+      this.attributes.removeAll(attributeList);
    }
    
    
@@ -335,7 +335,7 @@
 
    /**
     * Add  dependency
-    * @param dependencyList
+    * @param serviceDependencyMetaData
     */
    public void addDependency(ServiceDependencyMetaData serviceDependencyMetaData)
    {
@@ -398,7 +398,7 @@
    }
    /**
     * Set the service annotations
-    * @param annotation - the annotations metadata
+    * @param annotations - the annotations metadata
     */
    public void setAnnotations(List<ServiceAnnotationMetaData> annotations)
    {

Modified: projects/microcontainer/trunk/jmx-mc-int/src/main/java/org/jboss/system/microcontainer/ConfigureAction.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/main/java/org/jboss/system/microcontainer/ConfigureAction.java	2009-03-30 14:20:22 UTC (rev 86476)
+++ projects/microcontainer/trunk/jmx-mc-int/src/main/java/org/jboss/system/microcontainer/ConfigureAction.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -23,10 +23,8 @@
 
 import java.util.List;
 
-import javax.management.MBeanServer;
 import javax.management.ObjectName;
 
-import org.jboss.system.ServiceBinding;
 import org.jboss.system.ServiceConfigurator;
 import org.jboss.system.ServiceContext;
 import org.jboss.system.ServiceController;
@@ -44,7 +42,6 @@
    public void installAction(ServiceControllerContext context) throws Throwable
    {
       ServiceController controller = context.getServiceController();
-      MBeanServer server = controller.getMBeanServer();
       ObjectName objectName = context.getObjectName();
 
       // Configure any attributes

Modified: projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/AbstractSystemTest.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/AbstractSystemTest.java	2009-03-30 14:20:22 UTC (rev 86476)
+++ projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/AbstractSystemTest.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -87,7 +87,7 @@
     * @return the delegate
     * @throws Exception for any error
     */
-   public static AbstractTestDelegate getDelegate(Class clazz) throws Exception
+   public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
    {
       AbstractTestDelegate delegate = new AbstractTestDelegate(clazz);
       delegate.enableSecurity = true;

Modified: projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/AbstractControllerTest.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/AbstractControllerTest.java	2009-03-30 14:20:22 UTC (rev 86476)
+++ projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/AbstractControllerTest.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -58,15 +58,22 @@
       super(name);
    }
    
-   public static AbstractTestDelegate getNewControllerDelegate(Class clazz) throws Exception
+   public static AbstractTestDelegate getNewControllerDelegate(Class<?> clazz) throws Exception
    {
       ControllerTestDelegate delegate = new NewControllerTestDelegate(clazz);
       // @todo delegate.enableSecurity = true;
       return delegate;
    }
    
-   public static AbstractTestDelegate getOldControllerDelegate(Class clazz) throws Exception
+   public static AbstractTestDelegate getPlainControllerDelegate(Class<?> clazz) throws Exception
    {
+      ControllerTestDelegate delegate = new PlainControllerTestDelegate(clazz);
+      // @todo delegate.enableSecurity = true;
+      return delegate;
+   }
+   
+   public static AbstractTestDelegate getOldControllerDelegate(Class<?> clazz) throws Exception
+   {
       ControllerTestDelegate delegate = new OldControllerTestDelegate(clazz);
       // @todo delegate.enableSecurity = true;
       return delegate;

Modified: projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/ControllerTestDelegate.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/ControllerTestDelegate.java	2009-03-30 14:20:22 UTC (rev 86476)
+++ projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/ControllerTestDelegate.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -83,22 +83,35 @@
    public void setUp() throws Exception
    {
       super.setUp();
-      
-      System.setProperty(ServerConstants.MBEAN_SERVER_BUILDER_CLASS_PROPERTY, ServerConstants.DEFAULT_MBEAN_SERVER_BUILDER_CLASS);
-      server = createMBeanServer();
-      serviceController = createServiceController();
-      server.registerMBean(serviceController, ServiceControllerMBean.OBJECT_NAME);
-      
-      deployer = new SimpleSARDeployer(server, serviceController);
 
-      Order.reset();
-      
-      deploy();
-      
-      if (isValidateAtSetUp())
-         validate();
+      try
+      {
+         setUpMBeanServerBuilder();
+         server = createMBeanServer();
+         serviceController = createServiceController();
+         server.registerMBean(serviceController, ServiceControllerMBean.OBJECT_NAME);
+         
+         deployer = new SimpleSARDeployer(server, serviceController);
+
+         Order.reset();
+         
+         deploy();
+         
+         if (isValidateAtSetUp())
+            validate();
+      }
+      catch (Exception e)
+      {
+         getLog().error("Error in setup", e);
+         throw e;
+      }
    }
 
+   protected void setUpMBeanServerBuilder()
+   {
+      System.setProperty(ServerConstants.MBEAN_SERVER_BUILDER_CLASS_PROPERTY, ServerConstants.DEFAULT_MBEAN_SERVER_BUILDER_CLASS);
+   }
+   
    // TODO Temporary until the IncompleteDeploymentDescription is integrated 
    protected boolean isValidateAtSetUp()
    {
@@ -123,6 +136,7 @@
       deployer.uninstallTemporary();
    }
    
+   @SuppressWarnings("unchecked")
    protected void validate() throws Exception
    {
       Collection<ServiceContext> waitingForClasses = new HashSet<ServiceContext>();
@@ -182,6 +196,9 @@
       index = testName.indexOf("OldUnitTestCase");
       if (index != -1)
          testName = testName.substring(0, index);
+      index = testName.indexOf("PlainUnitTestCase");
+      if (index != -1)
+         testName = testName.substring(0, index);
       
       testName += ".xml";
       
@@ -262,6 +279,7 @@
       assertServiceFailed(name);
    }
    
+   @SuppressWarnings("unchecked")
    protected void checkIncomplete(IncompleteDeploymentException e, ObjectName name, Class<? extends Throwable> expected) throws Exception
    {
       Collection incomplete = e.getMbeansWaitingForDepends();

Modified: projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/IncompleteDeploymentException.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/IncompleteDeploymentException.java	2009-03-30 14:20:22 UTC (rev 86476)
+++ projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/IncompleteDeploymentException.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -34,6 +34,7 @@
  * @author <a href="mailto:dimitris at jboss.org">Dimitris Andreadis</a>
  * @version $Revision: 81033 $
  */
+ at SuppressWarnings("unchecked")
 public class IncompleteDeploymentException extends Exception
 {
    /** @since 4.0.2 */

Modified: projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/NewControllerTestDelegate.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/NewControllerTestDelegate.java	2009-03-30 14:20:22 UTC (rev 86476)
+++ projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/NewControllerTestDelegate.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -37,7 +37,7 @@
  */
 public class NewControllerTestDelegate extends ControllerTestDelegate
 {
-   public NewControllerTestDelegate(Class clazz)
+   public NewControllerTestDelegate(Class<?> clazz)
    {
       super(clazz);
    }

Modified: projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/OldControllerTestDelegate.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/OldControllerTestDelegate.java	2009-03-30 14:20:22 UTC (rev 86476)
+++ projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/OldControllerTestDelegate.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -42,7 +42,7 @@
  */
 public class OldControllerTestDelegate extends ControllerTestDelegate
 {
-   public OldControllerTestDelegate(Class clazz)
+   public OldControllerTestDelegate(Class<?> clazz)
    {
       super(clazz);
    }

Added: projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/PlainControllerTestDelegate.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/PlainControllerTestDelegate.java	                        (rev 0)
+++ projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/PlainControllerTestDelegate.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -0,0 +1,44 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, 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;
+
+import org.jboss.jmx.mbeanserver.JBossMBeanServerBuilder;
+import org.jboss.mx.server.ServerConstants;
+
+/**
+ * ControllerTestDelegate.
+ * 
+ * @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @version $Revision: 82920 $
+ */
+public class PlainControllerTestDelegate extends NewControllerTestDelegate
+{
+   public PlainControllerTestDelegate(Class<?> clazz)
+   {
+      super(clazz);
+   }
+
+   protected void setUpMBeanServerBuilder()
+   {
+      System.setProperty(ServerConstants.MBEAN_SERVER_BUILDER_CLASS_PROPERTY, JBossMBeanServerBuilder.class.getName());
+   }
+}

Modified: projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/basic/test/BasicNewUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/basic/test/BasicNewUnitTestCase.java	2009-03-30 14:20:22 UTC (rev 86476)
+++ projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/basic/test/BasicNewUnitTestCase.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -43,7 +43,7 @@
       super(name);
    }
 
-   public static AbstractTestDelegate getDelegate(Class clazz) throws Exception
+   public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
    {
       return getNewControllerDelegate(clazz);
    }

Modified: projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/basic/test/BasicOldUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/basic/test/BasicOldUnitTestCase.java	2009-03-30 14:20:22 UTC (rev 86476)
+++ projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/basic/test/BasicOldUnitTestCase.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -43,7 +43,7 @@
       super(name);
    }
 
-   public static AbstractTestDelegate getDelegate(Class clazz) throws Exception
+   public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
    {
       return getOldControllerDelegate(clazz);
    }

Added: projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/basic/test/BasicPlainUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/basic/test/BasicPlainUnitTestCase.java	                        (rev 0)
+++ projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/basic/test/BasicPlainUnitTestCase.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -0,0 +1,50 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, 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.basic.test;
+
+import junit.framework.Test;
+
+import org.jboss.test.AbstractTestDelegate;
+
+/**
+ * BasicPlainUnitTestCase.
+ * 
+ * @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @version $Revision: 82920 $
+ */
+public class BasicPlainUnitTestCase extends BasicTest
+{
+   public static Test suite()
+   {
+      return suite(BasicPlainUnitTestCase.class);
+   }
+
+   public BasicPlainUnitTestCase(String name)
+   {
+      super(name);
+   }
+
+   public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
+   {
+      return getPlainControllerDelegate(clazz);
+   }
+}

Modified: projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/basic/test/ControllerBasicTestSuite.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/basic/test/ControllerBasicTestSuite.java	2009-03-30 14:20:22 UTC (rev 86476)
+++ projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/basic/test/ControllerBasicTestSuite.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -44,8 +44,10 @@
 
       suite.addTest(BasicOldUnitTestCase.suite());
       suite.addTest(BasicNewUnitTestCase.suite());
+      suite.addTest(BasicPlainUnitTestCase.suite());
       suite.addTest(DoubleInstallOldUnitTestCase.suite());
       suite.addTest(DoubleInstallNewUnitTestCase.suite());
+      suite.addTest(DoubleInstallPlainUnitTestCase.suite());
       
       return suite;
    }

Modified: projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/basic/test/DoubleInstallNewUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/basic/test/DoubleInstallNewUnitTestCase.java	2009-03-30 14:20:22 UTC (rev 86476)
+++ projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/basic/test/DoubleInstallNewUnitTestCase.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -43,7 +43,7 @@
       super(name);
    }
 
-   public static AbstractTestDelegate getDelegate(Class clazz) throws Exception
+   public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
    {
       return getNewControllerDelegate(clazz);
    }

Added: projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/basic/test/DoubleInstallPlainUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/basic/test/DoubleInstallPlainUnitTestCase.java	                        (rev 0)
+++ projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/basic/test/DoubleInstallPlainUnitTestCase.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -0,0 +1,50 @@
+/*
+ * 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.basic.test;
+
+import junit.framework.Test;
+
+import org.jboss.test.AbstractTestDelegate;
+
+/**
+ * DoubleInstallPlainUnitTestCase.
+ * 
+ * @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @version $Revision: 82920 $
+ */
+public class DoubleInstallPlainUnitTestCase extends DoubleInstallTest
+{
+   public static Test suite()
+   {
+      return suite(DoubleInstallPlainUnitTestCase.class);
+   }
+
+   public DoubleInstallPlainUnitTestCase(String name)
+   {
+      super(name);
+   }
+
+   public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
+   {
+      return getPlainControllerDelegate(clazz);
+   }
+}

Added: projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/classloader/test/ContextClassLoaderNewUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/classloader/test/ContextClassLoaderNewUnitTestCase.java	                        (rev 0)
+++ projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/classloader/test/ContextClassLoaderNewUnitTestCase.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -0,0 +1,50 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2000, 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.classloader.test;
+
+import junit.framework.Test;
+
+import org.jboss.test.AbstractTestDelegate;
+
+/**
+ * ContextClassLoaderNewUnitTestCase.
+ * 
+ * @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @version $Revision: 1.1 $
+ */
+public class ContextClassLoaderNewUnitTestCase extends ContextClassLoaderTest
+{
+   public static Test suite()
+   {
+      return suite(ContextClassLoaderNewUnitTestCase.class);
+   }
+
+   public ContextClassLoaderNewUnitTestCase(String name)
+   {
+      super(name);
+   }
+
+   public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
+   {
+      return getNewControllerDelegate(clazz);
+   }
+}

Added: projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/classloader/test/ContextClassLoaderPlainUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/classloader/test/ContextClassLoaderPlainUnitTestCase.java	                        (rev 0)
+++ projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/classloader/test/ContextClassLoaderPlainUnitTestCase.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -0,0 +1,50 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2000, 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.classloader.test;
+
+import junit.framework.Test;
+
+import org.jboss.test.AbstractTestDelegate;
+
+/**
+ * ContextClassLoaderPlainUnitTestCase.
+ * 
+ * @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @version $Revision: 1.1 $
+ */
+public class ContextClassLoaderPlainUnitTestCase extends ContextClassLoaderTest
+{
+   public static Test suite()
+   {
+      return suite(ContextClassLoaderPlainUnitTestCase.class);
+   }
+
+   public ContextClassLoaderPlainUnitTestCase(String name)
+   {
+      super(name);
+   }
+
+   public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
+   {
+      return getPlainControllerDelegate(clazz);
+   }
+}

Added: projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/classloader/test/ContextClassLoaderTest.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/classloader/test/ContextClassLoaderTest.java	                        (rev 0)
+++ projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/classloader/test/ContextClassLoaderTest.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -0,0 +1,73 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, 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.classloader.test;
+
+import javax.management.Attribute;
+import javax.management.AttributeList;
+import javax.management.MBeanServer;
+import javax.management.Notification;
+import javax.management.NotificationListener;
+import javax.management.ObjectName;
+
+import org.jboss.test.system.controller.AbstractControllerTest;
+import org.jboss.test.system.controller.support.ContextClassLoaderMBean;
+import org.jboss.test.system.controller.support.ContextClassLoaderTester;
+
+/**
+ * ContextClassLoaderTest.
+ * 
+ * @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @version $Revision: 1.1 $
+ */
+public abstract class ContextClassLoaderTest extends AbstractControllerTest implements NotificationListener
+{
+   public ContextClassLoaderTest(String name)
+   {
+      super(name);
+   }
+   
+   public void testContextClassLoader() throws Exception
+   {
+      ContextClassLoaderTester.classLoader = getMBean(ClassLoader.class, ContextClassLoaderMBean.OBJECT_NAME, "Instance");
+      
+      ObjectName test = new ObjectName("jboss.test:type=test");
+      
+      MBeanServer server = getServer();
+      server.createMBean(ContextClassLoaderTester.class.getName(), test, ContextClassLoaderMBean.OBJECT_NAME);
+      server.getAttribute(test, "test");
+      server.setAttribute(test, new Attribute("test", "hello"));
+      server.getAttributes(test, new String[] { "test" });
+      AttributeList attributes = new AttributeList();
+      attributes.add(new Attribute("test", "hello"));
+      server.setAttributes(test, attributes);
+      server.invoke(test, "hello", null, null);
+      
+      server.addNotificationListener(test, this, null, null);
+      server.removeNotificationListener(test, this);
+      
+      assertEquals(ContextClassLoaderTester.classLoader, server.getClassLoaderFor(test));
+   }
+
+   public void handleNotification(Notification notification, Object handback)
+   {
+   }
+}

Added: projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/classloader/test/ControllerClassLoaderTestSuite.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/classloader/test/ControllerClassLoaderTestSuite.java	                        (rev 0)
+++ projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/classloader/test/ControllerClassLoaderTestSuite.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -0,0 +1,50 @@
+/*
+ * 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.classloader.test;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+import junit.textui.TestRunner;
+
+/**
+ * ControllerClassLoaderTestSuite.
+ * 
+ * @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @version $Revision: 1.1 $
+ */
+public class ControllerClassLoaderTestSuite extends TestSuite
+{
+   public static void main(String[] args)
+   {
+      TestRunner.run(suite());
+   }
+
+   public static Test suite()
+   {
+      TestSuite suite = new TestSuite("Controller ClassLoader Tests");
+
+      suite.addTest(ContextClassLoaderNewUnitTestCase.suite());
+      suite.addTest(ContextClassLoaderPlainUnitTestCase.suite());
+      
+      return suite;
+   }
+}

Modified: projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/configure/attribute/test/AttributeNewUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/configure/attribute/test/AttributeNewUnitTestCase.java	2009-03-30 14:20:22 UTC (rev 86476)
+++ projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/configure/attribute/test/AttributeNewUnitTestCase.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -43,7 +43,7 @@
       super(name);
    }
 
-   public static AbstractTestDelegate getDelegate(Class clazz) throws Exception
+   public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
    {
       return getNewControllerDelegate(clazz);
    }

Added: projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/configure/attribute/test/AttributePlainUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/configure/attribute/test/AttributePlainUnitTestCase.java	                        (rev 0)
+++ projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/configure/attribute/test/AttributePlainUnitTestCase.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -0,0 +1,50 @@
+/*
+ * 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.configure.attribute.test;
+
+import junit.framework.Test;
+
+import org.jboss.test.AbstractTestDelegate;
+
+/**
+ * AttributePlainUnitTestCase.
+ * 
+ * @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @version $Revision: 82920 $
+ */
+public class AttributePlainUnitTestCase extends AttributeTest
+{
+   public static Test suite()
+   {
+      return suite(AttributePlainUnitTestCase.class);
+   }
+
+   public AttributePlainUnitTestCase(String name)
+   {
+      super(name);
+   }
+
+   public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
+   {
+      return getPlainControllerDelegate(clazz);
+   }
+}

Modified: projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/configure/attribute/test/DependsAttributeNewUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/configure/attribute/test/DependsAttributeNewUnitTestCase.java	2009-03-30 14:20:22 UTC (rev 86476)
+++ projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/configure/attribute/test/DependsAttributeNewUnitTestCase.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -43,7 +43,7 @@
       super(name);
    }
 
-   public static AbstractTestDelegate getDelegate(Class clazz) throws Exception
+   public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
    {
       return getNewControllerDelegate(clazz);
    }

Modified: projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/configure/attribute/test/DependsAttributeOldUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/configure/attribute/test/DependsAttributeOldUnitTestCase.java	2009-03-30 14:20:22 UTC (rev 86476)
+++ projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/configure/attribute/test/DependsAttributeOldUnitTestCase.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -47,7 +47,7 @@
       super(name);
    }
 
-   public static AbstractTestDelegate getDelegate(Class clazz) throws Exception
+   public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
    {
       return getOldControllerDelegate(clazz);
    }

Added: projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/configure/attribute/test/DependsAttributePlainUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/configure/attribute/test/DependsAttributePlainUnitTestCase.java	                        (rev 0)
+++ projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/configure/attribute/test/DependsAttributePlainUnitTestCase.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -0,0 +1,50 @@
+/*
+ * 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.configure.attribute.test;
+
+import junit.framework.Test;
+
+import org.jboss.test.AbstractTestDelegate;
+
+/**
+ * DependsAttributePlainUnitTestCase.
+ * 
+ * @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @version $Revision: 82920 $
+ */
+public class DependsAttributePlainUnitTestCase extends DependsAttributeTest
+{
+   public static Test suite()
+   {
+      return suite(DependsAttributePlainUnitTestCase.class);
+   }
+
+   public DependsAttributePlainUnitTestCase(String name)
+   {
+      super(name);
+   }
+
+   public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
+   {
+      return getPlainControllerDelegate(clazz);
+   }
+}

Added: projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/configure/attribute/test/DependsListAttributePlainUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/configure/attribute/test/DependsListAttributePlainUnitTestCase.java	                        (rev 0)
+++ projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/configure/attribute/test/DependsListAttributePlainUnitTestCase.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -0,0 +1,50 @@
+/*
+ * 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.configure.attribute.test;
+
+import junit.framework.Test;
+
+import org.jboss.test.AbstractTestDelegate;
+
+/**
+ * DependsListAttributePlainUnitTestCase.
+ * 
+ * @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @version $Revision: 82920 $
+ */
+public class DependsListAttributePlainUnitTestCase extends DependsListAttributeTest
+{
+   public static Test suite()
+   {
+      return suite(DependsListAttributePlainUnitTestCase.class);
+   }
+
+   public DependsListAttributePlainUnitTestCase(String name)
+   {
+      super(name);
+   }
+
+   public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
+   {
+      return getPlainControllerDelegate(clazz);
+   }
+}

Modified: projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/configure/test/ConfigureRedeployAfterErrorNewUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/configure/test/ConfigureRedeployAfterErrorNewUnitTestCase.java	2009-03-30 14:20:22 UTC (rev 86476)
+++ projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/configure/test/ConfigureRedeployAfterErrorNewUnitTestCase.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -43,7 +43,7 @@
       super(name);
    }
 
-   public static AbstractTestDelegate getDelegate(Class clazz) throws Exception
+   public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
    {
       return getNewControllerDelegate(clazz);
    }

Modified: projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/configure/test/ConfigureRedeployAfterErrorOldUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/configure/test/ConfigureRedeployAfterErrorOldUnitTestCase.java	2009-03-30 14:20:22 UTC (rev 86476)
+++ projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/configure/test/ConfigureRedeployAfterErrorOldUnitTestCase.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -43,7 +43,7 @@
       super(name);
    }
 
-   public static AbstractTestDelegate getDelegate(Class clazz) throws Exception
+   public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
    {
       return getOldControllerDelegate(clazz);
    }

Added: projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/configure/test/ConfigureRedeployAfterErrorPlainUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/configure/test/ConfigureRedeployAfterErrorPlainUnitTestCase.java	                        (rev 0)
+++ projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/configure/test/ConfigureRedeployAfterErrorPlainUnitTestCase.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -0,0 +1,50 @@
+/*
+ * 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.configure.test;
+
+import junit.framework.Test;
+
+import org.jboss.test.AbstractTestDelegate;
+
+/**
+ * ConfigureRedeployAfterErrorPlainUnitTestCase.
+ * 
+ * @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @version $Revision: 82920 $
+ */
+public class ConfigureRedeployAfterErrorPlainUnitTestCase extends ConfigureRedeployAfterErrorTest
+{
+   public static Test suite()
+   {
+      return suite(ConfigureRedeployAfterErrorPlainUnitTestCase.class);
+   }
+
+   public ConfigureRedeployAfterErrorPlainUnitTestCase(String name)
+   {
+      super(name);
+   }
+
+   public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
+   {
+      return getPlainControllerDelegate(clazz);
+   }
+}

Modified: projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/configure/test/ControllerConfigureTestSuite.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/configure/test/ControllerConfigureTestSuite.java	2009-03-30 14:20:22 UTC (rev 86476)
+++ projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/configure/test/ControllerConfigureTestSuite.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -27,10 +27,13 @@
 
 import org.jboss.test.system.controller.configure.attribute.test.AttributeNewUnitTestCase;
 import org.jboss.test.system.controller.configure.attribute.test.AttributeOldUnitTestCase;
+import org.jboss.test.system.controller.configure.attribute.test.AttributePlainUnitTestCase;
 import org.jboss.test.system.controller.configure.attribute.test.DependsAttributeNewUnitTestCase;
 import org.jboss.test.system.controller.configure.attribute.test.DependsAttributeOldUnitTestCase;
+import org.jboss.test.system.controller.configure.attribute.test.DependsAttributePlainUnitTestCase;
 import org.jboss.test.system.controller.configure.attribute.test.DependsListAttributeNewUnitTestCase;
 import org.jboss.test.system.controller.configure.attribute.test.DependsListAttributeOldUnitTestCase;
+import org.jboss.test.system.controller.configure.attribute.test.DependsListAttributePlainUnitTestCase;
 import org.jboss.test.system.controller.configure.value.ControllerConfigureValueTestSuite;
 
 /**
@@ -52,13 +55,17 @@
 
       suite.addTest(AttributeOldUnitTestCase.suite());
       suite.addTest(AttributeNewUnitTestCase.suite());
+      suite.addTest(AttributePlainUnitTestCase.suite());
       suite.addTest(DependsAttributeOldUnitTestCase.suite());
       suite.addTest(DependsAttributeNewUnitTestCase.suite());
+      suite.addTest(DependsAttributePlainUnitTestCase.suite());
       suite.addTest(DependsListAttributeOldUnitTestCase.suite());
       suite.addTest(DependsListAttributeNewUnitTestCase.suite());
+      suite.addTest(DependsListAttributePlainUnitTestCase.suite());
       suite.addTest(ControllerConfigureValueTestSuite.suite());
       suite.addTest(ConfigureRedeployAfterErrorOldUnitTestCase.suite());
       suite.addTest(ConfigureRedeployAfterErrorNewUnitTestCase.suite());
+      suite.addTest(ConfigureRedeployAfterErrorPlainUnitTestCase.suite());
       
       return suite;
    }

Modified: projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/configure/value/ControllerConfigureValueTestSuite.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/configure/value/ControllerConfigureValueTestSuite.java	2009-03-30 14:20:22 UTC (rev 86476)
+++ projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/configure/value/ControllerConfigureValueTestSuite.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -23,17 +23,23 @@
 
 import org.jboss.test.system.controller.configure.value.depends.test.DependencyValueNewUnitTestCase;
 import org.jboss.test.system.controller.configure.value.depends.test.DependencyValueOldUnitTestCase;
+import org.jboss.test.system.controller.configure.value.depends.test.DependencyValuePlainUnitTestCase;
 import org.jboss.test.system.controller.configure.value.dependslist.test.DependencyListValueNewUnitTestCase;
 import org.jboss.test.system.controller.configure.value.dependslist.test.DependencyListValueOldUnitTestCase;
+import org.jboss.test.system.controller.configure.value.dependslist.test.DependencyListValuePlainUnitTestCase;
 import org.jboss.test.system.controller.configure.value.element.test.ElementValueNewUnitTestCase;
 import org.jboss.test.system.controller.configure.value.element.test.ElementValueOldUnitTestCase;
+import org.jboss.test.system.controller.configure.value.element.test.ElementValuePlainUnitTestCase;
 import org.jboss.test.system.controller.configure.value.inject.test.NewInjectionValueUnitTestCase;
 import org.jboss.test.system.controller.configure.value.javabean.test.JavaBeanValueNewUnitTestCase;
 import org.jboss.test.system.controller.configure.value.javabean.test.JavaBeanValueOldUnitTestCase;
+import org.jboss.test.system.controller.configure.value.javabean.test.JavaBeanValuePlainUnitTestCase;
 import org.jboss.test.system.controller.configure.value.jbxb.test.JBXBValueNewUnitTestCase;
 import org.jboss.test.system.controller.configure.value.jbxb.test.JBXBValueOldUnitTestCase;
+import org.jboss.test.system.controller.configure.value.jbxb.test.JBXBValuePlainUnitTestCase;
 import org.jboss.test.system.controller.configure.value.text.test.TextValueNewUnitTestCase;
 import org.jboss.test.system.controller.configure.value.text.test.TextValueOldUnitTestCase;
+import org.jboss.test.system.controller.configure.value.text.test.TextValuePlainUnitTestCase;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
@@ -58,16 +64,22 @@
 
       suite.addTest(TextValueOldUnitTestCase.suite());
       suite.addTest(TextValueNewUnitTestCase.suite());
+      suite.addTest(TextValuePlainUnitTestCase.suite());
       suite.addTest(DependencyValueOldUnitTestCase.suite());
       suite.addTest(DependencyValueNewUnitTestCase.suite());
+      suite.addTest(DependencyValuePlainUnitTestCase.suite());
       suite.addTest(DependencyListValueOldUnitTestCase.suite());
       suite.addTest(DependencyListValueNewUnitTestCase.suite());
+      suite.addTest(DependencyListValuePlainUnitTestCase.suite());
       suite.addTest(ElementValueOldUnitTestCase.suite());
       suite.addTest(ElementValueNewUnitTestCase.suite());
+      suite.addTest(ElementValuePlainUnitTestCase.suite());
       suite.addTest(JavaBeanValueOldUnitTestCase.suite());
       suite.addTest(JavaBeanValueNewUnitTestCase.suite());
+      suite.addTest(JavaBeanValuePlainUnitTestCase.suite());
       suite.addTest(JBXBValueOldUnitTestCase.suite());
       suite.addTest(JBXBValueNewUnitTestCase.suite());
+      suite.addTest(JBXBValuePlainUnitTestCase.suite());
       suite.addTest(NewInjectionValueUnitTestCase.suite());
       
       return suite;

Modified: projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/configure/value/depends/test/DependencyValueNewUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/configure/value/depends/test/DependencyValueNewUnitTestCase.java	2009-03-30 14:20:22 UTC (rev 86476)
+++ projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/configure/value/depends/test/DependencyValueNewUnitTestCase.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -43,7 +43,7 @@
       super(name);
    }
 
-   public static AbstractTestDelegate getDelegate(Class clazz) throws Exception
+   public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
    {
       return getNewControllerDelegate(clazz);
    }

Modified: projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/configure/value/depends/test/DependencyValueOldUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/configure/value/depends/test/DependencyValueOldUnitTestCase.java	2009-03-30 14:20:22 UTC (rev 86476)
+++ projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/configure/value/depends/test/DependencyValueOldUnitTestCase.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -45,7 +45,7 @@
       super(name);
    }
 
-   public static AbstractTestDelegate getDelegate(Class clazz) throws Exception
+   public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
    {
       return getOldControllerDelegate(clazz);
    }

Added: projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/configure/value/depends/test/DependencyValuePlainUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/configure/value/depends/test/DependencyValuePlainUnitTestCase.java	                        (rev 0)
+++ projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/configure/value/depends/test/DependencyValuePlainUnitTestCase.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -0,0 +1,50 @@
+/*
+ * 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.configure.value.depends.test;
+
+import junit.framework.Test;
+
+import org.jboss.test.AbstractTestDelegate;
+
+/**
+ * DependencyValuePlainUnitTestCase.
+ * 
+ * @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @version $Revision: 82920 $
+ */
+public class DependencyValuePlainUnitTestCase extends DependencyValueTest
+{
+   public static Test suite()
+   {
+      return suite(DependencyValuePlainUnitTestCase.class);
+   }
+
+   public DependencyValuePlainUnitTestCase(String name)
+   {
+      super(name);
+   }
+
+   public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
+   {
+      return getPlainControllerDelegate(clazz);
+   }
+}

Modified: projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/configure/value/dependslist/test/DependencyListValueNewUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/configure/value/dependslist/test/DependencyListValueNewUnitTestCase.java	2009-03-30 14:20:22 UTC (rev 86476)
+++ projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/configure/value/dependslist/test/DependencyListValueNewUnitTestCase.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -43,7 +43,7 @@
       super(name);
    }
 
-   public static AbstractTestDelegate getDelegate(Class clazz) throws Exception
+   public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
    {
       return getNewControllerDelegate(clazz);
    }

Modified: projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/configure/value/dependslist/test/DependencyListValueOldUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/configure/value/dependslist/test/DependencyListValueOldUnitTestCase.java	2009-03-30 14:20:22 UTC (rev 86476)
+++ projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/configure/value/dependslist/test/DependencyListValueOldUnitTestCase.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -45,7 +45,7 @@
       super(name);
    }
 
-   public static AbstractTestDelegate getDelegate(Class clazz) throws Exception
+   public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
    {
       return getOldControllerDelegate(clazz);
    }

Added: projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/configure/value/dependslist/test/DependencyListValuePlainUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/configure/value/dependslist/test/DependencyListValuePlainUnitTestCase.java	                        (rev 0)
+++ projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/configure/value/dependslist/test/DependencyListValuePlainUnitTestCase.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -0,0 +1,50 @@
+/*
+ * 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.configure.value.dependslist.test;
+
+import junit.framework.Test;
+
+import org.jboss.test.AbstractTestDelegate;
+
+/**
+ * DependencyListValuePlainUnitTestCase.
+ * 
+ * @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @version $Revision: 82920 $
+ */
+public class DependencyListValuePlainUnitTestCase extends DependencyListValueTest
+{
+   public static Test suite()
+   {
+      return suite(DependencyListValuePlainUnitTestCase.class);
+   }
+
+   public DependencyListValuePlainUnitTestCase(String name)
+   {
+      super(name);
+   }
+
+   public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
+   {
+      return getPlainControllerDelegate(clazz);
+   }
+}

Modified: projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/configure/value/element/test/ElementValueNewUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/configure/value/element/test/ElementValueNewUnitTestCase.java	2009-03-30 14:20:22 UTC (rev 86476)
+++ projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/configure/value/element/test/ElementValueNewUnitTestCase.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -43,7 +43,7 @@
       super(name);
    }
 
-   public static AbstractTestDelegate getDelegate(Class clazz) throws Exception
+   public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
    {
       return getNewControllerDelegate(clazz);
    }

Modified: projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/configure/value/element/test/ElementValueOldUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/configure/value/element/test/ElementValueOldUnitTestCase.java	2009-03-30 14:20:22 UTC (rev 86476)
+++ projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/configure/value/element/test/ElementValueOldUnitTestCase.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -43,7 +43,7 @@
       super(name);
    }
 
-   public static AbstractTestDelegate getDelegate(Class clazz) throws Exception
+   public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
    {
       return getOldControllerDelegate(clazz);
    }

Added: projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/configure/value/element/test/ElementValuePlainUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/configure/value/element/test/ElementValuePlainUnitTestCase.java	                        (rev 0)
+++ projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/configure/value/element/test/ElementValuePlainUnitTestCase.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -0,0 +1,50 @@
+/*
+ * 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.configure.value.element.test;
+
+import junit.framework.Test;
+
+import org.jboss.test.AbstractTestDelegate;
+
+/**
+ * ElementValuePlainUnitTestCase.
+ * 
+ * @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @version $Revision: 82920 $
+ */
+public class ElementValuePlainUnitTestCase extends ElementValueTest
+{
+   public static Test suite()
+   {
+      return suite(ElementValuePlainUnitTestCase.class);
+   }
+
+   public ElementValuePlainUnitTestCase(String name)
+   {
+      super(name);
+   }
+
+   public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
+   {
+      return getPlainControllerDelegate(clazz);
+   }
+}

Modified: projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/configure/value/inject/test/NewInjectionValueUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/configure/value/inject/test/NewInjectionValueUnitTestCase.java	2009-03-30 14:20:22 UTC (rev 86476)
+++ projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/configure/value/inject/test/NewInjectionValueUnitTestCase.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -51,7 +51,7 @@
       return suite(NewInjectionValueUnitTestCase.class);
    }
 
-   public static AbstractTestDelegate getDelegate(Class clazz) throws Exception
+   public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
    {
       return getNewControllerDelegate(clazz);
    }

Modified: projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/configure/value/javabean/test/JavaBeanValueNewUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/configure/value/javabean/test/JavaBeanValueNewUnitTestCase.java	2009-03-30 14:20:22 UTC (rev 86476)
+++ projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/configure/value/javabean/test/JavaBeanValueNewUnitTestCase.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -43,7 +43,7 @@
       super(name);
    }
 
-   public static AbstractTestDelegate getDelegate(Class clazz) throws Exception
+   public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
    {
       return getNewControllerDelegate(clazz);
    }

Modified: projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/configure/value/javabean/test/JavaBeanValueOldUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/configure/value/javabean/test/JavaBeanValueOldUnitTestCase.java	2009-03-30 14:20:22 UTC (rev 86476)
+++ projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/configure/value/javabean/test/JavaBeanValueOldUnitTestCase.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -43,7 +43,7 @@
       super(name);
    }
 
-   public static AbstractTestDelegate getDelegate(Class clazz) throws Exception
+   public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
    {
       return getOldControllerDelegate(clazz);
    }

Added: projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/configure/value/javabean/test/JavaBeanValuePlainUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/configure/value/javabean/test/JavaBeanValuePlainUnitTestCase.java	                        (rev 0)
+++ projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/configure/value/javabean/test/JavaBeanValuePlainUnitTestCase.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -0,0 +1,50 @@
+/*
+ * 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.configure.value.javabean.test;
+
+import junit.framework.Test;
+
+import org.jboss.test.AbstractTestDelegate;
+
+/**
+ * JavaBeanValuePlainUnitTestCase.
+ * 
+ * @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @version $Revision: 82920 $
+ */
+public class JavaBeanValuePlainUnitTestCase extends JavaBeanValueTest
+{
+   public static Test suite()
+   {
+      return suite(JavaBeanValuePlainUnitTestCase.class);
+   }
+
+   public JavaBeanValuePlainUnitTestCase(String name)
+   {
+      super(name);
+   }
+
+   public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
+   {
+      return getPlainControllerDelegate(clazz);
+   }
+}

Modified: projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/configure/value/jbxb/test/JBXBValueNewUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/configure/value/jbxb/test/JBXBValueNewUnitTestCase.java	2009-03-30 14:20:22 UTC (rev 86476)
+++ projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/configure/value/jbxb/test/JBXBValueNewUnitTestCase.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -43,7 +43,7 @@
       super(name);
    }
 
-   public static AbstractTestDelegate getDelegate(Class clazz) throws Exception
+   public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
    {
       return getNewControllerDelegate(clazz);
    }

Modified: projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/configure/value/jbxb/test/JBXBValueOldUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/configure/value/jbxb/test/JBXBValueOldUnitTestCase.java	2009-03-30 14:20:22 UTC (rev 86476)
+++ projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/configure/value/jbxb/test/JBXBValueOldUnitTestCase.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -43,7 +43,7 @@
       super(name);
    }
 
-   public static AbstractTestDelegate getDelegate(Class clazz) throws Exception
+   public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
    {
       return getOldControllerDelegate(clazz);
    }

Added: projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/configure/value/jbxb/test/JBXBValuePlainUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/configure/value/jbxb/test/JBXBValuePlainUnitTestCase.java	                        (rev 0)
+++ projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/configure/value/jbxb/test/JBXBValuePlainUnitTestCase.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -0,0 +1,50 @@
+/*
+ * 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.configure.value.jbxb.test;
+
+import junit.framework.Test;
+
+import org.jboss.test.AbstractTestDelegate;
+
+/**
+ * JBXBValuePlainUnitTestCase.
+ * 
+ * @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @version $Revision: 82920 $
+ */
+public class JBXBValuePlainUnitTestCase extends JBXBValueTest
+{
+   public static Test suite()
+   {
+      return suite(JBXBValuePlainUnitTestCase.class);
+   }
+
+   public JBXBValuePlainUnitTestCase(String name)
+   {
+      super(name);
+   }
+
+   public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
+   {
+      return getPlainControllerDelegate(clazz);
+   }
+}

Modified: projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/configure/value/text/test/TextValueNewUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/configure/value/text/test/TextValueNewUnitTestCase.java	2009-03-30 14:20:22 UTC (rev 86476)
+++ projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/configure/value/text/test/TextValueNewUnitTestCase.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -43,7 +43,7 @@
       super(name);
    }
 
-   public static AbstractTestDelegate getDelegate(Class clazz) throws Exception
+   public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
    {
       return getNewControllerDelegate(clazz);
    }

Added: projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/configure/value/text/test/TextValuePlainUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/configure/value/text/test/TextValuePlainUnitTestCase.java	                        (rev 0)
+++ projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/configure/value/text/test/TextValuePlainUnitTestCase.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -0,0 +1,50 @@
+/*
+ * 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.configure.value.text.test;
+
+import junit.framework.Test;
+
+import org.jboss.test.AbstractTestDelegate;
+
+/**
+ * TextValuePlainUnitTestCase.
+ * 
+ * @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @version $Revision: 82920 $
+ */
+public class TextValuePlainUnitTestCase extends TextValueTest
+{
+   public static Test suite()
+   {
+      return suite(TextValuePlainUnitTestCase.class);
+   }
+
+   public TextValuePlainUnitTestCase(String name)
+   {
+      super(name);
+   }
+
+   public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
+   {
+      return getPlainControllerDelegate(clazz);
+   }
+}

Modified: projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/instantiate/plain/test/PlainMBeanNewUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/instantiate/plain/test/PlainMBeanNewUnitTestCase.java	2009-03-30 14:20:22 UTC (rev 86476)
+++ projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/instantiate/plain/test/PlainMBeanNewUnitTestCase.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -43,7 +43,7 @@
       super(name);
    }
 
-   public static AbstractTestDelegate getDelegate(Class clazz) throws Exception
+   public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
    {
       return getNewControllerDelegate(clazz);
    }

Modified: projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/instantiate/plain/test/PlainMBeanOldUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/instantiate/plain/test/PlainMBeanOldUnitTestCase.java	2009-03-30 14:20:22 UTC (rev 86476)
+++ projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/instantiate/plain/test/PlainMBeanOldUnitTestCase.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -43,7 +43,7 @@
       super(name);
    }
 
-   public static AbstractTestDelegate getDelegate(Class clazz) throws Exception
+   public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
    {
       return getOldControllerDelegate(clazz);
    }

Added: projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/instantiate/plain/test/PlainMBeanPlainUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/instantiate/plain/test/PlainMBeanPlainUnitTestCase.java	                        (rev 0)
+++ projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/instantiate/plain/test/PlainMBeanPlainUnitTestCase.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -0,0 +1,50 @@
+/*
+ * 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.plain.test;
+
+import junit.framework.Test;
+
+import org.jboss.test.AbstractTestDelegate;
+
+/**
+ * PlainMBeanPlainUnitTestCase.
+ * 
+ * @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @version $Revision: 82920 $
+ */
+public class PlainMBeanPlainUnitTestCase extends PlainMBeanRedeployAfterErrorTest
+{
+   public static Test suite()
+   {
+      return suite(PlainMBeanPlainUnitTestCase.class);
+   }
+
+   public PlainMBeanPlainUnitTestCase(String name)
+   {
+      super(name);
+   }
+
+   public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
+   {
+      return getPlainControllerDelegate(clazz);
+   }
+}

Modified: projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/instantiate/plain/test/PlainMBeanRedeployAfterErrorNewUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/instantiate/plain/test/PlainMBeanRedeployAfterErrorNewUnitTestCase.java	2009-03-30 14:20:22 UTC (rev 86476)
+++ projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/instantiate/plain/test/PlainMBeanRedeployAfterErrorNewUnitTestCase.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -43,7 +43,7 @@
       super(name);
    }
 
-   public static AbstractTestDelegate getDelegate(Class clazz) throws Exception
+   public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
    {
       return getNewControllerDelegate(clazz);
    }

Modified: projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/instantiate/plain/test/PlainMBeanRedeployAfterErrorOldUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/instantiate/plain/test/PlainMBeanRedeployAfterErrorOldUnitTestCase.java	2009-03-30 14:20:22 UTC (rev 86476)
+++ projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/instantiate/plain/test/PlainMBeanRedeployAfterErrorOldUnitTestCase.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -43,7 +43,7 @@
       super(name);
    }
 
-   public static AbstractTestDelegate getDelegate(Class clazz) throws Exception
+   public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
    {
       return getOldControllerDelegate(clazz);
    }

Added: projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/instantiate/plain/test/PlainMBeanRedeployAfterErrorPlainUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/instantiate/plain/test/PlainMBeanRedeployAfterErrorPlainUnitTestCase.java	                        (rev 0)
+++ projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/instantiate/plain/test/PlainMBeanRedeployAfterErrorPlainUnitTestCase.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -0,0 +1,59 @@
+/*
+ * 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.plain.test;
+
+import javax.management.NotCompliantMBeanException;
+
+import junit.framework.Test;
+
+import org.jboss.test.AbstractTestDelegate;
+import org.jboss.test.system.controller.support.BrokenDynamicMBean;
+
+/**
+ * PlainMBeanPlainUnitTestCase.
+ * 
+ * @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @version $Revision: 82920 $
+ */
+public class PlainMBeanRedeployAfterErrorPlainUnitTestCase extends PlainMBeanTest
+{
+   public static Test suite()
+   {
+      return suite(PlainMBeanRedeployAfterErrorPlainUnitTestCase.class);
+   }
+
+   public PlainMBeanRedeployAfterErrorPlainUnitTestCase(String name)
+   {
+      super(name);
+   }
+
+   public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
+   {
+      return getPlainControllerDelegate(clazz);
+   }
+   
+   // The JDK MBeanServer eats the error message :-(
+   public void testPlainMBeanGetMBeanInfoError() throws Exception
+   {
+      assertMaybeDeployFailure(BrokenDynamicMBean.OBJECT_NAME, NotCompliantMBeanException.class);
+   }
+}

Modified: projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/instantiate/standard/test/StandardMBeanNewUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/instantiate/standard/test/StandardMBeanNewUnitTestCase.java	2009-03-30 14:20:22 UTC (rev 86476)
+++ projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/instantiate/standard/test/StandardMBeanNewUnitTestCase.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -43,7 +43,7 @@
       super(name);
    }
 
-   public static AbstractTestDelegate getDelegate(Class clazz) throws Exception
+   public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
    {
       return getNewControllerDelegate(clazz);
    }

Modified: projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/instantiate/standard/test/StandardMBeanOldUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/instantiate/standard/test/StandardMBeanOldUnitTestCase.java	2009-03-30 14:20:22 UTC (rev 86476)
+++ projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/instantiate/standard/test/StandardMBeanOldUnitTestCase.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -43,7 +43,7 @@
       super(name);
    }
 
-   public static AbstractTestDelegate getDelegate(Class clazz) throws Exception
+   public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
    {
       return getOldControllerDelegate(clazz);
    }

Added: projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/instantiate/standard/test/StandardMBeanPlainUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/instantiate/standard/test/StandardMBeanPlainUnitTestCase.java	                        (rev 0)
+++ projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/instantiate/standard/test/StandardMBeanPlainUnitTestCase.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -0,0 +1,50 @@
+/*
+ * 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.standard.test;
+
+import junit.framework.Test;
+
+import org.jboss.test.AbstractTestDelegate;
+
+/**
+ * StandardMBeanPlainUnitTestCase.
+ * 
+ * @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @version $Revision: 82920 $
+ */
+public class StandardMBeanPlainUnitTestCase extends StandardMBeanTest
+{
+   public static Test suite()
+   {
+      return suite(StandardMBeanPlainUnitTestCase.class);
+   }
+
+   public StandardMBeanPlainUnitTestCase(String name)
+   {
+      super(name);
+   }
+
+   public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
+   {
+      return getPlainControllerDelegate(clazz);
+   }
+}

Modified: projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/instantiate/standard/test/StandardMBeanRedeployAfterErrorNewUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/instantiate/standard/test/StandardMBeanRedeployAfterErrorNewUnitTestCase.java	2009-03-30 14:20:22 UTC (rev 86476)
+++ projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/instantiate/standard/test/StandardMBeanRedeployAfterErrorNewUnitTestCase.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -43,7 +43,7 @@
       super(name);
    }
 
-   public static AbstractTestDelegate getDelegate(Class clazz) throws Exception
+   public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
    {
       return getNewControllerDelegate(clazz);
    }

Modified: projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/instantiate/standard/test/StandardMBeanRedeployAfterErrorOldUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/instantiate/standard/test/StandardMBeanRedeployAfterErrorOldUnitTestCase.java	2009-03-30 14:20:22 UTC (rev 86476)
+++ projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/instantiate/standard/test/StandardMBeanRedeployAfterErrorOldUnitTestCase.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -43,7 +43,7 @@
       super(name);
    }
 
-   public static AbstractTestDelegate getDelegate(Class clazz) throws Exception
+   public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
    {
       return getOldControllerDelegate(clazz);
    }

Added: projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/instantiate/standard/test/StandardMBeanRedeployAfterErrorPlainUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/instantiate/standard/test/StandardMBeanRedeployAfterErrorPlainUnitTestCase.java	                        (rev 0)
+++ projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/instantiate/standard/test/StandardMBeanRedeployAfterErrorPlainUnitTestCase.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -0,0 +1,50 @@
+/*
+ * 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.standard.test;
+
+import junit.framework.Test;
+
+import org.jboss.test.AbstractTestDelegate;
+
+/**
+ * StandardMBeanPlainUnitTestCase.
+ * 
+ * @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @version $Revision: 82920 $
+ */
+public class StandardMBeanRedeployAfterErrorPlainUnitTestCase extends StandardMBeanRedeployAfterErrorTest
+{
+   public static Test suite()
+   {
+      return suite(StandardMBeanRedeployAfterErrorPlainUnitTestCase.class);
+   }
+
+   public StandardMBeanRedeployAfterErrorPlainUnitTestCase(String name)
+   {
+      super(name);
+   }
+
+   public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
+   {
+      return getPlainControllerDelegate(clazz);
+   }
+}

Modified: projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/instantiate/test/ConstructorArgsErrorNewUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/instantiate/test/ConstructorArgsErrorNewUnitTestCase.java	2009-03-30 14:20:22 UTC (rev 86476)
+++ projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/instantiate/test/ConstructorArgsErrorNewUnitTestCase.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -43,7 +43,7 @@
       super(name);
    }
 
-   public static AbstractTestDelegate getDelegate(Class clazz) throws Exception
+   public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
    {
       return getNewControllerDelegate(clazz);
    }

Modified: projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/instantiate/test/ConstructorArgsErrorOldUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/instantiate/test/ConstructorArgsErrorOldUnitTestCase.java	2009-03-30 14:20:22 UTC (rev 86476)
+++ projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/instantiate/test/ConstructorArgsErrorOldUnitTestCase.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -44,7 +44,7 @@
       super(name);
    }
 
-   public static AbstractTestDelegate getDelegate(Class clazz) throws Exception
+   public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
    {
       return getOldControllerDelegate(clazz);
    }

Added: projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/instantiate/test/ConstructorArgsErrorPlainUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/instantiate/test/ConstructorArgsErrorPlainUnitTestCase.java	                        (rev 0)
+++ projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/instantiate/test/ConstructorArgsErrorPlainUnitTestCase.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -0,0 +1,50 @@
+/*
+ * 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.test.AbstractTestDelegate;
+
+/**
+ * ConstructorArgsErrorPlainUnitTestCase.
+ * 
+ * @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @version $Revision: 82920 $
+ */
+public class ConstructorArgsErrorPlainUnitTestCase extends ConstructorArgsErrorTest
+{
+   public static Test suite()
+   {
+      return suite(ConstructorArgsErrorPlainUnitTestCase.class);
+   }
+
+   public ConstructorArgsErrorPlainUnitTestCase(String name)
+   {
+      super(name);
+   }
+
+   public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
+   {
+      return getPlainControllerDelegate(clazz);
+   }
+}

Modified: projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/instantiate/test/ConstructorArgsNewUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/instantiate/test/ConstructorArgsNewUnitTestCase.java	2009-03-30 14:20:22 UTC (rev 86476)
+++ projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/instantiate/test/ConstructorArgsNewUnitTestCase.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -43,7 +43,7 @@
       super(name);
    }
 
-   public static AbstractTestDelegate getDelegate(Class clazz) throws Exception
+   public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
    {
       return getNewControllerDelegate(clazz);
    }

Modified: projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/instantiate/test/ConstructorArgsOldUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/instantiate/test/ConstructorArgsOldUnitTestCase.java	2009-03-30 14:20:22 UTC (rev 86476)
+++ projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/instantiate/test/ConstructorArgsOldUnitTestCase.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -43,7 +43,7 @@
       super(name);
    }
 
-   public static AbstractTestDelegate getDelegate(Class clazz) throws Exception
+   public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
    {
       return getOldControllerDelegate(clazz);
    }

Added: projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/instantiate/test/ConstructorArgsPlainUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/instantiate/test/ConstructorArgsPlainUnitTestCase.java	                        (rev 0)
+++ projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/instantiate/test/ConstructorArgsPlainUnitTestCase.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -0,0 +1,50 @@
+/*
+ * 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.test.AbstractTestDelegate;
+
+/**
+ * ConstructorArgsPlainUnitTestCase.
+ * 
+ * @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @version $Revision: 82920 $
+ */
+public class ConstructorArgsPlainUnitTestCase extends ConstructorArgsTest
+{
+   public static Test suite()
+   {
+      return suite(ConstructorArgsPlainUnitTestCase.class);
+   }
+
+   public ConstructorArgsPlainUnitTestCase(String name)
+   {
+      super(name);
+   }
+
+   public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
+   {
+      return getPlainControllerDelegate(clazz);
+   }
+}

Modified: projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/instantiate/test/ControllerInstantiateTestSuite.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/instantiate/test/ControllerInstantiateTestSuite.java	2009-03-30 14:20:22 UTC (rev 86476)
+++ projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/instantiate/test/ControllerInstantiateTestSuite.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -23,12 +23,16 @@
 
 import org.jboss.test.system.controller.instantiate.plain.test.PlainMBeanNewUnitTestCase;
 import org.jboss.test.system.controller.instantiate.plain.test.PlainMBeanOldUnitTestCase;
+import org.jboss.test.system.controller.instantiate.plain.test.PlainMBeanPlainUnitTestCase;
 import org.jboss.test.system.controller.instantiate.plain.test.PlainMBeanRedeployAfterErrorNewUnitTestCase;
 import org.jboss.test.system.controller.instantiate.plain.test.PlainMBeanRedeployAfterErrorOldUnitTestCase;
+import org.jboss.test.system.controller.instantiate.plain.test.PlainMBeanRedeployAfterErrorPlainUnitTestCase;
 import org.jboss.test.system.controller.instantiate.standard.test.StandardMBeanNewUnitTestCase;
 import org.jboss.test.system.controller.instantiate.standard.test.StandardMBeanOldUnitTestCase;
+import org.jboss.test.system.controller.instantiate.standard.test.StandardMBeanPlainUnitTestCase;
 import org.jboss.test.system.controller.instantiate.standard.test.StandardMBeanRedeployAfterErrorNewUnitTestCase;
 import org.jboss.test.system.controller.instantiate.standard.test.StandardMBeanRedeployAfterErrorOldUnitTestCase;
+import org.jboss.test.system.controller.instantiate.standard.test.StandardMBeanRedeployAfterErrorPlainUnitTestCase;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
@@ -54,16 +58,22 @@
       suite.addTest(NewNoMetaDataInstantiateUnitTestCase.suite());
       suite.addTest(ConstructorArgsOldUnitTestCase.suite());
       suite.addTest(ConstructorArgsNewUnitTestCase.suite());
+      suite.addTest(ConstructorArgsPlainUnitTestCase.suite());
       suite.addTest(PlainMBeanOldUnitTestCase.suite());
       suite.addTest(PlainMBeanNewUnitTestCase.suite());
+      suite.addTest(PlainMBeanPlainUnitTestCase.suite());
       suite.addTest(PlainMBeanRedeployAfterErrorOldUnitTestCase.suite());
       suite.addTest(PlainMBeanRedeployAfterErrorNewUnitTestCase.suite());
+      suite.addTest(PlainMBeanRedeployAfterErrorPlainUnitTestCase.suite());
       suite.addTest(StandardMBeanOldUnitTestCase.suite());
       suite.addTest(StandardMBeanNewUnitTestCase.suite());
+      suite.addTest(StandardMBeanPlainUnitTestCase.suite());
       suite.addTest(StandardMBeanRedeployAfterErrorOldUnitTestCase.suite());
       suite.addTest(StandardMBeanRedeployAfterErrorNewUnitTestCase.suite());
+      suite.addTest(StandardMBeanRedeployAfterErrorPlainUnitTestCase.suite());
       suite.addTest(ConstructorArgsErrorOldUnitTestCase.suite());
       suite.addTest(ConstructorArgsErrorNewUnitTestCase.suite());
+      suite.addTest(ConstructorArgsErrorPlainUnitTestCase.suite());
       
       return suite;
    }

Modified: projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/instantiate/test/NewNoMetaDataInstantiateUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/instantiate/test/NewNoMetaDataInstantiateUnitTestCase.java	2009-03-30 14:20:22 UTC (rev 86476)
+++ projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/instantiate/test/NewNoMetaDataInstantiateUnitTestCase.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -50,7 +50,7 @@
       super(name);
    }
 
-   public static AbstractTestDelegate getDelegate(Class clazz) throws Exception
+   public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
    {
       return getNewControllerDelegate(clazz);
    }

Modified: projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/integration/test/AbstractIntegrationTest.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/integration/test/AbstractIntegrationTest.java	2009-03-30 14:20:22 UTC (rev 86476)
+++ projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/integration/test/AbstractIntegrationTest.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -47,7 +47,7 @@
       super(name);
    }
    
-   public static AbstractTestDelegate getDelegate(Class clazz) throws Exception
+   public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
    {
       IntegrationTestDelegate delegate = new IntegrationTestDelegate(clazz);
       // @todo delegate.enableSecurity = true;

Modified: projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/integration/test/IntegrationTestDelegate.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/integration/test/IntegrationTestDelegate.java	2009-03-30 14:20:22 UTC (rev 86476)
+++ projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/integration/test/IntegrationTestDelegate.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -49,7 +49,7 @@
    /** The deployer */
    protected BasicXMLDeployer beanDeployer;
 
-   public IntegrationTestDelegate(Class clazz)
+   public IntegrationTestDelegate(Class<?> clazz)
    {
       super(clazz);
    }

Modified: projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/legacy/OldServiceConfigurator.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/legacy/OldServiceConfigurator.java	2009-03-30 14:20:22 UTC (rev 86476)
+++ projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/legacy/OldServiceConfigurator.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -166,9 +166,9 @@
       }
       catch (Exception e)
       {
-         for (ListIterator li = mbeans.listIterator(mbeans.size()); li.hasPrevious();)
+         for (ListIterator<ObjectName> li = mbeans.listIterator(mbeans.size()); li.hasPrevious();)
          {
-            ObjectName mbean = (ObjectName) li.previous();
+            ObjectName mbean = li.previous();
             try
             {
                serviceCreator.remove(mbean);
@@ -367,7 +367,7 @@
                         throw new DeploymentException("No Attribute found with name: " + mbeanRefName);
                      proxyType = attr.getType();
                   }
-                  Class proxyClass = cl.loadClass(proxyType);
+                  Class<?> proxyClass = cl.loadClass(proxyType);
                   attribute = MBeanProxyExt.create(proxyClass, dependsObjectName,
                      server, true);
                }
@@ -475,7 +475,7 @@
       String typeName = attr.getType();
 
       // see if it is a primitive type first
-      Class typeClass = Classes.getPrimitiveTypeForName(typeName);
+      Class<?> typeClass = Classes.getPrimitiveTypeForName(typeName);
       if (typeClass == null)
       {
          // nope try look up
@@ -573,7 +573,7 @@
       String attributeClassName = element.getAttribute("attributeClass");
       if( attributeClassName == null || attributeClassName.length() == 0 )
          attributeClassName = attr.getType();
-      Class attributeClass = cl.loadClass(attributeClassName);
+      Class<?> attributeClass = cl.loadClass(attributeClassName);
       // Create the bean instance
       Object bean = attributeClass.newInstance();
       // Get the JavaBean properties
@@ -726,9 +726,9 @@
       }
 
       ServiceContext sc = serviceController.getServiceContext(name);
-      for (Iterator i = sc.iDependOn.iterator(); i.hasNext();)
+      for (Iterator<ServiceContext> i = sc.iDependOn.iterator(); i.hasNext();)
       {
-         ServiceContext needs = (ServiceContext) i.next();
+         ServiceContext needs = i.next();
          Element dependsElement = doc.createElement("depends");
          dependsElement.appendChild(doc.createTextNode(needs.objectName.toString()));
          mbeanElement.appendChild(dependsElement);

Modified: projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/legacy/OldServiceController.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/legacy/OldServiceController.java	2009-03-30 14:20:22 UTC (rev 86476)
+++ projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/legacy/OldServiceController.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -65,6 +65,7 @@
  * @author <a href="mailto:dimitris at jboss.org">Dimitris Andreadis</a>
  * @version $Revision$
  */
+ at SuppressWarnings("unchecked")
 public class OldServiceController extends JBossNotificationBroadcasterSupport
    implements OldServiceControllerMBean, MBeanRegistration
 {
@@ -712,7 +713,7 @@
       ClassLoader loader = Thread.currentThread().getContextClassLoader();
       if (serviceFactory != null && serviceFactory.length() > 0)
       {
-         Class clazz = loader.loadClass(serviceFactory);
+         Class<?> clazz = loader.loadClass(serviceFactory);
          ServiceFactory factory = (ServiceFactory) clazz.newInstance();
          service = factory.createService(server, objectName);
       }
@@ -720,7 +721,7 @@
       {
          MBeanInfo info = server.getMBeanInfo(objectName);
          MBeanOperationInfo[] opInfo = info.getOperations();
-         Class[] interfaces = {Service.class};
+         Class<?>[] interfaces = {Service.class};
          InvocationHandler handler = new ServiceProxy(objectName, opInfo);
          service = (Service) Proxy.newProxyInstance(Service.class.getClassLoader(), interfaces, handler);
       }

Modified: projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/legacy/OldServiceCreator.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/legacy/OldServiceCreator.java	2009-03-30 14:20:22 UTC (rev 86476)
+++ projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/legacy/OldServiceCreator.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -50,6 +50,7 @@
  * @author <a href="mailto:d_jencks at users.sourceforge.net">David Jencks</a>
  * @version $Revision$
  */
+ at SuppressWarnings("unchecked")
 public class OldServiceCreator
 {
    // Static --------------------------------------------------------

Modified: projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/basic/test/BasicDependencyDependsListNestedNewUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/basic/test/BasicDependencyDependsListNestedNewUnitTestCase.java	2009-03-30 14:20:22 UTC (rev 86476)
+++ projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/basic/test/BasicDependencyDependsListNestedNewUnitTestCase.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -43,7 +43,7 @@
       super(name);
    }
 
-   public static AbstractTestDelegate getDelegate(Class clazz) throws Exception
+   public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
    {
       return getNewControllerDelegate(clazz);
    }

Modified: projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/basic/test/BasicDependencyDependsListNestedOldUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/basic/test/BasicDependencyDependsListNestedOldUnitTestCase.java	2009-03-30 14:20:22 UTC (rev 86476)
+++ projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/basic/test/BasicDependencyDependsListNestedOldUnitTestCase.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -43,7 +43,7 @@
       super(name);
    }
 
-   public static AbstractTestDelegate getDelegate(Class clazz) throws Exception
+   public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
    {
       return getOldControllerDelegate(clazz);
    }

Added: projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/basic/test/BasicDependencyDependsListNestedPlainUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/basic/test/BasicDependencyDependsListNestedPlainUnitTestCase.java	                        (rev 0)
+++ projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/basic/test/BasicDependencyDependsListNestedPlainUnitTestCase.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -0,0 +1,50 @@
+/*
+ * 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.lifecycle.basic.test;
+
+import junit.framework.Test;
+
+import org.jboss.test.AbstractTestDelegate;
+
+/**
+ * BasicDependencyDependsListNestedPlainUnitTestCase.
+ * 
+ * @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @version $Revision: 82920 $
+ */
+public class BasicDependencyDependsListNestedPlainUnitTestCase extends BasicDependencyTest
+{
+   public static Test suite()
+   {
+      return suite(BasicDependencyDependsListNestedPlainUnitTestCase.class);
+   }
+
+   public BasicDependencyDependsListNestedPlainUnitTestCase(String name)
+   {
+      super(name);
+   }
+
+   public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
+   {
+      return getPlainControllerDelegate(clazz);
+   }
+}

Modified: projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/basic/test/BasicDependencyDependsListNewUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/basic/test/BasicDependencyDependsListNewUnitTestCase.java	2009-03-30 14:20:22 UTC (rev 86476)
+++ projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/basic/test/BasicDependencyDependsListNewUnitTestCase.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -43,7 +43,7 @@
       super(name);
    }
 
-   public static AbstractTestDelegate getDelegate(Class clazz) throws Exception
+   public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
    {
       return getNewControllerDelegate(clazz);
    }

Modified: projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/basic/test/BasicDependencyDependsListOldUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/basic/test/BasicDependencyDependsListOldUnitTestCase.java	2009-03-30 14:20:22 UTC (rev 86476)
+++ projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/basic/test/BasicDependencyDependsListOldUnitTestCase.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -43,7 +43,7 @@
       super(name);
    }
 
-   public static AbstractTestDelegate getDelegate(Class clazz) throws Exception
+   public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
    {
       return getOldControllerDelegate(clazz);
    }

Added: projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/basic/test/BasicDependencyDependsListPlainUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/basic/test/BasicDependencyDependsListPlainUnitTestCase.java	                        (rev 0)
+++ projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/basic/test/BasicDependencyDependsListPlainUnitTestCase.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -0,0 +1,50 @@
+/*
+ * 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.lifecycle.basic.test;
+
+import junit.framework.Test;
+
+import org.jboss.test.AbstractTestDelegate;
+
+/**
+ * BasicDependencyDependsListPlainUnitTestCase.
+ * 
+ * @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @version $Revision: 82920 $
+ */
+public class BasicDependencyDependsListPlainUnitTestCase extends BasicDependencyTest
+{
+   public static Test suite()
+   {
+      return suite(BasicDependencyDependsListPlainUnitTestCase.class);
+   }
+
+   public BasicDependencyDependsListPlainUnitTestCase(String name)
+   {
+      super(name);
+   }
+
+   public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
+   {
+      return getPlainControllerDelegate(clazz);
+   }
+}

Modified: projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/basic/test/BasicDependencyDependsNestedNewUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/basic/test/BasicDependencyDependsNestedNewUnitTestCase.java	2009-03-30 14:20:22 UTC (rev 86476)
+++ projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/basic/test/BasicDependencyDependsNestedNewUnitTestCase.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -43,7 +43,7 @@
       super(name);
    }
 
-   public static AbstractTestDelegate getDelegate(Class clazz) throws Exception
+   public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
    {
       return getNewControllerDelegate(clazz);
    }

Modified: projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/basic/test/BasicDependencyDependsNestedOldUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/basic/test/BasicDependencyDependsNestedOldUnitTestCase.java	2009-03-30 14:20:22 UTC (rev 86476)
+++ projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/basic/test/BasicDependencyDependsNestedOldUnitTestCase.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -43,7 +43,7 @@
       super(name);
    }
 
-   public static AbstractTestDelegate getDelegate(Class clazz) throws Exception
+   public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
    {
       return getOldControllerDelegate(clazz);
    }

Added: projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/basic/test/BasicDependencyDependsNestedPlainUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/basic/test/BasicDependencyDependsNestedPlainUnitTestCase.java	                        (rev 0)
+++ projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/basic/test/BasicDependencyDependsNestedPlainUnitTestCase.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -0,0 +1,50 @@
+/*
+ * 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.lifecycle.basic.test;
+
+import junit.framework.Test;
+
+import org.jboss.test.AbstractTestDelegate;
+
+/**
+ * BasicDependencyDependsNestedPlanUnitTestCase.
+ * 
+ * @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @version $Revision: 82920 $
+ */
+public class BasicDependencyDependsNestedPlainUnitTestCase extends BasicDependencyTest
+{
+   public static Test suite()
+   {
+      return suite(BasicDependencyDependsNestedPlainUnitTestCase.class);
+   }
+
+   public BasicDependencyDependsNestedPlainUnitTestCase(String name)
+   {
+      super(name);
+   }
+
+   public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
+   {
+      return getPlainControllerDelegate(clazz);
+   }
+}

Modified: projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/basic/test/BasicDependencyDependsNewUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/basic/test/BasicDependencyDependsNewUnitTestCase.java	2009-03-30 14:20:22 UTC (rev 86476)
+++ projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/basic/test/BasicDependencyDependsNewUnitTestCase.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -43,7 +43,7 @@
       super(name);
    }
 
-   public static AbstractTestDelegate getDelegate(Class clazz) throws Exception
+   public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
    {
       return getNewControllerDelegate(clazz);
    }

Modified: projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/basic/test/BasicDependencyDependsOldUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/basic/test/BasicDependencyDependsOldUnitTestCase.java	2009-03-30 14:20:22 UTC (rev 86476)
+++ projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/basic/test/BasicDependencyDependsOldUnitTestCase.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -43,7 +43,7 @@
       super(name);
    }
 
-   public static AbstractTestDelegate getDelegate(Class clazz) throws Exception
+   public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
    {
       return getOldControllerDelegate(clazz);
    }

Modified: projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/basic/test/BasicDependencyDependsOptionalAttributeListNestedNewUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/basic/test/BasicDependencyDependsOptionalAttributeListNestedNewUnitTestCase.java	2009-03-30 14:20:22 UTC (rev 86476)
+++ projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/basic/test/BasicDependencyDependsOptionalAttributeListNestedNewUnitTestCase.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -43,7 +43,7 @@
       super(name);
    }
 
-   public static AbstractTestDelegate getDelegate(Class clazz) throws Exception
+   public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
    {
       return getNewControllerDelegate(clazz);
    }

Modified: projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/basic/test/BasicDependencyDependsOptionalAttributeListNestedOldUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/basic/test/BasicDependencyDependsOptionalAttributeListNestedOldUnitTestCase.java	2009-03-30 14:20:22 UTC (rev 86476)
+++ projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/basic/test/BasicDependencyDependsOptionalAttributeListNestedOldUnitTestCase.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -43,7 +43,7 @@
       super(name);
    }
 
-   public static AbstractTestDelegate getDelegate(Class clazz) throws Exception
+   public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
    {
       return getOldControllerDelegate(clazz);
    }

Added: projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/basic/test/BasicDependencyDependsOptionalAttributeListNestedPlainUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/basic/test/BasicDependencyDependsOptionalAttributeListNestedPlainUnitTestCase.java	                        (rev 0)
+++ projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/basic/test/BasicDependencyDependsOptionalAttributeListNestedPlainUnitTestCase.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -0,0 +1,50 @@
+/*
+ * 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.lifecycle.basic.test;
+
+import junit.framework.Test;
+
+import org.jboss.test.AbstractTestDelegate;
+
+/**
+ * BasicDependencyDependsOptionalAttributeListNestedPlainUnitTestCase.
+ * 
+ * @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @version $Revision: 82920 $
+ */
+public class BasicDependencyDependsOptionalAttributeListNestedPlainUnitTestCase extends BasicDependencyTest
+{
+   public static Test suite()
+   {
+      return suite(BasicDependencyDependsOptionalAttributeListNestedPlainUnitTestCase.class);
+   }
+
+   public BasicDependencyDependsOptionalAttributeListNestedPlainUnitTestCase(String name)
+   {
+      super(name);
+   }
+
+   public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
+   {
+      return getPlainControllerDelegate(clazz);
+   }
+}

Modified: projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/basic/test/BasicDependencyDependsOptionalAttributeListNewUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/basic/test/BasicDependencyDependsOptionalAttributeListNewUnitTestCase.java	2009-03-30 14:20:22 UTC (rev 86476)
+++ projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/basic/test/BasicDependencyDependsOptionalAttributeListNewUnitTestCase.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -43,7 +43,7 @@
       super(name);
    }
 
-   public static AbstractTestDelegate getDelegate(Class clazz) throws Exception
+   public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
    {
       return getNewControllerDelegate(clazz);
    }

Modified: projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/basic/test/BasicDependencyDependsOptionalAttributeListOldUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/basic/test/BasicDependencyDependsOptionalAttributeListOldUnitTestCase.java	2009-03-30 14:20:22 UTC (rev 86476)
+++ projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/basic/test/BasicDependencyDependsOptionalAttributeListOldUnitTestCase.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -43,7 +43,7 @@
       super(name);
    }
 
-   public static AbstractTestDelegate getDelegate(Class clazz) throws Exception
+   public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
    {
       return getOldControllerDelegate(clazz);
    }

Added: projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/basic/test/BasicDependencyDependsOptionalAttributeListPlainUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/basic/test/BasicDependencyDependsOptionalAttributeListPlainUnitTestCase.java	                        (rev 0)
+++ projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/basic/test/BasicDependencyDependsOptionalAttributeListPlainUnitTestCase.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -0,0 +1,50 @@
+/*
+ * 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.lifecycle.basic.test;
+
+import junit.framework.Test;
+
+import org.jboss.test.AbstractTestDelegate;
+
+/**
+ * BasicDependencyDependsOptionalAttributeListPlainUnitTestCase.
+ * 
+ * @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @version $Revision: 82920 $
+ */
+public class BasicDependencyDependsOptionalAttributeListPlainUnitTestCase extends BasicDependencyTest
+{
+   public static Test suite()
+   {
+      return suite(BasicDependencyDependsOptionalAttributeListPlainUnitTestCase.class);
+   }
+
+   public BasicDependencyDependsOptionalAttributeListPlainUnitTestCase(String name)
+   {
+      super(name);
+   }
+
+   public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
+   {
+      return getPlainControllerDelegate(clazz);
+   }
+}

Modified: projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/basic/test/BasicDependencyDependsOptionalAttributeNestedNewUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/basic/test/BasicDependencyDependsOptionalAttributeNestedNewUnitTestCase.java	2009-03-30 14:20:22 UTC (rev 86476)
+++ projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/basic/test/BasicDependencyDependsOptionalAttributeNestedNewUnitTestCase.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -43,7 +43,7 @@
       super(name);
    }
 
-   public static AbstractTestDelegate getDelegate(Class clazz) throws Exception
+   public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
    {
       return getNewControllerDelegate(clazz);
    }

Modified: projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/basic/test/BasicDependencyDependsOptionalAttributeNestedOldUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/basic/test/BasicDependencyDependsOptionalAttributeNestedOldUnitTestCase.java	2009-03-30 14:20:22 UTC (rev 86476)
+++ projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/basic/test/BasicDependencyDependsOptionalAttributeNestedOldUnitTestCase.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -43,7 +43,7 @@
       super(name);
    }
 
-   public static AbstractTestDelegate getDelegate(Class clazz) throws Exception
+   public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
    {
       return getOldControllerDelegate(clazz);
    }

Added: projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/basic/test/BasicDependencyDependsOptionalAttributeNestedPlainUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/basic/test/BasicDependencyDependsOptionalAttributeNestedPlainUnitTestCase.java	                        (rev 0)
+++ projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/basic/test/BasicDependencyDependsOptionalAttributeNestedPlainUnitTestCase.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -0,0 +1,50 @@
+/*
+ * 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.lifecycle.basic.test;
+
+import junit.framework.Test;
+
+import org.jboss.test.AbstractTestDelegate;
+
+/**
+ * BasicDependencyDependsOptionalAttributeNestedPlainUnitTestCase.
+ * 
+ * @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @version $Revision: 82920 $
+ */
+public class BasicDependencyDependsOptionalAttributeNestedPlainUnitTestCase extends BasicDependencyTest
+{
+   public static Test suite()
+   {
+      return suite(BasicDependencyDependsOptionalAttributeNestedPlainUnitTestCase.class);
+   }
+
+   public BasicDependencyDependsOptionalAttributeNestedPlainUnitTestCase(String name)
+   {
+      super(name);
+   }
+
+   public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
+   {
+      return getPlainControllerDelegate(clazz);
+   }
+}

Modified: projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/basic/test/BasicDependencyDependsOptionalAttributeNewUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/basic/test/BasicDependencyDependsOptionalAttributeNewUnitTestCase.java	2009-03-30 14:20:22 UTC (rev 86476)
+++ projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/basic/test/BasicDependencyDependsOptionalAttributeNewUnitTestCase.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -43,7 +43,7 @@
       super(name);
    }
 
-   public static AbstractTestDelegate getDelegate(Class clazz) throws Exception
+   public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
    {
       return getNewControllerDelegate(clazz);
    }

Modified: projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/basic/test/BasicDependencyDependsOptionalAttributeOldUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/basic/test/BasicDependencyDependsOptionalAttributeOldUnitTestCase.java	2009-03-30 14:20:22 UTC (rev 86476)
+++ projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/basic/test/BasicDependencyDependsOptionalAttributeOldUnitTestCase.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -43,7 +43,7 @@
       super(name);
    }
 
-   public static AbstractTestDelegate getDelegate(Class clazz) throws Exception
+   public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
    {
       return getOldControllerDelegate(clazz);
    }

Added: projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/basic/test/BasicDependencyDependsOptionalAttributePlainUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/basic/test/BasicDependencyDependsOptionalAttributePlainUnitTestCase.java	                        (rev 0)
+++ projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/basic/test/BasicDependencyDependsOptionalAttributePlainUnitTestCase.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -0,0 +1,50 @@
+/*
+ * 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.lifecycle.basic.test;
+
+import junit.framework.Test;
+
+import org.jboss.test.AbstractTestDelegate;
+
+/**
+ * BasicDependencyDependsOptionalAttributePlainUnitTestCase.
+ * 
+ * @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @version $Revision: 82920 $
+ */
+public class BasicDependencyDependsOptionalAttributePlainUnitTestCase extends BasicDependencyTest
+{
+   public static Test suite()
+   {
+      return suite(BasicDependencyDependsOptionalAttributePlainUnitTestCase.class);
+   }
+
+   public BasicDependencyDependsOptionalAttributePlainUnitTestCase(String name)
+   {
+      super(name);
+   }
+
+   public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
+   {
+      return getPlainControllerDelegate(clazz);
+   }
+}

Added: projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/basic/test/BasicDependencyDependsPlainUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/basic/test/BasicDependencyDependsPlainUnitTestCase.java	                        (rev 0)
+++ projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/basic/test/BasicDependencyDependsPlainUnitTestCase.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -0,0 +1,50 @@
+/*
+ * 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.lifecycle.basic.test;
+
+import junit.framework.Test;
+
+import org.jboss.test.AbstractTestDelegate;
+
+/**
+ * BasicDependencyDependsPlainUnitTestCase.
+ * 
+ * @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @version $Revision: 82920 $
+ */
+public class BasicDependencyDependsPlainUnitTestCase extends BasicDependencyTest
+{
+   public static Test suite()
+   {
+      return suite(BasicDependencyDependsPlainUnitTestCase.class);
+   }
+
+   public BasicDependencyDependsPlainUnitTestCase(String name)
+   {
+      super(name);
+   }
+
+   public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
+   {
+      return getPlainControllerDelegate(clazz);
+   }
+}

Modified: projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/basic/test/BasicDependencyTest.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/basic/test/BasicDependencyTest.java	2009-03-30 14:20:22 UTC (rev 86476)
+++ projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/basic/test/BasicDependencyTest.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -58,6 +58,9 @@
       index = resourceName.indexOf("OldUnitTestCase");
       if (index != -1)
          resourceName = resourceName.substring(0, index);
+      index = resourceName.indexOf("PlainUnitTestCase");
+      if (index != -1)
+         resourceName = resourceName.substring(0, index);
       
       resourceName = resourceName + "_NotAutomatic.xml";
    }

Modified: projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/basic/test/BasicLifecycleNewUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/basic/test/BasicLifecycleNewUnitTestCase.java	2009-03-30 14:20:22 UTC (rev 86476)
+++ projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/basic/test/BasicLifecycleNewUnitTestCase.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -43,7 +43,7 @@
       super(name);
    }
 
-   public static AbstractTestDelegate getDelegate(Class clazz) throws Exception
+   public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
    {
       return getNewControllerDelegate(clazz);
    }

Modified: projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/basic/test/BasicLifecycleOldUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/basic/test/BasicLifecycleOldUnitTestCase.java	2009-03-30 14:20:22 UTC (rev 86476)
+++ projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/basic/test/BasicLifecycleOldUnitTestCase.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -43,7 +43,7 @@
       super(name);
    }
 
-   public static AbstractTestDelegate getDelegate(Class clazz) throws Exception
+   public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
    {
       return getOldControllerDelegate(clazz);
    }

Added: projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/basic/test/BasicLifecyclePlainUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/basic/test/BasicLifecyclePlainUnitTestCase.java	                        (rev 0)
+++ projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/basic/test/BasicLifecyclePlainUnitTestCase.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -0,0 +1,50 @@
+/*
+ * 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.lifecycle.basic.test;
+
+import junit.framework.Test;
+
+import org.jboss.test.AbstractTestDelegate;
+
+/**
+ * BasicLifecyclePlainUnitTestCase.
+ * 
+ * @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @version $Revision: 82920 $
+ */
+public class BasicLifecyclePlainUnitTestCase extends BasicLifecycleTest
+{
+   public static Test suite()
+   {
+      return suite(BasicLifecyclePlainUnitTestCase.class);
+   }
+
+   public BasicLifecyclePlainUnitTestCase(String name)
+   {
+      super(name);
+   }
+
+   public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
+   {
+      return getPlainControllerDelegate(clazz);
+   }
+}

Modified: projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/basic/test/ControllerLifecycleBasicTestSuite.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/basic/test/ControllerLifecycleBasicTestSuite.java	2009-03-30 14:20:22 UTC (rev 86476)
+++ projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/basic/test/ControllerLifecycleBasicTestSuite.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -44,22 +44,31 @@
 
       suite.addTest(BasicLifecycleOldUnitTestCase.suite());
       suite.addTest(BasicLifecycleNewUnitTestCase.suite());
+      suite.addTest(BasicLifecyclePlainUnitTestCase.suite());
       suite.addTest(BasicDependencyDependsOldUnitTestCase.suite());
       suite.addTest(BasicDependencyDependsNewUnitTestCase.suite());
+      suite.addTest(BasicDependencyDependsPlainUnitTestCase.suite());
       suite.addTest(BasicDependencyDependsNestedOldUnitTestCase.suite());
       suite.addTest(BasicDependencyDependsNestedNewUnitTestCase.suite());
+      suite.addTest(BasicDependencyDependsNestedPlainUnitTestCase.suite());
       suite.addTest(BasicDependencyDependsListOldUnitTestCase.suite());
       suite.addTest(BasicDependencyDependsListNewUnitTestCase.suite());
+      suite.addTest(BasicDependencyDependsListPlainUnitTestCase.suite());
       suite.addTest(BasicDependencyDependsListNestedOldUnitTestCase.suite());
       suite.addTest(BasicDependencyDependsListNestedNewUnitTestCase.suite());
+      suite.addTest(BasicDependencyDependsListNestedPlainUnitTestCase.suite());
       suite.addTest(BasicDependencyDependsOptionalAttributeOldUnitTestCase.suite());
       suite.addTest(BasicDependencyDependsOptionalAttributeNewUnitTestCase.suite());
+      suite.addTest(BasicDependencyDependsOptionalAttributePlainUnitTestCase.suite());
       suite.addTest(BasicDependencyDependsOptionalAttributeNestedOldUnitTestCase.suite());
       suite.addTest(BasicDependencyDependsOptionalAttributeNestedNewUnitTestCase.suite());
+      suite.addTest(BasicDependencyDependsOptionalAttributeNestedPlainUnitTestCase.suite());
       suite.addTest(BasicDependencyDependsOptionalAttributeListOldUnitTestCase.suite());
       suite.addTest(BasicDependencyDependsOptionalAttributeListNewUnitTestCase.suite());
+      suite.addTest(BasicDependencyDependsOptionalAttributeListPlainUnitTestCase.suite());
       suite.addTest(BasicDependencyDependsOptionalAttributeListNestedOldUnitTestCase.suite());
       suite.addTest(BasicDependencyDependsOptionalAttributeListNestedNewUnitTestCase.suite());
+      suite.addTest(BasicDependencyDependsOptionalAttributeListNestedPlainUnitTestCase.suite());
       
       return suite;
    }

Modified: projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/seperated/test/ControllerLifecycleSeperatedTestSuite.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/seperated/test/ControllerLifecycleSeperatedTestSuite.java	2009-03-30 14:20:22 UTC (rev 86476)
+++ projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/seperated/test/ControllerLifecycleSeperatedTestSuite.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -44,14 +44,19 @@
 
       suite.addTest(SeperatedDependencyDependsOldUnitTestCase.suite());
       suite.addTest(SeperatedDependencyDependsNewUnitTestCase.suite());
+      suite.addTest(SeperatedDependencyDependsPlainUnitTestCase.suite());
       suite.addTest(DependsBrokenInstantiateOldUnitTestCase.suite());
       suite.addTest(DependsBrokenInstantiateNewUnitTestCase.suite());
+      suite.addTest(DependsBrokenInstantiatePlainUnitTestCase.suite());
       suite.addTest(DependsBrokenConfigureOldUnitTestCase.suite());
       suite.addTest(DependsBrokenConfigureNewUnitTestCase.suite());
+      suite.addTest(DependsBrokenConfigurePlainUnitTestCase.suite());
       suite.addTest(DependsBrokenCreateOldUnitTestCase.suite());
       suite.addTest(DependsBrokenCreateNewUnitTestCase.suite());
+      suite.addTest(DependsBrokenCreatePlainUnitTestCase.suite());
       suite.addTest(DependsBrokenStartOldUnitTestCase.suite());
       suite.addTest(DependsBrokenStartNewUnitTestCase.suite());
+      suite.addTest(DependsBrokenStartPlainUnitTestCase.suite());
       suite.addTest(NewOnDemandDependencyUnitTestCase.suite());
       suite.addTest(NewOnDemandServerDependencyUnitTestCase.suite());
       

Modified: projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/seperated/test/DependsBrokenConfigureNewUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/seperated/test/DependsBrokenConfigureNewUnitTestCase.java	2009-03-30 14:20:22 UTC (rev 86476)
+++ projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/seperated/test/DependsBrokenConfigureNewUnitTestCase.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -43,7 +43,7 @@
       super(name);
    }
 
-   public static AbstractTestDelegate getDelegate(Class clazz) throws Exception
+   public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
    {
       return getNewControllerDelegate(clazz);
    }

Modified: projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/seperated/test/DependsBrokenConfigureOldUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/seperated/test/DependsBrokenConfigureOldUnitTestCase.java	2009-03-30 14:20:22 UTC (rev 86476)
+++ projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/seperated/test/DependsBrokenConfigureOldUnitTestCase.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -44,7 +44,7 @@
       super(name);
    }
 
-   public static AbstractTestDelegate getDelegate(Class clazz) throws Exception
+   public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
    {
       return getOldControllerDelegate(clazz);
    }

Added: projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/seperated/test/DependsBrokenConfigurePlainUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/seperated/test/DependsBrokenConfigurePlainUnitTestCase.java	                        (rev 0)
+++ projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/seperated/test/DependsBrokenConfigurePlainUnitTestCase.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -0,0 +1,50 @@
+/*
+ * 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.lifecycle.seperated.test;
+
+import junit.framework.Test;
+
+import org.jboss.test.AbstractTestDelegate;
+
+/**
+ * DependsBrokenConfigurePlainUnitTestCase.
+ * 
+ * @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @version $Revision: 82920 $
+ */
+public class DependsBrokenConfigurePlainUnitTestCase extends DependsBrokenConfigureTest
+{
+   public static Test suite()
+   {
+      return suite(DependsBrokenConfigurePlainUnitTestCase.class);
+   }
+
+   public DependsBrokenConfigurePlainUnitTestCase(String name)
+   {
+      super(name);
+   }
+
+   public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
+   {
+      return getPlainControllerDelegate(clazz);
+   }
+}

Modified: projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/seperated/test/DependsBrokenCreateNewUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/seperated/test/DependsBrokenCreateNewUnitTestCase.java	2009-03-30 14:20:22 UTC (rev 86476)
+++ projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/seperated/test/DependsBrokenCreateNewUnitTestCase.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -43,7 +43,7 @@
       super(name);
    }
 
-   public static AbstractTestDelegate getDelegate(Class clazz) throws Exception
+   public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
    {
       return getNewControllerDelegate(clazz);
    }

Modified: projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/seperated/test/DependsBrokenCreateOldUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/seperated/test/DependsBrokenCreateOldUnitTestCase.java	2009-03-30 14:20:22 UTC (rev 86476)
+++ projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/seperated/test/DependsBrokenCreateOldUnitTestCase.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -44,7 +44,7 @@
       super(name);
    }
 
-   public static AbstractTestDelegate getDelegate(Class clazz) throws Exception
+   public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
    {
       return getOldControllerDelegate(clazz);
    }

Added: projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/seperated/test/DependsBrokenCreatePlainUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/seperated/test/DependsBrokenCreatePlainUnitTestCase.java	                        (rev 0)
+++ projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/seperated/test/DependsBrokenCreatePlainUnitTestCase.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -0,0 +1,50 @@
+/*
+ * 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.lifecycle.seperated.test;
+
+import junit.framework.Test;
+
+import org.jboss.test.AbstractTestDelegate;
+
+/**
+ * DependsBrokenCreatePlainUnitTestCase.
+ * 
+ * @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @version $Revision: 82920 $
+ */
+public class DependsBrokenCreatePlainUnitTestCase extends DependsBrokenCreateTest
+{
+   public static Test suite()
+   {
+      return suite(DependsBrokenCreatePlainUnitTestCase.class);
+   }
+
+   public DependsBrokenCreatePlainUnitTestCase(String name)
+   {
+      super(name);
+   }
+
+   public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
+   {
+      return getPlainControllerDelegate(clazz);
+   }
+}

Modified: projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/seperated/test/DependsBrokenInstantiateNewUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/seperated/test/DependsBrokenInstantiateNewUnitTestCase.java	2009-03-30 14:20:22 UTC (rev 86476)
+++ projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/seperated/test/DependsBrokenInstantiateNewUnitTestCase.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -43,7 +43,7 @@
       super(name);
    }
 
-   public static AbstractTestDelegate getDelegate(Class clazz) throws Exception
+   public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
    {
       return getNewControllerDelegate(clazz);
    }

Modified: projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/seperated/test/DependsBrokenInstantiateOldUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/seperated/test/DependsBrokenInstantiateOldUnitTestCase.java	2009-03-30 14:20:22 UTC (rev 86476)
+++ projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/seperated/test/DependsBrokenInstantiateOldUnitTestCase.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -44,7 +44,7 @@
       super(name);
    }
 
-   public static AbstractTestDelegate getDelegate(Class clazz) throws Exception
+   public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
    {
       return getOldControllerDelegate(clazz);
    }

Added: projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/seperated/test/DependsBrokenInstantiatePlainUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/seperated/test/DependsBrokenInstantiatePlainUnitTestCase.java	                        (rev 0)
+++ projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/seperated/test/DependsBrokenInstantiatePlainUnitTestCase.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -0,0 +1,50 @@
+/*
+ * 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.lifecycle.seperated.test;
+
+import junit.framework.Test;
+
+import org.jboss.test.AbstractTestDelegate;
+
+/**
+ * DependsBrokenInstantiatePlainUnitTestCase.
+ * 
+ * @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @version $Revision: 82920 $
+ */
+public class DependsBrokenInstantiatePlainUnitTestCase extends DependsBrokenInstantiateTest
+{
+   public static Test suite()
+   {
+      return suite(DependsBrokenInstantiatePlainUnitTestCase.class);
+   }
+
+   public DependsBrokenInstantiatePlainUnitTestCase(String name)
+   {
+      super(name);
+   }
+
+   public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
+   {
+      return getPlainControllerDelegate(clazz);
+   }
+}

Modified: projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/seperated/test/DependsBrokenStartNewUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/seperated/test/DependsBrokenStartNewUnitTestCase.java	2009-03-30 14:20:22 UTC (rev 86476)
+++ projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/seperated/test/DependsBrokenStartNewUnitTestCase.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -43,7 +43,7 @@
       super(name);
    }
 
-   public static AbstractTestDelegate getDelegate(Class clazz) throws Exception
+   public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
    {
       return getNewControllerDelegate(clazz);
    }

Modified: projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/seperated/test/DependsBrokenStartOldUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/seperated/test/DependsBrokenStartOldUnitTestCase.java	2009-03-30 14:20:22 UTC (rev 86476)
+++ projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/seperated/test/DependsBrokenStartOldUnitTestCase.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -44,7 +44,7 @@
       super(name);
    }
 
-   public static AbstractTestDelegate getDelegate(Class clazz) throws Exception
+   public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
    {
       return getOldControllerDelegate(clazz);
    }

Added: projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/seperated/test/DependsBrokenStartPlainUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/seperated/test/DependsBrokenStartPlainUnitTestCase.java	                        (rev 0)
+++ projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/seperated/test/DependsBrokenStartPlainUnitTestCase.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -0,0 +1,50 @@
+/*
+ * 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.lifecycle.seperated.test;
+
+import junit.framework.Test;
+
+import org.jboss.test.AbstractTestDelegate;
+
+/**
+ * DependsBrokenStartPlainUnitTestCase.
+ * 
+ * @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @version $Revision: 82920 $
+ */
+public class DependsBrokenStartPlainUnitTestCase extends DependsBrokenStartTest
+{
+   public static Test suite()
+   {
+      return suite(DependsBrokenStartPlainUnitTestCase.class);
+   }
+
+   public DependsBrokenStartPlainUnitTestCase(String name)
+   {
+      super(name);
+   }
+
+   public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
+   {
+      return getPlainControllerDelegate(clazz);
+   }
+}

Modified: projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/seperated/test/DependsBrokenTest.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/seperated/test/DependsBrokenTest.java	2009-03-30 14:20:22 UTC (rev 86476)
+++ projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/seperated/test/DependsBrokenTest.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -56,6 +56,11 @@
       index = resourceName.indexOf("OldUnitTestCase");
       if (index != -1)
          resourceName = resourceName.substring(0, index);
+      if (index != -1)
+         resourceName = resourceName.substring(0, index);
+      index = resourceName.indexOf("PlainUnitTestCase");
+      if (index != -1)
+         resourceName = resourceName.substring(0, index);
       
       resourceName1 = resourceName + "_bad.xml";
       resourceName2 = resourceName + "_good.xml";

Modified: projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/seperated/test/NewOnDemandDependencyTest.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/seperated/test/NewOnDemandDependencyTest.java	2009-03-30 14:20:22 UTC (rev 86476)
+++ projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/seperated/test/NewOnDemandDependencyTest.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -49,7 +49,7 @@
       super(name);
    }
 
-   public static AbstractTestDelegate getDelegate(Class clazz) throws Exception
+   public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
    {
       return getNewControllerDelegate(clazz);
    }

Modified: projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/seperated/test/SeperatedDependencyDependsNewUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/seperated/test/SeperatedDependencyDependsNewUnitTestCase.java	2009-03-30 14:20:22 UTC (rev 86476)
+++ projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/seperated/test/SeperatedDependencyDependsNewUnitTestCase.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -43,7 +43,7 @@
       super(name);
    }
 
-   public static AbstractTestDelegate getDelegate(Class clazz) throws Exception
+   public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
    {
       return getNewControllerDelegate(clazz);
    }

Modified: projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/seperated/test/SeperatedDependencyDependsOldUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/seperated/test/SeperatedDependencyDependsOldUnitTestCase.java	2009-03-30 14:20:22 UTC (rev 86476)
+++ projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/seperated/test/SeperatedDependencyDependsOldUnitTestCase.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -43,7 +43,7 @@
       super(name);
    }
 
-   public static AbstractTestDelegate getDelegate(Class clazz) throws Exception
+   public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
    {
       return getOldControllerDelegate(clazz);
    }

Added: projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/seperated/test/SeperatedDependencyDependsPlainUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/seperated/test/SeperatedDependencyDependsPlainUnitTestCase.java	                        (rev 0)
+++ projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/seperated/test/SeperatedDependencyDependsPlainUnitTestCase.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -0,0 +1,50 @@
+/*
+ * 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.lifecycle.seperated.test;
+
+import junit.framework.Test;
+
+import org.jboss.test.AbstractTestDelegate;
+
+/**
+ * SeperatedDependencyDependsPlainUnitTestCase.
+ * 
+ * @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @version $Revision: 82920 $
+ */
+public class SeperatedDependencyDependsPlainUnitTestCase extends SeperatedDependencyTest
+{
+   public static Test suite()
+   {
+      return suite(SeperatedDependencyDependsPlainUnitTestCase.class);
+   }
+
+   public SeperatedDependencyDependsPlainUnitTestCase(String name)
+   {
+      super(name);
+   }
+
+   public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
+   {
+      return getPlainControllerDelegate(clazz);
+   }
+}

Modified: projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/seperated/test/SeperatedDependencyTest.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/seperated/test/SeperatedDependencyTest.java	2009-03-30 14:20:22 UTC (rev 86476)
+++ projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/seperated/test/SeperatedDependencyTest.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -58,6 +58,11 @@
       index = resourceName.indexOf("OldUnitTestCase");
       if (index != -1)
          resourceName = resourceName.substring(0, index);
+      if (index != -1)
+         resourceName = resourceName.substring(0, index);
+      index = resourceName.indexOf("PlainUnitTestCase");
+      if (index != -1)
+         resourceName = resourceName.substring(0, index);
       
       resourceName1 = resourceName + "_1.xml";
       resourceName2 = resourceName + "_2.xml";

Modified: projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/test/ControllerLifecycleTestSuite.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/test/ControllerLifecycleTestSuite.java	2009-03-30 14:20:22 UTC (rev 86476)
+++ projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/test/ControllerLifecycleTestSuite.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -47,6 +47,7 @@
 
       suite.addTest(LifecycleRedeployAfterErrorOldUnitTestCase.suite());
       suite.addTest(LifecycleRedeployAfterErrorNewUnitTestCase.suite());
+      suite.addTest(LifecycleRedeployAfterErrorPlainUnitTestCase.suite());
       suite.addTest(ControllerLifecycleBasicTestSuite.suite());
       suite.addTest(ControllerLifecycleSeperatedTestSuite.suite());
       

Modified: projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/test/LifecycleRedeployAfterErrorNewUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/test/LifecycleRedeployAfterErrorNewUnitTestCase.java	2009-03-30 14:20:22 UTC (rev 86476)
+++ projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/test/LifecycleRedeployAfterErrorNewUnitTestCase.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -43,7 +43,7 @@
       super(name);
    }
 
-   public static AbstractTestDelegate getDelegate(Class clazz) throws Exception
+   public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
    {
       return getNewControllerDelegate(clazz);
    }

Modified: projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/test/LifecycleRedeployAfterErrorOldUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/test/LifecycleRedeployAfterErrorOldUnitTestCase.java	2009-03-30 14:20:22 UTC (rev 86476)
+++ projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/test/LifecycleRedeployAfterErrorOldUnitTestCase.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -43,7 +43,7 @@
       super(name);
    }
 
-   public static AbstractTestDelegate getDelegate(Class clazz) throws Exception
+   public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
    {
       return getOldControllerDelegate(clazz);
    }

Added: projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/test/LifecycleRedeployAfterErrorPlainUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/test/LifecycleRedeployAfterErrorPlainUnitTestCase.java	                        (rev 0)
+++ projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/test/LifecycleRedeployAfterErrorPlainUnitTestCase.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -0,0 +1,50 @@
+/*
+ * 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.lifecycle.test;
+
+import junit.framework.Test;
+
+import org.jboss.test.AbstractTestDelegate;
+
+/**
+ * LifecycleRedeployAfterErrorPlainUnitTestCase.
+ * 
+ * @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @version $Revision: 82920 $
+ */
+public class LifecycleRedeployAfterErrorPlainUnitTestCase extends LifecycleRedeployAfterErrorTest
+{
+   public static Test suite()
+   {
+      return suite(LifecycleRedeployAfterErrorPlainUnitTestCase.class);
+   }
+
+   public LifecycleRedeployAfterErrorPlainUnitTestCase(String name)
+   {
+      super(name);
+   }
+
+   public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
+   {
+      return getPlainControllerDelegate(clazz);
+   }
+}

Modified: projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/parse/test/ControllerParseTestSuite.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/parse/test/ControllerParseTestSuite.java	2009-03-30 14:20:22 UTC (rev 86476)
+++ projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/parse/test/ControllerParseTestSuite.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -44,6 +44,7 @@
 
       suite.addTest(ErrorInParseOldUnitTestCase.suite());
       suite.addTest(ErrorInParseNewUnitTestCase.suite());
+      suite.addTest(ErrorInParsePlainUnitTestCase.suite());
       
       return suite;
    }

Modified: projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/parse/test/ErrorInParseNewUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/parse/test/ErrorInParseNewUnitTestCase.java	2009-03-30 14:20:22 UTC (rev 86476)
+++ projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/parse/test/ErrorInParseNewUnitTestCase.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -43,7 +43,7 @@
       super(name);
    }
 
-   public static AbstractTestDelegate getDelegate(Class clazz) throws Exception
+   public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
    {
       return getNewControllerDelegate(clazz);
    }

Added: projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/parse/test/ErrorInParsePlainUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/parse/test/ErrorInParsePlainUnitTestCase.java	                        (rev 0)
+++ projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/parse/test/ErrorInParsePlainUnitTestCase.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -0,0 +1,50 @@
+/*
+ * 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.parse.test;
+
+import junit.framework.Test;
+
+import org.jboss.test.AbstractTestDelegate;
+
+/**
+ * ErrorInParsePlainUnitTestCase.
+ * 
+ * @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @version $Revision: 82920 $
+ */
+public class ErrorInParsePlainUnitTestCase extends ErrorInParseTest
+{
+   public static Test suite()
+   {
+      return suite(ErrorInParsePlainUnitTestCase.class);
+   }
+
+   public ErrorInParsePlainUnitTestCase(String name)
+   {
+      super(name);
+   }
+
+   public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
+   {
+      return getPlainControllerDelegate(clazz);
+   }
+}

Added: projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/support/ContextClassLoader.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/support/ContextClassLoader.java	                        (rev 0)
+++ projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/support/ContextClassLoader.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -0,0 +1,36 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2007, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt 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.support;
+
+/**
+ * ContextClassLoader.
+ * 
+ * @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @version $Revision: 1.1 $
+ */
+public class ContextClassLoader extends ClassLoader implements ContextClassLoaderMBean
+{
+   public ContextClassLoader getInstance()
+   {
+      return this;
+   }
+}

Added: projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/support/ContextClassLoaderMBean.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/support/ContextClassLoaderMBean.java	                        (rev 0)
+++ projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/support/ContextClassLoaderMBean.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -0,0 +1,39 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2007, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt 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.support;
+
+import javax.management.ObjectName;
+
+import org.jboss.mx.util.ObjectNameFactory;
+
+/**
+ * ContextClassLoaderMBean.
+ * 
+ * @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @version $Revision: 1.1 $
+ */
+public interface ContextClassLoaderMBean
+{
+   ObjectName OBJECT_NAME = ObjectNameFactory.create("jboss.test:type=ClassLoader");
+   
+   ContextClassLoader getInstance();
+}

Added: projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/support/ContextClassLoaderTester.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/support/ContextClassLoaderTester.java	                        (rev 0)
+++ projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/support/ContextClassLoaderTester.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -0,0 +1,146 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2007, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt 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.support;
+
+import javax.management.Attribute;
+import javax.management.AttributeList;
+import javax.management.AttributeNotFoundException;
+import javax.management.DynamicMBean;
+import javax.management.InvalidAttributeValueException;
+import javax.management.ListenerNotFoundException;
+import javax.management.MBeanAttributeInfo;
+import javax.management.MBeanConstructorInfo;
+import javax.management.MBeanException;
+import javax.management.MBeanInfo;
+import javax.management.MBeanNotificationInfo;
+import javax.management.MBeanOperationInfo;
+import javax.management.MBeanRegistration;
+import javax.management.MBeanServer;
+import javax.management.NotificationBroadcasterSupport;
+import javax.management.NotificationFilter;
+import javax.management.NotificationListener;
+import javax.management.ObjectName;
+import javax.management.ReflectionException;
+
+/**
+ * ContextClassLoaderTester.
+ * 
+ * @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @version $Revision: 1.1 $
+ */
+public class ContextClassLoaderTester extends NotificationBroadcasterSupport implements DynamicMBean, MBeanRegistration
+{
+   public static ClassLoader classLoader;
+   
+
+   public Object getAttribute(String attribute) throws AttributeNotFoundException, MBeanException, ReflectionException
+   {
+      checkClassLoader();
+      return null;
+   }
+
+   public AttributeList getAttributes(String[] attributes)
+   {
+      checkClassLoader();
+      return null;
+   }
+
+   public MBeanInfo getMBeanInfo()
+   {
+      checkClassLoader();
+      MBeanAttributeInfo[] attributes =
+      {
+         new MBeanAttributeInfo("test", String.class.getName(), "test", true, true, false)
+      };
+      MBeanConstructorInfo[] constructors = new MBeanConstructorInfo[0];
+      MBeanOperationInfo[] operations = new MBeanOperationInfo[0];
+      MBeanNotificationInfo[] notifications = new MBeanNotificationInfo[0];
+      return new MBeanInfo(getClass().getName(), "Test", attributes, constructors, operations, notifications);
+   }
+
+   public Object invoke(String actionName, Object[] params, String[] signature) throws MBeanException,
+         ReflectionException
+   {
+      checkClassLoader();
+      return null;
+   }
+
+   public void setAttribute(Attribute attribute) throws AttributeNotFoundException, InvalidAttributeValueException,
+         MBeanException, ReflectionException
+   {
+      checkClassLoader();
+   }
+
+   public AttributeList setAttributes(AttributeList attributes)
+   {
+      checkClassLoader();
+      return null;
+   }
+
+   public ObjectName preRegister(MBeanServer server, ObjectName name) throws Exception
+   {
+      checkClassLoader();
+      return name;
+   }
+
+   public void postRegister(Boolean registrationDone)
+   {
+      checkClassLoader();
+   }
+
+   public void preDeregister() throws Exception
+   {
+      checkClassLoader();
+   }
+   
+   public void postDeregister()
+   {
+      checkClassLoader();
+   }
+
+   public void addNotificationListener(NotificationListener listener, NotificationFilter filter, Object handback)
+   {
+      checkClassLoader();
+      super.addNotificationListener(listener, filter, handback);
+   }
+
+   public void removeNotificationListener(NotificationListener listener, NotificationFilter filter, Object handback)
+         throws ListenerNotFoundException
+   {
+      checkClassLoader();
+      super.removeNotificationListener(listener, filter, handback);
+   }
+
+   public void removeNotificationListener(NotificationListener listener) throws ListenerNotFoundException
+   {
+      checkClassLoader();
+      super.removeNotificationListener(listener);
+   }
+
+   protected void checkClassLoader()
+   {
+      ClassLoader expected = classLoader;
+      ClassLoader actual = Thread.currentThread().getContextClassLoader();
+      if (expected != actual)
+         throw new Error("Expected tcl: " + expected + " actual: " + actual);
+   }
+}

Modified: projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/support/JavaBean.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/support/JavaBean.java	2009-03-30 14:20:22 UTC (rev 86476)
+++ projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/support/JavaBean.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -29,6 +29,7 @@
  * @author <a href="adrian at jboss.com">Adrian Brock</a>
  * @version $Revision$
  */
+ at SuppressWarnings("unchecked")
 public class JavaBean
 {
    private String property1;

Modified: projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/test/ControllerTestSuite.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/test/ControllerTestSuite.java	2009-03-30 14:20:22 UTC (rev 86476)
+++ projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/test/ControllerTestSuite.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -26,6 +26,7 @@
 import junit.textui.TestRunner;
 
 import org.jboss.test.system.controller.basic.test.ControllerBasicTestSuite;
+import org.jboss.test.system.controller.classloader.test.ControllerClassLoaderTestSuite;
 import org.jboss.test.system.controller.configure.test.ControllerConfigureTestSuite;
 import org.jboss.test.system.controller.instantiate.test.ControllerInstantiateTestSuite;
 import org.jboss.test.system.controller.integration.test.IntegrationTestSuite;
@@ -51,6 +52,7 @@
 
       suite.addTest(ControllerBasicTestSuite.suite());
       suite.addTest(ControllerParseTestSuite.suite());
+      suite.addTest(ControllerClassLoaderTestSuite.suite());
       suite.addTest(ControllerInstantiateTestSuite.suite());
       suite.addTest(ControllerConfigureTestSuite.suite());
       suite.addTest(ControllerLifecycleTestSuite.suite());

Modified: projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/metadata/annotation/AnnotationUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/metadata/annotation/AnnotationUnitTestCase.java	2009-03-30 14:20:22 UTC (rev 86476)
+++ projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/metadata/annotation/AnnotationUnitTestCase.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -24,8 +24,6 @@
 import java.lang.annotation.Annotation;
 import java.util.List;
 
-import javax.management.ObjectName;
-
 import org.jboss.annotation.factory.AnnotationCreator;
 import org.jboss.system.metadata.ServiceAnnotationMetaData;
 import org.jboss.system.metadata.ServiceMetaData;
@@ -55,7 +53,7 @@
       assertOthers(metaData);
    }
 
-   protected void assertAnnotation(ServiceMetaData metaData, String exp, Class c)
+   protected void assertAnnotation(ServiceMetaData metaData, String exp, Class<?> c)
       throws Exception
    {
       List<ServiceAnnotationMetaData> annotations = metaData.getAnnotations();

Modified: projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/metadata/value/alias/test/AliasValueUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/metadata/value/alias/test/AliasValueUnitTestCase.java	2009-03-30 14:20:22 UTC (rev 86476)
+++ projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/metadata/value/alias/test/AliasValueUnitTestCase.java	2009-03-30 14:50:55 UTC (rev 86477)
@@ -22,10 +22,9 @@
 package org.jboss.test.system.metadata.value.alias.test;
 
 import java.util.List;
-import java.util.Iterator;
 
-import org.jboss.test.system.metadata.test.AbstractMetaDataTest;
 import org.jboss.system.metadata.ServiceMetaData;
+import org.jboss.test.system.metadata.test.AbstractMetaDataTest;
 
 /**
  * Test aliases on XMBeans.

Added: projects/microcontainer/trunk/jmx-mc-int/src/test/resources/org/jboss/test/system/controller/classloader/test/ContextClassLoader.xml
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/test/resources/org/jboss/test/system/controller/classloader/test/ContextClassLoader.xml	                        (rev 0)
+++ projects/microcontainer/trunk/jmx-mc-int/src/test/resources/org/jboss/test/system/controller/classloader/test/ContextClassLoader.xml	2009-03-30 14:50:55 UTC (rev 86477)
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<server>
+   <mbean name="jboss.test:type=ClassLoader" code="org.jboss.test.system.controller.support.ContextClassLoader"/>
+</server>
\ No newline at end of file

Modified: projects/microcontainer/trunk/pom.xml
===================================================================
--- projects/microcontainer/trunk/pom.xml	2009-03-30 14:20:22 UTC (rev 86476)
+++ projects/microcontainer/trunk/pom.xml	2009-03-30 14:50:55 UTC (rev 86477)
@@ -43,7 +43,7 @@
     <version.jboss.aop>2.0.0.SP1</version.jboss.aop>
     <version.org.jboss.reflect>2.0.2.GA</version.org.jboss.reflect>
     <version.org.jboss.mdr>2.0.1.GA</version.org.jboss.mdr>
-    <version.org.jboss.mx>6.0.0.Beta1</version.org.jboss.mx>
+    <version.org.jboss.mx>6.0.0.Beta2</version.org.jboss.mx>
     <version.org.jboss.test>1.1.1.GA</version.org.jboss.test>
     <version.junit>4.4</version.junit>
     <version.jboss.profiler.jvmti>1.0.0.CR5</version.jboss.profiler.jvmti>
@@ -197,6 +197,11 @@
         <version>${version.org.jboss.mx}</version>
       </dependency>
       <dependency>
+        <groupId>org.jboss.mx</groupId>
+        <artifactId>jboss-mbeanserver</artifactId>
+        <version>${version.org.jboss.mx}</version>
+      </dependency>
+      <dependency>
         <groupId>org.jboss.microcontainer</groupId>
         <artifactId>jboss-jmx-mc-int</artifactId>
         <version>${project.version}</version>




More information about the jboss-cvs-commits mailing list