You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by se...@apache.org on 2013/03/06 12:23:41 UTC

svn commit: r1453294 - in /commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload: DefaultFileItem.java DefaultFileItemFactory.java DiskFileUpload.java FileUploadBase.java MultipartStream.java

Author: sebb
Date: Wed Mar  6 11:23:41 2013
New Revision: 1453294

URL: http://svn.apache.org/r1453294
Log:
Add versions to @deprecated markers

Modified:
    commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/DefaultFileItem.java
    commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/DefaultFileItemFactory.java
    commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/DiskFileUpload.java
    commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/FileUploadBase.java
    commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/MultipartStream.java

Modified: commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/DefaultFileItem.java
URL: http://svn.apache.org/viewvc/commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/DefaultFileItem.java?rev=1453294&r1=1453293&r2=1453294&view=diff
==============================================================================
--- commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/DefaultFileItem.java (original)
+++ commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/DefaultFileItem.java Wed Mar  6 11:23:41 2013
@@ -41,7 +41,7 @@ import org.apache.commons.fileupload.dis
  *
  * @version $Id$
  *
- * @deprecated Use <code>DiskFileItem</code> instead.
+ * @deprecated 1.1 Use <code>DiskFileItem</code> instead.
  */
 @Deprecated
 public class DefaultFileItem
@@ -71,7 +71,7 @@ public class DefaultFileItem
      *                      which files will be created, should the item size
      *                      exceed the threshold.
      *
