[Jboss-cvs] JBossAS SVN: r55336 - in branches/MC_VDF_WORK/system-jmx/src: main/org/jboss/deployment main/org/jboss/system main/org/jboss/system/metadata tests/org/jboss/test/system/controller/instantiate/plain/test tests/org/jboss/test/system/controller/legacy

[jboss-cvs-commits at lists.jboss.org]

Author: adrian at jboss.org
Date: 2006-08-05 10:34:17 -0400 (Sat, 05 Aug 2006)
New Revision: 55336

Modified:
   branches/MC_VDF_WORK/system-jmx/src/main/org/jboss/deployment/DeploymentException.java
   branches/MC_VDF_WORK/system-jmx/src/main/org/jboss/system/ServiceConfigurator.java
   branches/MC_VDF_WORK/system-jmx/src/main/org/jboss/system/ServiceController.java
   branches/MC_VDF_WORK/system-jmx/src/main/org/jboss/system/metadata/ServiceMetaDataParser.java
   branches/MC_VDF_WORK/system-jmx/src/tests/org/jboss/test/system/controller/instantiate/plain/test/PlainMBeanTest.java
   branches/MC_VDF_WORK/system-jmx/src/tests/org/jboss/test/system/controller/legacy/OldServiceConfigurator.java
   branches/MC_VDF_WORK/system-jmx/src/tests/org/jboss/test/system/controller/legacy/OldServiceController.java
Log:
Make the old DeploymentException extend the new DeploymentException.
Deprecate the old DeploymentException
Use the old DeploymentException in the SARDeployer, etc. for backwards
compatibility.

Modified: branches/MC_VDF_WORK/system-jmx/src/main/org/jboss/deployment/DeploymentException.java
===================================================================
--- branches/MC_VDF_WORK/system-jmx/src/main/org/jboss/deployment/DeploymentException.java	2006-08-05 14:08:09 UTC (rev 55335)
+++ branches/MC_VDF_WORK/system-jmx/src/main/org/jboss/deployment/DeploymentException.java	2006-08-05 14:34:17 UTC (rev 55336)
@@ -21,18 +21,17 @@
 */
 package org.jboss.deployment;
 
-import org.jboss.util.NestedException;
-
 /**
  * Thrown by a deployer if an application component could not be
  * deployed.
  *
  * @see DeployerMBean
  * 
+ * @deprecated use org.jboss.deployers.spi.DeploymentException
  * @author <a href="mailto:toby.allsopp at peace.com">Toby Allsopp</a>
  * @version $Revision$
  */
