Author: rob.stryker(a)jboss.com Date: 2012-02-16 01:05:38 -0500 (Thu, 16 Feb 2012) New Revision: 38803 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/configuration/AbstractLaunchConfigurator.java 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/v7/JBoss7LaunchConfigProperties.java Log: JBIDE-10802 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/configuration/AbstractLaunchConfigurator.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/configuration/AbstractLaunchConfigurator.java 2012-02-16 05:33:14 UTC (rev 38802) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/configuration/AbstractLaunchConfigurator.java 2012-02-16 06:05:38 UTC (rev 38803) @@ -40,7 +40,8 @@ if (!areDefaultsSet(launchConfig)) { doConfigure(launchConfig, jbossServer, jbossRuntime); setDefaultsSet(launchConfig); - } else if( shouldUpdateLaunch(launchConfig)){ + } + if( shouldUpdateLaunch(launchConfig)){ doOverrides(launchConfig, jbossServer, jbossRuntime); } } 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 2012-02-16 05:33:14 UTC (rev 38802) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/configuration/JBossLaunchConfigProperties.java 2012-02-16 06:05:38 UTC (rev 38803) @@ -15,11 +15,16 @@ import java.util.Map; import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IPath; import org.eclipse.debug.core.ILaunchConfiguration; import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy; import org.eclipse.debug.core.ILaunchManager; import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants; +import org.eclipse.wst.server.core.IRuntime; +import org.eclipse.wst.server.core.IServer; +import org.eclipse.wst.server.core.ServerCore; import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime; +import org.jboss.ide.eclipse.as.core.server.bean.ServerBeanLoader; import org.jboss.ide.eclipse.as.core.util.ArgsUtil; import org.jboss.ide.eclipse.as.core.util.IJBossRuntimeConstants; @@ -262,4 +267,18 @@ return map != null; } + protected ServerBeanLoader getBeanLoader(ILaunchConfigurationWorkingCopy launchConfig) throws CoreException { + String serverId = getServerId(launchConfig); + if( serverId != null ) { + IServer s = ServerCore.findServer(serverId); + if( s != null ) { + IRuntime rt = s.getRuntime(); + if( rt != null ) { + IPath location = rt.getLocation(); + return new ServerBeanLoader(location.toFile()); + } + } + } + return null; + } } 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 2012-02-16 05:33:14 UTC (rev 38802) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7LaunchConfigProperties.java 2012-02-16 06:05:38 UTC (rev 38803) @@ -11,8 +11,14 @@ package org.jboss.ide.eclipse.as.core.server.internal.v7; import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IPath; import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy; +import org.eclipse.wst.server.core.IRuntime; +import org.eclipse.wst.server.core.IServer; +import org.eclipse.wst.server.core.ServerCore; import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime; +import org.jboss.ide.eclipse.as.core.server.bean.JBossServerType; +import org.jboss.ide.eclipse.as.core.server.bean.ServerBeanLoader; 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; @@ -70,7 +76,22 @@ } } + private boolean supportsBindingFlag(ILaunchConfigurationWorkingCopy launchConfig ) throws CoreException { + ServerBeanLoader loader = getBeanLoader(launchConfig); + if( loader.getServerBean().getType().equals(JBossServerType.AS7)){ + String v = loader.getFullServerVersion(); + if( "7.0.2".compareTo(v) >= 0 ) { //$NON-NLS-1$ + // this is jboss 7.0 or 7.1 + return false; + } + } + return true; + } + public void setHost(String host, ILaunchConfigurationWorkingCopy launchConfig) throws CoreException { + if( !supportsBindingFlag(launchConfig)) + return; + if (isSet(host)) { String currentHost = getHost(launchConfig); if (currentHost == null