[jbosstools-commits] JBoss Tools SVN: r24683 - in branches/jbosstools-3.2.0.M2/as/plugins: org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch and 1 other directories.

Author: rob.stryker(a)jboss.com Date: 2010-09-03 02:27:36 -0400 (Fri, 03 Sep 2010) New Revision: 24683 Modified: branches/jbosstools-3.2.0.M2/as/plugins/org.jboss.ide.eclipse.archives.webtools/META-INF/MANIFEST.MF branches/jbosstools-3.2.0.M2/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/JBossServerStartupLaunchConfiguration.java branches/jbosstools-3.2.0.M2/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEBehaviourDelegate.java Log: JBIDE-6963 - remote start unsupported, should succeed but log warning Modified: branches/jbosstools-3.2.0.M2/as/plugins/org.jboss.ide.eclipse.archives.webtools/META-INF/MANIFEST.MF =================================================================== --- branches/jbosstools-3.2.0.M2/as/plugins/org.jboss.ide.eclipse.archives.webtools/META-INF/MANIFEST.MF 2010-09-03 04:15:56 UTC (rev 24682) +++ branches/jbosstools-3.2.0.M2/as/plugins/org.jboss.ide.eclipse.archives.webtools/META-INF/MANIFEST.MF 2010-09-03 06:27:36 UTC (rev 24683) @@ -30,8 +30,7 @@ org.eclipse.emf.ecore;bundle-version="2.5.0" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Export-Package: org.jboss.ide.eclipse.archives, - org.jboss.ide.eclipse.archives.webtools, +Export-Package: org.jboss.ide.eclipse.archives.webtools, org.jboss.ide.eclipse.archives.webtools.archivetypes, org.jboss.ide.eclipse.archives.webtools.filesets, org.jboss.ide.eclipse.archives.webtools.filesets.vcf, Modified: branches/jbosstools-3.2.0.M2/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/JBossServerStartupLaunchConfiguration.java =================================================================== --- branches/jbosstools-3.2.0.M2/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/JBossServerStartupLaunchConfiguration.java 2010-09-03 04:15:56 UTC (rev 24682) +++ branches/jbosstools-3.2.0.M2/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/JBossServerStartupLaunchConfiguration.java 2010-09-03 06:27:36 UTC (rev 24683) @@ -12,14 +12,17 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Status; import org.eclipse.debug.core.ILaunch; 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.JBossServerCorePlugin; import org.jboss.ide.eclipse.as.core.publishers.LocalPublishMethod; import org.jboss.ide.eclipse.as.core.server.IJBossServerPublishMethodType; import org.jboss.ide.eclipse.as.core.server.internal.DeployableServerBehavior; -import org.jboss.ide.eclipse.as.core.util.DeploymentPreferenceLoader; +import org.jboss.ide.eclipse.as.core.server.internal.JBossServerBehavior; import org.jboss.ide.eclipse.as.core.util.ServerConverter; public class JBossServerStartupLaunchConfiguration extends AbstractJBossLaunchConfigType { @@ -45,9 +48,39 @@ IJBossServerPublishMethodType type = beh.createPublishMethod().getPublishMethodType(); if( type.getId().equals(LocalPublishMethod.LOCAL_PUBLISH_METHOD)) { del = new LocalJBossServerStartupLaunchUtil(); + } else { + del = new NullLaunchDelegate(); } return del; } + + protected static class NullLaunchDelegate implements StartLaunchDelegate { + + public void actualLaunch( + JBossServerStartupLaunchConfiguration launchConfig, + ILaunchConfiguration configuration, String mode, + ILaunch launch, IProgressMonitor monitor) throws CoreException { + JBossServerBehavior beh = LocalJBossServerStartupLaunchUtil.getServerBehavior(configuration); + beh.setServerStarted(); + IStatus warn = new Status(IStatus.WARNING, JBossServerCorePlugin.PLUGIN_ID, "Starting and stopping of remote servers is not yet supported"); //$NON-NLS-1$ + JBossServerCorePlugin.getDefault().getLog().log(warn); + } + + public boolean preLaunchCheck(ILaunchConfiguration configuration, + String mode, IProgressMonitor monitor) throws CoreException { + return true; + } + + public void preLaunch(ILaunchConfiguration configuration, String mode, + ILaunch launch, IProgressMonitor monitor) throws CoreException { + } + + public void postLaunch(ILaunchConfiguration configuration, String mode, + ILaunch launch, IProgressMonitor monitor) throws CoreException { + } + + } + public void actualLaunch(ILaunchConfiguration configuration, String mode, ILaunch launch, IProgressMonitor monitor) throws CoreException { getDelegate(configuration).actualLaunch(this, configuration, mode, launch, monitor); Modified: branches/jbosstools-3.2.0.M2/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEBehaviourDelegate.java =================================================================== --- branches/jbosstools-3.2.0.M2/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEBehaviourDelegate.java 2010-09-03 04:15:56 UTC (rev 24682) +++ branches/jbosstools-3.2.0.M2/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEBehaviourDelegate.java 2010-09-03 06:27:36 UTC (rev 24683) @@ -9,8 +9,7 @@ @Override public void stop(boolean force) { - // TODO Auto-generated method stub - + getActualBehavior().setServerStopped(); } @Override