Author: rob.stryker(a)jboss.com Date: 2008-05-20 15:46:17 -0400 (Tue, 20 May 2008) New Revision: 8241 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling/JMXPoller.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling/ProcessTerminatedPoller.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling/TimeoutPoller.java 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 Log: JBIDE-2239 - working with changed timeout structure Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling/JMXPoller.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling/JMXPoller.java 2008-05-20 18:32:01 UTC (rev 8240) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling/JMXPoller.java 2008-05-20 19:46:17 UTC (rev 8241) @@ -272,4 +272,8 @@ public IServer getServer() { return server; } + + public int getTimeoutBehavior() { + return TIMEOUT_BEHAVIOR_IGNORE; + } } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling/ProcessTerminatedPoller.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling/ProcessTerminatedPoller.java 2008-05-20 18:32:01 UTC (rev 8240) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling/ProcessTerminatedPoller.java 2008-05-20 19:46:17 UTC (rev 8241) @@ -84,5 +84,9 @@ this.type = type; } + public int getTimeoutBehavior() { + return TIMEOUT_BEHAVIOR_IGNORE; + } + } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling/TimeoutPoller.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling/TimeoutPoller.java 2008-05-20 18:32:01 UTC (rev 8240) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling/TimeoutPoller.java 2008-05-20 19:46:17 UTC (rev 8241) @@ -52,7 +52,7 @@ public void beginPolling(IServer server, boolean expectedState, PollThread pt) { this.expectedState = expectedState; this.server = server; - this.endTime = new Date().getTime() + getTimeout() - 2000; + this.endTime = new Date().getTime() + getTimeout(); } public IServer getServer() { @@ -76,17 +76,10 @@ } public int getTimeout() { - int timeout; - JBossServer jbs = ((JBossServer)server.loadAdapter(JBossServer.class, null)); - ServerAttributeHelper helper = (ServerAttributeHelper)jbs.getAttributeHelper(); - if( expectedState == IServerStatePoller.SERVER_UP) { - int def = ((ServerType)server.getServerType()).getStartTimeout(); - timeout = helper.getAttribute(IServerPollingAttributes.START_TIMEOUT, def); - } else { - int def = ((ServerType)server.getServerType()).getStopTimeout(); - timeout = helper.getAttribute(IServerPollingAttributes.STOP_TIMEOUT, def); - } - return timeout; + if( expectedState == IServerStatePoller.SERVER_UP) + return (getServer().getStartTimeout()-3) * 1000; + else + return (getServer().getStopTimeout()-3) * 1000; } public boolean supportsShutdown() { @@ -112,5 +105,12 @@ this.type = type; } + public int getTimeoutBehavior() { + if( expectedState == IServerStatePoller.SERVER_UP) + return TIMEOUT_BEHAVIOR_SUCCEED; + else + return TIMEOUT_BEHAVIOR_IGNORE; + } + } 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 2008-05-20 18:32:01 UTC (rev 8240) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IServerStatePoller.java 2008-05-20 19:46:17 UTC (rev 8241) @@ -43,13 +43,27 @@ public static final int SUCCESS = 2; public static final int FAILED = 3; + /** + * Force a successful state change if we timeout + */ + public static final int TIMEOUT_BEHAVIOR_SUCCEED = 0; + + /** + * Ignore the timeout and let the wst tools handle the timeout + */ + public static final int TIMEOUT_BEHAVIOR_IGNORE = 1; + + /** + * Force a failure upon timeout + */ + public static final int TIMEOUT_BEHAVIOR_FAIL = 2; + public ServerStatePollerType getPollerType(); public void setPollerType(ServerStatePollerType type); public void beginPolling(IServer server, boolean expectedState, PollThread pt); // expected to launch own thread public IServer getServer(); public boolean isComplete() throws PollingException, RequiresInfoException; public boolean getState() throws PollingException, RequiresInfoException; - public void cleanup(); // clean up any resources / processes. Will ALWAYS be called public List<String> getRequiredProperties(); public void failureHandled(Properties properties); @@ -59,6 +73,12 @@ * @param type CANCEL or TIMEOUT_REACHED */ public void cancel(int type); + + /** + * Returns a TIMEOUT_BEHAVIOR_XXX constant + * @return + */ + public int getTimeoutBehavior(); public class PollingException extends Exception { private static final long serialVersionUID = -7830978018908940551L; 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 2008-05-20 18:32:01 UTC (rev 8240) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/PollThread.java 2008-05-20 19:46:17 UTC (rev 8241) @@ -103,20 +103,11 @@ abortMessage = message; } - - // Getting the timeouts. First from plugin.xml as default, or from user settings. public int getTimeout() { - int timeout; - JBossServer jbs = ((JBossServer)getServer().loadAdapter(JBossServer.class, null)); - ServerAttributeHelper helper = (ServerAttributeHelper)jbs.getAttributeHelper(); - if( expectedState == IServerStatePoller.SERVER_UP) { - int def = ((ServerType)getServer().getServerType()).getStartTimeout(); - timeout = helper.getAttribute(IServerPollingAttributes.START_TIMEOUT, def); - } else { - int def = ((ServerType)getServer().getServerType()).getStopTimeout(); - timeout = helper.getAttribute(IServerPollingAttributes.STOP_TIMEOUT, def); - } - return timeout; + if( expectedState == IServerStatePoller.SERVER_UP) + return (getServer().getStartTimeout()-2) * 1000; + else + return (getServer().getStopTimeout()-2) * 1000; }