### Eclipse Workspace Patch 1.0 #P org.eclipse.rse.services.dstore Index: serverruntime/scripts/macosx/daemon.pl =================================================================== RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/macosx/daemon.pl,v retrieving revision 1.3 diff -u -r1.3 daemon.pl --- serverruntime/scripts/macosx/daemon.pl 15 Dec 2006 10:46:36 -0000 1.3 +++ serverruntime/scripts/macosx/daemon.pl 26 Jun 2007 18:09:59 -0000 @@ -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"; Index: serverruntime/scripts/unix/daemon.pl =================================================================== RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/unix/daemon.pl,v retrieving revision 1.4 diff -u -r1.4 daemon.pl --- serverruntime/scripts/unix/daemon.pl 4 Jan 2007 19:17:42 -0000 1.4 +++ serverruntime/scripts/unix/daemon.pl 26 Jun 2007 18:09:59 -0000 @@ -10,7 +10,7 @@ # IBM Corporation - initial API and implementation #******************************************************************************* -$port = "4035"; +$port = "4075"; $helpFlag = "-h"; $dir = "."; Index: serverruntime/scripts/linux/daemon.pl =================================================================== RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/linux/daemon.pl,v retrieving revision 1.4 diff -u -r1.4 daemon.pl --- serverruntime/scripts/linux/daemon.pl 4 Jan 2007 19:17:42 -0000 1.4 +++ serverruntime/scripts/linux/daemon.pl 26 Jun 2007 18:09:59 -0000 @@ -10,7 +10,7 @@ # IBM Corporation - initial API and implementation #******************************************************************************* -$port = "4035"; +$port = "4075"; $helpFlag = "-h"; $dir = "."; Index: serverruntime/scripts/windows/daemon.bat =================================================================== RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/windows/daemon.bat,v retrieving revision 1.9 diff -u -r1.9 daemon.bat --- serverruntime/scripts/windows/daemon.bat 24 Oct 2006 14:04:15 -0000 1.9 +++ serverruntime/scripts/windows/daemon.bat 26 Jun 2007 18:09:59 -0000 @@ -17,7 +17,7 @@ REM setlocal -SET DaemonPort=4035 +SET DaemonPort=4075 SET ServerPortRange= IF NOT "%1"=="" SET DaemonPort=%1 IF NOT "%2"=="" SET ServerPortRange=%2 #P org.eclipse.dstore.core 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 18:10:08 -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 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 18:10:08 -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); } #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 18:10:10 -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(); } } #P org.eclipse.rse.core 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 18:10:11 -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. 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 18:10:11 -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; #P org.eclipse.rse.doc.user Index: tasks/tbeginwindows.html =================================================================== RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/doc/org.eclipse.rse.doc.user/tasks/tbeginwindows.html,v retrieving revision 1.8 diff -u -r1.8 tbeginwindows.html --- tasks/tbeginwindows.html 12 Jun 2007 14:40:01 -0000 1.8 +++ tasks/tbeginwindows.html 26 Jun 2007 18:10:13 -0000 @@ -53,12 +53,12 @@ with the file system and run commands. Use of the server daemon on Windows systems is not recommended.

-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.
If your daemon runs behind a firewall, you may want to specify the optional serverPortRange argument to restrict selected server ports to the range given:
-daemon.bat 4035 10000-10010
+daemon.bat 4075 10000-10010 Index: tasks/tbeginlinux.html =================================================================== RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/doc/org.eclipse.rse.doc.user/tasks/tbeginlinux.html,v retrieving revision 1.10 diff -u -r1.10 tbeginlinux.html --- tasks/tbeginlinux.html 12 Jun 2007 14:40:01 -0000 1.10 +++ tasks/tbeginlinux.html 26 Jun 2007 18:10:13 -0000 @@ -78,12 +78,12 @@ perl ./daemon.pl [daemonPort] [serverPortRange] -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.
If your daemon runs behind a firewall, you may want to specify the optional serverPortRange argument to restrict selected server ports to the range given:
-perl ./daemon.pl 4035 10000-10010
+perl ./daemon.pl 4075 10000-10010

To start the server manually

If you do not have root access on a remote machine, you can