[jboss-cvs] JBossAS SVN: r81485 - in trunk: system-jmx/src/main/org/jboss/system and 6 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Nov 24 07:46:34 EST 2008
Author: adrian at jboss.org
Date: 2008-11-24 07:46:33 -0500 (Mon, 24 Nov 2008)
New Revision: 81485
Modified:
trunk/server/src/etc/conf/default/bootstrap/deployers.xml
trunk/server/src/etc/conf/default/bootstrap/jmx.xml
trunk/system-jmx/src/main/org/jboss/system/ServiceConfigurator.java
trunk/system-jmx/src/main/org/jboss/system/ServiceContext.java
trunk/system-jmx/src/main/org/jboss/system/ServiceController.java
trunk/system-jmx/src/main/org/jboss/system/ServiceControllerMBean.java
trunk/system-jmx/src/main/org/jboss/system/ServiceCreator.java
trunk/system-jmx/src/main/org/jboss/system/metadata/ServiceMetaDataParser.java
trunk/system-jmx/src/tests/org/jboss/test/system/controller/basic/test/DoubleInstallOldUnitTestCase.java
trunk/system-jmx/src/tests/org/jboss/test/system/controller/basic/test/DoubleInstallTest.java
trunk/system-jmx/src/tests/org/jboss/test/system/controller/configure/attribute/test/AttributeOldUnitTestCase.java
trunk/system-jmx/src/tests/org/jboss/test/system/controller/configure/attribute/test/AttributeTest.java
trunk/system-jmx/src/tests/org/jboss/test/system/controller/configure/attribute/test/DependsAttributeTest.java
trunk/system-jmx/src/tests/org/jboss/test/system/controller/configure/attribute/test/DependsListAttributeNewUnitTestCase.java
trunk/system-jmx/src/tests/org/jboss/test/system/controller/configure/attribute/test/DependsListAttributeOldUnitTestCase.java
trunk/system-jmx/src/tests/org/jboss/test/system/controller/configure/attribute/test/DependsListAttributeTest.java
trunk/system-jmx/src/tests/org/jboss/test/system/controller/parse/test/ErrorInParseOldUnitTestCase.java
trunk/system-jmx/src/tests/org/jboss/test/system/controller/parse/test/ErrorInParseTest.java
trunk/system-jmx/src/tests/org/jboss/test/system/metadata/basic/test/BasicMBeanUnitTestCase.java
trunk/system-jmx/src/tests/org/jboss/test/system/metadata/test/AbstractMetaDataTest.java
trunk/system-jmx/src/tests/org/jboss/test/system/metadata/test/MetaDataTestDelegate.java
Log:
[JBAS-6237] - Don't use DeploymentException in the jmx kernel
Modified: trunk/server/src/etc/conf/default/bootstrap/deployers.xml
===================================================================
--- trunk/server/src/etc/conf/default/bootstrap/deployers.xml 2008-11-24 11:46:07 UTC (rev 81484)
+++ trunk/server/src/etc/conf/default/bootstrap/deployers.xml 2008-11-24 12:46:33 UTC (rev 81485)
@@ -8,6 +8,7 @@
<classloader><inject bean="deployers-classloader:0.0.0"/></classloader>
<classloader name="deployers-classloader" xmlns="urn:jboss:classloader:1.0" export-all="NON_EMPTY" import-all="true">
+ <root>${jboss.lib.url}jboss-deployers-core-spi.jar</root>
<root>${jboss.lib.url}jboss-deployers-core.jar</root>
<root>${jboss.lib.url}jboss-deployers-client-spi.jar</root>
<root>${jboss.lib.url}jboss-deployers-client.jar</root>
Modified: trunk/server/src/etc/conf/default/bootstrap/jmx.xml
===================================================================
--- trunk/server/src/etc/conf/default/bootstrap/jmx.xml 2008-11-24 11:46:07 UTC (rev 81484)
+++ trunk/server/src/etc/conf/default/bootstrap/jmx.xml 2008-11-24 12:46:33 UTC (rev 81485)
@@ -13,9 +13,6 @@
<root>${jboss.lib.url}jboss-jmx.jar</root>
<root>${jboss.lib.url}jboss-system-jmx.jar</root>
<root>${jboss.lib.url}dom4j.jar</root>
-
- <!-- FIXME ServiceController uses DeploymentException -->
- <root>${jboss.lib.url}jboss-deployers-core-spi.jar</root>
</classloader>
<bean name="ServerInfo" class="org.jboss.system.server.ServerInfo">
Modified: trunk/system-jmx/src/main/org/jboss/system/ServiceConfigurator.java
===================================================================
--- trunk/system-jmx/src/main/org/jboss/system/ServiceConfigurator.java 2008-11-24 11:46:07 UTC (rev 81484)
+++ trunk/system-jmx/src/main/org/jboss/system/ServiceConfigurator.java 2008-11-24 12:46:33 UTC (rev 81485)
@@ -27,7 +27,6 @@
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.List;
import javax.management.Attribute;
@@ -44,7 +43,6 @@
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamResult;
-import org.jboss.deployment.DeploymentException;
import org.jboss.logging.Logger;
import org.jboss.mx.util.JMXExceptionDecoder;
import org.jboss.system.metadata.ServiceAttributeMetaData;
@@ -83,6 +81,23 @@
private static final Logger log = Logger.getLogger(ServiceConfigurator.class);
/**
+ * Rethrow an error as an exception
+ *
+ * @param context the context
+ * @param t the original throwable
+ * @return never
+ * @throws Exception always
+ */
+ public static Exception rethrow(String context, Throwable t) throws Exception
+ {
+ if (t instanceof Error)
+ throw (Error) t;
+ else if (t instanceof Exception)
+ throw (Exception) t;
+ throw new RuntimeException(context, t);
+ }
+
+ /**
* Configure an MBean
*
* @param server the server
@@ -120,11 +135,11 @@
{
String attributeName = attribute.getName();
if (attributeName == null || attributeName.length() == 0)
- throw new DeploymentException("No or empty attribute name for " + objectName);
+ throw new RuntimeException("No or empty attribute name for " + objectName);
MBeanAttributeInfo attributeInfo = attributeMap.get(attributeName);
if (attributeInfo == null)
{
- throw new DeploymentException("No Attribute found with name: " + attributeName + " for " + objectName
+ throw new RuntimeException("No Attribute found with name: " + attributeName + " for " + objectName
+", attributes: "+attributeMap.keySet());
}
@@ -152,7 +167,7 @@
}
catch (Throwable t)
{
- throw new DeploymentException("Exception setting attribute " + attributeName + " on mbean " + objectName, JMXExceptionDecoder.decode(t));
+ throw new RuntimeException("Exception setting attribute " + attributeName + " on mbean " + objectName, JMXExceptionDecoder.decode(t));
}
}
}
@@ -193,14 +208,14 @@
catch (InstanceNotFoundException e)
{
// The MBean is no longer available
- throw new DeploymentException("Trying to configure nonexistent mbean: " + objectName);
+ throw new RuntimeException("Trying to configure nonexistent mbean: " + objectName);
}
catch (Exception e)
{
- throw new DeploymentException("Could not get mbeanInfo", JMXExceptionDecoder.decode(e));
+ throw new RuntimeException("Could not get mbeanInfo", JMXExceptionDecoder.decode(e));
}
if (info == null)
- throw new DeploymentException("MBeanInfo is null for mbean: " + objectName);
+ throw new RuntimeException("MBeanInfo is null for mbean: " + objectName);
MBeanAttributeInfo[] attributes = info.getAttributes();
HashMap<String, MBeanAttributeInfo> attributeMap = new HashMap<String, MBeanAttributeInfo>();
for (int i = 0; i < attributes.length; i++)
@@ -242,9 +257,9 @@
* the mbeans to create and configure.
* @param loaderName the classloader's ObjectName
* @return a <code>List</code> of ObjectNames of created mbeans.
- * @throws DeploymentException if an error occurs
+ * @throws Exception if an error occurs
*/
- public List<ObjectName> install(Element config, ObjectName loaderName) throws DeploymentException
+ public List<ObjectName> install(Element config, ObjectName loaderName) throws Exception
{
// Parse the xml
ServiceMetaDataParser parser = new ServiceMetaDataParser(config);
@@ -279,7 +294,7 @@
log.error("Error removing mbean after failed deployment: " + name, e);
}
}
- DeploymentException.rethrowAsDeploymentException("Error during install", t);
+ throw rethrow("Error during install", t);
}
}
return result;
@@ -368,9 +383,8 @@
}
ServiceContext sc = serviceController.getServiceContext(name);
- for (Iterator i = sc.iDependOn.iterator(); i.hasNext();)
+ for (ServiceContext needs : sc.iDependOn)
{
- ServiceContext needs = (ServiceContext) i.next();
Element dependsElement = doc.createElement("depends");
dependsElement.appendChild(doc.createTextNode(needs.objectName.toString()));
mbeanElement.appendChild(dependsElement);
Modified: trunk/system-jmx/src/main/org/jboss/system/ServiceContext.java
===================================================================
--- trunk/system-jmx/src/main/org/jboss/system/ServiceContext.java 2008-11-24 11:46:07 UTC (rev 81484)
+++ trunk/system-jmx/src/main/org/jboss/system/ServiceContext.java 2008-11-24 12:46:33 UTC (rev 81485)
@@ -122,7 +122,8 @@
return sbuf.toString();
}
-
+
+ @SuppressWarnings("unchecked")
private void printList(StringBuffer sbuf, String msg, List ctxs)
{
if (ctxs.size() > 0)
Modified: trunk/system-jmx/src/main/org/jboss/system/ServiceController.java
===================================================================
--- trunk/system-jmx/src/main/org/jboss/system/ServiceController.java 2008-11-24 11:46:07 UTC (rev 81484)
+++ trunk/system-jmx/src/main/org/jboss/system/ServiceController.java 2008-11-24 12:46:33 UTC (rev 81485)
@@ -39,7 +39,6 @@
import org.jboss.dependency.spi.ControllerState;
import org.jboss.dependency.spi.DependencyInfo;
import org.jboss.dependency.spi.DependencyItem;
-import org.jboss.deployers.spi.DeploymentException;
import org.jboss.deployment.DeploymentInfo;
import org.jboss.deployment.DeploymentState;
import org.jboss.kernel.Kernel;
@@ -102,6 +101,23 @@
protected CopyOnWriteArrayList<ServiceControllerContext> installedOrder = new CopyOnWriteArrayList<ServiceControllerContext>();
/**
+ * Rethrow an error as an exception
+ *
+ * @param context the context
+ * @param t the original throwable
+ * @return never
+ * @throws Exception always
+ */
+ public static Exception rethrow(String context, Throwable t) throws Exception
+ {
+ if (t instanceof Error)
+ throw (Error) t;
+ else if (t instanceof Exception)
+ throw (Exception) t;
+ throw new RuntimeException(context, t);
+ }
+
+ /**
* Get exception that will expose stacktrace.
*
* @return the stracktrace exposing exception
@@ -109,7 +125,7 @@
protected Throwable getStackTrace()
{
//noinspection ThrowableInstanceNeverThrown
- return new Exception("STACKTRACE");
+ return new Throwable("STACKTRACE");
}
/**
@@ -209,7 +225,7 @@
di.state = state;
}
- public List<ObjectName> install(List<ServiceMetaData> metaDatas, ObjectName loaderName) throws DeploymentException
+ public List<ObjectName> install(List<ServiceMetaData> metaDatas, ObjectName loaderName) throws Exception
{
KernelController controller = kernel.getController();
@@ -238,13 +254,13 @@
for (ServiceControllerContext ctx : contexts)
safelyRemoveAnyRegisteredContext(ctx);
- DeploymentException.rethrowAsDeploymentException("Error during install", t);
+ throw rethrow("Error during install", t);
}
}
return result;
}
- public ObjectName install(ServiceMetaData metaData, ObjectName loaderName) throws DeploymentException
+ public ObjectName install(ServiceMetaData metaData, ObjectName loaderName) throws Exception
{
KernelController controller = kernel.getController();
metaData.setClassLoaderName(loaderName);
@@ -260,11 +276,11 @@
}
catch (Throwable t)
{
- throw DeploymentException.rethrowAsDeploymentException("Error during install " + name, t);
+ throw rethrow("Error during install " + name, t);
}
}
- public List<ObjectName> install(Element config, ObjectName loaderName) throws DeploymentException
+ public List<ObjectName> install(Element config, ObjectName loaderName) throws Exception
{
// Parse the xml
ServiceMetaDataParser parser = new ServiceMetaDataParser(config);
@@ -277,9 +293,9 @@
*
* @param name the object name
* @param object the mbean object
- * @throws DeploymentException for any error
+ * @throws Exception for any error
*/
- public void install(ObjectName name, Object object) throws DeploymentException
+ public void install(ObjectName name, Object object) throws Exception
{
if (name == null)
throw new IllegalArgumentException("Null name");
@@ -299,7 +315,7 @@
// Something went wrong
safelyRemoveAnyRegisteredContext(context);
- DeploymentException.rethrowAsDeploymentException("Error during install", t);
+ throw rethrow("Error during install", t);
}
}
@@ -362,7 +378,7 @@
// Something went wrong
safelyRemoveAnyRegisteredContext(context);
- DeploymentException.rethrowAsDeploymentException("Error during register: " + serviceName, t);
+ throw rethrow("Error during register: " + serviceName, t);
}
}
Modified: trunk/system-jmx/src/main/org/jboss/system/ServiceControllerMBean.java
===================================================================
--- trunk/system-jmx/src/main/org/jboss/system/ServiceControllerMBean.java 2008-11-24 11:46:07 UTC (rev 81484)
+++ trunk/system-jmx/src/main/org/jboss/system/ServiceControllerMBean.java 2008-11-24 12:46:33 UTC (rev 81485)
@@ -26,7 +26,6 @@
import javax.management.ObjectName;
-import org.jboss.deployers.spi.DeploymentException;
import org.jboss.deployment.DeploymentInfo;
import org.jboss.deployment.DeploymentState;
import org.jboss.mx.util.ObjectNameFactory;
@@ -94,9 +93,9 @@
* @param config
* @param loaderName
* @return Description of the Returned Value
- * @throws DeploymentException
+ * @throws Exception for any error
*/
- List<ObjectName> install(Element config, ObjectName loaderName) throws DeploymentException;
+ List<ObjectName> install(Element config, ObjectName loaderName) throws Exception;
/**
* Register the mbean against the microkernel with no dependencies.
Modified: trunk/system-jmx/src/main/org/jboss/system/ServiceCreator.java
===================================================================
--- trunk/system-jmx/src/main/org/jboss/system/ServiceCreator.java 2008-11-24 11:46:07 UTC (rev 81484)
+++ trunk/system-jmx/src/main/org/jboss/system/ServiceCreator.java 2008-11-24 12:46:33 UTC (rev 81485)
@@ -29,7 +29,6 @@
import javax.management.ObjectName;
import javax.management.StandardMBean;
-import org.jboss.deployment.DeploymentException;
import org.jboss.logging.Logger;
import org.jboss.mx.server.ServerConstants;
import org.jboss.mx.server.registry.MBeanEntry;
@@ -39,7 +38,6 @@
import org.jboss.system.metadata.ServiceConstructorMetaData;
import org.jboss.system.metadata.ServiceMetaData;
import org.jboss.system.metadata.ServiceMetaDataParser;
-import org.jboss.util.UnreachableStatementException;
import org.w3c.dom.Element;
/**
@@ -64,6 +62,23 @@
private MBeanServer server;
/**
+ * Rethrow an error as an exception
+ *
+ * @param context the context
+ * @param t the original throwable
+ * @return never
+ * @throws Exception always
+ */
+ public static Exception rethrow(String context, Throwable t) throws Exception
+ {
+ if (t instanceof Error)
+ throw (Error) t;
+ else if (t instanceof Exception)
+ throw (Exception) t;
+ throw new RuntimeException(context, t);
+ }
+
+ /**
* Install an MBean
*
* @todo expand the meta data to include a pre-instantiated object
@@ -85,7 +100,7 @@
// Check for duplicate
if (server.isRegistered(objectName))
- throw new DeploymentException("Trying to install an already registered mbean: " + objectName);
+ throw new RuntimeException("Trying to install an already registered mbean: " + objectName);
try
{
@@ -138,8 +153,7 @@
{
}
- DeploymentException.rethrowAsDeploymentException("Unable to createMBean for " + objectName, newE);
- throw new UnreachableStatementException();
+ throw rethrow("Unable to createMBean for " + objectName, newE);
}
}
@@ -160,7 +174,7 @@
ServiceConstructorMetaData constructor = metaData.getConstructor();
String interfaceName = metaData.getInterfaceName();
- Class intf = loader.loadClass(interfaceName);
+ Class<?> intf = loader.loadClass(interfaceName);
log.debug("About to create bean resource: " + objectName + " with code: " + code + " and interface " + interfaceName);
Object resource = server.instantiate(code,
loaderName,
@@ -356,7 +370,7 @@
ServiceMetaDataParser parser = new ServiceMetaDataParser(mbeanElement);
List<ServiceMetaData> metaDatas = parser.parse();
if (metaDatas.isEmpty())
- throw new DeploymentException("No mbeans found in passed configuration for " + mbeanName);
+ throw new RuntimeException("No mbeans found in passed configuration for " + mbeanName);
ServiceMetaData metaData = metaDatas.get(0);
metaData.setClassLoaderName(loaderName);
ServiceInstance instance = install(server, mbeanName, metaData, null);
Modified: trunk/system-jmx/src/main/org/jboss/system/metadata/ServiceMetaDataParser.java
===================================================================
--- trunk/system-jmx/src/main/org/jboss/system/metadata/ServiceMetaDataParser.java 2008-11-24 11:46:07 UTC (rev 81484)
+++ trunk/system-jmx/src/main/org/jboss/system/metadata/ServiceMetaDataParser.java 2008-11-24 12:46:33 UTC (rev 81485)
@@ -23,7 +23,6 @@
import java.security.AccessController;
import java.security.PrivilegedAction;
-import java.security.PrivilegedActionException;
import java.util.ArrayList;
import java.util.List;
@@ -31,7 +30,6 @@
import org.jboss.dependency.spi.ControllerMode;
import org.jboss.dependency.spi.ControllerState;
-import org.jboss.deployment.DeploymentException;
import org.jboss.logging.Logger;
import org.jboss.util.StringPropertyReplacer;
import org.w3c.dom.Attr;
@@ -78,12 +76,29 @@
}
/**
+ * Rethrow an error as an exception
+ *
+ * @param context the context
+ * @param t the original throwable
+ * @return never
+ * @throws Exception always
+ */
+ public static Exception rethrow(String context, Throwable t) throws Exception
+ {
+ if (t instanceof Error)
+ throw (Error) t;
+ else if (t instanceof Exception)
+ throw (Exception) t;
+ throw new RuntimeException(context, t);
+ }
+
+ /**
* Parse the xml
*
* @return the list of service meta data
- * @throws DeploymentException for any error
+ * @throws Exception for any error
*/
- public List<ServiceMetaData> parse() throws DeploymentException
+ public List<ServiceMetaData> parse() throws Exception
{
List<ServiceMetaData> services = new ArrayList<ServiceMetaData>();
@@ -115,7 +130,7 @@
}
catch (Throwable t)
{
- DeploymentException.rethrowAsDeploymentException("Unable to parse service configuration", t);
+ throw rethrow("Unable to parse service configuration", t);
}
return services;
@@ -199,7 +214,7 @@
{
String attributeName = element.getAttribute("name");
if (attributeName == null)
- throw new DeploymentException("No attribute name for " + mbeanName);
+ throw new RuntimeException("No attribute name for " + mbeanName);
boolean trim = true;
String replaceAttr = element.getAttribute("replace");
if (replaceAttr.length() > 0)
@@ -367,7 +382,7 @@
String name = mbeanElement.getAttribute("name");
if (name == null || name.trim().length() == 0)
- throw new DeploymentException("Missing or empty 'name' attribute for mbean.");
+ throw new RuntimeException("Missing or empty 'name' attribute for mbean.");
if (replace)
name = StringPropertyReplacer.replaceProperties(name);
@@ -422,7 +437,7 @@
NodeList list = mbeanElement.getElementsByTagName("constructor");
if (list.getLength() > 1 && list.item(0).getParentNode() == mbeanElement)
- throw new DeploymentException("only one <constructor> element may be defined for " + name);
+ throw new RuntimeException("only one <constructor> element may be defined for " + name);
if (list.getLength() == 1)
{
@@ -520,7 +535,7 @@
{
NodeList mbeans = mbeanElement.getElementsByTagName("xmbean");
if (mbeans.getLength() == 0)
- throw new DeploymentException("No nested mbean element given for xmbean for " + name);
+ throw new RuntimeException("No nested mbean element given for xmbean for " + name);
return (Element) mbeans.item(0);
}
@@ -611,7 +626,7 @@
}
else if ("null".equals(valueEl.getTagName()) == false)
{
- throw new DeploymentException("Element " + ((Element)child).getTagName() + " not supported as a child of value-factory/parameter in a -service.xml");
+ throw new RuntimeException("Element " + ((Element)child).getTagName() + " not supported as a child of value-factory/parameter in a -service.xml");
}
}
else
Modified: trunk/system-jmx/src/tests/org/jboss/test/system/controller/basic/test/DoubleInstallOldUnitTestCase.java
===================================================================
--- trunk/system-jmx/src/tests/org/jboss/test/system/controller/basic/test/DoubleInstallOldUnitTestCase.java 2008-11-24 11:46:07 UTC (rev 81484)
+++ trunk/system-jmx/src/tests/org/jboss/test/system/controller/basic/test/DoubleInstallOldUnitTestCase.java 2008-11-24 12:46:33 UTC (rev 81485)
@@ -23,7 +23,9 @@
import junit.framework.Test;
+import org.jboss.deployment.DeploymentException;
import org.jboss.test.AbstractTestDelegate;
+import org.jboss.test.system.controller.support.SimpleMBean;
/**
* DoubleInstallOldUnitTestCase.
@@ -43,8 +45,22 @@
super(name);
}
- public static AbstractTestDelegate getDelegate(Class clazz) throws Exception
+ public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
{
return getOldControllerDelegate(clazz);
}
+
+ public void testDoubleInstall() throws Exception
+ {
+ try
+ {
+ deploy("DoubleInstall.xml");
+ fail("Should not be able to deploy twice");
+ }
+ catch (Throwable t)
+ {
+ checkThrowable(DeploymentException.class, t);
+ }
+ assertServiceRunning(SimpleMBean.OBJECT_NAME);
+ }
}
Modified: trunk/system-jmx/src/tests/org/jboss/test/system/controller/basic/test/DoubleInstallTest.java
===================================================================
--- trunk/system-jmx/src/tests/org/jboss/test/system/controller/basic/test/DoubleInstallTest.java 2008-11-24 11:46:07 UTC (rev 81484)
+++ trunk/system-jmx/src/tests/org/jboss/test/system/controller/basic/test/DoubleInstallTest.java 2008-11-24 12:46:33 UTC (rev 81485)
@@ -21,7 +21,6 @@
*/
package org.jboss.test.system.controller.basic.test;
-import org.jboss.deployment.DeploymentException;
import org.jboss.test.system.controller.AbstractControllerTest;
import org.jboss.test.system.controller.support.SimpleMBean;
@@ -47,7 +46,7 @@
}
catch (Throwable t)
{
- checkThrowable(DeploymentException.class, t);
+ checkThrowable(IllegalStateException.class, t);
}
assertServiceRunning(SimpleMBean.OBJECT_NAME);
}
Modified: trunk/system-jmx/src/tests/org/jboss/test/system/controller/configure/attribute/test/AttributeOldUnitTestCase.java
===================================================================
--- trunk/system-jmx/src/tests/org/jboss/test/system/controller/configure/attribute/test/AttributeOldUnitTestCase.java 2008-11-24 11:46:07 UTC (rev 81484)
+++ trunk/system-jmx/src/tests/org/jboss/test/system/controller/configure/attribute/test/AttributeOldUnitTestCase.java 2008-11-24 12:46:33 UTC (rev 81485)
@@ -23,7 +23,9 @@
import junit.framework.Test;
+import org.jboss.deployment.DeploymentException;
import org.jboss.test.AbstractTestDelegate;
+import org.jboss.test.system.controller.support.SimpleMBean;
/**
* AttributeOldUnitTestCase.
@@ -43,8 +45,23 @@
super(name);
}
- public static AbstractTestDelegate getDelegate(Class clazz) throws Exception
+ public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
{
return getOldControllerDelegate(clazz);
}
+
+ public void testAttributeNoName() throws Exception
+ {
+ assertDeployFailure(SimpleMBean.OBJECT_NAME, DeploymentException.class);
+ }
+
+ public void testAttributeEmptyName() throws Exception
+ {
+ assertDeployFailure(SimpleMBean.OBJECT_NAME, DeploymentException.class);
+ }
+
+ public void testAttributeNotFound() throws Exception
+ {
+ assertDeployFailure(SimpleMBean.OBJECT_NAME, DeploymentException.class);
+ }
}
Modified: trunk/system-jmx/src/tests/org/jboss/test/system/controller/configure/attribute/test/AttributeTest.java
===================================================================
--- trunk/system-jmx/src/tests/org/jboss/test/system/controller/configure/attribute/test/AttributeTest.java 2008-11-24 11:46:07 UTC (rev 81484)
+++ trunk/system-jmx/src/tests/org/jboss/test/system/controller/configure/attribute/test/AttributeTest.java 2008-11-24 12:46:33 UTC (rev 81485)
@@ -23,7 +23,6 @@
import javax.management.ObjectName;
-import org.jboss.deployment.DeploymentException;
import org.jboss.test.system.controller.AbstractControllerTest;
import org.jboss.test.system.controller.support.BrokenDynamicMBeanAttributes;
import org.jboss.test.system.controller.support.Simple;
@@ -124,12 +123,12 @@
public void testAttributeNoName() throws Exception
{
- assertDeployFailure(SimpleMBean.OBJECT_NAME, DeploymentException.class);
+ assertDeployFailure(SimpleMBean.OBJECT_NAME, RuntimeException.class);
}
public void testAttributeEmptyName() throws Exception
{
- assertDeployFailure(SimpleMBean.OBJECT_NAME, DeploymentException.class);
+ assertDeployFailure(SimpleMBean.OBJECT_NAME, RuntimeException.class);
}
public void testAttributeBrokenGetAttributes() throws Exception
@@ -139,7 +138,7 @@
public void testAttributeNotFound() throws Exception
{
- assertDeployFailure(SimpleMBean.OBJECT_NAME, DeploymentException.class);
+ assertDeployFailure(SimpleMBean.OBJECT_NAME, RuntimeException.class);
}
public void testAttributeBrokenSetAttribute() throws Exception
Modified: trunk/system-jmx/src/tests/org/jboss/test/system/controller/configure/attribute/test/DependsAttributeTest.java
===================================================================
--- trunk/system-jmx/src/tests/org/jboss/test/system/controller/configure/attribute/test/DependsAttributeTest.java 2008-11-24 11:46:07 UTC (rev 81484)
+++ trunk/system-jmx/src/tests/org/jboss/test/system/controller/configure/attribute/test/DependsAttributeTest.java 2008-11-24 12:46:33 UTC (rev 81485)
@@ -24,7 +24,6 @@
import javax.management.MalformedObjectNameException;
import javax.management.ObjectName;
-import org.jboss.deployment.DeploymentException;
import org.jboss.mx.util.ObjectNameFactory;
import org.jboss.test.system.controller.AbstractControllerTest;
import org.jboss.test.system.controller.support.Simple;
@@ -137,7 +136,7 @@
public void testDependsAttributeNotFound() throws Exception
{
- assertDeployFailure(SimpleMBean.OBJECT_NAME, DeploymentException.class);
+ assertDeployFailure(SimpleMBean.OBJECT_NAME, RuntimeException.class);
}
public void testDependsAttributeBrokenSetAttribute() throws Exception
Modified: trunk/system-jmx/src/tests/org/jboss/test/system/controller/configure/attribute/test/DependsListAttributeNewUnitTestCase.java
===================================================================
--- trunk/system-jmx/src/tests/org/jboss/test/system/controller/configure/attribute/test/DependsListAttributeNewUnitTestCase.java 2008-11-24 11:46:07 UTC (rev 81484)
+++ trunk/system-jmx/src/tests/org/jboss/test/system/controller/configure/attribute/test/DependsListAttributeNewUnitTestCase.java 2008-11-24 12:46:33 UTC (rev 81485)
@@ -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: trunk/system-jmx/src/tests/org/jboss/test/system/controller/configure/attribute/test/DependsListAttributeOldUnitTestCase.java
===================================================================
--- trunk/system-jmx/src/tests/org/jboss/test/system/controller/configure/attribute/test/DependsListAttributeOldUnitTestCase.java 2008-11-24 11:46:07 UTC (rev 81484)
+++ trunk/system-jmx/src/tests/org/jboss/test/system/controller/configure/attribute/test/DependsListAttributeOldUnitTestCase.java 2008-11-24 12:46:33 UTC (rev 81485)
@@ -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);
}
Modified: trunk/system-jmx/src/tests/org/jboss/test/system/controller/configure/attribute/test/DependsListAttributeTest.java
===================================================================
--- trunk/system-jmx/src/tests/org/jboss/test/system/controller/configure/attribute/test/DependsListAttributeTest.java 2008-11-24 11:46:07 UTC (rev 81484)
+++ trunk/system-jmx/src/tests/org/jboss/test/system/controller/configure/attribute/test/DependsListAttributeTest.java 2008-11-24 12:46:33 UTC (rev 81485)
@@ -28,7 +28,6 @@
import javax.management.MalformedObjectNameException;
import javax.management.ObjectName;
-import org.jboss.deployment.DeploymentException;
import org.jboss.mx.util.ObjectNameFactory;
import org.jboss.test.system.controller.AbstractControllerTest;
import org.jboss.test.system.controller.support.Simple;
@@ -166,7 +165,7 @@
public void testDependsListAttributeNotFound() throws Exception
{
- assertDeployFailure(SimpleMBean.OBJECT_NAME, DeploymentException.class);
+ assertDeployFailure(SimpleMBean.OBJECT_NAME, RuntimeException.class);
}
public void testDependsListAttributeBrokenSetAttribute() throws Exception
Modified: trunk/system-jmx/src/tests/org/jboss/test/system/controller/parse/test/ErrorInParseOldUnitTestCase.java
===================================================================
--- trunk/system-jmx/src/tests/org/jboss/test/system/controller/parse/test/ErrorInParseOldUnitTestCase.java 2008-11-24 11:46:07 UTC (rev 81484)
+++ trunk/system-jmx/src/tests/org/jboss/test/system/controller/parse/test/ErrorInParseOldUnitTestCase.java 2008-11-24 12:46:33 UTC (rev 81485)
@@ -23,6 +23,7 @@
import junit.framework.Test;
+import org.jboss.deployment.DeploymentException;
import org.jboss.test.AbstractTestDelegate;
/**
@@ -43,8 +44,18 @@
super(name);
}
- public static AbstractTestDelegate getDelegate(Class clazz) throws Exception
+ public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
{
return getOldControllerDelegate(clazz);
}
+
+ public void testNameMissing() throws Exception
+ {
+ errorInParse(DeploymentException.class);
+ }
+
+ public void testNameEmpty() throws Exception
+ {
+ errorInParse(DeploymentException.class);
+ }
}
Modified: trunk/system-jmx/src/tests/org/jboss/test/system/controller/parse/test/ErrorInParseTest.java
===================================================================
--- trunk/system-jmx/src/tests/org/jboss/test/system/controller/parse/test/ErrorInParseTest.java 2008-11-24 11:46:07 UTC (rev 81484)
+++ trunk/system-jmx/src/tests/org/jboss/test/system/controller/parse/test/ErrorInParseTest.java 2008-11-24 12:46:33 UTC (rev 81485)
@@ -23,7 +23,6 @@
import javax.management.MalformedObjectNameException;
-import org.jboss.deployment.DeploymentException;
import org.jboss.test.system.controller.AbstractControllerTest;
import org.jboss.test.system.controller.support.SimpleMBean;
@@ -49,12 +48,12 @@
public void testNameMissing() throws Exception
{
- errorInParse(DeploymentException.class);
+ errorInParse(RuntimeException.class);
}
public void testNameEmpty() throws Exception
{
- errorInParse(DeploymentException.class);
+ errorInParse(RuntimeException.class);
}
public void testNameInvalid() throws Exception
Modified: trunk/system-jmx/src/tests/org/jboss/test/system/metadata/basic/test/BasicMBeanUnitTestCase.java
===================================================================
--- trunk/system-jmx/src/tests/org/jboss/test/system/metadata/basic/test/BasicMBeanUnitTestCase.java 2008-11-24 11:46:07 UTC (rev 81484)
+++ trunk/system-jmx/src/tests/org/jboss/test/system/metadata/basic/test/BasicMBeanUnitTestCase.java 2008-11-24 12:46:33 UTC (rev 81485)
@@ -24,7 +24,6 @@
import javax.management.MalformedObjectNameException;
import org.jboss.dependency.spi.ControllerMode;
-import org.jboss.deployment.DeploymentException;
import org.jboss.system.metadata.ServiceMetaData;
import org.jboss.test.system.metadata.test.AbstractMetaDataTest;
@@ -53,12 +52,12 @@
public void testBasicMBeanNoName() throws Exception
{
- assertFailUnmarshal(DeploymentException.class);
+ assertFailUnmarshal(RuntimeException.class);
}
public void testBasicMBeanEmptyName() throws Exception
{
- assertFailUnmarshal(DeploymentException.class);
+ assertFailUnmarshal(RuntimeException.class);
}
public void testBasicMBeanInvalidName() throws Exception
Modified: trunk/system-jmx/src/tests/org/jboss/test/system/metadata/test/AbstractMetaDataTest.java
===================================================================
--- trunk/system-jmx/src/tests/org/jboss/test/system/metadata/test/AbstractMetaDataTest.java 2008-11-24 11:46:07 UTC (rev 81484)
+++ trunk/system-jmx/src/tests/org/jboss/test/system/metadata/test/AbstractMetaDataTest.java 2008-11-24 12:46:33 UTC (rev 81485)
@@ -85,7 +85,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
{
MetaDataTestDelegate delegate = new MetaDataTestDelegate(clazz);
delegate.enableSecurity = true;
Modified: trunk/system-jmx/src/tests/org/jboss/test/system/metadata/test/MetaDataTestDelegate.java
===================================================================
--- trunk/system-jmx/src/tests/org/jboss/test/system/metadata/test/MetaDataTestDelegate.java 2008-11-24 11:46:07 UTC (rev 81484)
+++ trunk/system-jmx/src/tests/org/jboss/test/system/metadata/test/MetaDataTestDelegate.java 2008-11-24 12:46:33 UTC (rev 81485)
@@ -47,7 +47,7 @@
/** The parser */
private DocumentBuilder parser;
- public MetaDataTestDelegate(Class clazz)
+ public MetaDataTestDelegate(Class<?> clazz)
{
super(clazz);
}
More information about the jboss-cvs-commits
mailing list