Author: mwiederkehr
Date: Sat Jan 10 14:26:46 2009
New Revision: 733385
URL: http://svn.apache.org/viewvc?rev=733385&view=rev
Log:
move StorageProvider to o.a.j.mime4j.storage (fix for MIME4J-102).
Added:
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/storage/
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/storage/AbstractStorageProvider.java
- copied, changed from r733372,
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/storage/AbstractStorageProvider.java
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/storage/CipherStorageProvider.java
- copied, changed from r733372,
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/storage/CipherStorageProvider.java
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/storage/DefaultStorageProvider.java
- copied, changed from r733372,
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/storage/DefaultStorageProvider.java
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/storage/MemoryStorageProvider.java
- copied, changed from r733372,
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/storage/MemoryStorageProvider.java
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/storage/MultiReferenceStorage.java
- copied, changed from r733372,
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/storage/MultiReferenceStorage.java
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/storage/Storage.java
- copied, changed from r733372,
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/storage/Storage.java
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/storage/StorageOutputStream.java
- copied, changed from r733372,
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/storage/StorageOutputStream.java
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/storage/StorageProvider.java
- copied, changed from r733372,
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/storage/StorageProvider.java
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/storage/TempFileStorageProvider.java
- copied, changed from r733372,
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/storage/TempFileStorageProvider.java
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/storage/ThresholdStorageProvider.java
- copied, changed from r733372,
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/storage/ThresholdStorageProvider.java
james/mime4j/trunk/src/test/java/org/apache/james/mime4j/storage/
james/mime4j/trunk/src/test/java/org/apache/james/mime4j/storage/DefaultStorageProviderTest.java
- copied, changed from r733372,
james/mime4j/trunk/src/test/java/org/apache/james/mime4j/message/storage/DefaultStorageProviderTest.java
james/mime4j/trunk/src/test/java/org/apache/james/mime4j/storage/MultiReferenceStorageTest.java
- copied, changed from r733372,
james/mime4j/trunk/src/test/java/org/apache/james/mime4j/message/storage/MultiReferenceStorageTest.java
james/mime4j/trunk/src/test/java/org/apache/james/mime4j/storage/StorageProviderTest.java
- copied, changed from r733372,
james/mime4j/trunk/src/test/java/org/apache/james/mime4j/message/storage/StorageProviderTest.java
Removed:
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/storage/AbstractStorageProvider.java
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/storage/CipherStorageProvider.java
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/storage/DefaultStorageProvider.java
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/storage/MemoryStorageProvider.java
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/storage/MultiReferenceStorage.java
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/storage/Storage.java
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/storage/StorageOutputStream.java
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/storage/StorageProvider.java
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/storage/TempFileStorageProvider.java
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/storage/ThresholdStorageProvider.java
james/mime4j/trunk/src/test/java/org/apache/james/mime4j/message/storage/DefaultStorageProviderTest.java
james/mime4j/trunk/src/test/java/org/apache/james/mime4j/message/storage/MultiReferenceStorageTest.java
james/mime4j/trunk/src/test/java/org/apache/james/mime4j/message/storage/StorageProviderTest.java
Modified:
james/mime4j/trunk/benchmarks/src/org/apache/james/mime4j/LongMultipartReadBench.java
james/mime4j/trunk/examples/src/java/org/apache/james/mime4j/samples/transform/TransformMessage.java
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/BodyFactory.java
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/Message.java
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/MessageBuilder.java
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/StorageBinaryBody.java
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/StorageTextBody.java
james/mime4j/trunk/src/test/java/org/apache/james/mime4j/message/SingleBodyCopyTest.java
Modified:
james/mime4j/trunk/benchmarks/src/org/apache/james/mime4j/LongMultipartReadBench.java
URL:
http://svn.apache.org/viewvc/james/mime4j/trunk/benchmarks/src/org/apache/james/mime4j/LongMultipartReadBench.java?rev=733385&r1=733384&r2=733385&view=diff
==============================================================================
---
james/mime4j/trunk/benchmarks/src/org/apache/james/mime4j/LongMultipartReadBench.java
(original)
+++
james/mime4j/trunk/benchmarks/src/org/apache/james/mime4j/LongMultipartReadBench.java
Sat Jan 10 14:26:46 2009
@@ -29,12 +29,12 @@
import org.apache.james.mime4j.message.Header;
import org.apache.james.mime4j.message.Message;
import org.apache.james.mime4j.message.SimpleContentHandler;
-import org.apache.james.mime4j.message.storage.DefaultStorageProvider;
-import org.apache.james.mime4j.message.storage.MemoryStorageProvider;
import org.apache.james.mime4j.parser.AbstractContentHandler;
import org.apache.james.mime4j.parser.ContentHandler;
import org.apache.james.mime4j.parser.MimeStreamParser;
import org.apache.james.mime4j.parser.MimeTokenStream;
+import org.apache.james.mime4j.storage.DefaultStorageProvider;
+import org.apache.james.mime4j.storage.MemoryStorageProvider;
public class LongMultipartReadBench {
Modified:
james/mime4j/trunk/examples/src/java/org/apache/james/mime4j/samples/transform/TransformMessage.java
URL:
http://svn.apache.org/viewvc/james/mime4j/trunk/examples/src/java/org/apache/james/mime4j/samples/transform/TransformMessage.java?rev=733385&r1=733384&r2=733385&view=diff
==============================================================================
---
james/mime4j/trunk/examples/src/java/org/apache/james/mime4j/samples/transform/TransformMessage.java
(original)
+++
james/mime4j/trunk/examples/src/java/org/apache/james/mime4j/samples/transform/TransformMessage.java
Sat Jan 10 14:26:46 2009
@@ -32,10 +32,10 @@
import org.apache.james.mime4j.message.Mode;
import org.apache.james.mime4j.message.Multipart;
import org.apache.james.mime4j.message.TextBody;
-import org.apache.james.mime4j.message.storage.DefaultStorageProvider;
-import org.apache.james.mime4j.message.storage.StorageProvider;
-import org.apache.james.mime4j.message.storage.TempFileStorageProvider;
import org.apache.james.mime4j.util.MimeUtil;
+import org.apache.james.mime4j.storage.DefaultStorageProvider;
+import org.apache.james.mime4j.storage.StorageProvider;
+import org.apache.james.mime4j.storage.TempFileStorageProvider;
/**
* This code should illustrate how to transform a message into another message
Modified:
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/BodyFactory.java
URL:
http://svn.apache.org/viewvc/james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/BodyFactory.java?rev=733385&r1=733384&r2=733385&view=diff
==============================================================================
---
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/BodyFactory.java
(original)
+++
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/BodyFactory.java
Sat Jan 10 14:26:46 2009
@@ -25,10 +25,10 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.james.mime4j.message.storage.DefaultStorageProvider;
-import org.apache.james.mime4j.message.storage.MultiReferenceStorage;
-import org.apache.james.mime4j.message.storage.Storage;
-import org.apache.james.mime4j.message.storage.StorageProvider;
+import org.apache.james.mime4j.storage.DefaultStorageProvider;
+import org.apache.james.mime4j.storage.MultiReferenceStorage;
+import org.apache.james.mime4j.storage.Storage;
+import org.apache.james.mime4j.storage.StorageProvider;
import org.apache.james.mime4j.util.CharsetUtil;
import org.apache.james.mime4j.util.MessageUtils;
Modified:
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/Message.java
URL:
http://svn.apache.org/viewvc/james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/Message.java?rev=733385&r1=733384&r2=733385&view=diff
==============================================================================
---
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/Message.java
(original)
+++
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/Message.java
Sat Jan 10 14:26:46 2009
@@ -23,10 +23,10 @@
import org.apache.james.mime4j.MimeIOException;
import org.apache.james.mime4j.field.Field;
import org.apache.james.mime4j.field.UnstructuredField;
-import org.apache.james.mime4j.message.storage.DefaultStorageProvider;
-import org.apache.james.mime4j.message.storage.StorageProvider;
import org.apache.james.mime4j.parser.MimeEntityConfig;
import org.apache.james.mime4j.parser.MimeStreamParser;
+import org.apache.james.mime4j.storage.DefaultStorageProvider;
+import org.apache.james.mime4j.storage.StorageProvider;
import java.io.IOException;
import java.io.InputStream;
Modified:
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/MessageBuilder.java
URL:
http://svn.apache.org/viewvc/james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/MessageBuilder.java?rev=733385&r1=733384&r2=733385&view=diff
==============================================================================
---
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/MessageBuilder.java
(original)
+++
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/MessageBuilder.java
Sat Jan 10 14:26:46 2009
@@ -28,8 +28,8 @@
import org.apache.james.mime4j.decoder.QuotedPrintableInputStream;
import org.apache.james.mime4j.descriptor.BodyDescriptor;
import org.apache.james.mime4j.field.Field;
-import org.apache.james.mime4j.message.storage.StorageProvider;
import org.apache.james.mime4j.parser.ContentHandler;
+import org.apache.james.mime4j.storage.StorageProvider;
import org.apache.james.mime4j.util.CharArrayBuffer;
import org.apache.james.mime4j.util.MimeUtil;
Modified:
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/StorageBinaryBody.java
URL:
http://svn.apache.org/viewvc/james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/StorageBinaryBody.java?rev=733385&r1=733384&r2=733385&view=diff
==============================================================================
---
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/StorageBinaryBody.java
(original)
+++
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/StorageBinaryBody.java
Sat Jan 10 14:26:46 2009
@@ -24,11 +24,11 @@
import java.io.OutputStream;
import org.apache.james.mime4j.decoder.CodecUtil;
-import org.apache.james.mime4j.message.storage.MultiReferenceStorage;
+import org.apache.james.mime4j.storage.MultiReferenceStorage;
/**
* Binary body backed by a
- * {...@link org.apache.james.mime4j.message.storage.Storage}
+ * {...@link org.apache.james.mime4j.storage.Storage}
*/
class StorageBinaryBody extends SingleBody implements BinaryBody {
@@ -66,7 +66,7 @@
/**
* Deletes the Storage that holds the content of this binary body.
- *
+ *
* @see org.apache.james.mime4j.message.Disposable#dispose()
*/
@Override
Modified:
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/StorageTextBody.java
URL:
http://svn.apache.org/viewvc/james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/StorageTextBody.java?rev=733385&r1=733384&r2=733385&view=diff
==============================================================================
---
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/StorageTextBody.java
(original)
+++
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/StorageTextBody.java
Sat Jan 10 14:26:46 2009
@@ -27,11 +27,11 @@
import java.nio.charset.Charset;
import org.apache.james.mime4j.decoder.CodecUtil;
-import org.apache.james.mime4j.message.storage.MultiReferenceStorage;
+import org.apache.james.mime4j.storage.MultiReferenceStorage;
import org.apache.james.mime4j.util.CharsetUtil;
/**
- * Text body backed by a {...@link
org.apache.james.mime4j.message.storage.Storage}.
+ * Text body backed by a {...@link org.apache.james.mime4j.storage.Storage}.
*/
class StorageTextBody extends SingleBody implements TextBody {
@@ -78,7 +78,7 @@
/**
* Deletes the Storage that holds the content of this text body.
- *
+ *
* @see org.apache.james.mime4j.message.Disposable#dispose()
*/
@Override
Copied:
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/storage/AbstractStorageProvider.java
(from r733372,
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/storage/AbstractStorageProvider.java)
URL:
http://svn.apache.org/viewvc/james/mime4j/trunk/src/main/java/org/apache/james/mime4j/storage/AbstractStorageProvider.java?p2=james/mime4j/trunk/src/main/java/org/apache/james/mime4j/storage/AbstractStorageProvider.java&p1=james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/storage/AbstractStorageProvider.java&r1=733372&r2=733385&rev=733385&view=diff
==============================================================================
---
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/storage/AbstractStorageProvider.java
(original)
+++
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/storage/AbstractStorageProvider.java
Sat Jan 10 14:26:46 2009
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mime4j.message.storage;
+package org.apache.james.mime4j.storage;
import java.io.IOException;
import java.io.InputStream;
@@ -44,7 +44,7 @@
* and copies the content of the given input stream to that output stream.
* It then calls {...@link StorageOutputStream#toStorage()} on the output
* stream and returns this object.
- *
+ *
* @param in
* stream containing the data to store.
* @return a {...@link Storage} instance that can be used to retrieve the
Copied:
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/storage/CipherStorageProvider.java
(from r733372,
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/storage/CipherStorageProvider.java)
URL:
http://svn.apache.org/viewvc/james/mime4j/trunk/src/main/java/org/apache/james/mime4j/storage/CipherStorageProvider.java?p2=james/mime4j/trunk/src/main/java/org/apache/james/mime4j/storage/CipherStorageProvider.java&p1=james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/storage/CipherStorageProvider.java&r1=733372&r2=733385&rev=733385&view=diff
==============================================================================
---
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/storage/CipherStorageProvider.java
(original)
+++
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/storage/CipherStorageProvider.java
Sat Jan 10 14:26:46 2009
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mime4j.message.storage;
+package org.apache.james.mime4j.storage;
import java.io.IOException;
import java.io.InputStream;
@@ -33,10 +33,10 @@
/**
* A {...@link StorageProvider} that transparently scrambles and unscrambles
the
* data stored by another <code>StorageProvider</code>.
- *
+ *
* <p>
* Example usage:
- *
+ *
* <pre>
* StorageProvider mistrusted = new TempFileStorageProvider();
* StorageProvider enciphered = new CipherStorageProvider(mistrusted);
@@ -53,7 +53,7 @@
/**
* Creates a new <code>CipherStorageProvider</code> for the given back-end
* using the Blowfish cipher algorithm.
- *
+ *
* @param backend
* back-end storage strategy to encrypt.
*/
@@ -64,7 +64,7 @@
/**
* Creates a new <code>CipherStorageProvider</code> for the given back-end
* and cipher algorithm.
- *
+ *
* @param backend
* back-end storage strategy to encrypt.
* @param algorithm
Copied:
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/storage/DefaultStorageProvider.java
(from r733372,
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/storage/DefaultStorageProvider.java)
URL:
http://svn.apache.org/viewvc/james/mime4j/trunk/src/main/java/org/apache/james/mime4j/storage/DefaultStorageProvider.java?p2=james/mime4j/trunk/src/main/java/org/apache/james/mime4j/storage/DefaultStorageProvider.java&p1=james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/storage/DefaultStorageProvider.java&r1=733372&r2=733385&rev=733385&view=diff
==============================================================================
---
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/storage/DefaultStorageProvider.java
(original)
+++
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/storage/DefaultStorageProvider.java
Sat Jan 10 14:26:46 2009
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mime4j.message.storage;
+package org.apache.james.mime4j.storage;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -54,7 +54,7 @@
/**
* Returns the default {...@link StorageProvider} instance.
- *
+ *
* @return the default {...@link StorageProvider} instance.
*/
public static StorageProvider getInstance() {
@@ -63,7 +63,7 @@
/**
* Sets the default {...@link StorageProvider} instance.
- *
+ *
* @param instance
* the default {...@link StorageProvider} instance.
*/
Copied:
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/storage/MemoryStorageProvider.java
(from r733372,
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/storage/MemoryStorageProvider.java)
URL:
http://svn.apache.org/viewvc/james/mime4j/trunk/src/main/java/org/apache/james/mime4j/storage/MemoryStorageProvider.java?p2=james/mime4j/trunk/src/main/java/org/apache/james/mime4j/storage/MemoryStorageProvider.java&p1=james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/storage/MemoryStorageProvider.java&r1=733372&r2=733385&rev=733385&view=diff
==============================================================================
---
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/storage/MemoryStorageProvider.java
(original)
+++
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/storage/MemoryStorageProvider.java
Sat Jan 10 14:26:46 2009
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mime4j.message.storage;
+package org.apache.james.mime4j.storage;
import java.io.ByteArrayInputStream;
import java.io.IOException;
@@ -29,7 +29,7 @@
* A {...@link StorageProvider} that stores the data entirely in memory.
* <p>
* Example usage:
- *
+ *
* <pre>
* StorageProvider provider = new MemoryStorageProvider();
* DefaultStorageProvider.setInstance(provider);
Copied:
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/storage/MultiReferenceStorage.java
(from r733372,
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/storage/MultiReferenceStorage.java)
URL:
http://svn.apache.org/viewvc/james/mime4j/trunk/src/main/java/org/apache/james/mime4j/storage/MultiReferenceStorage.java?p2=james/mime4j/trunk/src/main/java/org/apache/james/mime4j/storage/MultiReferenceStorage.java&p1=james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/storage/MultiReferenceStorage.java&r1=733372&r2=733385&rev=733385&view=diff
==============================================================================
---
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/storage/MultiReferenceStorage.java
(original)
+++
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/storage/MultiReferenceStorage.java
Sat Jan 10 14:26:46 2009
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mime4j.message.storage;
+package org.apache.james.mime4j.storage;
import java.io.IOException;
import java.io.InputStream;
@@ -51,7 +51,7 @@
* Creates a new <code>MultiReferenceStorage</code> instance for the given
* back-end. The reference counter is initially set to one so the caller
* does not have to call {...@link #addReference()} after this constructor.
- *
+ *
* @param storage
* storage back-end that should be reference counted.
* @throws IllegalArgumentException
@@ -67,7 +67,7 @@
/**
* Increments the reference counter.
- *
+ *
* @throws IllegalStateException
* if the reference counter is zero which implies that the
* backing storage has already been deleted.
@@ -82,7 +82,7 @@
* <p>
* A client that holds a reference to this object must make sure not to
* invoke this method a second time.
- *
+ *
* @throws IllegalStateException
* if the reference counter is zero which implies that the
* backing storage has already been deleted.
@@ -95,7 +95,7 @@
/**
* Returns the input stream of the inner <code>Storage</code> object.
- *
+ *
* @return an input stream.
*/
public InputStream getInputStream() throws IOException {
@@ -104,7 +104,7 @@
/**
* Synchronized increment of reference count.
- *
+ *
* @throws IllegalStateException
* when counter is already zero
*/
@@ -117,7 +117,7 @@
/**
* Synchronized decrement of reference count.
- *
+ *
* @return true when counter has reached zero, false otherwise
* @throws IllegalStateException
* when counter is already zero
Copied:
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/storage/Storage.java
(from r733372,
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/storage/Storage.java)
URL:
http://svn.apache.org/viewvc/james/mime4j/trunk/src/main/java/org/apache/james/mime4j/storage/Storage.java?p2=james/mime4j/trunk/src/main/java/org/apache/james/mime4j/storage/Storage.java&p1=james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/storage/Storage.java&r1=733372&r2=733385&rev=733385&view=diff
==============================================================================
---
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/storage/Storage.java
(original)
+++
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/storage/Storage.java
Sat Jan 10 14:26:46 2009
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mime4j.message.storage;
+package org.apache.james.mime4j.storage;
import java.io.IOException;
import java.io.InputStream;
@@ -35,7 +35,7 @@
* <code>BufferedInputStream</code> by the caller. If the implementing
* <code>Storage</code> creates a stream which would benefit from being
* buffered it is the <code>Storage</code>'s responsibility to wrap it.
- *
+ *
* @return an <code>InputStream</code> for reading the stored data.
* @throws IOException
* if an I/O error occurs.
Copied:
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/storage/StorageOutputStream.java
(from r733372,
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/storage/StorageOutputStream.java)
URL:
http://svn.apache.org/viewvc/james/mime4j/trunk/src/main/java/org/apache/james/mime4j/storage/StorageOutputStream.java?p2=james/mime4j/trunk/src/main/java/org/apache/james/mime4j/storage/StorageOutputStream.java&p1=james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/storage/StorageOutputStream.java&r1=733372&r2=733385&rev=733385&view=diff
==============================================================================
---
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/storage/StorageOutputStream.java
(original)
+++
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/storage/StorageOutputStream.java
Sat Jan 10 14:26:46 2009
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mime4j.message.storage;
+package org.apache.james.mime4j.storage;
import java.io.IOException;
import java.io.OutputStream;
@@ -56,7 +56,7 @@
* for some implementations it is not possible to create another
* <code>Storage</code> object that can be read from and deleted
* independently (e.g. if the implementation writes to a file).
- *
+ *
* @return a <code>Storage</code> object as described above.
* @throws IOException
* if an I/O error occurs.
@@ -125,7 +125,7 @@
* <p>
* This implementation never throws an {...@link IOException} but a
subclass
* might.
- *
+ *
* @throws IOException
* if an I/O error occurs.
*/
@@ -141,7 +141,7 @@
* {...@link #write(byte[], int, int)}. All the required preconditions have
* already been checked by these methods, including the check if the output
* stream has already been closed.
- *
+ *
* @param buffer
* buffer containing bytes to write.
* @param offset
@@ -160,7 +160,7 @@
* <code>StorageOutputStream</code>. This method gets called by
* {...@link #toStorage()} after the preconditions have been checked. The
* implementation can also be sure that this methods gets invoked only
once.
- *
+ *
* @return a <code>Storage</code> object as described above.
* @throws IOException
* if an I/O error occurs.
Copied:
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/storage/StorageProvider.java
(from r733372,
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/storage/StorageProvider.java)
URL:
http://svn.apache.org/viewvc/james/mime4j/trunk/src/main/java/org/apache/james/mime4j/storage/StorageProvider.java?p2=james/mime4j/trunk/src/main/java/org/apache/james/mime4j/storage/StorageProvider.java&p1=james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/storage/StorageProvider.java&r1=733372&r2=733385&rev=733385&view=diff
==============================================================================
---
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/storage/StorageProvider.java
(original)
+++
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/storage/StorageProvider.java
Sat Jan 10 14:26:46 2009
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mime4j.message.storage;
+package org.apache.james.mime4j.storage;
import java.io.IOException;
import java.io.InputStream;
@@ -29,7 +29,7 @@
public interface StorageProvider {
/**
* Stores the contents of the given <code>InputStream</code>.
- *
+ *
* @param in stream containing the data to store.
* @return a {...@link Storage} instance that can be used to retrieve the
* stored content.
@@ -42,7 +42,7 @@
* written to. Subsequently the user can call
* {...@link StorageOutputStream#toStorage() toStorage()} on that object
to get
* a {...@link Storage} instance that holds the data that has been written.
- *
+ *
* @return a {...@link StorageOutputStream} where data can be written to.
* @throws IOException
* if an I/O error occurs.
Copied:
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/storage/TempFileStorageProvider.java
(from r733372,
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/storage/TempFileStorageProvider.java)
URL:
http://svn.apache.org/viewvc/james/mime4j/trunk/src/main/java/org/apache/james/mime4j/storage/TempFileStorageProvider.java?p2=james/mime4j/trunk/src/main/java/org/apache/james/mime4j/storage/TempFileStorageProvider.java&p1=james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/storage/TempFileStorageProvider.java&r1=733372&r2=733385&rev=733385&view=diff
==============================================================================
---
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/storage/TempFileStorageProvider.java
(original)
+++
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/storage/TempFileStorageProvider.java
Sat Jan 10 14:26:46 2009
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mime4j.message.storage;
+package org.apache.james.mime4j.storage;
import java.io.BufferedInputStream;
import java.io.File;
@@ -36,7 +36,7 @@
* directory (specified by system property <code>java.io.tmpdir</code>).
* <p>
* Example usage:
- *
+ *
* <pre>
* File directory = new File("/tmp/mime4j");
* StorageProvider provider = new TempFileStorageProvider(directory);
@@ -70,7 +70,7 @@
/**
* Creates a new <code>TempFileStorageProvider</code> using the given
* values.
- *
+ *
* @param prefix
* prefix for generating the temporary file's name; must be at
* least three characters long.
Copied:
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/storage/ThresholdStorageProvider.java
(from r733372,
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/storage/ThresholdStorageProvider.java)
URL:
http://svn.apache.org/viewvc/james/mime4j/trunk/src/main/java/org/apache/james/mime4j/storage/ThresholdStorageProvider.java?p2=james/mime4j/trunk/src/main/java/org/apache/james/mime4j/storage/ThresholdStorageProvider.java&p1=james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/storage/ThresholdStorageProvider.java&r1=733372&r2=733385&rev=733385&view=diff
==============================================================================
---
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/storage/ThresholdStorageProvider.java
(original)
+++
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/storage/ThresholdStorageProvider.java
Sat Jan 10 14:26:46 2009
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mime4j.message.storage;
+package org.apache.james.mime4j.storage;
import java.io.ByteArrayInputStream;
import java.io.IOException;
@@ -32,7 +32,7 @@
* if a certain threshold size gets exceeded.
* <p>
* Example usage:
- *
+ *
* <pre>
* StorageProvider tempStore = new TempFileStorageProvider();
* StorageProvider provider = new ThresholdStorageProvider(tempStore, 4096);
@@ -55,7 +55,7 @@
/**
* Creates a new <code>ThresholdStorageProvider</code> for the given
* back-end and threshold size.
- *
+ *
* @param backend
* used to store the remainder of the data if the threshold size
* gets exceeded.
Modified:
james/mime4j/trunk/src/test/java/org/apache/james/mime4j/message/SingleBodyCopyTest.java
URL:
http://svn.apache.org/viewvc/james/mime4j/trunk/src/test/java/org/apache/james/mime4j/message/SingleBodyCopyTest.java?rev=733385&r1=733384&r2=733385&view=diff
==============================================================================
---
james/mime4j/trunk/src/test/java/org/apache/james/mime4j/message/SingleBodyCopyTest.java
(original)
+++
james/mime4j/trunk/src/test/java/org/apache/james/mime4j/message/SingleBodyCopyTest.java
Sat Jan 10 14:26:46 2009
@@ -24,9 +24,9 @@
import junit.framework.TestCase;
-import org.apache.james.mime4j.message.storage.MemoryStorageProvider;
-import org.apache.james.mime4j.message.storage.MultiReferenceStorage;
-import org.apache.james.mime4j.message.storage.Storage;
+import org.apache.james.mime4j.storage.MemoryStorageProvider;
+import org.apache.james.mime4j.storage.MultiReferenceStorage;
+import org.apache.james.mime4j.storage.Storage;
import org.apache.james.mime4j.util.MessageUtils;
public class SingleBodyCopyTest extends TestCase {
Copied:
james/mime4j/trunk/src/test/java/org/apache/james/mime4j/storage/DefaultStorageProviderTest.java
(from r733372,
james/mime4j/trunk/src/test/java/org/apache/james/mime4j/message/storage/DefaultStorageProviderTest.java)
URL:
http://svn.apache.org/viewvc/james/mime4j/trunk/src/test/java/org/apache/james/mime4j/storage/DefaultStorageProviderTest.java?p2=james/mime4j/trunk/src/test/java/org/apache/james/mime4j/storage/DefaultStorageProviderTest.java&p1=james/mime4j/trunk/src/test/java/org/apache/james/mime4j/message/storage/DefaultStorageProviderTest.java&r1=733372&r2=733385&rev=733385&view=diff
==============================================================================
---
james/mime4j/trunk/src/test/java/org/apache/james/mime4j/message/storage/DefaultStorageProviderTest.java
(original)
+++
james/mime4j/trunk/src/test/java/org/apache/james/mime4j/storage/DefaultStorageProviderTest.java
Sat Jan 10 14:26:46 2009
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mime4j.message.storage;
+package org.apache.james.mime4j.storage;
import junit.framework.TestCase;
Copied:
james/mime4j/trunk/src/test/java/org/apache/james/mime4j/storage/MultiReferenceStorageTest.java
(from r733372,
james/mime4j/trunk/src/test/java/org/apache/james/mime4j/message/storage/MultiReferenceStorageTest.java)
URL:
http://svn.apache.org/viewvc/james/mime4j/trunk/src/test/java/org/apache/james/mime4j/storage/MultiReferenceStorageTest.java?p2=james/mime4j/trunk/src/test/java/org/apache/james/mime4j/storage/MultiReferenceStorageTest.java&p1=james/mime4j/trunk/src/test/java/org/apache/james/mime4j/message/storage/MultiReferenceStorageTest.java&r1=733372&r2=733385&rev=733385&view=diff
==============================================================================
---
james/mime4j/trunk/src/test/java/org/apache/james/mime4j/message/storage/MultiReferenceStorageTest.java
(original)
+++
james/mime4j/trunk/src/test/java/org/apache/james/mime4j/storage/MultiReferenceStorageTest.java
Sat Jan 10 14:26:46 2009
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mime4j.message.storage;
+package org.apache.james.mime4j.storage;
import java.io.ByteArrayInputStream;
import java.io.IOException;
Copied:
james/mime4j/trunk/src/test/java/org/apache/james/mime4j/storage/StorageProviderTest.java
(from r733372,
james/mime4j/trunk/src/test/java/org/apache/james/mime4j/message/storage/StorageProviderTest.java)
URL:
http://svn.apache.org/viewvc/james/mime4j/trunk/src/test/java/org/apache/james/mime4j/storage/StorageProviderTest.java?p2=james/mime4j/trunk/src/test/java/org/apache/james/mime4j/storage/StorageProviderTest.java&p1=james/mime4j/trunk/src/test/java/org/apache/james/mime4j/message/storage/StorageProviderTest.java&r1=733372&r2=733385&rev=733385&view=diff
==============================================================================
---
james/mime4j/trunk/src/test/java/org/apache/james/mime4j/message/storage/StorageProviderTest.java
(original)
+++
james/mime4j/trunk/src/test/java/org/apache/james/mime4j/storage/StorageProviderTest.java
Sat Jan 10 14:26:46 2009
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mime4j.message.storage;
+package org.apache.james.mime4j.storage;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
