You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2014/02/07 15:50:54 UTC

[2/3] WICKET-5503 Remove local copies of Commons FileUpload files and use Maven dependency

http://git-wip-us.apache.org/repos/asf/wicket/blob/99fcd91f/wicket-util/src/main/java/org/apache/wicket/util/upload/FileItemHeadersImpl.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/upload/FileItemHeadersImpl.java b/wicket-util/src/main/java/org/apache/wicket/util/upload/FileItemHeadersImpl.java
deleted file mode 100644
index 8400ed8..0000000
--- a/wicket-util/src/main/java/org/apache/wicket/util/upload/FileItemHeadersImpl.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.wicket.util.upload;
-
-import java.io.Serializable;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.wicket.util.lang.Generics;
-
-/**
- * Default implementation of the {@link FileItemHeaders} interface.
- * 
- * @author Michael C. Macaluso
- * @since 1.3
- */
-public class FileItemHeadersImpl implements FileItemHeaders, Serializable
-{
-	private static final long serialVersionUID = -4455695752627032559L;
-
-	/**
-	 * Map of <code>String</code> keys to a <code>List</code> of <code>String</code> instances.
-	 */
-	private final Map<String, List<String>> headerNameToValueListMap = Generics.newHashMap();
-
-	/**
-	 * List to preserve order of headers as added. This would not be needed if a
-	 * <code>LinkedHashMap</code> could be used, but don't want to depend on 1.4.
-	 */
-	private final List<String> headerNameList = Generics.newArrayList();
-
-	@Override
-	public String getHeader(final String name)
-	{
-		String nameLower = name.toLowerCase();
-		List<String> headerValueList = headerNameToValueListMap.get(nameLower);
-		if (null == headerValueList)
-		{
-			return null;
-		}
-		return headerValueList.get(0);
-	}
-
-	@Override
-	public Iterator<String> getHeaderNames()
-	{
-		return headerNameList.iterator();
-	}
-
-	@Override
-	public Iterator<String> getHeaders(final String name)
-	{
-		String nameLower = name.toLowerCase();
-		List<String> headerValueList = headerNameToValueListMap.get(nameLower);
-		if (null == headerValueList)
-		{
-			headerValueList = Collections.emptyList();
-		}
-		return headerValueList.iterator();
-	}
-
-	/**
-	 * Method to add header values to this instance.
-	 * 
-	 * @param name
-	 *            name of this header
-	 * @param value
-	 *            value of this header
-	 */
-	public synchronized void addHeader(final String name, final String value)
-	{
-		String nameLower = name.toLowerCase();
-		List<String> headerValueList = headerNameToValueListMap.get(nameLower);
-		if (null == headerValueList)
-		{
-			headerValueList = Generics.newArrayList();
-			headerNameToValueListMap.put(nameLower, headerValueList);
-			headerNameList.add(nameLower);
-		}
-		headerValueList.add(value);
-	}
-}

http://git-wip-us.apache.org/repos/asf/wicket/blob/99fcd91f/wicket-util/src/main/java/org/apache/wicket/util/upload/FileItemHeadersSupport.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/upload/FileItemHeadersSupport.java b/wicket-util/src/main/java/org/apache/wicket/util/upload/FileItemHeadersSupport.java
deleted file mode 100644
index cbd629e..0000000
--- a/wicket-util/src/main/java/org/apache/wicket/util/upload/FileItemHeadersSupport.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.wicket.util.upload;
-
-/**
- * Interface that will indicate that {@link FileItem} or {@link FileItemStream} implementations will
- * accept the headers read for the item.
- * 
- * @author Michael C. Macaluso
- * 
- * @see FileItem
- * @see FileItemStream
- */
-public interface FileItemHeadersSupport
-{
-	/**
-	 * Returns the collection of headers defined locally within this item.
-	 * 
-	 * @return the {@link FileItemHeaders} present for this item.
-	 */
-	FileItemHeaders getHeaders();
-
-	/**
-	 * Sets the headers read from within an item. Implementations of {@link FileItem} or
-	 * {@link FileItemStream} should implement this interface to be able to get the raw headers
-	 * found within the item header block.
-	 * 
-	 * @param headers
-	 *            the instance that holds onto the headers for this instance.
-	 */
-	void setHeaders(FileItemHeaders headers);
-}

http://git-wip-us.apache.org/repos/asf/wicket/blob/99fcd91f/wicket-util/src/main/java/org/apache/wicket/util/upload/FileItemIterator.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/upload/FileItemIterator.java b/wicket-util/src/main/java/org/apache/wicket/util/upload/FileItemIterator.java
deleted file mode 100644
index 9fce5c7..0000000
--- a/wicket-util/src/main/java/org/apache/wicket/util/upload/FileItemIterator.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.wicket.util.upload;
-
-import java.io.IOException;
-
-
-/**
- * An iterator, as returned by {@link FileUploadBase#getItemIterator(RequestContext)}.
- */
-public interface FileItemIterator
-{
-	/**
-	 * Returns, whether another instance of {@link FileItemStream} is available.
-	 * 
-	 * @throws FileUploadException
-	 *             Parsing or processing the file item failed.
-	 * @throws IOException
-	 *             Reading the file item failed.
-	 * @return True, if one or more additional file items are available, otherwise false.
-	 */
-	boolean hasNext() throws FileUploadException, IOException;
-
-	/**
-	 * Returns the next available {@link FileItemStream}.
-	 * 
-	 * @throws java.util.NoSuchElementException
-	 *             No more items are available. Use {@link #hasNext()} to prevent this exception.
-	 * @throws FileUploadException
-	 *             Parsing or processing the file item failed.
-	 * @throws IOException
-	 *             Reading the file item failed.
-	 * @return FileItemStream instance, which provides access to the next file item.
-	 */
-	FileItemStream next() throws FileUploadException, IOException;
-}

