brekke 2003/03/03 07:25:56
Modified: net/src/java/org/apache/commons/net/ftp/parser
VMSFTPEntryParser.java
net/src/test/org/apache/commons/net/ftp/parser
UnixFTPEntryParserTest.java
VMSFTPEntryParserTest.java
Log:
Updated to
Revision Changes Path
1.3 +21 -3
jakarta-commons/net/src/java/org/apache/commons/net/ftp/parser/VMSFTPEntryParser.java
Index: VMSFTPEntryParser.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/net/src/java/org/apache/commons/net/ftp/parser/VMSFTPEntryParser.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- VMSFTPEntryParser.java 2 Mar 2003 19:36:44 -0000 1.2
+++ VMSFTPEntryParser.java 3 Mar 2003 15:25:56 -0000 1.3
@@ -55,13 +55,15 @@
*/
import java.util.Calendar;
+import java.io.BufferedReader;
+import java.io.IOException;
import org.apache.commons.net.ftp.FTPFile;
import org.apache.commons.net.ftp.FTPFileListParserImpl;
/**
* This Class uses the FTPEntryParser class to validate the input string.
- * It also requires the NetComponents library version 1.3.7 or later
- * and the OROMatcher library for the regualar expressions stuff.
+ * It also requires the Commons/Net library version 1.0.0 or later
+ * and the Jakarta/ORO library for the regualar expressions stuff.
*
*
* <P><B>USAGE:</B></P>
@@ -241,5 +243,21 @@
return f;
}
return null;
+ }
+
+ public String readNextEntry(BufferedReader reader) throws IOException
+ {
+ String line = reader.readLine();
+ StringBuffer entry = new StringBuffer();
+ while (line != null)
+ {
+ entry.append(line);
+ if (line.trim().endsWith(")"))
+ {
+ break;
+ }
+ line = reader.readLine();
+ }
+ return (entry.length()==0 ? null : entry.toString());
}
}
1.4 +3 -4
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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- UnixFTPEntryParserTest.java 2 Mar 2003 19:47:00 -0000 1.3
+++ UnixFTPEntryParserTest.java 3 Mar 2003 15:25:56 -0000 1.4
@@ -54,13 +54,12 @@
* <http://www.apache.org/>.
*/
+import java.util.Calendar;
+
import junit.framework.TestSuite;
import org.apache.commons.net.ftp.FTPFile;
import org.apache.commons.net.ftp.FTPFileEntryParser;
-
-import java.util.Calendar;
-import java.util.Date;
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Steve Cohen</a>
1.4 +11 -3
jakarta-commons/net/src/test/org/apache/commons/net/ftp/parser/VMSFTPEntryParserTest.java
Index: VMSFTPEntryParserTest.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/net/src/test/org/apache/commons/net/ftp/parser/VMSFTPEntryParserTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- VMSFTPEntryParserTest.java 2 Mar 2003 19:47:00 -0000 1.3
+++ VMSFTPEntryParserTest.java 3 Mar 2003 15:25:56 -0000 1.4
@@ -88,7 +88,13 @@
"120196.TXT;1 118/126 14-APR-1997 12:45:27 [GROUP,OWNER]
(RWED,,RWED,RE)",
"30CHARBAR.TXT;1 11/18 2-JUN-1998 08:38:42 [GROUP,OWNER]
(RWED,RWED,RWED,RE)",
"A.;2 18/18 1-JUL-1998 08:43:20 [GROUP,OWNER]
(RWED,RWED,RWED,RE)",
- "AA.;2 152/153 13-FEB-1997 08:13:43 [GROUP,OWNER]
(RWED,RWED,RWED,RE)"
+ "AA.;2 152/153 13-FEB-1997 08:13:43 [GROUP,OWNER]
(RWED,RWED,RWED,RE)",
+ "UCX$REXECD_STARTUP.LOG;1098\r\n 4/15
24-FEB-2003 13:17:24 [POSTWARE,LP] (RWED,RWED,RE,)",
+ "UNARCHIVE.COM;1 2/15 7-JUL-1997 16:37:45 [POSTWARE,LP]
(RWE,RWE,RWE,RE)",
+ "UNXMERGE.COM;15 1/15 20-AUG-1996 13:59:50 [POSTWARE,LP]
(RWE,RWE,RWE,RE)",
+ "UNXTEMP.COM;7 1/15 15-AUG-1996 14:10:38 [POSTWARE,LP]
(RWE,RWE,RWE,RE)",
+ "UNZIP_AND_ATTACH_FILES.COM;12\r\n 14/15
24-JUL-2002 14:35:40 [POSTWARE,LP] (RWE,RWE,RWE,RE)",
+ "UNZIP_AND_ATTACH_FILES.SAV;1\r\n 14/15
17-JAN-2002 11:13:53 [POSTWARE,LP] (RWE,RWED,RWE,RE)"
};
/**
@@ -99,6 +105,8 @@
super(name);
}
+
+
/**
* @see
org.apache.commons.net.ftp.parser.FTPParseTestFramework#testParseFieldsOnDirectory()
*/
@@ -212,5 +220,5 @@
public static TestSuite suite()
{
return(new TestSuite(VMSFTPEntryParserTest.class));
- }
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
