Author: bago
Date: Sat Jan 2 16:55:57 2010
New Revision: 895241
URL: http://svn.apache.org/viewvc?rev=895241&view=rev
Log:
Moved parser "implementation" classes to the "impl" subpackage. This is not the
final solution, but at least this better separate dependencies. Maybe we should
better have "parser" => "parser.stream" and "parser.impl" => "parser", but this
is a detail at this point of the reorganization process. (preparing MIME4J-157)
Added:
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/impl/
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/impl/DefaultBodyDescriptor.java
(contents, props changed)
- copied, changed from r895022,
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/DefaultBodyDescriptor.java
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/impl/MaximalBodyDescriptor.java
(contents, props changed)
- copied, changed from r895022,
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/MaximalBodyDescriptor.java
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/impl/MimeStreamParser.java
(contents, props changed)
- copied, changed from r895236,
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/impl/MimeTokenStream.java
(contents, props changed)
- copied, changed from r895236,
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/MimeTokenStream.java
james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/parser/impl/
james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/parser/impl/DefaultBodyDescriptorTest.java
(contents, props changed)
- copied, changed from r895022,
james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/parser/DefaultBodyDescriptorTest.java
james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/parser/impl/MaximalBodyDescriptorTest.java
(contents, props changed)
- copied, changed from r895022,
james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/parser/MaximalBodyDescriptorTest.java
Removed:
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/DefaultBodyDescriptor.java
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/MaximalBodyDescriptor.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/test/java/org/apache/james/mime4j/parser/DefaultBodyDescriptorTest.java
james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/parser/MaximalBodyDescriptorTest.java
Modified:
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/message/impl/HeaderImpl.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/BasicMimeTokenStream.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/MimeEntityConfig.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/MimeStreamParserExampleMessagesTest.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/MimeStreamTokenMessageRfc822Test.java
james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/parser/MimeTokenEmbeddedMessageTest.java
james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/parser/MimeTokenNoRecurseTest.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/MimeTokenStreamReaderTest.java
james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/parser/MimeTokenStreamTest.java
james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/parser/MultipartStreamTest.java
james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/parser/MultipartTokensTest.java
james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/parser/StrictMimeTokenStreamTest.java
Modified:
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/message/impl/HeaderImpl.java
URL:
http://svn.apache.org/viewvc/james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/message/impl/HeaderImpl.java?rev=895241&r1=895240&r2=895241&view=diff
==============================================================================
---
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/message/impl/HeaderImpl.java
(original)
+++
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/message/impl/HeaderImpl.java
Sat Jan 2 16:55:57 2010
@@ -28,8 +28,8 @@
import org.apache.james.mime4j.field.impl.DefaultFieldParser;
import org.apache.james.mime4j.message.Header;
import org.apache.james.mime4j.parser.AbstractContentHandler;
-import org.apache.james.mime4j.parser.MimeStreamParser;
import org.apache.james.mime4j.parser.RawField;
+import org.apache.james.mime4j.parser.impl.MimeStreamParser;
/**
* The header of an entity (see RFC 2045).
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=895241&r1=895240&r2=895241&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
Sat Jan 2 16:55:57 2010
@@ -33,8 +33,8 @@
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;
+import org.apache.james.mime4j.parser.impl.MimeStreamParser;
import org.apache.james.mime4j.storage.StorageProvider;
import org.apache.james.mime4j.util.ByteArrayBuffer;
import org.apache.james.mime4j.util.ByteSequence;
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=895241&r1=895240&r2=895241&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
Sat Jan 2 16:55:57 2010
@@ -49,7 +49,7 @@
import org.apache.james.mime4j.message.Multipart;
import org.apache.james.mime4j.message.SingleBody;
import org.apache.james.mime4j.parser.MimeEntityConfig;
-import org.apache.james.mime4j.parser.MimeStreamParser;
+import org.apache.james.mime4j.parser.impl.MimeStreamParser;
import org.apache.james.mime4j.storage.DefaultStorageProvider;
import org.apache.james.mime4j.storage.StorageProvider;
import org.apache.james.mime4j.util.MimeUtil;
Modified:
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/parser/BasicMimeTokenStream.java?rev=895241&r1=895240&r2=895241&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/parser/BasicMimeTokenStream.java
Sat Jan 2 16:55:57 2010
@@ -319,7 +319,7 @@
}
- protected MimeEntityConfig getConfig() {
+ public MimeEntityConfig getConfig() {
return config;
}
}
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=895241&r1=895240&r2=895241&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
Sat Jan 2 16:55:57 2010
@@ -20,6 +20,7 @@
package org.apache.james.mime4j.parser;
import org.apache.james.mime4j.MimeException;
+import org.apache.james.mime4j.parser.impl.MimeStreamParser;
import java.io.IOException;
import java.io.InputStream;
@@ -29,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.MimeStreamParser#setContentHandler(ContentHandler)}
+ * {...@link
org.apache.james.mime4j.parser.impl.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.
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=895241&r1=895240&r2=895241&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
Sat Jan 2 16:55:57 2010
@@ -20,6 +20,10 @@
package org.apache.james.mime4j.parser;
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;
/**
* MIME entity configuration
Copied:
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/impl/DefaultBodyDescriptor.java
(from r895022,
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/DefaultBodyDescriptor.java)
URL:
http://svn.apache.org/viewvc/james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/impl/DefaultBodyDescriptor.java?p2=james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/impl/DefaultBodyDescriptor.java&p1=james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/DefaultBodyDescriptor.java&r1=895022&r2=895241&rev=895241&view=diff
==============================================================================
---
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/DefaultBodyDescriptor.java
(original)
+++
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/impl/DefaultBodyDescriptor.java
Sat Jan 2 16:55:57 2010
@@ -17,13 +17,16 @@
* under the License. *
****************************************************************/
-package org.apache.james.mime4j.parser;
+package org.apache.james.mime4j.parser.impl;
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.BodyDescriptor;
+import org.apache.james.mime4j.parser.MutableBodyDescriptor;
+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/impl/DefaultBodyDescriptor.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/impl/DefaultBodyDescriptor.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied:
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/impl/MaximalBodyDescriptor.java
(from r895022,
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/MaximalBodyDescriptor.java)
URL:
http://svn.apache.org/viewvc/james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/impl/MaximalBodyDescriptor.java?p2=james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/impl/MaximalBodyDescriptor.java&p1=james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/MaximalBodyDescriptor.java&r1=895022&r2=895241&rev=895241&view=diff
==============================================================================
---
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/MaximalBodyDescriptor.java
(original)
+++
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/impl/MaximalBodyDescriptor.java
Sat Jan 2 16:55:57 2010
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mime4j.parser;
+package org.apache.james.mime4j.parser.impl;
import java.io.StringReader;
import java.util.Collections;
@@ -31,6 +31,9 @@
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.BodyDescriptor;
+import org.apache.james.mime4j.parser.MutableBodyDescriptor;
+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/impl/MaximalBodyDescriptor.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied:
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/impl/MimeStreamParser.java
(from r895236,
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/impl/MimeStreamParser.java?p2=james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/impl/MimeStreamParser.java&p1=james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/MimeStreamParser.java&r1=895236&r2=895241&rev=895241&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/impl/MimeStreamParser.java
Sat Jan 2 16:55:57 2010
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mime4j.parser;
+package org.apache.james.mime4j.parser.impl;
import java.io.ByteArrayInputStream;
import java.io.IOException;
@@ -25,6 +25,9 @@
import java.io.SequenceInputStream;
import org.apache.james.mime4j.MimeException;
+import org.apache.james.mime4j.parser.BodyDescriptor;
+import org.apache.james.mime4j.parser.ContentHandler;
+import org.apache.james.mime4j.parser.MimeEntityConfig;
/**
* <p>
Propchange:
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/impl/MimeStreamParser.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied:
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/impl/MimeTokenStream.java
(from r895236,
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/impl/MimeTokenStream.java?p2=james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/impl/MimeTokenStream.java&p1=james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/MimeTokenStream.java&r1=895236&r2=895241&rev=895241&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/impl/MimeTokenStream.java
Sat Jan 2 16:55:57 2010
@@ -17,10 +17,16 @@
* under the License. *
****************************************************************/
-package org.apache.james.mime4j.parser;
+package org.apache.james.mime4j.parser.impl;
import java.io.InputStream;
+import org.apache.james.mime4j.parser.BasicMimeTokenStream;
+import org.apache.james.mime4j.parser.BodyDescriptor;
+import org.apache.james.mime4j.parser.MimeEntityConfig;
+import org.apache.james.mime4j.parser.MutableBodyDescriptor;
+import org.apache.james.mime4j.parser.RawField;
+
/**
* <p>
* Parses MIME (or RFC822) message streams of bytes or characters.
Propchange:
james/mime4j/branches/cycleclean/core/src/main/java/org/apache/james/mime4j/parser/impl/MimeTokenStream.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=895241&r1=895240&r2=895241&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
Sat Jan 2 16:55:57 2010
@@ -33,6 +33,7 @@
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 junit.framework.TestCase;
Modified:
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/parser/MimeStreamParserExampleMessagesTest.java?rev=895241&r1=895240&r2=895241&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/parser/MimeStreamParserExampleMessagesTest.java
Sat Jan 2 16:55:57 2010
@@ -32,6 +32,7 @@
import junit.framework.TestSuite;
import org.apache.commons.io.IOUtils;
+import org.apache.james.mime4j.parser.impl.MimeStreamParser;
import org.apache.log4j.BasicConfigurator;
/**
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=895241&r1=895240&r2=895241&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
Sat Jan 2 16:55:57 2010
@@ -20,7 +20,7 @@
package org.apache.james.mime4j.parser;
import org.apache.james.mime4j.parser.AbstractContentHandler;
-import org.apache.james.mime4j.parser.MimeStreamParser;
+import org.apache.james.mime4j.parser.impl.MimeStreamParser;
import org.apache.james.mime4j.util.ByteSequence;
import org.apache.james.mime4j.util.ContentUtil;
import org.apache.log4j.BasicConfigurator;
Modified:
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/parser/MimeStreamTokenMessageRfc822Test.java?rev=895241&r1=895240&r2=895241&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/parser/MimeStreamTokenMessageRfc822Test.java
Sat Jan 2 16:55:57 2010
@@ -20,8 +20,8 @@
package org.apache.james.mime4j.parser;
import org.apache.james.mime4j.ExampleMail;
-import org.apache.james.mime4j.parser.MimeTokenStream;
import org.apache.james.mime4j.parser.RecursionMode;
+import org.apache.james.mime4j.parser.impl.MimeTokenStream;
import java.io.ByteArrayInputStream;
Modified:
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/parser/MimeTokenEmbeddedMessageTest.java?rev=895241&r1=895240&r2=895241&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/parser/MimeTokenEmbeddedMessageTest.java
Sat Jan 2 16:55:57 2010
@@ -20,7 +20,7 @@
package org.apache.james.mime4j.parser;
import org.apache.james.mime4j.ExampleMail;
-import org.apache.james.mime4j.parser.MimeTokenStream;
+import org.apache.james.mime4j.parser.impl.MimeTokenStream;
import java.io.ByteArrayInputStream;
import java.io.InputStream;
Modified:
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/parser/MimeTokenNoRecurseTest.java?rev=895241&r1=895240&r2=895241&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/parser/MimeTokenNoRecurseTest.java
Sat Jan 2 16:55:57 2010
@@ -24,6 +24,7 @@
import junit.framework.TestCase;
+import org.apache.james.mime4j.parser.impl.MimeTokenStream;
import org.apache.james.mime4j.util.CharsetUtil;
public class MimeTokenNoRecurseTest extends TestCase {
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=895241&r1=895240&r2=895241&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
Sat Jan 2 16:55:57 2010
@@ -20,7 +20,7 @@
package org.apache.james.mime4j.parser;
import org.apache.james.mime4j.ExampleMail;
-import org.apache.james.mime4j.parser.MimeTokenStream;
+import org.apache.james.mime4j.parser.impl.MimeTokenStream;
import java.io.ByteArrayInputStream;
Modified:
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/parser/MimeTokenStreamReaderTest.java?rev=895241&r1=895240&r2=895241&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/parser/MimeTokenStreamReaderTest.java
Sat Jan 2 16:55:57 2010
@@ -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.MimeTokenStream;
+import org.apache.james.mime4j.parser.impl.MimeTokenStream;
import junit.framework.TestCase;
Modified:
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/parser/MimeTokenStreamTest.java?rev=895241&r1=895240&r2=895241&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/parser/MimeTokenStreamTest.java
Sat Jan 2 16:55:57 2010
@@ -21,8 +21,8 @@
import org.apache.james.mime4j.ExampleMail;
import org.apache.james.mime4j.parser.EntityStates;
-import org.apache.james.mime4j.parser.MimeTokenStream;
import org.apache.james.mime4j.parser.RecursionMode;
+import org.apache.james.mime4j.parser.impl.MimeTokenStream;
import java.io.ByteArrayInputStream;
Modified:
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/parser/MultipartStreamTest.java?rev=895241&r1=895240&r2=895241&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/parser/MultipartStreamTest.java
Sat Jan 2 16:55:57 2010
@@ -28,6 +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.util.CharsetUtil;
public class MultipartStreamTest extends TestCase {
Modified:
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/parser/MultipartTokensTest.java?rev=895241&r1=895240&r2=895241&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/parser/MultipartTokensTest.java
Sat Jan 2 16:55:57 2010
@@ -27,6 +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.util.CharsetUtil;
public class MultipartTokensTest extends TestCase {
Modified:
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/parser/StrictMimeTokenStreamTest.java?rev=895241&r1=895240&r2=895241&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/parser/StrictMimeTokenStreamTest.java
Sat Jan 2 16:55:57 2010
@@ -21,7 +21,7 @@
import org.apache.james.mime4j.parser.Event;
import org.apache.james.mime4j.parser.MimeParseEventException;
-import org.apache.james.mime4j.parser.MimeTokenStream;
+import org.apache.james.mime4j.parser.impl.MimeTokenStream;
import java.io.ByteArrayInputStream;
Copied:
james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/parser/impl/DefaultBodyDescriptorTest.java
(from r895022,
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/impl/DefaultBodyDescriptorTest.java?p2=james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/parser/impl/DefaultBodyDescriptorTest.java&p1=james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/parser/DefaultBodyDescriptorTest.java&r1=895022&r2=895241&rev=895241&view=diff
==============================================================================
---
james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/parser/DefaultBodyDescriptorTest.java
(original)
+++
james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/parser/impl/DefaultBodyDescriptorTest.java
Sat Jan 2 16:55:57 2010
@@ -17,11 +17,12 @@
* under the License. *
****************************************************************/
-package org.apache.james.mime4j.parser;
+package org.apache.james.mime4j.parser.impl;
+import org.apache.james.mime4j.parser.BaseTestForBodyDescriptors;
import org.apache.james.mime4j.parser.BodyDescriptor;
-import org.apache.james.mime4j.parser.DefaultBodyDescriptor;
import org.apache.james.mime4j.parser.MutableBodyDescriptor;
+import org.apache.james.mime4j.parser.impl.DefaultBodyDescriptor;
public class DefaultBodyDescriptorTest extends BaseTestForBodyDescriptors {
@Override
Propchange:
james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/parser/impl/DefaultBodyDescriptorTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied:
james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/parser/impl/MaximalBodyDescriptorTest.java
(from r895022,
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/impl/MaximalBodyDescriptorTest.java?p2=james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/parser/impl/MaximalBodyDescriptorTest.java&p1=james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/parser/MaximalBodyDescriptorTest.java&r1=895022&r2=895241&rev=895241&view=diff
==============================================================================
---
james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/parser/MaximalBodyDescriptorTest.java
(original)
+++
james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/parser/impl/MaximalBodyDescriptorTest.java
Sat Jan 2 16:55:57 2010
@@ -17,16 +17,17 @@
* under the License. *
****************************************************************/
-package org.apache.james.mime4j.parser;
+package org.apache.james.mime4j.parser.impl;
import java.io.ByteArrayInputStream;
import org.apache.james.mime4j.ExampleMail;
import org.apache.james.mime4j.field.datetime.DateTime;
+import org.apache.james.mime4j.parser.BaseTestForBodyDescriptors;
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;
+import org.apache.james.mime4j.parser.impl.MaximalBodyDescriptor;
+import org.apache.james.mime4j.parser.impl.MimeTokenStream;
public class MaximalBodyDescriptorTest extends BaseTestForBodyDescriptors {
Propchange:
james/mime4j/branches/cycleclean/core/src/test/java/org/apache/james/mime4j/parser/impl/MaximalBodyDescriptorTest.java
------------------------------------------------------------------------------
svn:eol-style = native