Author: adietish Date: 2011-07-11 05:15:28 -0400 (Mon, 11 Jul 2011) New Revision: 32795 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBoss7StartLaunchDelegate.java Log: [JBIDE-9215] corrected error reporting (was: twice the root cause, now: user error & the root cause) Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBoss7StartLaunchDelegate.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBoss7StartLaunchDelegate.java 2011-07-11 09:11:23 UTC (rev 32794) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBoss7StartLaunchDelegate.java 2011-07-11 09:15:28 UTC (rev 32795) @@ -22,17 +22,14 @@ import org.eclipse.wst.server.core.IServer; 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.core.util.ThreadUtils; public class RSEJBoss7StartLaunchDelegate extends AbstractRSELaunchDelegate { @@ -97,40 +94,17 @@ } 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; + return null; } 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, ""); + String rseHome = RSEUtils.getRSEHomeDir(jbossServer.getServer()); // 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 +