Author: rob.stryker(a)jboss.com Date: 2007-08-16 14:28:38 -0400 (Thu, 16 Aug 2007) New Revision: 3186 Added: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/runtime/server/polling/IServerStatePoller.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/runtime/server/polling/ServerStatePollerType.java Removed: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/runtime/server/IServerStatePoller.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/runtime/server/ServerStatePollerType.java Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/ExtensionManager.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/runtime/server/polling/JMXPoller.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/runtime/server/polling/PollThread.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/runtime/server/polling/ProcessTerminatedPoller.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/runtime/server/polling/TimeoutPoller.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/JBossServerBehavior.java trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/preferencepages/JBossServersPreferencePage.java trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/events/PollingLabelProvider.java Log: Moved poller-relative classes into the poller package. Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/ExtensionManager.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/ExtensionManager.java 2007-08-16 18:14:13 UTC (rev 3185) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/ExtensionManager.java 2007-08-16 18:28:38 UTC (rev 3186) @@ -28,7 +28,7 @@ import org.eclipse.core.runtime.IConfigurationElement; import org.eclipse.core.runtime.IExtensionRegistry; import org.eclipse.core.runtime.Platform; -import org.jboss.ide.eclipse.as.core.runtime.server.ServerStatePollerType; +import org.jboss.ide.eclipse.as.core.runtime.server.polling.ServerStatePollerType; /** * Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/runtime/server/IServerStatePoller.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/runtime/server/IServerStatePoller.java 2007-08-16 18:14:13 UTC (rev 3185) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/runtime/server/IServerStatePoller.java 2007-08-16 18:28:38 UTC (rev 3186) @@ -1,45 +0,0 @@ -/** - * JBoss, a Division of Red Hat - * Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * -* This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.ide.eclipse.as.core.runtime.server; - -import org.eclipse.wst.server.core.IServer; -import org.jboss.ide.eclipse.as.core.runtime.server.polling.PollThread; -import org.jboss.ide.eclipse.as.core.server.attributes.IServerPollingAttributes; - -public interface IServerStatePoller extends IServerPollingAttributes { - - public static final boolean SERVER_UP = true; - public static final boolean SERVER_DOWN = false; - - public static final int CANCEL = 0; - public static final int TIMEOUT_REACHED = 1; - - public void beginPolling(IServer server, boolean expectedState, PollThread pt); // expected to launch own thread - public boolean isComplete() throws PollingException; - public boolean getState() throws PollingException; - public void cancel(int type); // cancel the polling - public void cleanup(); // clean up any resources / processes. Will ALWAYS be called - - public class PollingException extends Exception { - public PollingException(String message) {super(message);} - } -} Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/runtime/server/ServerStatePollerType.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/runtime/server/ServerStatePollerType.java 2007-08-16 18:14:13 UTC (rev 3185) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/runtime/server/ServerStatePollerType.java 2007-08-16 18:28:38 UTC (rev 3186) @@ -1,29 +0,0 @@ -package org.jboss.ide.eclipse.as.core.runtime.server; - -import org.eclipse.core.runtime.IConfigurationElement; - -public class ServerStatePollerType { - private IConfigurationElement el; - public ServerStatePollerType(IConfigurationElement el) { - this.el = el; - } - public boolean supportsStartup() { - return Boolean.parseBoolean(el.getAttribute("supportsStartup")); - } - public boolean supportsShutdown() { - return Boolean.parseBoolean(el.getAttribute("supportsShutdown")); - } - public String getName() { - return el.getAttribute("name"); - } - public String getId() { - return el.getAttribute("id"); - } - public IServerStatePoller createPoller() { - try { - return (IServerStatePoller)el.createExecutableExtension("class"); - } catch( Exception e ) { - } - return null; - } -} Copied: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/runtime/server/polling/IServerStatePoller.java (from rev 3014, trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/runtime/server/IServerStatePoller.java) =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/runtime/server/polling/IServerStatePoller.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/runtime/server/polling/IServerStatePoller.java 2007-08-16 18:28:38 UTC (rev 3186) @@ -0,0 +1,44 @@ +/** + * JBoss, a Division of Red Hat + * Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * +* This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.ide.eclipse.as.core.runtime.server.polling; + +import org.eclipse.wst.server.core.IServer; +import org.jboss.ide.eclipse.as.core.server.attributes.IServerPollingAttributes; + +public interface IServerStatePoller extends IServerPollingAttributes { + + public static final boolean SERVER_UP = true; + public static final boolean SERVER_DOWN = false; + + public static final int CANCEL = 0; + public static final int TIMEOUT_REACHED = 1; + + public void beginPolling(IServer server, boolean expectedState, PollThread pt); // expected to launch own thread + public boolean isComplete() throws PollingException; + public boolean getState() throws PollingException; + public void cancel(int type); // cancel the polling + public void cleanup(); // clean up any resources / processes. Will ALWAYS be called + + public class PollingException extends Exception { + public PollingException(String message) {super(message);} + } +} Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/runtime/server/polling/JMXPoller.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/runtime/server/polling/JMXPoller.java 2007-08-16 18:14:13 UTC (rev 3185) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/runtime/server/polling/JMXPoller.java 2007-08-16 18:28:38 UTC (rev 3186) @@ -41,7 +41,6 @@ import org.eclipse.wst.server.core.IRuntime; import org.eclipse.wst.server.core.IServer; import org.jboss.ide.eclipse.as.core.model.EventLogModel.EventLogTreeItem; -import org.jboss.ide.eclipse.as.core.runtime.server.IServerStatePoller; import org.jboss.ide.eclipse.as.core.server.JBossServerLaunchConfiguration; import org.jboss.ide.eclipse.as.core.util.ArgsUtil; import org.jboss.ide.eclipse.as.core.util.ServerConverter; Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/runtime/server/polling/PollThread.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/runtime/server/polling/PollThread.java 2007-08-16 18:14:13 UTC (rev 3185) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/runtime/server/polling/PollThread.java 2007-08-16 18:28:38 UTC (rev 3186) @@ -29,9 +29,7 @@ import org.jboss.ide.eclipse.as.core.model.EventLogModel; import org.jboss.ide.eclipse.as.core.model.EventLogModel.EventLogRoot; import org.jboss.ide.eclipse.as.core.model.EventLogModel.EventLogTreeItem; -import org.jboss.ide.eclipse.as.core.runtime.server.IServerStatePoller; -import org.jboss.ide.eclipse.as.core.runtime.server.ServerStatePollerType; -import org.jboss.ide.eclipse.as.core.runtime.server.IServerStatePoller.PollingException; +import org.jboss.ide.eclipse.as.core.runtime.server.polling.IServerStatePoller.PollingException; import org.jboss.ide.eclipse.as.core.server.JBossServer; import org.jboss.ide.eclipse.as.core.server.JBossServerBehavior; import org.jboss.ide.eclipse.as.core.server.ServerAttributeHelper; Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/runtime/server/polling/ProcessTerminatedPoller.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/runtime/server/polling/ProcessTerminatedPoller.java 2007-08-16 18:14:13 UTC (rev 3185) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/runtime/server/polling/ProcessTerminatedPoller.java 2007-08-16 18:28:38 UTC (rev 3186) @@ -2,7 +2,6 @@ import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.wst.server.core.IServer; -import org.jboss.ide.eclipse.as.core.runtime.server.IServerStatePoller; import org.jboss.ide.eclipse.as.core.server.JBossServerBehavior; /** Copied: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/runtime/server/polling/ServerStatePollerType.java (from rev 3014, trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/runtime/server/ServerStatePollerType.java) =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/runtime/server/polling/ServerStatePollerType.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/runtime/server/polling/ServerStatePollerType.java 2007-08-16 18:28:38 UTC (rev 3186) @@ -0,0 +1,29 @@ +package org.jboss.ide.eclipse.as.core.runtime.server.polling; + +import org.eclipse.core.runtime.IConfigurationElement; + +public class ServerStatePollerType { + private IConfigurationElement el; + public ServerStatePollerType(IConfigurationElement el) { + this.el = el; + } + public boolean supportsStartup() { + return Boolean.parseBoolean(el.getAttribute("supportsStartup")); + } + public boolean supportsShutdown() { + return Boolean.parseBoolean(el.getAttribute("supportsShutdown")); + } + public String getName() { + return el.getAttribute("name"); + } + public String getId() { + return el.getAttribute("id"); + } + public IServerStatePoller createPoller() { + try { + return (IServerStatePoller)el.createExecutableExtension("class"); + } catch( Exception e ) { + } + return null; + } +} Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/runtime/server/polling/TimeoutPoller.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/runtime/server/polling/TimeoutPoller.java 2007-08-16 18:14:13 UTC (rev 3185) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/runtime/server/polling/TimeoutPoller.java 2007-08-16 18:28:38 UTC (rev 3186) @@ -25,7 +25,6 @@ import org.eclipse.wst.server.core.IServer; import org.eclipse.wst.server.core.internal.ServerType; -import org.jboss.ide.eclipse.as.core.runtime.server.IServerStatePoller; import org.jboss.ide.eclipse.as.core.server.JBossServer; import org.jboss.ide.eclipse.as.core.server.ServerAttributeHelper; import org.jboss.ide.eclipse.as.core.server.attributes.IServerPollingAttributes; Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/JBossServerBehavior.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/JBossServerBehavior.java 2007-08-16 18:14:13 UTC (rev 3185) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/JBossServerBehavior.java 2007-08-16 18:28:38 UTC (rev 3186) @@ -34,7 +34,7 @@ import org.eclipse.wst.server.core.IServer; import org.jboss.ide.eclipse.as.core.model.EventLogModel; import org.jboss.ide.eclipse.as.core.model.EventLogModel.EventLogTreeItem; -import org.jboss.ide.eclipse.as.core.runtime.server.IServerStatePoller; +import org.jboss.ide.eclipse.as.core.runtime.server.polling.IServerStatePoller; import org.jboss.ide.eclipse.as.core.runtime.server.polling.PollThread; import org.jboss.ide.eclipse.as.core.runtime.server.polling.JMXPoller; import org.jboss.ide.eclipse.as.core.server.stripped.DeployableServerBehavior; Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/preferencepages/JBossServersPreferencePage.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/preferencepages/JBossServersPreferencePage.java 2007-08-16 18:14:13 UTC (rev 3185) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/preferencepages/JBossServersPreferencePage.java 2007-08-16 18:28:38 UTC (rev 3186) @@ -63,8 +63,8 @@ import org.eclipse.wst.server.core.internal.ServerType; import org.eclipse.wst.server.ui.ServerUICore; import org.jboss.ide.eclipse.as.core.ExtensionManager; -import org.jboss.ide.eclipse.as.core.runtime.server.IServerStatePoller; -import org.jboss.ide.eclipse.as.core.runtime.server.ServerStatePollerType; +import org.jboss.ide.eclipse.as.core.runtime.server.polling.IServerStatePoller; +import org.jboss.ide.eclipse.as.core.runtime.server.polling.ServerStatePollerType; import org.jboss.ide.eclipse.as.core.server.JBossServer; import org.jboss.ide.eclipse.as.core.server.ServerAttributeHelper; import org.jboss.ide.eclipse.as.core.server.attributes.IServerPollingAttributes; Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/events/PollingLabelProvider.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/events/PollingLabelProvider.java 2007-08-16 18:14:13 UTC (rev 3185) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/events/PollingLabelProvider.java 2007-08-16 18:28:38 UTC (rev 3186) @@ -35,7 +35,7 @@ import org.eclipse.wst.server.core.IServer; import org.eclipse.wst.server.ui.internal.provisional.UIDecoratorManager; import org.jboss.ide.eclipse.as.core.model.EventLogModel.EventLogTreeItem; -import org.jboss.ide.eclipse.as.core.runtime.server.IServerStatePoller; +import org.jboss.ide.eclipse.as.core.runtime.server.polling.IServerStatePoller; import org.jboss.ide.eclipse.as.core.runtime.server.polling.PollThread; import org.jboss.ide.eclipse.as.core.runtime.server.polling.JMXPoller; import org.jboss.ide.eclipse.as.core.runtime.server.polling.PollThread.PollThreadEvent;