[jboss-cvs] jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server ...

[Robert Stryker]

  User: rawb    
  Date: 06/09/18 13:50:11

  Modified:    as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server   
                        ServerAttributeHelper.java JBossServer.java
                        JBossLaunchConfigurationDelegate.java
  Log:
  Changing 'host' in the server editor should now properly update the launch configuration
  
  Revision  Changes    Path
  1.11      +2 -2      jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/ServerAttributeHelper.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ServerAttributeHelper.java
  ===================================================================
  RCS file: /cvsroot/jboss/jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/ServerAttributeHelper.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -b -r1.10 -r1.11
  --- ServerAttributeHelper.java	12 Sep 2006 21:30:03 -0000	1.10
  +++ ServerAttributeHelper.java	18 Sep 2006 17:50:11 -0000	1.11
  @@ -135,8 +135,8 @@
   	}
   	
   	public SimpleXPathPreferenceTreeItem getXPathPreferenceTree() {
  -		List categories = server.getAttribute(XPATH_CATEGORIES, new ArrayList());
  -		if( categories.size() == 0 ) {
  +		List categories = server.getAttribute(XPATH_CATEGORIES, (List)null);
  +		if( categories == null ) {
   			return getDefaultXPathPreferenceTree();
   		}
   		SimpleXPathPreferenceTreeItem model = new SimpleXPathPreferenceTreeItem(null, XPATH_CATEGORIES);
  
  
  
  1.10      +11 -3     jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/JBossServer.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: JBossServer.java
  ===================================================================
  RCS file: /cvsroot/jboss/jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/JBossServer.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -b -r1.9 -r1.10
  --- JBossServer.java	27 Jul 2006 06:34:03 -0000	1.9
  +++ JBossServer.java	18 Sep 2006 17:50:11 -0000	1.10
  @@ -24,14 +24,15 @@
   import org.eclipse.core.runtime.CoreException;
   import org.eclipse.core.runtime.IProgressMonitor;
   import org.eclipse.core.runtime.IStatus;
  +import org.eclipse.core.runtime.NullProgressMonitor;
   import org.eclipse.core.runtime.Status;
  +import org.eclipse.debug.core.ILaunchConfiguration;
  +import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
   import org.eclipse.wst.server.core.IModule;
   import org.eclipse.wst.server.core.IRuntime;
  -import org.eclipse.wst.server.core.IServer;
   import org.eclipse.wst.server.core.IServerWorkingCopy;
  -import org.eclipse.wst.server.core.ServerCore;
   import org.eclipse.wst.server.core.ServerPort;
  -import org.eclipse.wst.server.core.internal.PublishServerJob;
  +import org.eclipse.wst.server.core.internal.Server;
   import org.eclipse.wst.server.core.model.ServerDelegate;
   import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin;
   import org.jboss.ide.eclipse.as.core.model.DescriptorModel;
  @@ -74,6 +75,13 @@
   
   	public void saveConfiguration(IProgressMonitor monitor) throws CoreException {
   		debug("saveConfiguration");
  +		// Saving a change in server properties (via server editor)
  +		String newHost = getServer().getHost();
  +		
  +		ILaunchConfiguration launchConfig = 
  +			((Server)getServer()).getLaunchConfiguration(true, new NullProgressMonitor());
  +
  +		JBossLaunchConfigurationDelegate.setHost(launchConfig, newHost, getDescriptorModel().getJNDIPort());
   	}
   
   	public void configurationChanged() {
  
  
  
  1.6       +24 -0     jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/JBossLaunchConfigurationDelegate.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: JBossLaunchConfigurationDelegate.java
  ===================================================================
  RCS file: /cvsroot/jboss/jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/JBossLaunchConfigurationDelegate.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -b -r1.5 -r1.6
  --- JBossLaunchConfigurationDelegate.java	15 Sep 2006 00:33:22 -0000	1.5
  +++ JBossLaunchConfigurationDelegate.java	18 Sep 2006 17:50:11 -0000	1.6
  @@ -55,6 +55,7 @@
   import org.jboss.ide.eclipse.as.core.server.runtime.IJBossServerRuntimeDelegate;
   import org.jboss.ide.eclipse.as.core.server.runtime.JBossServerRuntime;
   import org.jboss.ide.eclipse.as.core.util.ASDebug;
  +import org.jboss.ide.eclipse.as.core.util.RuntimeConfigUtil;
   
   public class JBossLaunchConfigurationDelegate extends
   	AbstractJavaLaunchConfigurationDelegate {
  @@ -64,6 +65,29 @@
   	public static final String PRGM_ARGS_STOP_SUFFIX = "_SERVER_STOP_";
   	public static final String PRGM_ARGS_TWIDDLE_SUFFIX = "_SERVER_TWIDDLE_"; 
   
  +	
  +	public static void setHost(ILaunchConfiguration config, String newHost, int jndiPort) throws CoreException {
  +		ILaunchConfigurationWorkingCopy wc = config.getWorkingCopy();
  +		String argsKey = IJavaLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS;
  +		String startArgsKey = argsKey + PRGM_ARGS_START_SUFFIX;
  +		String stopArgsKey = argsKey + PRGM_ARGS_STOP_SUFFIX;
  +		String twiddleArgsKey = argsKey + PRGM_ARGS_TWIDDLE_SUFFIX;
  +		
  +		String startArgs = wc.getAttribute(startArgsKey, "");
  +		String stopArgs = wc.getAttribute(stopArgsKey, "");
  +		String twiddleArgs = wc.getAttribute(twiddleArgsKey, "");
  +		
  +		String jndiHost = newHost + ":" + jndiPort;
  +		
  +		String newStartArgs = RuntimeConfigUtil.setCommandArguments(startArgs, "-b", "--host", newHost);
  +		String newStopArgs = RuntimeConfigUtil.setCommandArguments(stopArgs, "-s", "--server", jndiHost);
  +		String newTwidArgs = RuntimeConfigUtil.setCommandArguments(twiddleArgs, "-s", "--server", jndiHost);
  +		
  +		ASDebug.p("start:  " + startArgs + " -> " + newStartArgs, JBossLaunchConfigurationDelegate.class);
  +		ASDebug.p("stop:  " + stopArgs + " -> " + newStopArgs, JBossLaunchConfigurationDelegate.class);
  +		ASDebug.p("twiddle:  " + twiddleArgs + " -> " + newTwidArgs, JBossLaunchConfigurationDelegate.class);
  +	}
  +	
   	public static ILaunchConfigurationWorkingCopy setupLaunchConfiguration(JBossServer server, String action) throws CoreException {
   		ILaunchConfigurationWorkingCopy config = createLaunchConfiguration(server);
   		setupLaunchConfiguration(config, server, action);