Copied: james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/stream/BasicMimeTokenStream.java (from r895589, james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/BasicMimeTokenStream.java)
URL: http://svn.apache.org/viewvc/james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/stream/BasicMimeTokenStream.java?p2=james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/stream/BasicMimeTokenStream.java&p1=james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/BasicMimeTokenStream.java&r1=895589&r2=897163&rev=897163&view=diff
==============================================================================
--- james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/BasicMimeTokenStream.java (original)
+++ james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/stream/BasicMimeTokenStream.java Fri Jan 8 10:51:51 2010
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mime4j.parser;
+package org.apache.james.mime4j.stream;
import java.io.IOException;
import java.io.InputStream;
Propchange: james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/stream/BasicMimeTokenStream.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/stream/BasicMimeTokenStream.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/stream/BodyDescriptor.java (from r895589, james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/BodyDescriptor.java)
URL: http://svn.apache.org/viewvc/james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/stream/BodyDescriptor.java?p2=james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/stream/BodyDescriptor.java&p1=james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/BodyDescriptor.java&r1=895589&r2=897163&rev=897163&view=diff
==============================================================================
--- james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/BodyDescriptor.java (original)
+++ james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/stream/BodyDescriptor.java Fri Jan 8 10:51:51 2010
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mime4j.parser;
+package org.apache.james.mime4j.stream;
/**
* Encapsulates the values of the MIME-specific header fields
Propchange: james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/stream/BodyDescriptor.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/stream/ContentDescriptor.java (from r895589, james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/ContentDescriptor.java)
URL: http://svn.apache.org/viewvc/james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/stream/ContentDescriptor.java?p2=james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/stream/ContentDescriptor.java&p1=james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/ContentDescriptor.java&r1=895589&r2=897163&rev=897163&view=diff
==============================================================================
--- james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/ContentDescriptor.java (original)
+++ james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/stream/ContentDescriptor.java Fri Jan 8 10:51:51 2010
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mime4j.parser;
+package org.apache.james.mime4j.stream;
import java.util.Map;
Propchange: james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/stream/ContentDescriptor.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/stream/ContentHandler.java (from r895589, 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/stream/ContentHandler.java?p2=james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/stream/ContentHandler.java&p1=james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/ContentHandler.java&r1=895589&r2=897163&rev=897163&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/stream/ContentHandler.java Fri Jan 8 10:51:51 2010
@@ -17,10 +17,10 @@
* under the License. *
****************************************************************/
-package org.apache.james.mime4j.parser;
+package org.apache.james.mime4j.stream;
import org.apache.james.mime4j.MimeException;
-import org.apache.james.mime4j.parser.impl.MimeStreamParser;
+import org.apache.james.mime4j.parser.MimeStreamParser;
import java.io.IOException;
import java.io.InputStream;
@@ -30,7 +30,7 @@
* Receives notifications of the content of a plain RFC822 or MIME message.
* Implement this interface and register an instance of that implementation
* with a <code>MimeStreamParser</code> instance using its
- * {@link org.apache.james.mime4j.parser.impl.MimeStreamParser#setContentHandler(ContentHandler)}
+ * {@link org.apache.james.mime4j.stream.MimeStreamParser#setContentHandler(ContentHandler)}
* method. The parser uses the <code>ContentHandler</code> instance to report
* basic message-related events like the start and end of the body of a
* part in a multipart MIME entity.
Propchange: james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/stream/ContentHandler.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/stream/EntityStateMachine.java (from r895589, 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/stream/EntityStateMachine.java?p2=james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/stream/EntityStateMachine.java&p1=james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/EntityStateMachine.java&r1=895589&r2=897163&rev=897163&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/stream/EntityStateMachine.java Fri Jan 8 10:51:51 2010
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mime4j.parser;
+package org.apache.james.mime4j.stream;
import org.apache.james.mime4j.MimeException;
Propchange: james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/stream/EntityStateMachine.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/stream/EntityStates.java (from r895589, james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/EntityStates.java)
URL: http://svn.apache.org/viewvc/james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/stream/EntityStates.java?p2=james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/stream/EntityStates.java&p1=james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/EntityStates.java&r1=895589&r2=897163&rev=897163&view=diff
==============================================================================
--- james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/EntityStates.java (original)
+++ james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/stream/EntityStates.java Fri Jan 8 10:51:51 2010
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mime4j.parser;
+package org.apache.james.mime4j.stream;
/**
* Enumeration of states an entity is expected to go through
Propchange: james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/stream/EntityStates.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/stream/Event.java (from r895589, james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/Event.java)
URL: http://svn.apache.org/viewvc/james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/stream/Event.java?p2=james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/stream/Event.java&p1=james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/Event.java&r1=895589&r2=897163&rev=897163&view=diff
==============================================================================
--- james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/Event.java (original)
+++ james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/stream/Event.java Fri Jan 8 10:51:51 2010
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mime4j.parser;
+package org.apache.james.mime4j.stream;
/**
* Enumerates events which can be monitored.
Propchange: james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/stream/Event.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/stream/MimeEntity.java (from r895589, 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/stream/MimeEntity.java?p2=james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/stream/MimeEntity.java&p1=james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/MimeEntity.java&r1=895589&r2=897163&rev=897163&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/stream/MimeEntity.java Fri Jan 8 10:51:51 2010
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mime4j.parser;
+package org.apache.james.mime4j.stream;
import java.io.IOException;
import java.io.InputStream;
@@ -264,7 +264,7 @@
}
/**
- * @see org.apache.james.mime4j.parser.EntityStateMachine#getContentStream()
+ * @see org.apache.james.mime4j.stream.EntityStateMachine#getContentStream()
*/
public InputStream getContentStream() {
switch (state) {
@@ -279,7 +279,7 @@
}
/**
- * @see org.apache.james.mime4j.parser.EntityStateMachine#getDecodedContentStream()
+ * @see org.apache.james.mime4j.stream.EntityStateMachine#getDecodedContentStream()
*/
public InputStream getDecodedContentStream() throws IllegalStateException {
return decodedStream(getContentStream());
Propchange: james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/stream/MimeEntity.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/stream/MimeEntityConfig.java (from r895589, 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/stream/MimeEntityConfig.java?p2=james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/stream/MimeEntityConfig.java&p1=james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/MimeEntityConfig.java&r1=895589&r2=897163&rev=897163&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/stream/MimeEntityConfig.java Fri Jan 8 10:51:51 2010
@@ -17,13 +17,13 @@
* under the License. *
****************************************************************/
-package org.apache.james.mime4j.parser;
+package org.apache.james.mime4j.stream;
import org.apache.james.mime4j.MimeException;
-import org.apache.james.mime4j.parser.impl.DefaultBodyDescriptor;
-import org.apache.james.mime4j.parser.impl.MaximalBodyDescriptor;
-import org.apache.james.mime4j.parser.impl.MimeStreamParser;
-import org.apache.james.mime4j.parser.impl.MimeTokenStream;
+import org.apache.james.mime4j.parser.DefaultBodyDescriptor;
+import org.apache.james.mime4j.parser.MaximalBodyDescriptor;
+import org.apache.james.mime4j.parser.MimeStreamParser;
+import org.apache.james.mime4j.parser.MimeTokenStream;
/**
* MIME entity configuration
Propchange: james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/stream/MimeEntityConfig.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/stream/MimeEntityConfig.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/stream/MimeEntityConfig.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/stream/MimeParseEventException.java (from r895589, james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/MimeParseEventException.java)
URL: http://svn.apache.org/viewvc/james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/stream/MimeParseEventException.java?p2=james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/stream/MimeParseEventException.java&p1=james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/MimeParseEventException.java&r1=895589&r2=897163&rev=897163&view=diff
==============================================================================
--- james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/MimeParseEventException.java (original)
+++ james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/stream/MimeParseEventException.java Fri Jan 8 10:51:51 2010
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mime4j.parser;
+package org.apache.james.mime4j.stream;
import org.apache.james.mime4j.MimeException;
Propchange: james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/stream/MimeParseEventException.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/stream/MutableBodyDescriptor.java (from r895589, james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/MutableBodyDescriptor.java)
URL: http://svn.apache.org/viewvc/james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/stream/MutableBodyDescriptor.java?p2=james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/stream/MutableBodyDescriptor.java&p1=james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/MutableBodyDescriptor.java&r1=895589&r2=897163&rev=897163&view=diff
==============================================================================
--- james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/MutableBodyDescriptor.java (original)
+++ james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/stream/MutableBodyDescriptor.java Fri Jan 8 10:51:51 2010
@@ -18,7 +18,7 @@
****************************************************************/
-package org.apache.james.mime4j.parser;
+package org.apache.james.mime4j.stream;
/**
Propchange: james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/stream/MutableBodyDescriptor.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/stream/RawEntity.java (from r895589, 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/stream/RawEntity.java?p2=james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/stream/RawEntity.java&p1=james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/RawEntity.java&r1=895589&r2=897163&rev=897163&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/stream/RawEntity.java Fri Jan 8 10:51:51 2010
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mime4j.parser;
+package org.apache.james.mime4j.stream;
import java.io.InputStream;
@@ -89,7 +89,7 @@
}
/**
- * @see org.apache.james.mime4j.parser.EntityStateMachine#getDecodedContentStream()
+ * @see org.apache.james.mime4j.stream.EntityStateMachine#getDecodedContentStream()
*/
public InputStream getDecodedContentStream() throws IllegalStateException {
throw new IllegalStateException("Raw entity does not support stream decoding");
Propchange: james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/stream/RawEntity.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/stream/RawField.java (from r895589, james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/RawField.java)
URL: http://svn.apache.org/viewvc/james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/stream/RawField.java?p2=james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/stream/RawField.java&p1=james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/RawField.java&r1=895589&r2=897163&rev=897163&view=diff
==============================================================================
--- james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/RawField.java (original)
+++ james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/stream/RawField.java Fri Jan 8 10:51:51 2010
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mime4j.parser;
+package org.apache.james.mime4j.stream;
import java.util.BitSet;
Propchange: james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/stream/RawField.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/stream/RawField.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/stream/RecursionMode.java (from r895589, james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/RecursionMode.java)
URL: http://svn.apache.org/viewvc/james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/stream/RecursionMode.java?p2=james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/stream/RecursionMode.java&p1=james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/RecursionMode.java&r1=895589&r2=897163&rev=897163&view=diff
==============================================================================
--- james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/RecursionMode.java (original)
+++ james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/stream/RecursionMode.java Fri Jan 8 10:51:51 2010
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mime4j.parser;
+package org.apache.james.mime4j.stream;
/**
* Enumeration of parsing modes.
Propchange: james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/stream/RecursionMode.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/util/StringArrayMap.java
URL: http://svn.apache.org/viewvc/james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/util/StringArrayMap.java?rev=897163&r1=897162&r2=897163&view=diff
==============================================================================
--- james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/util/StringArrayMap.java (original)
+++ james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/util/StringArrayMap.java Fri Jan 8 10:51:51 2010
@@ -36,7 +36,7 @@
* <p>
* Note that this class is not directly used anywhere in Mime4j.
* Instead a user might choose to use it instead of {@link org.apache.james.mime4j.message.Header}
- * and {@link org.apache.james.mime4j.field.Field} in a custom {@link org.apache.james.mime4j.parser.ContentHandler} implementation.
+ * and {@link org.apache.james.mime4j.field.Field} in a custom {@link org.apache.james.mime4j.stream.ContentHandler} implementation.
* See also MIME4j-24.
*/
public class StringArrayMap implements Serializable {
Modified: james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/message/ExampleMessagesRoundtripTest.java
URL: http://svn.apache.org/viewvc/james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/message/ExampleMessagesRoundtripTest.java?rev=897163&r1=897162&r2=897163&view=diff
==============================================================================
--- james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/message/ExampleMessagesRoundtripTest.java (original)
+++ james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/message/ExampleMessagesRoundtripTest.java Fri Jan 8 10:51:51 2010
@@ -34,7 +34,7 @@
import org.apache.james.mime4j.codec.CodecUtil;
import org.apache.james.mime4j.message.impl.MessageImpl;
-import org.apache.james.mime4j.parser.MimeEntityConfig;
+import org.apache.james.mime4j.stream.MimeEntityConfig;
import org.apache.log4j.BasicConfigurator;
/**
Modified: james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/message/MessageHeadlessParserTest.java
URL: http://svn.apache.org/viewvc/james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/message/MessageHeadlessParserTest.java?rev=897163&r1=897162&r2=897163&view=diff
==============================================================================
--- james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/message/MessageHeadlessParserTest.java (original)
+++ james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/message/MessageHeadlessParserTest.java Fri Jan 8 10:51:51 2010
@@ -27,7 +27,7 @@
import org.apache.james.mime4j.field.ContentTypeField;
import org.apache.james.mime4j.field.FieldName;
import org.apache.james.mime4j.message.impl.MessageImpl;
-import org.apache.james.mime4j.parser.MimeEntityConfig;
+import org.apache.james.mime4j.stream.MimeEntityConfig;
public class MessageHeadlessParserTest extends TestCase {
Modified: james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/message/MessageParserTest.java
URL: http://svn.apache.org/viewvc/james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/message/MessageParserTest.java?rev=897163&r1=897162&r2=897163&view=diff
==============================================================================
--- james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/message/MessageParserTest.java (original)
+++ james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/message/MessageParserTest.java Fri Jan 8 10:51:51 2010
@@ -40,7 +40,7 @@
import org.apache.james.mime4j.field.Field;
import org.apache.james.mime4j.field.FieldsTest;
import org.apache.james.mime4j.message.impl.MessageImpl;
-import org.apache.james.mime4j.parser.MimeEntityConfig;
+import org.apache.james.mime4j.stream.MimeEntityConfig;
import org.apache.james.mime4j.util.CharsetUtil;
import org.apache.log4j.BasicConfigurator;
Added: james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/parser/DefaultBodyDescriptorTest.java
URL: http://svn.apache.org/viewvc/james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/parser/DefaultBodyDescriptorTest.java?rev=897163&view=auto
==============================================================================
--- james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/parser/DefaultBodyDescriptorTest.java (added)
+++ james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/parser/DefaultBodyDescriptorTest.java Fri Jan 8 10:51:51 2010
@@ -0,0 +1,37 @@
+/****************************************************************
+ * 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.parser;
+
+import org.apache.james.mime4j.parser.DefaultBodyDescriptor;
+import org.apache.james.mime4j.stream.BaseTestForBodyDescriptors;
+import org.apache.james.mime4j.stream.BodyDescriptor;
+import org.apache.james.mime4j.stream.MutableBodyDescriptor;
+
+public class DefaultBodyDescriptorTest extends BaseTestForBodyDescriptors {
+ @Override
+ protected MutableBodyDescriptor newBodyDescriptor() {
+ return new DefaultBodyDescriptor();
+ }
+
+ @Override
+ protected MutableBodyDescriptor newBodyDescriptor(BodyDescriptor parent) {
+ return new DefaultBodyDescriptor(parent);
+ }
+}
Propchange: james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/parser/DefaultBodyDescriptorTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/parser/MaximalBodyDescriptorTest.java
URL: http://svn.apache.org/viewvc/james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/parser/MaximalBodyDescriptorTest.java?rev=897163&view=auto
==============================================================================
--- james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/parser/MaximalBodyDescriptorTest.java (added)
+++ james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/parser/MaximalBodyDescriptorTest.java Fri Jan 8 10:51:51 2010
@@ -0,0 +1,193 @@
+/****************************************************************
+ * 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.parser;
+
+import java.io.ByteArrayInputStream;
+
+import org.apache.james.mime4j.ExampleMail;
+import org.apache.james.mime4j.field.datetime.DateTime;
+import org.apache.james.mime4j.parser.MaximalBodyDescriptor;
+import org.apache.james.mime4j.parser.MimeTokenStream;
+import org.apache.james.mime4j.stream.BaseTestForBodyDescriptors;
+import org.apache.james.mime4j.stream.BodyDescriptor;
+import org.apache.james.mime4j.stream.MutableBodyDescriptor;
+
+public class MaximalBodyDescriptorTest extends BaseTestForBodyDescriptors {
+
+ MimeTokenStream parser;
+
+ @Override
+ protected void setUp() throws Exception {
+ super.setUp();
+ parser = MimeTokenStream.createMaximalDescriptorStream();
+ }
+
+ @Override
+ protected void tearDown() throws Exception {
+ super.tearDown();
+ }
+
+ public void testMimeVersionDefault() throws Exception {
+ MaximalBodyDescriptor descriptor = describe(ExampleMail.RFC822_SIMPLE_BYTES);
+ assertEquals(1, descriptor.getMimeMajorVersion());
+ assertEquals(0, descriptor.getMimeMinorVersion());
+ assertNull(descriptor.getMimeVersionParseException());
+ }
+
+ public void testMimeVersion() throws Exception {
+ MaximalBodyDescriptor descriptor = describe(ExampleMail.ONE_PART_MIME_ASCII_COMMENT_IN_MIME_VERSION_BYTES);
+ assertEquals(2, descriptor.getMimeMajorVersion());
+ assertEquals(4, descriptor.getMimeMinorVersion());
+ assertNull(descriptor.getMimeVersionParseException());
+ }
+
+ public void testContentId() throws Exception {
+ MaximalBodyDescriptor descriptor = describe(ExampleMail.ONE_PART_MIME_8859_BYTES);
+ assertEquals(1, descriptor.getMimeMajorVersion());
+ assertEquals(0, descriptor.getMimeMinorVersion());
+ assertNull(descriptor.getMimeVersionParseException());
+ assertEquals(ExampleMail.CONTENT_ID, descriptor.getContentId());
+ }
+
+ public void testContentDescription() throws Exception {
+ MaximalBodyDescriptor descriptor = describe(ExampleMail.ONE_PART_MIME_8859_BYTES);
+ assertEquals(1, descriptor.getMimeMajorVersion());
+ assertEquals(0, descriptor.getMimeMinorVersion());
+ assertNull(descriptor.getMimeVersionParseException());
+ assertEquals(ExampleMail.CONTENT_DESCRIPTION, descriptor.getContentDescription());
+ }
+
+ public void testMimeVersionHeaderBreak() throws Exception {
+ MaximalBodyDescriptor descriptor = describe(ExampleMail.ONE_PART_MIME_ASCII_MIME_VERSION_SPANS_TWO_LINES_BYTES);
+ assertEquals(4, descriptor.getMimeMajorVersion());
+ assertEquals(1, descriptor.getMimeMinorVersion());
+ assertNull(descriptor.getMimeVersionParseException());
+ }
+
+ public void testContentDispositionType() throws Exception {
+ MaximalBodyDescriptor descriptor = describe(ExampleMail.ONE_PART_MIME_BASE64_LATIN1_BYTES);
+ assertEquals("inline", descriptor.getContentDispositionType());
+ }
+
+ public void testContentDispositionTypeCaseConversion() throws Exception {
+ MaximalBodyDescriptor descriptor = describe(ExampleMail.ONE_PART_MIME_BASE64_LATIN1_BYTES);
+ assertEquals("Should be converted to lower case", "inline", descriptor.getContentDispositionType());
+ assertNotNull(descriptor.getContentDispositionParameters());
+ assertEquals(0, descriptor.getContentDispositionParameters().size());
+ }
+
+ public void testContentDispositionParameters() throws Exception {
+ MaximalBodyDescriptor descriptor = describe(ExampleMail.ONE_PART_MIME_WITH_CONTENT_DISPOSITION_PARAMETERS_BYTES);
+ assertEquals("inline", descriptor.getContentDispositionType());
+ assertNotNull(descriptor.getContentDispositionParameters());
+ assertEquals(3, descriptor.getContentDispositionParameters().size());
+ assertEquals("value", descriptor.getContentDispositionParameters().get("param"));
+ assertEquals("1", descriptor.getContentDispositionParameters().get("one"));
+ assertEquals("bar", descriptor.getContentDispositionParameters().get("foo"));
+ }
+
+ public void testContentDispositionStandardParameters() throws Exception {
+ MaximalBodyDescriptor descriptor = describe(ExampleMail.MULTIPART_WITH_BINARY_ATTACHMENTS_BYTES, 1);
+ assertEquals("attachment", descriptor.getContentDispositionType());
+ assertNotNull(descriptor.getContentDispositionParameters());
+ assertEquals(5, descriptor.getContentDispositionParameters().size());
+ assertEquals("blob.png", descriptor.getContentDispositionFilename());
+ assertEquals(new DateTime("2008", 6, 21, 15, 32, 18, 0), descriptor.getContentDispositionModificationDate());
+ assertEquals(new DateTime("2008", 6, 20, 10, 15, 9, 0), descriptor.getContentDispositionCreationDate());
+ assertEquals(new DateTime("2008", 6, 22, 12, 8, 56, 0), descriptor.getContentDispositionReadDate());
+ assertEquals(10234, descriptor.getContentDispositionSize());
+ }
+
+ public void testLanguageParameters() throws Exception {
+ MaximalBodyDescriptor descriptor = describe(ExampleMail.MULTIPART_WITH_BINARY_ATTACHMENTS_BYTES, 3);
+ assertNotNull(descriptor.getContentLanguage());
+ assertEquals(3, descriptor.getContentLanguage().size());
+ assertEquals("en", descriptor.getContentLanguage().get(0));
+ assertEquals("en-US", descriptor.getContentLanguage().get(1));
+ assertEquals("en-CA", descriptor.getContentLanguage().get(2));
+ }
+
+ public void testContentLocationRelativeUrl() throws Exception {
+ MaximalBodyDescriptor descriptor = describe(ExampleMail.MULTIPART_WITH_CONTENT_LOCATION_BYTES, 0);
+ assertEquals("relative/url", descriptor.getContentLocation());
+ }
+
+ public void testContentLocationAbsoluteUrl() throws Exception {
+ MaximalBodyDescriptor descriptor = describe(ExampleMail.MULTIPART_WITH_CONTENT_LOCATION_BYTES, 1);
+ assertEquals("http://www.example.org/absolute/rhubard.txt", descriptor.getContentLocation());
+ }
+
+ public void testContentLocationWithComment() throws Exception {
+ MaximalBodyDescriptor descriptor = describe(ExampleMail.MULTIPART_WITH_CONTENT_LOCATION_BYTES, 3);
+ assertEquals("http://www.example.org/absolute/comments/rhubard.txt", descriptor.getContentLocation());
+ }
+
+ public void testContentLocationFoldedUrl() throws Exception {
+ MaximalBodyDescriptor descriptor = describe(ExampleMail.MULTIPART_WITH_CONTENT_LOCATION_BYTES, 4);
+ assertEquals("http://www.example.org/this/is/a/very/long/url/split/over/two/lines/", descriptor.getContentLocation());
+ }
+
+ public void testContentMD5Url() throws Exception {
+ MaximalBodyDescriptor descriptor = describe(ExampleMail.ONE_PART_MIME_WITH_CONTENT_DISPOSITION_PARAMETERS_BYTES);
+ assertEquals(ExampleMail.MD5_CONTENT, descriptor.getContentMD5Raw());
+ }
+
+ private MaximalBodyDescriptor describe(byte[] mail, int zeroBasedPart) throws Exception {
+ ByteArrayInputStream bias = new ByteArrayInputStream(mail);
+ parser.parse(bias);
+ int state = parser.next();
+ while (state != MimeTokenStream.T_END_OF_STREAM && zeroBasedPart>=0) {
+ state = parser.next();
+ if (state == MimeTokenStream.T_BODY) {
+ --zeroBasedPart;
+ }
+ }
+ assertEquals(MimeTokenStream.T_BODY, state);
+ BodyDescriptor descriptor = parser.getBodyDescriptor();
+ assertNotNull(descriptor);
+ assertTrue("Parser is maximal so body descriptor should be maximal", descriptor instanceof MaximalBodyDescriptor);
+ return (MaximalBodyDescriptor) descriptor;
+ }
+
+ private MaximalBodyDescriptor describe(byte[] mail) throws Exception {
+ ByteArrayInputStream bias = new ByteArrayInputStream(mail);
+ parser.parse(bias);
+ int state = parser.next();
+ while (state != MimeTokenStream.T_BODY && state != MimeTokenStream.T_END_OF_STREAM)
+ {
+ state = parser.next();
+ }
+ assertEquals(MimeTokenStream.T_BODY, state);
+ BodyDescriptor descriptor = parser.getBodyDescriptor();
+ assertNotNull(descriptor);
+ assertTrue("Parser is maximal so body descriptor should be maximal", descriptor instanceof MaximalBodyDescriptor);
+ return (MaximalBodyDescriptor) descriptor;
+ }
+
+ @Override
+ protected MutableBodyDescriptor newBodyDescriptor() {
+ return new MaximalBodyDescriptor();
+ }
+
+ @Override
+ protected MutableBodyDescriptor newBodyDescriptor(BodyDescriptor parent) {
+ return new MaximalBodyDescriptor(parent);
+ }
+}
Propchange: james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/parser/MaximalBodyDescriptorTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/stream/BaseTestForBodyDescriptors.java (from r895589, james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/parser/BaseTestForBodyDescriptors.java)
URL: http://svn.apache.org/viewvc/james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/stream/BaseTestForBodyDescriptors.java?p2=james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/stream/BaseTestForBodyDescriptors.java&p1=james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/parser/BaseTestForBodyDescriptors.java&r1=895589&r2=897163&rev=897163&view=diff
==============================================================================
--- james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/parser/BaseTestForBodyDescriptors.java (original)
+++ james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/stream/BaseTestForBodyDescriptors.java Fri Jan 8 10:51:51 2010
@@ -17,13 +17,13 @@
* under the License. *
****************************************************************/
-package org.apache.james.mime4j.parser;
+package org.apache.james.mime4j.stream;
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;
+import org.apache.james.mime4j.stream.BodyDescriptor;
+import org.apache.james.mime4j.stream.MutableBodyDescriptor;
+import org.apache.james.mime4j.stream.RawField;
public abstract class BaseTestForBodyDescriptors extends TestCase {
Propchange: james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/stream/BaseTestForBodyDescriptors.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/stream/BaseTestForBodyDescriptors.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/stream/MimeEntityTest.java (from r895589, 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/stream/MimeEntityTest.java?p2=james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/stream/MimeEntityTest.java&p1=james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/parser/MimeEntityTest.java&r1=895589&r2=897163&rev=897163&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/stream/MimeEntityTest.java Fri Jan 8 10:51:51 2010
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mime4j.parser;
+package org.apache.james.mime4j.stream;
import java.io.ByteArrayInputStream;
import java.io.IOException;
@@ -29,11 +29,12 @@
import org.apache.james.mime4j.io.MaxHeaderLimitException;
import org.apache.james.mime4j.io.MaxLineLimitException;
import org.apache.james.mime4j.io.LineNumberInputStream;
-import org.apache.james.mime4j.parser.EntityStateMachine;
-import org.apache.james.mime4j.parser.EntityStates;
-import org.apache.james.mime4j.parser.MimeEntity;
-import org.apache.james.mime4j.parser.RecursionMode;
-import org.apache.james.mime4j.parser.impl.DefaultBodyDescriptor;
+import org.apache.james.mime4j.parser.DefaultBodyDescriptor;
+import org.apache.james.mime4j.stream.EntityStateMachine;
+import org.apache.james.mime4j.stream.EntityStates;
+import org.apache.james.mime4j.stream.MimeEntity;
+import org.apache.james.mime4j.stream.MimeEntityConfig;
+import org.apache.james.mime4j.stream.RecursionMode;
import junit.framework.TestCase;
Propchange: james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/stream/MimeEntityTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/stream/MimeStreamParserExampleMessagesTest.java (from r895589, james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/parser/MimeStreamParserExampleMessagesTest.java)
URL: http://svn.apache.org/viewvc/james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/stream/MimeStreamParserExampleMessagesTest.java?p2=james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/stream/MimeStreamParserExampleMessagesTest.java&p1=james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/parser/MimeStreamParserExampleMessagesTest.java&r1=895589&r2=897163&rev=897163&view=diff
==============================================================================
--- james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/parser/MimeStreamParserExampleMessagesTest.java (original)
+++ james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/stream/MimeStreamParserExampleMessagesTest.java Fri Jan 8 10:51:51 2010
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mime4j.parser;
+package org.apache.james.mime4j.stream;
import java.io.File;
import java.io.FileInputStream;
@@ -32,7 +32,8 @@
import junit.framework.TestSuite;
import org.apache.commons.io.IOUtils;
-import org.apache.james.mime4j.parser.impl.MimeStreamParser;
+import org.apache.james.mime4j.parser.MimeStreamParser;
+import org.apache.james.mime4j.stream.MimeEntityConfig;
import org.apache.log4j.BasicConfigurator;
/**
Propchange: james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/stream/MimeStreamParserExampleMessagesTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/stream/MimeStreamParserExampleMessagesTest.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/stream/MimeStreamParserTest.java (from r895589, 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/stream/MimeStreamParserTest.java?p2=james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/stream/MimeStreamParserTest.java&p1=james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/parser/MimeStreamParserTest.java&r1=895589&r2=897163&rev=897163&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/stream/MimeStreamParserTest.java Fri Jan 8 10:51:51 2010
@@ -17,10 +17,12 @@
* under the License. *
****************************************************************/
-package org.apache.james.mime4j.parser;
+package org.apache.james.mime4j.stream;
-import org.apache.james.mime4j.parser.AbstractContentHandler;
-import org.apache.james.mime4j.parser.impl.MimeStreamParser;
+import org.apache.james.mime4j.parser.MimeStreamParser;
+import org.apache.james.mime4j.stream.AbstractContentHandler;
+import org.apache.james.mime4j.stream.BodyDescriptor;
+import org.apache.james.mime4j.stream.RawField;
import org.apache.james.mime4j.util.ByteSequence;
import org.apache.james.mime4j.util.ContentUtil;
import org.apache.log4j.BasicConfigurator;
Propchange: james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/stream/MimeStreamParserTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/stream/MimeStreamTokenMessageRfc822Test.java (from r895589, james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/parser/MimeStreamTokenMessageRfc822Test.java)
URL: http://svn.apache.org/viewvc/james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/stream/MimeStreamTokenMessageRfc822Test.java?p2=james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/stream/MimeStreamTokenMessageRfc822Test.java&p1=james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/parser/MimeStreamTokenMessageRfc822Test.java&r1=895589&r2=897163&rev=897163&view=diff
==============================================================================
--- james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/parser/MimeStreamTokenMessageRfc822Test.java (original)
+++ james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/stream/MimeStreamTokenMessageRfc822Test.java Fri Jan 8 10:51:51 2010
@@ -17,11 +17,11 @@
* under the License. *
****************************************************************/
-package org.apache.james.mime4j.parser;
+package org.apache.james.mime4j.stream;
import org.apache.james.mime4j.ExampleMail;
-import org.apache.james.mime4j.parser.RecursionMode;
-import org.apache.james.mime4j.parser.impl.MimeTokenStream;
+import org.apache.james.mime4j.parser.MimeTokenStream;
+import org.apache.james.mime4j.stream.RecursionMode;
import java.io.ByteArrayInputStream;
Propchange: james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/stream/MimeStreamTokenMessageRfc822Test.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/stream/MimeTokenEmbeddedMessageTest.java (from r895589, james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/parser/MimeTokenEmbeddedMessageTest.java)
URL: http://svn.apache.org/viewvc/james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/stream/MimeTokenEmbeddedMessageTest.java?p2=james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/stream/MimeTokenEmbeddedMessageTest.java&p1=james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/parser/MimeTokenEmbeddedMessageTest.java&r1=895589&r2=897163&rev=897163&view=diff
==============================================================================
--- james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/parser/MimeTokenEmbeddedMessageTest.java (original)
+++ james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/stream/MimeTokenEmbeddedMessageTest.java Fri Jan 8 10:51:51 2010
@@ -17,10 +17,10 @@
* under the License. *
****************************************************************/
-package org.apache.james.mime4j.parser;
+package org.apache.james.mime4j.stream;
import org.apache.james.mime4j.ExampleMail;
-import org.apache.james.mime4j.parser.impl.MimeTokenStream;
+import org.apache.james.mime4j.parser.MimeTokenStream;
import java.io.ByteArrayInputStream;
import java.io.InputStream;
Propchange: james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/stream/MimeTokenEmbeddedMessageTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/stream/MimeTokenNoRecurseTest.java (from r895589, james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/parser/MimeTokenNoRecurseTest.java)
URL: http://svn.apache.org/viewvc/james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/stream/MimeTokenNoRecurseTest.java?p2=james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/stream/MimeTokenNoRecurseTest.java&p1=james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/parser/MimeTokenNoRecurseTest.java&r1=895589&r2=897163&rev=897163&view=diff
==============================================================================
--- james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/parser/MimeTokenNoRecurseTest.java (original)
+++ james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/stream/MimeTokenNoRecurseTest.java Fri Jan 8 10:51:51 2010
@@ -17,14 +17,14 @@
* under the License. *
****************************************************************/
-package org.apache.james.mime4j.parser;
+package org.apache.james.mime4j.stream;
import java.io.ByteArrayInputStream;
import java.io.InputStream;
import junit.framework.TestCase;
-import org.apache.james.mime4j.parser.impl.MimeTokenStream;
+import org.apache.james.mime4j.parser.MimeTokenStream;
import org.apache.james.mime4j.util.CharsetUtil;
public class MimeTokenNoRecurseTest extends TestCase {
Propchange: james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/stream/MimeTokenNoRecurseTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/stream/MimeTokenStreamBodyDescriptorTest.java (from r895589, 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/stream/MimeTokenStreamBodyDescriptorTest.java?p2=james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/stream/MimeTokenStreamBodyDescriptorTest.java&p1=james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/parser/MimeTokenStreamBodyDescriptorTest.java&r1=895589&r2=897163&rev=897163&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/stream/MimeTokenStreamBodyDescriptorTest.java Fri Jan 8 10:51:51 2010
@@ -17,10 +17,11 @@
* under the License. *
****************************************************************/
-package org.apache.james.mime4j.parser;
+package org.apache.james.mime4j.stream;
import org.apache.james.mime4j.ExampleMail;
-import org.apache.james.mime4j.parser.impl.MimeTokenStream;
+import org.apache.james.mime4j.parser.MimeTokenStream;
+import org.apache.james.mime4j.stream.BodyDescriptor;
import java.io.ByteArrayInputStream;
Propchange: james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/stream/MimeTokenStreamBodyDescriptorTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/stream/MimeTokenStreamReaderTest.java (from r895589, james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/parser/MimeTokenStreamReaderTest.java)
URL: http://svn.apache.org/viewvc/james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/stream/MimeTokenStreamReaderTest.java?p2=james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/stream/MimeTokenStreamReaderTest.java&p1=james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/parser/MimeTokenStreamReaderTest.java&r1=895589&r2=897163&rev=897163&view=diff
==============================================================================
--- james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/parser/MimeTokenStreamReaderTest.java (original)
+++ james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/stream/MimeTokenStreamReaderTest.java Fri Jan 8 10:51:51 2010
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mime4j.parser;
+package org.apache.james.mime4j.stream;
import java.io.ByteArrayInputStream;
import java.io.IOException;
@@ -27,7 +27,7 @@
import org.apache.commons.io.IOUtils;
import org.apache.james.mime4j.ExampleMail;
import org.apache.james.mime4j.MimeException;
-import org.apache.james.mime4j.parser.impl.MimeTokenStream;
+import org.apache.james.mime4j.parser.MimeTokenStream;
import junit.framework.TestCase;
Propchange: james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/stream/MimeTokenStreamReaderTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/stream/MimeTokenStreamTest.java (from r895589, james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/parser/MimeTokenStreamTest.java)
URL: http://svn.apache.org/viewvc/james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/stream/MimeTokenStreamTest.java?p2=james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/stream/MimeTokenStreamTest.java&p1=james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/parser/MimeTokenStreamTest.java&r1=895589&r2=897163&rev=897163&view=diff
==============================================================================
--- james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/parser/MimeTokenStreamTest.java (original)
+++ james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/stream/MimeTokenStreamTest.java Fri Jan 8 10:51:51 2010
@@ -17,12 +17,12 @@
* under the License. *
****************************************************************/
-package org.apache.james.mime4j.parser;
+package org.apache.james.mime4j.stream;
import org.apache.james.mime4j.ExampleMail;
-import org.apache.james.mime4j.parser.EntityStates;
-import org.apache.james.mime4j.parser.RecursionMode;
-import org.apache.james.mime4j.parser.impl.MimeTokenStream;
+import org.apache.james.mime4j.parser.MimeTokenStream;
+import org.apache.james.mime4j.stream.EntityStates;
+import org.apache.james.mime4j.stream.RecursionMode;
import java.io.ByteArrayInputStream;
Propchange: james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/stream/MimeTokenStreamTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/stream/MultipartStreamTest.java (from r895589, james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/parser/MultipartStreamTest.java)
URL: http://svn.apache.org/viewvc/james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/stream/MultipartStreamTest.java?p2=james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/stream/MultipartStreamTest.java&p1=james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/parser/MultipartStreamTest.java&r1=895589&r2=897163&rev=897163&view=diff
==============================================================================
--- james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/parser/MultipartStreamTest.java (original)
+++ james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/stream/MultipartStreamTest.java Fri Jan 8 10:51:51 2010
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mime4j.parser;
+package org.apache.james.mime4j.stream;
import java.io.ByteArrayInputStream;
import java.io.IOException;
@@ -28,7 +28,7 @@
import org.apache.commons.io.IOUtils;
import org.apache.james.mime4j.MimeException;
-import org.apache.james.mime4j.parser.impl.MimeTokenStream;
+import org.apache.james.mime4j.parser.MimeTokenStream;
import org.apache.james.mime4j.util.CharsetUtil;
public class MultipartStreamTest extends TestCase {
Propchange: james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/stream/MultipartStreamTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/stream/MultipartTokensTest.java (from r895589, james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/parser/MultipartTokensTest.java)
URL: http://svn.apache.org/viewvc/james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/stream/MultipartTokensTest.java?p2=james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/stream/MultipartTokensTest.java&p1=james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/parser/MultipartTokensTest.java&r1=895589&r2=897163&rev=897163&view=diff
==============================================================================
--- james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/parser/MultipartTokensTest.java (original)
+++ james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/stream/MultipartTokensTest.java Fri Jan 8 10:51:51 2010
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mime4j.parser;
+package org.apache.james.mime4j.stream;
import java.io.ByteArrayInputStream;
import java.io.IOException;
@@ -27,7 +27,7 @@
import org.apache.commons.io.IOUtils;
import org.apache.james.mime4j.MimeException;
-import org.apache.james.mime4j.parser.impl.MimeTokenStream;
+import org.apache.james.mime4j.parser.MimeTokenStream;
import org.apache.james.mime4j.util.CharsetUtil;
public class MultipartTokensTest extends TestCase {
Propchange: james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/stream/MultipartTokensTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/stream/StrictMimeTokenStreamTest.java (from r895589, james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/parser/StrictMimeTokenStreamTest.java)
URL: http://svn.apache.org/viewvc/james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/stream/StrictMimeTokenStreamTest.java?p2=james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/stream/StrictMimeTokenStreamTest.java&p1=james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/parser/StrictMimeTokenStreamTest.java&r1=895589&r2=897163&rev=897163&view=diff
==============================================================================
--- james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/parser/StrictMimeTokenStreamTest.java (original)
+++ james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/stream/StrictMimeTokenStreamTest.java Fri Jan 8 10:51:51 2010
@@ -17,11 +17,11 @@
* under the License. *
****************************************************************/
-package org.apache.james.mime4j.parser;
+package org.apache.james.mime4j.stream;
-import org.apache.james.mime4j.parser.Event;
-import org.apache.james.mime4j.parser.MimeParseEventException;
-import org.apache.james.mime4j.parser.impl.MimeTokenStream;
+import org.apache.james.mime4j.parser.MimeTokenStream;
+import org.apache.james.mime4j.stream.Event;
+import org.apache.james.mime4j.stream.MimeParseEventException;
import java.io.ByteArrayInputStream;
Propchange: james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/stream/StrictMimeTokenStreamTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/stream/TestHandler.java (from r895589, 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/stream/TestHandler.java?p2=james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/stream/TestHandler.java&p1=james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/parser/TestHandler.java&r1=895589&r2=897163&rev=897163&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/stream/TestHandler.java Fri Jan 8 10:51:51 2010
@@ -17,9 +17,11 @@
* under the License. *
****************************************************************/
-package org.apache.james.mime4j.parser;
+package org.apache.james.mime4j.stream;
-import org.apache.james.mime4j.parser.ContentHandler;
+import org.apache.james.mime4j.stream.BodyDescriptor;
+import org.apache.james.mime4j.stream.ContentHandler;
+import org.apache.james.mime4j.stream.RawField;
import org.apache.james.mime4j.util.ContentUtil;
import java.io.IOException;
Propchange: james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/stream/TestHandler.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/stream/TestHandler.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
|