You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by ba...@apache.org on 2008/07/13 18:31:14 UTC
svn commit: r676351 - in /james/mime4j/branches/repackaging-proposal/src:
main/java/org/apache/james/mime4j/ main/java/org/apache/james/mime4j/decoder/
main/java/org/apache/james/mime4j/field/
main/java/org/apache/james/mime4j/field/address/ main/java/...
Author: bago
Date: Sun Jul 13 09:31:14 2008
New Revision: 676351
URL: http://svn.apache.org/viewvc?rev=676351&view=rev
Log:
decoder classes are utilities. Moving them to the util package (remove cycles). We can better structure the util package once cycles are gone.
Added:
james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/util/Base64InputStream.java
- copied, changed from r676348, james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/decoder/Base64InputStream.java
james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/util/ByteQueue.java
- copied, changed from r676348, james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/decoder/ByteQueue.java
james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/util/DecoderUtil.java
- copied, changed from r676348, james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/decoder/DecoderUtil.java
james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/util/QuotedPrintableInputStream.java
- copied, changed from r676348, james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/decoder/QuotedPrintableInputStream.java
james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/util/UnboundedFifoByteBuffer.java
- copied, changed from r676348, james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/decoder/UnboundedFifoByteBuffer.java
james/mime4j/branches/repackaging-proposal/src/test/java/org/apache/james/mime4j/util/Base64InputStreamTest.java
- copied, changed from r676347, james/mime4j/branches/repackaging-proposal/src/test/java/org/apache/james/mime4j/decoder/Base64InputStreamTest.java
james/mime4j/branches/repackaging-proposal/src/test/java/org/apache/james/mime4j/util/DecoderUtilTest.java
- copied, changed from r676347, james/mime4j/branches/repackaging-proposal/src/test/java/org/apache/james/mime4j/decoder/DecoderUtilTest.java
james/mime4j/branches/repackaging-proposal/src/test/java/org/apache/james/mime4j/util/QuotedPrintableInputStreamTest.java
- copied, changed from r676347, james/mime4j/branches/repackaging-proposal/src/test/java/org/apache/james/mime4j/decoder/QuotedPrintableInputStreamTest.java
Removed:
james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/decoder/
james/mime4j/branches/repackaging-proposal/src/test/java/org/apache/james/mime4j/decoder/
Modified:
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/field/UnstructuredField.java
james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/field/address/Builder.java
james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/message/SimpleContentHandler.java
james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/message/TempFileBinaryBody.java
james/mime4j/branches/repackaging-proposal/src/test/java/org/apache/james/mime4j/util/QuotedPrintableEncodeTest.java
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=676351&r1=676350&r2=676351&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:31:14 2008
@@ -3,9 +3,9 @@
import java.io.IOException;
import java.io.InputStream;
-import org.apache.james.mime4j.decoder.Base64InputStream;
-import org.apache.james.mime4j.decoder.QuotedPrintableInputStream;
+import org.apache.james.mime4j.util.Base64InputStream;
import org.apache.james.mime4j.util.MimeUtil;
+import org.apache.james.mime4j.util.QuotedPrintableInputStream;
public class MimeEntity extends AbstractEntity {
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=676351&r1=676350&r2=676351&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:31:14 2008
@@ -28,9 +28,9 @@
import java.nio.charset.UnsupportedCharsetException;
import java.util.LinkedList;
-import org.apache.james.mime4j.decoder.Base64InputStream;
-import org.apache.james.mime4j.decoder.QuotedPrintableInputStream;
+import org.apache.james.mime4j.util.Base64InputStream;
import org.apache.james.mime4j.util.MimeUtil;
+import org.apache.james.mime4j.util.QuotedPrintableInputStream;
/**
* <p>
Modified: james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/field/UnstructuredField.java
URL: http://svn.apache.org/viewvc/james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/field/UnstructuredField.java?rev=676351&r1=676350&r2=676351&view=diff
==============================================================================
--- james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/field/UnstructuredField.java (original)
+++ james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/field/UnstructuredField.java Sun Jul 13 09:31:14 2008
@@ -19,7 +19,7 @@
package org.apache.james.mime4j.field;
-import org.apache.james.mime4j.decoder.DecoderUtil;
+import org.apache.james.mime4j.util.DecoderUtil;
/**
Modified: james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/field/address/Builder.java
URL: http://svn.apache.org/viewvc/james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/field/address/Builder.java?rev=676351&r1=676350&r2=676351&view=diff
==============================================================================
--- james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/field/address/Builder.java (original)
+++ james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/field/address/Builder.java Sun Jul 13 09:31:14 2008
@@ -19,7 +19,6 @@
package org.apache.james.mime4j.field.address;
-import org.apache.james.mime4j.decoder.DecoderUtil;
import org.apache.james.mime4j.field.address.parser.ASTaddr_spec;
import org.apache.james.mime4j.field.address.parser.ASTaddress;
import org.apache.james.mime4j.field.address.parser.ASTaddress_list;
@@ -34,6 +33,7 @@
import org.apache.james.mime4j.field.address.parser.Node;
import org.apache.james.mime4j.field.address.parser.SimpleNode;
import org.apache.james.mime4j.field.address.parser.Token;
+import org.apache.james.mime4j.util.DecoderUtil;
import java.util.ArrayList;
import java.util.Iterator;
Modified: james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/message/SimpleContentHandler.java
URL: http://svn.apache.org/viewvc/james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/message/SimpleContentHandler.java?rev=676351&r1=676350&r2=676351&view=diff
==============================================================================
--- james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/message/SimpleContentHandler.java (original)
+++ james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/message/SimpleContentHandler.java Sun Jul 13 09:31:14 2008
@@ -21,10 +21,10 @@
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.util.Base64InputStream;
import org.apache.james.mime4j.util.MimeUtil;
+import org.apache.james.mime4j.util.QuotedPrintableInputStream;
import java.io.InputStream;
import java.io.IOException;
Modified: james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/message/TempFileBinaryBody.java
URL: http://svn.apache.org/viewvc/james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/message/TempFileBinaryBody.java?rev=676351&r1=676350&r2=676351&view=diff
==============================================================================
--- james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/message/TempFileBinaryBody.java (original)
+++ james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/message/TempFileBinaryBody.java Sun Jul 13 09:31:14 2008
@@ -23,10 +23,10 @@
import java.io.InputStream;
import java.io.OutputStream;
-import org.apache.james.mime4j.decoder.Base64InputStream;
-import org.apache.james.mime4j.decoder.QuotedPrintableInputStream;
+import org.apache.james.mime4j.util.Base64InputStream;
import org.apache.james.mime4j.util.CodecUtil;
import org.apache.james.mime4j.util.MimeUtil;
+import org.apache.james.mime4j.util.QuotedPrintableInputStream;
import org.apache.james.mime4j.util.TempFile;
import org.apache.james.mime4j.util.TempPath;
import org.apache.james.mime4j.util.TempStorage;
Copied: james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/util/Base64InputStream.java (from r676348, james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/decoder/Base64InputStream.java)
URL: http://svn.apache.org/viewvc/james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/util/Base64InputStream.java?p2=james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/util/Base64InputStream.java&p1=james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/decoder/Base64InputStream.java&r1=676348&r2=676351&rev=676351&view=diff
==============================================================================
--- james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/decoder/Base64InputStream.java (original)
+++ james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/util/Base64InputStream.java Sun Jul 13 09:31:14 2008
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mime4j.decoder;
+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/ByteQueue.java (from r676348, james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/decoder/ByteQueue.java)
URL: http://svn.apache.org/viewvc/james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/util/ByteQueue.java?p2=james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/util/ByteQueue.java&p1=james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/decoder/ByteQueue.java&r1=676348&r2=676351&rev=676351&view=diff
==============================================================================
--- james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/decoder/ByteQueue.java (original)
+++ james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/util/ByteQueue.java Sun Jul 13 09:31:14 2008
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mime4j.decoder;
+package org.apache.james.mime4j.util;
import java.util.Iterator;
Copied: james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/util/DecoderUtil.java (from r676348, james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/decoder/DecoderUtil.java)
URL: http://svn.apache.org/viewvc/james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/util/DecoderUtil.java?p2=james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/util/DecoderUtil.java&p1=james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/decoder/DecoderUtil.java&r1=676348&r2=676351&rev=676351&view=diff
==============================================================================
--- james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/decoder/DecoderUtil.java (original)
+++ james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/util/DecoderUtil.java Sun Jul 13 09:31:14 2008
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mime4j.decoder;
+package org.apache.james.mime4j.util;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -27,7 +27,6 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.james.mime4j.CharArrayBuffer;
-import org.apache.james.mime4j.util.CharsetUtil;
/**
* Static methods for decoding strings, byte arrays and encoded words.
Copied: james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/util/QuotedPrintableInputStream.java (from r676348, james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/decoder/QuotedPrintableInputStream.java)
URL: http://svn.apache.org/viewvc/james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/util/QuotedPrintableInputStream.java?p2=james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/util/QuotedPrintableInputStream.java&p1=james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/decoder/QuotedPrintableInputStream.java&r1=676348&r2=676351&rev=676351&view=diff
==============================================================================
--- james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/decoder/QuotedPrintableInputStream.java (original)
+++ james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/util/QuotedPrintableInputStream.java Sun Jul 13 09:31:14 2008
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mime4j.decoder;
+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/UnboundedFifoByteBuffer.java (from r676348, james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/decoder/UnboundedFifoByteBuffer.java)
URL: http://svn.apache.org/viewvc/james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/util/UnboundedFifoByteBuffer.java?p2=james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/util/UnboundedFifoByteBuffer.java&p1=james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/decoder/UnboundedFifoByteBuffer.java&r1=676348&r2=676351&rev=676351&view=diff
==============================================================================
--- james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/decoder/UnboundedFifoByteBuffer.java (original)
+++ james/mime4j/branches/repackaging-proposal/src/main/java/org/apache/james/mime4j/util/UnboundedFifoByteBuffer.java Sun Jul 13 09:31:14 2008
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mime4j.decoder;
+package org.apache.james.mime4j.util;
import java.util.Iterator;
import java.util.NoSuchElementException;
Copied: james/mime4j/branches/repackaging-proposal/src/test/java/org/apache/james/mime4j/util/Base64InputStreamTest.java (from r676347, james/mime4j/branches/repackaging-proposal/src/test/java/org/apache/james/mime4j/decoder/Base64InputStreamTest.java)
URL: http://svn.apache.org/viewvc/james/mime4j/branches/repackaging-proposal/src/test/java/org/apache/james/mime4j/util/Base64InputStreamTest.java?p2=james/mime4j/branches/repackaging-proposal/src/test/java/org/apache/james/mime4j/util/Base64InputStreamTest.java&p1=james/mime4j/branches/repackaging-proposal/src/test/java/org/apache/james/mime4j/decoder/Base64InputStreamTest.java&r1=676347&r2=676351&rev=676351&view=diff
==============================================================================
--- james/mime4j/branches/repackaging-proposal/src/test/java/org/apache/james/mime4j/decoder/Base64InputStreamTest.java (original)
+++ james/mime4j/branches/repackaging-proposal/src/test/java/org/apache/james/mime4j/util/Base64InputStreamTest.java Sun Jul 13 09:31:14 2008
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mime4j.decoder;
+package org.apache.james.mime4j.util;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -25,7 +25,7 @@
import java.io.InputStream;
import java.io.UnsupportedEncodingException;
-import org.apache.james.mime4j.decoder.Base64InputStream;
+import org.apache.james.mime4j.util.Base64InputStream;
import org.apache.log4j.BasicConfigurator;
import junit.framework.TestCase;
Copied: james/mime4j/branches/repackaging-proposal/src/test/java/org/apache/james/mime4j/util/DecoderUtilTest.java (from r676347, james/mime4j/branches/repackaging-proposal/src/test/java/org/apache/james/mime4j/decoder/DecoderUtilTest.java)
URL: http://svn.apache.org/viewvc/james/mime4j/branches/repackaging-proposal/src/test/java/org/apache/james/mime4j/util/DecoderUtilTest.java?p2=james/mime4j/branches/repackaging-proposal/src/test/java/org/apache/james/mime4j/util/DecoderUtilTest.java&p1=james/mime4j/branches/repackaging-proposal/src/test/java/org/apache/james/mime4j/decoder/DecoderUtilTest.java&r1=676347&r2=676351&rev=676351&view=diff
==============================================================================
--- james/mime4j/branches/repackaging-proposal/src/test/java/org/apache/james/mime4j/decoder/DecoderUtilTest.java (original)
+++ james/mime4j/branches/repackaging-proposal/src/test/java/org/apache/james/mime4j/util/DecoderUtilTest.java Sun Jul 13 09:31:14 2008
@@ -17,13 +17,13 @@
* under the License. *
****************************************************************/
-package org.apache.james.mime4j.decoder;
+package org.apache.james.mime4j.util;
import java.io.UnsupportedEncodingException;
import junit.framework.TestCase;
-import org.apache.james.mime4j.decoder.DecoderUtil;
+import org.apache.james.mime4j.util.DecoderUtil;
import org.apache.log4j.BasicConfigurator;
/**
Modified: james/mime4j/branches/repackaging-proposal/src/test/java/org/apache/james/mime4j/util/QuotedPrintableEncodeTest.java
URL: http://svn.apache.org/viewvc/james/mime4j/branches/repackaging-proposal/src/test/java/org/apache/james/mime4j/util/QuotedPrintableEncodeTest.java?rev=676351&r1=676350&r2=676351&view=diff
==============================================================================
--- james/mime4j/branches/repackaging-proposal/src/test/java/org/apache/james/mime4j/util/QuotedPrintableEncodeTest.java (original)
+++ james/mime4j/branches/repackaging-proposal/src/test/java/org/apache/james/mime4j/util/QuotedPrintableEncodeTest.java Sun Jul 13 09:31:14 2008
@@ -25,7 +25,6 @@
import java.util.Arrays;
import org.apache.commons.io.IOUtils;
-import org.apache.james.mime4j.decoder.QuotedPrintableInputStream;
import junit.framework.TestCase;
Copied: james/mime4j/branches/repackaging-proposal/src/test/java/org/apache/james/mime4j/util/QuotedPrintableInputStreamTest.java (from r676347, james/mime4j/branches/repackaging-proposal/src/test/java/org/apache/james/mime4j/decoder/QuotedPrintableInputStreamTest.java)
URL: http://svn.apache.org/viewvc/james/mime4j/branches/repackaging-proposal/src/test/java/org/apache/james/mime4j/util/QuotedPrintableInputStreamTest.java?p2=james/mime4j/branches/repackaging-proposal/src/test/java/org/apache/james/mime4j/util/QuotedPrintableInputStreamTest.java&p1=james/mime4j/branches/repackaging-proposal/src/test/java/org/apache/james/mime4j/decoder/QuotedPrintableInputStreamTest.java&r1=676347&r2=676351&rev=676351&view=diff
==============================================================================
--- james/mime4j/branches/repackaging-proposal/src/test/java/org/apache/james/mime4j/decoder/QuotedPrintableInputStreamTest.java (original)
+++ james/mime4j/branches/repackaging-proposal/src/test/java/org/apache/james/mime4j/util/QuotedPrintableInputStreamTest.java Sun Jul 13 09:31:14 2008
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mime4j.decoder;
+package org.apache.james.mime4j.util;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -27,7 +27,7 @@
import junit.framework.TestCase;
-import org.apache.james.mime4j.decoder.QuotedPrintableInputStream;
+import org.apache.james.mime4j.util.QuotedPrintableInputStream;
import org.apache.log4j.BasicConfigurator;
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org