mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-08-27 02:03:22 +02:00
[194442] Change dstore default daemon port
This commit is contained in:
parent
80bfdd4266
commit
77f7cf4637
11 changed files with 20 additions and 19 deletions
|
@ -78,12 +78,12 @@ cd /opt/rseserver
|
||||||
perl ./daemon.pl [daemonPort] [serverPortRange]</pre>
|
perl ./daemon.pl [daemonPort] [serverPortRange]</pre>
|
||||||
</li>
|
</li>
|
||||||
</ol>
|
</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/>
|
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
|
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
|
<i>serverPortRange</i> argument to restrict selected server ports to the
|
||||||
range given:<pre>
|
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>
|
<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
|
<div class="p">If you do not have root access on a remote machine, you can
|
||||||
|
|
|
@ -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.
|
with the file system and run commands.
|
||||||
<span style="font-weight: bold;">Use of the server daemon on Windows systems is not recommended</span>.
|
<span style="font-weight: bold;">Use of the server daemon on Windows systems is not recommended</span>.
|
||||||
</p>
|
</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/>
|
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
|
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
|
<i>serverPortRange</i> argument to restrict selected server ports to the
|
||||||
range given:<pre>
|
range given:<pre>
|
||||||
daemon.bat 4035 10000-10010</pre>
|
daemon.bat 4075 10000-10010</pre>
|
||||||
</blockquote>
|
</blockquote>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
|
@ -619,7 +619,7 @@ public class ClientConnection
|
||||||
*/
|
*/
|
||||||
public ConnectionStatus launchServer(String user, String password)
|
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);
|
return launchServer(user, password, ServerLauncher.DEFAULT_DAEMON_PORT);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -408,7 +408,7 @@ public class ServerLauncher extends Thread {
|
||||||
|
|
||||||
private ISSLProperties _sslProperties;
|
private ISSLProperties _sslProperties;
|
||||||
|
|
||||||
public static int DEFAULT_DAEMON_PORT = 4035;
|
public static int DEFAULT_DAEMON_PORT = 4075;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Constructor
|
* Constructor
|
||||||
|
@ -645,7 +645,7 @@ public class ServerLauncher extends Thread {
|
||||||
* Entry point into the DataStore daemon
|
* Entry point into the DataStore daemon
|
||||||
*
|
*
|
||||||
* @param args
|
* @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
|
* Optionally, the second arg specifies whether to use SSL or
|
||||||
* not. an optional second arg can be used to specify the port
|
* not. an optional second arg can be used to specify the port
|
||||||
* range of servers that get launched
|
* range of servers that get launched
|
||||||
|
|
|
@ -78,7 +78,7 @@ public class RemoteServerLauncher extends ServerLauncher implements IRemoteServe
|
||||||
|
|
||||||
protected int _rexecPort = REXEC_PORT_EDEFAULT;
|
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;
|
protected int _daemonPort = DAEMON_PORT_EDEFAULT;
|
||||||
|
|
||||||
|
|
|
@ -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.
|
* Default REXEC port, 512.
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
# IBM Corporation - initial API and implementation
|
# IBM Corporation - initial API and implementation
|
||||||
#*******************************************************************************
|
#*******************************************************************************
|
||||||
|
|
||||||
$port = "4035";
|
$port = "4075";
|
||||||
$helpFlag = "-h";
|
$helpFlag = "-h";
|
||||||
$dir = ".";
|
$dir = ".";
|
||||||
|
|
||||||
|
|
|
@ -11,7 +11,7 @@
|
||||||
#*******************************************************************************
|
#*******************************************************************************
|
||||||
|
|
||||||
# Arguments:
|
# 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
|
# ARGV[1] is the directory that contains RSE DStore server jar files and
|
||||||
# installation supplied miner class files. The default is the working
|
# installation supplied miner class files. The default is the working
|
||||||
# directory.
|
# directory.
|
||||||
|
@ -26,7 +26,7 @@
|
||||||
# Does not return if the daemon starts successfully. Terminate the
|
# Does not return if the daemon starts successfully. Terminate the
|
||||||
# daemon with a signal such as TERM or INT.
|
# daemon with a signal such as TERM or INT.
|
||||||
|
|
||||||
$port = $ARGV[0] || "4035";
|
$port = $ARGV[0] || "4075";
|
||||||
$plugin_dir = $ARGV[1] || $ENV{PWD};
|
$plugin_dir = $ARGV[1] || $ENV{PWD};
|
||||||
$trace = $ENV{DSTORE_TRACING_ON} || "0";
|
$trace = $ENV{DSTORE_TRACING_ON} || "0";
|
||||||
$debug = $ENV{DSTORE_DEBUG_ON} || "0";
|
$debug = $ENV{DSTORE_DEBUG_ON} || "0";
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
# IBM Corporation - initial API and implementation
|
# IBM Corporation - initial API and implementation
|
||||||
#*******************************************************************************
|
#*******************************************************************************
|
||||||
|
|
||||||
$port = "4035";
|
$port = "4075";
|
||||||
$helpFlag = "-h";
|
$helpFlag = "-h";
|
||||||
$dir = ".";
|
$dir = ".";
|
||||||
|
|
||||||
|
|
|
@ -17,7 +17,7 @@ REM Usage: daemon.bat [<port> | <low port>-<high port>] [ <low server port>-<hig
|
||||||
REM
|
REM
|
||||||
setlocal
|
setlocal
|
||||||
|
|
||||||
SET DaemonPort=4035
|
SET DaemonPort=4075
|
||||||
SET ServerPortRange=
|
SET ServerPortRange=
|
||||||
IF NOT "%1"=="" SET DaemonPort=%1
|
IF NOT "%1"=="" SET DaemonPort=%1
|
||||||
IF NOT "%2"=="" SET ServerPortRange=%2
|
IF NOT "%2"=="" SET ServerPortRange=%2
|
||||||
|
|
|
@ -17,6 +17,7 @@
|
||||||
|
|
||||||
package org.eclipse.rse.ui.validators;
|
package org.eclipse.rse.ui.validators;
|
||||||
|
|
||||||
|
import org.eclipse.rse.core.subsystems.RemoteServerLauncherConstants;
|
||||||
import org.eclipse.rse.ui.ISystemMessages;
|
import org.eclipse.rse.ui.ISystemMessages;
|
||||||
import org.eclipse.rse.ui.RSEUIPlugin;
|
import org.eclipse.rse.ui.RSEUIPlugin;
|
||||||
|
|
||||||
|
@ -34,10 +35,10 @@ public class ValidatorServerPortInput extends ValidatorPortInput
|
||||||
if (msg == null)
|
if (msg == null)
|
||||||
{
|
{
|
||||||
// check that it's not a used port
|
// 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 = 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();
|
msg = currentMessage.getLevelOneText();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -52,10 +53,10 @@ public class ValidatorServerPortInput extends ValidatorPortInput
|
||||||
if (msg == null)
|
if (msg == null)
|
||||||
{
|
{
|
||||||
// check that it's not a used port
|
// 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 = 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();
|
msg = currentMessage.getLevelOneText();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue