From 8efe8471ec33d28a4f87bc63de9cbcaa0a26399d Mon Sep 17 00:00:00 2001
From: Kaloyan Raev <kaloyan.r@zend.com>
Date: Wed, 28 Oct 2015 10:10:18 +0200
Subject: [PATCH] [480836] [ftp] cannot list directories on IBM i

Bug: 480836
Change-Id: I9c6c2c3534ee3bf48f19d080d0cd15c7ecb3490c
Signed-off-by: Kaloyan Raev <kaloyan.r@zend.com>
---
 .../META-INF/MANIFEST.MF                          |  2 +-
 .../plugin.xml                                    | 15 +++++++++++++--
 .../org.eclipse.rse.subsystems.files.ftp/pom.xml  |  2 +-
 3 files changed, 15 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 b8dcc493e14..b5a31d8ee8f 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.2.0.qualifier
+Bundle-Version: 2.2.100.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/plugin.xml b/rse/plugins/org.eclipse.rse.subsystems.files.ftp/plugin.xml
index 1c99595331b..f3303a741d1 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.files.ftp/plugin.xml
+++ b/rse/plugins/org.eclipse.rse.subsystems.files.ftp/plugin.xml
@@ -22,6 +22,7 @@
      Martin Oberhuber (Wind River) - [198692] Use FTP LIST -a to list UNIX hidden files
      Javier Montalvo Orus (Symbian) - [225821] [ftp] opening "/home" fails on OS/400 IFS
      Martin Oberhuber (Wind River) - [214141] Avoid NPE if missing SYST command
+     Kaloyan Raev (Zend) - [480836] cannot list directories on IBM i
  -->
 <?eclipse version="3.1"?>
 <plugin>
@@ -89,14 +90,24 @@
             label="%FTPParser.OS2"
             priority="100">
       </parser>
+      <!-- Bug 480836: Use Unix-style format for IBM i -->
       <parser
-            class="org.eclipse.rse.internal.subsystems.files.ftp.parser.RSEOS400FTPEntryParser"
+            class="org.apache.commons.net.ftp.parser.UnixFTPEntryParser"
             systemTypeRegex=".*[Oo][Ss]/400.*"
             id="org.eclipse.rse.ftp.parser.OS400"
             label="%FTPParser.OS400"
             priority="100">
          <initCommand
-               cmd="site namefmt 1">
+               cmd="SITE LISTFMT 1">
+         </initCommand>
+         <initCommand
+               cmd="SITE NAMEFMT 1">
+         </initCommand>
+         <initCommand
+               cmd="CWD /">
+         </initCommand>
+         <initCommand
+               cmd="CWD ~">
          </initCommand>
       </parser>
        <parser
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 6f5c252443f..01ad04e3bb2 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 @@
   </parent>
   <groupId>org.eclipse.tm</groupId>
   <artifactId>org.eclipse.rse.subsystems.files.ftp</artifactId>
-  <version>2.2.0-SNAPSHOT</version>
+  <version>2.2.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>