From 03f94f01c9181a95562628a88cb1d26c583d46c0 Mon Sep 17 00:00:00 2001 From: Martin Oberhuber Date: Wed, 15 May 2013 23:19:40 +0200 Subject: [PATCH] Bug 269442 - [ftp] FTP connections should use passive mode by default Change-Id: Ica81e2fe2afbbb84c4dac6218717c2c2e92c28dd Signed-off-by: Martin Oberhuber --- .../META-INF/MANIFEST.MF | 2 +- rse/plugins/org.eclipse.rse.subsystems.files.ftp/pom.xml | 2 +- .../files/ftp/connectorservice/FTPConnectorService.java | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.ftp/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.subsystems.files.ftp/META-INF/MANIFEST.MF index 917d07afd57..b8dcc493e14 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.files.ftp/META-INF/MANIFEST.MF +++ b/rse/plugins/org.eclipse.rse.subsystems.files.ftp/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.rse.subsystems.files.ftp;singleton:=true -Bundle-Version: 2.1.400.qualifier +Bundle-Version: 2.2.0.qualifier Bundle-Activator: org.eclipse.rse.internal.subsystems.files.ftp.Activator Bundle-Vendor: %providerName Bundle-Localization: plugin diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.ftp/pom.xml b/rse/plugins/org.eclipse.rse.subsystems.files.ftp/pom.xml index 8bca327223b..06d49eeb3eb 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.files.ftp/pom.xml +++ b/rse/plugins/org.eclipse.rse.subsystems.files.ftp/pom.xml @@ -10,6 +10,6 @@ org.eclipse.tm org.eclipse.rse.subsystems.files.ftp - 2.1.400-SNAPSHOT + 2.2.0-SNAPSHOT eclipse-plugin diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.ftp/src/org/eclipse/rse/internal/subsystems/files/ftp/connectorservice/FTPConnectorService.java b/rse/plugins/org.eclipse.rse.subsystems.files.ftp/src/org/eclipse/rse/internal/subsystems/files/ftp/connectorservice/FTPConnectorService.java index 1d7ba7ef91e..b6a69f4227e 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.files.ftp/src/org/eclipse/rse/internal/subsystems/files/ftp/connectorservice/FTPConnectorService.java +++ b/rse/plugins/org.eclipse.rse.subsystems.files.ftp/src/org/eclipse/rse/internal/subsystems/files/ftp/connectorservice/FTPConnectorService.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2008 IBM Corporation and others. + * Copyright (c) 2006, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -24,6 +24,7 @@ * Martin Oberhuber (Wind River) - [204669] Fix ftp path concatenation on systems using backslash separator * Martin Oberhuber (Wind River) - [203500] Support encodings for FTP paths * Martin Oberhuber (Wind River) - [235463][ftp][dstore] Incorrect case sensitivity reported on windows-remote + * Martin Oberhuber (Wind River) - [269442][ftp] Set passive mode by default *******************************************************************************/ package org.eclipse.rse.internal.subsystems.files.ftp.connectorservice; @@ -78,7 +79,7 @@ public class FTPConnectorService extends StandardConnectorService //Active - passive mode propertySet = createPropertySet("FTP Settings"); //$NON-NLS-1$ - propertySet.addProperty("passive","false",PropertyType.getEnumPropertyType(new String[]{"true","false"})); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ + propertySet.addProperty("passive","true",PropertyType.getEnumPropertyType(new String[]{"true","false"})); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ // FTP List parser String[] keys = FTPClientConfigFactory.getParserFactory().getKeySet();