You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by ma...@apache.org on 2004/10/11 05:18:45 UTC

cvs commit: jakarta-commons/fileupload/src/test/org/apache/commons/fileupload DeferredFileOutputStreamTest.java

martinc     2004/10/10 20:18:45

  Modified:    fileupload project.xml
               fileupload/src/java/org/apache/commons/fileupload
                        DefaultFileItem.java
               fileupload/src/test/org/apache/commons/fileupload
                        DeferredFileOutputStreamTest.java
  Removed:     fileupload/src/java/org/apache/commons/fileupload
                        DeferredFileOutputStream.java
                        ThresholdingOutputStream.java
  Log:
  Switch to Commons IO version of DeferredFileOutputStream. Adding IO as a
  dependency will allow us to take advantage of other classes in that
  component to fix additional FileUpload bugs.
  
  Revision  Changes    Path
  1.29      +10 -3     jakarta-commons/fileupload/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/fileupload/project.xml,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- project.xml	9 Apr 2004 19:58:07 -0000	1.28
  +++ project.xml	11 Oct 2004 03:18:45 -0000	1.29
  @@ -20,7 +20,7 @@
     
     <name>FileUpload</name>
     <id>commons-fileupload</id>
  -  <currentVersion>1.0</currentVersion>
  +  <currentVersion>1.1-dev</currentVersion>
     <inceptionYear>2002</inceptionYear>
     <shortDescription>File upload component for Java servlets</shortDescription>
     <description>
  @@ -139,11 +139,18 @@
     
     <dependencies>
       <dependency>
  -      <id>servletapi</id>
  +      <groupId>commons-io</groupId>
  +      <artifactId>commons-io</artifactId>
  +      <version>1.0</version>
  +    </dependency>
  +    <dependency>
  +      <groupId>servletapi</groupId>
  +      <artifactId>servletapi</artifactId>
         <version>2.3</version>
       </dependency>
       <dependency>
  -      <id>junit</id>
  +      <groupId>junit</groupId>
  +      <artifactId>junit</artifactId>
         <version>3.8.1</version>
       </dependency>
     </dependencies>
  
  
  
  1.26      +2 -1      jakarta-commons/fileupload/src/java/org/apache/commons/fileupload/DefaultFileItem.java
  
  Index: DefaultFileItem.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/fileupload/src/java/org/apache/commons/fileupload/DefaultFileItem.java,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- DefaultFileItem.java	12 Mar 2004 07:34:45 -0000	1.25
  +++ DefaultFileItem.java	11 Oct 2004 03:18:45 -0000	1.26
  @@ -26,6 +26,7 @@
   import java.io.OutputStream;
   import java.io.UnsupportedEncodingException;
   import java.util.Map;
  +import org.apache.commons.io.output.DeferredFileOutputStream;
   
   
   /**
  
  
  
  1.5       +2 -2      jakarta-commons/fileupload/src/test/org/apache/commons/fileupload/DeferredFileOutputStreamTest.java
  
  Index: DeferredFileOutputStreamTest.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/fileupload/src/test/org/apache/commons/fileupload/DeferredFileOutputStreamTest.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- DeferredFileOutputStreamTest.java	25 Feb 2004 21:07:12 -0000	1.4
  +++ DeferredFileOutputStreamTest.java	11 Oct 2004 03:18:45 -0000	1.5
  @@ -16,7 +16,7 @@
   package org.apache.commons.fileupload;
   
   import junit.framework.TestCase;
  -import org.apache.commons.fileupload.DeferredFileOutputStream;
  +import org.apache.commons.io.output.DeferredFileOutputStream;
   
   import java.io.File;
   import java.io.FileInputStream;
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org