http://git-wip-us.apache.org/repos/asf/wicket/blob/99fcd91f/wicket-util/src/main/java/org/apache/wicket/util/upload/FileItemStream.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/upload/FileItemStream.java b/wicket-util/src/main/java/org/apache/wicket/util/upload/FileItemStream.java
deleted file mode 100644
index 7d18c0e..0000000
--- a/wicket-util/src/main/java/org/apache/wicket/util/upload/FileItemStream.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.wicket.util.upload;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-
-/**
- * <p>
- * This interface provides access to a file or form item that was received within a
- * <code>multipart/form-data</code> POST request. The items contents are retrieved by calling
- * {@link #openStream()}.
- * </p>
- * <p>
- * Instances of this class are created by accessing the iterator, returned by
- * {@link FileUploadBase#getItemIterator(RequestContext)}.
- * </p>
- * <p>
- * <em>Note</em>: There is an interaction between the iterator and its associated instances of
- * {@link FileItemStream}: By invoking {@link java.util.Iterator#hasNext()} on the iterator, you
- * discard all data, which hasn't been read so far from the previous data.
- * </p>
- */
-public interface FileItemStream extends FileItemHeadersSupport
-{
-	/**
-	 * This exception is thrown, if an attempt is made to read data from the {@link InputStream},
-	 * which has been returned by {@link FileItemStream#openStream()}, after
-	 * {@link java.util.Iterator#hasNext()} has been invoked on the iterator, which created the
-	 * {@link FileItemStream}.
-	 */
-	public static class ItemSkippedException extends IOException
-	{
-		/**
-		 * The exceptions serial version UID, which is being used when serializing an exception
-		 * instance.
-		 */
-		private static final long serialVersionUID = -7280778431581963740L;
-	}
-
-	/**
-	 * Creates an {@link InputStream}, which allows to read the items contents.
-	 * 
-	 * @return The input stream, from which the items data may be read.
-	 * @throws IllegalStateException
-	 *             The method was already invoked on this item. It is not possible to recreate the
-	 *             data stream.
-	 * @throws IOException
-	 *             An I/O error occurred.
-	 * @see ItemSkippedException
-	 */
-	InputStream openStream() throws IOException;
-
-	/**
-	 * Returns the content type passed by the browser or <code>null</code> if not defined.
-	 * 
-	 * @return The content type passed by the browser or <code>null</code> if not defined.
-	 */
-	String getContentType();
-
-	/**
-	 * Returns the original filename in the client's filesystem, as provided by the browser (or
-	 * other client software). In most cases, this will be the base file name, without path
-	 * information. However, some clients, such as the Opera browser, do include path information.
-	 * 
-	 * @return The original filename in the client's filesystem.
-	 */
-	String getName();
-
-	/**
-	 * Returns the name of the field in the multipart form corresponding to this file item.
-	 * 
-	 * @return The name of the form field.
-	 */
-	String getFieldName();
-
-	/**
-	 * Determines whether or not a <code>FileItem</code> instance represents a simple form field.
-	 * 
-	 * @return <code>true</code> if the instance represents a simple form field; <code>false</code>
-	 *         if it represents an uploaded file.
-	 */
-	boolean isFormField();
-}

http://git-wip-us.apache.org/repos/asf/wicket/blob/99fcd91f/wicket-util/src/main/java/org/apache/wicket/util/upload/FileUpload.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/upload/FileUpload.java b/wicket-util/src/main/java/org/apache/wicket/util/upload/FileUpload.java
deleted file mode 100644
index 0657436..0000000
--- a/wicket-util/src/main/java/org/apache/wicket/util/upload/FileUpload.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.wicket.util.upload;
-
-
-/**
- * <p>
- * High level API for processing file uploads.
- * </p>
- * 
- * <p>
- * This class handles multiple files per single HTML widget, sent using <code>multipart/mixed</code>
- * encoding type, as specified by <a href="http://www.ietf.org/rfc/rfc1867.txt">RFC 1867</a>. Use
- * {@link #parseRequest(javax.servlet.http.HttpServletRequest)} to acquire a list of
- * {@link org.apache.wicket.util.upload.FileItem FileItems} associated with a given HTML widget.
- * </p>
- * 
- * <p>
- * How the data for individual parts is stored is determined by the factory used to create them; a
- * given part may be in memory, on disk, or somewhere else.
- * </p>
- * 
- * @author <a href="mailto:Rafal.Krzewski@e-point.pl">Rafal Krzewski</a>
- * @author <a href="mailto:dlr@collab.net">Daniel Rall</a>
- * @author <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a>
- * @author <a href="mailto:jmcnally@collab.net">John McNally</a>
- * @author <a href="mailto:martinc@apache.org">Martin Cooper</a>
- * @author Sean C. Sullivan
- */
-public class FileUpload extends FileUploadBase
-{
-
-	// ----------------------------------------------------------- Data members
-
-
-	/**
-	 * The factory to use to create new form items.
-	 */
-	private FileItemFactory fileItemFactory;
-
-
-	// ----------------------------------------------------------- Constructors
-
-
-	/**
-	 * Constructs an uninitialised instance of this class. A factory must be configured, using
-	 * <code>setFileItemFactory()</code>, before attempting to parse requests.
-	 * 
-	 * @see #FileUpload(FileItemFactory)
-	 */
-	public FileUpload()
-	{
-		super();
-	}
-
-
-	/**
-	 * Constructs an instance of this class which uses the supplied factory to create
-	 * <code>FileItem</code> instances.
-	 * 
-	 * @see #FileUpload()
-	 * @param fileItemFactory
-	 *            The factory to use for creating file items.
-	 */
-	public FileUpload(final FileItemFactory fileItemFactory)
-	{
-		super();
-		this.fileItemFactory = fileItemFactory;
-	}
-
-
-	// ----------------------------------------------------- Property accessors
-
-
-	/**
-	 * Returns the factory class used when creating file items.
-	 * 
-	 * @return The factory class for new file items.
-	 */
-	@Override
-	public FileItemFactory getFileItemFactory()
-	{
-		return fileItemFactory;
-	}
-
-
-	/**
-	 * Sets the factory class to use when creating file items.
-	 * 
-	 * @param factory
-	 *            The factory class for new file items.
-	 */
-	@Override
-	public void setFileItemFactory(final FileItemFactory factory)
-	{
-		fileItemFactory = factory;
-	}
-
-
-}

