From 77f7cf4637961a797c21017b3d78d22139b72d57 Mon Sep 17 00:00:00 2001
From: Martin Oberhuber < martin.oberhuber@windriver.com>
Date: Wed, 27 Jun 2007 10:37:25 +0000
Subject: [PATCH] [194442] Change dstore default daemon port

---
 rse/doc/org.eclipse.rse.doc.user/tasks/tbeginlinux.html  | 4 ++--
 .../org.eclipse.rse.doc.user/tasks/tbeginwindows.html    | 4 ++--
 .../org/eclipse/dstore/core/client/ClientConnection.java | 2 +-
 .../org/eclipse/dstore/core/server/ServerLauncher.java   | 4 ++--
 .../rse/core/subsystems/RemoteServerLauncher.java        | 2 +-
 .../core/subsystems/RemoteServerLauncherConstants.java   | 4 ++--
 .../serverruntime/scripts/linux/daemon.pl                | 2 +-
 .../serverruntime/scripts/macosx/daemon.pl               | 4 ++--
 .../serverruntime/scripts/unix/daemon.pl                 | 2 +-
 .../serverruntime/scripts/windows/daemon.bat             | 2 +-
 .../rse/ui/validators/ValidatorServerPortInput.java      | 9 +++++----
 11 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/rse/doc/org.eclipse.rse.doc.user/tasks/tbeginlinux.html b/rse/doc/org.eclipse.rse.doc.user/tasks/tbeginlinux.html
index 25071d9a95d..2e817336d3e 100755
--- a/rse/doc/org.eclipse.rse.doc.user/tasks/tbeginlinux.html
+++ b/rse/doc/org.eclipse.rse.doc.user/tasks/tbeginlinux.html
@@ -78,12 +78,12 @@ cd /opt/rseserver
 perl ./daemon.pl [daemonPort] [serverPortRange]</pre>
 </li>
 </ol>
-Note that the server daemon runs on port 4035 by default. You can pass the optional
+Note that the server daemon runs on port 4075 by default. You can pass the optional
 daemonPort argument to force a different port if you want.<br/>
 If your daemon runs behind a firewall, you may want to specify the optional
 <i>serverPortRange</i> argument to restrict selected server ports to the
 range given:<pre>
-perl ./daemon.pl 4035 10000-10010</pre>
+perl ./daemon.pl 4075 10000-10010</pre>
 
 <p><b>To start the server manually</b></p>
 <div class="p">If you do not have root access on a remote machine, you can
diff --git a/rse/doc/org.eclipse.rse.doc.user/tasks/tbeginwindows.html b/rse/doc/org.eclipse.rse.doc.user/tasks/tbeginwindows.html
index 9f5f3ddadef..7546a4e3017 100755
--- a/rse/doc/org.eclipse.rse.doc.user/tasks/tbeginwindows.html
+++ b/rse/doc/org.eclipse.rse.doc.user/tasks/tbeginwindows.html
@@ -53,12 +53,12 @@ authentication. If you run the server daemon, any user can connect to the machin
 with the file system and run commands.
 <span style="font-weight: bold;">Use of the server daemon on Windows systems is not recommended</span>.
 </p>
-The server daemon runs on port 4035 by default. You can pass the optional
+The server daemon runs on port 4075 by default. You can pass the optional
 daemonPort argument to force a different port if you want.<br/>
 If your daemon runs behind a firewall, you may want to specify the optional
 <i>serverPortRange</i> argument to restrict selected server ports to the
 range given:<pre>
-daemon.bat 4035 10000-10010</pre>
+daemon.bat 4075 10000-10010</pre>
 </blockquote>
 </div>
 
diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/client/ClientConnection.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/client/ClientConnection.java
index e44760a77d8..7dd7702fdff 100644
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/client/ClientConnection.java
+++ b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/client/ClientConnection.java
@@ -619,7 +619,7 @@ public class ClientConnection
 	 */
 	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);
 	}
 
diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/ServerLauncher.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/ServerLauncher.java
index 1cff3d493e7..851b0e764f5 100644
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/ServerLauncher.java
+++ b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/ServerLauncher.java
@@ -408,7 +408,7 @@ public class ServerLauncher extends Thread {
 
 	private ISSLProperties _sslProperties;
 
-	public static int DEFAULT_DAEMON_PORT = 4035;
+	public static int DEFAULT_DAEMON_PORT = 4075;
 
 	/**
 	 * Constructor
@@ -645,7 +645,7 @@ public class ServerLauncher extends Thread {
 	 * 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
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/subsystems/RemoteServerLauncher.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/subsystems/RemoteServerLauncher.java
index b8588051504..3b7c0c4255e 100644
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/subsystems/RemoteServerLauncher.java
+++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/subsystems/RemoteServerLauncher.java
@@ -78,7 +78,7 @@ public class RemoteServerLauncher extends ServerLauncher implements IRemoteServe
 
 	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;
 
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/subsystems/RemoteServerLauncherConstants.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/subsystems/RemoteServerLauncherConstants.java
index bd403025c93..05c72a98258 100644
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/subsystems/RemoteServerLauncherConstants.java
+++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/subsystems/RemoteServerLauncherConstants.java
@@ -23,9 +23,9 @@ public interface RemoteServerLauncherConstants
 {
 	
 	/**
-	 * 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.
diff --git a/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/linux/daemon.pl b/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/linux/daemon.pl
index 98a3f8c00a0..cfe194ab8ea 100644
--- a/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/linux/daemon.pl
+++ b/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/linux/daemon.pl
@@ -10,7 +10,7 @@
 # IBM Corporation - initial API and implementation
 #*******************************************************************************
  
-$port = "4035";
+$port = "4075";
 $helpFlag = "-h"; 
 $dir = ".";
  
diff --git a/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/macosx/daemon.pl b/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/macosx/daemon.pl
index 9bec4dfcb63..65154bfa832 100644
--- a/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/macosx/daemon.pl
+++ b/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/macosx/daemon.pl
@@ -11,7 +11,7 @@
 #*******************************************************************************
 
 # Arguments:
-# ARGV[0] is the port number for the daemon to listen on. Default is 4035.
+# ARGV[0] is the port number for the daemon to listen on. Default is 4075.
 # ARGV[1] is the directory that contains RSE DStore server jar files and 
 # installation supplied miner class files. The default is the working 
 # directory.
@@ -26,7 +26,7 @@
 # Does not return if the daemon starts successfully. Terminate the
 # daemon with a signal such as TERM or INT.
 
-$port = $ARGV[0] || "4035";
+$port = $ARGV[0] || "4075";
 $plugin_dir = $ARGV[1] || $ENV{PWD};
 $trace = $ENV{DSTORE_TRACING_ON} || "0";
 $debug = $ENV{DSTORE_DEBUG_ON} || "0";
diff --git a/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/unix/daemon.pl b/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/unix/daemon.pl
index 98a3f8c00a0..cfe194ab8ea 100644
--- a/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/unix/daemon.pl
+++ b/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/unix/daemon.pl
@@ -10,7 +10,7 @@
 # IBM Corporation - initial API and implementation
 #*******************************************************************************
  
-$port = "4035";
+$port = "4075";
 $helpFlag = "-h"; 
 $dir = ".";
  
diff --git a/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/windows/daemon.bat b/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/windows/daemon.bat
index fe12eb65b45..a5cf9a9d48c 100644
--- a/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/windows/daemon.bat
+++ b/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/windows/daemon.bat
@@ -17,7 +17,7 @@ REM Usage: daemon.bat [<port> | <low port>-<high port>] [ <low server port>-<hig
 REM
 setlocal
 
-SET DaemonPort=4035
+SET DaemonPort=4075
 SET ServerPortRange=
 IF NOT "%1"=="" SET DaemonPort=%1
 IF NOT "%2"=="" SET ServerPortRange=%2
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorServerPortInput.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorServerPortInput.java
index 2bcc0a17205..adf6db90e46 100644
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorServerPortInput.java
+++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorServerPortInput.java
@@ -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 @@ public class ValidatorServerPortInput extends ValidatorPortInput
 		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 @@ public class ValidatorServerPortInput extends ValidatorPortInput
 		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();
 		  	}
 		}