Author: adietish Date: 2011-07-06 10:07:39 -0400 (Wed, 06 Jul 2011) New Revision: 32650 Added: 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.rse.core/src/org/jboss/ide/eclipse/as/rse/core/AbstractRSEBehaviourDelegate.java Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling/ProcessTerminatedPoller.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/AbstractJBossBehaviourDelegate.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/PollThread.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/server/internal/launch/AbstractJBossLaunchConfigType.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/LocalJBossServerStartupLaunchUtil.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/LocalJBossStartLaunchDelegate.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/StopLaunchConfiguration.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/configuration/LocalStopLaunchConfigurator.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/LocalJBoss7StartLaunchConfiguration.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/JBossServerBehaviorUtils.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/PollThreadUtils.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.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerUtil.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml 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/RSECorePlugin.java trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEHostShellModel.java trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSELaunchDelegate.java trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEPublishMethod.java trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/server/MockTests.java trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/util/ServerRuntimeUtils.java Log: [JBIDE-9215] renamed JBossServerBehaviour to DelegatingServerBehaviour Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling/ProcessTerminatedPoller.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling/ProcessTerminatedPoller.java 2011-07-06 14:03:29 UTC (rev 32649) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling/ProcessTerminatedPoller.java 2011-07-06 14:07:39 UTC (rev 32650) @@ -17,8 +17,8 @@ import org.eclipse.debug.core.model.IProcess; import org.eclipse.wst.server.core.IServer; import org.jboss.ide.eclipse.as.core.server.IServerStatePoller; -import org.jboss.ide.eclipse.as.core.server.internal.JBossServerBehavior; -import org.jboss.ide.eclipse.as.core.server.internal.JBossServerBehavior.JBossBehaviourDelegate; +import org.jboss.ide.eclipse.as.core.server.internal.DelegatingServerBehavior; +import org.jboss.ide.eclipse.as.core.server.internal.DelegatingServerBehavior.JBossBehaviourDelegate; import org.jboss.ide.eclipse.as.core.server.internal.PollThread; import org.jboss.ide.eclipse.as.core.server.internal.ServerStatePollerType; @@ -40,10 +40,10 @@ private ServerStatePollerType type; - private JBossServerBehavior server; + private DelegatingServerBehavior server; public void beginPolling(IServer server, boolean expectedState, PollThread pt) { - this.server = (JBossServerBehavior)server.loadAdapter(JBossServerBehavior.class, new NullProgressMonitor()); + this.server = (DelegatingServerBehavior)server.loadAdapter(DelegatingServerBehavior.class, new NullProgressMonitor()); } public IServer getServer() { Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/AbstractJBossBehaviourDelegate.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/AbstractJBossBehaviourDelegate.java 2011-07-06 14:03:29 UTC (rev 32649) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/AbstractJBossBehaviourDelegate.java 2011-07-06 14:07:39 UTC (rev 32650) @@ -16,19 +16,19 @@ import org.eclipse.core.runtime.Status; import org.eclipse.wst.server.core.IServer; import org.jboss.ide.eclipse.as.core.server.IJBoss6Server; -import org.jboss.ide.eclipse.as.core.server.internal.JBossServerBehavior.JBossBehaviourDelegate; +import org.jboss.ide.eclipse.as.core.server.internal.DelegatingServerBehavior.JBossBehaviourDelegate; import org.jboss.ide.eclipse.as.core.util.IJBossRuntimeConstants; import org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants; import org.jboss.ide.eclipse.as.core.util.ServerConverter; public abstract class AbstractJBossBehaviourDelegate implements JBossBehaviourDelegate { - private JBossServerBehavior actualBehavior; - public void setActualBehaviour(JBossServerBehavior actualBehaviour) { + private DelegatingServerBehavior actualBehavior; + public void setActualBehaviour(DelegatingServerBehavior actualBehaviour) { this.actualBehavior = actualBehaviour; } - public JBossServerBehavior getActualBehavior() { + public DelegatingServerBehavior getActualBehavior() { return actualBehavior; } Copied: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DelegatingServerBehavior.java (from rev 32649, 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/DelegatingServerBehavior.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DelegatingServerBehavior.java 2011-07-06 14:07:39 UTC (rev 32650) @@ -0,0 +1,186 @@ +/******************************************************************************* + * Copyright (c) 2011 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.ide.eclipse.as.core.server.internal; + +import java.util.HashMap; + +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IPath; +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; +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; +import org.jboss.ide.eclipse.as.core.publishers.PublishUtil; +import org.jboss.ide.eclipse.as.core.server.IDeployableServer; +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.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.LaunchCommandPreferences; +import org.jboss.ide.eclipse.as.core.util.ServerConverter; +import org.jboss.ide.eclipse.as.wtp.core.util.ServerModelUtilities; + +/** + * + * @author Rob Stryker + * + */ +public class DelegatingServerBehavior extends DeployableServerBehavior { + + /** + * TODO: move to its own file (so that we can hide implementations and export interfaces) & rename to IJBossBehaviourDelegate + */ + public static interface JBossBehaviourDelegate { + public String getBehaviourTypeId(); + public void setActualBehaviour(DelegatingServerBehavior actualBehaviour); + public void stop(boolean force); + public void publishStart(final IProgressMonitor monitor) throws CoreException; + public void publishFinish(final IProgressMonitor monitor) throws CoreException; + public void setServerStarting(); + public void setServerStopping(); + public IStatus canChangeState(String launchMode); + public String getDefaultStopArguments() throws CoreException; + } + + private static HashMap<String, Class> delegateClassMap; + static { + delegateClassMap = new HashMap<String, Class>(); + delegateClassMap.put(LocalPublishMethod.LOCAL_PUBLISH_METHOD, LocalJBossBehaviorDelegate.class); + } + public static void addDelegateMapping(String s, Class c) { + delegateClassMap.put(s, c); + } + + public DelegatingServerBehavior() { + super(); + } + + private JBossBehaviourDelegate delegate; + private String lastModeId; + public JBossBehaviourDelegate getDelegate() { + IJBossServerPublishMethodType type = DeploymentPreferenceLoader.getCurrentDeploymentMethodType(getServer()); + String id = type == null ? LocalPublishMethod.LOCAL_PUBLISH_METHOD : type.getId(); + if( id.equals(lastModeId) && delegate != null && delegate.getBehaviourTypeId().equals(id)) + return delegate; + + Class c = getDelegateMap().get(id); + if( c == null ) + c = getDelegateMap().get(LocalPublishMethod.LOCAL_PUBLISH_METHOD); + + try { + JBossBehaviourDelegate o = (JBossBehaviourDelegate)c.newInstance(); + o.setActualBehaviour(this); + lastModeId = id; + delegate = o; + } catch( InstantiationException ie) { + } catch( IllegalAccessException iae) { + } + return delegate; + } + + protected HashMap<String, Class> getDelegateMap() { + return delegateClassMap; + } + + public void stop(boolean force) { + getDelegate().stop(force); + } + + /* + * This shouldn't be done in the delegate. + * The launch config class directly should do it and allow all modes + * to participate? + */ + public void setupLaunchConfiguration(ILaunchConfigurationWorkingCopy workingCopy, IProgressMonitor monitor) throws CoreException { + JBossServerStartupLaunchConfiguration.setupLaunchConfiguration(workingCopy, getServer()); + } + + public void setRunMode(String mode) { + setMode(mode); + } + + public void serverStarting() { + setServerStarting(); + getDelegate().setServerStarting(); + } + + public void serverStopping() { + setServerStopping(); + getDelegate().setServerStopping(); + } + + protected void publishStart(final IProgressMonitor monitor) throws CoreException { + super.publishStart(monitor); + getDelegate().publishStart(monitor); + } + + protected void publishFinish(final IProgressMonitor monitor) throws CoreException { + getDelegate().publishFinish(monitor); + super.publishFinish(monitor); + } + + public boolean shouldSuspendScanner() { + if( getServer().getServerState() != IServer.STATE_STARTED) + return false; + return true; + } + + // Can start / stop / restart etc + 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); + } + protected IStatus canChangeState(String launchMode) { + if( LaunchCommandPreferences.isIgnoreLaunchCommand(getServer())) { + return Status.CANCEL_STATUS; + } + return getDelegate().canChangeState(launchMode); + } + + public boolean canRestartModule(IModule[] module){ + if( module.length == 1 ) + return true; + return false; + } + + public void restartModule(IModule[] module, IProgressMonitor monitor) throws CoreException { + IDeployableServer ds = ServerConverter.getDeployableServer(getServer()); + if( ds == null ) + return; + + IJBossServerPublishMethod method = getOrCreatePublishMethod(); + IPath depPath = PublishUtil.getDeployPath(method, module, ds); + if( ServerModelUtilities.isBinaryModule(module[module.length-1]) || ds.zipsWTPDeployments()) { + // touch the file + getOrCreatePublishMethod().getCallbackHandler(depPath.removeLastSegments(1), getServer()).touchResource(new Path(depPath.lastSegment())); + } else { + // touch the descriptor + IPublishCopyCallbackHandler callback = method.getCallbackHandler(AbstractServerToolsPublisher.getRootPath(depPath).append(depPath), getServer()); + JSTPublisherXMLToucher.getInstance().touch(depPath, module[0], callback); + } + } +} Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/PollThread.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/PollThread.java 2011-07-06 14:03:29 UTC (rev 32649) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/PollThread.java 2011-07-06 14:07:39 UTC (rev 32650) @@ -51,10 +51,10 @@ private boolean expectedState, abort, stateStartedOrStopped; private IServerStatePoller poller; private String abortMessage; - private JBossServerBehavior behavior; + private DelegatingServerBehavior behavior; private String pollerId; - public PollThread(boolean expectedState, IServerStatePoller poller, JBossServerBehavior behavior) { + public PollThread(boolean expectedState, IServerStatePoller poller, DelegatingServerBehavior behavior) { super(getThreadName(behavior)); this.expectedState = expectedState; this.abort = false; @@ -63,7 +63,7 @@ this.poller = poller; } - private static String getThreadName(JBossServerBehavior behavior) { + private static String getThreadName(DelegatingServerBehavior behavior) { return NLS.bind(Messages.ServerPollerThreadName, behavior.getServer().getName()); } 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 14:03:29 UTC (rev 32649) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/ServerListener.java 2011-07-06 14:07:39 UTC (rev 32650) @@ -39,7 +39,7 @@ } protected void initUnmanagedServerState(IServer server) { - JBossServerBehavior beh = ServerConverter.getJBossServerBehavior(server); + DelegatingServerBehavior beh = ServerConverter.getJBossServerBehavior(server); if( beh != null ) { String ignoreLaunch = server.getAttribute(IJBossToolingConstants.IGNORE_LAUNCH_COMMANDS, Boolean.toString(false)); if( new Boolean(ignoreLaunch).booleanValue()) { Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/AbstractJBossLaunchConfigType.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/AbstractJBossLaunchConfigType.java 2011-07-06 14:03:29 UTC (rev 32649) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/AbstractJBossLaunchConfigType.java 2011-07-06 14:07:39 UTC (rev 32650) @@ -35,7 +35,7 @@ import org.jboss.ide.eclipse.as.core.Messages; import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime; 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.DelegatingServerBehavior; import org.jboss.ide.eclipse.as.core.server.internal.launch.configuration.JBossLaunchConfigProperties; import org.jboss.ide.eclipse.as.core.util.LaunchConfigUtils; import org.jboss.ide.eclipse.as.core.util.RuntimeUtils; @@ -126,7 +126,7 @@ ServerProfilerDelegate.configureProfiling(launch, vm, runConfig, monitor); } catch (CoreException ce) { IServer server = org.eclipse.wst.server.core.ServerUtil.getServer(configuration); - JBossServerBehavior jbsb = (JBossServerBehavior) server.getAdapter(JBossServerBehavior.class); + DelegatingServerBehavior jbsb = (DelegatingServerBehavior) server.getAdapter(DelegatingServerBehavior.class); jbsb.stop(true); // genericServer.stopImpl(); throw ce; Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/LocalJBossServerStartupLaunchUtil.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/LocalJBossServerStartupLaunchUtil.java 2011-07-06 14:03:29 UTC (rev 32649) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/LocalJBossServerStartupLaunchUtil.java 2011-07-06 14:07:39 UTC (rev 32650) @@ -28,7 +28,7 @@ import org.jboss.ide.eclipse.as.core.extensions.polling.WebPortPoller; import org.jboss.ide.eclipse.as.core.server.internal.AbstractLocalJBossServerRuntime; 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.DelegatingServerBehavior; import org.jboss.ide.eclipse.as.core.server.internal.LocalJBossBehaviorDelegate; import org.jboss.ide.eclipse.as.core.server.internal.launch.JBossServerStartupLaunchConfiguration.IStartLaunchSetupParticipant; import org.jboss.ide.eclipse.as.core.server.internal.launch.JBossServerStartupLaunchConfiguration.StartLaunchDelegate; @@ -105,7 +105,7 @@ public boolean preLaunchCheck(ILaunchConfiguration configuration, String mode, IProgressMonitor monitor) throws CoreException { - JBossServerBehavior jbsBehavior = JBossServerBehaviorUtils.getServerBehavior(configuration); + DelegatingServerBehavior jbsBehavior = JBossServerBehaviorUtils.getServerBehavior(configuration); if (!jbsBehavior.canStart(mode).isOK()) throw new CoreException(jbsBehavior.canStart(mode)); if (LaunchCommandPreferences.isIgnoreLaunchCommand(jbsBehavior.getServer())) { @@ -126,7 +126,7 @@ public void preLaunch(ILaunchConfiguration configuration, String mode, ILaunch launch, IProgressMonitor monitor) throws CoreException { try { - JBossServerBehavior jbsBehavior = JBossServerBehaviorUtils.getServerBehavior(configuration); + DelegatingServerBehavior jbsBehavior = JBossServerBehaviorUtils.getServerBehavior(configuration); jbsBehavior.setRunMode(mode); jbsBehavior.serverStarting(); } catch (CoreException ce) { @@ -138,7 +138,7 @@ ILaunch launch, IProgressMonitor monitor) throws CoreException { try { IProcess[] processes = launch.getProcesses(); - JBossServerBehavior jbsBehavior = JBossServerBehaviorUtils.getServerBehavior(configuration); + DelegatingServerBehavior jbsBehavior = JBossServerBehaviorUtils.getServerBehavior(configuration); ((LocalJBossBehaviorDelegate) (jbsBehavior.getDelegate())).setProcess(processes[0]); } catch (CoreException ce) { // report Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/LocalJBossStartLaunchDelegate.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/LocalJBossStartLaunchDelegate.java 2011-07-06 14:03:29 UTC (rev 32649) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/LocalJBossStartLaunchDelegate.java 2011-07-06 14:07:39 UTC (rev 32650) @@ -26,7 +26,7 @@ import org.eclipse.wst.server.core.ServerCore; import org.jboss.ide.eclipse.as.core.extensions.polling.WebPortPoller; import org.jboss.ide.eclipse.as.core.server.internal.AbstractLocalJBossServerRuntime; -import org.jboss.ide.eclipse.as.core.server.internal.JBossServerBehavior; +import org.jboss.ide.eclipse.as.core.server.internal.DelegatingServerBehavior; import org.jboss.ide.eclipse.as.core.server.internal.LocalJBossBehaviorDelegate; import org.jboss.ide.eclipse.as.core.server.internal.launch.JBossServerStartupLaunchConfiguration.IStartLaunchSetupParticipant; import org.jboss.ide.eclipse.as.core.server.internal.launch.JBossServerStartupLaunchConfiguration.StartLaunchDelegate; @@ -59,7 +59,7 @@ public boolean preLaunchCheck(ILaunchConfiguration configuration, String mode, IProgressMonitor monitor) throws CoreException { - JBossServerBehavior jbsBehavior = JBossServerBehaviorUtils.getServerBehavior(configuration); + DelegatingServerBehavior jbsBehavior = JBossServerBehaviorUtils.getServerBehavior(configuration); if (!jbsBehavior.canStart(mode).isOK()) throw new CoreException(jbsBehavior.canStart(mode)); if (LaunchCommandPreferences.isIgnoreLaunchCommand(jbsBehavior.getServer())) { @@ -80,7 +80,7 @@ public void preLaunch(ILaunchConfiguration configuration, String mode, ILaunch launch, IProgressMonitor monitor) throws CoreException { try { - JBossServerBehavior jbsBehavior = JBossServerBehaviorUtils.getServerBehavior(configuration); + DelegatingServerBehavior jbsBehavior = JBossServerBehaviorUtils.getServerBehavior(configuration); jbsBehavior.setRunMode(mode); jbsBehavior.serverStarting(); } catch (CoreException ce) { @@ -92,7 +92,7 @@ ILaunch launch, IProgressMonitor monitor) throws CoreException { try { IProcess[] processes = launch.getProcesses(); - JBossServerBehavior jbsBehavior = JBossServerBehaviorUtils.getServerBehavior(configuration); + DelegatingServerBehavior jbsBehavior = JBossServerBehaviorUtils.getServerBehavior(configuration); ((LocalJBossBehaviorDelegate) (jbsBehavior.getDelegate())).setProcess(processes[0]); } catch (CoreException ce) { // report Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/StopLaunchConfiguration.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/StopLaunchConfiguration.java 2011-07-06 14:03:29 UTC (rev 32649) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/StopLaunchConfiguration.java 2011-07-06 14:07:39 UTC (rev 32650) @@ -36,7 +36,7 @@ import org.jboss.ide.eclipse.as.core.server.IJBoss6Server; import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime; 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.DelegatingServerBehavior; import org.jboss.ide.eclipse.as.core.server.internal.launch.configuration.JBossLaunchConfigProperties; import org.jboss.ide.eclipse.as.core.util.IJBossRuntimeConstants; import org.jboss.ide.eclipse.as.core.util.IJBossRuntimeResourceConstants; Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/configuration/LocalStopLaunchConfigurator.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/configuration/LocalStopLaunchConfigurator.java 2011-07-06 14:03:29 UTC (rev 32649) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/configuration/LocalStopLaunchConfigurator.java 2011-07-06 14:07:39 UTC (rev 32650) @@ -19,7 +19,7 @@ import org.eclipse.wst.server.core.IServer; import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime; import org.jboss.ide.eclipse.as.core.server.internal.JBossServer; -import org.jboss.ide.eclipse.as.core.server.internal.JBossServerBehavior.JBossBehaviourDelegate; +import org.jboss.ide.eclipse.as.core.server.internal.DelegatingServerBehavior.JBossBehaviourDelegate; import org.jboss.ide.eclipse.as.core.util.IJBossRuntimeConstants; import org.jboss.ide.eclipse.as.core.util.IJBossRuntimeResourceConstants; import org.jboss.ide.eclipse.as.core.util.LaunchConfigUtils; 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-07-06 14:03:29 UTC (rev 32649) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerBehavior.java 2011-07-06 14:07:39 UTC (rev 32650) @@ -42,14 +42,14 @@ import org.jboss.ide.eclipse.as.core.server.IDeployableServer; import org.jboss.ide.eclipse.as.core.server.IJBoss7ManagerService; import org.jboss.ide.eclipse.as.core.server.IJBossServerPublishMethod; -import org.jboss.ide.eclipse.as.core.server.internal.JBossServerBehavior; +import org.jboss.ide.eclipse.as.core.server.internal.DelegatingServerBehavior; import org.jboss.ide.eclipse.as.core.server.internal.PollThread; import org.jboss.ide.eclipse.as.core.server.xpl.PublishCopyUtil.IPublishCopyCallbackHandler; import org.jboss.ide.eclipse.as.core.util.LaunchCommandPreferences; import org.jboss.ide.eclipse.as.core.util.ServerConverter; import org.jboss.ide.eclipse.as.wtp.core.util.ServerModelUtilities; -public class JBoss7ServerBehavior extends JBossServerBehavior { +public class JBoss7ServerBehavior extends DelegatingServerBehavior { public static final String MARK_DO_DEPLOY = "org.jboss.ide.eclipse.as.core.server.internal.v7.JBoss7JSTPublisher.markUndeploy"; //$NON-NLS-1$ Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7StartLaunchConfiguration.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7StartLaunchConfiguration.java 2011-07-06 14:03:29 UTC (rev 32649) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7StartLaunchConfiguration.java 2011-07-06 14:07:39 UTC (rev 32650) @@ -16,7 +16,7 @@ import org.eclipse.debug.core.ILaunchConfiguration; import org.eclipse.debug.core.model.IProcess; import org.jboss.ide.eclipse.as.core.extensions.polling.WebPortPoller; -import org.jboss.ide.eclipse.as.core.server.internal.JBossServerBehavior; +import org.jboss.ide.eclipse.as.core.server.internal.DelegatingServerBehavior; import org.jboss.ide.eclipse.as.core.server.internal.LocalJBossBehaviorDelegate; import org.jboss.ide.eclipse.as.core.server.internal.launch.JBossServerStartupLaunchConfiguration.IStartLaunchSetupParticipant; import org.jboss.ide.eclipse.as.core.server.internal.launch.JBossServerStartupLaunchConfiguration.StartLaunchDelegate; @@ -36,7 +36,7 @@ public boolean preLaunchCheck(ILaunchConfiguration configuration, String mode, IProgressMonitor monitor) throws CoreException { - JBossServerBehavior jbsBehavior = JBossServerBehaviorUtils.getServerBehavior(configuration); + DelegatingServerBehavior jbsBehavior = JBossServerBehaviorUtils.getServerBehavior(configuration); if( LaunchCommandPreferences.isIgnoreLaunchCommand(jbsBehavior.getServer())) { jbsBehavior.setServerStarting(); jbsBehavior.setServerStarted(); @@ -55,7 +55,7 @@ public void preLaunch(ILaunchConfiguration configuration, String mode, ILaunch launch, IProgressMonitor monitor) throws CoreException { try { - JBossServerBehavior jbsBehavior = JBossServerBehaviorUtils.getServerBehavior(configuration); + DelegatingServerBehavior jbsBehavior = JBossServerBehaviorUtils.getServerBehavior(configuration); jbsBehavior.setRunMode(mode); jbsBehavior.serverStarting(); } catch (CoreException ce) { Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/JBossServerBehaviorUtils.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/JBossServerBehaviorUtils.java 2011-07-06 14:03:29 UTC (rev 32649) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/JBossServerBehaviorUtils.java 2011-07-06 14:07:39 UTC (rev 32650) @@ -4,14 +4,14 @@ import org.eclipse.debug.core.ILaunchConfiguration; import org.eclipse.wst.server.core.IServer; import org.eclipse.wst.server.core.ServerUtil; -import org.jboss.ide.eclipse.as.core.server.internal.JBossServerBehavior; +import org.jboss.ide.eclipse.as.core.server.internal.DelegatingServerBehavior; import org.jboss.ide.eclipse.as.core.server.internal.v7.JBoss7ServerBehavior; public class JBossServerBehaviorUtils { - public static JBossServerBehavior getServerBehavior(ILaunchConfiguration configuration) throws CoreException { + public static DelegatingServerBehavior getServerBehavior(ILaunchConfiguration configuration) throws CoreException { IServer server = ServerUtil.getServer(configuration); - return (JBossServerBehavior) server.getAdapter(JBossServerBehavior.class); + return (DelegatingServerBehavior) server.getAdapter(DelegatingServerBehavior.class); } public static JBoss7ServerBehavior getJBoss7ServerBehavior(ILaunchConfiguration configuration) throws CoreException { Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/PollThreadUtils.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/PollThreadUtils.java 2011-07-06 14:03:29 UTC (rev 32649) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/PollThreadUtils.java 2011-07-06 14:07:39 UTC (rev 32650) @@ -14,7 +14,7 @@ import org.jboss.ide.eclipse.as.core.ExtensionManager; import org.jboss.ide.eclipse.as.core.server.IServerStatePoller; 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.DelegatingServerBehavior; import org.jboss.ide.eclipse.as.core.server.internal.PollThread; import org.jboss.ide.eclipse.as.core.server.internal.ServerAttributeHelper; import org.jboss.ide.eclipse.as.core.server.internal.ServerStatePollerType; @@ -66,13 +66,13 @@ } } - protected void pollServer(final boolean expectedState, PollThread pollThread, JBossServerBehavior behaviour, IServer server) { + protected void pollServer(final boolean expectedState, PollThread pollThread, DelegatingServerBehavior behaviour, IServer server) { IServerStatePoller poller = PollThreadUtils.getPoller(expectedState, server); pollServer(expectedState, poller, pollThread, behaviour); } - public static PollThread pollServer(boolean expectedState, IServerStatePoller poller, PollThread pollThread, JBossServerBehavior behaviour) { + public static PollThread pollServer(boolean expectedState, IServerStatePoller poller, PollThread pollThread, DelegatingServerBehavior behaviour) { stopPolling(pollThread); PollThread newPollThread = new PollThread(expectedState, poller, behaviour); newPollThread.start(); 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 14:03:29 UTC (rev 32649) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerConverter.java 2011-07-06 14:07:39 UTC (rev 32650) @@ -27,7 +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.DelegatingServerBehavior; import org.jboss.ide.eclipse.as.core.server.internal.v7.JBoss7ServerBehavior; /** @@ -128,11 +128,11 @@ return (JBoss7ServerBehavior) server.loadAdapter( JBoss7ServerBehavior.class, new NullProgressMonitor()); } - public static JBossServerBehavior getJBossServerBehavior(IServer server) { + public static DelegatingServerBehavior getJBossServerBehavior(IServer server) { if (server == null) return null; - return (JBossServerBehavior) server.loadAdapter( - JBossServerBehavior.class, new NullProgressMonitor()); + return (DelegatingServerBehavior) server.loadAdapter( + DelegatingServerBehavior.class, new NullProgressMonitor()); } /** Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerUtil.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerUtil.java 2011-07-06 14:03:29 UTC (rev 32649) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerUtil.java 2011-07-06 14:07:39 UTC (rev 32650) @@ -27,8 +27,8 @@ import org.jboss.ide.eclipse.as.core.Messages; import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime; 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.JBossServerBehavior.JBossBehaviourDelegate; +import org.jboss.ide.eclipse.as.core.server.internal.DelegatingServerBehavior; +import org.jboss.ide.eclipse.as.core.server.internal.DelegatingServerBehavior.JBossBehaviourDelegate; public class ServerUtil { public static IPath getServerStateLocation(IServer server) { @@ -58,7 +58,7 @@ } public static JBossBehaviourDelegate checkedGetBehaviorDelegate(IServer server) throws CoreException { - JBossBehaviourDelegate delegate = checkedGetServerAdapter(server, JBossServerBehavior.class).getDelegate(); + JBossBehaviourDelegate delegate = checkedGetServerAdapter(server, DelegatingServerBehavior.class).getDelegate(); if (delegate == null) { throw new CoreException( new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml 2011-07-06 14:03:29 UTC (rev 32649) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml 2011-07-06 14:07:39 UTC (rev 32650) @@ -11,7 +11,7 @@ <extension point="org.eclipse.wst.server.core.serverTypes"> <serverType - behaviourClass="org.jboss.ide.eclipse.as.core.server.internal.JBossServerBehavior" + behaviourClass="org.jboss.ide.eclipse.as.core.server.internal.DelegatingServerBehavior" class="org.jboss.ide.eclipse.as.core.server.internal.JBossServer" description="%jboss.version.32.description" hasConfiguration="false" @@ -28,7 +28,7 @@ supportsRemoteHosts="true"/> <serverType - behaviourClass="org.jboss.ide.eclipse.as.core.server.internal.JBossServerBehavior" + behaviourClass="org.jboss.ide.eclipse.as.core.server.internal.DelegatingServerBehavior" class="org.jboss.ide.eclipse.as.core.server.internal.JBossServer" description="%jboss.version.40.description" hasConfiguration="false" @@ -45,7 +45,7 @@ supportsRemoteHosts="true"/> <serverType - behaviourClass="org.jboss.ide.eclipse.as.core.server.internal.JBossServerBehavior" + behaviourClass="org.jboss.ide.eclipse.as.core.server.internal.DelegatingServerBehavior" class="org.jboss.ide.eclipse.as.core.server.internal.JBossServer" description="%jboss.version.42.description" hasConfiguration="false" @@ -62,7 +62,7 @@ supportsRemoteHosts="true"/> <serverType - behaviourClass="org.jboss.ide.eclipse.as.core.server.internal.JBossServerBehavior" + behaviourClass="org.jboss.ide.eclipse.as.core.server.internal.DelegatingServerBehavior" class="org.jboss.ide.eclipse.as.core.server.internal.JBossServer" description="%jboss.version.50.description" hasConfiguration="false" @@ -79,7 +79,7 @@ supportsRemoteHosts="true"/> <serverType - behaviourClass="org.jboss.ide.eclipse.as.core.server.internal.JBossServerBehavior" + behaviourClass="org.jboss.ide.eclipse.as.core.server.internal.DelegatingServerBehavior" class="org.jboss.ide.eclipse.as.core.server.internal.JBossServer" description="%jboss.version.51.description" hasConfiguration="false" @@ -96,7 +96,7 @@ supportsRemoteHosts="true"/> <serverType - behaviourClass="org.jboss.ide.eclipse.as.core.server.internal.JBossServerBehavior" + behaviourClass="org.jboss.ide.eclipse.as.core.server.internal.DelegatingServerBehavior" class="org.jboss.ide.eclipse.as.core.server.internal.JBoss6Server" description="%jboss.version.60.description" hasConfiguration="false" @@ -130,7 +130,7 @@ supportsRemoteHosts="true"/> <serverType - behaviourClass="org.jboss.ide.eclipse.as.core.server.internal.JBossServerBehavior" + behaviourClass="org.jboss.ide.eclipse.as.core.server.internal.DelegatingServerBehavior" class="org.jboss.ide.eclipse.as.core.server.internal.JBossServer" description="%jboss.eap.version.43.description" hasConfiguration="false" @@ -147,7 +147,7 @@ supportsRemoteHosts="true"/> <serverType - behaviourClass="org.jboss.ide.eclipse.as.core.server.internal.JBossServerBehavior" + behaviourClass="org.jboss.ide.eclipse.as.core.server.internal.DelegatingServerBehavior" class="org.jboss.ide.eclipse.as.core.server.internal.JBossServer" description="%jboss.eap.version.50.description" hasConfiguration="false" Added: 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 (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/AbstractRSEBehaviourDelegate.java 2011-07-06 14:07:39 UTC (rev 32650) @@ -0,0 +1,83 @@ +/******************************************************************************* + * Copyright (c) 2011 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + * + * TODO: Logging and Progress Monitors + ******************************************************************************/ +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.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.server.internal.PollThread; +import org.jboss.ide.eclipse.as.core.util.LaunchCommandPreferences; +import org.jboss.ide.eclipse.as.core.util.PollThreadUtils; +import org.jboss.ide.eclipse.as.core.util.ServerUtil; +import org.jboss.ide.eclipse.as.rse.core.RSEHostShellModel.ServerShellModel; + +public abstract class AbstractRSEBehaviourDelegate extends AbstractJBossBehaviourDelegate { + private PollThread pollThread = null; + public String getBehaviourTypeId() { + return RSEPublishMethod.RSE_ID; + } + + @Override + public void stop(boolean force) { + if( force ) { + forceStop(); + } + + if( LaunchCommandPreferences.isIgnoreLaunchCommand(getServer())) { + setServerStopping(); + serverStopped(); + return; + } + + setServerStopping(); + if (!gracefullStop().isOK()) { + serverStarted(); + } else { + serverStopped(); + } + } + + @Override + protected abstract void forceStop(); + + @Override + protected abstract IStatus gracefullStop(); + + public void setServerStarting() { + pollServer(IServerStatePoller.SERVER_UP); + } + + public void serverStarted() { + getActualBehavior().setServerStarted(); + } + + public void setServerStopping() { + getActualBehavior().setServerStopping(); + pollServer(IServerStatePoller.SERVER_DOWN); + } + + public void serverStopped() { + getActualBehavior().setServerStopped(); + } + + protected void pollServer(final boolean expectedState) { + IServerStatePoller poller = PollThreadUtils.getPoller(expectedState, getServer()); + this.pollThread = PollThreadUtils.pollServer(expectedState, poller, pollThread, getActualBehavior()); } +} Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/AbstractRSEBehaviourDelegate.java ___________________________________________________________________ Added: svn:mime-type + text/plain 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-06 14:03:29 UTC (rev 32649) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEBehaviourDelegate.java 2011-07-06 14:07:39 UTC (rev 32650) @@ -64,7 +64,7 @@ protected IStatus gracefullStop() { try { ILaunchConfiguration config = getServer().getLaunchConfiguration(false, new NullProgressMonitor()); - //JBossServerBehavior serverBehavior = ServerUtil.checkedGetServerAdapter(getServer(), JBossServerBehavior.class); + //DelegatingServerBehavior serverBehavior = ServerUtil.checkedGetServerAdapter(getServer(), DelegatingServerBehavior.class); //String defaultCmd = serverBehavior.getDefaultArguments(); String defaultCmd = ServerUtil.checkedGetBehaviorDelegate(getServer()).getDefaultStopArguments(); String shutdownCommand = config == null ? defaultCmd : Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSECorePlugin.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSECorePlugin.java 2011-07-06 14:03:29 UTC (rev 32649) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSECorePlugin.java 2011-07-06 14:07:39 UTC (rev 32650) @@ -12,7 +12,7 @@ ******************************************************************************/ package org.jboss.ide.eclipse.as.rse.core; -import org.jboss.ide.eclipse.as.core.server.internal.JBossServerBehavior; +import org.jboss.ide.eclipse.as.core.server.internal.DelegatingServerBehavior; import org.jboss.ide.eclipse.as.core.server.internal.launch.JBossServerStartupLaunchConfiguration; import org.osgi.framework.BundleActivator; import org.osgi.framework.BundleContext; @@ -32,7 +32,7 @@ */ public void start(BundleContext bundleContext) throws Exception { RSECorePlugin.context = bundleContext; - JBossServerBehavior.addDelegateMapping(RSEPublishMethod.RSE_ID, RSEBehaviourDelegate.class); + DelegatingServerBehavior.addDelegateMapping(RSEPublishMethod.RSE_ID, RSEBehaviourDelegate.class); JBossServerStartupLaunchConfiguration.addLaunchDelegateMapping(RSEPublishMethod.RSE_ID, new RSELaunchDelegate()); JBossServerStartupLaunchConfiguration.addSetupLaunchParticipant(new RSELaunchDelegate()); } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEHostShellModel.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEHostShellModel.java 2011-07-06 14:03:29 UTC (rev 32649) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEHostShellModel.java 2011-07-06 14:07:39 UTC (rev 32650) @@ -32,7 +32,7 @@ import org.eclipse.rse.subsystems.shells.core.subsystems.servicesubsystem.IShellServiceSubSystem; import org.eclipse.wst.server.core.IServer; import org.eclipse.wst.server.core.ServerCore; -import org.jboss.ide.eclipse.as.core.server.internal.JBossServerBehavior; +import org.jboss.ide.eclipse.as.core.server.internal.DelegatingServerBehavior; import org.jboss.ide.eclipse.as.rse.core.xpl.ConnectAllSubsystemsUtil; public class RSEHostShellModel { @@ -172,7 +172,7 @@ } } - public static IShellService findShellService(JBossServerBehavior behaviour) throws CoreException { + public static IShellService findShellService(DelegatingServerBehavior behaviour) throws CoreException { return findShellService(behaviour.getServer()); } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSELaunchDelegate.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSELaunchDelegate.java 2011-07-06 14:03:29 UTC (rev 32649) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSELaunchDelegate.java 2011-07-06 14:07:39 UTC (rev 32650) @@ -35,8 +35,8 @@ import org.jboss.ide.eclipse.as.core.extensions.polling.WebPortPoller; 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.JBossServerBehavior.JBossBehaviourDelegate; +import org.jboss.ide.eclipse.as.core.server.internal.DelegatingServerBehavior; +import org.jboss.ide.eclipse.as.core.server.internal.DelegatingServerBehavior.JBossBehaviourDelegate; import org.jboss.ide.eclipse.as.core.server.internal.launch.JBossServerStartupLaunchConfiguration; import org.jboss.ide.eclipse.as.core.server.internal.launch.JBossServerStartupLaunchConfiguration.IStartLaunchSetupParticipant; import org.jboss.ide.eclipse.as.core.server.internal.launch.JBossServerStartupLaunchConfiguration.StartLaunchDelegate; @@ -56,7 +56,7 @@ JBossServerStartupLaunchConfiguration launchConfig, ILaunchConfiguration configuration, String mode, ILaunch launch, IProgressMonitor monitor) throws CoreException { - JBossServerBehavior beh = JBossServerBehaviorUtils.getServerBehavior(configuration); + DelegatingServerBehavior beh = JBossServerBehaviorUtils.getServerBehavior(configuration); beh.setServerStarting(); if (LaunchCommandPreferences.isIgnoreLaunchCommand(beh.getServer())) { beh.setServerStarted(); @@ -110,7 +110,7 @@ * @param behaviour */ @Deprecated - public static void launchStopServerCommand(JBossServerBehavior behaviour) { + public static void launchStopServerCommand(DelegatingServerBehavior behaviour) { if (LaunchCommandPreferences.isIgnoreLaunchCommand(behaviour.getServer())) { behaviour.setServerStopping(); behaviour.setServerStopped(); @@ -148,7 +148,7 @@ public boolean preLaunchCheck(ILaunchConfiguration configuration, String mode, IProgressMonitor monitor) throws CoreException { // ping if up - final JBossServerBehavior beh = JBossServerBehaviorUtils.getServerBehavior(configuration); + final DelegatingServerBehavior beh = JBossServerBehaviorUtils.getServerBehavior(configuration); boolean started = WebPortPoller.onePing(beh.getServer()); if (started) { beh.setServerStarting(); Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEPublishMethod.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEPublishMethod.java 2011-07-06 14:03:29 UTC (rev 32649) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEPublishMethod.java 2011-07-06 14:07:39 UTC (rev 32650) @@ -32,7 +32,7 @@ import org.jboss.ide.eclipse.as.core.server.IJBoss6Server; 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.DelegatingServerBehavior; import org.jboss.ide.eclipse.as.core.server.xpl.PublishCopyUtil.IPublishCopyCallbackHandler; import org.jboss.ide.eclipse.as.core.util.IJBossRuntimeResourceConstants; import org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants; @@ -60,7 +60,7 @@ loadRemoteDeploymentDetails(); ensureConnection(monitor); - JBossServerBehavior b = (JBossServerBehavior) behaviour.getServer().loadAdapter(JBossServerBehavior.class, new NullProgressMonitor()); + DelegatingServerBehavior b = (DelegatingServerBehavior) behaviour.getServer().loadAdapter(DelegatingServerBehavior.class, new NullProgressMonitor()); if( b != null && getServer().getServerState() == IServer.STATE_STARTED ) { stopDeploymentScanner(); } @@ -69,7 +69,7 @@ public int publishFinish(DeployableServerBehavior behaviour, IProgressMonitor monitor) throws CoreException { - JBossServerBehavior b = (JBossServerBehavior) behaviour.getServer().loadAdapter(JBossServerBehavior.class, new NullProgressMonitor()); + DelegatingServerBehavior b = (DelegatingServerBehavior) behaviour.getServer().loadAdapter(DelegatingServerBehavior.class, new NullProgressMonitor()); if( b != null && getServer().getServerState() == IServer.STATE_STARTED ) { startDeploymentScanner(); } @@ -79,13 +79,13 @@ protected void startDeploymentScanner() { String cmd = getDeploymentScannerCommand(new NullProgressMonitor(), true); if( cmd != null ) - launchCommandNoResult((JBossServerBehavior)behaviour, 3000, cmd); + launchCommandNoResult((DelegatingServerBehavior)behaviour, 3000, cmd); } protected void stopDeploymentScanner() { String cmd = getDeploymentScannerCommand(new NullProgressMonitor(), false); if( cmd != null ) - launchCommandNoResult((JBossServerBehavior)behaviour, 3000, cmd); + launchCommandNoResult((DelegatingServerBehavior)behaviour, 3000, cmd); } protected String getDeploymentScannerCommand(IProgressMonitor monitor, boolean start) { @@ -193,7 +193,7 @@ return getRemoteRootFolder().toString(); } - private void launchCommandNoResult(JBossServerBehavior behaviour, int delay, String command) { + private void launchCommandNoResult(DelegatingServerBehavior behaviour, int delay, String command) { try { ServerShellModel model = RSEHostShellModel.getInstance().getModel(behaviour.getServer()); model.executeRemoteCommand("/", command, new String[]{}, new NullProgressMonitor(), delay, true); Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/server/MockTests.java =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/server/MockTests.java 2011-07-06 14:03:29 UTC (rev 32649) +++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/server/MockTests.java 2011-07-06 14:07:39 UTC (rev 32650) @@ -21,7 +21,7 @@ import org.eclipse.wst.server.core.IServer; import org.eclipse.wst.server.core.IServerWorkingCopy; import org.jboss.ide.eclipse.as.core.extensions.polling.ProcessTerminatedPoller.IProcessProvider; -import org.jboss.ide.eclipse.as.core.server.internal.JBossServerBehavior; +import org.jboss.ide.eclipse.as.core.server.internal.DelegatingServerBehavior; import org.jboss.ide.eclipse.as.core.server.internal.LocalJBossServerRuntime; import org.jboss.ide.eclipse.as.core.server.internal.ServerAttributeHelper; import org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants; @@ -99,7 +99,7 @@ } catch( CoreException ce) {} int loops = 0; - JBossServerBehavior behavior = (JBossServerBehavior)server.loadAdapter(JBossServerBehavior.class, null); + DelegatingServerBehavior behavior = (DelegatingServerBehavior)server.loadAdapter(DelegatingServerBehavior.class, null); while(loops < 50) { if( ((IProcessProvider)behavior.getDelegate()).getProcess() != null ) { Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/util/ServerRuntimeUtils.java =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/util/ServerRuntimeUtils.java 2011-07-06 14:03:29 UTC (rev 32649) +++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/util/ServerRuntimeUtils.java 2011-07-06 14:07:39 UTC (rev 32650) @@ -44,7 +44,7 @@ import org.jboss.ide.eclipse.as.core.extensions.polling.ProcessTerminatedPoller.IProcessProvider; import org.jboss.ide.eclipse.as.core.server.IDeployableServer; import org.jboss.ide.eclipse.as.core.server.internal.DeployableServer; -import org.jboss.ide.eclipse.as.core.server.internal.JBossServerBehavior; +import org.jboss.ide.eclipse.as.core.server.internal.DelegatingServerBehavior; import org.jboss.ide.eclipse.as.core.server.internal.ServerAttributeHelper; import org.jboss.ide.eclipse.as.core.util.FileUtil; import org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants; @@ -421,8 +421,8 @@ protected static IStreamMonitor getStreamMonitor(IServer server) { - JBossServerBehavior behavior = - (JBossServerBehavior)server.loadAdapter(JBossServerBehavior.class, null); + DelegatingServerBehavior behavior = + (DelegatingServerBehavior)server.loadAdapter(DelegatingServerBehavior.class, null); if( behavior != null ) { if( ((IProcessProvider)behavior.getDelegate()).getProcess() != null ) { return ((IProcessProvider)behavior.getDelegate()).getProcess().getStreamsProxy().getOutputStreamMonitor();