Author: adietish Date: 2011-07-08 08:31:20 -0400 (Fri, 08 Jul 2011) New Revision: 32755 Added: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7StartLaunchDelegate.java Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerStartupLaunchConfiguration.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7StartLaunchConfiguration.java Log: [JBIDE-9215] renamed LocalJBoss7StartLaunchConfiguration to LocalJBoss7StartLaunchDelegate and kept the original class while deprecating it (in order to have a consistent name scheme among delegates) Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerStartupLaunchConfiguration.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerStartupLaunchConfiguration.java 2011-07-08 11:09:24 UTC (rev 32754) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerStartupLaunchConfiguration.java 2011-07-08 12:31:20 UTC (rev 32755) @@ -38,7 +38,7 @@ setupParticipants = new ArrayList<IStartLaunchSetupParticipant>(); setupParticipants.add(new LocalJBossStartLaunchDelegate()); launchDelegates = new HashMap<String, IStartLaunchDelegate>(); - launchDelegates.put(LocalPublishMethod.LOCAL_PUBLISH_METHOD, new LocalJBoss7StartLaunchConfiguration()); + launchDelegates.put(LocalPublishMethod.LOCAL_PUBLISH_METHOD, new LocalJBoss7StartLaunchDelegate()); } public static void addLaunchDelegateMapping(String mode, IStartLaunchDelegate del) { @@ -66,7 +66,7 @@ // return launchDelegates.get(type.getId()); // always return local launch delegate until all parts were implemented - return new LocalJBoss7StartLaunchConfiguration(); + return new LocalJBoss7StartLaunchDelegate(); } 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-08 11:09:24 UTC (rev 32754) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7StartLaunchConfiguration.java 2011-07-08 12:31:20 UTC (rev 32755) @@ -25,6 +25,8 @@ import org.jboss.ide.eclipse.as.core.util.LaunchCommandPreferences; /** + * @deprecated replaced by {@link LocalJBoss7StartLaunchDelegate} + * * @author Rob Stryker */ public class LocalJBoss7StartLaunchConfiguration extends LocalJBossStartLaunchDelegate Copied: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7StartLaunchDelegate.java (from rev 32754, 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/LocalJBoss7StartLaunchDelegate.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7StartLaunchDelegate.java 2011-07-08 12:31:20 UTC (rev 32755) @@ -0,0 +1,80 @@ +/******************************************************************************* + * 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.v7; + +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.debug.core.ILaunch; +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.DelegatingServerBehavior; +import org.jboss.ide.eclipse.as.core.server.internal.LocalJBossBehaviorDelegate; +import org.jboss.ide.eclipse.as.core.server.internal.launch.IStartLaunchDelegate; +import org.jboss.ide.eclipse.as.core.server.internal.launch.IStartLaunchSetupParticipant; +import org.jboss.ide.eclipse.as.core.server.internal.launch.LocalJBossStartLaunchDelegate; +import org.jboss.ide.eclipse.as.core.util.JBossServerBehaviorUtils; +import org.jboss.ide.eclipse.as.core.util.LaunchCommandPreferences; + +/** + * @author Rob Stryker + */ +public class LocalJBoss7StartLaunchDelegate extends LocalJBossStartLaunchDelegate + implements IStartLaunchDelegate, IStartLaunchSetupParticipant { + + public String[] getJavaLibraryPath(ILaunchConfiguration configuration) throws CoreException { + return new String[] {}; + } + + public boolean preLaunchCheck(ILaunchConfiguration configuration, String mode, IProgressMonitor monitor) + throws CoreException { + DelegatingServerBehavior jbsBehavior = JBossServerBehaviorUtils.getServerBehavior(configuration); + if( LaunchCommandPreferences.isIgnoreLaunchCommand(jbsBehavior.getServer())) { + jbsBehavior.setServerStarting(); + jbsBehavior.setServerStarted(); + return false; + } + // TODO: use the configured poller + boolean started = WebPortPoller.onePing(jbsBehavior.getServer()); + if( started ) { + jbsBehavior.setServerStarting(); + jbsBehavior.setServerStarted(); + return false; + } + return true; + } + + public void preLaunch(ILaunchConfiguration configuration, String mode, ILaunch launch, IProgressMonitor monitor) + throws CoreException { + try { + DelegatingServerBehavior jbsBehavior = JBossServerBehaviorUtils.getServerBehavior(configuration); + jbsBehavior.setRunMode(mode); + jbsBehavior.setServerStarting(); + } catch (CoreException ce) { + // report it + } + } + + public void postLaunch(ILaunchConfiguration configuration, String mode, ILaunch launch, IProgressMonitor monitor) + throws CoreException { + try { + JBoss7ServerBehavior behavior = JBossServerBehaviorUtils.getJBoss7ServerBehavior(configuration); + IProcess[] processes = launch.getProcesses(); + if (processes != null && processes.length >= 1) { + behavior.setProcess(processes[0]); + ((LocalJBossBehaviorDelegate) (behavior.getDelegate())).setProcess(processes[0]); + } + behavior.setRunMode(mode); + } catch (CoreException ce) { + // report it + } + } +} Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7StartLaunchDelegate.java ___________________________________________________________________ Added: svn:mime-type + text/plain