-     * @deprecated Use <code>DiskFileItem</code> instead.
+     * @deprecated 1.1 Use <code>DiskFileItem</code> instead.
      */
     @Deprecated
     public DefaultFileItem(String fieldName, String contentType,

Modified: commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/DefaultFileItemFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/DefaultFileItemFactory.java?rev=1453294&r1=1453293&r2=1453294&view=diff
==============================================================================
--- commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/DefaultFileItemFactory.java (original)
+++ commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/DefaultFileItemFactory.java Wed Mar  6 11:23:41 2013
@@ -41,7 +41,7 @@ import org.apache.commons.fileupload.dis
  *
  * @version $Id$
  *
- * @deprecated Use <code>DiskFileItemFactory</code> instead.
+ * @deprecated 1.1 Use <code>DiskFileItemFactory</code> instead.
  */
 @Deprecated
 public class DefaultFileItemFactory extends DiskFileItemFactory {
@@ -52,7 +52,7 @@ public class DefaultFileItemFactory exte
      * Constructs an unconfigured instance of this class. The resulting factory
      * may be configured by calling the appropriate setter methods.
      *
-     * @deprecated Use <code>DiskFileItemFactory</code> instead.
+     * @deprecated 1.1 Use <code>DiskFileItemFactory</code> instead.
      */
     @Deprecated
     public DefaultFileItemFactory() {
@@ -69,7 +69,7 @@ public class DefaultFileItemFactory exte
      *                      which files will be created, should the item size
      *                      exceed the threshold.
      *
-     * @deprecated Use <code>DiskFileItemFactory</code> instead.
+     * @deprecated 1.1 Use <code>DiskFileItemFactory</code> instead.
      */
     @Deprecated
     public DefaultFileItemFactory(int sizeThreshold, File repository) {
@@ -92,7 +92,7 @@ public class DefaultFileItemFactory exte
      *
      * @return The newly created file item.
      *
-     * @deprecated Use <code>DiskFileItemFactory</code> instead.
+     * @deprecated 1.1 Use <code>DiskFileItemFactory</code> instead.
      */
     @Override
     @Deprecated

Modified: commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/DiskFileUpload.java
URL: http://svn.apache.org/viewvc/commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/DiskFileUpload.java?rev=1453294&r1=1453293&r2=1453294&view=diff
==============================================================================
--- commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/DiskFileUpload.java (original)
+++ commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/DiskFileUpload.java Wed Mar  6 11:23:41 2013
@@ -43,7 +43,7 @@ import javax.servlet.http.HttpServletReq
  *
  * @version $Id$
  *
- * @deprecated Use <code>ServletFileUpload</code> together with
+ * @deprecated 1.1 Use <code>ServletFileUpload</code> together with
  *             <code>DiskFileItemFactory</code> instead.
  */
 @Deprecated
@@ -65,7 +65,7 @@ public class DiskFileUpload
      *
      * @see #DiskFileUpload(DefaultFileItemFactory fileItemFactory)
      *
-     * @deprecated Use <code>FileUpload</code> instead.
+     * @deprecated 1.1 Use <code>FileUpload</code> instead.
      */
     @Deprecated
     public DiskFileUpload() {
@@ -80,7 +80,7 @@ public class DiskFileUpload
      * @see #DiskFileUpload()
      * @param fileItemFactory The file item factory to use.
      *
-     * @deprecated Use <code>FileUpload</code> instead.
+     * @deprecated 1.1 Use <code>FileUpload</code> instead.
      */
     @Deprecated
     public DiskFileUpload(DefaultFileItemFactory fileItemFactory) {
@@ -95,7 +95,7 @@ public class DiskFileUpload
      *
      * @return The factory class for new file items.
      *
-     * @deprecated Use <code>FileUpload</code> instead.
+     * @deprecated 1.1 Use <code>FileUpload</code> instead.
      */
     @Override
     @Deprecated
@@ -110,7 +110,7 @@ public class DiskFileUpload
      *
      * @param factory The factory class for new file items.
      *
-     * @deprecated Use <code>FileUpload</code> instead.
+     * @deprecated 1.1 Use <code>FileUpload</code> instead.
      */
     @Override
     @Deprecated
@@ -126,7 +126,7 @@ public class DiskFileUpload
      *
      * @see #setSizeThreshold(int)
      *
-     * @deprecated Use <code>DiskFileItemFactory</code> instead.
+     * @deprecated 1.1 Use <code>DiskFileItemFactory</code> instead.
      */
     @Deprecated
     public int getSizeThreshold() {
@@ -140,7 +140,7 @@ public class DiskFileUpload
      *
      * @see #getSizeThreshold()
      *
-     * @deprecated Use <code>DiskFileItemFactory</code> instead.
+     * @deprecated 1.1 Use <code>DiskFileItemFactory</code> instead.
      */
     @Deprecated
     public void setSizeThreshold(int sizeThreshold) {
@@ -155,7 +155,7 @@ public class DiskFileUpload
      *
      * @see #setRepositoryPath(String)
      *
-     * @deprecated Use <code>DiskFileItemFactory</code> instead.
+     * @deprecated 1.1 Use <code>DiskFileItemFactory</code> instead.
      */
     @Deprecated
     public String getRepositoryPath() {
@@ -170,7 +170,7 @@ public class DiskFileUpload
      *
      * @see #getRepositoryPath()
      *
-     * @deprecated Use <code>DiskFileItemFactory</code> instead.
+     * @deprecated 1.1 Use <code>DiskFileItemFactory</code> instead.
      */
     @Deprecated
     public void setRepositoryPath(String repositoryPath) {
@@ -195,7 +195,7 @@ public class DiskFileUpload
      * @throws FileUploadException if there are problems reading/parsing
      *                             the request or storing files.
      *
-     * @deprecated Use <code>ServletFileUpload</code> instead.
+     * @deprecated 1.1 Use <code>ServletFileUpload</code> instead.
      */
     @Deprecated
     public List<FileItem> parseRequest(HttpServletRequest req,

Modified: commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/FileUploadBase.java
URL: http://svn.apache.org/viewvc/commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/FileUploadBase.java?rev=1453294&r1=1453293&r2=1453294&view=diff
==============================================================================
--- commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/FileUploadBase.java (original)
+++ commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/FileUploadBase.java Wed Mar  6 11:23:41 2013
@@ -102,7 +102,7 @@ public abstract class FileUploadBase {
      * @return <code>true</code> if the request is multipart;
      *         <code>false</code> otherwise.
      *
-     * @deprecated Use the method on <code>ServletFileUpload</code> instead.
+     * @deprecated 1.1 Use the method on <code>ServletFileUpload</code> instead.
      */
     @Deprecated
     public static boolean isMultipartContent(HttpServletRequest req) {
@@ -307,7 +307,7 @@ public abstract class FileUploadBase {
      * @throws FileUploadException if there are problems reading/parsing
      *                             the request or storing files.
      *
-     * @deprecated Use {@link ServletFileUpload#parseRequest(HttpServletRequest)} instead.
+     * @deprecated 1.1 Use {@link ServletFileUpload#parseRequest(HttpServletRequest)} instead.
      */
     @Deprecated
     public List<FileItem> parseRequest(HttpServletRequest req)
@@ -439,7 +439,7 @@ public abstract class FileUploadBase {
      * @param headers A <code>Map</code> containing the HTTP request headers.
      *
      * @return The file name for the current <code>encapsulation</code>.
-     * @deprecated Use {@link #getFileName(FileItemHeaders)}.
+     * @deprecated 1.2.1 Use {@link #getFileName(FileItemHeaders)}.
      */
     @Deprecated
     protected String getFileName(Map<String, String> headers) {
@@ -530,7 +530,7 @@ public abstract class FileUploadBase {
      * @param headers A <code>Map</code> containing the HTTP request headers.
      *
      * @return The field name for the current <code>encapsulation</code>.
-     * @deprecated Use {@link #getFieldName(FileItemHeaders)}.
+     * @deprecated 1.2.1 Use {@link #getFieldName(FileItemHeaders)}.
      */
     @Deprecated
     protected String getFieldName(Map<String, String> headers) {
@@ -549,7 +549,7 @@ public abstract class FileUploadBase {
      * @return A newly created <code>FileItem</code> instance.
      *
      * @throws FileUploadException if an error occurs.
-     * @deprecated This method is no longer used in favour of
+     * @deprecated 1.2 This method is no longer used in favour of
      *   internally created instances of {@link FileItem}.
      */
     @Deprecated
@@ -626,7 +626,7 @@ public abstract class FileUploadBase {
      *                   <code>encapsulation</code>.
      *
      * @return A <code>Map</code> containing the parsed HTTP request headers.
-     * @deprecated Use {@link #getParsedHeaders(String)}
+     * @deprecated 1.2.1 Use {@link #getParsedHeaders(String)}
      */
     @Deprecated
     protected Map<String, String> parseHeaders(String headerPart) {
@@ -693,7 +693,7 @@ public abstract class FileUploadBase {
      *
      * @return The value of specified header, or a comma-separated list if
      *         there were multiple headers of that name.
-     * @deprecated Use {@link FileItemHeaders#getHeader(String)}.
+     * @deprecated 1.2.1 Use {@link FileItemHeaders#getHeader(String)}.
      */
     @Deprecated
     protected final String getHeader(Map<String, String> headers,
@@ -1227,7 +1227,7 @@ public abstract class FileUploadBase {
      * Thrown to indicate that the request size is not specified. In other
      * words, it is thrown, if the content-length header is missing or
      * contains the value -1.
-     * @deprecated As of commons-fileupload 1.2, the presence of a
+     * @deprecated 1.2 As of commons-fileupload 1.2, the presence of a
      *   content-length header is no longer required.
      */
     @Deprecated
@@ -1266,7 +1266,7 @@ public abstract class FileUploadBase {
         private static final long serialVersionUID = -2474893167098052828L;
 
         /**
-         * @deprecated Replaced by
+         * @deprecated 1.2 Replaced by
          * {@link #SizeLimitExceededException(String, long, long)}
          */
         @Deprecated
@@ -1275,7 +1275,7 @@ public abstract class FileUploadBase {
         }
 
         /**
-         * @deprecated Replaced by
+         * @deprecated 1.2 Replaced by
          * {@link #SizeLimitExceededException(String, long, long)}
          * @param message The exceptions detail message.
          */

Modified: commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/MultipartStream.java
URL: http://svn.apache.org/viewvc/commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/MultipartStream.java?rev=1453294&r1=1453293&r2=1453294&view=diff
==============================================================================
--- commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/MultipartStream.java (original)
+++ commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/MultipartStream.java Wed Mar  6 11:23:41 2013
@@ -271,7 +271,7 @@ public class MultipartStream {
     /**
      * Creates a new instance.
      *
-     * @deprecated Use {@link #MultipartStream(InputStream, byte[],
+     * @deprecated 1.2.1 Use {@link #MultipartStream(InputStream, byte[],
      * org.apache.commons.fileupload.MultipartStream.ProgressNotifier)},
      * or {@link #MultipartStream(InputStream, byte[], int,
      * org.apache.commons.fileupload.MultipartStream.ProgressNotifier)}
@@ -297,7 +297,7 @@ public class MultipartStream {
      *
      * @see #MultipartStream(InputStream, byte[],
      *   MultipartStream.ProgressNotifier)
-     * @deprecated Use {@link #MultipartStream(InputStream, byte[], int,
+     * @deprecated 1.2.1 Use {@link #MultipartStream(InputStream, byte[], int,
      *  org.apache.commons.fileupload.MultipartStream.ProgressNotifier)}.
      */
     @Deprecated
@@ -371,7 +371,7 @@ public class MultipartStream {
      * @param boundary The token used for dividing the stream into
      *                 <code>encapsulations</code>.
      *
-     * @deprecated Use {@link #MultipartStream(InputStream, byte[],
+     * @deprecated 1.2.1 Use {@link #MultipartStream(InputStream, byte[],
      *  MultipartStream.ProgressNotifier)}.
      * @see #MultipartStream(InputStream, byte[], int,
      *  MultipartStream.ProgressNotifier)