[jbosstools-commits] JBoss Tools SVN: r32718 - in trunk/as/plugins: org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui and 1 other directory.

Author: adietish Date: 2011-07-07 11:26:21 -0400 (Thu, 07 Jul 2011) New Revision: 32718 Added: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBossStartLaunchDelegate.java 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/RSELaunchConfigProperties.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.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSELaunchTabProvider.java Log: [JBIDE-9215] renamed RSELaunchDelegate to RSEJBossStartLaunchDelegate (to match local variants: LocalJBossStartLaunchDelegate etc.). Kept the old RSELaunchDelegate class and deprecated it 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-07 14:29:38 UTC (rev 32717) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSECorePlugin.java 2011-07-07 15:26:21 UTC (rev 32718) @@ -33,8 +33,8 @@ public void start(BundleContext bundleContext) throws Exception { RSECorePlugin.context = bundleContext; DelegatingServerBehavior.addDelegateMapping(RSEPublishMethod.RSE_ID, RSEBehaviourDelegate.class); - DelegatingStartLaunchConfiguration.addLaunchDelegateMapping(RSEPublishMethod.RSE_ID, new RSELaunchDelegate()); - DelegatingStartLaunchConfiguration.addSetupLaunchParticipant(new RSELaunchDelegate()); + DelegatingStartLaunchConfiguration.addLaunchDelegateMapping(RSEPublishMethod.RSE_ID, new RSEJBossStartLaunchDelegate()); + DelegatingStartLaunchConfiguration.addSetupLaunchParticipant(new RSEJBossStartLaunchDelegate()); } /* Copied: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBossStartLaunchDelegate.java (from rev 32717, 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/RSEJBossStartLaunchDelegate.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBossStartLaunchDelegate.java 2011-07-07 15:26:21 UTC (rev 32718) @@ -0,0 +1,221 @@ +/******************************************************************************* + * Copyright (c) 2010 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 org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.core.runtime.Path; +import org.eclipse.core.runtime.Status; +import org.eclipse.debug.core.ILaunch; +import org.eclipse.debug.core.ILaunchConfiguration; +import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy; +import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants; +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.extensions.events.ServerLogger; +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.DeployableServerBehavior; +import org.jboss.ide.eclipse.as.core.server.internal.IJBossBehaviourDelegate; +import org.jboss.ide.eclipse.as.core.server.internal.JBossServer; +import org.jboss.ide.eclipse.as.core.server.internal.launch.DelegatingStartLaunchConfiguration; +import org.jboss.ide.eclipse.as.core.server.internal.launch.configuration.JBossLaunchConfigProperties; +import org.jboss.ide.eclipse.as.core.util.ArgsUtil; +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.JBossServerBehaviorUtils; +import org.jboss.ide.eclipse.as.core.util.LaunchCommandPreferences; +import org.jboss.ide.eclipse.as.core.util.ServerConverter; +import org.jboss.ide.eclipse.as.core.util.ServerUtil; +import org.jboss.ide.eclipse.as.rse.core.RSEHostShellModel.ServerShellModel; + +public class RSEJBossStartLaunchDelegate extends AbstractRSELaunchDelegate { + public void actualLaunch( + DelegatingStartLaunchConfiguration launchConfig, + ILaunchConfiguration configuration, String mode, ILaunch launch, + IProgressMonitor monitor) throws CoreException { + DelegatingServerBehavior beh = JBossServerBehaviorUtils.getServerBehavior(configuration); + beh.setServerStarting(); + if (LaunchCommandPreferences.isIgnoreLaunchCommand(beh.getServer())) { + beh.setServerStarted(); + return; + } + String command = RSELaunchConfigProperties.getStartupCommand(configuration); + executeRemoteCommand(command, beh); + launchPingThread(beh); + } + + private void launchPingThread(DeployableServerBehavior beh) { + // TODO do it properly here + RSEHostShellModel.delay(30000); + beh.setServerStarted(); + } + + /** + * + * @deprecated + * This was called from {@link RSEBehaviourDelegate#stop(boolean) + * WTP keeps launching in launch configs and stopping in + * the server behavior. We should not change that and offer + * stopping-functionalities in launch delegates. + * + * @param behaviour + */ + @Deprecated + public static void launchStopServerCommand(DelegatingServerBehavior behaviour) { + if (LaunchCommandPreferences.isIgnoreLaunchCommand(behaviour.getServer())) { + behaviour.setServerStopping(); + behaviour.setServerStopped(); + return; + } + ILaunchConfiguration config = null; + String command2 = ""; + try { + config = behaviour.getServer().getLaunchConfiguration(false, new NullProgressMonitor()); + /* + * ATTENTION: this was commented since #getDefaultStopCommand is not static any more + * String defaultCmd = getDefaultStopCommand(behaviour.getServer(), true); + */ + + /* + * This was added to make it compile + */ + String defaultCmd = ""; + + + command2 = config == null ? defaultCmd : + RSELaunchConfigProperties.getShutdownCommand(config, defaultCmd); + behaviour.setServerStopping(); + ServerShellModel model = RSEHostShellModel.getInstance().getModel(behaviour.getServer()); + model.executeRemoteCommand("/", command2, new String[] {}, new NullProgressMonitor(), 10000, true); + if (model.getStartupShell() != null && model.getStartupShell().isActive()) + model.getStartupShell().writeToShell("exit"); + behaviour.setServerStopped(); + } catch (CoreException ce) { + behaviour.setServerStarted(); + ServerLogger.getDefault().log(behaviour.getServer(), ce.getStatus()); + } + } + + public boolean preLaunchCheck(ILaunchConfiguration configuration, + String mode, IProgressMonitor monitor) throws CoreException { + // ping if up + final DelegatingServerBehavior beh = JBossServerBehaviorUtils.getServerBehavior(configuration); + // TODO: use configured polelr + boolean started = WebPortPoller.onePing(beh.getServer()); + if (started) { + beh.setServerStarting(); + beh.setServerStarted(); + return false; + } + 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 setupLaunchConfiguration( + ILaunchConfigurationWorkingCopy workingCopy, IServer server) + throws CoreException { + new RSELaunchConfigurator(getDefaultLaunchCommand(workingCopy), getDefaultStopCommand(server)) + .configure(workingCopy); + /* + * /usr/lib/jvm/jre/bin/java -Dprogram.name=run.sh -server -Xms1530M + * -Xmx1530M -XX:PermSize=425M -XX:MaxPermSize=425M + * -Dorg.jboss.resolver.warning=true + * -Dsun.rmi.dgc.client.gcInterval=3600000 + * -Dsun.rmi.dgc.server.gcInterval=3600000 + * -Djboss.partition.udpGroup=228.1.2.3 + * -Djboss.webpartition.mcast_port=45577 + * -Djboss.hapartition.mcast_port=45566 + * -Djboss.ejb3entitypartition.mcast_port=43333 + * -Djboss.ejb3sfsbpartition.mcast_port=45551 + * -Djboss.jvmRoute=node-10.209.183.100 -Djboss.gossip_port=12001 + * -Djboss.gossip_refresh=5000 -Djava.awt.headless=true + * -Djava.net.preferIPv4Stack=true + * -Djava.endorsed.dirs=/opt/jboss-eap-5.1.0.Beta/jboss-as/lib/endorsed + * -classpath /opt/jboss-eap-5.1.0.Beta/jboss-as/bin/run.jar + * org.jboss.Main -c default -b 10.209.183.100 + */ + } + + private String getDefaultStopCommand(IServer server) { + try { + return getDefaultStopCommand(server, false); + } catch (CoreException ce) {/* ignore, INTENTIONAL */ + } + return null; + } + + private String getDefaultStopCommand(IServer server, boolean errorOnFail) throws CoreException { + String rseHome = RSEUtils.getRSEHomeDir(server, errorOnFail); + + String stop = new Path(rseHome) + .append(IJBossRuntimeResourceConstants.BIN) + .append(IJBossRuntimeResourceConstants.SHUTDOWN_SH).toString() + + IJBossRuntimeConstants.SPACE; + + // Pull args from single utility method + // stop += StopLaunchConfiguration.getDefaultArgs(jbs); + IJBossBehaviourDelegate delegate = ServerUtil.checkedGetBehaviorDelegate(server); + stop += delegate.getDefaultStopArguments(); + return stop; + } + + @Deprecated + public static IServer findServer(ILaunchConfiguration config) throws CoreException { + String serverId = config.getAttribute("server-id", (String) null); + JBossServer jbs = ServerConverter.findJBossServer(serverId); + if (jbs == null) { + throw new CoreException(new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, + NLS.bind(Messages.ServerNotFound, serverId))); + } + return jbs.getServer(); + } + + private String getDefaultLaunchCommand(ILaunchConfiguration config) throws CoreException { + String serverId = JBossLaunchConfigProperties.getServerId(config); + JBossServer jbossServer = ServerConverter.checkedFindJBossServer(serverId); + String rseHome = jbossServer.getServer().getAttribute(RSEUtils.RSE_SERVER_HOME_DIR, ""); + // initialize startup command to something reasonable + String currentArgs = config.getAttribute(IJavaLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS, ""); //$NON-NLS-1$ + String currentVMArgs = config.getAttribute(IJavaLaunchConfigurationConstants.ATTR_VM_ARGUMENTS, ""); //$NON-NLS-1$ + + currentVMArgs = ArgsUtil.setArg(currentVMArgs, null, + IJBossRuntimeConstants.SYSPROP + IJBossRuntimeConstants.ENDORSED_DIRS, + new Path(rseHome).append( + IJBossRuntimeResourceConstants.LIB).append( + IJBossRuntimeResourceConstants.ENDORSED).toOSString(), true); + + String libPath = new Path(rseHome).append(IJBossRuntimeResourceConstants.BIN) + .append(IJBossRuntimeResourceConstants.NATIVE).toOSString(); + currentVMArgs = ArgsUtil.setArg(currentVMArgs, null, + IJBossRuntimeConstants.SYSPROP + IJBossRuntimeConstants.JAVA_LIB_PATH, + libPath, true); + + String cmd = "java " + currentVMArgs + " -classpath " + + new Path(rseHome).append(IJBossRuntimeResourceConstants.BIN).append( + IJBossRuntimeResourceConstants.START_JAR).toString() + IJBossRuntimeConstants.SPACE + + IJBossRuntimeConstants.START_MAIN_TYPE + IJBossRuntimeConstants.SPACE + currentArgs + "&"; + return cmd; + } +} Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSELaunchConfigProperties.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSELaunchConfigProperties.java 2011-07-07 14:29:38 UTC (rev 32717) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSELaunchConfigProperties.java 2011-07-07 15:26:21 UTC (rev 32718) @@ -19,12 +19,12 @@ */ public class RSELaunchConfigProperties { - public static final String RSE_DEFAULT_STARTUP_COMMAND = "org.jboss.ide.eclipse.as.rse.core.RSELaunchDelegate.DEFAULT_STARTUP_COMMAND"; - public static final String RSE_STARTUP_COMMAND = "org.jboss.ide.eclipse.as.rse.core.RSELaunchDelegate.STARTUP_COMMAND"; - public static final String RSE_DEFAULT_SHUTDOWN_COMMAND = "org.jboss.ide.eclipse.as.rse.core.RSELaunchDelegate.DEFAULT_SHUTDOWN_COMMAND"; - public static final String RSE_SHUTDOWN_COMMAND = "org.jboss.ide.eclipse.as.rse.core.RSELaunchDelegate.SHUTDOWN_COMMAND"; - public static final String DETECT_STARTUP_COMMAND = "org.jboss.ide.eclipse.as.rse.core.RSELaunchDelegate.DETECT_STARTUP_COMMAND"; - public static final String DETECT_SHUTDOWN_COMMAND = "org.jboss.ide.eclipse.as.rse.core.RSELaunchDelegate.DETECT_SHUTDOWN_COMMAND"; + public static final String RSE_DEFAULT_STARTUP_COMMAND = "org.jboss.ide.eclipse.as.rse.core.RSEJBossStartLaunchDelegate.DEFAULT_STARTUP_COMMAND"; + public static final String RSE_STARTUP_COMMAND = "org.jboss.ide.eclipse.as.rse.core.RSEJBossStartLaunchDelegate.STARTUP_COMMAND"; + public static final String RSE_DEFAULT_SHUTDOWN_COMMAND = "org.jboss.ide.eclipse.as.rse.core.RSEJBossStartLaunchDelegate.DEFAULT_SHUTDOWN_COMMAND"; + public static final String RSE_SHUTDOWN_COMMAND = "org.jboss.ide.eclipse.as.rse.core.RSEJBossStartLaunchDelegate.SHUTDOWN_COMMAND"; + public static final String DETECT_STARTUP_COMMAND = "org.jboss.ide.eclipse.as.rse.core.RSEJBossStartLaunchDelegate.DETECT_STARTUP_COMMAND"; + public static final String DETECT_SHUTDOWN_COMMAND = "org.jboss.ide.eclipse.as.rse.core.RSEJBossStartLaunchDelegate.DETECT_SHUTDOWN_COMMAND"; public static boolean isDetectStartupCommand(ILaunchConfiguration launchConfig) throws CoreException { return isDetectStartupCommand(launchConfig, true); 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-07 14:29:38 UTC (rev 32717) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSELaunchDelegate.java 2011-07-07 15:26:21 UTC (rev 32718) @@ -43,6 +43,7 @@ import org.jboss.ide.eclipse.as.core.util.ServerUtil; import org.jboss.ide.eclipse.as.rse.core.RSEHostShellModel.ServerShellModel; +@Deprecated public class RSELaunchDelegate extends AbstractRSELaunchDelegate { public void actualLaunch( DelegatingStartLaunchConfiguration launchConfig, Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSELaunchTabProvider.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSELaunchTabProvider.java 2011-07-07 14:29:38 UTC (rev 32717) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSELaunchTabProvider.java 2011-07-07 15:26:21 UTC (rev 32718) @@ -101,7 +101,7 @@ if( autoStartArgs.getSelection()) { String command = null; try { -// command = RSELaunchDelegate.getDefaultLaunchCommand(initialConfig); +// command = RSEJBossStartLaunchDelegate.getDefaultLaunchCommand(initialConfig); command = RSELaunchConfigProperties.getDefaultStartupCommand(initialConfig, ""); startText.setText(command); } catch(CoreException ce) {