diff options
| author | David Dykstal | 2006-06-21 01:45:52 +0000 |
|---|---|---|
| committer | David Dykstal | 2006-06-21 01:45:52 +0000 |
| commit | 4d64b6d3ff474e0e449a485a8c6418b7e22f6c24 (patch) | |
| tree | 06f2c325b1f5e15b8b185689dba525a4b4249937 | |
| parent | bdfd3308eb3380f488575853f38a22a3b9d80399 (diff) | |
| download | org.eclipse.tm-4d64b6d3ff474e0e449a485a8c6418b7e22f6c24.tar.gz org.eclipse.tm-4d64b6d3ff474e0e449a485a8c6418b7e22f6c24.tar.xz org.eclipse.tm-4d64b6d3ff474e0e449a485a8c6418b7e22f6c24.zip | |
Bug 140348 - FTP should pay attention to port number.
2 files changed, 13 insertions, 2 deletions
diff --git a/rse/plugins/org.eclipse.rse.services.files.ftp/src/org/eclipse/rse/services/files/ftp/FTPService.java b/rse/plugins/org.eclipse.rse.services.files.ftp/src/org/eclipse/rse/services/files/ftp/FTPService.java index c735cc914..264bd235c 100644 --- a/rse/plugins/org.eclipse.rse.services.files.ftp/src/org/eclipse/rse/services/files/ftp/FTPService.java +++ b/rse/plugins/org.eclipse.rse.services.files.ftp/src/org/eclipse/rse/services/files/ftp/FTPService.java @@ -14,6 +14,7 @@ * Michael Berger (IBM) - Fixing 140408 - FTP upload does not work * Javier Montalvo Orus (Symbian) - Fixing 140323 - provided implementation for * delete, move and rename. + * Javier Montalvo Orus (Symbian) - Bug 140348 - FTP did not use port number ********************************************************************************/ package org.eclipse.rse.services.files.ftp; @@ -55,6 +56,7 @@ public class FTPService extends AbstractFileService implements IFileService, IFT private transient String _hostname; private transient String _userId; private transient String _password; + private transient int _portNumber; private URLConnection _urlConnection; public FTPService() @@ -76,6 +78,10 @@ public class FTPService extends AbstractFileService implements IFileService, IFT _hostname = hostname; } + public void setPortNumber(int portNumber) { + _portNumber = portNumber; + } + public void setUserId(String userId) { _userId = userId; @@ -90,7 +96,11 @@ public class FTPService extends AbstractFileService implements IFileService, IFT public void connect() throws Exception { FtpClient ftp = getFTPClient(); - ftp.openServer(_hostname); + if (_portNumber == 0) { + ftp.openServer(_hostname); + } else { + ftp.openServer(_hostname, _portNumber); + } ftp.login(_userId, _password); _userHome = ftp.pwd(); diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.ftp/src/org/eclipse/rse/subsystems/files/ftp/connectorservice/FTPConnectorService.java b/rse/plugins/org.eclipse.rse.subsystems.files.ftp/src/org/eclipse/rse/subsystems/files/ftp/connectorservice/FTPConnectorService.java index 9c7f1e041..9cf233f48 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.files.ftp/src/org/eclipse/rse/subsystems/files/ftp/connectorservice/FTPConnectorService.java +++ b/rse/plugins/org.eclipse.rse.subsystems.files.ftp/src/org/eclipse/rse/subsystems/files/ftp/connectorservice/FTPConnectorService.java @@ -11,7 +11,7 @@ * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley. * * Contributors: - * {Name} (company) - description of contribution. + * Javier Montalvo Orus (Symbian) - Bug 140348 - FTP did not use port number ********************************************************************************/ package org.eclipse.rse.subsystems.files.ftp.connectorservice; @@ -47,6 +47,7 @@ public class FTPConnectorService extends AbstractConnectorService _ftpService.setHostName(info.getHostname()); _ftpService.setUserId(info.getUserid()); _ftpService.setPassword(info.getPassword()); + _ftpService.setPortNumber(getPort()); _ftpService.connect(); } |