Author: adietish Date: 2011-07-12 08:20:43 -0400 (Tue, 12 Jul 2011) New Revision: 32839 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IJBoss7ManagerService.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DelegatingServerBehavior.java trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/JBoss7ManagerService.java Log: [JBIDE-9215] added IJBoss7ManagerService#isRunning Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IJBoss7ManagerService.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IJBoss7ManagerService.java 2011-07-12 09:01:26 UTC (rev 32838) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IJBoss7ManagerService.java 2011-07-12 12:20:43 UTC (rev 32839) @@ -129,7 +129,18 @@ * @throws Exception */ public JBoss7ServerState getServerState(String host, int port) throws Exception; - + + /** + * Returns <code>true</code> if the server is running, <code>false</code> + * otherwise. + * + * @param host the server to to query + * @param port the port to communicate on + * @return true if it's running, false otherwise + * @throws Exception + */ + public boolean isRunning(String host, int port) throws Exception; + @Deprecated public JBoss7ServerState getServerState(String host) throws Exception; Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DelegatingServerBehavior.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DelegatingServerBehavior.java 2011-07-12 09:01:26 UTC (rev 32838) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DelegatingServerBehavior.java 2011-07-12 12:20:43 UTC (rev 32839) @@ -10,6 +10,7 @@ ******************************************************************************/ package org.jboss.ide.eclipse.as.core.server.internal; +import java.text.MessageFormat; import java.util.HashMap; import org.eclipse.core.runtime.CoreException; @@ -21,6 +22,8 @@ import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy; import org.eclipse.wst.server.core.IModule; 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.publishers.AbstractServerToolsPublisher; import org.jboss.ide.eclipse.as.core.publishers.JSTPublisherXMLToucher; import org.jboss.ide.eclipse.as.core.publishers.LocalPublishMethod; @@ -29,6 +32,7 @@ import org.jboss.ide.eclipse.as.core.server.IJBossServerPublishMethod; import org.jboss.ide.eclipse.as.core.server.IJBossServerPublishMethodType; import org.jboss.ide.eclipse.as.core.server.internal.launch.DelegatingStartLaunchConfiguration; +import org.jboss.ide.eclipse.as.core.server.internal.v7.JBoss7Server; import org.jboss.ide.eclipse.as.core.server.xpl.PublishCopyUtil.IPublishCopyCallbackHandler; import org.jboss.ide.eclipse.as.core.util.DeploymentPreferenceLoader; import org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants; @@ -84,6 +88,10 @@ } public void stop(boolean force) { + if( LaunchCommandPreferences.isIgnoreLaunchCommand(getServer())) { + super.setServerStopped(); + return; + } getDelegate().stop(force); } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/JBoss7ManagerService.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/JBoss7ManagerService.java 2011-07-12 09:01:26 UTC (rev 32838) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/JBoss7ManagerService.java 2011-07-12 12:20:43 UTC (rev 32839) @@ -62,6 +62,14 @@ return manager.getServerState(); } + public boolean isRunning(String host, int port) { + try { + return getServerState(host, port) == JBoss7ServerState.RUNNING; + } catch (Exception e) { + return false; + } + } + @Deprecated public void stop(String host) throws Exception { stop(host, AS7Manager.MGMT_PORT);