commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rwins...@apache.org
Subject svn commit: r757233 - in /commons/proper/net/branches/NET_2_0/src: main/java/org/apache/commons/net/ftp/parser/UnixFTPEntryParser.java test/java/org/apache/commons/net/ftp/parser/OS400FTPEntryParserTest.java
Date Sun, 22 Mar 2009 18:46:16 GMT
Author: rwinston
Date: Sun Mar 22 18:46:16 2009
New Revision: 757233

URL: http://svn.apache.org/viewvc?rev=757233&view=rev
Log:
* Update UnixFTPEntryParser parser regex to enable parsing of timestamps with the day preceding
the month. Currently the parser can be configured to use this style of timestamp, but the
low-level matcher doesn't recognize it.
* Updare OS400FTPEntryParserTest: due to enhancements in UnixFTPEntryParser, some tests that
were previously marked as bad now pass.

Modified:
    commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/parser/UnixFTPEntryParser.java
    commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/ftp/parser/OS400FTPEntryParserTest.java

Modified: commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/parser/UnixFTPEntryParser.java
URL: http://svn.apache.org/viewvc/commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/parser/UnixFTPEntryParser.java?rev=757233&r1=757232&r2=757233&view=diff
==============================================================================
--- commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/parser/UnixFTPEntryParser.java
(original)
+++ commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/parser/UnixFTPEntryParser.java
Sun Mar 22 18:46:16 2009
@@ -91,7 +91,7 @@
         /*
           numeric or standard format date
         */
-        + "((?:\\d+[-/]\\d+[-/]\\d+)|(?:[a-zA-Z]+\\s+\\S+))\\s+"
+        + "((?:\\d+[-/]\\d+[-/]\\d+)|(?:[a-zA-Z0-9]+\\s+\\S+))\\s+"
         /* 
            year (for non-recent standard format) 
            or time (for numeric or recent standard format  

Modified: commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/ftp/parser/OS400FTPEntryParserTest.java
URL: http://svn.apache.org/viewvc/commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/ftp/parser/OS400FTPEntryParserTest.java?rev=757233&r1=757232&r2=757233&view=diff
==============================================================================
--- commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/ftp/parser/OS400FTPEntryParserTest.java
(original)
+++ commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/ftp/parser/OS400FTPEntryParserTest.java
Sun Mar 22 18:46:16 2009
@@ -42,7 +42,6 @@
                 "----rwxr-x   1PEP       0           4019 Mar 18 18:58 einladung.zip",
                 "----rwxr-x   1 PEP      0  xx        422 Mar 24 14:06 readme",
                 "----rwxr-x   1 PEP      0           8492 Apr 07 30:13 build.xml",
-                "d---rwxr-x   2 PEP USR  0          45056 Mar 24 14:06 dir1",
                 "d---rwxr-x   2 PEP      0          45056Mar 24 14:06 zdir2"
             }
     };



Mime
View raw message