Author: bago Date: Thu Aug 7 01:11:38 2008 New Revision: 683535 URL: http://svn.apache.org/viewvc?rev=683535&view=rev Log: Moved remaining *Descriptor classes from main to descriptor package (great suggestion from Niklas) (MIME4J-51).
Added: james/mime4j/trunk/src/main/java/org/apache/james/mime4j/descriptor/BodyDescriptor.java - copied, changed from r677844, james/mime4j/trunk/src/main/java/org/apache/james/mime4j/BodyDescriptor.java james/mime4j/trunk/src/main/java/org/apache/james/mime4j/descriptor/ContentDescriptor.java - copied, changed from r677844, james/mime4j/trunk/src/main/java/org/apache/james/mime4j/ContentDescriptor.java james/mime4j/trunk/src/main/java/org/apache/james/mime4j/descriptor/MutableBodyDescriptor.java - copied, changed from r677844, james/mime4j/trunk/src/main/java/org/apache/james/mime4j/MutableBodyDescriptor.java james/mime4j/trunk/src/test/java/org/apache/james/mime4j/descriptor/BaseTestForBodyDescriptors.java (contents, props changed) - copied, changed from r680968, james/mime4j/trunk/src/test/java/org/apache/james/mime4j/BaseTestForBodyDescriptors.java Removed: james/mime4j/trunk/src/main/java/org/apache/james/mime4j/BodyDescriptor.java james/mime4j/trunk/src/main/java/org/apache/james/mime4j/ContentDescriptor.java james/mime4j/trunk/src/main/java/org/apache/james/mime4j/MutableBodyDescriptor.java james/mime4j/trunk/src/test/java/org/apache/james/mime4j/BaseTestForBodyDescriptors.java Modified: james/mime4j/trunk/src/main/java/org/apache/james/mime4j/descriptor/DefaultBodyDescriptor.java james/mime4j/trunk/src/main/java/org/apache/james/mime4j/descriptor/MaximalBodyDescriptor.java james/mime4j/trunk/src/main/java/org/apache/james/mime4j/descriptor/RFC2045MimeDescriptor.java james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/Message.java james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/SimpleContentHandler.java james/mime4j/trunk/src/main/java/org/apache/james/mime4j/parser/AbstractContentHandler.java james/mime4j/trunk/src/main/java/org/apache/james/mime4j/parser/AbstractEntity.java james/mime4j/trunk/src/main/java/org/apache/james/mime4j/parser/ContentHandler.java james/mime4j/trunk/src/main/java/org/apache/james/mime4j/parser/EntityStateMachine.java james/mime4j/trunk/src/main/java/org/apache/james/mime4j/parser/MimeEntity.java james/mime4j/trunk/src/main/java/org/apache/james/mime4j/parser/MimeStreamParser.java james/mime4j/trunk/src/main/java/org/apache/james/mime4j/parser/MimeTokenStream.java james/mime4j/trunk/src/main/java/org/apache/james/mime4j/parser/RawEntity.java james/mime4j/trunk/src/test/java/org/apache/james/mime4j/descriptor/DefaultBodyDescriptorTest.java james/mime4j/trunk/src/test/java/org/apache/james/mime4j/descriptor/MaximalBodyDescriptorTest.java james/mime4j/trunk/src/test/java/org/apache/james/mime4j/parser/MimeStreamParserTest.java james/mime4j/trunk/src/test/java/org/apache/james/mime4j/parser/MimeTokenStreamBodyDescriptorTest.java james/mime4j/trunk/src/test/java/org/apache/james/mime4j/parser/TestHandler.java Copied: james/mime4j/trunk/src/main/java/org/apache/james/mime4j/descriptor/BodyDescriptor.java (from r677844, james/mime4j/trunk/src/main/java/org/apache/james/mime4j/BodyDescriptor.java) URL: http://svn.apache.org/viewvc/james/mime4j/trunk/src/main/java/org/apache/james/mime4j/descriptor/BodyDescriptor.java?p2=james/mime4j/trunk/src/main/java/org/apache/james/mime4j/descriptor/BodyDescriptor.java&p1=james/mime4j/trunk/src/main/java/org/apache/james/mime4j/BodyDescriptor.java&r1=677844&r2=683535&rev=683535&view=diff ============================================================================== --- james/mime4j/trunk/src/main/java/org/apache/james/mime4j/BodyDescriptor.java (original) +++ james/mime4j/trunk/src/main/java/org/apache/james/mime4j/descriptor/BodyDescriptor.java Thu Aug 7 01:11:38 2008 @@ -17,7 +17,7 @@ * under the License. * ****************************************************************/ -package org.apache.james.mime4j; +package org.apache.james.mime4j.descriptor; /** * Encapsulates the values of the MIME-specific header fields Copied: james/mime4j/trunk/src/main/java/org/apache/james/mime4j/descriptor/ContentDescriptor.java (from r677844, james/mime4j/trunk/src/main/java/org/apache/james/mime4j/ContentDescriptor.java) URL: http://svn.apache.org/viewvc/james/mime4j/trunk/src/main/java/org/apache/james/mime4j/descriptor/ContentDescriptor.java?p2=james/mime4j/trunk/src/main/java/org/apache/james/mime4j/descriptor/ContentDescriptor.java&p1=james/mime4j/trunk/src/main/java/org/apache/james/mime4j/ContentDescriptor.java&r1=677844&r2=683535&rev=683535&view=diff ============================================================================== --- james/mime4j/trunk/src/main/java/org/apache/james/mime4j/ContentDescriptor.java (original) +++ james/mime4j/trunk/src/main/java/org/apache/james/mime4j/descriptor/ContentDescriptor.java Thu Aug 7 01:11:38 2008 @@ -17,7 +17,7 @@ * under the License. * ****************************************************************/ -package org.apache.james.mime4j; +package org.apache.james.mime4j.descriptor; import java.util.Map; Modified: james/mime4j/trunk/src/main/java/org/apache/james/mime4j/descriptor/DefaultBodyDescriptor.java URL: http://svn.apache.org/viewvc/james/mime4j/trunk/src/main/java/org/apache/james/mime4j/descriptor/DefaultBodyDescriptor.java?rev=683535&r1=683534&r2=683535&view=diff ============================================================================== --- james/mime4j/trunk/src/main/java/org/apache/james/mime4j/descriptor/DefaultBodyDescriptor.java (original) +++ james/mime4j/trunk/src/main/java/org/apache/james/mime4j/descriptor/DefaultBodyDescriptor.java Thu Aug 7 01:11:38 2008 @@ -23,8 +23,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.james.mime4j.BodyDescriptor; -import org.apache.james.mime4j.MutableBodyDescriptor; import org.apache.james.mime4j.util.MimeUtil; /** Modified: james/mime4j/trunk/src/main/java/org/apache/james/mime4j/descriptor/MaximalBodyDescriptor.java URL: http://svn.apache.org/viewvc/james/mime4j/trunk/src/main/java/org/apache/james/mime4j/descriptor/MaximalBodyDescriptor.java?rev=683535&r1=683534&r2=683535&view=diff ============================================================================== --- james/mime4j/trunk/src/main/java/org/apache/james/mime4j/descriptor/MaximalBodyDescriptor.java (original) +++ james/mime4j/trunk/src/main/java/org/apache/james/mime4j/descriptor/MaximalBodyDescriptor.java Thu Aug 7 01:11:38 2008 @@ -23,7 +23,6 @@ import java.util.List; import java.util.Map; -import org.apache.james.mime4j.BodyDescriptor; import org.apache.james.mime4j.MimeException; import org.apache.james.mime4j.field.datetime.DateTime; import org.apache.james.mime4j.field.datetime.parser.DateTimeParser; Copied: james/mime4j/trunk/src/main/java/org/apache/james/mime4j/descriptor/MutableBodyDescriptor.java (from r677844, james/mime4j/trunk/src/main/java/org/apache/james/mime4j/MutableBodyDescriptor.java) URL: http://svn.apache.org/viewvc/james/mime4j/trunk/src/main/java/org/apache/james/mime4j/descriptor/MutableBodyDescriptor.java?p2=james/mime4j/trunk/src/main/java/org/apache/james/mime4j/descriptor/MutableBodyDescriptor.java&p1=james/mime4j/trunk/src/main/java/org/apache/james/mime4j/MutableBodyDescriptor.java&r1=677844&r2=683535&rev=683535&view=diff ============================================================================== --- james/mime4j/trunk/src/main/java/org/apache/james/mime4j/MutableBodyDescriptor.java (original) +++ james/mime4j/trunk/src/main/java/org/apache/james/mime4j/descriptor/MutableBodyDescriptor.java Thu Aug 7 01:11:38 2008 @@ -18,7 +18,7 @@ ****************************************************************/ -package org.apache.james.mime4j; +package org.apache.james.mime4j.descriptor; /** * Adds mutator. Modified: james/mime4j/trunk/src/main/java/org/apache/james/mime4j/descriptor/RFC2045MimeDescriptor.java URL: http://svn.apache.org/viewvc/james/mime4j/trunk/src/main/java/org/apache/james/mime4j/descriptor/RFC2045MimeDescriptor.java?rev=683535&r1=683534&r2=683535&view=diff ============================================================================== --- james/mime4j/trunk/src/main/java/org/apache/james/mime4j/descriptor/RFC2045MimeDescriptor.java (original) +++ james/mime4j/trunk/src/main/java/org/apache/james/mime4j/descriptor/RFC2045MimeDescriptor.java Thu Aug 7 01:11:38 2008 @@ -18,7 +18,6 @@ */ package org.apache.james.mime4j.descriptor; -import org.apache.james.mime4j.ContentDescriptor; import org.apache.james.mime4j.MimeException; /** Modified: james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/Message.java URL: http://svn.apache.org/viewvc/james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/Message.java?rev=683535&r1=683534&r2=683535&view=diff ============================================================================== --- james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/Message.java (original) +++ james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/Message.java Thu Aug 7 01:11:38 2008 @@ -19,10 +19,10 @@ package org.apache.james.mime4j.message; -import org.apache.james.mime4j.BodyDescriptor; import org.apache.james.mime4j.MimeException; import org.apache.james.mime4j.decoder.Base64InputStream; import org.apache.james.mime4j.decoder.QuotedPrintableInputStream; +import org.apache.james.mime4j.descriptor.BodyDescriptor; import org.apache.james.mime4j.field.Field; import org.apache.james.mime4j.field.UnstructuredField; import org.apache.james.mime4j.parser.ContentHandler; @@ -149,7 +149,7 @@ } /** - * @see org.apache.james.mime4j.parser.ContentHandler#startMultipart(org.apache.james.mime4j.BodyDescriptor) + * @see org.apache.james.mime4j.parser.ContentHandler#startMultipart(org.apache.james.mime4j.descriptor.BodyDescriptor) */ public void startMultipart(final BodyDescriptor bd) { expect(Entity.class); @@ -162,7 +162,7 @@ } /** - * @see org.apache.james.mime4j.parser.ContentHandler#body(org.apache.james.mime4j.BodyDescriptor, java.io.InputStream) + * @see org.apache.james.mime4j.parser.ContentHandler#body(org.apache.james.mime4j.descriptor.BodyDescriptor, java.io.InputStream) */ public void body(BodyDescriptor bd, final InputStream is) throws IOException { expect(Entity.class); Modified: james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/SimpleContentHandler.java URL: http://svn.apache.org/viewvc/james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/SimpleContentHandler.java?rev=683535&r1=683534&r2=683535&view=diff ============================================================================== --- james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/SimpleContentHandler.java (original) +++ james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/SimpleContentHandler.java Thu Aug 7 01:11:38 2008 @@ -19,9 +19,9 @@ package org.apache.james.mime4j.message; -import org.apache.james.mime4j.BodyDescriptor; import org.apache.james.mime4j.decoder.Base64InputStream; import org.apache.james.mime4j.decoder.QuotedPrintableInputStream; +import org.apache.james.mime4j.descriptor.BodyDescriptor; import org.apache.james.mime4j.field.Field; import org.apache.james.mime4j.parser.AbstractContentHandler; import org.apache.james.mime4j.util.MimeUtil; @@ -86,7 +86,7 @@ } /** - * @see org.apache.james.mime4j.parser.AbstractContentHandler#body(org.apache.james.mime4j.BodyDescriptor, java.io.InputStream) + * @see org.apache.james.mime4j.parser.AbstractContentHandler#body(org.apache.james.mime4j.descriptor.BodyDescriptor, java.io.InputStream) */ public final void body(BodyDescriptor bd, InputStream is) throws IOException { if (MimeUtil.isBase64Encoding(bd.getTransferEncoding())) { Modified: james/mime4j/trunk/src/main/java/org/apache/james/mime4j/parser/AbstractContentHandler.java URL: http://svn.apache.org/viewvc/james/mime4j/trunk/src/main/java/org/apache/james/mime4j/parser/AbstractContentHandler.java?rev=683535&r1=683534&r2=683535&view=diff ============================================================================== --- james/mime4j/trunk/src/main/java/org/apache/james/mime4j/parser/AbstractContentHandler.java (original) +++ james/mime4j/trunk/src/main/java/org/apache/james/mime4j/parser/AbstractContentHandler.java Thu Aug 7 01:11:38 2008 @@ -19,8 +19,8 @@ package org.apache.james.mime4j.parser; -import org.apache.james.mime4j.BodyDescriptor; import org.apache.james.mime4j.MimeException; +import org.apache.james.mime4j.descriptor.BodyDescriptor; import java.io.IOException; import java.io.InputStream; @@ -43,13 +43,13 @@ } /** - * @see org.apache.james.mime4j.parser.ContentHandler#startMultipart(org.apache.james.mime4j.BodyDescriptor) + * @see org.apache.james.mime4j.parser.ContentHandler#startMultipart(org.apache.james.mime4j.descriptor.BodyDescriptor) */ public void startMultipart(BodyDescriptor bd) throws MimeException { } /** - * @see org.apache.james.mime4j.parser.ContentHandler#body(org.apache.james.mime4j.BodyDescriptor, java.io.InputStream) + * @see org.apache.james.mime4j.parser.ContentHandler#body(org.apache.james.mime4j.descriptor.BodyDescriptor, java.io.InputStream) */ public void body(BodyDescriptor bd, InputStream is) throws MimeException, IOException { Modified: james/mime4j/trunk/src/main/java/org/apache/james/mime4j/parser/AbstractEntity.java URL: http://svn.apache.org/viewvc/james/mime4j/trunk/src/main/java/org/apache/james/mime4j/parser/AbstractEntity.java?rev=683535&r1=683534&r2=683535&view=diff ============================================================================== --- james/mime4j/trunk/src/main/java/org/apache/james/mime4j/parser/AbstractEntity.java (original) +++ james/mime4j/trunk/src/main/java/org/apache/james/mime4j/parser/AbstractEntity.java Thu Aug 7 01:11:38 2008 @@ -24,11 +24,11 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.james.mime4j.BodyDescriptor; import org.apache.james.mime4j.MimeException; -import org.apache.james.mime4j.MutableBodyDescriptor; +import org.apache.james.mime4j.descriptor.BodyDescriptor; import org.apache.james.mime4j.descriptor.DefaultBodyDescriptor; import org.apache.james.mime4j.descriptor.MaximalBodyDescriptor; +import org.apache.james.mime4j.descriptor.MutableBodyDescriptor; import org.apache.james.mime4j.stream.LineReaderInputStream; import org.apache.james.mime4j.util.ByteArrayBuffer; import org.apache.james.mime4j.util.CharArrayBuffer; Modified: james/mime4j/trunk/src/main/java/org/apache/james/mime4j/parser/ContentHandler.java URL: http://svn.apache.org/viewvc/james/mime4j/trunk/src/main/java/org/apache/james/mime4j/parser/ContentHandler.java?rev=683535&r1=683534&r2=683535&view=diff ============================================================================== --- james/mime4j/trunk/src/main/java/org/apache/james/mime4j/parser/ContentHandler.java (original) +++ james/mime4j/trunk/src/main/java/org/apache/james/mime4j/parser/ContentHandler.java Thu Aug 7 01:11:38 2008 @@ -19,8 +19,8 @@ package org.apache.james.mime4j.parser; -import org.apache.james.mime4j.BodyDescriptor; import org.apache.james.mime4j.MimeException; +import org.apache.james.mime4j.descriptor.BodyDescriptor; import java.io.IOException; import java.io.InputStream; Modified: james/mime4j/trunk/src/main/java/org/apache/james/mime4j/parser/EntityStateMachine.java URL: http://svn.apache.org/viewvc/james/mime4j/trunk/src/main/java/org/apache/james/mime4j/parser/EntityStateMachine.java?rev=683535&r1=683534&r2=683535&view=diff ============================================================================== --- james/mime4j/trunk/src/main/java/org/apache/james/mime4j/parser/EntityStateMachine.java (original) +++ james/mime4j/trunk/src/main/java/org/apache/james/mime4j/parser/EntityStateMachine.java Thu Aug 7 01:11:38 2008 @@ -19,8 +19,8 @@ package org.apache.james.mime4j.parser; -import org.apache.james.mime4j.BodyDescriptor; import org.apache.james.mime4j.MimeException; +import org.apache.james.mime4j.descriptor.BodyDescriptor; import java.io.IOException; import java.io.InputStream; Modified: james/mime4j/trunk/src/main/java/org/apache/james/mime4j/parser/MimeEntity.java URL: http://svn.apache.org/viewvc/james/mime4j/trunk/src/main/java/org/apache/james/mime4j/parser/MimeEntity.java?rev=683535&r1=683534&r2=683535&view=diff ============================================================================== --- james/mime4j/trunk/src/main/java/org/apache/james/mime4j/parser/MimeEntity.java (original) +++ james/mime4j/trunk/src/main/java/org/apache/james/mime4j/parser/MimeEntity.java Thu Aug 7 01:11:38 2008 @@ -22,10 +22,10 @@ import java.io.IOException; import java.io.InputStream; -import org.apache.james.mime4j.BodyDescriptor; import org.apache.james.mime4j.MimeException; import org.apache.james.mime4j.decoder.Base64InputStream; import org.apache.james.mime4j.decoder.QuotedPrintableInputStream; +import org.apache.james.mime4j.descriptor.BodyDescriptor; import org.apache.james.mime4j.stream.BufferedLineReaderInputStream; import org.apache.james.mime4j.stream.LineReaderInputStream; import org.apache.james.mime4j.stream.LineReaderInputStreamAdaptor; Modified: james/mime4j/trunk/src/main/java/org/apache/james/mime4j/parser/MimeStreamParser.java URL: http://svn.apache.org/viewvc/james/mime4j/trunk/src/main/java/org/apache/james/mime4j/parser/MimeStreamParser.java?rev=683535&r1=683534&r2=683535&view=diff ============================================================================== --- james/mime4j/trunk/src/main/java/org/apache/james/mime4j/parser/MimeStreamParser.java (original) +++ james/mime4j/trunk/src/main/java/org/apache/james/mime4j/parser/MimeStreamParser.java Thu Aug 7 01:11:38 2008 @@ -19,8 +19,8 @@ package org.apache.james.mime4j.parser; -import org.apache.james.mime4j.BodyDescriptor; import org.apache.james.mime4j.MimeException; +import org.apache.james.mime4j.descriptor.BodyDescriptor; import java.io.IOException; import java.io.InputStream; Modified: james/mime4j/trunk/src/main/java/org/apache/james/mime4j/parser/MimeTokenStream.java URL: http://svn.apache.org/viewvc/james/mime4j/trunk/src/main/java/org/apache/james/mime4j/parser/MimeTokenStream.java?rev=683535&r1=683534&r2=683535&view=diff ============================================================================== --- james/mime4j/trunk/src/main/java/org/apache/james/mime4j/parser/MimeTokenStream.java (original) +++ james/mime4j/trunk/src/main/java/org/apache/james/mime4j/parser/MimeTokenStream.java Thu Aug 7 01:11:38 2008 @@ -28,10 +28,10 @@ import java.nio.charset.UnsupportedCharsetException; import java.util.LinkedList; -import org.apache.james.mime4j.BodyDescriptor; import org.apache.james.mime4j.MimeException; import org.apache.james.mime4j.decoder.Base64InputStream; import org.apache.james.mime4j.decoder.QuotedPrintableInputStream; +import org.apache.james.mime4j.descriptor.BodyDescriptor; import org.apache.james.mime4j.stream.BufferedLineReaderInputStream; import org.apache.james.mime4j.stream.RootInputStream; import org.apache.james.mime4j.util.MimeUtil; Modified: james/mime4j/trunk/src/main/java/org/apache/james/mime4j/parser/RawEntity.java URL: http://svn.apache.org/viewvc/james/mime4j/trunk/src/main/java/org/apache/james/mime4j/parser/RawEntity.java?rev=683535&r1=683534&r2=683535&view=diff ============================================================================== --- james/mime4j/trunk/src/main/java/org/apache/james/mime4j/parser/RawEntity.java (original) +++ james/mime4j/trunk/src/main/java/org/apache/james/mime4j/parser/RawEntity.java Thu Aug 7 01:11:38 2008 @@ -19,7 +19,7 @@ package org.apache.james.mime4j.parser; -import org.apache.james.mime4j.BodyDescriptor; +import org.apache.james.mime4j.descriptor.BodyDescriptor; import java.io.InputStream; Copied: james/mime4j/trunk/src/test/java/org/apache/james/mime4j/descriptor/BaseTestForBodyDescriptors.java (from r680968, james/mime4j/trunk/src/test/java/org/apache/james/mime4j/BaseTestForBodyDescriptors.java) URL: http://svn.apache.org/viewvc/james/mime4j/trunk/src/test/java/org/apache/james/mime4j/descriptor/BaseTestForBodyDescriptors.java?p2=james/mime4j/trunk/src/test/java/org/apache/james/mime4j/descriptor/BaseTestForBodyDescriptors.java&p1=james/mime4j/trunk/src/test/java/org/apache/james/mime4j/BaseTestForBodyDescriptors.java&r1=680968&r2=683535&rev=683535&view=diff ============================================================================== --- james/mime4j/trunk/src/test/java/org/apache/james/mime4j/BaseTestForBodyDescriptors.java (original) +++ james/mime4j/trunk/src/test/java/org/apache/james/mime4j/descriptor/BaseTestForBodyDescriptors.java Thu Aug 7 01:11:38 2008 @@ -17,7 +17,10 @@ * under the License. * ****************************************************************/ -package org.apache.james.mime4j; +package org.apache.james.mime4j.descriptor; + +import org.apache.james.mime4j.descriptor.BodyDescriptor; +import org.apache.james.mime4j.descriptor.MutableBodyDescriptor; import junit.framework.TestCase; Propchange: james/mime4j/trunk/src/test/java/org/apache/james/mime4j/descriptor/BaseTestForBodyDescriptors.java ------------------------------------------------------------------------------ svn:mergeinfo = Modified: james/mime4j/trunk/src/test/java/org/apache/james/mime4j/descriptor/DefaultBodyDescriptorTest.java URL: http://svn.apache.org/viewvc/james/mime4j/trunk/src/test/java/org/apache/james/mime4j/descriptor/DefaultBodyDescriptorTest.java?rev=683535&r1=683534&r2=683535&view=diff ============================================================================== --- james/mime4j/trunk/src/test/java/org/apache/james/mime4j/descriptor/DefaultBodyDescriptorTest.java (original) +++ james/mime4j/trunk/src/test/java/org/apache/james/mime4j/descriptor/DefaultBodyDescriptorTest.java Thu Aug 7 01:11:38 2008 @@ -18,9 +18,6 @@ */ package org.apache.james.mime4j.descriptor; -import org.apache.james.mime4j.BaseTestForBodyDescriptors; -import org.apache.james.mime4j.BodyDescriptor; -import org.apache.james.mime4j.MutableBodyDescriptor; import org.apache.james.mime4j.descriptor.DefaultBodyDescriptor; public class DefaultBodyDescriptorTest extends BaseTestForBodyDescriptors { Modified: james/mime4j/trunk/src/test/java/org/apache/james/mime4j/descriptor/MaximalBodyDescriptorTest.java URL: http://svn.apache.org/viewvc/james/mime4j/trunk/src/test/java/org/apache/james/mime4j/descriptor/MaximalBodyDescriptorTest.java?rev=683535&r1=683534&r2=683535&view=diff ============================================================================== --- james/mime4j/trunk/src/test/java/org/apache/james/mime4j/descriptor/MaximalBodyDescriptorTest.java (original) +++ james/mime4j/trunk/src/test/java/org/apache/james/mime4j/descriptor/MaximalBodyDescriptorTest.java Thu Aug 7 01:11:38 2008 @@ -20,10 +20,7 @@ import java.io.ByteArrayInputStream; -import org.apache.james.mime4j.BaseTestForBodyDescriptors; -import org.apache.james.mime4j.BodyDescriptor; import org.apache.james.mime4j.ExampleMail; -import org.apache.james.mime4j.MutableBodyDescriptor; import org.apache.james.mime4j.descriptor.MaximalBodyDescriptor; import org.apache.james.mime4j.descriptor.RFC1864ContentMD5Descriptor; import org.apache.james.mime4j.descriptor.RFC2183ContentDispositionDescriptor; Modified: james/mime4j/trunk/src/test/java/org/apache/james/mime4j/parser/MimeStreamParserTest.java URL: http://svn.apache.org/viewvc/james/mime4j/trunk/src/test/java/org/apache/james/mime4j/parser/MimeStreamParserTest.java?rev=683535&r1=683534&r2=683535&view=diff ============================================================================== --- james/mime4j/trunk/src/test/java/org/apache/james/mime4j/parser/MimeStreamParserTest.java (original) +++ james/mime4j/trunk/src/test/java/org/apache/james/mime4j/parser/MimeStreamParserTest.java Thu Aug 7 01:11:38 2008 @@ -19,7 +19,7 @@ package org.apache.james.mime4j.parser; -import org.apache.james.mime4j.BodyDescriptor; +import org.apache.james.mime4j.descriptor.BodyDescriptor; import org.apache.james.mime4j.parser.AbstractContentHandler; import org.apache.james.mime4j.parser.MimeStreamParser; import org.apache.log4j.BasicConfigurator; Modified: james/mime4j/trunk/src/test/java/org/apache/james/mime4j/parser/MimeTokenStreamBodyDescriptorTest.java URL: http://svn.apache.org/viewvc/james/mime4j/trunk/src/test/java/org/apache/james/mime4j/parser/MimeTokenStreamBodyDescriptorTest.java?rev=683535&r1=683534&r2=683535&view=diff ============================================================================== --- james/mime4j/trunk/src/test/java/org/apache/james/mime4j/parser/MimeTokenStreamBodyDescriptorTest.java (original) +++ james/mime4j/trunk/src/test/java/org/apache/james/mime4j/parser/MimeTokenStreamBodyDescriptorTest.java Thu Aug 7 01:11:38 2008 @@ -18,8 +18,8 @@ */ package org.apache.james.mime4j.parser; -import org.apache.james.mime4j.BodyDescriptor; import org.apache.james.mime4j.ExampleMail; +import org.apache.james.mime4j.descriptor.BodyDescriptor; import org.apache.james.mime4j.parser.MimeTokenStream; import java.io.ByteArrayInputStream; Modified: james/mime4j/trunk/src/test/java/org/apache/james/mime4j/parser/TestHandler.java URL: http://svn.apache.org/viewvc/james/mime4j/trunk/src/test/java/org/apache/james/mime4j/parser/TestHandler.java?rev=683535&r1=683534&r2=683535&view=diff ============================================================================== --- james/mime4j/trunk/src/test/java/org/apache/james/mime4j/parser/TestHandler.java (original) +++ james/mime4j/trunk/src/test/java/org/apache/james/mime4j/parser/TestHandler.java Thu Aug 7 01:11:38 2008 @@ -19,7 +19,7 @@ package org.apache.james.mime4j.parser; -import org.apache.james.mime4j.BodyDescriptor; +import org.apache.james.mime4j.descriptor.BodyDescriptor; import org.apache.james.mime4j.parser.ContentHandler; import java.io.IOException; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]