Author: rob.stryker(a)jboss.com Date: 2012-02-01 01:57:47 -0500 (Wed, 01 Feb 2012) New Revision: 38357 Added: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IJBossLaunchDelegate.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/ILaunchConfigConfigurator.java Removed: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/IJBossLaunchDelegate.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/ILaunchConfigConfigurator.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/TwiddleLaunchConfiguration.java Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/BehaviourModel.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/LocalJBossStartLaunchDelegate.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7StartLaunchDelegate.java trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/AbstractRSELaunchDelegate.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressLaunchDelegate.java Log: JBIDE-10769 - moving files around, launch interfaces this time, into public folder Copied: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IJBossLaunchDelegate.java (from rev 38327, trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/IJBossLaunchDelegate.java) =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IJBossLaunchDelegate.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IJBossLaunchDelegate.java 2012-02-01 06:57:47 UTC (rev 38357) @@ -0,0 +1,27 @@ +package org.jboss.ide.eclipse.as.core.server; + +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.ILaunchConfigurationWorkingCopy; +import org.eclipse.wst.server.core.IServer; +import org.jboss.ide.eclipse.as.core.server.internal.launch.DelegatingStartLaunchConfiguration; + +public interface IJBossLaunchDelegate { + public void actualLaunch(DelegatingStartLaunchConfiguration launchConfig, ILaunchConfiguration configuration, + String mode, ILaunch launch, IProgressMonitor monitor) throws CoreException; + + public boolean preLaunchCheck(ILaunchConfiguration configuration, String mode, IProgressMonitor monitor) + throws CoreException; + + 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 setupLaunchConfiguration(ILaunchConfigurationWorkingCopy workingCopy, IServer server) + throws CoreException; + +} Copied: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/ILaunchConfigConfigurator.java (from rev 38327, trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/ILaunchConfigConfigurator.java) =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/ILaunchConfigConfigurator.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/ILaunchConfigConfigurator.java 2012-02-01 06:57:47 UTC (rev 38357) @@ -0,0 +1,10 @@ +package org.jboss.ide.eclipse.as.core.server; + +import org.eclipse.core.runtime.CoreException; +import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy; + +public interface ILaunchConfigConfigurator { + + public abstract void configure(ILaunchConfigurationWorkingCopy launchConfig) throws CoreException; + +} \ No newline at end of file Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/BehaviourModel.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/BehaviourModel.java 2012-02-01 06:51:11 UTC (rev 38356) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/BehaviourModel.java 2012-02-01 06:57:47 UTC (rev 38357) @@ -12,9 +12,9 @@ import org.eclipse.wst.server.core.IServer; import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin; import org.jboss.ide.eclipse.as.core.server.IJBossBehaviourDelegate; +import org.jboss.ide.eclipse.as.core.server.IJBossLaunchDelegate; 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.IJBossLaunchDelegate; import org.jboss.ide.eclipse.as.core.util.DeploymentPreferenceLoader; public class BehaviourModel { 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 2012-02-01 06:51:11 UTC (rev 38356) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/DelegatingStartLaunchConfiguration.java 2012-02-01 06:57:47 UTC (rev 38357) @@ -24,6 +24,7 @@ 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.IJBossLaunchDelegate; import org.jboss.ide.eclipse.as.core.server.internal.BehaviourModel; import org.jboss.ide.eclipse.as.core.server.internal.DeployableServerBehavior; import org.jboss.ide.eclipse.as.core.util.DeploymentPreferenceLoader; Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/IJBossLaunchDelegate.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/IJBossLaunchDelegate.java 2012-02-01 06:51:11 UTC (rev 38356) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/IJBossLaunchDelegate.java 2012-02-01 06:57:47 UTC (rev 38357) @@ -1,26 +0,0 @@ -package org.jboss.ide.eclipse.as.core.server.internal.launch; - -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.ILaunchConfigurationWorkingCopy; -import org.eclipse.wst.server.core.IServer; - -public interface IJBossLaunchDelegate { - public void actualLaunch(DelegatingStartLaunchConfiguration launchConfig, ILaunchConfiguration configuration, - String mode, ILaunch launch, IProgressMonitor monitor) throws CoreException; - - public boolean preLaunchCheck(ILaunchConfiguration configuration, String mode, IProgressMonitor monitor) - throws CoreException; - - 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 setupLaunchConfiguration(ILaunchConfigurationWorkingCopy workingCopy, IServer server) - throws CoreException; - -} Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/ILaunchConfigConfigurator.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/ILaunchConfigConfigurator.java 2012-02-01 06:51:11 UTC (rev 38356) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/ILaunchConfigConfigurator.java 2012-02-01 06:57:47 UTC (rev 38357) @@ -1,10 +0,0 @@ -package org.jboss.ide.eclipse.as.core.server.internal.launch; - -import org.eclipse.core.runtime.CoreException; -import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy; - -public interface ILaunchConfigConfigurator { - - public abstract void configure(ILaunchConfigurationWorkingCopy launchConfig) throws CoreException; - -} \ No newline at end of file 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 2012-02-01 06:51:11 UTC (rev 38356) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/LocalJBossStartLaunchDelegate.java 2012-02-01 06:57:47 UTC (rev 38357) @@ -25,6 +25,7 @@ import org.eclipse.jdt.launching.StandardClasspathProvider; import org.eclipse.wst.server.core.IServer; import org.eclipse.wst.server.core.ServerCore; +import org.jboss.ide.eclipse.as.core.server.IJBossLaunchDelegate; import org.jboss.ide.eclipse.as.core.server.internal.AbstractLocalJBossServerRuntime; import org.jboss.ide.eclipse.as.core.server.internal.DelegatingServerBehavior; import org.jboss.ide.eclipse.as.core.server.internal.LocalJBossBehaviorDelegate; Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/TwiddleLaunchConfiguration.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/TwiddleLaunchConfiguration.java 2012-02-01 06:51:11 UTC (rev 38356) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/TwiddleLaunchConfiguration.java 2012-02-01 06:57:47 UTC (rev 38357) @@ -1,110 +0,0 @@ -/******************************************************************************* - * 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 static org.jboss.ide.eclipse.as.core.util.IJBossRuntimeConstants.RMIAdaptor; -import static org.jboss.ide.eclipse.as.core.util.IJBossRuntimeConstants.SHUTDOWN_ADAPTER_ARG; -import static org.jboss.ide.eclipse.as.core.util.IJBossRuntimeConstants.SHUTDOWN_PASS_ARG; -import static org.jboss.ide.eclipse.as.core.util.IJBossRuntimeConstants.SHUTDOWN_SERVER_ARG; -import static org.jboss.ide.eclipse.as.core.util.IJBossRuntimeConstants.SHUTDOWN_USER_ARG; -import static org.jboss.ide.eclipse.as.core.util.IJBossRuntimeConstants.SPACE; - -import java.io.File; -import java.util.ArrayList; -import java.util.List; - -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Path; -import org.eclipse.core.runtime.Status; -import org.eclipse.debug.core.DebugPlugin; -import org.eclipse.debug.core.ILaunchConfigurationType; -import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy; -import org.eclipse.debug.core.ILaunchManager; -import org.eclipse.jdt.launching.IRuntimeClasspathEntry; -import org.eclipse.osgi.util.NLS; -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.IJBossServerRuntime; -import org.jboss.ide.eclipse.as.core.server.internal.JBossServer; -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; -import org.jboss.ide.eclipse.as.core.util.LaunchConfigUtils; -import org.jboss.ide.eclipse.as.core.util.RuntimeUtils; -import org.jboss.ide.eclipse.as.core.util.ServerConverter; -import org.jboss.ide.eclipse.as.core.util.ServerUtil; - -public class TwiddleLaunchConfiguration { - - public static final String TWIDDLE_LAUNCH_TYPE = "org.jboss.ide.eclipse.as.core.server.twiddleConfiguration"; //$NON-NLS-1$ - - protected static final String TWIDDLE_JAR_LOC = - IJBossRuntimeResourceConstants.BIN + File.separator + IJBossRuntimeResourceConstants.TWIDDLE_JAR; - - public static ILaunchConfigurationWorkingCopy createLaunchConfiguration(IServer server, String args) throws CoreException { - JBossServer jbs = ServerConverter.checkedGetJBossServer(server); - String serverHome = ServerUtil.checkedGetServerHome(jbs); - IJBossServerRuntime jbrt = RuntimeUtils.checkedGetJBossServerRuntime(server); - - ILaunchManager launchManager = DebugPlugin.getDefault().getLaunchManager(); - ILaunchConfigurationType launchConfigType = launchManager.getLaunchConfigurationType(TWIDDLE_LAUNCH_TYPE); - - String launchName = TwiddleLaunchConfiguration.class.getName(); - launchName = launchManager.generateUniqueLaunchConfigurationNameFrom(launchName); - ILaunchConfigurationWorkingCopy wc = launchConfigType.newInstance(null, launchName); - new JBossLaunchConfigProperties().setProgramArguments(args, wc); - new JBossLaunchConfigProperties().setMainType(IJBossRuntimeConstants.TWIDDLE_MAIN_TYPE, wc); - new JBossLaunchConfigProperties().setWorkingDirectory(serverHome + Path.SEPARATOR + IJBossRuntimeResourceConstants.BIN, wc); - new JBossLaunchConfigProperties().setServerId(server.getId(), wc); - - ArrayList<IRuntimeClasspathEntry> classpath = new ArrayList<IRuntimeClasspathEntry>(); - LaunchConfigUtils.addCPEntry(TWIDDLE_JAR_LOC, serverHome, classpath); - // Twiddle requires more classes and I'm too lazy to actually figure OUT which ones it needs. - LaunchConfigUtils.addDirectory(serverHome, classpath, IJBossRuntimeResourceConstants.LIB); - LaunchConfigUtils.addDirectory(serverHome, classpath, IJBossRuntimeResourceConstants.LIB + File.separator + IJBossRuntimeResourceConstants.ENDORSED); - LaunchConfigUtils.addDirectory(serverHome, classpath, IJBossRuntimeResourceConstants.CLIENT); - LaunchConfigUtils.addJREEntry(jbrt.getVM(), classpath); - List<String> runtimeClassPaths = LaunchConfigUtils.toStrings(classpath); - new JBossLaunchConfigProperties().setClasspath(runtimeClassPaths, wc); - new JBossLaunchConfigProperties().setUseDefaultClassPath(false, wc); - - return wc; - } - - public static String getDefaultArgs(IServer server) throws CoreException { - JBossServer jbs = ServerConverter.findJBossServer(server.getId()); - if (jbs == null) { - throw new CoreException(new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, - NLS.bind(Messages.ServerNotFound, server.getName()))); - } - String twiddleArgs = SHUTDOWN_SERVER_ARG - + SPACE - + jbs.getHost() + ":" + jbs.getJNDIPort() //$NON-NLS-1$ - + SPACE - + SHUTDOWN_ADAPTER_ARG - + SPACE - + RMIAdaptor - + SPACE; - if( jbs.getUsername() != null ) - twiddleArgs += SHUTDOWN_USER_ARG - + SPACE + jbs.getUsername() - + SPACE; - if( jbs.getPassword() != null ) - twiddleArgs += SHUTDOWN_PASS_ARG - + SPACE - + jbs.getPassword() - + SPACE; - return twiddleArgs; - } -} Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7StartLaunchDelegate.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7StartLaunchDelegate.java 2012-02-01 06:51:11 UTC (rev 38356) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7StartLaunchDelegate.java 2012-02-01 06:57:47 UTC (rev 38357) @@ -17,9 +17,9 @@ import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy; import org.eclipse.debug.core.model.IProcess; import org.eclipse.wst.server.core.IServer; +import org.jboss.ide.eclipse.as.core.server.IJBossLaunchDelegate; 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.IJBossLaunchDelegate; import org.jboss.ide.eclipse.as.core.server.internal.launch.LocalJBossStartLaunchDelegate; import org.jboss.ide.eclipse.as.core.util.JBossServerBehaviorUtils; Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/AbstractRSELaunchDelegate.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/AbstractRSELaunchDelegate.java 2012-02-01 06:51:11 UTC (rev 38356) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/AbstractRSELaunchDelegate.java 2012-02-01 06:57:47 UTC (rev 38357) @@ -23,10 +23,10 @@ import org.eclipse.rse.services.shells.IHostShell; import org.eclipse.rse.services.shells.IHostShellChangeEvent; import org.eclipse.rse.services.shells.IHostShellOutputListener; +import org.jboss.ide.eclipse.as.core.server.IJBossLaunchDelegate; import org.jboss.ide.eclipse.as.core.server.internal.DelegatingServerBehavior; import org.jboss.ide.eclipse.as.core.server.internal.DeployableServerBehavior; import org.jboss.ide.eclipse.as.core.server.internal.launch.AbstractJBossStartLaunchConfiguration; -import org.jboss.ide.eclipse.as.core.server.internal.launch.IJBossLaunchDelegate; import org.jboss.ide.eclipse.as.core.util.ThreadUtils; import org.jboss.ide.eclipse.as.rse.core.RSEHostShellModel.ServerShellModel; Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressLaunchDelegate.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressLaunchDelegate.java 2012-02-01 06:51:11 UTC (rev 38356) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressLaunchDelegate.java 2012-02-01 06:57:47 UTC (rev 38357) @@ -18,9 +18,9 @@ import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy; import org.eclipse.wst.server.core.IServer; import org.jboss.ide.eclipse.as.core.Trace; +import org.jboss.ide.eclipse.as.core.server.IJBossLaunchDelegate; import org.jboss.ide.eclipse.as.core.server.internal.DelegatingServerBehavior; import org.jboss.ide.eclipse.as.core.server.internal.launch.DelegatingStartLaunchConfiguration; -import org.jboss.ide.eclipse.as.core.server.internal.launch.IJBossLaunchDelegate; import org.jboss.ide.eclipse.as.core.util.JBossServerBehaviorUtils; import org.jboss.ide.eclipse.as.core.util.LaunchCommandPreferences;