Author: adietish Date: 2011-08-11 06:49:24 -0400 (Thu, 11 Aug 2011) New Revision: 33807 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.properties trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IServerStatePoller.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/PollThread.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagerServicePoller.java trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JMXPoller.java Log: [JBIDE-9521] changed IServerStatePoller#beginPolling to throw PollException (was: Exception). Changed implementors accordingly and catched PollException in PollThread Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.java 2011-08-11 10:27:16 UTC (rev 33806) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.java 2011-08-11 10:49:24 UTC (rev 33807) @@ -14,7 +14,7 @@ public class Messages extends NLS { private static final String BUNDLE_NAME = "org.jboss.ide.eclipse.as.core.Messages"; //$NON-NLS-1$ - + /* Standard and re-usable */ public static String jboss; public static String server; @@ -60,6 +60,7 @@ public static String ModuleDeleted; public static String ModulePublished; public static String NoPublisherFound; + public static String CouldNotBeginPolling; public static String PollingStartupSuccess; public static String PollingShutdownSuccess; public static String PollingStartupFailed; Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.properties =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.properties 2011-08-11 10:27:16 UTC (rev 33806) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.properties 2011-08-11 10:49:24 UTC (rev 33807) @@ -8,6 +8,7 @@ JBoss7ServerBehavior_could_not_stop=Could not stop server adapter {0} JMXPoller=JMX Poller loadJMXClassesFailed=Could not load JMX classes for server {0} +CouldNotBeginPolling=Could not begin polling server {0} PollingStartupSuccess=Server Startup Succeeded PollingShutdownSuccess=Server Shutdown Succeeded PollingStartupFailed=Server Startup Failed Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IServerStatePoller.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IServerStatePoller.java 2011-08-11 10:27:16 UTC (rev 33806) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IServerStatePoller.java 2011-08-11 10:49:24 UTC (rev 33807) @@ -87,6 +87,10 @@ public PollingException(String message) { super(message); } + + public PollingException(String message, Throwable t) { + super(message, t); + } } public class RequiresInfoException extends Exception { Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/PollThread.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/PollThread.java 2011-08-11 10:27:16 UTC (rev 33806) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/PollThread.java 2011-08-11 10:49:24 UTC (rev 33807) @@ -148,7 +148,7 @@ } stateStartedOrStopped = checkServerState(); } - } catch(Exception e) { + } catch(PollingException e) { abort = true; } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagerServicePoller.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagerServicePoller.java 2011-08-11 10:27:16 UTC (rev 33806) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagerServicePoller.java 2011-08-11 10:49:24 UTC (rev 33807) @@ -18,17 +18,20 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.Status; +import org.eclipse.osgi.util.NLS; import org.eclipse.wst.server.core.IServer; import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin; +import org.jboss.ide.eclipse.as.core.Messages; import org.jboss.ide.eclipse.as.core.server.IServerStatePoller; import org.jboss.ide.eclipse.as.core.server.IServerStatePoller2; import org.jboss.ide.eclipse.as.core.server.internal.PollThread; import org.jboss.ide.eclipse.as.core.server.internal.ServerStatePollerType; import org.jboss.ide.eclipse.as.management.as7.IJBoss7ManagerService; import org.jboss.ide.eclipse.as.management.as7.JBoss7ManagerUtil; +import org.jboss.ide.eclipse.as.management.as7.JBoss7ManagerUtil.IServiceAware; import org.jboss.ide.eclipse.as.management.as7.JBoss7ManangerConnectException; import org.jboss.ide.eclipse.as.management.as7.JBoss7ServerState; -import org.jboss.ide.eclipse.as.management.as7.JBoss7ManagerUtil.IServiceAware; +import org.osgi.framework.InvalidSyntaxException; /** * @author André Dietisheim @@ -45,10 +48,14 @@ public void beginPolling(IServer server, boolean expectedState, PollThread pollTread) throws Exception { } - public void beginPolling(IServer server, boolean expectedState) throws Exception { - this.service = JBoss7ManagerUtil.getService(server); - this.server = server; - this.expectedState = expectedState; + public void beginPolling(IServer server, boolean expectedState) throws PollingException { + try { + this.service = JBoss7ManagerUtil.getService(server); + this.server = server; + this.expectedState = expectedState; + } catch(InvalidSyntaxException e) { + throw new PollingException(NLS.bind(Messages.CouldNotBeginPolling,server.getName()), e); + } } public ServerStatePollerType getPollerType() { Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JMXPoller.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JMXPoller.java 2011-08-11 10:27:16 UTC (rev 33806) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JMXPoller.java 2011-08-11 10:49:24 UTC (rev 33807) @@ -68,7 +68,7 @@ private JMXPollerRunnable runnable; private JMXSafeRunner runner; - public void beginPolling(IServer server, boolean expectedState) throws Exception { + public void beginPolling(IServer server, boolean expectedState) throws PollingException { ceFound = nnfeFound = startingFound = canceled = done = false; this.server = server; launchJMXPoller();