tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r981187 - in /tomcat/trunk/java/org/apache/tomcat/util/http/fileupload: ./ disk/ servlet/ util/
Date Sun, 01 Aug 2010 09:28:02 GMT
Author: markt
Date: Sun Aug  1 09:28:02 2010
New Revision: 981187

URL: http://svn.apache.org/viewvc?rev=981187&view=rev
Log:
Switch back to standard commons file-upload layout - simpler to merge updates. Part 2.

Added:
    tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/disk/DiskFileItem.java
      - copied, changed from r981064, tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/DiskFileItem.java
    tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/disk/DiskFileItemFactory.java
      - copied, changed from r981064, tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/DiskFileItemFactory.java
    tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/servlet/ServletFileUpload.java
      - copied, changed from r981064, tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/ServletFileUpload.java
    tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/servlet/ServletRequestContext.java
      - copied, changed from r981064, tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/ServletRequestContext.java
    tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/util/Closeable.java
      - copied, changed from r981064, tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/Closeable.java
    tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/util/FileItemHeadersImpl.java
      - copied, changed from r981064, tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileItemHeadersImpl.java
    tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/util/LimitedInputStream.java
      - copied, changed from r981064, tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/LimitedInputStream.java
    tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/util/Streams.java
      - copied, changed from r981064, tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/Streams.java
Removed:
    tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/Closeable.java
    tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/DiskFileItem.java
    tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/DiskFileItemFactory.java
    tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileItemHeadersImpl.java
    tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/LimitedInputStream.java
    tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/ServletFileUpload.java
    tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/ServletRequestContext.java
    tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/Streams.java
Modified:
    tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileUploadBase.java
    tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/MultipartStream.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileUploadBase.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileUploadBase.java?rev=981187&r1=981186&r2=981187&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileUploadBase.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileUploadBase.java Sun Aug 
1 09:28:02 2010
@@ -28,6 +28,10 @@ import java.util.NoSuchElementException;
 import javax.servlet.http.HttpServletRequest;
 
 import org.apache.tomcat.util.http.fileupload.MultipartStream.ItemInputStream;
