james-server-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From b...@apache.org
Subject svn commit: r682372 [1/2] - in /james/mime4j/trunk/src: main/java/org/apache/james/mime4j/ main/java/org/apache/james/mime4j/decoder/ main/java/org/apache/james/mime4j/descriptor/ main/java/org/apache/james/mime4j/message/ main/java/org/apache/james/mi...
Date Mon, 04 Aug 2008 12:58:03 GMT
Author: bago
Date: Mon Aug  4 05:57:59 2008
New Revision: 682372

URL: http://svn.apache.org/viewvc?rev=682372&view=rev
Log:
Remove cyclic dependencies and provide better organization of the source tree (MIME4J-51)

Added:
    james/mime4j/trunk/src/main/java/org/apache/james/mime4j/decoder/Base64OutputStream.java   (contents, props changed)
      - copied, changed from r680972, james/mime4j/trunk/src/main/java/org/apache/james/mime4j/util/Base64OutputStream.java
    james/mime4j/trunk/src/main/java/org/apache/james/mime4j/decoder/CodecUtil.java   (contents, props changed)
      - copied, changed from r680972, james/mime4j/trunk/src/main/java/org/apache/james/mime4j/util/CodecUtil.java
    james/mime4j/trunk/src/main/java/org/apache/james/mime4j/decoder/LineBreakingOutputStream.java   (contents, props changed)
      - copied, changed from r680972, james/mime4j/trunk/src/main/java/org/apache/james/mime4j/util/LineBreakingOutputStream.java
    james/mime4j/trunk/src/main/java/org/apache/james/mime4j/descriptor/
    james/mime4j/trunk/src/main/java/org/apache/james/mime4j/descriptor/DefaultBodyDescriptor.java   (contents, props changed)
      - copied, changed from r677844, james/mime4j/trunk/src/main/java/org/apache/james/mime4j/DefaultBodyDescriptor.java
    james/mime4j/trunk/src/main/java/org/apache/james/mime4j/descriptor/MaximalBodyDescriptor.java
      - copied, changed from r677844, james/mime4j/trunk/src/main/java/org/apache/james/mime4j/MaximalBodyDescriptor.java
    james/mime4j/trunk/src/main/java/org/apache/james/mime4j/descriptor/RFC1864ContentMD5Descriptor.java
      - copied, changed from r677844, james/mime4j/trunk/src/main/java/org/apache/james/mime4j/RFC1864ContentMD5Descriptor.java
    james/mime4j/trunk/src/main/java/org/apache/james/mime4j/descriptor/RFC2045MimeDescriptor.java
      - copied, changed from r677844, james/mime4j/trunk/src/main/java/org/apache/james/mime4j/RFC2045MimeDescriptor.java
    james/mime4j/trunk/src/main/java/org/apache/james/mime4j/descriptor/RFC2183ContentDispositionDescriptor.java
      - copied, changed from r677844, james/mime4j/trunk/src/main/java/org/apache/james/mime4j/RFC2183ContentDispositionDescriptor.java
    james/mime4j/trunk/src/main/java/org/apache/james/mime4j/descriptor/RFC2557ContentLocationDescriptor.java
      - copied, changed from r677844, james/mime4j/trunk/src/main/java/org/apache/james/mime4j/RFC2557ContentLocationDescriptor.java
    james/mime4j/trunk/src/main/java/org/apache/james/mime4j/descriptor/RFC3066ContentLanguageDescriptor.java
      - copied, changed from r677844, james/mime4j/trunk/src/main/java/org/apache/james/mime4j/RFC3066ContentLanguageDescriptor.java
    james/mime4j/trunk/src/main/java/org/apache/james/mime4j/parser/
    james/mime4j/trunk/src/main/java/org/apache/james/mime4j/parser/AbstractContentHandler.java
      - copied, changed from r677844, james/mime4j/trunk/src/main/java/org/apache/james/mime4j/AbstractContentHandler.java
    james/mime4j/trunk/src/main/java/org/apache/james/mime4j/parser/AbstractEntity.java
      - copied, changed from r678436, james/mime4j/trunk/src/main/java/org/apache/james/mime4j/AbstractEntity.java
    james/mime4j/trunk/src/main/java/org/apache/james/mime4j/parser/ContentHandler.java
      - copied, changed from r677844, james/mime4j/trunk/src/main/java/org/apache/james/mime4j/ContentHandler.java
    james/mime4j/trunk/src/main/java/org/apache/james/mime4j/parser/EntityStateMachine.java
      - copied, changed from r677844, james/mime4j/trunk/src/main/java/org/apache/james/mime4j/EntityStateMachine.java
    james/mime4j/trunk/src/main/java/org/apache/james/mime4j/parser/EntityStates.java
      - copied, changed from r677844, james/mime4j/trunk/src/main/java/org/apache/james/mime4j/EntityStates.java
    james/mime4j/trunk/src/main/java/org/apache/james/mime4j/parser/Event.java
      - copied, changed from r677844, james/mime4j/trunk/src/main/java/org/apache/james/mime4j/Event.java
    james/mime4j/trunk/src/main/java/org/apache/james/mime4j/parser/MimeEntity.java
      - copied, changed from r678671, james/mime4j/trunk/src/main/java/org/apache/james/mime4j/MimeEntity.java
    james/mime4j/trunk/src/main/java/org/apache/james/mime4j/parser/MimeParseEventException.java
      - copied, changed from r677844, james/mime4j/trunk/src/main/java/org/apache/james/mime4j/MimeParseEventException.java
    james/mime4j/trunk/src/main/java/org/apache/james/mime4j/parser/MimeStreamParser.java
      - copied, changed from r677844, james/mime4j/trunk/src/main/java/org/apache/james/mime4j/MimeStreamParser.java
    james/mime4j/trunk/src/main/java/org/apache/james/mime4j/parser/MimeTokenStream.java
      - copied, changed from r677924, james/mime4j/trunk/src/main/java/org/apache/james/mime4j/MimeTokenStream.java
    james/mime4j/trunk/src/main/java/org/apache/james/mime4j/parser/RawEntity.java
      - copied, changed from r677844, james/mime4j/trunk/src/main/java/org/apache/james/mime4j/RawEntity.java
    james/mime4j/trunk/src/main/java/org/apache/james/mime4j/parser/RecursionMode.java
      - copied, changed from r677844, james/mime4j/trunk/src/main/java/org/apache/james/mime4j/RecursionMode.java
    james/mime4j/trunk/src/main/java/org/apache/james/mime4j/stream/
    james/mime4j/trunk/src/main/java/org/apache/james/mime4j/stream/BufferedLineReaderInputStream.java
      - copied, changed from r678517, james/mime4j/trunk/src/main/java/org/apache/james/mime4j/BufferedLineReaderInputStream.java
    james/mime4j/trunk/src/main/java/org/apache/james/mime4j/stream/CloseShieldInputStream.java
      - copied, changed from r677844, james/mime4j/trunk/src/main/java/org/apache/james/mime4j/CloseShieldInputStream.java
    james/mime4j/trunk/src/main/java/org/apache/james/mime4j/stream/EOLConvertingInputStream.java
      - copied, changed from r677844, james/mime4j/trunk/src/main/java/org/apache/james/mime4j/EOLConvertingInputStream.java
    james/mime4j/trunk/src/main/java/org/apache/james/mime4j/stream/LineReaderInputStream.java
      - copied, changed from r677844, james/mime4j/trunk/src/main/java/org/apache/james/mime4j/LineReaderInputStream.java
    james/mime4j/trunk/src/main/java/org/apache/james/mime4j/stream/LineReaderInputStreamAdaptor.java
      - copied, changed from r680968, james/mime4j/trunk/src/main/java/org/apache/james/mime4j/LineReaderInputStreamAdaptor.java
    james/mime4j/trunk/src/main/java/org/apache/james/mime4j/stream/MimeBoundaryInputStream.java
      - copied, changed from r680973, james/mime4j/trunk/src/main/java/org/apache/james/mime4j/MimeBoundaryInputStream.java
    james/mime4j/trunk/src/main/java/org/apache/james/mime4j/stream/PartialInputStream.java
      - copied, changed from r677844, james/mime4j/trunk/src/main/java/org/apache/james/mime4j/util/PartialInputStream.java
    james/mime4j/trunk/src/main/java/org/apache/james/mime4j/stream/PositionInputStream.java
      - copied, changed from r677844, james/mime4j/trunk/src/main/java/org/apache/james/mime4j/util/PositionInputStream.java
    james/mime4j/trunk/src/main/java/org/apache/james/mime4j/stream/RootInputStream.java
      - copied, changed from r678282, james/mime4j/trunk/src/main/java/org/apache/james/mime4j/RootInputStream.java
    james/mime4j/trunk/src/main/java/org/apache/james/mime4j/util/ByteArrayBuffer.java
      - copied, changed from r677844, james/mime4j/trunk/src/main/java/org/apache/james/mime4j/ByteArrayBuffer.java
    james/mime4j/trunk/src/main/java/org/apache/james/mime4j/util/CharArrayBuffer.java
      - copied, changed from r677844, james/mime4j/trunk/src/main/java/org/apache/james/mime4j/CharArrayBuffer.java
    james/mime4j/trunk/src/test/java/org/apache/james/mime4j/decoder/Base64OutputStreamTest.java   (contents, props changed)
      - copied, changed from r680972, james/mime4j/trunk/src/test/java/org/apache/james/mime4j/util/Base64OutputStreamTest.java
    james/mime4j/trunk/src/test/java/org/apache/james/mime4j/decoder/CodecUtilTest.java
      - copied, changed from r680972, james/mime4j/trunk/src/test/java/org/apache/james/mime4j/util/CodecUtilTest.java
    james/mime4j/trunk/src/test/java/org/apache/james/mime4j/decoder/LineBreakingOutputStreamTest.java   (contents, props changed)
      - copied, changed from r680984, james/mime4j/trunk/src/test/java/org/apache/james/mime4j/util/LineBreakingOutputStreamTest.java
    james/mime4j/trunk/src/test/java/org/apache/james/mime4j/decoder/QuotedPrintableEncodeTest.java
      - copied, changed from r680968, james/mime4j/trunk/src/test/java/org/apache/james/mime4j/util/QuotedPrintableEncodeTest.java
    james/mime4j/trunk/src/test/java/org/apache/james/mime4j/decoder/QuotedPrintableTextEncodeTest.java
      - copied, changed from r680968, james/mime4j/trunk/src/test/java/org/apache/james/mime4j/util/QuotedPrintableTextEncodeTest.java
    james/mime4j/trunk/src/test/java/org/apache/james/mime4j/descriptor/
    james/mime4j/trunk/src/test/java/org/apache/james/mime4j/descriptor/DefaultBodyDescriptorTest.java
      - copied, changed from r680968, james/mime4j/trunk/src/test/java/org/apache/james/mime4j/DefaultBodyDescriptorTest.java
    james/mime4j/trunk/src/test/java/org/apache/james/mime4j/descriptor/MaximalBodyDescriptorTest.java
      - copied, changed from r680968, james/mime4j/trunk/src/test/java/org/apache/james/mime4j/MaximalBodyDescriptorTest.java
    james/mime4j/trunk/src/test/java/org/apache/james/mime4j/parser/
    james/mime4j/trunk/src/test/java/org/apache/james/mime4j/parser/MimeEntityTest.java
      - copied, changed from r680968, james/mime4j/trunk/src/test/java/org/apache/james/mime4j/MimeEntityTest.java
    james/mime4j/trunk/src/test/java/org/apache/james/mime4j/parser/MimeStreamParserExampleMessagesTest.java   (contents, props changed)
      - copied, changed from r680968, james/mime4j/trunk/src/test/java/org/apache/james/mime4j/MimeStreamParserExampleMessagesTest.java
    james/mime4j/trunk/src/test/java/org/apache/james/mime4j/parser/MimeStreamParserTest.java
      - copied, changed from r680968, james/mime4j/trunk/src/test/java/org/apache/james/mime4j/MimeStreamParserTest.java
    james/mime4j/trunk/src/test/java/org/apache/james/mime4j/parser/MimeStreamTokenMessageRfc822Test.java
      - copied, changed from r680968, james/mime4j/trunk/src/test/java/org/apache/james/mime4j/MimeStreamTokenMessageRfc822Test.java
    james/mime4j/trunk/src/test/java/org/apache/james/mime4j/parser/MimeTokenEmbeddedMessageTest.java
      - copied, changed from r680968, james/mime4j/trunk/src/test/java/org/apache/james/mime4j/MimeTokenEmbeddedMessageTest.java
    james/mime4j/trunk/src/test/java/org/apache/james/mime4j/parser/MimeTokenNoRecurseTest.java
      - copied, changed from r680968, james/mime4j/trunk/src/test/java/org/apache/james/mime4j/MimeTokenNoRecurseTest.java
    james/mime4j/trunk/src/test/java/org/apache/james/mime4j/parser/MimeTokenStreamBodyDescriptorTest.java
      - copied, changed from r680968, james/mime4j/trunk/src/test/java/org/apache/james/mime4j/MimeTokenStreamBodyDescriptorTest.java
    james/mime4j/trunk/src/test/java/org/apache/james/mime4j/parser/MimeTokenStreamReaderTest.java
      - copied, changed from r680968, james/mime4j/trunk/src/test/java/org/apache/james/mime4j/MimeTokenStreamReaderTest.java
    james/mime4j/trunk/src/test/java/org/apache/james/mime4j/parser/MimeTokenStreamTest.java
      - copied, changed from r680968, james/mime4j/trunk/src/test/java/org/apache/james/mime4j/MimeTokenStreamTest.java
    james/mime4j/trunk/src/test/java/org/apache/james/mime4j/parser/MultipartStreamTest.java
      - copied, changed from r680968, james/mime4j/trunk/src/test/java/org/apache/james/mime4j/MultipartStreamTest.java
    james/mime4j/trunk/src/test/java/org/apache/james/mime4j/parser/MultipartTokensTest.java
      - copied, changed from r680968, james/mime4j/trunk/src/test/java/org/apache/james/mime4j/MultipartTokensTest.java
    james/mime4j/trunk/src/test/java/org/apache/james/mime4j/parser/StrictMimeTokenStreamTest.java
      - copied, changed from r680968, james/mime4j/trunk/src/test/java/org/apache/james/mime4j/StrictMimeTokenStreamTest.java
    james/mime4j/trunk/src/test/java/org/apache/james/mime4j/parser/TestHandler.java   (contents, props changed)
      - copied, changed from r680968, james/mime4j/trunk/src/test/java/org/apache/james/mime4j/TestHandler.java
    james/mime4j/trunk/src/test/java/org/apache/james/mime4j/stream/
    james/mime4j/trunk/src/test/java/org/apache/james/mime4j/stream/BufferedLineReaderInputStreamBufferTest.java   (contents, props changed)
      - copied, changed from r680968, james/mime4j/trunk/src/test/java/org/apache/james/mime4j/BufferedLineReaderInputStreamBufferTest.java
    james/mime4j/trunk/src/test/java/org/apache/james/mime4j/stream/BufferedLineReaderInputStreamTest.java
      - copied, changed from r680968, james/mime4j/trunk/src/test/java/org/apache/james/mime4j/BufferedLineReaderInputStreamTest.java
    james/mime4j/trunk/src/test/java/org/apache/james/mime4j/stream/EOLConvertingInputStreamTest.java
      - copied, changed from r680968, james/mime4j/trunk/src/test/java/org/apache/james/mime4j/EOLConvertingInputStreamTest.java
    james/mime4j/trunk/src/test/java/org/apache/james/mime4j/stream/LineReaderInputStreamAdaptorTest.java
      - copied, changed from r680968, james/mime4j/trunk/src/test/java/org/apache/james/mime4j/LineReaderInputStreamAdaptorTest.java
    james/mime4j/trunk/src/test/java/org/apache/james/mime4j/stream/MimeBoundaryInputStreamTest.java
      - copied, changed from r680968, james/mime4j/trunk/src/test/java/org/apache/james/mime4j/MimeBoundaryInputStreamTest.java
    james/mime4j/trunk/src/test/java/org/apache/james/mime4j/stream/RootInputStreamTest.java
      - copied, changed from r680968, james/mime4j/trunk/src/test/java/org/apache/james/mime4j/RootInputStreamTest.java
    james/mime4j/trunk/src/test/java/org/apache/james/mime4j/util/TestByteArrayBuffer.java
      - copied, changed from r680968, james/mime4j/trunk/src/test/java/org/apache/james/mime4j/TestByteArrayBuffer.java
    james/mime4j/trunk/src/test/java/org/apache/james/mime4j/util/TestCharArrayBuffer.java
      - copied, changed from r680968, james/mime4j/trunk/src/test/java/org/apache/james/mime4j/TestCharArrayBuffer.java
