Author: rob.stryker(a)jboss.com Date: 2008-11-20 15:20:16 -0500 (Thu, 20 Nov 2008) New Revision: 11929 Added: trunk/jmx/plugins/org.jboss.tools.jmx.core/src/org/jboss/tools/jmx/core/JMXException.java trunk/jmx/tests/org.jboss.tools.jmx.core.test/bin/ Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/jmx/JBossServerConnection.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/jmx/JBossServerConnectionProvider.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/jmx/JMXSafeRunner.java trunk/jmx/plugins/org.jboss.tools.jmx.core/src/org/jboss/tools/jmx/core/IConnectionWrapper.java trunk/jmx/plugins/org.jboss.tools.jmx.core/src/org/jboss/tools/jmx/core/providers/DefaultConnectionWrapper.java trunk/jmx/plugins/org.jboss.tools.jmx.core/src/org/jboss/tools/jmx/core/tree/NodeUtils.java trunk/jmx/plugins/org.jboss.tools.jmx.core/src/org/jboss/tools/jmx/core/tree/ObjectNameNode.java trunk/jmx/tests/org.jboss.tools.jmx.core.test/src/org/jboss/tools/jmx/core/tests/MockConnectionWrapper.java Log: JBIDE-3244 replace CoreException with JMXException Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/jmx/JBossServerConnection.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/jmx/JBossServerConnection.java 2008-11-20 19:02:44 UTC (rev 11928) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/jmx/JBossServerConnection.java 2008-11-20 20:20:16 UTC (rev 11929) @@ -17,6 +17,7 @@ import org.jboss.tools.jmx.core.IConnectionProviderListener; import org.jboss.tools.jmx.core.IConnectionWrapper; import org.jboss.tools.jmx.core.IJMXRunnable; +import org.jboss.tools.jmx.core.JMXException; import org.jboss.tools.jmx.core.tree.NodeUtils; import org.jboss.tools.jmx.core.tree.Root; @@ -74,7 +75,7 @@ return isConnected; } - public void run(IJMXRunnable runnable) throws CoreException { + public void run(IJMXRunnable runnable) throws JMXException { // do nothing if the server is down. if( server.getServerState() != IServer.STATE_STARTED ) return; Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/jmx/JBossServerConnectionProvider.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/jmx/JBossServerConnectionProvider.java 2008-11-20 19:02:44 UTC (rev 11928) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/jmx/JBossServerConnectionProvider.java 2008-11-20 20:20:16 UTC (rev 11929) @@ -18,6 +18,7 @@ import org.jboss.tools.jmx.core.IConnectionProviderListener; import org.jboss.tools.jmx.core.IConnectionWrapper; import org.jboss.tools.jmx.core.IJMXRunnable; +import org.jboss.tools.jmx.core.JMXException; public class JBossServerConnectionProvider implements IConnectionProvider, IServerLifecycleListener { public static final String PROVIDER_ID = "org.jboss.ide.eclipse.as.core.extensions.jmx.JBossServerConnectionProvider"; //$NON-NLS-1$ @@ -32,7 +33,7 @@ // Run this action on the server. // If the connection doesn't exist, make a new one - public static void run(IServer s, IJMXRunnable r) throws CoreException { + public static void run(IServer s, IJMXRunnable r) throws JMXException { JBossServerConnection c = getConnection(s); if( c == null ) c = getConnection(s); Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/jmx/JMXSafeRunner.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/jmx/JMXSafeRunner.java 2008-11-20 19:02:44 UTC (rev 11928) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/jmx/JMXSafeRunner.java 2008-11-20 20:20:16 UTC (rev 11929) @@ -12,6 +12,7 @@ import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin; import org.jboss.ide.eclipse.as.core.util.ServerConverter; import org.jboss.tools.jmx.core.IJMXRunnable; +import org.jboss.tools.jmx.core.JMXException; public class JMXSafeRunner { private String user, pass; @@ -34,13 +35,13 @@ run(server,r,user,pass); } - public static void run(IServer s, IJMXRunnable r) throws CoreException { + public static void run(IServer s, IJMXRunnable r) throws JMXException { String user = ServerConverter.getJBossServer(s).getUsername(); String pass = ServerConverter.getJBossServer(s).getPassword(); run(s,r,user,pass); } - public static void run(IServer s, IJMXRunnable r, String user, String pass) throws CoreException { + public static void run(IServer s, IJMXRunnable r, String user, String pass) throws JMXException { JMXClassLoaderRepository.getDefault().addConcerned(s, r); ClassLoader currentLoader = Thread.currentThread() .getContextClassLoader(); @@ -59,7 +60,7 @@ r.run(connection); } } catch( Exception e ) { - throw new CoreException(new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, e.getMessage(), e)); + throw new JMXException(new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, e.getMessage(), e)); } finally { JMXClassLoaderRepository.getDefault().removeConcerned(s, r); Thread.currentThread().setContextClassLoader(currentLoader); Modified: trunk/jmx/plugins/org.jboss.tools.jmx.core/src/org/jboss/tools/jmx/core/IConnectionWrapper.java =================================================================== --- trunk/jmx/plugins/org.jboss.tools.jmx.core/src/org/jboss/tools/jmx/core/IConnectionWrapper.java 2008-11-20 19:02:44 UTC (rev 11928) +++ trunk/jmx/plugins/org.jboss.tools.jmx.core/src/org/jboss/tools/jmx/core/IConnectionWrapper.java 2008-11-20 20:20:16 UTC (rev 11929) @@ -38,5 +38,5 @@ * @return */ public Root getRoot(); - public void run(IJMXRunnable runnable) throws CoreException; + public void run(IJMXRunnable runnable) throws JMXException; } Added: trunk/jmx/plugins/org.jboss.tools.jmx.core/src/org/jboss/tools/jmx/core/JMXException.java =================================================================== --- trunk/jmx/plugins/org.jboss.tools.jmx.core/src/org/jboss/tools/jmx/core/JMXException.java (rev 0) +++ trunk/jmx/plugins/org.jboss.tools.jmx.core/src/org/jboss/tools/jmx/core/JMXException.java 2008-11-20 20:20:16 UTC (rev 11929) @@ -0,0 +1,11 @@ +package org.jboss.tools.jmx.core; + +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IStatus; + +public class JMXException extends CoreException { + private static final long serialVersionUID = 1L; + public JMXException(IStatus status) { + super(status); + } +} Modified: trunk/jmx/plugins/org.jboss.tools.jmx.core/src/org/jboss/tools/jmx/core/providers/DefaultConnectionWrapper.java =================================================================== --- trunk/jmx/plugins/org.jboss.tools.jmx.core/src/org/jboss/tools/jmx/core/providers/DefaultConnectionWrapper.java 2008-11-20 19:02:44 UTC (rev 11928) +++ trunk/jmx/plugins/org.jboss.tools.jmx.core/src/org/jboss/tools/jmx/core/providers/DefaultConnectionWrapper.java 2008-11-20 20:20:16 UTC (rev 11929) @@ -30,6 +30,7 @@ import org.jboss.tools.jmx.core.IJMXRunnable; import org.jboss.tools.jmx.core.JMXActivator; import org.jboss.tools.jmx.core.JMXCoreMessages; +import org.jboss.tools.jmx.core.JMXException; import org.jboss.tools.jmx.core.tree.NodeUtils; import org.jboss.tools.jmx.core.tree.Root; @@ -114,12 +115,12 @@ } } - public void run(IJMXRunnable runnable) throws CoreException { + public void run(IJMXRunnable runnable) throws JMXException { try { runnable.run(connection); } catch( Exception e ) { IStatus s = new Status(IStatus.ERROR, JMXActivator.PLUGIN_ID, JMXCoreMessages.DefaultConnection_ErrorRunningJMXCode, e); - throw new CoreException(s); + throw new JMXException(s); } } } Modified: trunk/jmx/plugins/org.jboss.tools.jmx.core/src/org/jboss/tools/jmx/core/tree/NodeUtils.java =================================================================== --- trunk/jmx/plugins/org.jboss.tools.jmx.core/src/org/jboss/tools/jmx/core/tree/NodeUtils.java 2008-11-20 19:02:44 UTC (rev 11928) +++ trunk/jmx/plugins/org.jboss.tools.jmx.core/src/org/jboss/tools/jmx/core/tree/NodeUtils.java 2008-11-20 20:20:16 UTC (rev 11929) @@ -14,11 +14,11 @@ import javax.management.ObjectName; import org.eclipse.core.runtime.Assert; -import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.SubProgressMonitor; import org.jboss.tools.jmx.core.IConnectionWrapper; import org.jboss.tools.jmx.core.IJMXRunnable; +import org.jboss.tools.jmx.core.JMXException; public class NodeUtils { @@ -45,7 +45,7 @@ @SuppressWarnings("unchecked") public static Root createObjectNameTree(final IConnectionWrapper connectionWrapper, final IProgressMonitor monitor) - throws CoreException { + throws JMXException { final Root[] _root = new Root[1]; connectionWrapper.run(new IJMXRunnable() { public void run(MBeanServerConnection connection) throws Exception { Modified: trunk/jmx/plugins/org.jboss.tools.jmx.core/src/org/jboss/tools/jmx/core/tree/ObjectNameNode.java =================================================================== --- trunk/jmx/plugins/org.jboss.tools.jmx.core/src/org/jboss/tools/jmx/core/tree/ObjectNameNode.java 2008-11-20 19:02:44 UTC (rev 11928) +++ trunk/jmx/plugins/org.jboss.tools.jmx.core/src/org/jboss/tools/jmx/core/tree/ObjectNameNode.java 2008-11-20 20:20:16 UTC (rev 11929) @@ -10,9 +10,9 @@ import javax.management.MBeanServerConnection; import javax.management.ObjectName; -import org.eclipse.core.runtime.CoreException; import org.jboss.tools.jmx.core.IConnectionWrapper; import org.jboss.tools.jmx.core.IJMXRunnable; +import org.jboss.tools.jmx.core.JMXException; import org.jboss.tools.jmx.core.MBeanInfoWrapper; public class ObjectNameNode extends PropertyNode { @@ -34,7 +34,7 @@ array[0] = new MBeanInfoWrapper(on2, mbsc.getMBeanInfo(on2), mbsc); } }); - } catch( CoreException ce ) { + } catch( JMXException ce ) { // TODO LOG } wrapper = array[0]; Modified: trunk/jmx/tests/org.jboss.tools.jmx.core.test/src/org/jboss/tools/jmx/core/tests/MockConnectionWrapper.java =================================================================== --- trunk/jmx/tests/org.jboss.tools.jmx.core.test/src/org/jboss/tools/jmx/core/tests/MockConnectionWrapper.java 2008-11-20 19:02:44 UTC (rev 11928) +++ trunk/jmx/tests/org.jboss.tools.jmx.core.test/src/org/jboss/tools/jmx/core/tests/MockConnectionWrapper.java 2008-11-20 20:20:16 UTC (rev 11929) @@ -7,6 +7,7 @@ import org.jboss.tools.jmx.core.IConnectionProvider; import org.jboss.tools.jmx.core.IConnectionWrapper; import org.jboss.tools.jmx.core.IJMXRunnable; +import org.jboss.tools.jmx.core.JMXException; import org.jboss.tools.jmx.core.tree.Root; @@ -34,7 +35,7 @@ return false; } - public void run(IJMXRunnable runnable) throws CoreException { + public void run(IJMXRunnable runnable) throws JMXException { } public void loadRoot(IProgressMonitor monitor) {