Author: rob.stryker(a)jboss.com Date: 2011-06-08 04:34:16 -0400 (Wed, 08 Jun 2011) New Revision: 31902 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossBehaviorDelegate.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerBehavior.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7BehaviorDelegate.java Log: AS7 - stopping a local server which was launched outside of eclipse Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossBehaviorDelegate.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossBehaviorDelegate.java 2011-06-08 04:20:43 UTC (rev 31901) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossBehaviorDelegate.java 2011-06-08 08:34:16 UTC (rev 31902) @@ -46,7 +46,7 @@ */ public class LocalJBossBehaviorDelegate extends AbstractJBossBehaviourDelegate implements IProcessProvider { - private PollThread pollThread = null; + protected PollThread pollThread = null; protected IProcess process; protected boolean nextStopRequiresForce = false; public LocalJBossBehaviorDelegate() { @@ -164,10 +164,14 @@ } protected void pollServer(final boolean expectedState) { + IServerStatePoller poller = PollThreadUtils.getPoller(expectedState, getServer()); + pollServer(expectedState, poller); + } + + protected void pollServer(boolean expectedState, IServerStatePoller poller) { if( pollThread != null ) { pollThread.cancel(); } - IServerStatePoller poller = PollThreadUtils.getPoller(expectedState, getServer()); this.pollThread = new PollThread(expectedState, poller, getActualBehavior()); pollThread.start(); } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerBehavior.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerBehavior.java 2011-06-08 04:20:43 UTC (rev 31901) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerBehavior.java 2011-06-08 08:34:16 UTC (rev 31902) @@ -34,6 +34,7 @@ import org.jboss.ide.eclipse.as.core.Messages; import org.jboss.ide.eclipse.as.core.extensions.events.IEventCodes; import org.jboss.ide.eclipse.as.core.extensions.events.ServerLogger; +import org.jboss.ide.eclipse.as.core.extensions.polling.WebPortPoller; import org.jboss.ide.eclipse.as.core.publishers.LocalPublishMethod; import org.jboss.ide.eclipse.as.core.server.IJBoss7ManagerService; import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime; @@ -84,16 +85,6 @@ initDebugListener(process); } - protected void pollServer(final boolean expectedState) { - if( pollThread != null ) { - pollThread.cancel(); - } - //IServerStatePoller poller = PollThreadUtils.getPoller(JBoss7ManagerServicePoller.POLLER_ID, expectedState, getServer()); - IServerStatePoller poller = PollThreadUtils.getPoller(expectedState, getServer()); - this.pollThread = new PollThread(expectedState, poller, this); - pollThread.start(); - } - private void initDebugListener(IProcess process) { DebugPlugin.getDefault().addDebugEventListener(serverProcessListener = new JBossServerLifecycleListener()); } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7BehaviorDelegate.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7BehaviorDelegate.java 2011-06-08 04:20:43 UTC (rev 31901) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7BehaviorDelegate.java 2011-06-08 08:34:16 UTC (rev 31902) @@ -12,11 +12,27 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; +import org.jboss.ide.eclipse.as.core.extensions.polling.WebPortPoller; +import org.jboss.ide.eclipse.as.core.server.IServerStatePoller; import org.jboss.ide.eclipse.as.core.server.internal.LocalJBossBehaviorDelegate; +import org.jboss.ide.eclipse.as.core.server.internal.PollThread; +import org.jboss.ide.eclipse.as.core.util.PollThreadUtils; public class LocalJBoss7BehaviorDelegate extends LocalJBossBehaviorDelegate { public IStatus canChangeState(String launchMode) { -// return Status.CANCEL_STATUS; return Status.OK_STATUS; } + protected void pollServer(final boolean expectedState) { + if( pollThread != null ) + pollThread.cancel(); + + IServerStatePoller poller = PollThreadUtils.getPoller(expectedState, getServer()); + // IF shutting down a process started OUTSIDE of eclipse, force use the web poller, + // since there's no process watch for shutdowns + if( !expectedState && process == null ) + poller = PollThreadUtils.getPoller(WebPortPoller.WEB_POLLER_ID, false, getServer()); + + this.pollThread = new PollThread(expectedState, poller, getActualBehavior()); + pollThread.start(); + } }