Removed:
    james/mime4j/trunk/src/main/java/org/apache/james/mime4j/AbstractContentHandler.java
    james/mime4j/trunk/src/main/java/org/apache/james/mime4j/AbstractEntity.java
    james/mime4j/trunk/src/main/java/org/apache/james/mime4j/BufferedLineReaderInputStream.java
    james/mime4j/trunk/src/main/java/org/apache/james/mime4j/ByteArrayBuffer.java
    james/mime4j/trunk/src/main/java/org/apache/james/mime4j/CharArrayBuffer.java
    james/mime4j/trunk/src/main/java/org/apache/james/mime4j/CloseShieldInputStream.java
    james/mime4j/trunk/src/main/java/org/apache/james/mime4j/ContentHandler.java
    james/mime4j/trunk/src/main/java/org/apache/james/mime4j/DefaultBodyDescriptor.java
    james/mime4j/trunk/src/main/java/org/apache/james/mime4j/EOLConvertingInputStream.java
    james/mime4j/trunk/src/main/java/org/apache/james/mime4j/EntityStateMachine.java
    james/mime4j/trunk/src/main/java/org/apache/james/mime4j/EntityStates.java
    james/mime4j/trunk/src/main/java/org/apache/james/mime4j/Event.java
    james/mime4j/trunk/src/main/java/org/apache/james/mime4j/LineReaderInputStream.java
    james/mime4j/trunk/src/main/java/org/apache/james/mime4j/LineReaderInputStreamAdaptor.java
    james/mime4j/trunk/src/main/java/org/apache/james/mime4j/MaximalBodyDescriptor.java
    james/mime4j/trunk/src/main/java/org/apache/james/mime4j/MimeBoundaryInputStream.java
    james/mime4j/trunk/src/main/java/org/apache/james/mime4j/MimeEntity.java
    james/mime4j/trunk/src/main/java/org/apache/james/mime4j/MimeParseEventException.java
    james/mime4j/trunk/src/main/java/org/apache/james/mime4j/MimeStreamParser.java
    james/mime4j/trunk/src/main/java/org/apache/james/mime4j/MimeTokenStream.java
    james/mime4j/trunk/src/main/java/org/apache/james/mime4j/RFC1864ContentMD5Descriptor.java
    james/mime4j/trunk/src/main/java/org/apache/james/mime4j/RFC2045MimeDescriptor.java
    james/mime4j/trunk/src/main/java/org/apache/james/mime4j/RFC2183ContentDispositionDescriptor.java
    james/mime4j/trunk/src/main/java/org/apache/james/mime4j/RFC2557ContentLocationDescriptor.java
    james/mime4j/trunk/src/main/java/org/apache/james/mime4j/RFC3066ContentLanguageDescriptor.java
    james/mime4j/trunk/src/main/java/org/apache/james/mime4j/RawEntity.java
    james/mime4j/trunk/src/main/java/org/apache/james/mime4j/RecursionMode.java
    james/mime4j/trunk/src/main/java/org/apache/james/mime4j/RootInputStream.java
    james/mime4j/trunk/src/main/java/org/apache/james/mime4j/util/Base64OutputStream.java
    james/mime4j/trunk/src/main/java/org/apache/james/mime4j/util/CodecUtil.java
    james/mime4j/trunk/src/main/java/org/apache/james/mime4j/util/LineBreakingOutputStream.java
    james/mime4j/trunk/src/main/java/org/apache/james/mime4j/util/PartialInputStream.java
    james/mime4j/trunk/src/main/java/org/apache/james/mime4j/util/PositionInputStream.java
    james/mime4j/trunk/src/test/java/org/apache/james/mime4j/BufferedLineReaderInputStreamBufferTest.java
    james/mime4j/trunk/src/test/java/org/apache/james/mime4j/BufferedLineReaderInputStreamTest.java
    james/mime4j/trunk/src/test/java/org/apache/james/mime4j/DefaultBodyDescriptorTest.java
    james/mime4j/trunk/src/test/java/org/apache/james/mime4j/EOLConvertingInputStreamTest.java
    james/mime4j/trunk/src/test/java/org/apache/james/mime4j/LineReaderInputStreamAdaptorTest.java
    james/mime4j/trunk/src/test/java/org/apache/james/mime4j/MaximalBodyDescriptorTest.java
    james/mime4j/trunk/src/test/java/org/apache/james/mime4j/MimeBoundaryInputStreamTest.java
    james/mime4j/trunk/src/test/java/org/apache/james/mime4j/MimeEntityTest.java
    james/mime4j/trunk/src/test/java/org/apache/james/mime4j/MimeStreamParserExampleMessagesTest.java
    james/mime4j/trunk/src/test/java/org/apache/james/mime4j/MimeStreamParserTest.java
    james/mime4j/trunk/src/test/java/org/apache/james/mime4j/MimeStreamTokenMessageRfc822Test.java
    james/mime4j/trunk/src/test/java/org/apache/james/mime4j/MimeTokenEmbeddedMessageTest.java
    james/mime4j/trunk/src/test/java/org/apache/james/mime4j/MimeTokenNoRecurseTest.java
    james/mime4j/trunk/src/test/java/org/apache/james/mime4j/MimeTokenStreamBodyDescriptorTest.java
    james/mime4j/trunk/src/test/java/org/apache/james/mime4j/MimeTokenStreamReaderTest.java
    james/mime4j/trunk/src/test/java/org/apache/james/mime4j/MimeTokenStreamTest.java
    james/mime4j/trunk/src/test/java/org/apache/james/mime4j/MultipartStreamTest.java
    james/mime4j/trunk/src/test/java/org/apache/james/mime4j/MultipartTokensTest.java
    james/mime4j/trunk/src/test/java/org/apache/james/mime4j/RootInputStreamTest.java
    james/mime4j/trunk/src/test/java/org/apache/james/mime4j/StrictMimeTokenStreamTest.java
    james/mime4j/trunk/src/test/java/org/apache/james/mime4j/TestByteArrayBuffer.java
    james/mime4j/trunk/src/test/java/org/apache/james/mime4j/TestCharArrayBuffer.java
    james/mime4j/trunk/src/test/java/org/apache/james/mime4j/TestHandler.java
    james/mime4j/trunk/src/test/java/org/apache/james/mime4j/util/Base64OutputStreamTest.java
    james/mime4j/trunk/src/test/java/org/apache/james/mime4j/util/CodecUtilTest.java
    james/mime4j/trunk/src/test/java/org/apache/james/mime4j/util/LineBreakingOutputStreamTest.java
    james/mime4j/trunk/src/test/java/org/apache/james/mime4j/util/QuotedPrintableEncodeTest.java
    james/mime4j/trunk/src/test/java/org/apache/james/mime4j/util/QuotedPrintableTextEncodeTest.java
