JBoss Tools SVN: r32850 - trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-07-12 09:16:08 -0400 (Tue, 12 Jul 2011)
New Revision: 32850
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/AbstractRSEBehaviourDelegate.java
Log:
[JBIDE-9215] cleaned imports
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/AbstractRSEBehaviourDelegate.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/AbstractRSEBehaviourDelegate.java 2011-07-12 13:08:23 UTC (rev 32849)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/AbstractRSEBehaviourDelegate.java 2011-07-12 13:16:08 UTC (rev 32850)
@@ -12,8 +12,6 @@
******************************************************************************/
package org.jboss.ide.eclipse.as.rse.core;
-import java.text.MessageFormat;
-
import org.eclipse.core.runtime.CoreException;
import org.eclipse.wst.server.core.IServer;
import org.jboss.ide.eclipse.as.core.server.IServerStatePoller;
14 years, 9 months
JBoss Tools SVN: r32849 - in trunk/as/plugins: org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-07-12 09:08:23 -0400 (Tue, 12 Jul 2011)
New Revision: 32849
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/DelegatingJBoss7ServerBehavior.java
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.rse.core/src/org/jboss/ide/eclipse/as/rse/core/AbstractRSEBehaviourDelegate.java
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEBehaviourDelegate.java
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBoss7BehaviourDelegate.java
Log:
[JBIDE-9215] added remote stopping
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/DelegatingJBoss7ServerBehavior.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/DelegatingJBoss7ServerBehavior.java 2011-07-12 12:58:41 UTC (rev 32848)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/DelegatingJBoss7ServerBehavior.java 2011-07-12 13:08:23 UTC (rev 32849)
@@ -135,53 +135,13 @@
createDoDeployMarker(new IPath[]{depPath}, monitor);
}
-
- protected IJBoss7ManagerService getService() throws Exception {
- if (service == null) {
- service = JBoss7ManagerUtil.getService(getServer());
- }
- return service;
- }
-
- private boolean isServerRunning(String host, int port) throws Exception {
- try {
- return getService().getServerState(host, port) == JBoss7ServerState.RUNNING;
- } catch (JBoss7ManangerConnectException e) {
- return false;
- }
- }
-
@Override
public void stop(boolean force) {
if( LaunchCommandPreferences.isIgnoreLaunchCommand(getServer())) {
super.setServerStopped();
return;
}
- try {
- if (force) {
- if( serverProcess != null )
- serverProcess.terminate();
- } else {
- setServerStopping();
- String host = getServer().getHost();
- JBoss7Server server = ServerConverter.checkedGetJBossServer(getServer(), JBoss7Server.class);
- int mgmtPort = server.getManagementPort();
- // TODO: for now only local, implement for remote afterwards
- if (isServerRunning(host, mgmtPort)) {
- // The service and Poller will make sure the server is down
- getService().stop(host, mgmtPort);
- return;
- } else {
- if( serverProcess != null && !serverProcess.isTerminated()) {
- serverProcess.terminate();
- }
- }
- }
- } catch (Exception e) {
- IStatus status = new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, MessageFormat.format(Messages.JBoss7ServerBehavior_could_not_stop, getServer().getName()), e);
- JBossServerCorePlugin.getDefault().getLog().log(status);
- }
- setServerStopped();
+ getDelegate().stop(force);
}
@Override
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-07-12 12:58:41 UTC (rev 32848)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7BehaviorDelegate.java 2011-07-12 13:08:23 UTC (rev 32849)
@@ -10,12 +10,18 @@
******************************************************************************/
package org.jboss.ide.eclipse.as.core.server.internal.v7;
+import java.text.MessageFormat;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
+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.extensions.polling.WebPortPoller;
+import org.jboss.ide.eclipse.as.core.server.IJBoss7ManagerService;
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.util.PollThreadUtils;
+import org.jboss.ide.eclipse.as.core.util.ServerConverter;
public class LocalJBoss7BehaviorDelegate extends LocalJBossBehaviorDelegate {
@@ -24,6 +30,33 @@
}
@Override
+ public void stop(boolean force) {
+ if (force) {
+ forceStop();
+ } else {
+ IStatus result = gracefullStop();
+ if (!result.isOK()) {
+ forceStop();
+ }
+ }
+ }
+
+ @Override
+ protected IStatus gracefullStop() {
+ IServer server = getServer();
+ try {
+ IJBoss7ManagerService service = JBoss7ManagerUtil.getService(server);
+ JBoss7Server jbossServer = ServerConverter.checkedGetJBossServer(server, JBoss7Server.class);
+ service.stop(jbossServer.getHost(), jbossServer.getManagementPort());
+ return Status.OK_STATUS;
+ } catch (Exception e) {
+ return new Status(
+ IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID,
+ MessageFormat.format(Messages.JBoss7ServerBehavior_could_not_stop, server.getName()), e);
+ }
+ }
+
+ @Override
protected void pollServer(final boolean expectedState) {
// IF shutting down a process started OUTSIDE of eclipse, force use the web poller,
// since there's no process watch for shutdowns
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/AbstractRSEBehaviourDelegate.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/AbstractRSEBehaviourDelegate.java 2011-07-12 12:58:41 UTC (rev 32848)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/AbstractRSEBehaviourDelegate.java 2011-07-12 13:08:23 UTC (rev 32849)
@@ -15,16 +15,9 @@
import java.text.MessageFormat;
import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.rse.services.shells.IHostShell;
import org.eclipse.wst.server.core.IServer;
-import org.jboss.ide.eclipse.as.core.extensions.events.ServerLogger;
import org.jboss.ide.eclipse.as.core.server.IServerStatePoller;
import org.jboss.ide.eclipse.as.core.server.internal.AbstractJBossBehaviourDelegate;
-import org.jboss.ide.eclipse.as.core.util.LaunchCommandPreferences;
-import org.jboss.ide.eclipse.as.rse.core.RSEHostShellModel.ServerShellModel;
public abstract class AbstractRSEBehaviourDelegate extends AbstractJBossBehaviourDelegate {
@@ -52,29 +45,6 @@
setServerStopped();
}
- @Override
- protected IStatus gracefullStop() {
- try {
- executeShutdownCommand(getShutdownCommand(getServer()));
- return Status.OK_STATUS;
- } catch(CoreException ce) {
- ServerLogger.getDefault().log(getServer(), ce.getStatus());
- return new Status(
- IStatus.ERROR, RSECorePlugin.PLUGIN_ID,
- MessageFormat.format("Could not stop server {0}", getServer().getName()),
- ce);
- }
- }
-
- private void executeShutdownCommand(String shutdownCommand) throws CoreException {
- ServerShellModel model = RSEHostShellModel.getInstance().getModel(getServer());
- model.executeRemoteCommand("/", shutdownCommand, new String[]{}, new NullProgressMonitor(), 10000, true);
- IHostShell shell = model.getStartupShell();
- if( RSEUtils.isActive(shell)) {
- shell.writeToShell("exit");
- }
- }
-
protected abstract String getShutdownCommand(IServer server) throws CoreException;
/**
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEBehaviourDelegate.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEBehaviourDelegate.java 2011-07-12 12:58:41 UTC (rev 32848)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEBehaviourDelegate.java 2011-07-12 13:08:23 UTC (rev 32849)
@@ -12,12 +12,19 @@
******************************************************************************/
package org.jboss.ide.eclipse.as.rse.core;
+import java.text.MessageFormat;
+
import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.Status;
import org.eclipse.debug.core.ILaunchConfiguration;
+import org.eclipse.rse.services.shells.IHostShell;
import org.eclipse.wst.server.core.IServer;
+import org.jboss.ide.eclipse.as.core.extensions.events.ServerLogger;
import org.jboss.ide.eclipse.as.core.server.IServerStatePoller;
import org.jboss.ide.eclipse.as.core.util.ServerUtil;
+import org.jboss.ide.eclipse.as.rse.core.RSEHostShellModel.ServerShellModel;
public class RSEBehaviourDelegate extends AbstractRSEBehaviourDelegate {
@@ -29,6 +36,29 @@
}
@Override
+ protected IStatus gracefullStop() {
+ try {
+ executeShutdownCommand(getShutdownCommand(getServer()));
+ return Status.OK_STATUS;
+ } catch(CoreException ce) {
+ ServerLogger.getDefault().log(getServer(), ce.getStatus());
+ return new Status(
+ IStatus.ERROR, RSECorePlugin.PLUGIN_ID,
+ MessageFormat.format("Could not stop server {0}", getServer().getName()),
+ ce);
+ }
+ }
+
+ private void executeShutdownCommand(String shutdownCommand) throws CoreException {
+ ServerShellModel model = RSEHostShellModel.getInstance().getModel(getServer());
+ model.executeRemoteCommand("/", shutdownCommand, new String[]{}, new NullProgressMonitor(), 10000, true);
+ IHostShell shell = model.getStartupShell();
+ if( RSEUtils.isActive(shell)) {
+ shell.writeToShell("exit");
+ }
+ }
+
+ @Override
public void serverIsStarting() {
pollServer(IServerStatePoller.SERVER_UP);
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBoss7BehaviourDelegate.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBoss7BehaviourDelegate.java 2011-07-12 12:58:41 UTC (rev 32848)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBoss7BehaviourDelegate.java 2011-07-12 13:08:23 UTC (rev 32849)
@@ -12,11 +12,21 @@
******************************************************************************/
package org.jboss.ide.eclipse.as.rse.core;
+import java.text.MessageFormat;
+
import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.Status;
import org.eclipse.debug.core.ILaunchConfiguration;
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.server.IJBoss7ManagerService;
import org.jboss.ide.eclipse.as.core.server.IServerStatePoller;
+import org.jboss.ide.eclipse.as.core.server.internal.v7.JBoss7ManagerUtil;
+import org.jboss.ide.eclipse.as.core.server.internal.v7.JBoss7Server;
+import org.jboss.ide.eclipse.as.core.util.ServerConverter;
import org.jboss.ide.eclipse.as.core.util.ServerUtil;
public class RSEJBoss7BehaviourDelegate extends AbstractRSEBehaviourDelegate {
@@ -37,4 +47,20 @@
public void serverIsStopping() {
pollServer(IServerStatePoller.SERVER_DOWN);
}
+
+ @Override
+ protected IStatus gracefullStop() {
+ IServer server = getServer();
+ try {
+ IJBoss7ManagerService service = JBoss7ManagerUtil.getService(server);
+ JBoss7Server jbossServer = ServerConverter.checkedGetJBossServer(server, JBoss7Server.class);
+ service.stop(jbossServer.getHost(), jbossServer.getManagementPort());
+ return Status.OK_STATUS;
+ } catch (Exception e) {
+ return new Status(
+ IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID,
+ MessageFormat.format(Messages.JBoss7ServerBehavior_could_not_stop, server.getName()), e);
+ }
+ }
+
}
14 years, 9 months
JBoss Tools SVN: r32848 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-07-12 08:58:41 -0400 (Tue, 12 Jul 2011)
New Revision: 32848
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossBehaviorDelegate.java
Log:
[JBIDE-9215] reformatted/refactored to be better readable
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-07-12 12:57:51 UTC (rev 32847)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossBehaviorDelegate.java 2011-07-12 12:58:41 UTC (rev 32848)
@@ -55,6 +55,8 @@
protected IProcess process;
protected boolean nextStopRequiresForce = false;
+ protected transient IDebugEventSetListener processListener;
+
public LocalJBossBehaviorDelegate() {
super();
}
@@ -149,8 +151,6 @@
ServerLogger.getDefault().log(getServer(), status);
}
- protected transient IDebugEventSetListener processListener;
-
public synchronized void setProcess(final IProcess newProcess) {
if (process != null) {
return;
@@ -302,12 +302,15 @@
public IStatus canStart(String launchMode) {
return canChangeState(launchMode);
}
+
public IStatus canRestart(String launchMode) {
return canChangeState(launchMode);
}
+
public IStatus canStop() {
return canChangeState(null);
}
+
public IStatus canStop(String launchMode) {
return canChangeState(launchMode);
}
14 years, 9 months
JBoss Tools SVN: r32847 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-07-12 08:57:51 -0400 (Tue, 12 Jul 2011)
New Revision: 32847
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossBehaviorDelegate.java
Log:
[JBIDE-9215] reformatted/refactored to be better readable
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-07-12 12:41:41 UTC (rev 32846)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossBehaviorDelegate.java 2011-07-12 12:57:51 UTC (rev 32847)
@@ -58,9 +58,11 @@
public LocalJBossBehaviorDelegate() {
super();
}
+
public String getBehaviourTypeId() {
return LocalPublishMethod.LOCAL_PUBLISH_METHOD;
}
+
public void stop(boolean force) {
int state = getServer().getServerState();
if (force
14 years, 9 months
JBoss Tools SVN: r32846 - trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-07-12 08:41:41 -0400 (Tue, 12 Jul 2011)
New Revision: 32846
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBossStartLaunchDelegate.java
Log:
[JBIDE-9215] removed "dont execute launch command" check since now the delegating launch config does check it
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBossStartLaunchDelegate.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBossStartLaunchDelegate.java 2011-07-12 12:40:43 UTC (rev 32845)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBossStartLaunchDelegate.java 2011-07-12 12:41:41 UTC (rev 32846)
@@ -49,10 +49,6 @@
IProgressMonitor monitor) throws CoreException {
DelegatingServerBehavior beh = JBossServerBehaviorUtils.getServerBehavior(configuration);
beh.setServerStarting();
- if (LaunchCommandPreferences.isIgnoreLaunchCommand(beh.getServer())) {
- beh.setServerStarted();
- return;
- }
String command = RSELaunchConfigProperties.getStartupCommand(configuration);
executeRemoteCommand(command, beh);
launchPingThread(beh);
14 years, 9 months
JBoss Tools SVN: r32845 - trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-07-12 08:40:43 -0400 (Tue, 12 Jul 2011)
New Revision: 32845
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/AbstractRSEBehaviourDelegate.java
Log:
[JBIDE-9215] removed "dont execute launch command" check since now the delegating server behavior does check it
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/AbstractRSEBehaviourDelegate.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/AbstractRSEBehaviourDelegate.java 2011-07-12 12:35:13 UTC (rev 32844)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/AbstractRSEBehaviourDelegate.java 2011-07-12 12:40:43 UTC (rev 32845)
@@ -39,11 +39,6 @@
forceStop();
}
- if( LaunchCommandPreferences.isIgnoreLaunchCommand(getServer())) {
- setServerStopped();
- return;
- }
-
setServerStopping();
if (!gracefullStop().isOK()) {
setServerStarted();
14 years, 9 months
JBoss Tools SVN: r32844 - trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/server.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-07-12 08:35:13 -0400 (Tue, 12 Jul 2011)
New Revision: 32844
Modified:
trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/server/JBossManagerTest.java
Log:
[JBIDE-9215] added IJBoss7ManagerService#isRunning
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/server/JBossManagerTest.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/server/JBossManagerTest.java 2011-07-12 12:28:54 UTC (rev 32843)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/server/JBossManagerTest.java 2011-07-12 12:35:13 UTC (rev 32844)
@@ -105,6 +105,10 @@
throw new UnsupportedOperationException();
}
+ public boolean isRunning(String host, int port) {
+ throw new UnsupportedOperationException();
+ }
+
public void stop(String host, int port) throws JBoss7ManangerException {
}
14 years, 9 months
JBoss Tools SVN: r32843 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-07-12 08:28:54 -0400 (Tue, 12 Jul 2011)
New Revision: 32843
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossBehaviorDelegate.java
Log:
[JBIDE-9215] reformatted/refactored to be better readable
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-07-12 12:23:22 UTC (rev 32842)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossBehaviorDelegate.java 2011-07-12 12:28:54 UTC (rev 32843)
@@ -63,24 +63,21 @@
}
public void stop(boolean force) {
int state = getServer().getServerState();
- if( force
- || !isProcessRunning()
- || state == IServer.STATE_STOPPED
+ if (force
+ || !isProcessRunning()
+ || state == IServer.STATE_STOPPED
|| nextStopRequiresForce) {
forceStop();
- return;
- }
-
- // if we're starting up or shutting down and they've tried again,
- // then force it to stop.
- if( state == IServer.STATE_STARTING || state == IServer.STATE_STOPPING ) {
+ } else if (state == IServer.STATE_STARTING
+ || state == IServer.STATE_STOPPING) {
+ // if we're starting up or shutting down and they've tried again,
+ // then force it to stop.
stopPolling();
forceStop();
- return;
+ } else {
+ setServerStopping();
+ gracefullStop();
}
-
- setServerStopping();
- gracefullStop();
}
@Override
14 years, 9 months
JBoss Tools SVN: r32842 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-07-12 08:23:22 -0400 (Tue, 12 Jul 2011)
New Revision: 32842
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagerServiceProxy.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/internal/v7/JBoss7ManagerServiceProxy.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagerServiceProxy.java 2011-07-12 12:22:57 UTC (rev 32841)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagerServiceProxy.java 2011-07-12 12:23:22 UTC (rev 32842)
@@ -46,7 +46,15 @@
public JBoss7ServerState getServerState(String host, int port) throws Exception {
return checkedGetService().getServerState(host, port);
}
-
+
+ public boolean isRunning(String host, int port) throws Exception {
+ try {
+ return checkedGetService().isRunning(host, port);
+ } catch (Exception e) {
+ return false;
+ }
+ }
+
@Deprecated
public JBoss7ServerState getServerState(String host) throws Exception {
return checkedGetService().getServerState(host);
14 years, 9 months
JBoss Tools SVN: r32841 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-07-12 08:22:57 -0400 (Tue, 12 Jul 2011)
New Revision: 32841
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/AbstractJBossStartLaunchConfiguration.java
Log:
[JBIDE-9215] do not delegate if "do not execute launch commands"
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/AbstractJBossStartLaunchConfiguration.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/AbstractJBossStartLaunchConfiguration.java 2011-07-12 12:21:17 UTC (rev 32840)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/AbstractJBossStartLaunchConfiguration.java 2011-07-12 12:22:57 UTC (rev 32841)
@@ -33,6 +33,7 @@
import org.jboss.ide.eclipse.as.core.server.internal.DelegatingServerBehavior;
import org.jboss.ide.eclipse.as.core.util.JBossServerBehaviorUtils;
import org.jboss.ide.eclipse.as.core.util.LaunchCommandPreferences;
+import org.jboss.ide.eclipse.as.core.util.LaunchConfigUtils;
/**
* @author Rob Stryker
@@ -73,11 +74,15 @@
@Override
public void launch(ILaunchConfiguration configuration, String mode,
ILaunch launch, IProgressMonitor monitor) throws CoreException {
+ IServer server = LaunchConfigUtils.checkedGetServer(configuration);
+ if( LaunchCommandPreferences.isIgnoreLaunchCommand(server)) {
+ return;
+ }
preLaunch(configuration, mode, launch, monitor);
actualLaunch(configuration, mode, launch, monitor);
postLaunch(configuration, mode, launch, monitor);
}
-
+
protected void actualLaunch(ILaunchConfiguration configuration,
String mode, ILaunch launch, IProgressMonitor monitor) throws CoreException {
// And off we go!
14 years, 9 months