martinc 2003/11/25 21:57:06 Modified: src/share/org/apache/struts/upload BufferedMultipartInputStream.java ContentLengthExceededException.java DiskFile.java DiskMultipartRequestHandler.java MaxLengthExceededException.java MultipartBoundaryInputStream.java MultipartElement.java MultipartIterator.java MultipartValueStream.java Log: Deprecate DiskMultipartRequestHandler and friends, which is the buggy old upload implementation, no longer used as the default as of Struts 1.1. This will be removed after 1.2 (meaning as of 1.3/2.0). Revision Changes Path 1.9 +6 -3 jakarta-struts/src/share/org/apache/struts/upload/BufferedMultipartInputStream.java Index: BufferedMultipartInputStream.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/upload/BufferedMultipartInputStream.java,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- BufferedMultipartInputStream.java 7 Nov 2002 05:58:03 -0000 1.8 +++ BufferedMultipartInputStream.java 26 Nov 2003 05:57:06 -0000 1.9 @@ -69,6 +69,9 @@ * This class implements buffering for an InputStream as well as a * readLine method. The purpose of this is to provide a reliable * readLine() method. + * + * @deprecated Use the Commons FileUpload based multipart handler instead. This + * class will be removed after Struts 1.2. */ public class BufferedMultipartInputStream extends InputStream { 1.3 +6 -3 jakarta-struts/src/share/org/apache/struts/upload/ContentLengthExceededException.java Index: ContentLengthExceededException.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/upload/ContentLengthExceededException.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ContentLengthExceededException.java 6 Jul 2002 04:44:07 -0000 1.2 +++ ContentLengthExceededException.java 26 Nov 2003 05:57:06 -0000 1.3 @@ -66,6 +66,9 @@ /** * This exception is thrown when multipart post data exceeds the value * given by the Content-Length header + * + * @deprecated Use the Commons FileUpload based multipart handler instead. This + * class will be removed after Struts 1.2. */ public class ContentLengthExceededException extends IOException { 1.5 +7 -3 jakarta-struts/src/share/org/apache/struts/upload/DiskFile.java Index: DiskFile.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/upload/DiskFile.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- DiskFile.java 8 Dec 2002 07:12:16 -0000 1.4 +++ DiskFile.java 26 Nov 2003 05:57:06 -0000 1.5 @@ -68,6 +68,10 @@ import java.io.ByteArrayOutputStream; import java.io.FileNotFoundException; +/** + * @deprecated Use the Commons FileUpload based multipart handler instead. This + * class will be removed after Struts 1.2. + */ public class DiskFile implements FormFile { /** 1.25 +6 -3 jakarta-struts/src/share/org/apache/struts/upload/DiskMultipartRequestHandler.java Index: DiskMultipartRequestHandler.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/upload/DiskMultipartRequestHandler.java,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- DiskMultipartRequestHandler.java 2 Aug 2003 22:22:13 -0000 1.24 +++ DiskMultipartRequestHandler.java 26 Nov 2003 05:57:06 -0000 1.25 @@ -82,6 +82,9 @@ * to temporary files on disk. * * @author Mike Schachter + * + * @deprecated Use the Commons FileUpload based multipart handler instead. This + * class will be removed after Struts 1.2. */ public class DiskMultipartRequestHandler implements MultipartRequestHandler { 1.3 +6 -3 jakarta-struts/src/share/org/apache/struts/upload/MaxLengthExceededException.java Index: MaxLengthExceededException.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/upload/MaxLengthExceededException.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- MaxLengthExceededException.java 6 Jul 2002 04:44:07 -0000 1.2 +++ MaxLengthExceededException.java 26 Nov 2003 05:57:06 -0000 1.3 @@ -66,6 +66,9 @@ /** * This exception is thrown when multipart post data exceeds the maximum * value set + * + * @deprecated Use the Commons FileUpload based multipart handler instead. This + * class will be removed after Struts 1.2. */ public class MaxLengthExceededException extends IOException { 1.3 +6 -3 jakarta-struts/src/share/org/apache/struts/upload/MultipartBoundaryInputStream.java Index: MultipartBoundaryInputStream.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/upload/MultipartBoundaryInputStream.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- MultipartBoundaryInputStream.java 6 Jul 2002 04:44:07 -0000 1.2 +++ MultipartBoundaryInputStream.java 26 Nov 2003 05:57:06 -0000 1.3 @@ -70,6 +70,9 @@ * and MultipartIterator for usage examples. * * @author Mike Schachter + * + * @deprecated Use the Commons FileUpload based multipart handler instead. This + * class will be removed after Struts 1.2. */ public class MultipartBoundaryInputStream extends InputStream { 1.7 +6 -3 jakarta-struts/src/share/org/apache/struts/upload/MultipartElement.java Index: MultipartElement.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/upload/MultipartElement.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- MultipartElement.java 31 Jul 2003 03:53:23 -0000 1.6 +++ MultipartElement.java 26 Nov 2003 05:57:06 -0000 1.7 @@ -71,6 +71,9 @@ * files have a non-null content type. * * @author Mike Schachter + * + * @deprecated Use the Commons FileUpload based multipart handler instead. This + * class will be removed after Struts 1.2. */ public class MultipartElement { 1.24 +6 -3 jakarta-struts/src/share/org/apache/struts/upload/MultipartIterator.java Index: MultipartIterator.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/upload/MultipartIterator.java,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- MultipartIterator.java 13 May 2003 16:09:22 -0000 1.23 +++ MultipartIterator.java 26 Nov 2003 05:57:06 -0000 1.24 @@ -90,6 +90,9 @@ * * @see org.apache.struts.upload.MultipartElement * @author Mike Schachter + * + * @deprecated Use the Commons FileUpload based multipart handler instead. This + * class will be removed after Struts 1.2. */ public class MultipartIterator { 1.5 +6 -3 jakarta-struts/src/share/org/apache/struts/upload/MultipartValueStream.java Index: MultipartValueStream.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/upload/MultipartValueStream.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- MultipartValueStream.java 8 Dec 2002 07:12:17 -0000 1.4 +++ MultipartValueStream.java 26 Nov 2003 05:57:06 -0000 1.5 @@ -77,6 +77,9 @@ * <p> * * @author Jimmy Larsson + * + * @deprecated Use the Commons FileUpload based multipart handler instead. This + * class will be removed after Struts 1.2. */ class MultipartValueStream extends InputStream {
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]