Modified:
    james/mime4j/trunk/src/main/java/org/apache/james/mime4j/decoder/DecoderUtil.java
    james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/Entity.java
    james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/Header.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/message/TempFileBinaryBody.java
    james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/TempFileTextBody.java
    james/mime4j/trunk/src/main/java/org/apache/james/mime4j/util/MimeUtil.java
    james/mime4j/trunk/src/test/java/org/apache/james/mime4j/message/ExampleMessagesRoundtripTest.java

Copied: james/mime4j/trunk/src/main/java/org/apache/james/mime4j/decoder/Base64OutputStream.java (from r680972, james/mime4j/trunk/src/main/java/org/apache/james/mime4j/util/Base64OutputStream.java)
URL: http://svn.apache.org/viewvc/james/mime4j/trunk/src/main/java/org/apache/james/mime4j/decoder/Base64OutputStream.java?p2=james/mime4j/trunk/src/main/java/org/apache/james/mime4j/decoder/Base64OutputStream.java&p1=james/mime4j/trunk/src/main/java/org/apache/james/mime4j/util/Base64OutputStream.java&r1=680972&r2=682372&rev=682372&view=diff
==============================================================================
--- james/mime4j/trunk/src/main/java/org/apache/james/mime4j/util/Base64OutputStream.java (original)
+++ james/mime4j/trunk/src/main/java/org/apache/james/mime4j/decoder/Base64OutputStream.java Mon Aug  4 05:57:59 2008
@@ -17,7 +17,7 @@
  * under the License.                                           *
  ****************************************************************/
 
-package org.apache.james.mime4j.util;
+package org.apache.james.mime4j.decoder;
 
 import java.io.OutputStream;
 import java.io.Writer;

Propchange: james/mime4j/trunk/src/main/java/org/apache/james/mime4j/decoder/Base64OutputStream.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: james/mime4j/trunk/src/main/java/org/apache/james/mime4j/decoder/Base64OutputStream.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: james/mime4j/trunk/src/main/java/org/apache/james/mime4j/decoder/CodecUtil.java (from r680972, james/mime4j/trunk/src/main/java/org/apache/james/mime4j/util/CodecUtil.java)
URL: http://svn.apache.org/viewvc/james/mime4j/trunk/src/main/java/org/apache/james/mime4j/decoder/CodecUtil.java?p2=james/mime4j/trunk/src/main/java/org/apache/james/mime4j/decoder/CodecUtil.java&p1=james/mime4j/trunk/src/main/java/org/apache/james/mime4j/util/CodecUtil.java&r1=680972&r2=682372&rev=682372&view=diff
==============================================================================
--- james/mime4j/trunk/src/main/java/org/apache/james/mime4j/util/CodecUtil.java (original)
+++ james/mime4j/trunk/src/main/java/org/apache/james/mime4j/decoder/CodecUtil.java Mon Aug  4 05:57:59 2008
@@ -17,7 +17,8 @@
  * under the License.                                           *
  ****************************************************************/
 
-package org.apache.james.mime4j.util;
+package org.apache.james.mime4j.decoder;
+
 
 import java.io.FilterOutputStream;
 import java.io.IOException;

Propchange: james/mime4j/trunk/src/main/java/org/apache/james/mime4j/decoder/CodecUtil.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Modified: james/mime4j/trunk/src/main/java/org/apache/james/mime4j/decoder/DecoderUtil.java
URL: http://svn.apache.org/viewvc/james/mime4j/trunk/src/main/java/org/apache/james/mime4j/decoder/DecoderUtil.java?rev=682372&r1=682371&r2=682372&view=diff
==============================================================================
--- james/mime4j/trunk/src/main/java/org/apache/james/mime4j/decoder/DecoderUtil.java (original)
+++ james/mime4j/trunk/src/main/java/org/apache/james/mime4j/decoder/DecoderUtil.java Mon Aug  4 05:57:59 2008
@@ -26,7 +26,7 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.james.mime4j.CharArrayBuffer;
+import org.apache.james.mime4j.util.CharArrayBuffer;
 import org.apache.james.mime4j.util.CharsetUtil;
 
 /**

Copied: james/mime4j/trunk/src/main/java/org/apache/james/mime4j/decoder/LineBreakingOutputStream.java (from r680972, james/mime4j/trunk/src/main/java/org/apache/james/mime4j/util/LineBreakingOutputStream.java)
URL: http://svn.apache.org/viewvc/james/mime4j/trunk/src/main/java/org/apache/james/mime4j/decoder/LineBreakingOutputStream.java?p2=james/mime4j/trunk/src/main/java/org/apache/james/mime4j/decoder/LineBreakingOutputStream.java&p1=james/mime4j/trunk/src/main/java/org/apache/james/mime4j/util/LineBreakingOutputStream.java&r1=680972&r2=682372&rev=682372&view=diff
==============================================================================
--- james/mime4j/trunk/src/main/java/org/apache/james/mime4j/util/LineBreakingOutputStream.java (original)
+++ james/mime4j/trunk/src/main/java/org/apache/james/mime4j/decoder/LineBreakingOutputStream.java Mon Aug  4 05:57:59 2008
@@ -17,7 +17,8 @@
  * under the License.                                           *
  ****************************************************************/
 
-package org.apache.james.mime4j.util;
+package org.apache.james.mime4j.decoder;
+
 
 import java.io.FilterOutputStream;
 import java.io.IOException;

Propchange: james/mime4j/trunk/src/main/java/org/apache/james/mime4j/decoder/LineBreakingOutputStream.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: james/mime4j/trunk/src/main/java/org/apache/james/mime4j/decoder/LineBreakingOutputStream.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: james/mime4j/trunk/src/main/java/org/apache/james/mime4j/descriptor/DefaultBodyDescriptor.java (from r677844, james/mime4j/trunk/src/main/java/org/apache/james/mime4j/DefaultBodyDescriptor.java)
URL: http://svn.apache.org/viewvc/james/mime4j/trunk/src/main/java/org/apache/james/mime4j/descriptor/DefaultBodyDescriptor.java?p2=james/mime4j/trunk/src/main/java/org/apache/james/mime4j/descriptor/DefaultBodyDescriptor.java&p1=james/mime4j/trunk/src/main/java/org/apache/james/mime4j/DefaultBodyDescriptor.java&r1=677844&r2=682372&rev=682372&view=diff
==============================================================================
--- james/mime4j/trunk/src/main/java/org/apache/james/mime4j/DefaultBodyDescriptor.java (original)
+++ james/mime4j/trunk/src/main/java/org/apache/james/mime4j/descriptor/DefaultBodyDescriptor.java Mon Aug  4 05:57:59 2008
@@ -16,13 +16,15 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.james.mime4j;
+package org.apache.james.mime4j.descriptor;
 
 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.BodyDescriptor;
