Author: bago
Date: Thu Dec 31 14:59:37 2009
New Revision: 894858
URL: http://svn.apache.org/viewvc?rev=894858&view=rev
Log:
Created a message.impl package and started moving there non-api (non-dom)
classes from the message package (MIME4J-156)
Added:
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/message/impl/
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/message/impl/BodyFactory.java
(contents, props changed)
- copied, changed from r894746,
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/message/BodyFactory.java
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/message/impl/HeaderImpl.java
(with props)
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/message/impl/MessageBuilder.java
(contents, props changed)
- copied, changed from r894746,
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/message/MessageBuilder.java
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/message/impl/SimpleContentHandler.java
(contents, props changed)
- copied, changed from r894746,
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/message/SimpleContentHandler.java
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/message/impl/StorageBinaryBody.java
(contents, props changed)
- copied, changed from r894746,
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/message/StorageBinaryBody.java
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/message/impl/StorageTextBody.java
(contents, props changed)
- copied, changed from r894746,
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/message/StorageTextBody.java
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/message/impl/StringTextBody.java
(contents, props changed)
- copied, changed from r894746,
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/message/StringTextBody.java
james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/message/impl/
james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/message/impl/SingleBodyCopyTest.java
(contents, props changed)
- copied, changed from r894746,
james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/message/SingleBodyCopyTest.java
Removed:
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/message/BodyFactory.java
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/message/MessageBuilder.java
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/message/SimpleContentHandler.java
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/message/StorageBinaryBody.java
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/message/StorageTextBody.java
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/message/StringTextBody.java
james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/message/SingleBodyCopyTest.java
Modified:
james/mime4j/branches/cycleclean/benchmark/src/main/java/org/apache/james/mime4j/LongMultipartReadBench.java
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/message/Entity.java
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/message/Header.java
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/message/Message.java
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/message/Multipart.java
james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/message/CopyConstructorTest.java
james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/message/EntityTest.java
james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/message/MultipartFormTest.java
james/mime4j/branches/cycleclean/examples/src/main/java/org/apache/james/mime4j/samples/dom/MultipartMessage.java
james/mime4j/branches/cycleclean/examples/src/main/java/org/apache/james/mime4j/samples/dom/TextPlainMessage.java
james/mime4j/branches/cycleclean/examples/src/main/java/org/apache/james/mime4j/samples/transform/TransformMessage.java
Modified:
james/mime4j/branches/cycleclean/benchmark/src/main/java/org/apache/james/mime4j/LongMultipartReadBench.java
URL:
http://svn.apache.org/viewvc/james/mime4j/branches/cycleclean/benchmark/src/main/java/org/apache/james/mime4j/LongMultipartReadBench.java?rev=894858&r1=894857&r2=894858&view=diff
==============================================================================
---
james/mime4j/branches/cycleclean/benchmark/src/main/java/org/apache/james/mime4j/LongMultipartReadBench.java
(original)
+++
james/mime4j/branches/cycleclean/benchmark/src/main/java/org/apache/james/mime4j/LongMultipartReadBench.java
Thu Dec 31 14:59:37 2009
@@ -28,7 +28,7 @@
import org.apache.james.mime4j.descriptor.BodyDescriptor;
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.impl.SimpleContentHandler;
import org.apache.james.mime4j.parser.AbstractContentHandler;
import org.apache.james.mime4j.parser.ContentHandler;
import org.apache.james.mime4j.parser.MimeStreamParser;
Modified:
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/message/Entity.java
URL:
http://svn.apache.org/viewvc/james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/message/Entity.java?rev=894858&r1=894857&r2=894858&view=diff
==============================================================================
---
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/message/Entity.java
(original)
+++
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/message/Entity.java
Thu Dec 31 14:59:37 2009
@@ -211,7 +211,7 @@
*
* @param textBody
* the <code>TextBody</code> to set as body.
- * @see BodyFactory#textBody(String)
+ * @see org.apache.james.mime4j.message.impl.BodyFactory#textBody(String)
*/
public void setText(TextBody textBody) {
setText(textBody, "plain");
@@ -228,7 +228,7 @@
* @param subtype
* the text subtype (e.g. "plain", "html" or
* "xml").
- * @see BodyFactory#textBody(String)
+ * @see org.apache.james.mime4j.message.impl.BodyFactory#textBody(String)
*/
public void setText(TextBody textBody, String subtype) {
String mimeType = "text/" + subtype;
Modified:
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/message/Header.java
URL:
http://svn.apache.org/viewvc/james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/message/Header.java?rev=894858&r1=894857&r2=894858&view=diff
==============================================================================
---
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/message/Header.java
(original)
+++
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/message/Header.java
Thu Dec 31 14:59:37 2009
@@ -19,8 +19,6 @@
package org.apache.james.mime4j.message;
-import java.io.IOException;
-import java.io.InputStream;
import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
@@ -28,13 +26,7 @@
import java.util.List;
import java.util.Map;
-import org.apache.james.mime4j.MimeException;
-import org.apache.james.mime4j.MimeIOException;
-import org.apache.james.mime4j.field.DefaultFieldParser;
import org.apache.james.mime4j.field.Field;
-import org.apache.james.mime4j.parser.AbstractContentHandler;
-import org.apache.james.mime4j.parser.MimeStreamParser;
-import org.apache.james.mime4j.parser.RawField;
/**
* The header of an entity (see RFC 2045).
@@ -67,35 +59,6 @@
}
/**
- * Creates a new <code>Header</code> from the specified stream.
- *
- * @param is the stream to read the header from.
- *
- * @throws IOException on I/O errors.
- * @throws MimeIOException on MIME protocol violations.
- */
- public Header(InputStream is)
- throws IOException, MimeIOException {
- final MimeStreamParser parser = new MimeStreamParser();
- parser.setContentHandler(new AbstractContentHandler() {
- @Override
- public void endHeader() {
- parser.stop();
- }
- @Override
- public void field(RawField field) throws MimeException {
- Field parsedField = DefaultFieldParser.parse(field.getRaw());
- addField(parsedField);
- }
- });
- try {
- parser.parse(is);
- } catch (MimeException ex) {
- throw new MimeIOException(ex);
- }
- }
-
- /**
* Adds a field to the end of the list of fields.
*
* @param field the field to add.
Modified:
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/message/Message.java
URL:
http://svn.apache.org/viewvc/james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/message/Message.java?rev=894858&r1=894857&r2=894858&view=diff
==============================================================================
---
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/message/Message.java
(original)
+++
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/message/Message.java
Thu Dec 31 14:59:37 2009
@@ -42,6 +42,7 @@
import org.apache.james.mime4j.field.address.AddressList;
import org.apache.james.mime4j.field.address.Mailbox;
import org.apache.james.mime4j.field.address.MailboxList;
+import org.apache.james.mime4j.message.impl.MessageBuilder;
import org.apache.james.mime4j.parser.MimeEntityConfig;
import org.apache.james.mime4j.parser.MimeStreamParser;
import org.apache.james.mime4j.storage.DefaultStorageProvider;
Modified:
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/message/Multipart.java
URL:
http://svn.apache.org/viewvc/james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/message/Multipart.java?rev=894858&r1=894857&r2=894858&view=diff
==============================================================================
---
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/message/Multipart.java
(original)
+++
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/message/Multipart.java
Thu Dec 31 14:59:37 2009
@@ -243,7 +243,7 @@
return preamble;
}
- void setPreambleRaw(ByteSequence preamble) {
+ public void setPreambleRaw(ByteSequence preamble) {
this.preamble = preamble;
this.preambleStrCache = null;
}
@@ -276,7 +276,7 @@
return epilogue;
}
- void setEpilogueRaw(ByteSequence epilogue) {
+ public void setEpilogueRaw(ByteSequence epilogue) {
this.epilogue = epilogue;
this.epilogueStrCache = null;
}
Copied:
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/message/impl/BodyFactory.java
(from r894746,
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/message/BodyFactory.java)
URL:
http://svn.apache.org/viewvc/james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/message/impl/BodyFactory.java?p2=james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/message/impl/BodyFactory.java&p1=james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/message/BodyFactory.java&r1=894746&r2=894858&rev=894858&view=diff
==============================================================================
---
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/message/BodyFactory.java
(original)
+++
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/message/impl/BodyFactory.java
Thu Dec 31 14:59:37 2009
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mime4j.message;
+package org.apache.james.mime4j.message.impl;
import java.io.IOException;
import java.io.InputStream;
@@ -25,6 +25,10 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.james.mime4j.message.BinaryBody;
+import org.apache.james.mime4j.message.Disposable;
+import org.apache.james.mime4j.message.SingleBody;
+import org.apache.james.mime4j.message.TextBody;
import org.apache.james.mime4j.storage.DefaultStorageProvider;
import org.apache.james.mime4j.storage.MultiReferenceStorage;
import org.apache.james.mime4j.storage.Storage;
Propchange:
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/message/impl/BodyFactory.java
------------------------------------------------------------------------------
svn:eol-style = native
Added:
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/message/impl/HeaderImpl.java
URL:
http://svn.apache.org/viewvc/james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/message/impl/HeaderImpl.java?rev=894858&view=auto
==============================================================================
---
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/message/impl/HeaderImpl.java
(added)
+++
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/message/impl/HeaderImpl.java
Thu Dec 31 14:59:37 2009
@@ -0,0 +1,90 @@
+/****************************************************************
+ * 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.james.mime4j.message.impl;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+import org.apache.james.mime4j.MimeException;
+import org.apache.james.mime4j.MimeIOException;
+import org.apache.james.mime4j.field.DefaultFieldParser;
+import org.apache.james.mime4j.field.Field;
+import org.apache.james.mime4j.message.Header;
+import org.apache.james.mime4j.parser.AbstractContentHandler;
+import org.apache.james.mime4j.parser.MimeStreamParser;
+import org.apache.james.mime4j.parser.RawField;
+
+/**
+ * The header of an entity (see RFC 2045).
+ */
+public class HeaderImpl extends Header {
+
+ /**
+ * Creates a new empty <code>Header</code>.
+ */
+ public HeaderImpl() {
+ }
+
+ /**
+ * Creates a new <code>Header</code> from the specified
+ * <code>Header</code>. The <code>Header</code> instance is initialized
+ * with a copy of the list of {...@link Field}s of the specified
+ * <code>Header</code>. The <code>Field</code> objects are not copied
+ * because they are immutable and can safely be shared between headers.
+ *
+ * @param other
+ * header to copy.
+ */
+ public HeaderImpl(Header other) {
+ for (Field otherField : other.getFields()) {
+ addField(otherField);
+ }
+ }
+
+ /**
+ * Creates a new <code>Header</code> from the specified stream.
+ *
+ * @param is the stream to read the header from.
+ *
+ * @throws IOException on I/O errors.
+ * @throws MimeIOException on MIME protocol violations.
+ */
+ public HeaderImpl(InputStream is)
+ throws IOException, MimeIOException {
+ final MimeStreamParser parser = new MimeStreamParser();
+ parser.setContentHandler(new AbstractContentHandler() {
+ @Override
+ public void endHeader() {
+ parser.stop();
+ }
+ @Override
+ public void field(RawField field) throws MimeException {
+ Field parsedField = DefaultFieldParser.parse(field.getRaw());
+ addField(parsedField);
+ }
+ });
+ try {
+ parser.parse(is);
+ } catch (MimeException ex) {
+ throw new MimeIOException(ex);
+ }
+ }
+
+}
Propchange:
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/message/impl/HeaderImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/message/impl/HeaderImpl.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied:
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/message/impl/MessageBuilder.java
(from r894746,
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/message/MessageBuilder.java)
URL:
http://svn.apache.org/viewvc/james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/message/impl/MessageBuilder.java?p2=james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/message/impl/MessageBuilder.java&p1=james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/message/MessageBuilder.java&r1=894746&r2=894858&rev=894858&view=diff
==============================================================================
---
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/message/MessageBuilder.java
(original)
+++
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/message/impl/MessageBuilder.java
Thu Dec 31 14:59:37 2009
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mime4j.message;
+package org.apache.james.mime4j.message.impl;
import java.io.IOException;
import java.io.InputStream;
@@ -27,6 +27,12 @@
import org.apache.james.mime4j.descriptor.BodyDescriptor;
import org.apache.james.mime4j.field.DefaultFieldParser;
import org.apache.james.mime4j.field.Field;
+import org.apache.james.mime4j.message.Body;
+import org.apache.james.mime4j.message.BodyPart;
+import org.apache.james.mime4j.message.Entity;
+import org.apache.james.mime4j.message.Header;
+import org.apache.james.mime4j.message.Message;
+import org.apache.james.mime4j.message.Multipart;
import org.apache.james.mime4j.parser.ContentHandler;
import org.apache.james.mime4j.parser.MimeStreamParser;
import org.apache.james.mime4j.parser.RawField;
Propchange:
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/message/impl/MessageBuilder.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/message/impl/MessageBuilder.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange:
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/message/impl/MessageBuilder.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied:
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/message/impl/SimpleContentHandler.java
(from r894746,
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/message/SimpleContentHandler.java)
URL:
http://svn.apache.org/viewvc/james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/message/impl/SimpleContentHandler.java?p2=james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/message/impl/SimpleContentHandler.java&p1=james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/message/SimpleContentHandler.java&r1=894746&r2=894858&rev=894858&view=diff
==============================================================================
---
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/message/SimpleContentHandler.java
(original)
+++
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/message/impl/SimpleContentHandler.java
Thu Dec 31 14:59:37 2009
@@ -17,11 +17,12 @@
* under the License. *
****************************************************************/
-package org.apache.james.mime4j.message;
+package org.apache.james.mime4j.message.impl;
import org.apache.james.mime4j.MimeException;
import org.apache.james.mime4j.field.DefaultFieldParser;
import org.apache.james.mime4j.field.Field;
+import org.apache.james.mime4j.message.Header;
import org.apache.james.mime4j.parser.AbstractContentHandler;
import org.apache.james.mime4j.parser.RawField;
Propchange:
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/message/impl/SimpleContentHandler.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied:
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/message/impl/StorageBinaryBody.java
(from r894746,
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/message/StorageBinaryBody.java)
URL:
http://svn.apache.org/viewvc/james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/message/impl/StorageBinaryBody.java?p2=james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/message/impl/StorageBinaryBody.java&p1=james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/message/StorageBinaryBody.java&r1=894746&r2=894858&rev=894858&view=diff
==============================================================================
---
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/message/StorageBinaryBody.java
(original)
+++
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/message/impl/StorageBinaryBody.java
Thu Dec 31 14:59:37 2009
@@ -17,13 +17,14 @@
* under the License. *
****************************************************************/
-package org.apache.james.mime4j.message;
+package org.apache.james.mime4j.message.impl;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import org.apache.james.mime4j.codec.CodecUtil;
+import org.apache.james.mime4j.message.BinaryBody;
import org.apache.james.mime4j.storage.MultiReferenceStorage;
/**
Propchange:
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/message/impl/StorageBinaryBody.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied:
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/message/impl/StorageTextBody.java
(from r894746,
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/message/StorageTextBody.java)
URL:
http://svn.apache.org/viewvc/james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/message/impl/StorageTextBody.java?p2=james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/message/impl/StorageTextBody.java&p1=james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/message/StorageTextBody.java&r1=894746&r2=894858&rev=894858&view=diff
==============================================================================
---
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/message/StorageTextBody.java
(original)
+++
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/message/impl/StorageTextBody.java
Thu Dec 31 14:59:37 2009
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mime4j.message;
+package org.apache.james.mime4j.message.impl;
import java.io.IOException;
import java.io.InputStream;
@@ -25,6 +25,7 @@
import java.io.Reader;
import java.nio.charset.Charset;
+import org.apache.james.mime4j.message.TextBody;
import org.apache.james.mime4j.storage.MultiReferenceStorage;
import org.apache.james.mime4j.util.CharsetUtil;
Propchange:
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/message/impl/StorageTextBody.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied:
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/message/impl/StringTextBody.java
(from r894746,
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/message/StringTextBody.java)
URL:
http://svn.apache.org/viewvc/james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/message/impl/StringTextBody.java?p2=james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/message/impl/StringTextBody.java&p1=james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/message/StringTextBody.java&r1=894746&r2=894858&rev=894858&view=diff
==============================================================================
---
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/message/StringTextBody.java
(original)
+++
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/message/impl/StringTextBody.java
Thu Dec 31 14:59:37 2009
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mime4j.message;
+package org.apache.james.mime4j.message.impl;
import java.io.ByteArrayInputStream;
import java.io.IOException;
@@ -29,6 +29,7 @@
import java.io.Writer;
import java.nio.charset.Charset;
+import org.apache.james.mime4j.message.TextBody;
import org.apache.james.mime4j.util.CharsetUtil;
/**
Propchange:
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/message/impl/StringTextBody.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/message/CopyConstructorTest.java
URL:
http://svn.apache.org/viewvc/james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/message/CopyConstructorTest.java?rev=894858&r1=894857&r2=894858&view=diff
==============================================================================
---
james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/message/CopyConstructorTest.java
(original)
+++
james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/message/CopyConstructorTest.java
Thu Dec 31 14:59:37 2009
@@ -24,6 +24,7 @@
import org.apache.james.mime4j.field.DefaultFieldParser;
import org.apache.james.mime4j.field.Field;
+import org.apache.james.mime4j.message.impl.BodyFactory;
import junit.framework.TestCase;
Modified:
james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/message/EntityTest.java
URL:
http://svn.apache.org/viewvc/james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/message/EntityTest.java?rev=894858&r1=894857&r2=894858&view=diff
==============================================================================
---
james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/message/EntityTest.java
(original)
+++
james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/message/EntityTest.java
Thu Dec 31 14:59:37 2009
@@ -21,6 +21,7 @@
import org.apache.james.mime4j.field.DefaultFieldParser;
import org.apache.james.mime4j.message.Entity;
+import org.apache.james.mime4j.message.impl.BodyFactory;
import junit.framework.TestCase;
Modified:
james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/message/MultipartFormTest.java
URL:
http://svn.apache.org/viewvc/james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/message/MultipartFormTest.java?rev=894858&r1=894857&r2=894858&view=diff
==============================================================================
---
james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/message/MultipartFormTest.java
(original)
+++
james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/message/MultipartFormTest.java
Thu Dec 31 14:59:37 2009
@@ -24,6 +24,7 @@
import junit.framework.TestCase;
import org.apache.james.mime4j.field.DefaultFieldParser;
+import org.apache.james.mime4j.message.impl.BodyFactory;
public class MultipartFormTest extends TestCase {
Copied:
james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/message/impl/SingleBodyCopyTest.java
(from r894746,
james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/message/SingleBodyCopyTest.java)
URL:
http://svn.apache.org/viewvc/james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/message/impl/SingleBodyCopyTest.java?p2=james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/message/impl/SingleBodyCopyTest.java&p1=james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/message/SingleBodyCopyTest.java&r1=894746&r2=894858&rev=894858&view=diff
==============================================================================
---
james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/message/SingleBodyCopyTest.java
(original)
+++
james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/message/impl/SingleBodyCopyTest.java
Thu Dec 31 14:59:37 2009
@@ -17,13 +17,17 @@
* under the License. *
****************************************************************/
-package org.apache.james.mime4j.message;
+package org.apache.james.mime4j.message.impl;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import junit.framework.TestCase;
+import org.apache.james.mime4j.message.Message;
+import org.apache.james.mime4j.message.SingleBody;
+import org.apache.james.mime4j.message.impl.StorageBinaryBody;
+import org.apache.james.mime4j.message.impl.StorageTextBody;
import org.apache.james.mime4j.storage.MemoryStorageProvider;
import org.apache.james.mime4j.storage.MultiReferenceStorage;
import org.apache.james.mime4j.storage.Storage;
Propchange:
james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/message/impl/SingleBodyCopyTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
james/mime4j/branches/cycleclean/examples/src/main/java/org/apache/james/mime4j/samples/dom/MultipartMessage.java
URL:
http://svn.apache.org/viewvc/james/mime4j/branches/cycleclean/examples/src/main/java/org/apache/james/mime4j/samples/dom/MultipartMessage.java?rev=894858&r1=894857&r2=894858&view=diff
==============================================================================
---
james/mime4j/branches/cycleclean/examples/src/main/java/org/apache/james/mime4j/samples/dom/MultipartMessage.java
(original)
+++
james/mime4j/branches/cycleclean/examples/src/main/java/org/apache/james/mime4j/samples/dom/MultipartMessage.java
Thu Dec 31 14:59:37 2009
@@ -31,11 +31,11 @@
import org.apache.james.mime4j.field.address.Mailbox;
import org.apache.james.mime4j.message.BinaryBody;
-import org.apache.james.mime4j.message.BodyFactory;
import org.apache.james.mime4j.message.BodyPart;
import org.apache.james.mime4j.message.Message;
import org.apache.james.mime4j.message.Multipart;
import org.apache.james.mime4j.message.TextBody;
+import org.apache.james.mime4j.message.impl.BodyFactory;
import org.apache.james.mime4j.storage.Storage;
import org.apache.james.mime4j.storage.StorageOutputStream;
import org.apache.james.mime4j.storage.StorageProvider;
Modified:
james/mime4j/branches/cycleclean/examples/src/main/java/org/apache/james/mime4j/samples/dom/TextPlainMessage.java
URL:
http://svn.apache.org/viewvc/james/mime4j/branches/cycleclean/examples/src/main/java/org/apache/james/mime4j/samples/dom/TextPlainMessage.java?rev=894858&r1=894857&r2=894858&view=diff
==============================================================================
---
james/mime4j/branches/cycleclean/examples/src/main/java/org/apache/james/mime4j/samples/dom/TextPlainMessage.java
(original)
+++
james/mime4j/branches/cycleclean/examples/src/main/java/org/apache/james/mime4j/samples/dom/TextPlainMessage.java
Thu Dec 31 14:59:37 2009
@@ -23,9 +23,9 @@
import java.util.Date;
import org.apache.james.mime4j.field.address.Mailbox;
-import org.apache.james.mime4j.message.BodyFactory;
import org.apache.james.mime4j.message.Message;
import org.apache.james.mime4j.message.TextBody;
+import org.apache.james.mime4j.message.impl.BodyFactory;
/**
* This example generates a message very similar to the one from RFC 5322
Modified:
james/mime4j/branches/cycleclean/examples/src/main/java/org/apache/james/mime4j/samples/transform/TransformMessage.java
URL:
http://svn.apache.org/viewvc/james/mime4j/branches/cycleclean/examples/src/main/java/org/apache/james/mime4j/samples/transform/TransformMessage.java?rev=894858&r1=894857&r2=894858&view=diff
==============================================================================
---
james/mime4j/branches/cycleclean/examples/src/main/java/org/apache/james/mime4j/samples/transform/TransformMessage.java
(original)
+++
james/mime4j/branches/cycleclean/examples/src/main/java/org/apache/james/mime4j/samples/transform/TransformMessage.java
Thu Dec 31 14:59:37 2009
@@ -26,11 +26,11 @@
import org.apache.james.mime4j.field.address.Mailbox;
import org.apache.james.mime4j.message.Body;
-import org.apache.james.mime4j.message.BodyFactory;
import org.apache.james.mime4j.message.BodyPart;
import org.apache.james.mime4j.message.Message;
import org.apache.james.mime4j.message.Multipart;
import org.apache.james.mime4j.message.TextBody;
+import org.apache.james.mime4j.message.impl.BodyFactory;
import org.apache.james.mime4j.storage.DefaultStorageProvider;
import org.apache.james.mime4j.storage.StorageProvider;
import org.apache.james.mime4j.storage.TempFileStorageProvider;
