Author: bago
Date: Sun Jul 13 09:42:17 2008
New Revision: 676355
URL: http://svn.apache.org/viewvc?rev=676355&view=rev
Log:
Moved more utilities from the main package to the utils package.
Added:
james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/util/BasicBufferingInputStream.java
- copied, changed from r676348,
james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/BasicBufferingInputStream.java
james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/util/BufferingInputStream.java
- copied, changed from r676348,
james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/BufferingInputStream.java
james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/util/BufferingInputStreamAdaptor.java
- copied, changed from r676348,
james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/BufferingInputStreamAdaptor.java
james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/util/InputBuffer.java
- copied, changed from r676348,
james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/InputBuffer.java
james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/util/MimeBoundaryInputStream.java
- copied, changed from r676348,
james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/MimeBoundaryInputStream.java
james/mime4j/branches/repackaging-proposal/src/test/java/org/apache/james/mime4j/util/BasicBufferingInputStreamTest.java
- copied, changed from r676347,
james/mime4j/branches/repackaging-proposal/src/test/java/org/apache/james/mime4j/BasicBufferingInputStreamTest.java
james/mime4j/branches/repackaging-proposal/src/test/java/org/apache/james/mime4j/util/BufferingInputStreamAdaptorTest.java
- copied, changed from r676347,
james/mime4j/branches/repackaging-proposal/src/test/java/org/apache/james/mime4j/BufferingInputStreamAdaptorTest.java
james/mime4j/branches/repackaging-proposal/src/test/java/org/apache/james/mime4j/util/InputBufferTest.java
(contents, props changed)
- copied, changed from r676347,
james/mime4j/branches/repackaging-proposal/src/test/java/org/apache/james/mime4j/InputBufferTest.java
james/mime4j/branches/repackaging-proposal/src/test/java/org/apache/james/mime4j/util/MimeBoundaryInputStreamTest.java
- copied, changed from r676347,
james/mime4j/branches/repackaging-proposal/src/test/java/org/apache/james/mime4j/MimeBoundaryInputStreamTest.java
james/mime4j/branches/repackaging-proposal/src/test/java/org/apache/james/mime4j/util/MimeEntityTest.java
- copied, changed from r676347,
james/mime4j/branches/repackaging-proposal/src/test/java/org/apache/james/mime4j/MimeEntityTest.java
Removed:
james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/BasicBufferingInputStream.java
james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/BufferingInputStream.java
james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/BufferingInputStreamAdaptor.java
james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/InputBuffer.java
james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/MimeBoundaryInputStream.java
james/mime4j/branches/repackaging-proposal/src/test/java/org/apache/james/mime4j/BasicBufferingInputStreamTest.java
james/mime4j/branches/repackaging-proposal/src/test/java/org/apache/james/mime4j/BufferingInputStreamAdaptorTest.java
james/mime4j/branches/repackaging-proposal/src/test/java/org/apache/james/mime4j/InputBufferTest.java
james/mime4j/branches/repackaging-proposal/src/test/java/org/apache/james/mime4j/MimeBoundaryInputStreamTest.java
james/mime4j/branches/repackaging-proposal/src/test/java/org/apache/james/mime4j/MimeEntityTest.java
Modified:
james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/AbstractEntity.java
james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/MimeEntity.java
james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/MimeTokenStream.java
james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/RootInputStream.java
Modified:
james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/AbstractEntity.java
URL:
http://svn.apache.org/viewvc/james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/AbstractEntity.java?rev=676355&r1=676354&r2=676355&view=diff
==============================================================================
---
james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/AbstractEntity.java
(original)
+++
james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/AbstractEntity.java
Sun Jul 13 09:42:17 2008
@@ -24,6 +24,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.james.mime4j.util.BufferingInputStream;
import org.apache.james.mime4j.util.MessageUtils;
/**
Modified:
james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/MimeEntity.java
URL:
http://svn.apache.org/viewvc/james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/MimeEntity.java?rev=676355&r1=676354&r2=676355&view=diff
==============================================================================
---
james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/MimeEntity.java
(original)
+++
james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/MimeEntity.java
Sun Jul 13 09:42:17 2008
@@ -4,6 +4,10 @@
import java.io.InputStream;
import org.apache.james.mime4j.util.Base64InputStream;
+import org.apache.james.mime4j.util.BufferingInputStream;
+import org.apache.james.mime4j.util.BufferingInputStreamAdaptor;
+import org.apache.james.mime4j.util.InputBuffer;
+import org.apache.james.mime4j.util.MimeBoundaryInputStream;
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/MimeTokenStream.java
URL:
http://svn.apache.org/viewvc/james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/MimeTokenStream.java?rev=676355&r1=676354&r2=676355&view=diff
==============================================================================
---
james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/MimeTokenStream.java
(original)
+++
james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/MimeTokenStream.java
Sun Jul 13 09:42:17 2008
@@ -29,6 +29,8 @@
import java.util.LinkedList;
import org.apache.james.mime4j.util.Base64InputStream;
+import org.apache.james.mime4j.util.BasicBufferingInputStream;
+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/RootInputStream.java
URL:
http://svn.apache.org/viewvc/james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/RootInputStream.java?rev=676355&r1=676354&r2=676355&view=diff
==============================================================================
---
james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/RootInputStream.java
(original)
+++
james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/RootInputStream.java
Sun Jul 13 09:42:17 2008
@@ -32,7 +32,7 @@
*
* @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/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/util/BasicBufferingInputStream.java
(from r676348,
james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/BasicBufferingInputStream.java)
URL:
http://svn.apache.org/viewvc/james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/util/BasicBufferingInputStream.java?p2=james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/util/BasicBufferingInputStream.java&p1=james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/BasicBufferingInputStream.java&r1=676348&r2=676355&rev=676355&view=diff
==============================================================================
---
james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/BasicBufferingInputStream.java
(original)
+++
james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/util/BasicBufferingInputStream.java
Sun Jul 13 09:42:17 2008
@@ -17,7 +17,9 @@
* under the License. *
****************************************************************/
-package org.apache.james.mime4j;
+package org.apache.james.mime4j.util;
+
+import org.apache.james.mime4j.ByteArrayBuffer;
import java.io.IOException;
Copied:
james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/util/BufferingInputStream.java
(from r676348,
james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/BufferingInputStream.java)
URL:
http://svn.apache.org/viewvc/james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/util/BufferingInputStream.java?p2=james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/util/BufferingInputStream.java&p1=james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/BufferingInputStream.java&r1=676348&r2=676355&rev=676355&view=diff
==============================================================================
---
james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/BufferingInputStream.java
(original)
+++
james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/util/BufferingInputStream.java
Sun Jul 13 09:42:17 2008
@@ -17,7 +17,9 @@
* under the License. *
****************************************************************/
-package org.apache.james.mime4j;
+package org.apache.james.mime4j.util;
+
+import org.apache.james.mime4j.ByteArrayBuffer;
import java.io.IOException;
import java.io.InputStream;
Copied:
james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/util/BufferingInputStreamAdaptor.java
(from r676348,
james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/BufferingInputStreamAdaptor.java)
URL:
http://svn.apache.org/viewvc/james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/util/BufferingInputStreamAdaptor.java?p2=james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/util/BufferingInputStreamAdaptor.java&p1=james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/BufferingInputStreamAdaptor.java&r1=676348&r2=676355&rev=676355&view=diff
==============================================================================
---
james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/BufferingInputStreamAdaptor.java
(original)
+++
james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/util/BufferingInputStreamAdaptor.java
Sun Jul 13 09:42:17 2008
@@ -17,7 +17,9 @@
* under the License. *
****************************************************************/
-package org.apache.james.mime4j;
+package org.apache.james.mime4j.util;
+
+import org.apache.james.mime4j.ByteArrayBuffer;
import java.io.IOException;
import java.io.InputStream;
@@ -29,7 +31,7 @@
*
* @version $Id$
*/
-class BufferingInputStreamAdaptor extends BufferingInputStream {
+public class BufferingInputStreamAdaptor extends BufferingInputStream {
private final InputStream is;
private final BufferingInputStream bis;
Copied:
james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/util/InputBuffer.java
(from r676348,
james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/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/InputBuffer.java&r1=676348&r2=676355&rev=676355&view=diff
==============================================================================
---
james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/InputBuffer.java
(original)
+++
james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/util/InputBuffer.java
Sun Jul 13 09:42:17 2008
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mime4j;
+package org.apache.james.mime4j.util;
import java.io.IOException;
import java.io.InputStream;
Copied:
james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/util/MimeBoundaryInputStream.java
(from r676348,
james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/MimeBoundaryInputStream.java)
URL:
http://svn.apache.org/viewvc/james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/util/MimeBoundaryInputStream.java?p2=james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/util/MimeBoundaryInputStream.java&p1=james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/MimeBoundaryInputStream.java&r1=676348&r2=676355&rev=676355&view=diff
==============================================================================
---
james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/MimeBoundaryInputStream.java
(original)
+++
james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/util/MimeBoundaryInputStream.java
Sun Jul 13 09:42:17 2008
@@ -17,7 +17,9 @@
* under the License. *
****************************************************************/
-package org.apache.james.mime4j;
+package org.apache.james.mime4j.util;
+
+import org.apache.james.mime4j.ByteArrayBuffer;
import java.io.IOException;
Copied:
james/mime4j/branches/repackaging-proposal/src/test/java/org/apache/james/mime4j/util/BasicBufferingInputStreamTest.java
(from r676347,
james/mime4j/branches/repackaging-proposal/src/test/java/org/apache/james/mime4j/BasicBufferingInputStreamTest.java)
URL:
http://svn.apache.org/viewvc/james/mime4j/branches/repackaging-proposal/src/test/java/org/apache/james/mime4j/util/BasicBufferingInputStreamTest.java?p2=james/mime4j/branches/repackaging-proposal/src/test/java/org/apache/james/mime4j/util/BasicBufferingInputStreamTest.java&p1=james/mime4j/branches/repackaging-proposal/src/test/java/org/apache/james/mime4j/BasicBufferingInputStreamTest.java&r1=676347&r2=676355&rev=676355&view=diff
==============================================================================
---
james/mime4j/branches/repackaging-proposal/src/test/java/org/apache/james/mime4j/BasicBufferingInputStreamTest.java
(original)
+++
james/mime4j/branches/repackaging-proposal/src/test/java/org/apache/james/mime4j/util/BasicBufferingInputStreamTest.java
Sun Jul 13 09:42:17 2008
@@ -17,7 +17,12 @@
* under the License. *
****************************************************************/
-package org.apache.james.mime4j;
+package org.apache.james.mime4j.util;
+
+import org.apache.james.mime4j.ByteArrayBuffer;
+import org.apache.james.mime4j.util.BasicBufferingInputStream;
+import org.apache.james.mime4j.util.BufferingInputStream;
+import org.apache.james.mime4j.util.InputBuffer;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
Copied:
james/mime4j/branches/repackaging-proposal/src/test/java/org/apache/james/mime4j/util/BufferingInputStreamAdaptorTest.java
(from r676347,
james/mime4j/branches/repackaging-proposal/src/test/java/org/apache/james/mime4j/BufferingInputStreamAdaptorTest.java)
URL:
http://svn.apache.org/viewvc/james/mime4j/branches/repackaging-proposal/src/test/java/org/apache/james/mime4j/util/BufferingInputStreamAdaptorTest.java?p2=james/mime4j/branches/repackaging-proposal/src/test/java/org/apache/james/mime4j/util/BufferingInputStreamAdaptorTest.java&p1=james/mime4j/branches/repackaging-proposal/src/test/java/org/apache/james/mime4j/BufferingInputStreamAdaptorTest.java&r1=676347&r2=676355&rev=676355&view=diff
==============================================================================
---
james/mime4j/branches/repackaging-proposal/src/test/java/org/apache/james/mime4j/BufferingInputStreamAdaptorTest.java
(original)
+++
james/mime4j/branches/repackaging-proposal/src/test/java/org/apache/james/mime4j/util/BufferingInputStreamAdaptorTest.java
Sun Jul 13 09:42:17 2008
@@ -17,7 +17,10 @@
* under the License. *
****************************************************************/
-package org.apache.james.mime4j;
+package org.apache.james.mime4j.util;
+
+import org.apache.james.mime4j.ByteArrayBuffer;
+import org.apache.james.mime4j.util.BufferingInputStreamAdaptor;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
Copied:
james/mime4j/branches/repackaging-proposal/src/test/java/org/apache/james/mime4j/util/InputBufferTest.java
(from r676347,
james/mime4j/branches/repackaging-proposal/src/test/java/org/apache/james/mime4j/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/InputBufferTest.java&r1=676347&r2=676355&rev=676355&view=diff
==============================================================================
---
james/mime4j/branches/repackaging-proposal/src/test/java/org/apache/james/mime4j/InputBufferTest.java
(original)
+++
james/mime4j/branches/repackaging-proposal/src/test/java/org/apache/james/mime4j/util/InputBufferTest.java
Sun Jul 13 09:42:17 2008
@@ -17,7 +17,9 @@
* under the License. *
****************************************************************/
-package org.apache.james.mime4j;
+package org.apache.james.mime4j.util;
+
+import org.apache.james.mime4j.util.InputBuffer;
import java.io.ByteArrayInputStream;
@@ -33,8 +35,8 @@
InputBuffer inbuffer = new InputBuffer(new ByteArrayInputStream(b1),
4096);
inbuffer.fillBuffer();
- assertEquals((int)'b', inbuffer.read());
- assertEquals((int)'l', inbuffer.read());
+ assertEquals('b', inbuffer.read());
+ assertEquals('l', inbuffer.read());
try {
inbuffer.charAt(1);
Propchange:
james/mime4j/branches/repackaging-proposal/src/test/java/org/apache/james/mime4j/util/InputBufferTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied:
james/mime4j/branches/repackaging-proposal/src/test/java/org/apache/james/mime4j/util/MimeBoundaryInputStreamTest.java
(from r676347,
james/mime4j/branches/repackaging-proposal/src/test/java/org/apache/james/mime4j/MimeBoundaryInputStreamTest.java)
URL:
http://svn.apache.org/viewvc/james/mime4j/branches/repackaging-proposal/src/test/java/org/apache/james/mime4j/util/MimeBoundaryInputStreamTest.java?p2=james/mime4j/branches/repackaging-proposal/src/test/java/org/apache/james/mime4j/util/MimeBoundaryInputStreamTest.java&p1=james/mime4j/branches/repackaging-proposal/src/test/java/org/apache/james/mime4j/MimeBoundaryInputStreamTest.java&r1=676347&r2=676355&rev=676355&view=diff
==============================================================================
---
james/mime4j/branches/repackaging-proposal/src/test/java/org/apache/james/mime4j/MimeBoundaryInputStreamTest.java
(original)
+++
james/mime4j/branches/repackaging-proposal/src/test/java/org/apache/james/mime4j/util/MimeBoundaryInputStreamTest.java
Sun Jul 13 09:42:17 2008
@@ -17,14 +17,17 @@
* under the License. *
****************************************************************/
-package org.apache.james.mime4j;
+package org.apache.james.mime4j.util;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
-import org.apache.james.mime4j.MimeBoundaryInputStream;
+import org.apache.james.mime4j.ByteArrayBuffer;
+import org.apache.james.mime4j.util.BufferingInputStream;
+import org.apache.james.mime4j.util.InputBuffer;
+import org.apache.james.mime4j.util.MimeBoundaryInputStream;
import junit.framework.TestCase;
Copied:
james/mime4j/branches/repackaging-proposal/src/test/java/org/apache/james/mime4j/util/MimeEntityTest.java
(from r676347,
james/mime4j/branches/repackaging-proposal/src/test/java/org/apache/james/mime4j/MimeEntityTest.java)
URL:
http://svn.apache.org/viewvc/james/mime4j/branches/repackaging-proposal/src/test/java/org/apache/james/mime4j/util/MimeEntityTest.java?p2=james/mime4j/branches/repackaging-proposal/src/test/java/org/apache/james/mime4j/util/MimeEntityTest.java&p1=james/mime4j/branches/repackaging-proposal/src/test/java/org/apache/james/mime4j/MimeEntityTest.java&r1=676347&r2=676355&rev=676355&view=diff
==============================================================================
---
james/mime4j/branches/repackaging-proposal/src/test/java/org/apache/james/mime4j/MimeEntityTest.java
(original)
+++
james/mime4j/branches/repackaging-proposal/src/test/java/org/apache/james/mime4j/util/MimeEntityTest.java
Sun Jul 13 09:42:17 2008
@@ -17,11 +17,18 @@
* under the License. *
****************************************************************/
-package org.apache.james.mime4j;
+package org.apache.james.mime4j.util;
import java.io.ByteArrayInputStream;
import org.apache.commons.io.IOUtils;
+import org.apache.james.mime4j.EntityStateMachine;
+import org.apache.james.mime4j.EntityStates;
+import org.apache.james.mime4j.MimeEntity;
+import org.apache.james.mime4j.RecursionMode;
+import org.apache.james.mime4j.RootInputStream;
+import org.apache.james.mime4j.util.BasicBufferingInputStream;
+import org.apache.james.mime4j.util.InputBuffer;
import junit.framework.TestCase;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