+import org.apache.tomcat.util.http.fileupload.util.Closeable;
+import org.apache.tomcat.util.http.fileupload.util.FileItemHeadersImpl;
+import org.apache.tomcat.util.http.fileupload.util.LimitedInputStream;
+import org.apache.tomcat.util.http.fileupload.util.Streams;
 
 
 /**

Modified: tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/MultipartStream.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/MultipartStream.java?rev=981187&r1=981186&r2=981187&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/MultipartStream.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/MultipartStream.java Sun Aug
 1 09:28:02 2010
@@ -22,6 +22,9 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.UnsupportedEncodingException;
 
+import org.apache.tomcat.util.http.fileupload.util.Closeable;
+import org.apache.tomcat.util.http.fileupload.util.Streams;
+
 
 /**
  * <p> Low level API for processing file uploads.

Copied: tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/disk/DiskFileItem.java (from
r981064, tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/DiskFileItem.java)
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/disk/DiskFileItem.java?p2=tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/disk/DiskFileItem.java&p1=tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/DiskFileItem.java&r1=981064&r2=981187&rev=981187&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/DiskFileItem.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/disk/DiskFileItem.java Sun Aug
 1 09:28:02 2010
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.tomcat.util.http.fileupload;
+package org.apache.tomcat.util.http.fileupload.disk;
 
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
@@ -30,6 +30,14 @@ import java.io.OutputStream;
 import java.io.UnsupportedEncodingException;
 import java.util.Map;
 
+import org.apache.tomcat.util.http.fileupload.DeferredFileOutputStream;
+import org.apache.tomcat.util.http.fileupload.FileItem;
+import org.apache.tomcat.util.http.fileupload.FileItemHeaders;
+import org.apache.tomcat.util.http.fileupload.FileItemHeadersSupport;
+import org.apache.tomcat.util.http.fileupload.FileUploadException;
+import org.apache.tomcat.util.http.fileupload.IOUtils;
+import org.apache.tomcat.util.http.fileupload.ParameterParser;
+
 
 /**
  * <p> The default implementation of the

Copied: tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/disk/DiskFileItemFactory.java
(from r981064, tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/DiskFileItemFactory.java)
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/disk/DiskFileItemFactory.java?p2=tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/disk/DiskFileItemFactory.java&p1=tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/DiskFileItemFactory.java&r1=981064&r2=981187&rev=981187&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/DiskFileItemFactory.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/disk/DiskFileItemFactory.java
Sun Aug  1 09:28:02 2010
@@ -14,10 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.tomcat.util.http.fileupload;
+package org.apache.tomcat.util.http.fileupload.disk;
 
 import java.io.File;
 
+import org.apache.tomcat.util.http.fileupload.FileCleaningTracker;
+import org.apache.tomcat.util.http.fileupload.FileItem;
+import org.apache.tomcat.util.http.fileupload.FileItemFactory;
+
 
 /**
  * <p>The default {@link org.apache.commons.fileupload.FileItemFactory}
@@ -174,7 +178,7 @@ public class DiskFileItemFactory impleme
     // --------------------------------------------------------- Public Methods
 
     /**
-     * Create a new {@link org.apache.commons.fileupload.disk.DiskFileItem}
+     * Create a new {@link org.apache.tomcat.util.http.fileupload.disk.commons.fileupload.disk.DiskFileItem}
      * instance from the supplied parameters and the local factory
      * configuration.
      *

Copied: tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/servlet/ServletFileUpload.java
(from r981064, tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/ServletFileUpload.java)
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/servlet/ServletFileUpload.java?p2=tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/servlet/ServletFileUpload.java&p1=tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/ServletFileUpload.java&r1=981064&r2=981187&rev=981187&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/ServletFileUpload.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/servlet/ServletFileUpload.java
Sun Aug  1 09:28:02 2010
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.tomcat.util.http.fileupload;
+package org.apache.tomcat.util.http.fileupload.servlet;
 
 import java.io.IOException;
 import java.util.List;
@@ -22,6 +22,12 @@ import java.util.Locale;
 
 import javax.servlet.http.HttpServletRequest;
 
+import org.apache.tomcat.util.http.fileupload.FileItem;
+import org.apache.tomcat.util.http.fileupload.FileItemFactory;
+import org.apache.tomcat.util.http.fileupload.FileItemIterator;
+import org.apache.tomcat.util.http.fileupload.FileUpload;
+import org.apache.tomcat.util.http.fileupload.FileUploadException;
+
 
 /**
  * <p>High level API for processing file uploads.</p>

Copied: tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/servlet/ServletRequestContext.java
(from r981064, tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/ServletRequestContext.java)
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/servlet/ServletRequestContext.java?p2=tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/servlet/ServletRequestContext.java&p1=tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/ServletRequestContext.java&r1=981064&r2=981187&rev=981187&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/ServletRequestContext.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/servlet/ServletRequestContext.java
Sun Aug  1 09:28:02 2010
@@ -14,12 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.tomcat.util.http.fileupload;
+package org.apache.tomcat.util.http.fileupload.servlet;
 
 import java.io.InputStream;
 import java.io.IOException;
 import javax.servlet.http.HttpServletRequest;
 
+import org.apache.tomcat.util.http.fileupload.RequestContext;
+
 
 /**
  * <p>Provides access to the request information needed for a request made to

Copied: tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/util/Closeable.java (from
r981064, tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/Closeable.java)
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/util/Closeable.java?p2=tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/util/Closeable.java&p1=tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/Closeable.java&r1=981064&r2=981187&rev=981187&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/Closeable.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/util/Closeable.java Sun Aug 
1 09:28:02 2010
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.tomcat.util.http.fileupload;
+package org.apache.tomcat.util.http.fileupload.util;
 
 import java.io.IOException;
 

Copied: tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/util/FileItemHeadersImpl.java
(from r981064, tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileItemHeadersImpl.java)
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/util/FileItemHeadersImpl.java?p2=tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/util/FileItemHeadersImpl.java&p1=tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileItemHeadersImpl.java&r1=981064&r2=981187&rev=981187&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileItemHeadersImpl.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/util/FileItemHeadersImpl.java
Sun Aug  1 09:28:02 2010
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.tomcat.util.http.fileupload;
+package org.apache.tomcat.util.http.fileupload.util;
 
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -25,6 +25,8 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 
+import org.apache.tomcat.util.http.fileupload.FileItemHeaders;
+
 
 /**
  * Default implementation of the {@link FileItemHeaders} interface.

Copied: tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/util/LimitedInputStream.java
(from r981064, tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/LimitedInputStream.java)
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/util/LimitedInputStream.java?p2=tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/util/LimitedInputStream.java&p1=tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/LimitedInputStream.java&r1=981064&r2=981187&rev=981187&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/LimitedInputStream.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/util/LimitedInputStream.java
Sun Aug  1 09:28:02 2010
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.tomcat.util.http.fileupload;
+package org.apache.tomcat.util.http.fileupload.util;
 
 import java.io.FilterInputStream;
 import java.io.IOException;

Copied: tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/util/Streams.java (from r981064,
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/Streams.java)
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/util/Streams.java?p2=tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/util/Streams.java&p1=tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/Streams.java&r1=981064&r2=981187&rev=981187&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/Streams.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/util/Streams.java Sun Aug  1
09:28:02 2010
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.tomcat.util.http.fileupload;
+package org.apache.tomcat.util.http.fileupload.util;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;



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


Mime
View raw message