http://git-wip-us.apache.org/repos/asf/wicket/blob/99fcd91f/wicket-util/src/main/java/org/apache/wicket/util/upload/FileUploadBase.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/upload/FileUploadBase.java b/wicket-util/src/main/java/org/apache/wicket/util/upload/FileUploadBase.java
deleted file mode 100644
index 1bd5a86..0000000
--- a/wicket-util/src/main/java/org/apache/wicket/util/upload/FileUploadBase.java
+++ /dev/null
@@ -1,1285 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.wicket.util.upload;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
-import java.util.List;
-import java.util.Map;
-import java.util.NoSuchElementException;
-
-import javax.servlet.http.HttpServletRequest;
-
-import org.apache.wicket.util.io.Streams;
-import org.apache.wicket.util.lang.Args;
-import org.apache.wicket.util.lang.Generics;
-import org.apache.wicket.util.upload.MultipartFormInputStream.ItemInputStream;
-
-/**
- * <p>
- * High level API for processing file uploads.
- * </p>
- * 
- * <p>
- * This class handles multiple files per single HTML widget, sent using <code>multipart/mixed</code>
- * encoding type, as specified by <a href="http://www.ietf.org/rfc/rfc1867.txt">RFC 1867</a>. Use
- * {@link #parseRequest(HttpServletRequest)} to acquire a list of
- * {@link org.apache.wicket.util.upload.FileItem}s associated with a given HTML widget.
- * </p>
- * 
- * <p>
- * How the data for individual parts is stored is determined by the factory used to create them; a
- * given part may be in memory, on disk, or somewhere else.
- * </p>
- * 
- * @author <a href="mailto:Rafal.Krzewski@e-point.pl">Rafal Krzewski</a>
- * @author <a href="mailto:dlr@collab.net">Daniel Rall</a>
- * @author <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a>
- * @author <a href="mailto:jmcnally@collab.net">John McNally</a>
- * @author <a href="mailto:martinc@apache.org">Martin Cooper</a>
- * @author Sean C. Sullivan
- */
-public abstract class FileUploadBase
-{
-	// ---------------------------------------------------------- Class methods
-
-	/**
-	 * <p>
-	 * Utility method that determines whether the request contains multipart content.
-	 * </p>
-	 * 
-	 * <p>
-	 * <strong>NOTE:</strong>This method will be moved to the <code>ServletFileUpload</code> class
-	 * after the FileUpload 1.1 release. Unfortunately, since this method is static, it is not
-	 * possible to provide its replacement until this method is removed.
-	 * </p>
-	 * 
-	 * @param ctx
-	 *            The request context to be evaluated. Must be non-null.
-	 * 
-	 * @return <code>true</code> if the request is multipart; <code>false</code> otherwise.
-	 */
-	public static final boolean isMultipartContent(final RequestContext ctx)
-	{
-		String contentType = ctx.getContentType();
-		if (contentType == null)
-		{
-			return false;
-		}
-		return contentType.toLowerCase().startsWith(MULTIPART);
-	}
-
-	// ----------------------------------------------------- Manifest constants
-
-	/**
-	 * HTTP content type header name.
-	 */
-	public static final String CONTENT_TYPE = "Content-type";
-
-	/**
-	 * HTTP content disposition header name.
-	 */
-	public static final String CONTENT_DISPOSITION = "Content-disposition";
-
-	/**
-	 * HTTP content length header name.
-	 */
-	public static final String CONTENT_LENGTH = "Content-length";
-
-	/**
-	 * Content-disposition value for form data.
-	 */
-	public static final String FORM_DATA = "form-data";
-
-	/**
-	 * Content-disposition value for file attachment.
-	 */
-	public static final String ATTACHMENT = "attachment";
-
-	/**
-	 * Part of HTTP content type header.
-	 */
-	public static final String MULTIPART = "multipart/";
-
-	/**
-	 * HTTP content type header for multipart forms.
-	 */
-	public static final String MULTIPART_FORM_DATA = "multipart/form-data";
-
-	/**
-	 * HTTP content type header for multiple uploads.
-	 */
-	public static final String MULTIPART_MIXED = "multipart/mixed";
-
-	// ----------------------------------------------------------- Data members
-
-	/**
-	 * The maximum size permitted for the complete request, as opposed to {@link #fileSizeMax}. A
-	 * value of -1 indicates no maximum.
-	 */
-	private long sizeMax = -1;
-
-	/**
-	 * The maximum size permitted for a single uploaded file, as opposed to {@link #sizeMax}. A
-	 * value of -1 indicates no maximum.
-	 */
-	private long fileSizeMax = -1;
-
-	/**
-	 * The content encoding to use when reading part headers.
-	 */
-	private String headerEncoding;
-
-	/**
-	 * The progress listener.
-	 */
-	private ProgressListener listener;
-
-	// ----------------------------------------------------- Property accessors
-
-	/**
-	 * Returns the factory class used when creating file items.
-	 * 
-	 * @return The factory class for new file items.
-	 */
-	public abstract FileItemFactory getFileItemFactory();
-
-	/**
-	 * Sets the factory class to use when creating file items.
-	 * 
-	 * @param factory
-	 *            The factory class for new file items.
-	 */
-	public abstract void setFileItemFactory(FileItemFactory factory);
-
-	/**
-	 * Returns the maximum allowed size of a complete request, as opposed to
-	 * {@link #getFileSizeMax()}.
-	 * 
-	 * @return The maximum allowed size, in bytes. The default value of -1 indicates, that there is
-	 *         no limit.
-	 * 
-	 * @see #setSizeMax(long)
-	 * 
-	 */
-	public long getSizeMax()
-	{
-		return sizeMax;
-	}
-
-	/**
-	 * Sets the maximum allowed size of a complete request, as opposed to
-	 * {@link #setFileSizeMax(long)}.
-	 * 
-	 * @param sizeMax
-	 *            The maximum allowed size, in bytes. The default value of -1 indicates, that there
-	 *            is no limit.
-	 * 
-	 * @see #getSizeMax()
-	 * 
-	 */
-	public void setSizeMax(final long sizeMax)
-	{
-		this.sizeMax = sizeMax;
-	}
-
-	/**
-	 * Returns the maximum allowed size of a single uploaded file, as opposed to
-	 * {@link #getSizeMax()}.
-	 * 
-	 * @see #setFileSizeMax(long)
-	 * @return Maximum size of a single uploaded file.
-	 */
-	public long getFileSizeMax()
-	{
-		return fileSizeMax;
-	}
-
-	/**
-	 * Sets the maximum allowed size of a single uploaded file, as opposed to {@link #getSizeMax()}.
-	 * 
-	 * @see #getFileSizeMax()
-	 * @param fileSizeMax
-	 *            Maximum size of a single uploaded file.
-	 */
-	public void setFileSizeMax(final long fileSizeMax)
-	{
-		this.fileSizeMax = fileSizeMax;
-	}
-
-	/**
-	 * Retrieves the character encoding used when reading the headers of an individual part. When
-	 * not specified, or <code>null</code>, the request encoding is used. If that is also not
-	 * specified, or <code>null</code>, the platform default encoding is used.
-	 * 
-	 * @return The encoding used to read part headers.
-	 */
-	public String getHeaderEncoding()
-	{
-		return headerEncoding;
-	}
-
-	/**
-	 * Specifies the character encoding to be used when reading the headers of individual part. When
-	 * not specified, or <code>null</code>, the request encoding is used. If that is also not
-	 * specified, or <code>null</code>, the platform default encoding is used.
-	 * 
-	 * @param encoding
-	 *            The encoding used to read part headers.
-	 */
-	public void setHeaderEncoding(final String encoding)
-	{
-		headerEncoding = encoding;
-	}
-
-	// --------------------------------------------------------- Public methods
-
-	/**
-	 * Processes an <a href="http://www.ietf.org/rfc/rfc1867.txt">RFC 1867</a> compliant
-	 * <code>multipart/form-data</code> stream.
-	 * 
-	 * @param ctx
-	 *            The context for the request to be parsed.
-	 * 
-	 * @return An iterator to instances of <code>FileItemStream</code> parsed from the request, in
-	 *         the order that they were transmitted.
-	 * 
-	 * @throws FileUploadException
-	 *             if there are problems reading/parsing the request or storing files.
-	 * @throws IOException
-	 *             An I/O error occurred. This may be a network error while communicating with the
-	 *             client or a problem while storing the uploaded content.
-	 */
-	public FileItemIterator getItemIterator(final RequestContext ctx) throws FileUploadException,
-		IOException
-	{
-		return new FileItemIteratorImpl(ctx);
-	}
-
-	/**
-	 * Processes an <a href="http://www.ietf.org/rfc/rfc1867.txt">RFC 1867</a> compliant
-	 * <code>multipart/form-data</code> stream.
-	 * 
-	 * @param ctx
-	 *            The context for the request to be parsed.
-	 * 
-	 * @return A list of <code>FileItem</code> instances parsed from the request, in the order that
-	 *         they were transmitted.
-	 * 
-	 * @throws FileUploadException
-	 *             if there are problems reading/parsing the request or storing files.
-	 */
-	public List<FileItem> parseRequest(final RequestContext ctx) throws FileUploadException
-	{
-		try
-		{
-			FileItemIterator iter = getItemIterator(ctx);
-			List<FileItem> items = Generics.newArrayList();
-			FileItemFactory fac = getFileItemFactory();
-			if (fac == null)
-			{
-				throw new NullPointerException("No FileItemFactory has been set.");
-			}
-			while (iter.hasNext())
-			{
-				FileItemStream item = iter.next();
-				FileItem fileItem = fac.createItem(item.getFieldName(), item.getContentType(),
-					item.isFormField(), item.getName());
-				try
-				{
-					Streams.copyAndClose(item.openStream(), fileItem.getOutputStream());
-				}
-				catch (FileUploadIOException e)
-				{
-					throw (FileUploadException)e.getCause();
-				}
-				catch (IOException e)
-				{
-					throw new IOFileUploadException("Processing of " + MULTIPART_FORM_DATA +
-						" request failed. " + e.getMessage(), e);
-				}
-				if (fileItem instanceof FileItemHeadersSupport)
-				{
-					final FileItemHeaders fih = item.getHeaders();
-					((FileItemHeadersSupport)fileItem).setHeaders(fih);
-				}
-				items.add(fileItem);
-			}
-			return items;
-		}
-		catch (FileUploadIOException e)
-		{
-			throw (FileUploadException)e.getCause();
-		}
-		catch (IOException e)
-		{
-			throw new FileUploadException(e.getMessage(), e);
-		}
-	}
-
-
-	// ------------------------------------------------------ Protected methods
-
-
-	/**
-	 * Retrieves the boundary from the <code>Content-type</code> header.
-	 * 
-	 * @param contentType
-	 *            The value of the content type header from which to extract the boundary value.
-	 * 
-	 * @return The boundary, as a byte array.
-	 */
-	protected byte[] getBoundary(final String contentType)
-	{
-		ParameterParser parser = new ParameterParser();
-		parser.setLowerCaseNames(true);
-		// Parameter parser can handle null input
-		Map<String, String> params = parser.parse(contentType, new char[] { ';', ',' });
-		String boundaryStr = params.get("boundary");
-
-		if (boundaryStr == null)
-		{
-			return null;
-		}
-		byte[] boundary;
-		try
-		{
-			boundary = boundaryStr.getBytes("ISO-8859-1");
-		}
-		catch (UnsupportedEncodingException e)
-		{
-			boundary = boundaryStr.getBytes();
-		}
-		return boundary;
-	}
-
-	/**
-	 * Retrieves the file name from the <code>Content-disposition</code> header.
-	 * 
-	 * @param headers
-	 *            The HTTP headers object.
-	 * 
-	 * @return The file name for the current <code>encapsulation</code>.
-	 */
-	protected String getFileName(final FileItemHeaders headers)
-	{
-		return getFileName(headers.getHeader(CONTENT_DISPOSITION));
-	}
-
-	/**
-	 * Returns the given content-disposition headers file name.
-	 * 
-	 * @param pContentDisposition
-	 *            The content-disposition headers value.
-	 * @return The file name
-	 */
-	private String getFileName(final String pContentDisposition)
-	{
-		String fileName = null;
-		if (pContentDisposition != null)
-		{
-			String cdl = pContentDisposition.toLowerCase();
-			if (cdl.startsWith(FORM_DATA) || cdl.startsWith(ATTACHMENT))
-			{
-				ParameterParser parser = new ParameterParser();
-				parser.setLowerCaseNames(true);
-				// Parameter parser can handle null input
-				Map<String, String> params = parser.parse(pContentDisposition, ';');
-				if (params.containsKey("filename"))
-				{
-					fileName = params.get("filename");
-					if (fileName != null)
-					{
-						fileName = fileName.trim();
-					}
-					else
-					{
-						// Even if there is no value, the parameter is present,
-						// so we return an empty file name rather than no file
-						// name.
-						fileName = "";
-					}
-				}
-			}
-		}
-		return fileName;
-	}
-
-
-	/**
-	 * Retrieves the field name from the <code>Content-disposition</code> header.
-	 * 
-	 * @param headers
-	 *            A <code>Map</code> containing the HTTP request headers.
-	 * 
-	 * @return The field name for the current <code>encapsulation</code>.
-	 */
-	protected String getFieldName(final FileItemHeaders headers)
-	{
-		return getFieldName(headers.getHeader(CONTENT_DISPOSITION));
-	}
-
-	/**
-	 * Returns the field name, which is given by the content-disposition header.
-	 * 
-	 * @param pContentDisposition
-	 *            The content-dispositions header value.
-	 * @return The field jake
-	 */
-	private String getFieldName(final String pContentDisposition)
-	{
-		String fieldName = null;
-		if ((pContentDisposition != null) &&
-			pContentDisposition.toLowerCase().startsWith(FORM_DATA))
-		{
-			ParameterParser parser = new ParameterParser();
-			parser.setLowerCaseNames(true);
-			// Parameter parser can handle null input
-			Map<String, String> params = parser.parse(pContentDisposition, ';');
-			fieldName = params.get("name");
-			if (fieldName != null)
-			{
-				fieldName = fieldName.trim();
-			}
-		}
-		return fieldName;
-	}
-
-	/**
-	 * <p>
-	 * Parses the <code>header-part</code> and returns as key/value pairs.
-	 * 
-	 * <p>
-	 * If there are multiple headers of the same names, the name will map to a comma-separated list
-	 * containing the values.
-	 * 
-	 * @param headerPart
-	 *            The <code>header-part</code> of the current <code>encapsulation</code>.
-	 * 
-	 * @return A <code>Map</code> containing the parsed HTTP request headers.
-	 */
-	protected FileItemHeaders getParsedHeaders(final String headerPart)
-	{
-		final int len = headerPart.length();
-		FileItemHeadersImpl headers = newFileItemHeaders();
-		int start = 0;
-		for (;;)
-		{
-			int end = parseEndOfLine(headerPart, start);
-			if (start == end)
-			{
-				break;
-			}
-			StringBuilder header = new StringBuilder(headerPart.substring(start, end));
-			start = end + 2;
-			while (start < len)
-			{
-				int nonWs = start;
-				while (nonWs < len)
-				{
-					char c = headerPart.charAt(nonWs);
-					if ((c != ' ') && (c != '\t'))
-					{
-						break;
-					}
-					++nonWs;
-				}
-				if (nonWs == start)
-				{
-					break;
-				}
-				// Continuation line found
-				end = parseEndOfLine(headerPart, nonWs);
-				header.append(' ').append(headerPart.substring(nonWs, end));
-				start = end + 2;
-			}
-			parseHeaderLine(headers, header.toString());
-		}
-		return headers;
-	}
-
-	/**
-	 * Creates a new instance of {@link FileItemHeaders}.
-	 * 
-	 * @return The new instance.
-	 */
-	protected FileItemHeadersImpl newFileItemHeaders()
-	{
-		return new FileItemHeadersImpl();
-	}
-
-	/**
-	 * Skips bytes until the end of the current line.
-	 * 
-	 * @param headerPart
-	 *            The headers, which are being parsed.
-	 * @param end
-	 *            Index of the last byte, which has yet been processed.
-	 * @return Index of the \r\n sequence, which indicates end of line.
-	 */
-	private int parseEndOfLine(final String headerPart, final int end)
-	{
-		int index = end;
-		for (;;)
-		{
-			int offset = headerPart.indexOf('\r', index);
-			if ((offset == -1) || (offset + 1 >= headerPart.length()))
-			{
-				throw new IllegalStateException(
-					"Expected headers to be terminated by an empty line.");
-			}
-			if (headerPart.charAt(offset + 1) == '\n')
-			{
-				return offset;
-			}
-			index = offset + 1;
-		}
-	}
-
-	/**
-	 * Reads the next header line.
-	 * 
-	 * @param headers
-	 *            String with all headers.
-	 * @param header
-	 *            Map where to store the current header.
-	 */
-	private void parseHeaderLine(final FileItemHeadersImpl headers, final String header)
-	{
-		final int colonOffset = header.indexOf(':');
-		if (colonOffset == -1)
-		{
-			// This header line is malformed, skip it.
-			return;
-		}
-		String headerName = header.substring(0, colonOffset).trim();
-		String headerValue = header.substring(header.indexOf(':') + 1).trim();
-		headers.addHeader(headerName, headerValue);
-	}
-
-	/**
-	 * The iterator, which is returned by {@link FileUploadBase#getItemIterator(RequestContext)}.
-	 */
-	private class FileItemIteratorImpl implements FileItemIterator
-	{
-		/**
-		 * Default implementation of {@link FileItemStream}.
-		 */
-		private class FileItemStreamImpl implements FileItemStream
-		{
-			/**
-			 * The file items content type.
-			 */
-			private final String contentType;
-			/**
-			 * The file items field name.
-			 */
-			private final String fieldName;
-			/**
-			 * The file items file name.
-			 */
-			private final String name;
-			/**
-			 * Whether the file item is a form field.
-			 */
-			private final boolean formField;
-			/**
-			 * The file items input stream.
-			 */
-			private final InputStream stream;
-			/**
-			 * Whether the file item was already opened.
-			 */
-			private boolean opened;
-			/**
-			 * The headers, if any.
-			 */
-			private FileItemHeaders headers;
-
-			/**
-			 * Creates a new instance.
-			 * 
-			 * @param pName
-			 *            The items file name, or null.
-			 * @param pFieldName
-			 *            The items field name.
-			 * @param pContentType
-			 *            The items content type, or null.
-			 * @param pFormField
-			 *            Whether the item is a form field.
-			 * @param pContentLength
-			 *            The items content length, if known, or -1
-			 * @throws IOException
-			 *             Creating the file item failed.
-			 */
-			FileItemStreamImpl(final String pName, final String pFieldName,
-				final String pContentType, final boolean pFormField, final long pContentLength)
-				throws IOException
-			{
-				name = pName;
-				fieldName = pFieldName;
-				contentType = pContentType;
-				formField = pFormField;
-				final ItemInputStream itemStream = multi.newInputStream();
-				InputStream istream = itemStream;
-				if (fileSizeMax != -1)
-				{
-					if ((pContentLength != -1) && (pContentLength > fileSizeMax))
-					{
-						FileUploadException e = new FileSizeLimitExceededException("The field " +
-							fieldName + " exceeds its maximum permitted " + " size of " +
-							fileSizeMax + " characters.", pContentLength, fileSizeMax);
-						throw new FileUploadIOException(e);
-					}
-					istream = new LimitedInputStream(istream, fileSizeMax)
-					{
-						@Override
-						protected void raiseError(final long pSizeMax, final long pCount)
-							throws IOException
-						{
-							itemStream.close(true);
-							FileUploadException e = new FileSizeLimitExceededException(
-								"The field " + fieldName + " exceeds its maximum permitted " +
-									" size of " + pSizeMax + " characters.", pCount, pSizeMax);
-							throw new FileUploadIOException(e);
-						}
-					};
-				}
-				stream = istream;
-			}
-
-			/**
-			 * Returns the items content type, or null.
-			 * 
-			 * @return Content type, if known, or null.
-			 */
-			@Override
-			public String getContentType()
-			{
-				return contentType;
-			}
-
-			/**
-			 * Returns the items field name.
-			 * 
-			 * @return Field name.
-			 */
-			@Override
-			public String getFieldName()
-			{
-				return fieldName;
-			}
-
-			/**
-			 * Returns the items file name.
-			 * 
-			 * @return File name, if known, or null.
-			 */
-			@Override
-			public String getName()
-			{
-				return name;
-			}
-
-			/**
-			 * Returns, whether this is a form field.
-			 * 
-			 * @return True, if the item is a form field, otherwise false.
-			 */
-			@Override
-			public boolean isFormField()
-			{
-				return formField;
-			}
-
-			/**
-			 * Returns an input stream, which may be used to read the items contents.
-			 * 
-			 * @return Opened input stream.
-			 * @throws IOException
-			 *             An I/O error occurred.
-			 */
-			@Override
-			public InputStream openStream() throws IOException
-			{
-				if (opened)
-				{
-					throw new IllegalStateException("The stream was already opened.");
-				}
-				if (((Closeable)stream).isClosed())
-				{
-					throw new FileItemStream.ItemSkippedException();
-				}
-				return stream;
-			}
-
-			/**
-			 * Closes the file item.
-			 * 
-			 * @throws IOException
-			 *             An I/O error occurred.
-			 */
-			void close() throws IOException
-			{
-				stream.close();
-			}
-
-			/**
-			 * Returns the file item headers.
-			 * 
-			 * @return The items header object
-			 */
-			@Override
-			public FileItemHeaders getHeaders()
-			{
-				return headers;
-			}
-
-			/**
-			 * Sets the file item headers.
-			 * 
-			 * @param pHeaders
-			 *            The items header object
-			 */
-			@Override
-			public void setHeaders(final FileItemHeaders pHeaders)
-			{
-				headers = pHeaders;
-			}
-		}
-
-		/**
-		 * The multi part stream to process.
-		 */
-		private final MultipartFormInputStream multi;
-		/**
-		 * The notifier, which used for triggering the {@link ProgressListener}.
-		 */
-		private final MultipartFormInputStream.ProgressNotifier notifier;
-		/**
-		 * The boundary, which separates the various parts.
-		 */
-		private final byte[] boundary;
-		/**
-		 * The item, which we currently process.
-		 */
-		private FileItemStreamImpl currentItem;
-		/**
-		 * The current items field name.
-		 */
-		private String currentFieldName;
-		/**
-		 * Whether we are currently skipping the preamble.
-		 */
-		private boolean skipPreamble;
-		/**
-		 * Whether the current item may still be read.
-		 */
-		private boolean itemValid;
-		/**
-		 * Whether we have seen the end of the file.
-		 */
-		private boolean eof;
-
-		/**
-		 * Creates a new instance.
-		 * 
-		 * @param ctx
-		 *            The request context.
-		 * @throws FileUploadException
-		 *             An error occurred while parsing the request.
-		 * @throws IOException
-		 *             An I/O error occurred.
-		 */
-		FileItemIteratorImpl(final RequestContext ctx) throws FileUploadException, IOException
-		{
-			Args.notNull(ctx, "ctx");
-
-			String contentType = ctx.getContentType();
-			if ((null == contentType) || (!contentType.toLowerCase().startsWith(MULTIPART)))
-			{
-				throw new InvalidContentTypeException("the request doesn't contain a " +
-					MULTIPART_FORM_DATA + " or " + MULTIPART_MIXED +
-					" stream, content type header is " + contentType);
-			}
-
-			InputStream input = ctx.getInputStream();
-
-			if (sizeMax >= 0)
-			{
-				int requestSize = ctx.getContentLength();
-				if (requestSize == -1)
-				{
-					input = new LimitedInputStream(input, sizeMax)
-					{
-						@Override
-						protected void raiseError(final long pSizeMax, final long pCount)
-							throws IOException
-						{
-							FileUploadException ex = new SizeLimitExceededException(
-								"the request was rejected because" + " its size (" + pCount +
-									") exceeds the configured maximum" + " (" + pSizeMax + ")",
-								pCount, pSizeMax);
-							throw new FileUploadIOException(ex);
-						}
-					};
-				}
-				else
-				{
-					if ((sizeMax >= 0) && (requestSize > sizeMax))
-					{
-						throw new SizeLimitExceededException(
-							"the request was rejected because its size (" + requestSize +
-								") exceeds the configured maximum (" + sizeMax + ")", requestSize,
-							sizeMax);
-					}
-				}
-			}
-
-			String charEncoding = headerEncoding;
-			if (charEncoding == null)
-			{
-				charEncoding = ctx.getCharacterEncoding();
-			}
-
-			boundary = getBoundary(contentType);
-			if (boundary == null)
-			{
-				throw new FileUploadException("the request was rejected because "
-					+ "no multipart boundary was found");
-			}
-
-			notifier = new MultipartFormInputStream.ProgressNotifier(listener,
-				ctx.getContentLength());
-			try
-			{
-				multi = new MultipartFormInputStream(input, boundary, notifier);
-			}
-			catch (IllegalArgumentException iae)
-			{
-				throw new InvalidContentTypeException(String.format(
-					"The boundary specified in the %s header is too long",
-					CONTENT_TYPE), iae);
-			}
-			multi.setHeaderEncoding(charEncoding);
-
-			skipPreamble = true;
-			findNextItem();
-		}
-
-		/**
-		 * Called for finding the nex item, if any.
-		 * 
-		 * @return True, if an next item was found, otherwise false.
-		 * @throws IOException
-		 *             An I/O error occurred.
-		 */
-		private boolean findNextItem() throws IOException
-		{
-			if (eof)
-			{
-				return false;
-			}
-			if (currentItem != null)
-			{
-				currentItem.close();
-				currentItem = null;
-			}
-			for (;;)
-			{
-				boolean nextPart;
-				if (skipPreamble)
-				{
-					nextPart = multi.skipPreamble();
-				}
-				else
-				{
-					nextPart = multi.readBoundary();
-				}
-				if (!nextPart)
-				{
-					if (currentFieldName == null)
-					{
-						// Outer multipart terminated -> No more data
-						eof = true;
-						return false;
-					}
-					// Inner multipart terminated -> Return to parsing the outer
-					multi.setBoundary(boundary);
-					currentFieldName = null;
-					continue;
-				}
-				FileItemHeaders headers = getParsedHeaders(multi.readHeaders());
-				if (currentFieldName == null)
-				{
-					// We're parsing the outer multipart
-					String fieldName = getFieldName(headers);
-					if (fieldName != null)
-					{
-						String subContentType = headers.getHeader(CONTENT_TYPE);
-						if ((subContentType != null) &&
-							subContentType.toLowerCase().startsWith(MULTIPART_MIXED))
-						{
-							currentFieldName = fieldName;
-							// Multiple files associated with this field name
-							byte[] subBoundary = getBoundary(subContentType);
-							multi.setBoundary(subBoundary);
-							skipPreamble = true;
-							continue;
-						}
-						String fileName = getFileName(headers);
-						currentItem = new FileItemStreamImpl(fileName, fieldName,
-							headers.getHeader(CONTENT_TYPE), fileName == null,
-							getContentLength(headers));
-						notifier.noteItem();
-						itemValid = true;
-						return true;
-					}
-				}
-				else
-				{
-					String fileName = getFileName(headers);
-					if (fileName != null)
-					{
-						currentItem = new FileItemStreamImpl(fileName, currentFieldName,
-							headers.getHeader(CONTENT_TYPE), false, getContentLength(headers));
-						notifier.noteItem();
-						itemValid = true;
-						return true;
-					}
-				}
-				multi.discardBodyData();
-			}
-		}
-
-		private long getContentLength(final FileItemHeaders pHeaders)
-		{
-			try
-			{
-				return Long.parseLong(pHeaders.getHeader(CONTENT_LENGTH));
-			}
-			catch (Exception e)
-			{
-				return -1;
-			}
-		}
-
-		/**
-		 * Returns, whether another instance of {@link FileItemStream} is available.
-		 * 
-		 * @throws FileUploadException
-		 *             Parsing or processing the file item failed.
-		 * @throws IOException
-		 *             Reading the file item failed.
-		 * @return True, if one or more additional file items are available, otherwise false.
-		 */
-		@Override
-		public boolean hasNext() throws FileUploadException, IOException
-		{
-			if (eof)
-			{
-				return false;
-			}
-			if (itemValid)
-			{
-				return true;
-			}
-			return findNextItem();
-		}
-
-		/**
-		 * Returns the next available {@link FileItemStream}.
-		 * 
-		 * @throws java.util.NoSuchElementException
-		 *             No more items are available. Use {@link #hasNext()} to prevent this
-		 *             exception.
-		 * @throws FileUploadException
-		 *             Parsing or processing the file item failed.
-		 * @throws IOException
-		 *             Reading the file item failed.
-		 * @return FileItemStream instance, which provides access to the next file item.
-		 */
-		@Override
-		public FileItemStream next() throws FileUploadException, IOException
-		{
-			if (eof || (!itemValid && !hasNext()))
-			{
-				throw new NoSuchElementException();
-			}
-			itemValid = false;
-			return currentItem;
-		}
-	}
-
-	/**
-	 * This exception is thrown for hiding an inner {@link FileUploadException} in an
-	 * {@link IOException}.
-	 */
-	public static class FileUploadIOException extends IOException
-	{
-		/**
-		 * The exceptions UID, for serializing an instance.
-		 */
-		private static final long serialVersionUID = -7047616958165584154L;
-		/**
-		 * The exceptions cause; we overwrite the parent classes field, which is available since
-		 * Java 1.4 only.
-		 */
-		private final FileUploadException cause;
-
-		/**
-		 * Creates a <code>FileUploadIOException</code> with the given cause.
-		 * 
-		 * @param pCause
-		 *            The exceptions cause, if any, or null.
-		 */
-		public FileUploadIOException(final FileUploadException pCause)
-		{
-			// We're not doing super(pCause) cause of 1.3 compatibility.
-			cause = pCause;
-		}
-
-		/**
-		 * Returns the exceptions cause.
-		 * 
-		 * @return The exceptions cause, if any, or null.
-		 */
-		@Override
-		public Throwable getCause()
-		{
-			return cause;
-		}
-	}
-
-	/**
-	 * Thrown to indicate that the request is not a multipart request.
-	 */
-	public static class InvalidContentTypeException extends FileUploadException
-	{
-		/**
-		 * The exceptions UID, for serializing an instance.
-		 */
-		private static final long serialVersionUID = -9073026332015646668L;
-
-		/**
-		 * Constructs a <code>InvalidContentTypeException</code> with no detail message.
-		 */
-		public InvalidContentTypeException()
-		{
-			// Nothing to do.
-		}
-
-		/**
-		 * Constructs an <code>InvalidContentTypeException</code> with the specified detail message.
-		 * 
-		 * @param message
-		 *            The detail message.
-		 */
-		public InvalidContentTypeException(final String message)
-		{
-			super(message);
-		}
-
-		/**
-		 * Constructs an <code>InvalidContentTypeException</code> with the specified detail message
-		 * and cause.
-		 *
-		 * @param message
-		 *            The detail message.
-		 * @param cause
-		 *            The real cause
-		 */
-		public InvalidContentTypeException(final String message, Throwable cause)
-		{
-			super(message, cause);
-		}
-	}
-
-	/**
-	 * Thrown to indicate an IOException.
-	 */
-	public static class IOFileUploadException extends FileUploadException
-	{
-		/**
-		 * The exceptions UID, for serializing an instance.
-		 */
-		private static final long serialVersionUID = 1749796615868477269L;
-		/**
-		 * The exceptions cause; we overwrite the parent classes field, which is available since
-		 * Java 1.4 only.
-		 */
-		private final IOException cause;
-
-		/**
-		 * Creates a new instance with the given cause.
-		 * 
-		 * @param pMsg
-		 *            The detail message.
-		 * @param pException
-		 *            The exceptions cause.
-		 */
-		public IOFileUploadException(final String pMsg, final IOException pException)
-		{
-			super(pMsg);
-			cause = pException;
-		}
-
-		/**
-		 * Returns the exceptions cause.
-		 * 
-		 * @return The exceptions cause, if any, or null.
-		 */
-		@Override
-		public Throwable getCause()
-		{
-			return cause;
-		}
-	}
-
-	/**
-	 * This exception is thrown, if a requests permitted size is exceeded.
-	 */
-	protected abstract static class SizeException extends FileUploadException
-	{
-		private static final long serialVersionUID = 1L;
-
-		/**
-		 * The actual size of the request.
-		 */
-		private final long actual;
-
-		/**
-		 * The maximum permitted size of the request.
-		 */
-		private final long permitted;
-
-		/**
-		 * Creates a new instance.
-		 * 
-		 * @param message
-		 *            The detail message.
-		 * @param actual
-		 *            The actual number of bytes in the request.
-		 * @param permitted
-		 *            The requests size limit, in bytes.
-		 */
-		protected SizeException(final String message, final long actual, final long permitted)
-		{
-			super(message);
-			this.actual = actual;
-			this.permitted = permitted;
-		}
-
-		/**
-		 * Retrieves the actual size of the request.
-		 * 
-		 * @return The actual size of the request.
-		 */
-		public long getActualSize()
-		{
-			return actual;
-		}
-
-		/**
-		 * Retrieves the permitted size of the request.
-		 * 
-		 * @return The permitted size of the request.
-		 */
-		public long getPermittedSize()
-		{
-			return permitted;
-		}
-	}
-
-	/**
-	 * Thrown to indicate that the request size exceeds the configured maximum.
-	 */
-	public static class SizeLimitExceededException extends SizeException
-	{
-		/**
-		 * The exceptions UID, for serializing an instance.
-		 */
-		private static final long serialVersionUID = -2474893167098052828L;
-
-		/**
-		 * Constructs a <code>SizeExceededException</code> with the specified detail message, and
-		 * actual and permitted sizes.
-		 * 
-		 * @param message
-		 *            The detail message.
-		 * @param actual
-		 *            The actual request size.
-		 * @param permitted
-		 *            The maximum permitted request size.
-		 */
-		public SizeLimitExceededException(final String message, final long actual,
-			final long permitted)
-		{
-			super(message, actual, permitted);
-		}
-	}
-
-	/**
-	 * Thrown to indicate that A files size exceeds the configured maximum.
-	 */
-	public static class FileSizeLimitExceededException extends SizeException
-	{
-		/**
-		 * The exceptions UID, for serializing an instance.
-		 */
-		private static final long serialVersionUID = 8150776562029630058L;
-
-		/**
-		 * Constructs a <code>SizeExceededException</code> with the specified detail message, and
-		 * actual and permitted sizes.
-		 * 
-		 * @param message
-		 *            The detail message.
-		 * @param actual
-		 *            The actual request size.
-		 * @param permitted
-		 *            The maximum permitted request size.
-		 */
-		public FileSizeLimitExceededException(final String message, final long actual,
-			final long permitted)
-		{
-			super(message, actual, permitted);
-		}
-	}
-
-	/**
-	 * Returns the progress listener.
-	 * 
-	 * @return The progress listener, if any, or null.
-	 */
-	public ProgressListener getProgressListener()
-	{
-		return listener;
-	}
-
-	/**
-	 * Sets the progress listener.
-	 * 
-	 * @param pListener
-	 *            The progress listener, if any. Defaults to null.
-	 */
-	public void setProgressListener(final ProgressListener pListener)
-	{
-		listener = pListener;
-	}
-}

