Author: adietish Date: 2011-07-07 08:15:47 -0400 (Thu, 07 Jul 2011) New Revision: 32696 Added: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/AbstractJBossStartLaunchConfiguration.java 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/DelegatingStartLaunchConfiguration.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/JBossServerStartupLaunchConfiguration.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/util/JBoss7RuntimeClasspathUtil.java Log: [JBIDE-9215] renamed AbstractJBossLaunchConfigType to AbstractJBossLaunchConfiguration (while keeping and deprecating AbstractJBossLaunchConfigType) 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-07 12:10:51 UTC (rev 32695) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/AbstractJBossLaunchConfigType.java 2011-07-07 12:15:47 UTC (rev 32696) @@ -45,6 +45,7 @@ /** * @author Rob Stryker */ +@Deprecated public abstract class AbstractJBossLaunchConfigType extends AbstractJavaLaunchConfigurationDelegate { // we have no need to do anything in pre-launch check Copied: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/AbstractJBossStartLaunchConfiguration.java (from rev 32689, 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/AbstractJBossStartLaunchConfiguration.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/AbstractJBossStartLaunchConfiguration.java 2011-07-07 12:15:47 UTC (rev 32696) @@ -0,0 +1,127 @@ +/******************************************************************************* + * Copyright (c) 2007 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.launch; + +import java.io.File; +import java.util.Map; + +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.debug.core.ILaunchManager; +import org.eclipse.jdt.launching.AbstractJavaLaunchConfigurationDelegate; +import org.eclipse.jdt.launching.ExecutionArguments; +import org.eclipse.jdt.launching.IVMInstall; +import org.eclipse.jdt.launching.IVMRunner; +import org.eclipse.jdt.launching.VMRunnerConfiguration; +import org.eclipse.jst.server.core.ServerProfilerDelegate; +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.internal.DelegatingServerBehavior; + +/** + * @author Rob Stryker + */ +public abstract class AbstractJBossStartLaunchConfiguration extends AbstractJavaLaunchConfigurationDelegate { + + // we have no need to do anything in pre-launch check + @Override + 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 { + // override me + } + + public void postLaunch(ILaunchConfiguration configuration, + String mode, ILaunch launch, IProgressMonitor monitor) throws CoreException { + // override me + } + + @Override + public void launch(ILaunchConfiguration configuration, String mode, + ILaunch launch, IProgressMonitor monitor) throws CoreException { + 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! + IVMInstall vm = verifyVMInstall(configuration); + IVMRunner runner = vm.getVMRunner(mode); + + if (runner == null && ILaunchManager.PROFILE_MODE.equals(mode)) { + runner = vm.getVMRunner(ILaunchManager.RUN_MODE); + } + if (runner == null) { + throw new CoreException(new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, 0, + Messages.runModeNotSupported, null)); + } + + File workingDir = verifyWorkingDirectory(configuration); + String workingDirName = null; + if (workingDir != null) + workingDirName = workingDir.getAbsolutePath(); + + // Program & VM args + String pgmArgs = getProgramArguments(configuration); + String vmArgs = getVMArguments(configuration); + ExecutionArguments execArgs = new ExecutionArguments(vmArgs, pgmArgs); + + // VM-specific attributes + Map<?, ?> vmAttributesMap = getVMSpecificAttributesMap(configuration); + + // Classpath + String[] classpath = getClasspath(configuration); + + // Environment + String[] environment = getEnvironment(configuration); + + // Create VM config + String mainType = getMainTypeName(configuration); + VMRunnerConfiguration runConfig = new VMRunnerConfiguration(mainType, classpath); + runConfig.setProgramArguments(execArgs.getProgramArgumentsArray()); + runConfig.setVMArguments(execArgs.getVMArgumentsArray()); + runConfig.setWorkingDirectory(workingDirName); + runConfig.setVMSpecificAttributesMap(vmAttributesMap); + runConfig.setEnvironment(environment); + + // Bootpath + String[] bootpath = getBootpath(configuration); + if (bootpath != null && bootpath.length > 0) + runConfig.setBootClassPath(bootpath); + + setDefaultSourceLocator(launch, configuration); + + if (ILaunchManager.PROFILE_MODE.equals(mode)) { + try { + ServerProfilerDelegate.configureProfiling(launch, vm, runConfig, monitor); + } catch (CoreException ce) { + IServer server = org.eclipse.wst.server.core.ServerUtil.getServer(configuration); + DelegatingServerBehavior jbsb = (DelegatingServerBehavior) server.getAdapter(DelegatingServerBehavior.class); + jbsb.stop(true); + // genericServer.stopImpl(); + throw ce; + } + } + // Launch the configuration + runner.run(runConfig, launch, monitor); + } +} Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/DelegatingStartLaunchConfiguration.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/DelegatingStartLaunchConfiguration.java 2011-07-07 12:10:51 UTC (rev 32695) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/DelegatingStartLaunchConfiguration.java 2011-07-07 12:15:47 UTC (rev 32696) @@ -26,7 +26,7 @@ import org.jboss.ide.eclipse.as.core.server.internal.DeployableServerBehavior; import org.jboss.ide.eclipse.as.core.util.ServerConverter; -public class DelegatingStartLaunchConfiguration extends AbstractJBossLaunchConfigType { +public class DelegatingStartLaunchConfiguration extends AbstractJBossStartLaunchConfiguration { public static interface IStartLaunchSetupParticipant { public void setupLaunchConfiguration(ILaunchConfigurationWorkingCopy workingCopy, IServer server) throws CoreException; Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/JBossServerStartupLaunchConfiguration.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/JBossServerStartupLaunchConfiguration.java 2011-07-07 12:10:51 UTC (rev 32695) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/JBossServerStartupLaunchConfiguration.java 2011-07-07 12:15:47 UTC (rev 32696) @@ -36,7 +36,7 @@ import org.jboss.ide.eclipse.as.core.util.ServerConverter; @Deprecated -public class JBossServerStartupLaunchConfiguration extends AbstractJBossLaunchConfigType { +public class JBossServerStartupLaunchConfiguration extends AbstractJBossStartLaunchConfiguration { public static interface StartLaunchDelegate { public void actualLaunch(JBossServerStartupLaunchConfiguration launchConfig, ILaunchConfiguration configuration, 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-07 12:10:51 UTC (rev 32695) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/LocalJBossStartLaunchDelegate.java 2011-07-07 12:15:47 UTC (rev 32696) @@ -39,7 +39,7 @@ * @author Rob Stryker * @author André Dietisheim */ -public class LocalJBossStartLaunchDelegate extends AbstractJBossLaunchConfigType implements IStartLaunchDelegate, IStartLaunchSetupParticipant { +public class LocalJBossStartLaunchDelegate extends AbstractJBossStartLaunchConfiguration implements IStartLaunchDelegate, IStartLaunchSetupParticipant { public void setupLaunchConfiguration( ILaunchConfigurationWorkingCopy workingCopy, IServer server) throws CoreException { 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-07 12:10:51 UTC (rev 32695) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/StopLaunchConfiguration.java 2011-07-07 12:15:47 UTC (rev 32696) @@ -48,7 +48,7 @@ @Deprecated -public class StopLaunchConfiguration extends AbstractJBossLaunchConfigType { +public class StopLaunchConfiguration extends AbstractJBossStartLaunchConfiguration { public static final String STOP_LAUNCH_TYPE = "org.jboss.ide.eclipse.as.core.server.stopLaunchConfiguration"; //$NON-NLS-1$ public static final String STOP_MAIN_TYPE = IJBossRuntimeConstants.SHUTDOWN_MAIN_TYPE; Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/JBoss7RuntimeClasspathUtil.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/JBoss7RuntimeClasspathUtil.java 2011-07-07 12:10:51 UTC (rev 32695) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/JBoss7RuntimeClasspathUtil.java 2011-07-07 12:15:47 UTC (rev 32696) @@ -20,6 +20,7 @@ import org.eclipse.jdt.launching.JavaRuntime; import org.eclipse.wst.server.core.IServer; import org.jboss.ide.eclipse.as.core.server.internal.launch.AbstractJBossLaunchConfigType; +import org.jboss.ide.eclipse.as.core.server.internal.launch.AbstractJBossStartLaunchConfiguration; public class JBoss7RuntimeClasspathUtil {