Author: adietish Date: 2011-06-22 17:42:40 -0400 (Wed, 22 Jun 2011) New Revision: 32293 Modified: branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerBehavior.java branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml Log: [JBIDE-9173] terminating process when stopping the server (was: using mgmt api) and commented mgmt api poller Modified: branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerBehavior.java =================================================================== --- branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerBehavior.java 2011-06-22 21:41:13 UTC (rev 32292) +++ branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerBehavior.java 2011-06-22 21:42:40 UTC (rev 32293) @@ -24,6 +24,7 @@ import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.SubProgressMonitor; import org.eclipse.debug.core.DebugEvent; +import org.eclipse.debug.core.DebugException; import org.eclipse.debug.core.DebugPlugin; import org.eclipse.debug.core.IDebugEventSetListener; import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy; @@ -38,11 +39,9 @@ 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; -import org.jboss.ide.eclipse.as.core.server.internal.DeployableServerBehavior; import org.jboss.ide.eclipse.as.core.server.internal.JBossServerBehavior; import org.jboss.ide.eclipse.as.core.server.internal.PollThread; import org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants; -import org.jboss.ide.eclipse.as.core.util.ServerConverter; public class JBoss7ServerBehavior extends JBossServerBehavior { @@ -165,20 +164,22 @@ } try { if (force) { - if( serverProcess != null ) - serverProcess.terminate(); + terminateProcess(); } else { serverStopping(); // TODO: for now only local, implement for remote afterwards - if (isServerRunning(getServer().getHost(), getJBoss7Server().getManagementPort())) { - // The service and Poller will make sure the server is down - getService().stop(getServer().getHost(), getJBoss7Server().getManagementPort()); - return; - } else { - if( serverProcess != null && !serverProcess.isTerminated()) { - serverProcess.terminate(); - } - } +// disabled because of JBIDE-9173 +// try { +// if (isServerRunning(getServer().getHost(), getJBoss7Server().getManagementPort())) { +// // The service and Poller will make sure the server is down +// getService().stop(getServer().getHost(), getJBoss7Server().getManagementPort()); +// return; +// } else { + terminateProcess(); +// } +// } catch(Exception e) { +// terminateProcess(); +// } } } catch (Exception e) { IStatus status = new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, MessageFormat.format(Messages.JBoss7ServerBehavior_could_not_stop, getServer().getName()), e); @@ -187,6 +188,12 @@ setServerStopped(); } + private void terminateProcess() throws DebugException { + if( serverProcess != null && !serverProcess.isTerminated()) { + serverProcess.terminate(); + } + } + @Override public void dispose() { super.dispose(); Modified: branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml =================================================================== --- branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml 2011-06-22 21:41:13 UTC (rev 32292) +++ branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml 2011-06-22 21:42:40 UTC (rev 32293) @@ -729,13 +729,14 @@ supportsShutdown="true" supportsStartup="true"> </serverPoller> +<!-- disabled because of JBIDE-9173 <serverPoller class="org.jboss.ide.eclipse.as.core.server.internal.v7.JBoss7ManagerServicePoller" id="org.jboss.ide.eclipse.as.core.server.JBoss7ManagerServicePoller" name="JBoss 7 Manager Service Poller" supportsShutdown="true" supportsStartup="true"> - </serverPoller> + </serverPoller> --> </extension>