commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d..@apache.org
Subject cvs commit: jakarta-commons/net/xdocs changes.xml
Date Mon, 25 Aug 2003 22:29:49 GMT
dfs         2003/08/25 15:29:49

  Modified:    net/src/java/org/apache/commons/net/ftp/parser
                        UnixFTPEntryParser.java
               net/src/test/org/apache/commons/net/ftp/parser
                        EnterpriseUnixFTPEntryParserTest.java
                        UnixFTPEntryParserTest.java
               net/xdocs changes.xml
  Log:
  Changed listing pattern in UnixFTPEntryParser to account for missing
  space between user and group fields.
  "Matthieu Recouly" <matthieu.recouly@laposte.net> reported that
  some FTP servers will list files in this format (referencing
  http://www.javaworld.com/javaworld/jw-04-2003/jw-0404-ftp-p2.html)
  I added test cases for this listing format to UnixFTPEntryParserTest.java
  and EnterpriseUnixFTPEntryParserTest.java.  EnterpriseUnixFTPEntryParser
  already handles the format, but didn't have a test for it.  Reported
  change in changes.xml.
  
  Revision  Changes    Path
  1.3       +2 -2      jakarta-commons/net/src/java/org/apache/commons/net/ftp/parser/UnixFTPEntryParser.java
  
  Index: UnixFTPEntryParser.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/net/src/java/org/apache/commons/net/ftp/parser/UnixFTPEntryParser.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- UnixFTPEntryParser.java	6 Mar 2003 03:28:36 -0000	1.2
  +++ UnixFTPEntryParser.java	25 Aug 2003 22:29:49 -0000	1.3
  @@ -82,7 +82,7 @@
           + "(((r|-)(w|-)(x|-))((r|-)(w|-)(x|-))((r|-)(w|-)(x|-)))\\s+"
           + "(\\d+)\\s+"
           + "(\\S+)\\s+"
  -        + "(\\S+)\\s+"
  +        + "(?:(\\S+)\\s+)?"
           + "(\\d+)\\s+"
           + MONTHS + "\\s+"
           + "((?:[0-9])|(?:[0-2][0-9])|(?:3[0-1]))\\s+"
  
  
  
  1.4       +2 -1      jakarta-commons/net/src/test/org/apache/commons/net/ftp/parser/EnterpriseUnixFTPEntryParserTest.java
  
  Index: EnterpriseUnixFTPEntryParserTest.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/net/src/test/org/apache/commons/net/ftp/parser/EnterpriseUnixFTPEntryParserTest.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- EnterpriseUnixFTPEntryParserTest.java	5 Aug 2003 20:06:38 -0000	1.3
  +++ EnterpriseUnixFTPEntryParserTest.java	25 Aug 2003 22:29:49 -0000	1.4
  @@ -83,6 +83,7 @@
           "-rw-r--r--   1ftp       nogroup    126552 Jan 22  2001 zxJDBC-1.2.4.zip", 
           "-rw-r--r--   1 root     root       111325 Apr -7 18:79 zxJDBC-2.0.1b1.tar.gz",

           "drwxr-xr-x   2 root     root         4096 Mar  2 15:13 zxbox", 
  +        "drwxr-xr-x 1 usernameftp 512 Jan 29 23:32 prog",
           "drwxr-xr-x   2 root     root         4096 Aug 24  2001 zxjdbc", 
           "drwxr-xr-x   2 root     root         4096 Jan  4 00:03 zziplib", 
           "drwxr-xr-x   2 root     99           4096 Feb 23  2001 zzplayer", 
  
  
  
  1.5       +2 -1      jakarta-commons/net/src/test/org/apache/commons/net/ftp/parser/UnixFTPEntryParserTest.java
  
  Index: UnixFTPEntryParserTest.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/net/src/test/org/apache/commons/net/ftp/parser/UnixFTPEntryParserTest.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- UnixFTPEntryParserTest.java	3 Mar 2003 15:25:56 -0000	1.4
  +++ UnixFTPEntryParserTest.java	25 Aug 2003 22:29:49 -0000	1.5
  @@ -90,6 +90,7 @@
           "drwxr-xr-x   2 root     root         4096 Jan  4 00:03 zziplib", 
           "drwxr-xr-x   2 root     99           4096 Feb 23  2001 zzplayer", 
           "drwxr-xr-x   2 root     root         4096 Aug  6  2001 zztpp", 
  +        "drwxr-xr-x 1 usernameftp 512 Jan 29 23:32 prog",
           "lrw-r--r--   1 14       14          80284 Aug 22  2000 zxJDBC-1.2.3.tar.gz", 
           "frw-r--r--   1 14       staff      119926 Aug 22  2000 zxJDBC-1.2.3.zip", 
           "crw-r--r--   1 ftp      nogroup     83853 Jan 22  2001 zxJDBC-1.2.4.tar.gz", 
  
  
  
  1.11      +22 -0     jakarta-commons/net/xdocs/changes.xml
  
  Index: changes.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/net/xdocs/changes.xml,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- changes.xml	23 Jun 2003 12:47:39 -0000	1.10
  +++ changes.xml	25 Aug 2003 22:29:49 -0000	1.11
  @@ -7,6 +7,28 @@
   
     <body>
       <release version="1.0.1" date="In CVS">
  +<!-- Pending resubmission of patch.
  +      <action dev="dfs" type="add">
  +        Rory Winston &lt;Rory.Winston@telewest.co.uk&gt; provided
  +        patches to add the following extended NNTP commands to
  +        NNTPClient: XOVER, AUTHINFO USER, AUTHINFO PASS, and
  +        LIST ACTIVE.
  +      </action>
  +-->
  +      <action dev="dfs" type="fix">
  +        Applied variation of fix suggested by Matthieu Recouly
  +        &lt;matthieu.recouly@laposte.net&gt; so that
  +        UnixFTPEntryParser may handle listings of the form
  +        <pre>
  +        drwxr-xr-x 1 usernameftp 512 Jan 29 23:32 prog
  +        </pre>
  +        where the space between user name and group is omitted.
  +      </action>
  +      <action dev="dfs" type="fix">
  +        Applied patch from Stephane Este-Gracias
  +        &lt;sestegra@free.fr&gt; that fixes the parsing of
  +        VMS listings by VMSFTPEntryParser..
  +      </action>
         <action dev="brekke" type="fix">
           If the buffer queue run full, the run() method sometimes hangs forever.
           Changed wait() to wait(100) as with other changes in TelnetInputStream.
  
  
  

Mime
View raw message