+import org.apache.james.mime4j.MutableBodyDescriptor;
 import org.apache.james.mime4j.util.MimeUtil;
 
 /**

Propchange: james/mime4j/trunk/src/main/java/org/apache/james/mime4j/descriptor/DefaultBodyDescriptor.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: james/mime4j/trunk/src/main/java/org/apache/james/mime4j/descriptor/MaximalBodyDescriptor.java (from r677844, james/mime4j/trunk/src/main/java/org/apache/james/mime4j/MaximalBodyDescriptor.java)
URL: http://svn.apache.org/viewvc/james/mime4j/trunk/src/main/java/org/apache/james/mime4j/descriptor/MaximalBodyDescriptor.java?p2=james/mime4j/trunk/src/main/java/org/apache/james/mime4j/descriptor/MaximalBodyDescriptor.java&p1=james/mime4j/trunk/src/main/java/org/apache/james/mime4j/MaximalBodyDescriptor.java&r1=677844&r2=682372&rev=682372&view=diff
==============================================================================
--- james/mime4j/trunk/src/main/java/org/apache/james/mime4j/MaximalBodyDescriptor.java (original)
+++ james/mime4j/trunk/src/main/java/org/apache/james/mime4j/descriptor/MaximalBodyDescriptor.java Mon Aug  4 05:57:59 2008
@@ -16,13 +16,15 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.james.mime4j;
+package org.apache.james.mime4j.descriptor;
 
 import java.io.StringReader;
 import java.util.Collections;
 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;
 import org.apache.james.mime4j.field.datetime.parser.ParseException;
@@ -73,7 +75,7 @@
         this(null);
     }
 
-    protected MaximalBodyDescriptor(BodyDescriptor parent) {
+    public MaximalBodyDescriptor(BodyDescriptor parent) {
         super(parent);
         isMimeVersionSet = false;
         mimeMajorVersion = DEFAULT_MAJOR_VERSION;
@@ -248,147 +250,147 @@
     }
     
     /**
-     * @see org.apache.james.mime4j.RFC2045MimeDescriptor#getMimeMajorVersion()
+     * @see org.apache.james.mime4j.descriptor.RFC2045MimeDescriptor#getMimeMajorVersion()
      */
     public int getMimeMajorVersion() {
         return mimeMajorVersion;
     }
     
     /**
-     * @see org.apache.james.mime4j.RFC2045MimeDescriptor#getMimeMinorVersion()
+     * @see org.apache.james.mime4j.descriptor.RFC2045MimeDescriptor#getMimeMinorVersion()
      */
     public int getMimeMinorVersion() {
         return mimeMinorVersion;
     }
     
     /**
-     * @see org.apache.james.mime4j.RFC2045MimeDescriptor#getMimeVersionParseException()
+     * @see org.apache.james.mime4j.descriptor.RFC2045MimeDescriptor#getMimeVersionParseException()
      */
     public MimeException getMimeVersionParseException() {
         return mimeVersionException;
     }
     
     /**
-     * @see org.apache.james.mime4j.RFC2045MimeDescriptor#getContentDescription()
+     * @see org.apache.james.mime4j.descriptor.RFC2045MimeDescriptor#getContentDescription()
      */
     public String getContentDescription() {
         return contentDescription;
     }
     
     /**
-     * @see org.apache.james.mime4j.RFC2045MimeDescriptor#getContentId()
+     * @see org.apache.james.mime4j.descriptor.RFC2045MimeDescriptor#getContentId()
      */
     public String getContentId() {
         return contentId;
     }
     
     /**
-     * @see org.apache.james.mime4j.RFC2183ContentDispositionDescriptor#getContentDispositionType()
+     * @see org.apache.james.mime4j.descriptor.RFC2183ContentDispositionDescriptor#getContentDispositionType()
      */
     public String getContentDispositionType() {
         return contentDispositionType;
     }
     
     /**
-     * @see org.apache.james.mime4j.RFC2183ContentDispositionDescriptor#getContentDispositionParameters()
+     * @see org.apache.james.mime4j.descriptor.RFC2183ContentDispositionDescriptor#getContentDispositionParameters()
      */
     public Map getContentDispositionParameters() {
         return contentDispositionParameters;
     }
     
     /**
-     * @see org.apache.james.mime4j.RFC2183ContentDispositionDescriptor#getContentDispositionFilename()
+     * @see org.apache.james.mime4j.descriptor.RFC2183ContentDispositionDescriptor#getContentDispositionFilename()
      */
     public String getContentDispositionFilename() {
         return (String) contentDispositionParameters.get(MimeUtil.PARAM_FILENAME);
     }
     
     /**
-     * @see org.apache.james.mime4j.RFC2183ContentDispositionDescriptor#getContentDispositionModificationDate()
+     * @see org.apache.james.mime4j.descriptor.RFC2183ContentDispositionDescriptor#getContentDispositionModificationDate()
      */
     public DateTime getContentDispositionModificationDate() {
         return contentDispositionModificationDate;
     }
     
     /**
-     * @see org.apache.james.mime4j.RFC2183ContentDispositionDescriptor#getContentDispositionModificationDateParseException()
+     * @see org.apache.james.mime4j.descriptor.RFC2183ContentDispositionDescriptor#getContentDispositionModificationDateParseException()
      */
     public MimeException getContentDispositionModificationDateParseException() {
         return contentDispositionModificationDateParseException;
     }
     
     /**
-     * @see org.apache.james.mime4j.RFC2183ContentDispositionDescriptor#getContentDispositionCreationDate()
+     * @see org.apache.james.mime4j.descriptor.RFC2183ContentDispositionDescriptor#getContentDispositionCreationDate()
      */
     public DateTime getContentDispositionCreationDate() {
         return contentDispositionCreationDate;
     }
     
     /**
-     * @see org.apache.james.mime4j.RFC2183ContentDispositionDescriptor#getContentDispositionCreationDateParseException()
+     * @see org.apache.james.mime4j.descriptor.RFC2183ContentDispositionDescriptor#getContentDispositionCreationDateParseException()
      */
     public MimeException getContentDispositionCreationDateParseException() {
         return contentDispositionCreationDateParseException;
     }
     
     /**
-     * @see org.apache.james.mime4j.RFC2183ContentDispositionDescriptor#getContentDispositionReadDate()
+     * @see org.apache.james.mime4j.descriptor.RFC2183ContentDispositionDescriptor#getContentDispositionReadDate()
      */
     public DateTime getContentDispositionReadDate() {
         return contentDispositionReadDate;
     }
     
     /**
-     * @see org.apache.james.mime4j.RFC2183ContentDispositionDescriptor#getContentDispositionReadDateParseException()
+     * @see org.apache.james.mime4j.descriptor.RFC2183ContentDispositionDescriptor#getContentDispositionReadDateParseException()
      */
     public MimeException getContentDispositionReadDateParseException() {
         return contentDispositionReadDateParseException;
     }
     
     /**
-     * @see org.apache.james.mime4j.RFC2183ContentDispositionDescriptor#getContentDispositionSize()
+     * @see org.apache.james.mime4j.descriptor.RFC2183ContentDispositionDescriptor#getContentDispositionSize()
      */
     public long getContentDispositionSize() {
         return contentDispositionSize;
     }
     
     /**
-     * @see org.apache.james.mime4j.RFC2183ContentDispositionDescriptor#getContentDispositionSizeParseException()
+     * @see org.apache.james.mime4j.descriptor.RFC2183ContentDispositionDescriptor#getContentDispositionSizeParseException()
      */
     public MimeException getContentDispositionSizeParseException() {
         return contentDispositionSizeParseException;
     }
     
     /**
-     * @see org.apache.james.mime4j.RFC3066ContentLanguageDescriptor#getContentLanguage()
+     * @see org.apache.james.mime4j.descriptor.RFC3066ContentLanguageDescriptor#getContentLanguage()
      */
     public List getContentLanguage() {
         return contentLanguage;
     }
 
     /**
-     * @see org.apache.james.mime4j.RFC3066ContentLanguageDescriptor#getContentLanguageParseException()
+     * @see org.apache.james.mime4j.descriptor.RFC3066ContentLanguageDescriptor#getContentLanguageParseException()
      */
     public MimeException getContentLanguageParseException() {
         return contentLanguageParseException;
     }
     
     /**
-     * @see org.apache.james.mime4j.RFC2557ContentLocationDescriptor#getContentLocation()
+     * @see org.apache.james.mime4j.descriptor.RFC2557ContentLocationDescriptor#getContentLocation()
      */
     public String getContentLocation() {
         return contentLocation;
     }
     
     /**
-     * @see org.apache.james.mime4j.RFC2557ContentLocationDescriptor#getContentLocationParseException()
+     * @see org.apache.james.mime4j.descriptor.RFC2557ContentLocationDescriptor#getContentLocationParseException()
      */
     public MimeException getContentLocationParseException() {
         return contentLocationParseException;
     }
     
     /**
-     * @see org.apache.james.mime4j.RFC1864ContentMD5Descriptor#getContentMD5Raw()
+     * @see org.apache.james.mime4j.descriptor.RFC1864ContentMD5Descriptor#getContentMD5Raw()
      */
     public String getContentMD5Raw() {
         return contentMD5Raw;

Copied: james/mime4j/trunk/src/main/java/org/apache/james/mime4j/descriptor/RFC1864ContentMD5Descriptor.java (from r677844, james/mime4j/trunk/src/main/java/org/apache/james/mime4j/RFC1864ContentMD5Descriptor.java)
URL: http://svn.apache.org/viewvc/james/mime4j/trunk/src/main/java/org/apache/james/mime4j/descriptor/RFC1864ContentMD5Descriptor.java?p2=james/mime4j/trunk/src/main/java/org/apache/james/mime4j/descriptor/RFC1864ContentMD5Descriptor.java&p1=james/mime4j/trunk/src/main/java/org/apache/james/mime4j/RFC1864ContentMD5Descriptor.java&r1=677844&r2=682372&rev=682372&view=diff
==============================================================================
--- james/mime4j/trunk/src/main/java/org/apache/james/mime4j/RFC1864ContentMD5Descriptor.java (original)
+++ james/mime4j/trunk/src/main/java/org/apache/james/mime4j/descriptor/RFC1864ContentMD5Descriptor.java Mon Aug  4 05:57:59 2008
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.james.mime4j;
+package org.apache.james.mime4j.descriptor;
 
 /**
  * Describes <a href='http://tools.ietf.org/html/rfc1864'>RFC1864</a>  

Copied: james/mime4j/trunk/src/main/java/org/apache/james/mime4j/descriptor/RFC2045MimeDescriptor.java (from r677844, james/mime4j/trunk/src/main/java/org/apache/james/mime4j/RFC2045MimeDescriptor.java)
URL: http://svn.apache.org/viewvc/james/mime4j/trunk/src/main/java/org/apache/james/mime4j/descriptor/RFC2045MimeDescriptor.java?p2=james/mime4j/trunk/src/main/java/org/apache/james/mime4j/descriptor/RFC2045MimeDescriptor.java&p1=james/mime4j/trunk/src/main/java/org/apache/james/mime4j/RFC2045MimeDescriptor.java&r1=677844&r2=682372&rev=682372&view=diff
==============================================================================
--- james/mime4j/trunk/src/main/java/org/apache/james/mime4j/RFC2045MimeDescriptor.java (original)
+++ james/mime4j/trunk/src/main/java/org/apache/james/mime4j/descriptor/RFC2045MimeDescriptor.java Mon Aug  4 05:57:59 2008
@@ -16,7 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.james.mime4j;
+package org.apache.james.mime4j.descriptor;
+
+import org.apache.james.mime4j.ContentDescriptor;
+import org.apache.james.mime4j.MimeException;
 
 /**
  * Describes standard <a href='http://www.faqs.org/rfcs/rfc2045.html' rel='tag'>RFC2045</a>

Copied: james/mime4j/trunk/src/main/java/org/apache/james/mime4j/descriptor/RFC2183ContentDispositionDescriptor.java (from r677844, james/mime4j/trunk/src/main/java/org/apache/james/mime4j/RFC2183ContentDispositionDescriptor.java)
URL: http://svn.apache.org/viewvc/james/mime4j/trunk/src/main/java/org/apache/james/mime4j/descriptor/RFC2183ContentDispositionDescriptor.java?p2=james/mime4j/trunk/src/main/java/org/apache/james/mime4j/descriptor/RFC2183ContentDispositionDescriptor.java&p1=james/mime4j/trunk/src/main/java/org/apache/james/mime4j/RFC2183ContentDispositionDescriptor.java&r1=677844&r2=682372&rev=682372&view=diff
==============================================================================
--- james/mime4j/trunk/src/main/java/org/apache/james/mime4j/RFC2183ContentDispositionDescriptor.java (original)
+++ james/mime4j/trunk/src/main/java/org/apache/james/mime4j/descriptor/RFC2183ContentDispositionDescriptor.java Mon Aug  4 05:57:59 2008
@@ -16,10 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.james.mime4j;
+package org.apache.james.mime4j.descriptor;
 
 import java.util.Map;
 
+import org.apache.james.mime4j.MimeException;
 import org.apache.james.mime4j.field.datetime.DateTime;
 
 /** 

Copied: james/mime4j/trunk/src/main/java/org/apache/james/mime4j/descriptor/RFC2557ContentLocationDescriptor.java (from r677844, james/mime4j/trunk/src/main/java/org/apache/james/mime4j/RFC2557ContentLocationDescriptor.java)
URL: http://svn.apache.org/viewvc/james/mime4j/trunk/src/main/java/org/apache/james/mime4j/descriptor/RFC2557ContentLocationDescriptor.java?p2=james/mime4j/trunk/src/main/java/org/apache/james/mime4j/descriptor/RFC2557ContentLocationDescriptor.java&p1=james/mime4j/trunk/src/main/java/org/apache/james/mime4j/RFC2557ContentLocationDescriptor.java&r1=677844&r2=682372&rev=682372&view=diff
==============================================================================
--- james/mime4j/trunk/src/main/java/org/apache/james/mime4j/RFC2557ContentLocationDescriptor.java (original)
+++ james/mime4j/trunk/src/main/java/org/apache/james/mime4j/descriptor/RFC2557ContentLocationDescriptor.java Mon Aug  4 05:57:59 2008
@@ -16,7 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.james.mime4j;
+package org.apache.james.mime4j.descriptor;
+
+import org.apache.james.mime4j.MimeException;
 
 /**
  * Describes <a href='http://tools.ietf.org/html/rfc2557'>RFC2557</a>  

Copied: james/mime4j/trunk/src/main/java/org/apache/james/mime4j/descriptor/RFC3066ContentLanguageDescriptor.java (from r677844, james/mime4j/trunk/src/main/java/org/apache/james/mime4j/RFC3066ContentLanguageDescriptor.java)
URL: http://svn.apache.org/viewvc/james/mime4j/trunk/src/main/java/org/apache/james/mime4j/descriptor/RFC3066ContentLanguageDescriptor.java?p2=james/mime4j/trunk/src/main/java/org/apache/james/mime4j/descriptor/RFC3066ContentLanguageDescriptor.java&p1=james/mime4j/trunk/src/main/java/org/apache/james/mime4j/RFC3066ContentLanguageDescriptor.java&r1=677844&r2=682372&rev=682372&view=diff
==============================================================================
--- james/mime4j/trunk/src/main/java/org/apache/james/mime4j/RFC3066ContentLanguageDescriptor.java (original)
+++ james/mime4j/trunk/src/main/java/org/apache/james/mime4j/descriptor/RFC3066ContentLanguageDescriptor.java Mon Aug  4 05:57:59 2008
@@ -16,7 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.james.mime4j;
+package org.apache.james.mime4j.descriptor;
+
+import org.apache.james.mime4j.MimeException;
 
 import java.util.List;
 

Modified: james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/Entity.java
URL: http://svn.apache.org/viewvc/james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/Entity.java?rev=682372&r1=682371&r2=682372&view=diff
==============================================================================
--- james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/Entity.java (original)
+++ james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/Entity.java Mon Aug  4 05:57:59 2008
@@ -20,10 +20,10 @@
 package org.apache.james.mime4j.message;
 
 import org.apache.james.mime4j.MimeException;
+import org.apache.james.mime4j.decoder.CodecUtil;
 import org.apache.james.mime4j.field.ContentTransferEncodingField;
 import org.apache.james.mime4j.field.ContentTypeField;
 import org.apache.james.mime4j.field.Field;
-import org.apache.james.mime4j.util.CodecUtil;
 import org.apache.james.mime4j.util.MessageUtils;
 import org.apache.james.mime4j.util.MimeUtil;
 

Modified: james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/Header.java
URL: http://svn.apache.org/viewvc/james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/Header.java?rev=682372&r1=682371&r2=682372&view=diff
==============================================================================
--- james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/Header.java (original)
+++ james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/Header.java Mon Aug  4 05:57:59 2008
@@ -31,12 +31,12 @@
 import java.util.LinkedList;
 import java.util.List;
 
-import org.apache.james.mime4j.AbstractContentHandler;
-import org.apache.james.mime4j.CharArrayBuffer;
 import org.apache.james.mime4j.MimeException;
-import org.apache.james.mime4j.MimeStreamParser;
 import org.apache.james.mime4j.field.ContentTypeField;
 import org.apache.james.mime4j.field.Field;
+import org.apache.james.mime4j.parser.AbstractContentHandler;
+import org.apache.james.mime4j.parser.MimeStreamParser;
+import org.apache.james.mime4j.util.CharArrayBuffer;
 import org.apache.james.mime4j.util.CharsetUtil;
 import org.apache.james.mime4j.util.MessageUtils;
 

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=682372&r1=682371&r2=682372&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 Mon Aug  4 05:57:59 2008
@@ -20,14 +20,14 @@
 package org.apache.james.mime4j.message;
 
 import org.apache.james.mime4j.BodyDescriptor;
-import org.apache.james.mime4j.CharArrayBuffer;
-import org.apache.james.mime4j.ContentHandler;
 import org.apache.james.mime4j.MimeException;
-import org.apache.james.mime4j.MimeStreamParser;
 import org.apache.james.mime4j.decoder.Base64InputStream;
 import org.apache.james.mime4j.decoder.QuotedPrintableInputStream;
 import org.apache.james.mime4j.field.Field;
 import org.apache.james.mime4j.field.UnstructuredField;
+import org.apache.james.mime4j.parser.ContentHandler;
+import org.apache.james.mime4j.parser.MimeStreamParser;
+import org.apache.james.mime4j.util.CharArrayBuffer;
 import org.apache.james.mime4j.util.MimeUtil;
 
 import java.io.IOException;
@@ -102,7 +102,7 @@
         }
         
         /**
-         * @see org.apache.james.mime4j.ContentHandler#startMessage()
+         * @see org.apache.james.mime4j.parser.ContentHandler#startMessage()
          */
         public void startMessage() {
             if (stack.isEmpty()) {
@@ -116,7 +116,7 @@
         }
         
         /**
-         * @see org.apache.james.mime4j.ContentHandler#endMessage()
+         * @see org.apache.james.mime4j.parser.ContentHandler#endMessage()
          */
         public void endMessage() {
             expect(Message.class);
@@ -124,14 +124,14 @@
         }
         
         /**
-         * @see org.apache.james.mime4j.ContentHandler#startHeader()
+         * @see org.apache.james.mime4j.parser.ContentHandler#startHeader()
          */
         public void startHeader() {
             stack.push(new Header());
         }
         
         /**
-         * @see org.apache.james.mime4j.ContentHandler#field(java.lang.String)
+         * @see org.apache.james.mime4j.parser.ContentHandler#field(java.lang.String)
          */
         public void field(String fieldData) {
             expect(Header.class);
@@ -139,7 +139,7 @@
         }
         
         /**
-         * @see org.apache.james.mime4j.ContentHandler#endHeader()
+         * @see org.apache.james.mime4j.parser.ContentHandler#endHeader()
          */
         public void endHeader() {
             expect(Header.class);
@@ -149,7 +149,7 @@
         }
         
         /**
-         * @see org.apache.james.mime4j.ContentHandler#startMultipart(org.apache.james.mime4j.BodyDescriptor)
+         * @see org.apache.james.mime4j.parser.ContentHandler#startMultipart(org.apache.james.mime4j.BodyDescriptor)
          */
         public void startMultipart(final BodyDescriptor bd) {
             expect(Entity.class);
@@ -162,7 +162,7 @@
         }
         
         /**
-         * @see org.apache.james.mime4j.ContentHandler#body(org.apache.james.mime4j.BodyDescriptor, java.io.InputStream)
+         * @see org.apache.james.mime4j.parser.ContentHandler#body(org.apache.james.mime4j.BodyDescriptor, java.io.InputStream)
          */
         public void body(BodyDescriptor bd, final InputStream is) throws IOException {
             expect(Entity.class);
@@ -191,14 +191,14 @@
         }
         
         /**
-         * @see org.apache.james.mime4j.ContentHandler#endMultipart()
+         * @see org.apache.james.mime4j.parser.ContentHandler#endMultipart()
          */
         public void endMultipart() {
             stack.pop();
         }
         
         /**
-         * @see org.apache.james.mime4j.ContentHandler#startBodyPart()
+         * @see org.apache.james.mime4j.parser.ContentHandler#startBodyPart()
          */
         public void startBodyPart() {
             expect(Multipart.class);
@@ -209,7 +209,7 @@
         }
         
         /**
-         * @see org.apache.james.mime4j.ContentHandler#endBodyPart()
+         * @see org.apache.james.mime4j.parser.ContentHandler#endBodyPart()
          */
         public void endBodyPart() {
             expect(BodyPart.class);
@@ -217,7 +217,7 @@
         }
         
         /**
-         * @see org.apache.james.mime4j.ContentHandler#epilogue(java.io.InputStream)
+         * @see org.apache.james.mime4j.parser.ContentHandler#epilogue(java.io.InputStream)
          */
         public void epilogue(InputStream is) throws IOException {
             expect(Multipart.class);
@@ -230,7 +230,7 @@
         }
         
         /**
-         * @see org.apache.james.mime4j.ContentHandler#preamble(java.io.InputStream)
+         * @see org.apache.james.mime4j.parser.ContentHandler#preamble(java.io.InputStream)
          */
         public void preamble(InputStream is) throws IOException {
             expect(Multipart.class);
@@ -244,7 +244,7 @@
         
         /**
          * Unsupported.
-         * @see org.apache.james.mime4j.ContentHandler#raw(java.io.InputStream)
+         * @see org.apache.james.mime4j.parser.ContentHandler#raw(java.io.InputStream)
          */
         public void raw(InputStream is) throws IOException {
             throw new UnsupportedOperationException("Not supported");

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=682372&r1=682371&r2=682372&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 Mon Aug  4 05:57:59 2008
@@ -19,11 +19,11 @@
 
 package org.apache.james.mime4j.message;
 
-import org.apache.james.mime4j.AbstractContentHandler;
 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.field.Field;
+import org.apache.james.mime4j.parser.AbstractContentHandler;
 import org.apache.james.mime4j.util.MimeUtil;
 
 import java.io.InputStream;
@@ -63,21 +63,21 @@
     private Header currHeader;
 
     /**
-     * @see org.apache.james.mime4j.AbstractContentHandler#startHeader()
+     * @see org.apache.james.mime4j.parser.AbstractContentHandler#startHeader()
      */
     public final void startHeader() {
         currHeader = new Header();
     }
 
     /**
-     * @see org.apache.james.mime4j.AbstractContentHandler#field(java.lang.String)
+     * @see org.apache.james.mime4j.parser.AbstractContentHandler#field(java.lang.String)
      */
     public final void field(String fieldData) {
         currHeader.addField(Field.parse(fieldData));
     }
 
     /**
-     * @see org.apache.james.mime4j.AbstractContentHandler#endHeader()
+     * @see org.apache.james.mime4j.parser.AbstractContentHandler#endHeader()
      */
     public final void endHeader() {
         Header tmp = currHeader;
@@ -86,7 +86,7 @@
     }
 
     /**
-     * @see org.apache.james.mime4j.AbstractContentHandler#body(org.apache.james.mime4j.BodyDescriptor, java.io.InputStream)
+     * @see org.apache.james.mime4j.parser.AbstractContentHandler#body(org.apache.james.mime4j.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/message/TempFileBinaryBody.java
URL: http://svn.apache.org/viewvc/james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/TempFileBinaryBody.java?rev=682372&r1=682371&r2=682372&view=diff
==============================================================================
--- james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/TempFileBinaryBody.java (original)
+++ james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/TempFileBinaryBody.java Mon Aug  4 05:57:59 2008
@@ -19,7 +19,7 @@
 
 package org.apache.james.mime4j.message;
 
-import org.apache.james.mime4j.util.CodecUtil;
+import org.apache.james.mime4j.decoder.CodecUtil;
 import org.apache.james.mime4j.util.TempFile;
 import org.apache.james.mime4j.util.TempPath;
 import org.apache.james.mime4j.util.TempStorage;

Modified: james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/TempFileTextBody.java
URL: http://svn.apache.org/viewvc/james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/TempFileTextBody.java?rev=682372&r1=682371&r2=682372&view=diff
==============================================================================
--- james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/TempFileTextBody.java (original)
+++ james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/TempFileTextBody.java Mon Aug  4 05:57:59 2008
@@ -21,8 +21,8 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.james.mime4j.decoder.CodecUtil;
 import org.apache.james.mime4j.util.CharsetUtil;
-import org.apache.james.mime4j.util.CodecUtil;
 import org.apache.james.mime4j.util.TempFile;
 import org.apache.james.mime4j.util.TempPath;
 import org.apache.james.mime4j.util.TempStorage;

Copied: james/mime4j/trunk/src/main/java/org/apache/james/mime4j/parser/AbstractContentHandler.java (from r677844, james/mime4j/trunk/src/main/java/org/apache/james/mime4j/AbstractContentHandler.java)
URL: http://svn.apache.org/viewvc/james/mime4j/trunk/src/main/java/org/apache/james/mime4j/parser/AbstractContentHandler.java?p2=james/mime4j/trunk/src/main/java/org/apache/james/mime4j/parser/AbstractContentHandler.java&p1=james/mime4j/trunk/src/main/java/org/apache/james/mime4j/AbstractContentHandler.java&r1=677844&r2=682372&rev=682372&view=diff
==============================================================================
--- james/mime4j/trunk/src/main/java/org/apache/james/mime4j/AbstractContentHandler.java (original)
+++ james/mime4j/trunk/src/main/java/org/apache/james/mime4j/parser/AbstractContentHandler.java Mon Aug  4 05:57:59 2008
@@ -17,7 +17,10 @@
  * under the License.                                           *
  ****************************************************************/
 
-package org.apache.james.mime4j;
+package org.apache.james.mime4j.parser;
+
+import org.apache.james.mime4j.BodyDescriptor;
+import org.apache.james.mime4j.MimeException;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -34,80 +37,80 @@
 public abstract class AbstractContentHandler implements ContentHandler {
     
     /**
-     * @see org.apache.james.mime4j.ContentHandler#endMultipart()
+     * @see org.apache.james.mime4j.parser.ContentHandler#endMultipart()
      */
     public void endMultipart() throws MimeException {
     }
     
     /**
-     * @see org.apache.james.mime4j.ContentHandler#startMultipart(org.apache.james.mime4j.BodyDescriptor)
+     * @see org.apache.james.mime4j.parser.ContentHandler#startMultipart(org.apache.james.mime4j.BodyDescriptor)
      */
     public void startMultipart(BodyDescriptor bd) throws MimeException {
     }
     
     /**
-     * @see org.apache.james.mime4j.ContentHandler#body(org.apache.james.mime4j.BodyDescriptor, java.io.InputStream)
+     * @see org.apache.james.mime4j.parser.ContentHandler#body(org.apache.james.mime4j.BodyDescriptor, java.io.InputStream)
      */
     public void body(BodyDescriptor bd, InputStream is)
             throws MimeException, IOException {
     }
     
     /**
-     * @see org.apache.james.mime4j.ContentHandler#endBodyPart()
+     * @see org.apache.james.mime4j.parser.ContentHandler#endBodyPart()
      */
     public void endBodyPart() throws MimeException {
     }
     
     /**
-     * @see org.apache.james.mime4j.ContentHandler#endHeader()
+     * @see org.apache.james.mime4j.parser.ContentHandler#endHeader()
      */
     public void endHeader() throws MimeException {
     }
     
     /**
-     * @see org.apache.james.mime4j.ContentHandler#endMessage()
+     * @see org.apache.james.mime4j.parser.ContentHandler#endMessage()
      */
     public void endMessage() throws MimeException {
     }
     
     /**
-     * @see org.apache.james.mime4j.ContentHandler#epilogue(java.io.InputStream)
+     * @see org.apache.james.mime4j.parser.ContentHandler#epilogue(java.io.InputStream)
      */
     public void epilogue(InputStream is) throws MimeException, IOException {
     }
     
     /**
-     * @see org.apache.james.mime4j.ContentHandler#field(java.lang.String)
+     * @see org.apache.james.mime4j.parser.ContentHandler#field(java.lang.String)
      */
     public void field(String fieldData) throws MimeException {
     }
     
     /**
-     * @see org.apache.james.mime4j.ContentHandler#preamble(java.io.InputStream)
+     * @see org.apache.james.mime4j.parser.ContentHandler#preamble(java.io.InputStream)
      */
     public void preamble(InputStream is) throws MimeException, IOException {
     }
     
     /**
-     * @see org.apache.james.mime4j.ContentHandler#startBodyPart()
+     * @see org.apache.james.mime4j.parser.ContentHandler#startBodyPart()
      */
     public void startBodyPart() throws MimeException {
     }
     
     /**
-     * @see org.apache.james.mime4j.ContentHandler#startHeader()
+     * @see org.apache.james.mime4j.parser.ContentHandler#startHeader()
      */
     public void startHeader() throws MimeException {
     }
     
     /**
-     * @see org.apache.james.mime4j.ContentHandler#startMessage()
+     * @see org.apache.james.mime4j.parser.ContentHandler#startMessage()
      */
     public void startMessage() throws MimeException {
     }
     
     /**
-     * @see org.apache.james.mime4j.ContentHandler#raw(java.io.InputStream)
+     * @see org.apache.james.mime4j.parser.ContentHandler#raw(java.io.InputStream)
      */
     public void raw(InputStream is) throws MimeException, IOException {
     }

Copied: james/mime4j/trunk/src/main/java/org/apache/james/mime4j/parser/AbstractEntity.java (from r678436, james/mime4j/trunk/src/main/java/org/apache/james/mime4j/AbstractEntity.java)
URL: http://svn.apache.org/viewvc/james/mime4j/trunk/src/main/java/org/apache/james/mime4j/parser/AbstractEntity.java?p2=james/mime4j/trunk/src/main/java/org/apache/james/mime4j/parser/AbstractEntity.java&p1=james/mime4j/trunk/src/main/java/org/apache/james/mime4j/AbstractEntity.java&r1=678436&r2=682372&rev=682372&view=diff
==============================================================================
--- james/mime4j/trunk/src/main/java/org/apache/james/mime4j/AbstractEntity.java (original)
+++ james/mime4j/trunk/src/main/java/org/apache/james/mime4j/parser/AbstractEntity.java Mon Aug  4 05:57:59 2008
@@ -17,13 +17,21 @@
  * under the License.                                           *
  ****************************************************************/
 
-package org.apache.james.mime4j;
+package org.apache.james.mime4j.parser;
 
 import java.io.IOException;
 import java.util.BitSet;
 
 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.DefaultBodyDescriptor;
+import org.apache.james.mime4j.descriptor.MaximalBodyDescriptor;
+import org.apache.james.mime4j.stream.LineReaderInputStream;
+import org.apache.james.mime4j.util.ByteArrayBuffer;
+import org.apache.james.mime4j.util.CharArrayBuffer;
 import org.apache.james.mime4j.util.MessageUtils;
 
 /**

Copied: james/mime4j/trunk/src/main/java/org/apache/james/mime4j/parser/ContentHandler.java (from r677844, james/mime4j/trunk/src/main/java/org/apache/james/mime4j/ContentHandler.java)
URL: http://svn.apache.org/viewvc/james/mime4j/trunk/src/main/java/org/apache/james/mime4j/parser/ContentHandler.java?p2=james/mime4j/trunk/src/main/java/org/apache/james/mime4j/parser/ContentHandler.java&p1=james/mime4j/trunk/src/main/java/org/apache/james/mime4j/ContentHandler.java&r1=677844&r2=682372&rev=682372&view=diff
==============================================================================
--- james/mime4j/trunk/src/main/java/org/apache/james/mime4j/ContentHandler.java (original)
+++ james/mime4j/trunk/src/main/java/org/apache/james/mime4j/parser/ContentHandler.java Mon Aug  4 05:57:59 2008
@@ -17,7 +17,10 @@
  * under the License.                                           *
  ****************************************************************/
 
-package org.apache.james.mime4j;
+package org.apache.james.mime4j.parser;
+
+import org.apache.james.mime4j.BodyDescriptor;
+import org.apache.james.mime4j.MimeException;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -27,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.MimeStreamParser#setContentHandler(ContentHandler)}
+ * {@link org.apache.james.mime4j.parser.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.

Copied: james/mime4j/trunk/src/main/java/org/apache/james/mime4j/parser/EntityStateMachine.java (from r677844, james/mime4j/trunk/src/main/java/org/apache/james/mime4j/EntityStateMachine.java)
URL: http://svn.apache.org/viewvc/james/mime4j/trunk/src/main/java/org/apache/james/mime4j/parser/EntityStateMachine.java?p2=james/mime4j/trunk/src/main/java/org/apache/james/mime4j/parser/EntityStateMachine.java&p1=james/mime4j/trunk/src/main/java/org/apache/james/mime4j/EntityStateMachine.java&r1=677844&r2=682372&rev=682372&view=diff
==============================================================================
--- james/mime4j/trunk/src/main/java/org/apache/james/mime4j/EntityStateMachine.java (original)
+++ james/mime4j/trunk/src/main/java/org/apache/james/mime4j/parser/EntityStateMachine.java Mon Aug  4 05:57:59 2008
@@ -17,7 +17,10 @@
  * under the License.                                           *
  ****************************************************************/
 
-package org.apache.james.mime4j;
+package org.apache.james.mime4j.parser;
+
+import org.apache.james.mime4j.BodyDescriptor;
+import org.apache.james.mime4j.MimeException;
 
 import java.io.IOException;
 import java.io.InputStream;

Copied: james/mime4j/trunk/src/main/java/org/apache/james/mime4j/parser/EntityStates.java (from r677844, james/mime4j/trunk/src/main/java/org/apache/james/mime4j/EntityStates.java)
URL: http://svn.apache.org/viewvc/james/mime4j/trunk/src/main/java/org/apache/james/mime4j/parser/EntityStates.java?p2=james/mime4j/trunk/src/main/java/org/apache/james/mime4j/parser/EntityStates.java&p1=james/mime4j/trunk/src/main/java/org/apache/james/mime4j/EntityStates.java&r1=677844&r2=682372&rev=682372&view=diff
==============================================================================
--- james/mime4j/trunk/src/main/java/org/apache/james/mime4j/EntityStates.java (original)
+++ james/mime4j/trunk/src/main/java/org/apache/james/mime4j/parser/EntityStates.java Mon Aug  4 05:57:59 2008
@@ -17,7 +17,7 @@
  * under the License.                                           *
  ****************************************************************/
 
-package org.apache.james.mime4j;
+package org.apache.james.mime4j.parser;
 
 /**
  * Enumeration of states an entity is expected to go through

Copied: james/mime4j/trunk/src/main/java/org/apache/james/mime4j/parser/Event.java (from r677844, james/mime4j/trunk/src/main/java/org/apache/james/mime4j/Event.java)
URL: http://svn.apache.org/viewvc/james/mime4j/trunk/src/main/java/org/apache/james/mime4j/parser/Event.java?p2=james/mime4j/trunk/src/main/java/org/apache/james/mime4j/parser/Event.java&p1=james/mime4j/trunk/src/main/java/org/apache/james/mime4j/Event.java&r1=677844&r2=682372&rev=682372&view=diff
==============================================================================
--- james/mime4j/trunk/src/main/java/org/apache/james/mime4j/Event.java (original)
+++ james/mime4j/trunk/src/main/java/org/apache/james/mime4j/parser/Event.java Mon Aug  4 05:57:59 2008
@@ -1,4 +1,4 @@
-package org.apache.james.mime4j;
+package org.apache.james.mime4j.parser;
 
 /**
  * Enumerates events which can be monitored.

Copied: james/mime4j/trunk/src/main/java/org/apache/james/mime4j/parser/MimeEntity.java (from r678671, james/mime4j/trunk/src/main/java/org/apache/james/mime4j/MimeEntity.java)
URL: http://svn.apache.org/viewvc/james/mime4j/trunk/src/main/java/org/apache/james/mime4j/parser/MimeEntity.java?p2=james/mime4j/trunk/src/main/java/org/apache/james/mime4j/parser/MimeEntity.java&p1=james/mime4j/trunk/src/main/java/org/apache/james/mime4j/MimeEntity.java&r1=678671&r2=682372&rev=682372&view=diff
==============================================================================
--- james/mime4j/trunk/src/main/java/org/apache/james/mime4j/MimeEntity.java (original)
+++ james/mime4j/trunk/src/main/java/org/apache/james/mime4j/parser/MimeEntity.java Mon Aug  4 05:57:59 2008
@@ -1,10 +1,17 @@
-package org.apache.james.mime4j;
+package org.apache.james.mime4j.parser;
 
 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.stream.BufferedLineReaderInputStream;
+import org.apache.james.mime4j.stream.LineReaderInputStream;
+import org.apache.james.mime4j.stream.LineReaderInputStreamAdaptor;
+import org.apache.james.mime4j.stream.MimeBoundaryInputStream;
+import org.apache.james.mime4j.stream.RootInputStream;
 import org.apache.james.mime4j.util.MimeUtil;
 
 public class MimeEntity extends AbstractEntity {

Copied: james/mime4j/trunk/src/main/java/org/apache/james/mime4j/parser/MimeParseEventException.java (from r677844, james/mime4j/trunk/src/main/java/org/apache/james/mime4j/MimeParseEventException.java)
URL: http://svn.apache.org/viewvc/james/mime4j/trunk/src/main/java/org/apache/james/mime4j/parser/MimeParseEventException.java?p2=james/mime4j/trunk/src/main/java/org/apache/james/mime4j/parser/MimeParseEventException.java&p1=james/mime4j/trunk/src/main/java/org/apache/james/mime4j/MimeParseEventException.java&r1=677844&r2=682372&rev=682372&view=diff
==============================================================================
--- james/mime4j/trunk/src/main/java/org/apache/james/mime4j/MimeParseEventException.java (original)
+++ james/mime4j/trunk/src/main/java/org/apache/james/mime4j/parser/MimeParseEventException.java Mon Aug  4 05:57:59 2008
@@ -17,7 +17,9 @@
  * under the License.                                           *
  ****************************************************************/
 
-package org.apache.james.mime4j;
+package org.apache.james.mime4j.parser;
+
+import org.apache.james.mime4j.MimeException;
 
 /**
  * Indicates that strict parsing has been enabled 

Copied: james/mime4j/trunk/src/main/java/org/apache/james/mime4j/parser/MimeStreamParser.java (from r677844, james/mime4j/trunk/src/main/java/org/apache/james/mime4j/MimeStreamParser.java)
URL: http://svn.apache.org/viewvc/james/mime4j/trunk/src/main/java/org/apache/james/mime4j/parser/MimeStreamParser.java?p2=james/mime4j/trunk/src/main/java/org/apache/james/mime4j/parser/MimeStreamParser.java&p1=james/mime4j/trunk/src/main/java/org/apache/james/mime4j/MimeStreamParser.java&r1=677844&r2=682372&rev=682372&view=diff
==============================================================================
--- james/mime4j/trunk/src/main/java/org/apache/james/mime4j/MimeStreamParser.java (original)
+++ james/mime4j/trunk/src/main/java/org/apache/james/mime4j/parser/MimeStreamParser.java Mon Aug  4 05:57:59 2008
@@ -17,7 +17,10 @@
  * under the License.                                           *
  ****************************************************************/
 
-package org.apache.james.mime4j;
+package org.apache.james.mime4j.parser;
+
+import org.apache.james.mime4j.BodyDescriptor;
+import org.apache.james.mime4j.MimeException;
 
 import java.io.IOException;
 import java.io.InputStream;

Copied: james/mime4j/trunk/src/main/java/org/apache/james/mime4j/parser/MimeTokenStream.java (from r677924, james/mime4j/trunk/src/main/java/org/apache/james/mime4j/MimeTokenStream.java)
URL: http://svn.apache.org/viewvc/james/mime4j/trunk/src/main/java/org/apache/james/mime4j/parser/MimeTokenStream.java?p2=james/mime4j/trunk/src/main/java/org/apache/james/mime4j/parser/MimeTokenStream.java&p1=james/mime4j/trunk/src/main/java/org/apache/james/mime4j/MimeTokenStream.java&r1=677924&r2=682372&rev=682372&view=diff
==============================================================================
--- james/mime4j/trunk/src/main/java/org/apache/james/mime4j/MimeTokenStream.java (original)
+++ james/mime4j/trunk/src/main/java/org/apache/james/mime4j/parser/MimeTokenStream.java Mon Aug  4 05:57:59 2008
@@ -17,7 +17,7 @@
  * under the License.                                           *
  ****************************************************************/
 
-package org.apache.james.mime4j;
+package org.apache.james.mime4j.parser;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -28,8 +28,12 @@
 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.stream.BufferedLineReaderInputStream;
+import org.apache.james.mime4j.stream.RootInputStream;
 import org.apache.james.mime4j.util.MimeUtil;
 
 /**

Copied: james/mime4j/trunk/src/main/java/org/apache/james/mime4j/parser/RawEntity.java (from r677844, james/mime4j/trunk/src/main/java/org/apache/james/mime4j/RawEntity.java)
URL: http://svn.apache.org/viewvc/james/mime4j/trunk/src/main/java/org/apache/james/mime4j/parser/RawEntity.java?p2=james/mime4j/trunk/src/main/java/org/apache/james/mime4j/parser/RawEntity.java&p1=james/mime4j/trunk/src/main/java/org/apache/james/mime4j/RawEntity.java&r1=677844&r2=682372&rev=682372&view=diff
==============================================================================
--- james/mime4j/trunk/src/main/java/org/apache/james/mime4j/RawEntity.java (original)
+++ james/mime4j/trunk/src/main/java/org/apache/james/mime4j/parser/RawEntity.java Mon Aug  4 05:57:59 2008
@@ -17,7 +17,9 @@
  * under the License.                                           *
  ****************************************************************/
 
-package org.apache.james.mime4j;
+package org.apache.james.mime4j.parser;
+
+import org.apache.james.mime4j.BodyDescriptor;
 
 import java.io.InputStream;
 

Copied: james/mime4j/trunk/src/main/java/org/apache/james/mime4j/parser/RecursionMode.java (from r677844, james/mime4j/trunk/src/main/java/org/apache/james/mime4j/RecursionMode.java)
URL: http://svn.apache.org/viewvc/james/mime4j/trunk/src/main/java/org/apache/james/mime4j/parser/RecursionMode.java?p2=james/mime4j/trunk/src/main/java/org/apache/james/mime4j/parser/RecursionMode.java&p1=james/mime4j/trunk/src/main/java/org/apache/james/mime4j/RecursionMode.java&r1=677844&r2=682372&rev=682372&view=diff
==============================================================================
--- james/mime4j/trunk/src/main/java/org/apache/james/mime4j/RecursionMode.java (original)
+++ james/mime4j/trunk/src/main/java/org/apache/james/mime4j/parser/RecursionMode.java Mon Aug  4 05:57:59 2008
@@ -17,7 +17,7 @@
  * under the License.                                           *
  ****************************************************************/
 
-package org.apache.james.mime4j;
+package org.apache.james.mime4j.parser;
 
 /**
  * Enumeration of parsing modes.

Copied: james/mime4j/trunk/src/main/java/org/apache/james/mime4j/stream/BufferedLineReaderInputStream.java (from r678517, james/mime4j/trunk/src/main/java/org/apache/james/mime4j/BufferedLineReaderInputStream.java)
URL: http://svn.apache.org/viewvc/james/mime4j/trunk/src/main/java/org/apache/james/mime4j/stream/BufferedLineReaderInputStream.java?p2=james/mime4j/trunk/src/main/java/org/apache/james/mime4j/stream/BufferedLineReaderInputStream.java&p1=james/mime4j/trunk/src/main/java/org/apache/james/mime4j/BufferedLineReaderInputStream.java&r1=678517&r2=682372&rev=682372&view=diff
==============================================================================
--- james/mime4j/trunk/src/main/java/org/apache/james/mime4j/BufferedLineReaderInputStream.java (original)
+++ james/mime4j/trunk/src/main/java/org/apache/james/mime4j/stream/BufferedLineReaderInputStream.java Mon Aug  4 05:57:59 2008
@@ -17,7 +17,9 @@
  * under the License.                                           *
  ****************************************************************/
 
-package org.apache.james.mime4j;
+package org.apache.james.mime4j.stream;
+
+import org.apache.james.mime4j.util.ByteArrayBuffer;
 
 import java.io.IOException;
 import java.io.InputStream;

Copied: james/mime4j/trunk/src/main/java/org/apache/james/mime4j/stream/CloseShieldInputStream.java (from r677844, james/mime4j/trunk/src/main/java/org/apache/james/mime4j/CloseShieldInputStream.java)
URL: http://svn.apache.org/viewvc/james/mime4j/trunk/src/main/java/org/apache/james/mime4j/stream/CloseShieldInputStream.java?p2=james/mime4j/trunk/src/main/java/org/apache/james/mime4j/stream/CloseShieldInputStream.java&p1=james/mime4j/trunk/src/main/java/org/apache/james/mime4j/CloseShieldInputStream.java&r1=677844&r2=682372&rev=682372&view=diff
==============================================================================
--- james/mime4j/trunk/src/main/java/org/apache/james/mime4j/CloseShieldInputStream.java (original)
+++ james/mime4j/trunk/src/main/java/org/apache/james/mime4j/stream/CloseShieldInputStream.java Mon Aug  4 05:57:59 2008
@@ -17,7 +17,7 @@
  * under the License.                                           *
  ****************************************************************/
 
-package org.apache.james.mime4j;
+package org.apache.james.mime4j.stream;
 
 import java.io.InputStream;
 import java.io.IOException;

Copied: james/mime4j/trunk/src/main/java/org/apache/james/mime4j/stream/EOLConvertingInputStream.java (from r677844, james/mime4j/trunk/src/main/java/org/apache/james/mime4j/EOLConvertingInputStream.java)
URL: http://svn.apache.org/viewvc/james/mime4j/trunk/src/main/java/org/apache/james/mime4j/stream/EOLConvertingInputStream.java?p2=james/mime4j/trunk/src/main/java/org/apache/james/mime4j/stream/EOLConvertingInputStream.java&p1=james/mime4j/trunk/src/main/java/org/apache/james/mime4j/EOLConvertingInputStream.java&r1=677844&r2=682372&rev=682372&view=diff
==============================================================================
--- james/mime4j/trunk/src/main/java/org/apache/james/mime4j/EOLConvertingInputStream.java (original)
+++ james/mime4j/trunk/src/main/java/org/apache/james/mime4j/stream/EOLConvertingInputStream.java Mon Aug  4 05:57:59 2008
@@ -17,7 +17,7 @@
  * under the License.                                           *
  ****************************************************************/
 
-package org.apache.james.mime4j;
+package org.apache.james.mime4j.stream;
 
 import java.io.IOException;
 import java.io.InputStream;

Copied: james/mime4j/trunk/src/main/java/org/apache/james/mime4j/stream/LineReaderInputStream.java (from r677844, james/mime4j/trunk/src/main/java/org/apache/james/mime4j/LineReaderInputStream.java)
URL: http://svn.apache.org/viewvc/james/mime4j/trunk/src/main/java/org/apache/james/mime4j/stream/LineReaderInputStream.java?p2=james/mime4j/trunk/src/main/java/org/apache/james/mime4j/stream/LineReaderInputStream.java&p1=james/mime4j/trunk/src/main/java/org/apache/james/mime4j/LineReaderInputStream.java&r1=677844&r2=682372&rev=682372&view=diff
==============================================================================
--- james/mime4j/trunk/src/main/java/org/apache/james/mime4j/LineReaderInputStream.java (original)
+++ james/mime4j/trunk/src/main/java/org/apache/james/mime4j/stream/LineReaderInputStream.java Mon Aug  4 05:57:59 2008
@@ -17,7 +17,9 @@
  * under the License.                                           *
  ****************************************************************/
 
-package org.apache.james.mime4j;
+package org.apache.james.mime4j.stream;
+
+import org.apache.james.mime4j.util.ByteArrayBuffer;
 
 import java.io.FilterInputStream;
 import java.io.IOException;

Copied: james/mime4j/trunk/src/main/java/org/apache/james/mime4j/stream/LineReaderInputStreamAdaptor.java (from r680968, james/mime4j/trunk/src/main/java/org/apache/james/mime4j/LineReaderInputStreamAdaptor.java)
URL: http://svn.apache.org/viewvc/james/mime4j/trunk/src/main/java/org/apache/james/mime4j/stream/LineReaderInputStreamAdaptor.java?p2=james/mime4j/trunk/src/main/java/org/apache/james/mime4j/stream/LineReaderInputStreamAdaptor.java&p1=james/mime4j/trunk/src/main/java/org/apache/james/mime4j/LineReaderInputStreamAdaptor.java&r1=680968&r2=682372&rev=682372&view=diff
==============================================================================
--- james/mime4j/trunk/src/main/java/org/apache/james/mime4j/LineReaderInputStreamAdaptor.java (original)
+++ james/mime4j/trunk/src/main/java/org/apache/james/mime4j/stream/LineReaderInputStreamAdaptor.java Mon Aug  4 05:57:59 2008
@@ -17,7 +17,9 @@
  * under the License.                                           *
  ****************************************************************/
 
-package org.apache.james.mime4j;
+package org.apache.james.mime4j.stream;
+
+import org.apache.james.mime4j.util.ByteArrayBuffer;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -29,7 +31,7 @@
  * 
  * @version $Id$
  */
-class LineReaderInputStreamAdaptor extends LineReaderInputStream {
+public class LineReaderInputStreamAdaptor extends LineReaderInputStream {
 
     private final LineReaderInputStream bis;
     private boolean used = false;

Copied: james/mime4j/trunk/src/main/java/org/apache/james/mime4j/stream/MimeBoundaryInputStream.java (from r680973, james/mime4j/trunk/src/main/java/org/apache/james/mime4j/MimeBoundaryInputStream.java)
URL: http://svn.apache.org/viewvc/james/mime4j/trunk/src/main/java/org/apache/james/mime4j/stream/MimeBoundaryInputStream.java?p2=james/mime4j/trunk/src/main/java/org/apache/james/mime4j/stream/MimeBoundaryInputStream.java&p1=james/mime4j/trunk/src/main/java/org/apache/james/mime4j/MimeBoundaryInputStream.java&r1=680973&r2=682372&rev=682372&view=diff
==============================================================================
--- james/mime4j/trunk/src/main/java/org/apache/james/mime4j/MimeBoundaryInputStream.java (original)
+++ james/mime4j/trunk/src/main/java/org/apache/james/mime4j/stream/MimeBoundaryInputStream.java Mon Aug  4 05:57:59 2008
@@ -17,7 +17,9 @@
  * under the License.                                           *
  ****************************************************************/
 
-package org.apache.james.mime4j;
+package org.apache.james.mime4j.stream;
+
+import org.apache.james.mime4j.util.ByteArrayBuffer;
 
 import java.io.IOException;
 

Copied: james/mime4j/trunk/src/main/java/org/apache/james/mime4j/stream/PartialInputStream.java (from r677844, james/mime4j/trunk/src/main/java/org/apache/james/mime4j/util/PartialInputStream.java)
URL: http://svn.apache.org/viewvc/james/mime4j/trunk/src/main/java/org/apache/james/mime4j/stream/PartialInputStream.java?p2=james/mime4j/trunk/src/main/java/org/apache/james/mime4j/stream/PartialInputStream.java&p1=james/mime4j/trunk/src/main/java/org/apache/james/mime4j/util/PartialInputStream.java&r1=677844&r2=682372&rev=682372&view=diff
==============================================================================
--- james/mime4j/trunk/src/main/java/org/apache/james/mime4j/util/PartialInputStream.java (original)
+++ james/mime4j/trunk/src/main/java/org/apache/james/mime4j/stream/PartialInputStream.java Mon Aug  4 05:57:59 2008
@@ -18,7 +18,7 @@
  ****************************************************************/
 
 
-package org.apache.james.mime4j.util;
+package org.apache.james.mime4j.stream;
 
 import java.io.InputStream;
 import java.io.IOException;

Copied: james/mime4j/trunk/src/main/java/org/apache/james/mime4j/stream/PositionInputStream.java (from r677844, james/mime4j/trunk/src/main/java/org/apache/james/mime4j/util/PositionInputStream.java)
URL: http://svn.apache.org/viewvc/james/mime4j/trunk/src/main/java/org/apache/james/mime4j/stream/PositionInputStream.java?p2=james/mime4j/trunk/src/main/java/org/apache/james/mime4j/stream/PositionInputStream.java&p1=james/mime4j/trunk/src/main/java/org/apache/james/mime4j/util/PositionInputStream.java&r1=677844&r2=682372&rev=682372&view=diff
==============================================================================
--- james/mime4j/trunk/src/main/java/org/apache/james/mime4j/util/PositionInputStream.java (original)
+++ james/mime4j/trunk/src/main/java/org/apache/james/mime4j/stream/PositionInputStream.java Mon Aug  4 05:57:59 2008
@@ -18,7 +18,7 @@
  ****************************************************************/
 
 
-package org.apache.james.mime4j.util;
+package org.apache.james.mime4j.stream;
 
 import java.io.InputStream;
 import java.io.IOException;

Copied: james/mime4j/trunk/src/main/java/org/apache/james/mime4j/stream/RootInputStream.java (from r678282, james/mime4j/trunk/src/main/java/org/apache/james/mime4j/RootInputStream.java)
URL: http://svn.apache.org/viewvc/james/mime4j/trunk/src/main/java/org/apache/james/mime4j/stream/RootInputStream.java?p2=james/mime4j/trunk/src/main/java/org/apache/james/mime4j/stream/RootInputStream.java&p1=james/mime4j/trunk/src/main/java/org/apache/james/mime4j/RootInputStream.java&r1=678282&r2=682372&rev=682372&view=diff
==============================================================================
--- james/mime4j/trunk/src/main/java/org/apache/james/mime4j/RootInputStream.java (original)
+++ james/mime4j/trunk/src/main/java/org/apache/james/mime4j/stream/RootInputStream.java Mon Aug  4 05:57:59 2008
@@ -17,7 +17,7 @@
  * under the License.                                           *
  ****************************************************************/
 
-package org.apache.james.mime4j;
+package org.apache.james.mime4j.stream;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -27,12 +27,12 @@
  * supplied stream. This stream keeps track of the current line number and
  * can also be truncated. When truncated the stream will appear to have
  * reached end of file. This is used by the parser's 
- * {@link org.apache.james.mime4j.MimeStreamParser#stop()} method.
+ * {@link org.apache.james.mime4j.parser.MimeStreamParser#stop()} method.
  *
  * 
  * @version $Id: RootInputStream.java,v 1.2 2004/10/02 12:41:10 ntherning Exp $
  */
-class RootInputStream extends InputStream {
+public class RootInputStream extends InputStream {
     private InputStream is = null;
     private int lineNumber = 1;
     private int prev = -1;

Copied: james/mime4j/trunk/src/main/java/org/apache/james/mime4j/util/ByteArrayBuffer.java (from r677844, james/mime4j/trunk/src/main/java/org/apache/james/mime4j/ByteArrayBuffer.java)
URL: http://svn.apache.org/viewvc/james/mime4j/trunk/src/main/java/org/apache/james/mime4j/util/ByteArrayBuffer.java?p2=james/mime4j/trunk/src/main/java/org/apache/james/mime4j/util/ByteArrayBuffer.java&p1=james/mime4j/trunk/src/main/java/org/apache/james/mime4j/ByteArrayBuffer.java&r1=677844&r2=682372&rev=682372&view=diff
==============================================================================
--- james/mime4j/trunk/src/main/java/org/apache/james/mime4j/ByteArrayBuffer.java (original)
+++ james/mime4j/trunk/src/main/java/org/apache/james/mime4j/util/ByteArrayBuffer.java Mon Aug  4 05:57:59 2008
@@ -17,7 +17,7 @@
  * under the License.                                           *
  ****************************************************************/
 
-package org.apache.james.mime4j;
+package org.apache.james.mime4j.util;
 
 /**
  * A resizable byte array.

Copied: james/mime4j/trunk/src/main/java/org/apache/james/mime4j/util/CharArrayBuffer.java (from r677844, james/mime4j/trunk/src/main/java/org/apache/james/mime4j/CharArrayBuffer.java)
URL: http://svn.apache.org/viewvc/james/mime4j/trunk/src/main/java/org/apache/james/mime4j/util/CharArrayBuffer.java?p2=james/mime4j/trunk/src/main/java/org/apache/james/mime4j/util/CharArrayBuffer.java&p1=james/mime4j/trunk/src/main/java/org/apache/james/mime4j/CharArrayBuffer.java&r1=677844&r2=682372&rev=682372&view=diff
==============================================================================
--- james/mime4j/trunk/src/main/java/org/apache/james/mime4j/CharArrayBuffer.java (original)
+++ james/mime4j/trunk/src/main/java/org/apache/james/mime4j/util/CharArrayBuffer.java Mon Aug  4 05:57:59 2008
@@ -17,9 +17,8 @@
  * under the License.                                           *
  ****************************************************************/
 
-package org.apache.james.mime4j;
+package org.apache.james.mime4j.util;
 
-import org.apache.james.mime4j.util.MessageUtils;
 
 /**
  * A resizable char array.

Modified: james/mime4j/trunk/src/main/java/org/apache/james/mime4j/util/MimeUtil.java
URL: http://svn.apache.org/viewvc/james/mime4j/trunk/src/main/java/org/apache/james/mime4j/util/MimeUtil.java?rev=682372&r1=682371&r2=682372&view=diff
==============================================================================
--- james/mime4j/trunk/src/main/java/org/apache/james/mime4j/util/MimeUtil.java (original)
+++ james/mime4j/trunk/src/main/java/org/apache/james/mime4j/util/MimeUtil.java Mon Aug  4 05:57:59 2008
@@ -21,7 +21,6 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.james.mime4j.CharArrayBuffer;
 
 import java.util.HashMap;
 import java.util.Map;

Copied: james/mime4j/trunk/src/test/java/org/apache/james/mime4j/decoder/Base64OutputStreamTest.java (from r680972, james/mime4j/trunk/src/test/java/org/apache/james/mime4j/util/Base64OutputStreamTest.java)
URL: http://svn.apache.org/viewvc/james/mime4j/trunk/src/test/java/org/apache/james/mime4j/decoder/Base64OutputStreamTest.java?p2=james/mime4j/trunk/src/test/java/org/apache/james/mime4j/decoder/Base64OutputStreamTest.java&p1=james/mime4j/trunk/src/test/java/org/apache/james/mime4j/util/Base64OutputStreamTest.java&r1=680972&r2=682372&rev=682372&view=diff
==============================================================================
--- james/mime4j/trunk/src/test/java/org/apache/james/mime4j/util/Base64OutputStreamTest.java (original)
+++ james/mime4j/trunk/src/test/java/org/apache/james/mime4j/decoder/Base64OutputStreamTest.java Mon Aug  4 05:57:59 2008
@@ -17,7 +17,9 @@
  * under the License.                                           *
  ****************************************************************/
 
-package org.apache.james.mime4j.util;
+package org.apache.james.mime4j.decoder;
+
+import org.apache.james.mime4j.decoder.Base64OutputStream;
 
 import java.io.IOException;
 import java.io.StringWriter;

Propchange: james/mime4j/trunk/src/test/java/org/apache/james/mime4j/decoder/Base64OutputStreamTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: james/mime4j/trunk/src/test/java/org/apache/james/mime4j/decoder/Base64OutputStreamTest.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain



---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org


Mime
View raw message