Author: bago
Date: Fri Jan 1 15:10:13 2010
New Revision: 895022
URL: http://svn.apache.org/viewvc?rev=895022&view=rev
Log:
Moved MessageWriter to message.impl (needs more thinking). Removed any package
dependency from Message classes. Removed ByteSequence from Multipart
(optimization done in MultipartImpl only). Removed CodecUtil dependency by
duplicating the stream copy method. Moved descriptor package classes to the
parser package. They was too much interconnected. (MIME4J-156)
Added:
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/message/impl/MessageWriter.java
(contents, props changed)
- copied, changed from r894868,
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/message/MessageWriter.java
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/BodyDescriptor.java
(contents, props changed)
- copied, changed from r894746,
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/descriptor/BodyDescriptor.java
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/ContentDescriptor.java
(contents, props changed)
- copied, changed from r894746,
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/descriptor/ContentDescriptor.java
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/DefaultBodyDescriptor.java
(contents, props changed)
- copied, changed from r894746,
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/descriptor/DefaultBodyDescriptor.java
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/MaximalBodyDescriptor.java
(contents, props changed)
- copied, changed from r894746,
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/descriptor/MaximalBodyDescriptor.java
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/MutableBodyDescriptor.java
(contents, props changed)
- copied, changed from r894746,
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/descriptor/MutableBodyDescriptor.java
james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/parser/BaseTestForBodyDescriptors.java
(contents, props changed)
- copied, changed from r894746,
james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/descriptor/BaseTestForBodyDescriptors.java
james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/parser/DefaultBodyDescriptorTest.java
(contents, props changed)
- copied, changed from r894746,
james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/descriptor/DefaultBodyDescriptorTest.java
james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/parser/MaximalBodyDescriptorTest.java
(contents, props changed)
- copied, changed from r894746,
james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/descriptor/MaximalBodyDescriptorTest.java
Removed:
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/descriptor/BodyDescriptor.java
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/descriptor/ContentDescriptor.java
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/descriptor/DefaultBodyDescriptor.java
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/descriptor/MaximalBodyDescriptor.java
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/descriptor/MutableBodyDescriptor.java
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/message/MessageWriter.java
james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/descriptor/BaseTestForBodyDescriptors.java
james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/descriptor/DefaultBodyDescriptorTest.java
james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/descriptor/MaximalBodyDescriptorTest.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/Multipart.java
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/message/SingleBody.java
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/message/impl/MessageBuilder.java
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/message/impl/MessageImpl.java
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/AbstractContentHandler.java
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/AbstractEntity.java
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/ContentHandler.java
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/EntityStateMachine.java
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/MimeEntity.java
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/MimeEntityConfig.java
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/MimeStreamParser.java
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/MimeTokenStream.java
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/RawEntity.java
james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/message/HeaderTest.java
james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/message/MultipartFormTest.java
james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/parser/MimeEntityTest.java
james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/parser/MimeStreamParserTest.java
james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/parser/MimeTokenStreamBodyDescriptorTest.java
james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/parser/TestHandler.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=895022&r1=895021&r2=895022&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
Fri Jan 1 15:10:13 2010
@@ -25,11 +25,11 @@
import java.io.InputStream;
import org.apache.james.mime4j.codec.CodecUtil;
-import org.apache.james.mime4j.descriptor.BodyDescriptor;
import org.apache.james.mime4j.message.Header;
import org.apache.james.mime4j.message.impl.MessageImpl;
import org.apache.james.mime4j.message.impl.SimpleContentHandler;
import org.apache.james.mime4j.parser.AbstractContentHandler;
+import org.apache.james.mime4j.parser.BodyDescriptor;
import org.apache.james.mime4j.parser.ContentHandler;
import org.apache.james.mime4j.parser.MimeStreamParser;
import org.apache.james.mime4j.parser.MimeTokenStream;
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=895022&r1=895021&r2=895022&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
Fri Jan 1 15:10:13 2010
@@ -23,8 +23,6 @@
import java.util.LinkedList;
import java.util.List;
-import org.apache.james.mime4j.util.ByteSequence;
-
/**
* Represents a MIME multipart body (see RFC 2045).A multipart body has a
* ordered list of body parts. The multipart body also has a preamble and
@@ -202,9 +200,6 @@
*/
public abstract String getPreamble();
- // package private for now; might become public someday
- public abstract ByteSequence getPreambleRaw();
-
/**
* Sets the preamble.
*
@@ -220,9 +215,6 @@
*/
public abstract String getEpilogue();
- // package private for now; might become public someday
- public abstract ByteSequence getEpilogueRaw();
-
/**
* Sets the epilogue.
*
Modified:
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/message/SingleBody.java
URL:
http://svn.apache.org/viewvc/james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/message/SingleBody.java?rev=895022&r1=895021&r2=895022&view=diff
==============================================================================
---
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/message/SingleBody.java
(original)
+++
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/message/SingleBody.java
Fri Jan 1 15:10:13 2010
@@ -23,8 +23,6 @@
import java.io.InputStream;
import java.io.OutputStream;
-import org.apache.james.mime4j.codec.CodecUtil;
-
/**
* Abstract implementation of a single message body; that is, a body that does
* not contain (directly or indirectly) any other child bodies. It also
provides
@@ -78,7 +76,7 @@
throw new IllegalArgumentException();
InputStream in = getInputStream();
- CodecUtil.copy(in, out);
+ SingleBody.copy(in, out);
in.close();
}
@@ -122,4 +120,20 @@
public void dispose() {
}
+ static final int DEFAULT_ENCODING_BUFFER_SIZE = 1024;
+
+ /**
+ * Copies the contents of one stream to the other.
+ * @param in not null
+ * @param out not null
+ * @throws IOException
+ */
+ private static void copy(final InputStream in, final OutputStream out)
throws IOException {
+ final byte[] buffer = new byte[DEFAULT_ENCODING_BUFFER_SIZE];
+ int inputLength;
+ while (-1 != (inputLength = in.read(buffer))) {
+ out.write(buffer, 0, inputLength);
+ }
+ }
+
}
Modified:
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/message/impl/MessageBuilder.java
URL:
http://svn.apache.org/viewvc/james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/message/impl/MessageBuilder.java?rev=895022&r1=895021&r2=895022&view=diff
==============================================================================
---
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/message/impl/MessageBuilder.java
(original)
+++
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/message/impl/MessageBuilder.java
Fri Jan 1 15:10:13 2010
@@ -24,7 +24,6 @@
import java.util.Stack;
import org.apache.james.mime4j.MimeException;
-import org.apache.james.mime4j.descriptor.BodyDescriptor;
import org.apache.james.mime4j.field.Field;
import org.apache.james.mime4j.field.impl.DefaultFieldParser;
import org.apache.james.mime4j.message.Body;
@@ -32,6 +31,7 @@
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.BodyDescriptor;
import org.apache.james.mime4j.parser.ContentHandler;
import org.apache.james.mime4j.parser.MimeStreamParser;
import org.apache.james.mime4j.parser.RawField;
@@ -116,7 +116,7 @@
}
/**
- * @see
org.apache.james.mime4j.parser.ContentHandler#startMultipart(org.apache.james.mime4j.descriptor.BodyDescriptor)
+ * @see
org.apache.james.mime4j.parser.ContentHandler#startMultipart(org.apache.james.mime4j.parser.BodyDescriptor)
*/
public void startMultipart(final BodyDescriptor bd) throws MimeException {
expect(Entity.class);
@@ -129,7 +129,7 @@
}
/**
- * @see
org.apache.james.mime4j.parser.ContentHandler#body(org.apache.james.mime4j.descriptor.BodyDescriptor,
java.io.InputStream)
+ * @see
org.apache.james.mime4j.parser.ContentHandler#body(org.apache.james.mime4j.parser.BodyDescriptor,
java.io.InputStream)
*/
public void body(BodyDescriptor bd, final InputStream is) throws
MimeException, IOException {
expect(Entity.class);
Modified:
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/message/impl/MessageImpl.java
URL:
http://svn.apache.org/viewvc/james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/message/impl/MessageImpl.java?rev=895022&r1=895021&r2=895022&view=diff
==============================================================================
---
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/message/impl/MessageImpl.java
(original)
+++
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/message/impl/MessageImpl.java
Fri Jan 1 15:10:13 2010
@@ -46,7 +46,6 @@
import org.apache.james.mime4j.message.Body;
import org.apache.james.mime4j.message.Header;
import org.apache.james.mime4j.message.Message;
-import org.apache.james.mime4j.message.MessageWriter;
import org.apache.james.mime4j.message.Multipart;
import org.apache.james.mime4j.message.SingleBody;
import org.apache.james.mime4j.parser.MimeEntityConfig;
Copied:
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/message/impl/MessageWriter.java
(from r894868,
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/message/MessageWriter.java)
URL:
http://svn.apache.org/viewvc/james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/message/impl/MessageWriter.java?p2=james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/message/impl/MessageWriter.java&p1=james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/message/MessageWriter.java&r1=894868&r2=895022&rev=895022&view=diff
==============================================================================
---
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/message/MessageWriter.java
(original)
+++
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/message/impl/MessageWriter.java
Fri Jan 1 15:10:13 2010
@@ -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.OutputStream;
@@ -26,6 +26,13 @@
import org.apache.james.mime4j.field.ContentTypeField;
import org.apache.james.mime4j.field.Field;
import org.apache.james.mime4j.field.FieldName;
+import org.apache.james.mime4j.message.BinaryBody;
+import org.apache.james.mime4j.message.Body;
+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.message.SingleBody;
import org.apache.james.mime4j.util.ByteArrayBuffer;
import org.apache.james.mime4j.util.ByteSequence;
import org.apache.james.mime4j.util.ContentUtil;
@@ -128,7 +135,16 @@
ByteSequence boundary = getBoundary(contentType);
- writeBytes(multipart.getPreambleRaw(), out);
+ ByteSequence preamble;
+ ByteSequence epilogue;
+ if (multipart instanceof MultipartImpl) {
+ preamble = ((MultipartImpl) multipart).getPreambleRaw();
+ epilogue = ((MultipartImpl) multipart).getEpilogueRaw();
+ } else {
+ preamble = ContentUtil.encode(multipart.getPreamble());
+ epilogue = ContentUtil.encode(multipart.getEpilogue());
+ }
+ writeBytes(preamble, out);
out.write(CRLF);
for (Entity bodyPart : multipart.getBodyParts()) {
@@ -145,7 +161,7 @@
out.write(DASHES);
out.write(CRLF);
- writeBytes(multipart.getEpilogueRaw(), out);
+ writeBytes(epilogue, out);
}
/**
Propchange:
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/message/impl/MessageWriter.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/AbstractContentHandler.java
URL:
http://svn.apache.org/viewvc/james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/AbstractContentHandler.java?rev=895022&r1=895021&r2=895022&view=diff
==============================================================================
---
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/AbstractContentHandler.java
(original)
+++
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/AbstractContentHandler.java
Fri Jan 1 15:10:13 2010
@@ -20,7 +20,6 @@
package org.apache.james.mime4j.parser;
import org.apache.james.mime4j.MimeException;
-import org.apache.james.mime4j.descriptor.BodyDescriptor;
import java.io.IOException;
import java.io.InputStream;
@@ -40,13 +39,13 @@
}
/**
- * @see
org.apache.james.mime4j.parser.ContentHandler#startMultipart(org.apache.james.mime4j.descriptor.BodyDescriptor)
+ * @see
org.apache.james.mime4j.parser.ContentHandler#startMultipart(org.apache.james.mime4j.parser.BodyDescriptor)
*/
public void startMultipart(BodyDescriptor bd) throws MimeException {
}
/**
- * @see
org.apache.james.mime4j.parser.ContentHandler#body(org.apache.james.mime4j.descriptor.BodyDescriptor,
java.io.InputStream)
+ * @see
org.apache.james.mime4j.parser.ContentHandler#body(org.apache.james.mime4j.parser.BodyDescriptor,
java.io.InputStream)
*/
public void body(BodyDescriptor bd, InputStream is)
throws MimeException, IOException {
Modified:
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/AbstractEntity.java
URL:
http://svn.apache.org/viewvc/james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/AbstractEntity.java?rev=895022&r1=895021&r2=895022&view=diff
==============================================================================
---
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/AbstractEntity.java
(original)
+++
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/AbstractEntity.java
Fri Jan 1 15:10:13 2010
@@ -24,8 +24,6 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.james.mime4j.MimeException;
-import org.apache.james.mime4j.descriptor.BodyDescriptor;
-import org.apache.james.mime4j.descriptor.MutableBodyDescriptor;
import org.apache.james.mime4j.io.LineReaderInputStream;
import org.apache.james.mime4j.io.MaxHeaderLengthLimitException;
import org.apache.james.mime4j.io.MaxHeaderLimitException;
Copied:
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/BodyDescriptor.java
(from r894746,
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/descriptor/BodyDescriptor.java)
URL:
http://svn.apache.org/viewvc/james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/BodyDescriptor.java?p2=james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/BodyDescriptor.java&p1=james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/descriptor/BodyDescriptor.java&r1=894746&r2=895022&rev=895022&view=diff
==============================================================================
---
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/descriptor/BodyDescriptor.java
(original)
+++
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/BodyDescriptor.java
Fri Jan 1 15:10:13 2010
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mime4j.descriptor;
+package org.apache.james.mime4j.parser;
/**
* Encapsulates the values of the MIME-specific header fields
Propchange:
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/BodyDescriptor.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied:
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/ContentDescriptor.java
(from r894746,
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/descriptor/ContentDescriptor.java)
URL:
http://svn.apache.org/viewvc/james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/ContentDescriptor.java?p2=james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/ContentDescriptor.java&p1=james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/descriptor/ContentDescriptor.java&r1=894746&r2=895022&rev=895022&view=diff
==============================================================================
---
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/descriptor/ContentDescriptor.java
(original)
+++
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/ContentDescriptor.java
Fri Jan 1 15:10:13 2010
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mime4j.descriptor;
+package org.apache.james.mime4j.parser;
import java.util.Map;
Propchange:
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/ContentDescriptor.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/ContentHandler.java
URL:
http://svn.apache.org/viewvc/james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/ContentHandler.java?rev=895022&r1=895021&r2=895022&view=diff
==============================================================================
---
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/ContentHandler.java
(original)
+++
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/ContentHandler.java
Fri Jan 1 15:10:13 2010
@@ -20,7 +20,6 @@
package org.apache.james.mime4j.parser;
import org.apache.james.mime4j.MimeException;
-import org.apache.james.mime4j.descriptor.BodyDescriptor;
import java.io.IOException;
import java.io.InputStream;
Copied:
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/DefaultBodyDescriptor.java
(from r894746,
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/descriptor/DefaultBodyDescriptor.java)
URL:
http://svn.apache.org/viewvc/james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/DefaultBodyDescriptor.java?p2=james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/DefaultBodyDescriptor.java&p1=james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/descriptor/DefaultBodyDescriptor.java&r1=894746&r2=895022&rev=895022&view=diff
==============================================================================
---
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/descriptor/DefaultBodyDescriptor.java
(original)
+++
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/DefaultBodyDescriptor.java
Fri Jan 1 15:10:13 2010
@@ -17,14 +17,13 @@
* under the License. *
****************************************************************/
-package org.apache.james.mime4j.descriptor;
+package org.apache.james.mime4j.parser;
import java.util.HashMap;
import java.util.Map;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.james.mime4j.parser.RawField;
import org.apache.james.mime4j.util.MimeUtil;
/**
Propchange:
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/DefaultBodyDescriptor.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/DefaultBodyDescriptor.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified:
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/EntityStateMachine.java
URL:
http://svn.apache.org/viewvc/james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/EntityStateMachine.java?rev=895022&r1=895021&r2=895022&view=diff
==============================================================================
---
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/EntityStateMachine.java
(original)
+++
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/EntityStateMachine.java
Fri Jan 1 15:10:13 2010
@@ -20,7 +20,6 @@
package org.apache.james.mime4j.parser;
import org.apache.james.mime4j.MimeException;
-import org.apache.james.mime4j.descriptor.BodyDescriptor;
import java.io.IOException;
import java.io.InputStream;
Copied:
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/MaximalBodyDescriptor.java
(from r894746,
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/descriptor/MaximalBodyDescriptor.java)
URL:
http://svn.apache.org/viewvc/james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/MaximalBodyDescriptor.java?p2=james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/MaximalBodyDescriptor.java&p1=james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/descriptor/MaximalBodyDescriptor.java&r1=894746&r2=895022&rev=895022&view=diff
==============================================================================
---
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/descriptor/MaximalBodyDescriptor.java
(original)
+++
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/MaximalBodyDescriptor.java
Fri Jan 1 15:10:13 2010
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mime4j.descriptor;
+package org.apache.james.mime4j.parser;
import java.io.StringReader;
import java.util.Collections;
@@ -31,7 +31,6 @@
import org.apache.james.mime4j.field.language.parser.ContentLanguageParser;
import org.apache.james.mime4j.field.mimeversion.parser.MimeVersionParser;
import org.apache.james.mime4j.field.structured.parser.StructuredFieldParser;
-import org.apache.james.mime4j.parser.RawField;
import org.apache.james.mime4j.util.MimeUtil;
/**
Propchange:
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/MaximalBodyDescriptor.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/MimeEntity.java
URL:
http://svn.apache.org/viewvc/james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/MimeEntity.java?rev=895022&r1=895021&r2=895022&view=diff
==============================================================================
---
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/MimeEntity.java
(original)
+++
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/MimeEntity.java
Fri Jan 1 15:10:13 2010
@@ -25,7 +25,6 @@
import org.apache.james.mime4j.MimeException;
import org.apache.james.mime4j.codec.Base64InputStream;
import org.apache.james.mime4j.codec.QuotedPrintableInputStream;
-import org.apache.james.mime4j.descriptor.MutableBodyDescriptor;
import org.apache.james.mime4j.io.BufferedLineReaderInputStream;
import org.apache.james.mime4j.io.LimitedInputStream;
import org.apache.james.mime4j.io.LineNumberSource;
Modified:
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/MimeEntityConfig.java
URL:
http://svn.apache.org/viewvc/james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/MimeEntityConfig.java?rev=895022&r1=895021&r2=895022&view=diff
==============================================================================
---
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/MimeEntityConfig.java
(original)
+++
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/MimeEntityConfig.java
Fri Jan 1 15:10:13 2010
@@ -20,8 +20,6 @@
package org.apache.james.mime4j.parser;
import org.apache.james.mime4j.MimeException;
-import org.apache.james.mime4j.descriptor.DefaultBodyDescriptor;
-import org.apache.james.mime4j.descriptor.MaximalBodyDescriptor;
/**
* MIME entity configuration
Modified:
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/MimeStreamParser.java
URL:
http://svn.apache.org/viewvc/james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/MimeStreamParser.java?rev=895022&r1=895021&r2=895022&view=diff
==============================================================================
---
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/MimeStreamParser.java
(original)
+++
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/MimeStreamParser.java
Fri Jan 1 15:10:13 2010
@@ -25,7 +25,6 @@
import java.io.SequenceInputStream;
import org.apache.james.mime4j.MimeException;
-import org.apache.james.mime4j.descriptor.BodyDescriptor;
/**
* <p>
Modified:
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/MimeTokenStream.java
URL:
http://svn.apache.org/viewvc/james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/MimeTokenStream.java?rev=895022&r1=895021&r2=895022&view=diff
==============================================================================
---
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/MimeTokenStream.java
(original)
+++
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/MimeTokenStream.java
Fri Jan 1 15:10:13 2010
@@ -31,10 +31,6 @@
import org.apache.james.mime4j.MimeException;
import org.apache.james.mime4j.codec.Base64InputStream;
import org.apache.james.mime4j.codec.QuotedPrintableInputStream;
-import org.apache.james.mime4j.descriptor.BodyDescriptor;
-import org.apache.james.mime4j.descriptor.DefaultBodyDescriptor;
-import org.apache.james.mime4j.descriptor.MaximalBodyDescriptor;
-import org.apache.james.mime4j.descriptor.MutableBodyDescriptor;
import org.apache.james.mime4j.io.LineNumberInputStream;
import org.apache.james.mime4j.io.LineNumberSource;
import org.apache.james.mime4j.util.CharsetUtil;
Copied:
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/MutableBodyDescriptor.java
(from r894746,
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/descriptor/MutableBodyDescriptor.java)
URL:
http://svn.apache.org/viewvc/james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/MutableBodyDescriptor.java?p2=james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/MutableBodyDescriptor.java&p1=james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/descriptor/MutableBodyDescriptor.java&r1=894746&r2=895022&rev=895022&view=diff
==============================================================================
---
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/descriptor/MutableBodyDescriptor.java
(original)
+++
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/MutableBodyDescriptor.java
Fri Jan 1 15:10:13 2010
@@ -18,9 +18,8 @@
****************************************************************/
-package org.apache.james.mime4j.descriptor;
+package org.apache.james.mime4j.parser;
-import org.apache.james.mime4j.parser.RawField;
/**
* Adds mutator.
Propchange:
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/MutableBodyDescriptor.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/RawEntity.java
URL:
http://svn.apache.org/viewvc/james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/RawEntity.java?rev=895022&r1=895021&r2=895022&view=diff
==============================================================================
---
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/RawEntity.java
(original)
+++
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/RawEntity.java
Fri Jan 1 15:10:13 2010
@@ -19,7 +19,6 @@
package org.apache.james.mime4j.parser;
-import org.apache.james.mime4j.descriptor.BodyDescriptor;
import java.io.InputStream;
Modified:
james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/message/HeaderTest.java
URL:
http://svn.apache.org/viewvc/james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/message/HeaderTest.java?rev=895022&r1=895021&r2=895022&view=diff
==============================================================================
---
james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/message/HeaderTest.java
(original)
+++
james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/message/HeaderTest.java
Fri Jan 1 15:10:13 2010
@@ -24,6 +24,7 @@
import org.apache.commons.io.output.ByteArrayOutputStream;
import org.apache.james.mime4j.field.Field;
import org.apache.james.mime4j.field.impl.DefaultFieldParser;
+import org.apache.james.mime4j.message.impl.MessageWriter;
import org.apache.james.mime4j.util.CharsetUtil;
public class HeaderTest extends 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=895022&r1=895021&r2=895022&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
Fri Jan 1 15:10:13 2010
@@ -27,6 +27,7 @@
import org.apache.james.mime4j.message.impl.BodyFactory;
import org.apache.james.mime4j.message.impl.BodyPart;
import org.apache.james.mime4j.message.impl.MessageImpl;
+import org.apache.james.mime4j.message.impl.MessageWriter;
import org.apache.james.mime4j.message.impl.MultipartImpl;
public class MultipartFormTest extends TestCase {
Copied:
james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/parser/BaseTestForBodyDescriptors.java
(from r894746,
james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/descriptor/BaseTestForBodyDescriptors.java)
URL:
http://svn.apache.org/viewvc/james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/parser/BaseTestForBodyDescriptors.java?p2=james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/parser/BaseTestForBodyDescriptors.java&p1=james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/descriptor/BaseTestForBodyDescriptors.java&r1=894746&r2=895022&rev=895022&view=diff
==============================================================================
---
james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/descriptor/BaseTestForBodyDescriptors.java
(original)
+++
james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/parser/BaseTestForBodyDescriptors.java
Fri Jan 1 15:10:13 2010
@@ -17,10 +17,12 @@
* under the License. *
****************************************************************/
-package org.apache.james.mime4j.descriptor;
+package org.apache.james.mime4j.parser;
import junit.framework.TestCase;
+import org.apache.james.mime4j.parser.BodyDescriptor;
+import org.apache.james.mime4j.parser.MutableBodyDescriptor;
import org.apache.james.mime4j.parser.RawField;
public abstract class BaseTestForBodyDescriptors extends TestCase {
Propchange:
james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/parser/BaseTestForBodyDescriptors.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/parser/BaseTestForBodyDescriptors.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied:
james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/parser/DefaultBodyDescriptorTest.java
(from r894746,
james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/descriptor/DefaultBodyDescriptorTest.java)
URL:
http://svn.apache.org/viewvc/james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/parser/DefaultBodyDescriptorTest.java?p2=james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/parser/DefaultBodyDescriptorTest.java&p1=james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/descriptor/DefaultBodyDescriptorTest.java&r1=894746&r2=895022&rev=895022&view=diff
==============================================================================
---
james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/descriptor/DefaultBodyDescriptorTest.java
(original)
+++
james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/parser/DefaultBodyDescriptorTest.java
Fri Jan 1 15:10:13 2010
@@ -17,9 +17,11 @@
* under the License. *
****************************************************************/
-package org.apache.james.mime4j.descriptor;
+package org.apache.james.mime4j.parser;
-import org.apache.james.mime4j.descriptor.DefaultBodyDescriptor;
+import org.apache.james.mime4j.parser.BodyDescriptor;
+import org.apache.james.mime4j.parser.DefaultBodyDescriptor;
+import org.apache.james.mime4j.parser.MutableBodyDescriptor;
public class DefaultBodyDescriptorTest extends BaseTestForBodyDescriptors {
@Override
Propchange:
james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/parser/DefaultBodyDescriptorTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied:
james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/parser/MaximalBodyDescriptorTest.java
(from r894746,
james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/descriptor/MaximalBodyDescriptorTest.java)
URL:
http://svn.apache.org/viewvc/james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/parser/MaximalBodyDescriptorTest.java?p2=james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/parser/MaximalBodyDescriptorTest.java&p1=james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/descriptor/MaximalBodyDescriptorTest.java&r1=894746&r2=895022&rev=895022&view=diff
==============================================================================
---
james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/descriptor/MaximalBodyDescriptorTest.java
(original)
+++
james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/parser/MaximalBodyDescriptorTest.java
Fri Jan 1 15:10:13 2010
@@ -17,14 +17,16 @@
* under the License. *
****************************************************************/
-package org.apache.james.mime4j.descriptor;
+package org.apache.james.mime4j.parser;
import java.io.ByteArrayInputStream;
import org.apache.james.mime4j.ExampleMail;
-import org.apache.james.mime4j.descriptor.MaximalBodyDescriptor;
import org.apache.james.mime4j.field.datetime.DateTime;
+import org.apache.james.mime4j.parser.BodyDescriptor;
+import org.apache.james.mime4j.parser.MaximalBodyDescriptor;
import org.apache.james.mime4j.parser.MimeTokenStream;
+import org.apache.james.mime4j.parser.MutableBodyDescriptor;
public class MaximalBodyDescriptorTest extends BaseTestForBodyDescriptors {
Propchange:
james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/parser/MaximalBodyDescriptorTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/parser/MimeEntityTest.java
URL:
http://svn.apache.org/viewvc/james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/parser/MimeEntityTest.java?rev=895022&r1=895021&r2=895022&view=diff
==============================================================================
---
james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/parser/MimeEntityTest.java
(original)
+++
james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/parser/MimeEntityTest.java
Fri Jan 1 15:10:13 2010
@@ -24,7 +24,6 @@
import org.apache.commons.io.IOUtils;
import org.apache.james.mime4j.MimeException;
-import org.apache.james.mime4j.descriptor.DefaultBodyDescriptor;
import org.apache.james.mime4j.io.BufferedLineReaderInputStream;
import org.apache.james.mime4j.io.MaxHeaderLengthLimitException;
import org.apache.james.mime4j.io.MaxHeaderLimitException;
Modified:
james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/parser/MimeStreamParserTest.java
URL:
http://svn.apache.org/viewvc/james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/parser/MimeStreamParserTest.java?rev=895022&r1=895021&r2=895022&view=diff
==============================================================================
---
james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/parser/MimeStreamParserTest.java
(original)
+++
james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/parser/MimeStreamParserTest.java
Fri Jan 1 15:10:13 2010
@@ -19,7 +19,6 @@
package org.apache.james.mime4j.parser;
-import org.apache.james.mime4j.descriptor.BodyDescriptor;
import org.apache.james.mime4j.parser.AbstractContentHandler;
import org.apache.james.mime4j.parser.MimeStreamParser;
import org.apache.james.mime4j.util.ByteSequence;
Modified:
james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/parser/MimeTokenStreamBodyDescriptorTest.java
URL:
http://svn.apache.org/viewvc/james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/parser/MimeTokenStreamBodyDescriptorTest.java?rev=895022&r1=895021&r2=895022&view=diff
==============================================================================
---
james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/parser/MimeTokenStreamBodyDescriptorTest.java
(original)
+++
james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/parser/MimeTokenStreamBodyDescriptorTest.java
Fri Jan 1 15:10:13 2010
@@ -20,7 +20,6 @@
package org.apache.james.mime4j.parser;
import org.apache.james.mime4j.ExampleMail;
-import org.apache.james.mime4j.descriptor.BodyDescriptor;
import org.apache.james.mime4j.parser.MimeTokenStream;
import java.io.ByteArrayInputStream;
Modified:
james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/parser/TestHandler.java
URL:
http://svn.apache.org/viewvc/james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/parser/TestHandler.java?rev=895022&r1=895021&r2=895022&view=diff
==============================================================================
---
james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/parser/TestHandler.java
(original)
+++
james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/parser/TestHandler.java
Fri Jan 1 15:10:13 2010
@@ -19,7 +19,6 @@
package org.apache.james.mime4j.parser;
-import org.apache.james.mime4j.descriptor.BodyDescriptor;
import org.apache.james.mime4j.parser.ContentHandler;
import org.apache.james.mime4j.util.ContentUtil;