http://git-wip-us.apache.org/repos/asf/wicket/blob/99fcd91f/wicket-util/src/main/java/org/apache/wicket/util/upload/FileUploadException.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/upload/FileUploadException.java b/wicket-util/src/main/java/org/apache/wicket/util/upload/FileUploadException.java
deleted file mode 100644
index 2ba9d67..0000000
--- a/wicket-util/src/main/java/org/apache/wicket/util/upload/FileUploadException.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.wicket.util.upload;
-
-import java.io.PrintStream;
-import java.io.PrintWriter;
-
-
-/**
- * Exception for errors encountered while processing the request.
- * 
- * @author <a href="mailto:jmcnally@collab.net">John McNally</a>
- */
-public class FileUploadException extends Exception
-{
-	/**
-	 * Serial version UID, being used, if the exception is serialized.
-	 */
-	private static final long serialVersionUID = 8881893724388807504L;
-	/**
-	 * The exceptions cause. We overwrite the cause of the super class, which isn't available in
-	 * Java 1.3.
-	 */
-	private final Throwable cause;
-
-	/**
-	 * Constructs a new <code>FileUploadException</code> without message.
-	 */
-	public FileUploadException()
-	{
-		this(null, null);
-	}
-
-	/**
-	 * Constructs a new <code>FileUploadException</code> with specified detail message.
-	 * 
-	 * @param msg
-	 *            the error message.
-	 */
-	public FileUploadException(final String msg)
-	{
-		this(msg, null);
-	}
-
-	/**
-	 * Creates a new <code>FileUploadException</code> with the given detail message and cause.
-	 * 
-	 * @param msg
-	 *            The exceptions detail message.
-	 * @param cause
-	 *            The exceptions cause.
-	 */
-	public FileUploadException(final String msg, final Throwable cause)
-	{
-		super(msg);
-		this.cause = cause;
-	}
-
-	/**
-	 * Prints this throwable and its backtrace to the specified print stream.
-	 * 
-	 * @param stream
-	 *            <code>PrintStream</code> to use for output
-	 */
-	@Override
-	public void printStackTrace(final PrintStream stream)
-	{
-		super.printStackTrace(stream);
-		if (cause != null)
-		{
-			stream.println("Caused by:");
-			cause.printStackTrace(stream);
-		}
-	}
-
-	/**
-	 * Prints this throwable and its backtrace to the specified print writer.
-	 * 
-	 * @param writer
-	 *            <code>PrintWriter</code> to use for output
-	 */
-	@Override
-	public void printStackTrace(final PrintWriter writer)
-	{
-		super.printStackTrace(writer);
-		if (cause != null)
-		{
-			writer.println("Caused by:");
-			cause.printStackTrace(writer);
-		}
-	}
-
-	@Override
-	public Throwable getCause()
-	{
-		return cause;
-	}
-}

