Author: rob.stryker(a)jboss.com Date: 2011-06-13 05:08:07 -0400 (Mon, 13 Jun 2011) New Revision: 32054 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.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ServerModeSectionComposite.java Log: JBIDE-9093 for AS 4 through 7 local versions via RSE 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-06-13 08:37:34 UTC (rev 32053) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSELaunchDelegate.java 2011-06-13 09:08:07 UTC (rev 32054) @@ -44,6 +44,7 @@ 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.IJBossToolingConstants; import org.jboss.ide.eclipse.as.core.util.JBossServerBehaviorUtils; import org.jboss.ide.eclipse.as.core.util.ServerConverter; import org.jboss.ide.eclipse.as.rse.core.RSEHostShellModel.ServerShellModel; @@ -61,6 +62,14 @@ ILaunchConfiguration configuration, String mode, ILaunch launch, IProgressMonitor monitor) throws CoreException { JBossServerBehavior beh = JBossServerBehaviorUtils.getServerBehavior(configuration); + String ignore = beh.getServer().getAttribute(IJBossToolingConstants.IGNORE_LAUNCH_COMMANDS, (String)null); + Boolean ignoreB = ignore == null ? new Boolean(false) : new Boolean(ignore); + if( ignoreB.booleanValue()) { + beh.setServerStarting(); + beh.setServerStarted(); + return; + } + beh.setServerStarting(); String command = configuration.getAttribute(RSE_STARTUP_COMMAND, (String)null); try { @@ -107,6 +116,13 @@ } public static void launchStopServerCommand(JBossServerBehavior behaviour) { + String ignore = behaviour.getServer().getAttribute(IJBossToolingConstants.IGNORE_LAUNCH_COMMANDS, (String)null); + Boolean ignoreB = ignore == null ? new Boolean(false) : new Boolean(ignore); + if( ignoreB.booleanValue()) { + behaviour.setServerStopping(); + behaviour.setServerStopped(); + return; + } ILaunchConfiguration config = null; String command2 = ""; try { Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ServerModeSectionComposite.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ServerModeSectionComposite.java 2011-06-13 08:37:34 UTC (rev 32053) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ServerModeSectionComposite.java 2011-06-13 09:08:07 UTC (rev 32054) @@ -83,7 +83,7 @@ preferencePageBook = toolkit.createPageBook(this, SWT.FLAT|SWT.TOP); preferencePageBook.setLayoutData(UIUtil.createFormData2( - deployTypeCombo, 5, 0, 150, 0, 5, 100, -5)); + deployTypeCombo, 5, 0, 200, 0, 5, 100, -5)); // fill widgets String[] nameList = new String[deployAdditions.size()];