diff --git a/rse/features/org.eclipse.rse.ssh-feature/feature.xml b/rse/features/org.eclipse.rse.ssh-feature/feature.xml index fccbc491ed5..1c0ee40e4fd 100644 --- a/rse/features/org.eclipse.rse.ssh-feature/feature.xml +++ b/rse/features/org.eclipse.rse.ssh-feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/rse/plugins/org.eclipse.rse.connectorservice.ssh/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.connectorservice.ssh/META-INF/MANIFEST.MF index 33ce8358298..9ee6b12dcbb 100644 --- a/rse/plugins/org.eclipse.rse.connectorservice.ssh/META-INF/MANIFEST.MF +++ b/rse/plugins/org.eclipse.rse.connectorservice.ssh/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.rse.connectorservice.ssh; singleton:=true -Bundle-Version: 2.0.0.qualifier +Bundle-Version: 2.0.1.qualifier Bundle-Activator: org.eclipse.rse.internal.connectorservice.ssh.Activator Bundle-Vendor: %providerName Bundle-Localization: plugin diff --git a/rse/plugins/org.eclipse.rse.connectorservice.ssh/src/org/eclipse/rse/internal/connectorservice/ssh/SshConnectorService.java b/rse/plugins/org.eclipse.rse.connectorservice.ssh/src/org/eclipse/rse/internal/connectorservice/ssh/SshConnectorService.java index 1db35eaece1..eb3729bca0c 100644 --- a/rse/plugins/org.eclipse.rse.connectorservice.ssh/src/org/eclipse/rse/internal/connectorservice/ssh/SshConnectorService.java +++ b/rse/plugins/org.eclipse.rse.connectorservice.ssh/src/org/eclipse/rse/internal/connectorservice/ssh/SshConnectorService.java @@ -11,6 +11,7 @@ * Martin Oberhuber (Wind River) - [175686] Adapted to new IJSchService API * - copied code from org.eclipse.team.cvs.ssh2/JSchSession (Copyright IBM) * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry + * Martin Oberhuber (Wind River) - [186761] make the port setting configurable *******************************************************************************/ package org.eclipse.rse.internal.connectorservice.ssh; @@ -61,11 +62,7 @@ public class SshConnectorService extends StandardConnectorService implements ISs private SessionLostHandler fSessionLostHandler; public SshConnectorService(IHost host) { - //TODO the port parameter doesnt really make sense here since - //it will be overridden when the subsystem initializes (through - //setPort() on our base class -- I assume the port is meant to - //be a local port. - super(SshConnectorResources.SshConnectorService_Name, SshConnectorResources.SshConnectorService_Description, host, 0); + super(SshConnectorResources.SshConnectorService_Name, SshConnectorResources.SshConnectorService_Description, host, SSH_DEFAULT_PORT); fSessionLostHandler = null; } @@ -94,6 +91,14 @@ public class SshConnectorService extends StandardConnectorService implements ISs // //---------------------------------------------------------------------- + protected int getSshPort() { + int port = getPort(); + if (port<=0) { + //Legacy "default port" setting + port = SSH_DEFAULT_PORT; + } + return port; + } protected void internalConnect(IProgressMonitor monitor) throws Exception { @@ -108,7 +113,7 @@ public class SshConnectorService extends StandardConnectorService implements ISs userInfo.aboutToConnect(); try { - session = createSession(user, password, host, SSH_DEFAULT_PORT, + session = createSession(user, password, host, getSshPort(), userInfo, monitor); //java.util.Hashtable config=new java.util.Hashtable(); diff --git a/rse/plugins/org.eclipse.rse.connectorservice.telnet/src/org/eclipse/rse/internal/connectorservice/telnet/TelnetConnectorService.java b/rse/plugins/org.eclipse.rse.connectorservice.telnet/src/org/eclipse/rse/internal/connectorservice/telnet/TelnetConnectorService.java index 894eb133730..1270a0eada8 100644 --- a/rse/plugins/org.eclipse.rse.connectorservice.telnet/src/org/eclipse/rse/internal/connectorservice/telnet/TelnetConnectorService.java +++ b/rse/plugins/org.eclipse.rse.connectorservice.telnet/src/org/eclipse/rse/internal/connectorservice/telnet/TelnetConnectorService.java @@ -16,6 +16,7 @@ * Martin Oberhuber (Wind River) - [187218] Fix error reporting for connect() * Sheldon D'souza (Celunite) - [187301] support multiple telnet shells * Sheldon D'souza (Celunite) - [194464] fix create multiple telnet shells quickly + * Martin Oberhuber (Wind River) - [186761] make the port setting configurable *******************************************************************************/ package org.eclipse.rse.internal.connectorservice.telnet; @@ -77,7 +78,7 @@ public class TelnetConnectorService extends StandardConnectorService implements public TelnetConnectorService(IHost host) { super(TelnetConnectorResources.TelnetConnectorService_Name, TelnetConnectorResources.TelnetConnectorService_Description, - host, 0); + host, TELNET_DEFAULT_PORT); fSessionLostHandler = null; telnetPropertySet = getTelnetPropertySet(); } @@ -132,6 +133,15 @@ public class TelnetConnectorService extends StandardConnectorService implements } } + protected int getTelnetPort() { + int port = getPort(); + if (port<=0) { + //Legacy "default port" setting + port = TELNET_DEFAULT_PORT; + } + return port; + } + public TelnetClient makeNewTelnetClient( IProgressMonitor monitor ) throws Exception { TelnetClient client = new TelnetClient(); String host = getHostName(); @@ -141,7 +151,7 @@ public class TelnetConnectorService extends StandardConnectorService implements Exception nestedException = null; try { Activator.trace("Telnet Service: Connecting....."); //$NON-NLS-1$ - client.connect(host, TELNET_DEFAULT_PORT); + client.connect(host, getTelnetPort()); SystemSignonInformation ssi = getSignonInformation(); if (ssi != null) { password = ssi.getPassword();