Author: rob.stryker(a)jboss.com Date: 2011-07-05 23:47:09 -0400 (Tue, 05 Jul 2011) New Revision: 32629 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServerBehavior.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/ServerListener.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerConverter.java trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties Log: JBIDE-9277 - cleanup of 'externally managed' servers. Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServerBehavior.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServerBehavior.java 2011-07-06 00:14:18 UTC (rev 32628) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServerBehavior.java 2011-07-06 03:47:09 UTC (rev 32629) @@ -17,6 +17,7 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Path; +import org.eclipse.core.runtime.Status; import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy; import org.eclipse.wst.server.core.IModule; import org.eclipse.wst.server.core.IServer; @@ -30,6 +31,7 @@ import org.jboss.ide.eclipse.as.core.server.internal.launch.JBossServerStartupLaunchConfiguration; 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; import org.jboss.ide.eclipse.as.core.util.ServerConverter; import org.jboss.ide.eclipse.as.wtp.core.util.ServerModelUtilities; @@ -152,6 +154,10 @@ return canChangeState(launchMode); } protected IStatus canChangeState(String launchMode) { + String ignoreLaunch = getServer().getAttribute(IJBossToolingConstants.IGNORE_LAUNCH_COMMANDS, Boolean.toString(false)); + if( new Boolean(ignoreLaunch).booleanValue()) { + return Status.CANCEL_STATUS; + } return getDelegate().canChangeState(launchMode); } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/ServerListener.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/ServerListener.java 2011-07-06 00:14:18 UTC (rev 32628) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/ServerListener.java 2011-07-06 03:47:09 UTC (rev 32629) @@ -14,9 +14,12 @@ import org.eclipse.wst.server.core.IServer; import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin; +import org.jboss.ide.eclipse.as.core.server.IDeployableServer; import org.jboss.ide.eclipse.as.core.server.UnitedServerListener; import org.jboss.ide.eclipse.as.core.server.UnitedServerListenerManager; import org.jboss.ide.eclipse.as.core.util.FileUtil; +import org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants; +import org.jboss.ide.eclipse.as.core.util.ServerConverter; import org.jboss.ide.eclipse.as.core.util.ServerUtil; public class ServerListener extends UnitedServerListener { @@ -31,8 +34,28 @@ return true; } + public void init(IServer server) { + initUnmanagedServerState(server); + } + + protected void initUnmanagedServerState(IServer server) { + JBossServerBehavior beh = ServerConverter.getJBossServerBehavior(server); + if( beh != null ) { + String ignoreLaunch = server.getAttribute(IJBossToolingConstants.IGNORE_LAUNCH_COMMANDS, Boolean.toString(false)); + if( new Boolean(ignoreLaunch).booleanValue()) { + // Assume started already + beh.setServerStarted(); + } + } + } + public void serverChanged(IServer server) { + // double check if the user toggled the 'assume started' flag to true + initUnmanagedServerState(server); + } + public void serverAdded(IServer server) { ServerUtil.createStandardFolders(server); + initUnmanagedServerState(server); } public void serverRemoved(IServer server) { Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerConverter.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerConverter.java 2011-07-06 00:14:18 UTC (rev 32628) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerConverter.java 2011-07-06 03:47:09 UTC (rev 32629) @@ -27,6 +27,7 @@ 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.JBossServer; +import org.jboss.ide.eclipse.as.core.server.internal.JBossServerBehavior; import org.jboss.ide.eclipse.as.core.server.internal.v7.JBoss7ServerBehavior; /** @@ -127,6 +128,12 @@ return (JBoss7ServerBehavior) server.loadAdapter( JBoss7ServerBehavior.class, new NullProgressMonitor()); } + public static JBossServerBehavior getJBossServerBehavior(IServer server) { + if (server == null) + return null; + return (JBossServerBehavior) server.loadAdapter( + JBossServerBehavior.class, new NullProgressMonitor()); + } /** * Return all JBossServer instances from the ServerCore Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties 2011-07-06 00:14:18 UTC (rev 32628) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties 2011-07-06 03:47:09 UTC (rev 32629) @@ -161,7 +161,7 @@ EditorSetRadioClicked=Set Deploy Location EditorDeployDNE=The deploy directory "{0}" does not exist. EditorTempDeployDNE=The temporary deploy directory "{0}" does not exist. -EditorDoNotLaunch=Do not execute startup or shutdown commands. +EditorDoNotLaunch=Server is externally managed. Assume server is started. EditorDoNotLaunchCommand=Toggle Startup and Shutdown scripts EditorChangeServerMode=Change server mode EditorStartupPollerLabel=Startup Poller