Author: bago
Date: Sun Jul 13 10:56:24 2008
New Revision: 676379
URL: http://svn.apache.org/viewvc?rev=676379&view=rev
Log:
InputBuffer is not a stream, moving back to util by now.
Added:
james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/util/InputBuffer.java
- copied, changed from r676375,
james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/stream/InputBuffer.java
james/mime4j/branches/repackaging-proposal/src/test/java/org/apache/james/mime4j/util/InputBufferTest.java
(contents, props changed)
- copied, changed from r676375,
james/mime4j/branches/repackaging-proposal/src/test/java/org/apache/james/mime4j/stream/InputBufferTest.java
Removed:
james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/stream/InputBuffer.java
james/mime4j/branches/repackaging-proposal/src/test/java/org/apache/james/mime4j/stream/InputBufferTest.java
Modified:
james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/parser/MimeEntity.java
james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/parser/MimeTokenStream.java
james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/stream/BasicBufferingInputStream.java
james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/stream/MimeBoundaryInputStream.java
james/mime4j/branches/repackaging-proposal/src/test/java/org/apache/james/mime4j/stream/BasicBufferingInputStreamTest.java
james/mime4j/branches/repackaging-proposal/src/test/java/org/apache/james/mime4j/stream/MimeBoundaryInputStreamTest.java
james/mime4j/branches/repackaging-proposal/src/test/java/org/apache/james/mime4j/util/MimeEntityTest.java
Modified:
james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/parser/MimeEntity.java
URL:
http://svn.apache.org/viewvc/james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/parser/MimeEntity.java?rev=676379&r1=676378&r2=676379&view=diff
==============================================================================
---
james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/parser/MimeEntity.java
(original)
+++
james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/parser/MimeEntity.java
Sun Jul 13 10:56:24 2008
@@ -7,9 +7,9 @@
import org.apache.james.mime4j.MimeException;
import org.apache.james.mime4j.stream.BufferingInputStream;
import org.apache.james.mime4j.stream.BufferingInputStreamAdaptor;
-import org.apache.james.mime4j.stream.InputBuffer;
import org.apache.james.mime4j.stream.MimeBoundaryInputStream;
import org.apache.james.mime4j.util.Base64InputStream;
+import org.apache.james.mime4j.util.InputBuffer;
import org.apache.james.mime4j.util.MimeUtil;
import org.apache.james.mime4j.util.QuotedPrintableInputStream;
Modified:
james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/parser/MimeTokenStream.java
URL:
http://svn.apache.org/viewvc/james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/parser/MimeTokenStream.java?rev=676379&r1=676378&r2=676379&view=diff
==============================================================================
---
james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/parser/MimeTokenStream.java
(original)
+++
james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/parser/MimeTokenStream.java
Sun Jul 13 10:56:24 2008
@@ -31,8 +31,8 @@
import org.apache.james.mime4j.BodyDescriptor;
import org.apache.james.mime4j.MimeException;
import org.apache.james.mime4j.stream.BasicBufferingInputStream;
-import org.apache.james.mime4j.stream.InputBuffer;
import org.apache.james.mime4j.util.Base64InputStream;
+import org.apache.james.mime4j.util.InputBuffer;
import org.apache.james.mime4j.util.MimeUtil;
import org.apache.james.mime4j.util.QuotedPrintableInputStream;
Modified:
james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/stream/BasicBufferingInputStream.java
URL:
http://svn.apache.org/viewvc/james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/stream/BasicBufferingInputStream.java?rev=676379&r1=676378&r2=676379&view=diff
==============================================================================
---
james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/stream/BasicBufferingInputStream.java
(original)
+++
james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/stream/BasicBufferingInputStream.java
Sun Jul 13 10:56:24 2008
@@ -21,6 +21,7 @@
import org.apache.james.mime4j.util.ByteArrayBuffer;
+import org.apache.james.mime4j.util.InputBuffer;
import java.io.IOException;
Modified:
james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/stream/MimeBoundaryInputStream.java
URL:
http://svn.apache.org/viewvc/james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/stream/MimeBoundaryInputStream.java?rev=676379&r1=676378&r2=676379&view=diff
==============================================================================
---
james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/stream/MimeBoundaryInputStream.java
(original)
+++
james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/stream/MimeBoundaryInputStream.java
Sun Jul 13 10:56:24 2008
@@ -21,6 +21,7 @@
import org.apache.james.mime4j.util.ByteArrayBuffer;
+import org.apache.james.mime4j.util.InputBuffer;
import java.io.IOException;
Copied:
james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/util/InputBuffer.java
(from r676375,
james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/stream/InputBuffer.java)
URL:
http://svn.apache.org/viewvc/james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/util/InputBuffer.java?p2=james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/util/InputBuffer.java&p1=james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/stream/InputBuffer.java&r1=676375&r2=676379&rev=676379&view=diff
==============================================================================
---
james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/stream/InputBuffer.java
(original)
+++
james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/util/InputBuffer.java
Sun Jul 13 10:56:24 2008
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mime4j.stream;
+package org.apache.james.mime4j.util;
import java.io.IOException;
import java.io.InputStream;
Modified:
james/mime4j/branches/repackaging-proposal/src/test/java/org/apache/james/mime4j/stream/BasicBufferingInputStreamTest.java
URL:
http://svn.apache.org/viewvc/james/mime4j/branches/repackaging-proposal/src/test/java/org/apache/james/mime4j/stream/BasicBufferingInputStreamTest.java?rev=676379&r1=676378&r2=676379&view=diff
==============================================================================
---
james/mime4j/branches/repackaging-proposal/src/test/java/org/apache/james/mime4j/stream/BasicBufferingInputStreamTest.java
(original)
+++
james/mime4j/branches/repackaging-proposal/src/test/java/org/apache/james/mime4j/stream/BasicBufferingInputStreamTest.java
Sun Jul 13 10:56:24 2008
@@ -21,8 +21,8 @@
import org.apache.james.mime4j.stream.BasicBufferingInputStream;
import org.apache.james.mime4j.stream.BufferingInputStream;
-import org.apache.james.mime4j.stream.InputBuffer;
import org.apache.james.mime4j.util.ByteArrayBuffer;
+import org.apache.james.mime4j.util.InputBuffer;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
Modified:
james/mime4j/branches/repackaging-proposal/src/test/java/org/apache/james/mime4j/stream/MimeBoundaryInputStreamTest.java
URL:
http://svn.apache.org/viewvc/james/mime4j/branches/repackaging-proposal/src/test/java/org/apache/james/mime4j/stream/MimeBoundaryInputStreamTest.java?rev=676379&r1=676378&r2=676379&view=diff
==============================================================================
---
james/mime4j/branches/repackaging-proposal/src/test/java/org/apache/james/mime4j/stream/MimeBoundaryInputStreamTest.java
(original)
+++
james/mime4j/branches/repackaging-proposal/src/test/java/org/apache/james/mime4j/stream/MimeBoundaryInputStreamTest.java
Sun Jul 13 10:56:24 2008
@@ -25,9 +25,9 @@
import java.io.InputStream;
import org.apache.james.mime4j.stream.BufferingInputStream;
-import org.apache.james.mime4j.stream.InputBuffer;
import org.apache.james.mime4j.stream.MimeBoundaryInputStream;
import org.apache.james.mime4j.util.ByteArrayBuffer;
+import org.apache.james.mime4j.util.InputBuffer;
import junit.framework.TestCase;
Copied:
james/mime4j/branches/repackaging-proposal/src/test/java/org/apache/james/mime4j/util/InputBufferTest.java
(from r676375,
james/mime4j/branches/repackaging-proposal/src/test/java/org/apache/james/mime4j/stream/InputBufferTest.java)
URL:
http://svn.apache.org/viewvc/james/mime4j/branches/repackaging-proposal/src/test/java/org/apache/james/mime4j/util/InputBufferTest.java?p2=james/mime4j/branches/repackaging-proposal/src/test/java/org/apache/james/mime4j/util/InputBufferTest.java&p1=james/mime4j/branches/repackaging-proposal/src/test/java/org/apache/james/mime4j/stream/InputBufferTest.java&r1=676375&r2=676379&rev=676379&view=diff
==============================================================================
---
james/mime4j/branches/repackaging-proposal/src/test/java/org/apache/james/mime4j/stream/InputBufferTest.java
(original)
+++
james/mime4j/branches/repackaging-proposal/src/test/java/org/apache/james/mime4j/util/InputBufferTest.java
Sun Jul 13 10:56:24 2008
@@ -17,9 +17,9 @@
* under the License. *
****************************************************************/
-package org.apache.james.mime4j.stream;
+package org.apache.james.mime4j.util;
-import org.apache.james.mime4j.stream.InputBuffer;
+import org.apache.james.mime4j.util.InputBuffer;
import java.io.ByteArrayInputStream;
Propchange:
james/mime4j/branches/repackaging-proposal/src/test/java/org/apache/james/mime4j/util/InputBufferTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Modified:
james/mime4j/branches/repackaging-proposal/src/test/java/org/apache/james/mime4j/util/MimeEntityTest.java
URL:
http://svn.apache.org/viewvc/james/mime4j/branches/repackaging-proposal/src/test/java/org/apache/james/mime4j/util/MimeEntityTest.java?rev=676379&r1=676378&r2=676379&view=diff
==============================================================================
---
james/mime4j/branches/repackaging-proposal/src/test/java/org/apache/james/mime4j/util/MimeEntityTest.java
(original)
+++
james/mime4j/branches/repackaging-proposal/src/test/java/org/apache/james/mime4j/util/MimeEntityTest.java
Sun Jul 13 10:56:24 2008
@@ -28,7 +28,6 @@
import org.apache.james.mime4j.parser.RecursionMode;
import org.apache.james.mime4j.parser.RootInputStream;
import org.apache.james.mime4j.stream.BasicBufferingInputStream;
-import org.apache.james.mime4j.stream.InputBuffer;
import junit.framework.TestCase;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]