Author: jochen
Date: Fri Mar 16 04:47:19 2007
New Revision: 518944
URL: http://svn.apache.org/viewvc?view=rev&rev=518944
Log:
Merged in changes made for the 1.2 release.
Modified:
jakarta/commons/proper/fileupload/trunk/NOTICE.txt
jakarta/commons/proper/fileupload/trunk/pom.xml
jakarta/commons/proper/fileupload/trunk/project.xml
jakarta/commons/proper/fileupload/trunk/src/java/org/apache/commons/fileupload/FileUploadBase.java
jakarta/commons/proper/fileupload/trunk/src/java/org/apache/commons/fileupload/MultipartStream.java
jakarta/commons/proper/fileupload/trunk/src/main/assembly/src.xml
jakarta/commons/proper/fileupload/trunk/src/site/site.xml
jakarta/commons/proper/fileupload/trunk/src/test/org/apache/commons/fileupload/ProgressListenerTest.java
jakarta/commons/proper/fileupload/trunk/xdocs/index.xml
Modified: jakarta/commons/proper/fileupload/trunk/NOTICE.txt
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/fileupload/trunk/NOTICE.txt?view=diff&rev=518944&r1=518943&r2=518944
==============================================================================
--- jakarta/commons/proper/fileupload/trunk/NOTICE.txt (original)
+++ jakarta/commons/proper/fileupload/trunk/NOTICE.txt Fri Mar 16 04:47:19 2007
@@ -1,5 +1,5 @@
Apache Jakarta Commons FileUpload
-Copyright 2002-2006 The Apache Software Foundation
+Copyright 2002-2007 The Apache Software Foundation
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
Modified: jakarta/commons/proper/fileupload/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/fileupload/trunk/pom.xml?view=diff&rev=518944&r1=518943&r2=518944
==============================================================================
--- jakarta/commons/proper/fileupload/trunk/pom.xml (original)
+++ jakarta/commons/proper/fileupload/trunk/pom.xml Fri Mar 16 04:47:19 2007
@@ -235,6 +235,14 @@
</rulesets>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>clirr-maven-plugin</artifactId>
+ <configuration>
+ <comparisonVersion>1.1</comparisonVersion>
+ <minSeverity>info</minSeverity>
+ </configuration>
+ </plugin>
</plugins>
</reporting>
</project>
Modified: jakarta/commons/proper/fileupload/trunk/project.xml
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/fileupload/trunk/project.xml?view=diff&rev=518944&r1=518943&r2=518944
==============================================================================
--- jakarta/commons/proper/fileupload/trunk/project.xml (original)
+++ jakarta/commons/proper/fileupload/trunk/project.xml Fri Mar 16 04:47:19 2007
@@ -79,7 +79,7 @@
<versions>
<version>
<id>1.2</id>
- <name>1.1.1</name>
+ <name>1.2</name>
<tag>commons-fileupload-1.2</tag>
</version>
<version>
Modified:
jakarta/commons/proper/fileupload/trunk/src/java/org/apache/commons/fileupload/FileUploadBase.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/fileupload/trunk/src/java/org/apache/commons/fileupload/FileUploadBase.java?view=diff&rev=518944&r1=518943&r2=518944
==============================================================================
---
jakarta/commons/proper/fileupload/trunk/src/java/org/apache/commons/fileupload/FileUploadBase.java
(original)
+++
jakarta/commons/proper/fileupload/trunk/src/java/org/apache/commons/fileupload/FileUploadBase.java
Fri Mar 16 04:47:19 2007
@@ -342,7 +342,8 @@
List items = new ArrayList();
FileItemFactory fac = getFileItemFactory();
if (fac == null) {
- throw new NullPointerException("No FileItemFactory has been
set.");
+ throw new NullPointerException(
+ "No FileItemFactory has been set.");
}
while (iter.hasNext()) {
FileItemStream item = iter.next();
@@ -1114,14 +1115,17 @@
private static final long serialVersionUID = -2474893167098052828L;
/**
- * @deprecated Replaced by [EMAIL PROTECTED]
#SizeLimitExceededException(String, long, long)}
+ * @deprecated Replaced by
+ * [EMAIL PROTECTED] #SizeLimitExceededException(String, long, long)}
*/
public SizeLimitExceededException() {
this(null, 0, 0);
}
/**
- * @deprecated Replaced by [EMAIL PROTECTED]
#SizeLimitExceededException(String, long, long)}
+ * @deprecated Replaced by
+ * [EMAIL PROTECTED] #SizeLimitExceededException(String, long, long)}
+ * @param message The exceptions detail message.
*/
public SizeLimitExceededException(String message) {
this(message, 0, 0);
Modified:
jakarta/commons/proper/fileupload/trunk/src/java/org/apache/commons/fileupload/MultipartStream.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/fileupload/trunk/src/java/org/apache/commons/fileupload/MultipartStream.java?view=diff&rev=518944&r1=518943&r2=518944
==============================================================================
---
jakarta/commons/proper/fileupload/trunk/src/java/org/apache/commons/fileupload/MultipartStream.java
(original)
+++
jakarta/commons/proper/fileupload/trunk/src/java/org/apache/commons/fileupload/MultipartStream.java
Fri Mar 16 04:47:19 2007
@@ -278,6 +278,38 @@
// ----------------------------------------------------------- Constructors
+ /**
+ * Creates a new instance.
+ * @deprecated Use [EMAIL PROTECTED] #MultipartStream(InputStream, byte[],
+ * org.apache.commons.fileupload.MultipartStream.ProgressNotifier)},
+ * or [EMAIL PROTECTED] #MultipartStream(InputStream, byte[], int,
+ * org.apache.commons.fileupload.MultipartStream.ProgressNotifier)}
+ */
+ public MultipartStream() {
+ this(null, null, null);
+ }
+
+ /**
+ * <p> Constructs a <code>MultipartStream</code> with a custom size buffer
+ * and no progress notifier.
+ *
+ * <p> Note that the buffer must be at least big enough to contain the
+ * boundary string, plus 4 characters for CR/LF and double dash, plus at
+ * least one byte of data. Too small a buffer size setting will degrade
+ * performance.
+ *
+ * @param input The <code>InputStream</code> to serve as a data source.
+ * @param boundary The token used for dividing the stream into
+ * <code>encapsulations</code>.
+ * @param bufSize The size of the buffer to be used, in bytes.
+ *
+ * @see #MultipartStream(InputStream, byte[], ProgressNotifier)
+ * @deprecated Use [EMAIL PROTECTED] #MultipartStream(InputStream, byte[],
int,
+ * org.apache.commons.fileupload.MultipartStream.ProgressNotifier)}.
+ */
+ public MultipartStream(InputStream input, byte[] boundary, int bufSize) {
+ this(input, boundary, bufSize, null);
+ }
/**
* <p> Constructs a <code>MultipartStream</code> with a custom size buffer.
@@ -337,6 +369,21 @@
this(input, boundary, DEFAULT_BUFSIZE, pNotifier);
}
+ /**
+ * <p> Constructs a <code>MultipartStream</code> with a default size
buffer.
+ *
+ * @param input The <code>InputStream</code> to serve as a data source.
+ * @param boundary The token used for dividing the stream into
+ * <code>encapsulations</code>.
+ *
+ * @deprecated Use [EMAIL PROTECTED] #MultipartStream(InputStream, byte[],
+ * ProgressNotifier)}.
+ * @see #MultipartStream(InputStream, byte[], int, ProgressNotifier)
+ */
+ public MultipartStream(InputStream input,
+ byte[] boundary) {
+ this(input, boundary, DEFAULT_BUFSIZE, null);
+ }
// --------------------------------------------------------- Public methods
Modified: jakarta/commons/proper/fileupload/trunk/src/main/assembly/src.xml
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/fileupload/trunk/src/main/assembly/src.xml?view=diff&rev=518944&r1=518943&r2=518944
==============================================================================
--- jakarta/commons/proper/fileupload/trunk/src/main/assembly/src.xml (original)
+++ jakarta/commons/proper/fileupload/trunk/src/main/assembly/src.xml Fri Mar
16 04:47:19 2007
@@ -18,6 +18,7 @@
<id>src</id>
<formats>
<format>tar.gz</format>
+ <format>zip</format>
</formats>
<fileSets>
<fileSet>
Modified: jakarta/commons/proper/fileupload/trunk/src/site/site.xml
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/fileupload/trunk/src/site/site.xml?view=diff&rev=518944&r1=518943&r2=518944
==============================================================================
--- jakarta/commons/proper/fileupload/trunk/src/site/site.xml (original)
+++ jakarta/commons/proper/fileupload/trunk/src/site/site.xml Fri Mar 16
04:47:19 2007
@@ -17,10 +17,16 @@
-->
<project name="FileUpload">
<bannerLeft>
+ <name>Jakarta Commons</name>
+
<src>http://jakarta.apache.org/commons/fileupload/images/jakarta-logo-blue.gif</src>
+ <href>http://jakarta.apache.org/commons</href>
+ </bannerLeft>
+
+ <bannerRight>
<name>Commons FileUpload</name>
- <src>http://jakarta.apache.org/images/jakarta-logo-blue.gif</src>
+ <src>http://jakarta.apache.org/commons/fileupload/images/logo.png</src>
<href>http://jakarta.apache.org/commons/fileupload</href>
- </bannerLeft>
+ </bannerRight>
<skin>
<groupId>org.apache.commons</groupId>
Modified:
jakarta/commons/proper/fileupload/trunk/src/test/org/apache/commons/fileupload/ProgressListenerTest.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/fileupload/trunk/src/test/org/apache/commons/fileupload/ProgressListenerTest.java?view=diff&rev=518944&r1=518943&r2=518944
==============================================================================
---
jakarta/commons/proper/fileupload/trunk/src/test/org/apache/commons/fileupload/ProgressListenerTest.java
(original)
+++
jakarta/commons/proper/fileupload/trunk/src/test/org/apache/commons/fileupload/ProgressListenerTest.java
Fri Mar 16 04:47:19 2007
@@ -90,7 +90,17 @@
FileItemStream stream = iter.next();
InputStream istream = stream.openStream();
for (int j = 0; j < 16384+i; j++) {
- assertEquals((byte) j, (byte) istream.read());
+ /**
+ * This used to be
+ * assertEquals((byte) j, (byte) istream.read());
+ * but this seems to trigger a bug in JRockit, so
+ * we express the same like this:
+ */
+ byte b1 = (byte) j;
+ byte b2 = (byte) istream.read();
+ if (b1 != b2) {
+ fail("Expected " + b1 + ", got " + b2);
+ }
}
assertEquals(-1, istream.read());
}
Modified: jakarta/commons/proper/fileupload/trunk/xdocs/index.xml
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/fileupload/trunk/xdocs/index.xml?view=diff&rev=518944&r1=518943&r2=518944
==============================================================================
--- jakarta/commons/proper/fileupload/trunk/xdocs/index.xml (original)
+++ jakarta/commons/proper/fileupload/trunk/xdocs/index.xml Fri Mar 16 04:47:19
2007
@@ -58,6 +58,14 @@
<section name="Downloading">
<subsection name='Full Releases'>
<p>
+ <strong>FileUpload 1.2</strong> - 13 February 2007
+ <ul>
+ <li>Download the binary and source distributions from a mirror
site
+ <a
href='http://jakarta.apache.org/site/downloads/downloads_commons-fileupload.cgi'>here</a>
+ </li>
+ </ul>
+ </p>
+ <p>
<strong>FileUpload 1.1.1</strong> - 08 June 2006
<ul>
<li>Download the binary and source distributions from a mirror
site
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
