Author: rob.stryker(a)jboss.com Date: 2011-12-14 07:19:44 -0500 (Wed, 14 Dec 2011) New Revision: 37325 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/configuration/JBossLaunchConfigProperties.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/configuration/LocalJBossStartLaunchConfigurator.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7LaunchConfigProperties.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7StartConfigurator.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IJBossToolingConstants.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/LaunchCommandPreferences.java trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.java trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ServerModeSectionComposite.java Log: JBIDE-10319 - added a new checkbox with the option. Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/configuration/JBossLaunchConfigProperties.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/configuration/JBossLaunchConfigProperties.java 2011-12-14 11:41:44 UTC (rev 37324) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/configuration/JBossLaunchConfigProperties.java 2011-12-14 12:19:44 UTC (rev 37325) @@ -102,7 +102,7 @@ String programArguments = getProgramArguments(launchConfig); programArguments = ArgsUtil.setArg(programArguments, IJBossRuntimeConstants.STARTUP_ARG_HOST_SHORT, - null, host); + IJBossRuntimeConstants.STARTUP_ARG_HOST_LONG, host); setProgramArguments(programArguments, launchConfig); } } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/configuration/LocalJBossStartLaunchConfigurator.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/configuration/LocalJBossStartLaunchConfigurator.java 2011-12-14 11:41:44 UTC (rev 37324) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/configuration/LocalJBossStartLaunchConfigurator.java 2011-12-14 12:19:44 UTC (rev 37325) @@ -28,6 +28,7 @@ import org.jboss.ide.eclipse.as.core.server.internal.launch.RunJarContainerWrapper; 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.LaunchCommandPreferences; import org.jboss.ide.eclipse.as.core.util.LaunchConfigUtils; import org.jboss.ide.eclipse.as.core.util.ServerUtil; @@ -88,7 +89,9 @@ @Override protected String getHost(JBossServer server, IJBossServerRuntime runtime) { - return server.getServer().getHost(); + if( LaunchCommandPreferences.listensOnAllHosts(server.getServer())) + return "0.0.0.0"; //$NON-NLS-1$ + return server.getHost(); } @Override Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7LaunchConfigProperties.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7LaunchConfigProperties.java 2011-12-14 11:41:44 UTC (rev 37324) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7LaunchConfigProperties.java 2011-12-14 12:19:44 UTC (rev 37325) @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Red Hat, Inc. + * Copyright (c) 2011 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, @@ -69,4 +69,19 @@ setVmArguments(arguments, launchConfig); } } + + public void setHost(String host, ILaunchConfigurationWorkingCopy launchConfig) throws CoreException { + if (isSet(host)) { + String currentHost = getHost(launchConfig); + if (currentHost == null + || !host.equals(currentHost)) { + String programArguments = getProgramArguments(launchConfig); + programArguments = ArgsUtil.setArg(programArguments, + IJBossRuntimeConstants.STARTUP_ARG_HOST_SHORT, + null, host); + setProgramArguments(programArguments, launchConfig); + } + } + } + } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7StartConfigurator.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7StartConfigurator.java 2011-12-14 11:41:44 UTC (rev 37324) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7StartConfigurator.java 2011-12-14 12:19:44 UTC (rev 37325) @@ -25,6 +25,7 @@ import org.jboss.ide.eclipse.as.core.server.internal.launch.configuration.AbstractStartLaunchConfigurator; 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.LaunchCommandPreferences; import org.jboss.ide.eclipse.as.core.util.LaunchConfigUtils; public class LocalJBoss7StartConfigurator extends AbstractStartLaunchConfigurator { @@ -100,6 +101,8 @@ @Override protected String getHost(JBossServer server, IJBossServerRuntime runtime) { + if( LaunchCommandPreferences.listensOnAllHosts(server.getServer())) + return "0.0.0.0"; //$NON-NLS-1$ return server.getHost(); } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IJBossToolingConstants.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IJBossToolingConstants.java 2011-12-14 11:41:44 UTC (rev 37324) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IJBossToolingConstants.java 2011-12-14 12:19:44 UTC (rev 37325) @@ -120,6 +120,7 @@ public static final int AS7_MANAGEMENT_PORT_DEFAULT_PORT = 9999; public static final String IGNORE_LAUNCH_COMMANDS = "org.jboss.ide.eclipse.as.core.server.IGNORE_LAUNCH_COMMANDS"; //$NON-NLS-1$ + public static final String LISTEN_ALL_HOSTS = "org.jboss.ide.eclipse.as.core.server.LISTEN_ON_ALL_HOSTS"; //$NON-NLS-1$ public static final String LOCAL_DEPLOYMENT_NAME = "name"; //$NON-NLS-1$ public static final String LOCAL_DEPLOYMENT_LOC = "location"; //$NON-NLS-1$ Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/LaunchCommandPreferences.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/LaunchCommandPreferences.java 2011-12-14 11:41:44 UTC (rev 37324) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/LaunchCommandPreferences.java 2011-12-14 12:19:44 UTC (rev 37325) @@ -23,11 +23,23 @@ } public static boolean isIgnoreLaunchCommand(IServerAttributes server, boolean defaultValue) { + return checkBooleanAttribute(server, IJBossToolingConstants.IGNORE_LAUNCH_COMMANDS, defaultValue ); + } + + public static boolean listensOnAllHosts(IServerAttributes server) { + return listensOnAllHosts(server, false); + } + + public static boolean listensOnAllHosts(IServerAttributes server, boolean defaultValue) { + return checkBooleanAttribute(server, IJBossToolingConstants.LISTEN_ALL_HOSTS, defaultValue ); + } + + private static boolean checkBooleanAttribute(IServerAttributes server, String key, boolean defaultValue) { if (server == null) { return false; } - String ignoreCommand = server.getAttribute(IJBossToolingConstants.IGNORE_LAUNCH_COMMANDS, Boolean.toString(defaultValue)); + String ignoreCommand = server.getAttribute(key, Boolean.toString(defaultValue)); return Boolean.valueOf(ignoreCommand); } - + } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.java 2011-12-14 11:41:44 UTC (rev 37324) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.java 2011-12-14 12:19:44 UTC (rev 37325) @@ -188,6 +188,8 @@ public static String EditorModule; public static String EditorDoNotLaunch; public static String EditorDoNotLaunchCommand; + public static String EditorListenOnAllHosts; + public static String EditorListenOnAllHostsCommand; public static String EditorChangeServerMode; public static String EditorZipDeployments; public static String EditorSetRadioClicked; Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties 2011-12-14 11:41:44 UTC (rev 37324) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties 2011-12-14 12:19:44 UTC (rev 37325) @@ -167,6 +167,8 @@ EditorTempDeployDNE=The temporary deploy directory "{0}" does not exist. EditorDoNotLaunch=Server is externally managed. Assume server is started. EditorDoNotLaunchCommand=Toggle Startup and Shutdown scripts +EditorListenOnAllHosts=Launched server listens on all hosts ( -b 0.0.0.0 ) +EditorListenOnAllHostsCommand=Toggle allowing launched server to listen on all hosts EditorChangeServerMode=Change server mode EditorStartupPollerLabel=Startup Poller EditorShutdownPollerLabel=Shutdown Poller 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-12-14 11:41:44 UTC (rev 37324) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ServerModeSectionComposite.java 2011-12-14 12:19:44 UTC (rev 37325) @@ -50,6 +50,7 @@ private ScrolledPageBook preferencePageBook; private IServerModeUICallback callback; private Button executeShellScripts; // may be null; + private Button listenOnAllHosts; // may be null public ServerModeSectionComposite(Composite parent, int style, IServerModeUICallback callback) { super(parent, style); @@ -75,7 +76,23 @@ }} ); } - + + if( showListenOnAllHostsCheckbox()) { + listenOnAllHosts = new Button(this, SWT.CHECK); + listenOnAllHosts.setText(Messages.EditorListenOnAllHosts); + FormData fd = UIUtil.createFormData2(top == null ? 0 : top, 5, null, 0, 0, 5, null, 0); + listenOnAllHosts.setLayoutData(fd); + top = listenOnAllHosts; + listenOnAllHosts.setSelection(LaunchCommandPreferences.listensOnAllHosts(callback.getServer())); + listenOnAllHosts.addSelectionListener(new SelectionListener(){ + public void widgetSelected(SelectionEvent e) { + listenOnAllHostsToggled(); + } + public void widgetDefaultSelected(SelectionEvent e) { + }} + ); + } + deployTypeCombo = new Combo(this, SWT.READ_ONLY); FormData fd = UIUtil.createFormData2(top, 5, null, 0, 0, 5, 50, -5); deployTypeCombo.setLayoutData(fd); @@ -139,6 +156,9 @@ protected boolean showExecuteShellCheckbox() { return true; } + protected boolean showListenOnAllHostsCheckbox() { + return true; + } protected void executeShellToggled() { callback.execute(new ChangeServerPropertyCommand( @@ -146,6 +166,12 @@ new Boolean(executeShellScripts.getSelection()).toString(), Messages.EditorDoNotLaunchCommand)); } + protected void listenOnAllHostsToggled() { + callback.execute(new ChangeServerPropertyCommand( + callback.getServer(), IJBossToolingConstants.LISTEN_ALL_HOSTS, + new Boolean(listenOnAllHosts.getSelection()).toString(), Messages.EditorListenOnAllHostsCommand)); + } + private class DeployUIAdditions { private String behaviourName; private String behaviourId;