FTPFile instance. If the
+ * file listing line doesn't describe a file, null is
+ * returned, otherwise a FTPFile instance representing the
+ * files in the directory is returned. This extension enables the R/W permission
+ * for NT parsing, setting it as true by default.
+ * + * @param entry A line of text from the file listing + * @return An FTPFile instance corresponding to the supplied entry + */ + public FTPFile parseFTPEntry(String entry) + { + FTPFile f = new FTPFile(); + f.setRawListing(entry); + + if (matches(entry)) + { + String datestr = group(1)+" "+group(2); //$NON-NLS-1$ + String dirString = group(3); + String size = group(4); + String name = group(5); + try + { + f.setTimestamp(super.parseTimestamp(datestr)); + } + catch (ParseException e) + { + return null; // this is a parsing failure too. + } + + if (null == name || name.equals(".") || name.equals("..")) //$NON-NLS-1$//$NON-NLS-2$ + { + return (null); + } + f.setName(name); + + + if ("
REGEX is not a valid regular expression.
+ */
+ public RSEVMSFTPEntryParser()
+ {
+ this(null);
+ }
+
+ /**
+ * This constructor allows the creation of a VMSFTPEntryParser object with
+ * something other than the default configuration.
+ *
+ * @param config The {@link FTPClientConfig configuration} object used to
+ * configure this parser.
+ * @exception IllegalArgumentException
+ * Thrown if the regular expression is unparseable. Should not be seen
+ * under normal conditions. It it is seen, this is a sign that
+ * REGEX is not a valid regular expression.
+ * @since 1.4
+ */
+ public RSEVMSFTPEntryParser(FTPClientConfig config)
+ {
+ super(REGEX);
+ configure(config);
+ }
+
+ /**
+ * Parses a line of a VMS FTP server file listing and converts it into a
+ * usable format in the form of an FTPFile instance. If the
+ * file listing line doesn't describe a file, null is
+ * returned, otherwise a FTPFile instance representing the
+ * files in the directory is returned.
+ * + * @param entry A line of text from the file listing + * @return An FTPFile instance corresponding to the supplied entry + */ + public FTPFile parseFTPEntry(String entry) + { + //one block in VMS equals 512 bytes + long longBlock = 512; + + if (matches(entry)) + { + FTPFile f = new FTPFile(); + f.setRawListing(entry); + String name = group(1); + String size = group(2); + String datestr = group(3)+" "+group(4); //$NON-NLS-1$ + String owner = group(5); + String permissions = group(9); + try + { + f.setTimestamp(super.parseTimestamp(datestr)); + } + catch (ParseException e) + { + return null; // this is a parsing failure too. + } + + + String grp; + String user; + StringTokenizer t = new StringTokenizer(owner, ","); //$NON-NLS-1$ + switch (t.countTokens()) { + case 1: + grp = null; + user = t.nextToken(); + break; + case 2: + grp = t.nextToken(); + user = t.nextToken(); + break; + default: + grp = null; + user = null; + } + + if (name.lastIndexOf(".DIR") != -1) //$NON-NLS-1$ + { + f.setType(FTPFile.DIRECTORY_TYPE); + } + else + { + f.setType(FTPFile.FILE_TYPE); + } + //set FTPFile name + //Check also for versions to be returned or not + if (isVersioning()) + { + f.setName(name); + } + else + { + name = name.substring(0, name.lastIndexOf(";")); //$NON-NLS-1$ + if(name.lastIndexOf(".DIR")!=-1) //$NON-NLS-1$ + { + name = name.substring(0, name.lastIndexOf(".DIR")); //$NON-NLS-1$ + } + f.setName(name); + } + //size is retreived in blocks and needs to be put in bytes + //for us humans and added to the FTPFile array + long sizeInBytes = Long.parseLong(size) * longBlock; + f.setSize(sizeInBytes); + + f.setGroup(grp); + f.setUser(user); + //set group and owner + + //Set file permission. + //VMS has (SYSTEM,OWNER,GROUP,WORLD) users that can contain + //R (read) W (write) E (execute) D (delete) + + t = new StringTokenizer(permissions, ","); //$NON-NLS-1$ + + //discard SYSTEM permission + t.nextElement(); + + //iterate for OWNER GROUP WORLD permissions + for (int access = 0; access < 3; access++) + { + String token = t.nextToken(); + + f.setPermission(access, FTPFile.READ_PERMISSION, token.indexOf('R')!=-1); + f.setPermission(access, FTPFile.WRITE_PERMISSION, token.indexOf('W')!=-1); + f.setPermission(access, FTPFile.EXECUTE_PERMISSION, token.indexOf('E')!=-1); + } + + return f; + } + return null; + } + + + /** + * Reads the next entry using the supplied BufferedReader object up to + * whatever delemits one entry from the next. This parser cannot use + * the default implementation of simply calling BufferedReader.readLine(), + * because one entry may span multiple lines. + * + * @param reader The BufferedReader object from which entries are to be + * read. + * + * @return A string representing the next ftp entry or null if none found. + * @exception IOException thrown on any IO Error reading from the reader. + */ + public String readNextEntry(BufferedReader reader) throws IOException + { + String line = reader.readLine(); + StringBuffer entry = new StringBuffer(); + while (line != null) + { + if (line.startsWith("Directory") || line.startsWith("Total")) { //$NON-NLS-1$//$NON-NLS-2$ + line = reader.readLine(); + continue; + } + + entry.append(line); + if (line.trim().endsWith(")")) //$NON-NLS-1$ + { + break; + } + line = reader.readLine(); + } + return (entry.length() == 0 ? null : entry.toString()); + } + + protected boolean isVersioning() { + return false; + } + + /** + * Defines a default configuration to be used when this class is + * instantiated without a {@link FTPClientConfig FTPClientConfig} + * parameter being specified. + * @return the default configuration for this parser. + */ +protected FTPClientConfig getDefaultConfiguration() { + return new FTPClientConfig( + FTPClientConfig.SYST_VMS, + DEFAULT_DATE_FORMAT, + null, null, null, null); + } + + +} 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 57b521d33f4..6457914d2d5 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 @@ -13,7 +13,8 @@ Require-Bundle: org.eclipse.ui, org.eclipse.rse.subsystems.files.core, org.eclipse.rse.core, org.eclipse.rse.ui, - org.eclipse.ui.console + org.eclipse.ui.console, + org.apache.commons.net Eclipse-LazyStart: true Export-Package: org.eclipse.rse.internal.subsystems.files.ftp;x-internal:=true, org.eclipse.rse.internal.subsystems.files.ftp.connectorservice;x-internal:=true, 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 403c1c9af3b..a0da901b16d 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.files.ftp/plugin.xml +++ b/rse/plugins/org.eclipse.rse.subsystems.files.ftp/plugin.xml @@ -42,5 +42,5 @@ Javier Montalvo Orus (Symbian) - [plan] Improve Discovery and Autodetect in RSE serviceType="_ftp._tcp"> - + 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 e14cb5d5d75..d76ad052a4d 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 @@ -16,11 +16,14 @@ * Javier Montalvo Orus (Symbian) - Bug 169680 - [ftp] FTP files subsystem and service should use passive mode * David Dykstal (IBM) - 168977: refactoring IConnectorService and ServerLauncher hierarchies * Martin Oberhuber (Wind River) - [cleanup] move FTPSubsystemResources out of core + * Javier Montalvo Orus (Symbian) - Fixing 176216 - [api] FTP sould provide API to allow clients register their own FTPListingParser ********************************************************************************/ package org.eclipse.rse.internal.subsystems.files.ftp.connectorservice; import java.io.OutputStream; +import java.util.Arrays; +import java.util.Set; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.rse.core.model.IHost; @@ -28,6 +31,7 @@ import org.eclipse.rse.core.model.IPropertySet; import org.eclipse.rse.core.model.PropertyType; import org.eclipse.rse.core.model.SystemSignonInformation; import org.eclipse.rse.internal.services.files.ftp.FTPService; +import org.eclipse.rse.internal.services.files.ftp.parser.FTPClientConfigFactory; import org.eclipse.rse.internal.subsystems.files.ftp.FTPSubsystemResources; import org.eclipse.rse.services.files.IFileService; import org.eclipse.rse.ui.subsystems.StandardConnectorService; @@ -51,8 +55,21 @@ public class FTPConnectorService extends StandardConnectorService if(_propertySet==null) { + + //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$ + + // FTP List parser + Set keys = FTPClientConfigFactory.getParserFactory().getKeySet(); + String[] keysArray = new String[keys.size()+1]; + + keys.toArray(keysArray); + keysArray[keysArray.length-1]="AUTO"; //$NON-NLS-1$ + + Arrays.sort(keysArray); + + _propertySet.addProperty("parser","AUTO",PropertyType.getEnumPropertyType(keysArray)); //$NON-NLS-1$ //$NON-NLS-2$ } } @@ -63,14 +80,7 @@ public class FTPConnectorService extends StandardConnectorService private void internalConnect() throws Exception { - _propertySet = getPropertySet("FTP Settings"); //$NON-NLS-1$ - - if(_propertySet==null) - { - _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$ - } - + SystemSignonInformation info = getSignonInformation(); _ftpService.setHostName(info.getHostname()); _ftpService.setUserId(info.getUserId());