Author: rob.stryker(a)jboss.com Date: 2008-04-21 20:25:33 -0400 (Mon, 21 Apr 2008) New Revision: 7670 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/jmx/JMXUtil.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServer.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/StopLaunchConfiguration.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/TwiddleLaunchConfiguration.java Log: JBIDE-1891 - getHost() wasn't checking for overrides in the launch configuration Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/jmx/JMXUtil.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/jmx/JMXUtil.java 2008-04-21 22:03:43 UTC (rev 7669) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/jmx/JMXUtil.java 2008-04-22 00:25:33 UTC (rev 7670) @@ -28,6 +28,7 @@ import java.util.Properties; import org.eclipse.wst.server.core.IServer; +import org.jboss.ide.eclipse.as.core.server.internal.JBossServer; import org.jboss.ide.eclipse.as.core.util.ServerConverter; /** @@ -112,14 +113,18 @@ } public static Properties getDefaultProperties(IServer server) { - int port = ServerConverter.getJBossServer(server).getJNDIPort(); + JBossServer jbs = ServerConverter.getJBossServer(server); Properties props = new Properties(); - props.put("java.naming.factory.initial", - "org.jnp.interfaces.NamingContextFactory"); - props.put("java.naming.factory.url.pkgs", - "org.jboss.naming:org.jnp.interfaces"); - props.put("java.naming.provider.url", "jnp://" + server.getHost() + ":" - + port); + if( jbs != null ) { + + int port = jbs.getJNDIPort(); + props.put("java.naming.factory.initial", + "org.jnp.interfaces.NamingContextFactory"); + props.put("java.naming.factory.url.pkgs", + "org.jboss.naming:org.jnp.interfaces"); + props.put("java.naming.provider.url", "jnp://" + jbs.getHost() + ":" + + port); + } return props; } } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServer.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServer.java 2008-04-21 22:03:43 UTC (rev 7669) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServer.java 2008-04-22 00:25:33 UTC (rev 7670) @@ -57,6 +57,26 @@ public JBossServer() { } + public String getHost() { + return getHost(true); + } + + public String getHost(boolean checkLaunchConfig) { + String host = getServer().getHost(); + if( checkLaunchConfig ) { + try { + Server s = (Server)getServer(); + ILaunchConfiguration lc = s.getLaunchConfiguration(true, new NullProgressMonitor()); + String startArgs = lc.getAttribute(IJavaLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS, (String)null); + String val = ArgsUtil.getValue(startArgs, "-b", "--host"); + if( val != null ) + host = val; + } catch( CoreException ce ) { + } + } + return host; + } + public String getConfigDirectory() { return getConfigDirectory(true); } @@ -156,7 +176,7 @@ return null; IWebModule webModule =(IWebModule)module.loadAdapter(IWebModule.class,null); - String host = getServer().getHost(); + String host = getHost(); String url = "http://"+host; //$NON-NLS-1$ int port = getJBossWebPort(); if (port != 80) Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/StopLaunchConfiguration.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/StopLaunchConfiguration.java 2008-04-21 22:03:43 UTC (rev 7669) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/StopLaunchConfiguration.java 2008-04-22 00:25:33 UTC (rev 7670) @@ -100,7 +100,7 @@ public static String getDefaultArgs(JBossServer jbs) throws CoreException { String args = "-S "; - args += "-s " + jbs.getServer().getHost() + ":" + jbs.getJNDIPort() + " "; + args += "-s " + jbs.getHost() + ":" + jbs.getJNDIPort() + " "; if( jbs.getUsername() != null && !jbs.getUsername().equals("")) args += "-u " + jbs.getUsername() + " "; if( jbs.getPassword() != null && !jbs.getUsername().equals("")) Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/TwiddleLaunchConfiguration.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/TwiddleLaunchConfiguration.java 2008-04-21 22:03:43 UTC (rev 7669) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/TwiddleLaunchConfiguration.java 2008-04-22 00:25:33 UTC (rev 7670) @@ -78,7 +78,7 @@ public static String getDefaultArgs(IServer server) throws CoreException { JBossServer jbs = findJBossServer(server.getId()); - String twiddleArgs = "-s " + jbs.getServer().getHost() + ":" + String twiddleArgs = "-s " + jbs.getHost() + ":" + jbs.getJNDIPort() + " -a jmx/rmi/RMIAdaptor "; if( jbs.getUsername() != null ) twiddleArgs += "-u " + jbs.getUsername() + " ";