-public class DeploymentException extends NestedException
+public class DeploymentException extends org.jboss.deployers.spi.DeploymentException
 {
    /** @since 4.0.2 */
    private static final long serialVersionUID = 1416258464473965574L;   
@@ -42,7 +41,7 @@
     *
     * @param message the message
     * @param t the throwable
-    * @throws a DeploymentException
+    * @throws DeploymentException always
     */
    public static void rethrowAsDeploymentException(String message, Throwable t)
       throws DeploymentException

Modified: branches/MC_VDF_WORK/system-jmx/src/main/org/jboss/system/ServiceConfigurator.java
===================================================================
--- branches/MC_VDF_WORK/system-jmx/src/main/org/jboss/system/ServiceConfigurator.java	2006-08-05 14:08:09 UTC (rev 55335)
+++ branches/MC_VDF_WORK/system-jmx/src/main/org/jboss/system/ServiceConfigurator.java	2006-08-05 14:34:17 UTC (rev 55336)
@@ -44,7 +44,7 @@
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
 
-import org.jboss.deployers.spi.DeploymentException;
+import org.jboss.deployment.DeploymentException;
 import org.jboss.logging.Logger;
 import org.jboss.mx.util.JMXExceptionDecoder;
 import org.jboss.system.metadata.ServiceAttributeMetaData;

Modified: branches/MC_VDF_WORK/system-jmx/src/main/org/jboss/system/ServiceController.java
===================================================================
--- branches/MC_VDF_WORK/system-jmx/src/main/org/jboss/system/ServiceController.java	2006-08-05 14:08:09 UTC (rev 55335)
+++ branches/MC_VDF_WORK/system-jmx/src/main/org/jboss/system/ServiceController.java	2006-08-05 14:34:17 UTC (rev 55336)
@@ -38,7 +38,7 @@
 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.DeploymentException;
 import org.jboss.deployment.DeploymentInfo;
 import org.jboss.deployment.DeploymentState;
 import org.jboss.kernel.Kernel;

Modified: branches/MC_VDF_WORK/system-jmx/src/main/org/jboss/system/metadata/ServiceMetaDataParser.java
===================================================================
--- branches/MC_VDF_WORK/system-jmx/src/main/org/jboss/system/metadata/ServiceMetaDataParser.java	2006-08-05 14:08:09 UTC (rev 55335)
+++ branches/MC_VDF_WORK/system-jmx/src/main/org/jboss/system/metadata/ServiceMetaDataParser.java	2006-08-05 14:34:17 UTC (rev 55336)
@@ -26,7 +26,7 @@
 
 import javax.management.ObjectName;
 
-import org.jboss.deployers.spi.DeploymentException;
+import org.jboss.deployment.DeploymentException;
 import org.jboss.system.ConfigurationException;
 import org.jboss.util.StringPropertyReplacer;
 import org.w3c.dom.Attr;

Modified: branches/MC_VDF_WORK/system-jmx/src/tests/org/jboss/test/system/controller/instantiate/plain/test/PlainMBeanTest.java
===================================================================
--- branches/MC_VDF_WORK/system-jmx/src/tests/org/jboss/test/system/controller/instantiate/plain/test/PlainMBeanTest.java	2006-08-05 14:08:09 UTC (rev 55335)
+++ branches/MC_VDF_WORK/system-jmx/src/tests/org/jboss/test/system/controller/instantiate/plain/test/PlainMBeanTest.java	2006-08-05 14:34:17 UTC (rev 55336)
@@ -60,7 +60,7 @@
    
    public void testPlainMBeanAbstractClass() throws Exception
    {
-      assertMaybeDeployFailure(SimpleMBean.OBJECT_NAME, InstantiationException.class);
+      assertMaybeDeployFailure(SimpleMBean.OBJECT_NAME, NotCompliantMBeanException.class); // FIXME
    }
    
    public void testPlainMBeanConstructorError() throws Exception

Modified: branches/MC_VDF_WORK/system-jmx/src/tests/org/jboss/test/system/controller/legacy/OldServiceConfigurator.java
===================================================================
--- branches/MC_VDF_WORK/system-jmx/src/tests/org/jboss/test/system/controller/legacy/OldServiceConfigurator.java	2006-08-05 14:08:09 UTC (rev 55335)
+++ branches/MC_VDF_WORK/system-jmx/src/tests/org/jboss/test/system/controller/legacy/OldServiceConfigurator.java	2006-08-05 14:34:17 UTC (rev 55336)
@@ -49,7 +49,7 @@
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
 
-import org.jboss.deployers.spi.DeploymentException;
+import org.jboss.deployment.DeploymentException;
 import org.jboss.logging.Logger;
 import org.jboss.mx.util.JMXExceptionDecoder;
 import org.jboss.mx.util.MBeanProxyExt;

Modified: branches/MC_VDF_WORK/system-jmx/src/tests/org/jboss/test/system/controller/legacy/OldServiceController.java
===================================================================
--- branches/MC_VDF_WORK/system-jmx/src/tests/org/jboss/test/system/controller/legacy/OldServiceController.java	2006-08-05 14:08:09 UTC (rev 55335)
+++ branches/MC_VDF_WORK/system-jmx/src/tests/org/jboss/test/system/controller/legacy/OldServiceController.java	2006-08-05 14:34:17 UTC (rev 55336)
@@ -42,7 +42,7 @@
 import javax.management.Notification;
 import javax.management.ObjectName;
 
-import org.jboss.deployers.spi.DeploymentException;
+import org.jboss.deployment.DeploymentException;
 import org.jboss.deployment.DeploymentInfo;
 import org.jboss.deployment.DeploymentState;
 import org.jboss.logging.Logger;
@@ -168,8 +168,7 @@
          di.state = state;
    }
 
-   public synchronized List<ObjectName> install(Element config, ObjectName loaderName)
-         throws DeploymentException
+   public synchronized List<ObjectName> install(Element config, ObjectName loaderName) throws DeploymentException
    {
       List<ObjectName> mbeans = configurator.install(config, loaderName);
       for (Iterator<ObjectName> i = mbeans.iterator(); i.hasNext();)