Bug 352800 - [ftp] Empty listing when connecting a WFTPD server on Windows

releng/org.eclipse.rse.updatesite/site.xml

@@ -752,7 +752,7 @@
    <feature url="features/org.eclipse.rse.dstore_3.3.1.qualifier.jar" id="org.eclipse.rse.dstore" version="3.3.1.qualifier">
       <category name="TM and RSE Uncategorized 3.3.1"/>
    </feature>
-   <feature url="features/org.eclipse.rse.ftp_3.0.300.qualifier.jar" id="org.eclipse.rse.ftp" version="3.0.300.qualifier">
+   <feature url="features/org.eclipse.rse.ftp_3.0.301.qualifier.jar" id="org.eclipse.rse.ftp" version="3.0.301.qualifier">
       <category name="TM and RSE Uncategorized 3.3.1"/>
    </feature>
    <feature url="features/org.eclipse.rse.local_2.1.300.qualifier.jar" id="org.eclipse.rse.local" version="2.1.300.qualifier">

releng/org.eclipse.tm.releng/maps/rse.map

@@ -4,7 +4,7 @@ feature@org.eclipse.rse=R33x_v201106281309,:pserver:anonymous:none@dev.eclipse.o
 feature@org.eclipse.rse.core=R33x_v201106281309,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/features/org.eclipse.rse.core-feature
 feature@org.eclipse.rse.dstore=R33x_v201106281309,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/features/org.eclipse.rse.dstore-feature
 feature@org.eclipse.rse.examples=v201103142315,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/examples/org.eclipse.rse.examples-feature
-feature@org.eclipse.rse.ftp=v201106011538,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/features/org.eclipse.rse.ftp-feature
+feature@org.eclipse.rse.ftp=R33x_v201107212114,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/features/org.eclipse.rse.ftp-feature
 feature@org.eclipse.rse.local=v201103142315,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/features/org.eclipse.rse.local-feature
 feature@org.eclipse.rse.sdk=R33x_v201106281309,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/features/org.eclipse.rse.sdk-feature
 feature@org.eclipse.rse.ssh=R33x_v201106281309,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/features/org.eclipse.rse.ssh-feature
@@ -43,7 +43,7 @@ plugin@org.eclipse.rse.services=R33x_v201106281309,:pserver:anonymous:none@dev.e
 plugin@org.eclipse.rse.shells.ui=R33x_v201107181530,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.shells.ui
 plugin@org.eclipse.rse.subsystems.files.core=R33x_v201107181530,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.files.core
 plugin@org.eclipse.rse.subsystems.files.dstore=v201103011700,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.files.dstore
-plugin@org.eclipse.rse.subsystems.files.ftp=v201101042155,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.files.ftp
+plugin@org.eclipse.rse.subsystems.files.ftp=R33x_v201107212114,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.files.ftp
 plugin@org.eclipse.rse.subsystems.files.local=v201101042155,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.files.local
 plugin@org.eclipse.rse.subsystems.files.ssh=v201101042155,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.files.ssh
 plugin@org.eclipse.rse.subsystems.processes.core=v201101042155,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.processes.core

rse/features/org.eclipse.rse.ftp-feature/feature.xml

@@ -12,7 +12,7 @@
 <feature
       id="org.eclipse.rse.ftp"
       label="%featureName"
-      version="3.0.300.qualifier"
+      version="3.0.301.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.rse.services.files.ftp">
 

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.300.qualifier
+Bundle-Version: 2.1.301.qualifier
 Bundle-Activator: org.eclipse.rse.internal.subsystems.files.ftp.Activator
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin

rse/plugins/org.eclipse.rse.subsystems.files.ftp/plugin.properties

@@ -32,6 +32,7 @@ FilesDescription=This configuration allows you to work with files on local or re
 
 FTPParser.UNIX=UNIX
 FTPParser.MVS=MVS
+FTPParser.WFTPD=Windows WFTPD
 FTPParser.WinNT=WinNT
 FTPParser.OS2=OS2
 FTPParser.OS400=OS400

rse/plugins/org.eclipse.rse.subsystems.files.ftp/plugin.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-     Copyright (c) 2006, 2009 IBM Corporation and others.
+     Copyright (c) 2006, 2011 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
@@ -61,6 +61,13 @@
             priority="100"
             systemTypeRegex=".*[Uu][Nn][Ii][Xx].*">
       </parser>
+      <parser
+            class="org.apache.commons.net.ftp.parser.UnixFTPEntryParser"
+            id="org.eclipse.rse.ftp.parser.WFTPD"
+            label="%FTPParser.WFTPD"
+            priority="100"
+            systemTypeRegex="MSDOS.*WFTPD.*">
+      </parser>
       <parser
             class="org.apache.commons.net.ftp.parser.MVSFTPEntryParser"
             systemTypeRegex=".*[Mm][Vv][Ss].*"