http://git-wip-us.apache.org/repos/asf/wicket/blob/99fcd91f/wicket-util/src/main/java/org/apache/wicket/util/upload/LimitedInputStream.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/upload/LimitedInputStream.java b/wicket-util/src/main/java/org/apache/wicket/util/upload/LimitedInputStream.java
deleted file mode 100644
index 0aa4bb9..0000000
--- a/wicket-util/src/main/java/org/apache/wicket/util/upload/LimitedInputStream.java
+++ /dev/null
@@ -1,173 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.wicket.util.upload;
-
-import java.io.FilterInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-
-
-/**
- * An input stream, which limits its data size. This stream is used, if the content length is
- * unknown.
- */
-public abstract class LimitedInputStream extends FilterInputStream implements Closeable
-{
-	/**
-	 * The maximum size of an item, in bytes.
-	 */
-	private final long sizeMax;
-	/**
-	 * The current number of bytes.
-	 */
-	private long count;
-	/**
-	 * Whether this stream is already closed.
-	 */
-	private boolean closed;
-
-	/**
-	 * Creates a new instance.
-	 * 
-	 * @param pIn
-	 *            The input stream, which shall be limited.
-	 * @param pSizeMax
-	 *            The limit; no more than this number of bytes shall be returned by the source
-	 *            stream.
-	 */
-	public LimitedInputStream(final InputStream pIn, final long pSizeMax)
-	{
-		super(pIn);
-		sizeMax = pSizeMax;
-	}
-
-	/**
-	 * Called to indicate, that the input streams limit has been exceeded.
-	 * 
-	 * @param pSizeMax
-	 *            The input streams limit, in bytes.
-	 * @param pCount
-	 *            The actual number of bytes.
-	 * @throws IOException
-	 *             The called method is expected to raise an IOException.
-	 */
-	protected abstract void raiseError(long pSizeMax, long pCount) throws IOException;
-
-	/**
-	 * Called to check, whether the input streams limit is reached.
-	 * 
-	 * @throws IOException
-	 *             The given limit is exceeded.
-	 */
-	private void checkLimit() throws IOException
-	{
-		if (count > sizeMax)
-		{
-			raiseError(sizeMax, count);
-		}
-	}
-
-	/**
-	 * Reads the next byte of data from this input stream. The value byte is returned as an
-	 * <code>int</code> in the range <code>0</code> to <code>255</code>. If no byte is available
-	 * because the end of the stream has been reached, the value <code>-1</code> is returned. This
-	 * method blocks until input data is available, the end of the stream is detected, or an
-	 * exception is thrown.
-	 * <p>
-	 * This method simply performs <code>in.read()</code> and returns the result.
-	 * 
-	 * @return the next byte of data, or <code>-1</code> if the end of the stream is reached.
-	 * @exception IOException
-	 *                if an I/O error occurs.
-	 * @see java.io.FilterInputStream#in
-	 */
-	@Override
-	public int read() throws IOException
-	{
-		int res = super.read();
-		if (res != -1)
-		{
-			count++;
-			checkLimit();
-		}
-		return res;
-	}
-
-	/**
-	 * Reads up to <code>len</code> bytes of data from this input stream into an array of bytes. If
-	 * <code>len</code> is not zero, the method blocks until some input is available; otherwise, no
-	 * bytes are read and <code>0</code> is returned.
-	 * <p>
-	 * This method simply performs <code>in.read(b, off, len)</code> and returns the result.
-	 * 
-	 * @param b
-	 *            the buffer into which the data is read.
-	 * @param off
-	 *            The start offset in the destination array <code>b</code>.
-	 * @param len
-	 *            the maximum number of bytes read.
-	 * @return the total number of bytes read into the buffer, or <code>-1</code> if there is no
-	 *         more data because the end of the stream has been reached.
-	 * @exception NullPointerException
-	 *                If <code>b</code> is <code>null</code>.
-	 * @exception IndexOutOfBoundsException
-	 *                If <code>off</code> is negative, <code>len</code> is negative, or
-	 *                <code>len</code> is greater than <code>b.length - off</code>
-	 * @exception IOException
-	 *                if an I/O error occurs.
-	 * @see java.io.FilterInputStream#in
-	 */
-	@Override
-	public int read(final byte[] b, final int off, final int len) throws IOException
-	{
-		int res = super.read(b, off, len);
-		if (res > 0)
-		{
-			count += res;
-			checkLimit();
-		}
-		return res;
-	}
-
-	/**
-	 * Returns, whether this stream is already closed.
-	 * 
-	 * @return True, if the stream is closed, otherwise false.
-	 * @throws IOException
-	 *             An I/O error occurred.
-	 */
-	@Override
-	public boolean isClosed() throws IOException
-	{
-		return closed;
-	}
-
-	/**
-	 * Closes this input stream and releases any system resources associated with the stream. This
-	 * method simply performs <code>in.close()</code>.
-	 * 
-	 * @exception IOException
-	 *                if an I/O error occurs.
-	 * @see java.io.FilterInputStream#in
-	 */
-	@Override
-	public void close() throws IOException
-	{
-		closed = true;
-		super.close();
-	}
-}