Author: bago
Date: Fri Jun 17 08:36:11 2011
New Revision: 1136807
URL: http://svn.apache.org/viewvc?rev=1136807&view=rev
Log:
Update jDKIM to the latest mime4j trunk (near to 0.7 release?), also using
MessageFormatter instead of MimeWriter (see MIME4J-193)
Modified:
james/jdkim/trunk/main/src/main/java/org/apache/james/jdkim/impl/Message.java
Modified:
james/jdkim/trunk/main/src/main/java/org/apache/james/jdkim/impl/Message.java
URL:
http://svn.apache.org/viewvc/james/jdkim/trunk/main/src/main/java/org/apache/james/jdkim/impl/Message.java?rev=1136807&r1=1136806&r2=1136807&view=diff
==============================================================================
---
james/jdkim/trunk/main/src/main/java/org/apache/james/jdkim/impl/Message.java
(original)
+++
james/jdkim/trunk/main/src/main/java/org/apache/james/jdkim/impl/Message.java
Fri Jun 17 08:36:11 2011
@@ -29,11 +29,11 @@ import org.apache.james.jdkim.api.Header
import org.apache.james.mime4j.MimeException;
import org.apache.james.mime4j.MimeIOException;
import org.apache.james.mime4j.dom.MessageBuilder;
+import org.apache.james.mime4j.dom.MessageFormatter;
import org.apache.james.mime4j.dom.MessageServiceFactory;
import org.apache.james.mime4j.dom.SingleBody;
-import org.apache.james.mime4j.dom.field.Field;
+import org.apache.james.mime4j.stream.Field;
import org.apache.james.mime4j.io.EOLConvertingInputStream;
-import org.apache.james.mime4j.message.MimeWriter;
import org.apache.james.mime4j.stream.MimeEntityConfig;
/**
@@ -55,14 +55,13 @@ public class Message implements Headers
* on MIME protocol violations.
*/
public Message(InputStream is) throws IOException, MimeException {
- MessageBuilder mb = newMessageBuilder();
-
+ MessageBuilder mb = newMessageBuilder().newMessageBuilder();
org.apache.james.mime4j.dom.Message mImpl = mb.parse(new
EOLConvertingInputStream(is));
this.message = mImpl;
}
- private MessageBuilder newMessageBuilder() throws MimeException {
+ private MessageServiceFactory newMessageBuilder() throws MimeException {
MimeEntityConfig mec = new MimeEntityConfig();
mec.setMaxLineLen(10000);
mec.setMaxHeaderLen(30000);
@@ -72,10 +71,7 @@ public class Message implements Headers
mbf.setAttribute("FlatMode", true);
mbf.setAttribute("ContentDecoding", false);
- // mbf.setProperty("MaxLineLength", 10000);
- MessageBuilder mb = mbf.newMessageBuilder();
-
- return mb;
+ return mbf;
}
public InputStream getBodyInputStream() {
@@ -96,11 +92,17 @@ public class Message implements Headers
private List<String> convertFields(List<Field> res) {
List<String> res2 = new LinkedList<String>();
+ MessageFormatter mf;
+ try {
+ mf = newMessageBuilder().newMessageFormatter();
+ } catch (MimeException e1) {
+ return res2;
+ }
for (Field f : res) {
ByteArrayOutputStream bos = new ByteArrayOutputStream();
String field = null;
try {
- MimeWriter.DEFAULT.writeField(f, bos);
+ mf.writeField(f, bos);
// writeField always ends with CRLF and we don't want it.
byte[] fieldbytes = bos.toByteArray();
field = new String(fieldbytes, 0, fieldbytes.length - 2);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
