Author: adietish Date: 2011-06-24 14:36:53 -0400 (Fri, 24 Jun 2011) New Revision: 32354 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/LocalJBossServerStartupLaunchUtil.java Log: [JBIDE-9215] extracted setting the server configuration to its own method Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/LocalJBossServerStartupLaunchUtil.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/LocalJBossServerStartupLaunchUtil.java 2011-06-24 18:19:03 UTC (rev 32353) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/LocalJBossServerStartupLaunchUtil.java 2011-06-24 18:36:53 UTC (rev 32354) @@ -103,7 +103,7 @@ updateVMPath(runtime, wc); wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_WORKING_DIRECTORY, serverHome + Path.SEPARATOR + IJBossRuntimeResourceConstants.BIN); - updateArguments(wc, jbs, runtime); + updateProgramArguments(wc, jbs, runtime); updateVMArgs(wc, runtime); updateClassPath(wc, jbs); wc.setAttribute(AbstractJBossLaunchConfigType.SERVER_ID, jbs.getServer().getId()); @@ -127,11 +127,12 @@ wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_VM_ARGUMENTS, vmArgs.trim()); } - private void updateArguments(ILaunchConfigurationWorkingCopy wc, JBossServer jbs, IJBossServerRuntime runtime) + private void updateProgramArguments(ILaunchConfigurationWorkingCopy wc, JBossServer jbs, IJBossServerRuntime runtime) throws CoreException { String args = wc.getAttribute(IJavaLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS, ""); //$NON-NLS-1$ String host = jbs.getServer().getHost(); args = updateHostArgument(host, args); + args = updateConfigArgument(args, runtime); args = updateServerHomeArgument(args, runtime); wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS, args.trim()); } @@ -144,11 +145,15 @@ IJBossRuntimeResourceConstants.ENDORSED).toOSString(), true); } - private String updateServerHomeArgument(String args, IJBossServerRuntime runtime) { + private String updateConfigArgument(String args, IJBossServerRuntime runtime) { String config = runtime.getJBossConfiguration(); args = ArgsUtil.setArg(args, IJBossRuntimeConstants.STARTUP_ARG_CONFIG_SHORT, IJBossRuntimeConstants.STARTUP_ARG_CONFIG_LONG, config); + return args; + } + + private String updateServerHomeArgument(String args, IJBossServerRuntime runtime) { try { if (!runtime.getConfigLocation().equals(IConstants.SERVER)) {