### Eclipse Workspace Patch 1.0
#P org.eclipse.dstore.core
Index: src/org/eclipse/dstore/core/client/ClientConnection.java
===================================================================
RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/client/ClientConnection.java,v
retrieving revision 1.13
diff -u -r1.13 ClientConnection.java
--- src/org/eclipse/dstore/core/client/ClientConnection.java	24 May 2007 13:59:13 -0000	1.13
+++ src/org/eclipse/dstore/core/client/ClientConnection.java	26 Jun 2007 16:42:20 -0000
@@ -619,7 +619,7 @@
 	 */
 	public ConnectionStatus launchServer(String user, String password)
 	{
-		// default daemon port is 4035
+		// default daemon port is 4075
 		return launchServer(user, password, ServerLauncher.DEFAULT_DAEMON_PORT);
 	}
 
Index: src/org/eclipse/dstore/core/server/ServerLauncher.java
===================================================================
RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/ServerLauncher.java,v
retrieving revision 1.11
diff -u -r1.11 ServerLauncher.java
--- src/org/eclipse/dstore/core/server/ServerLauncher.java	24 May 2007 13:59:13 -0000	1.11
+++ src/org/eclipse/dstore/core/server/ServerLauncher.java	26 Jun 2007 16:42:20 -0000
@@ -408,7 +408,7 @@
 
 	private ISSLProperties _sslProperties;
 
-	public static int DEFAULT_DAEMON_PORT = 4035;
+	public static int DEFAULT_DAEMON_PORT = 4075;
 
 	/**
 	 * Constructor
@@ -645,7 +645,7 @@
 	 * Entry point into the DataStore daemon
 	 * 
 	 * @param args
-	 *            the port for the daemon to run on (default is 4035).
+	 *            the port for the daemon to run on (default is 4075).
 	 *            Optionally, the second arg specifies whether to use SSL or
 	 *            not. an optional second arg can be used to specify the port
 	 *            range of servers that get launched
#P org.eclipse.rse.core
Index: src/org/eclipse/rse/core/subsystems/RemoteServerLauncher.java
===================================================================
RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/subsystems/RemoteServerLauncher.java,v
retrieving revision 1.5
diff -u -r1.5 RemoteServerLauncher.java
--- src/org/eclipse/rse/core/subsystems/RemoteServerLauncher.java	22 May 2007 13:47:37 -0000	1.5
+++ src/org/eclipse/rse/core/subsystems/RemoteServerLauncher.java	26 Jun 2007 16:42:21 -0000
@@ -78,7 +78,7 @@
 
 	protected int _rexecPort = REXEC_PORT_EDEFAULT;
 
-	protected static final int DAEMON_PORT_EDEFAULT = 4035;
+	protected static final int DAEMON_PORT_EDEFAULT = 4075;
 
 	protected int _daemonPort = DAEMON_PORT_EDEFAULT;
 
Index: src/org/eclipse/rse/core/subsystems/RemoteServerLauncherConstants.java
===================================================================
RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/subsystems/RemoteServerLauncherConstants.java,v
retrieving revision 1.1
diff -u -r1.1 RemoteServerLauncherConstants.java
--- src/org/eclipse/rse/core/subsystems/RemoteServerLauncherConstants.java	7 Mar 2007 21:44:14 -0000	1.1
+++ src/org/eclipse/rse/core/subsystems/RemoteServerLauncherConstants.java	26 Jun 2007 16:42:21 -0000
@@ -23,9 +23,9 @@
 {
 	
 	/**
-	 * Default daemon port, 4035. 
+	 * Default daemon port, 4075. 
 	 */
-	public static final int DEFAULT_DAEMON_PORT = 4035;
+	public static final int DEFAULT_DAEMON_PORT = 4075;
 	
 	/** 
 	 * Default REXEC port, 512.
#P org.eclipse.rse.ui
Index: UI/org/eclipse/rse/ui/validators/ValidatorServerPortInput.java
===================================================================
RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorServerPortInput.java,v
retrieving revision 1.3
diff -u -r1.3 ValidatorServerPortInput.java
--- UI/org/eclipse/rse/ui/validators/ValidatorServerPortInput.java	5 Dec 2006 00:20:13 -0000	1.3
+++ UI/org/eclipse/rse/ui/validators/ValidatorServerPortInput.java	26 Jun 2007 16:42:22 -0000
@@ -17,6 +17,7 @@
 
 package org.eclipse.rse.ui.validators;
 
+import org.eclipse.rse.core.subsystems.RemoteServerLauncherConstants;
 import org.eclipse.rse.ui.ISystemMessages;
 import org.eclipse.rse.ui.RSEUIPlugin;
 
@@ -34,10 +35,10 @@
 		if (msg == null)
 		{
 		  	// check that it's not a used port
-		  	if (number == 4035)
+		  	if (number == RemoteServerLauncherConstants.DEFAULT_DAEMON_PORT)
 		  	{
 		  		currentMessage = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_COMM_PORT_WARNING);
-		  		currentMessage.makeSubstitution("4035", "RSE daemon"); //$NON-NLS-1$ //$NON-NLS-2$
+		  		currentMessage.makeSubstitution("4075", "RSE daemon"); //$NON-NLS-1$ //$NON-NLS-2$
 		  		msg = currentMessage.getLevelOneText();
 		  	}
 		}
@@ -52,10 +53,10 @@
 		if (msg == null)
 		{		 		  	
 		  	// check that it's not a used port
-		  	if (number == 4035)
+		  	if (number == RemoteServerLauncherConstants.DEFAULT_DAEMON_PORT)
 		  	{
 		  		currentMessage = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_COMM_PORT_WARNING);
-		  		currentMessage.makeSubstitution("4035", "RSE daemon"); //$NON-NLS-1$ //$NON-NLS-2$
+		  		currentMessage.makeSubstitution("4075", "RSE daemon"); //$NON-NLS-1$ //$NON-NLS-2$
 		  		msg = currentMessage.getLevelOneText();
 		  	}
 		}