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 2011/06/21 00:34:28 UTC
svn commit: r1137807 -
/james/jdkim/trunk/main/src/main/java/org/apache/james/jdkim/impl/Message.java
Author: bago
Date: Mon Jun 20 22:34:28 2011
New Revision: 1137807
URL: http://svn.apache.org/viewvc?rev=1137807&view=rev
Log:
Update jDKIM to latest mime4j trunk (MessageFormatter => MessageWriter)
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=1137807&r1=1137806&r2=1137807&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 Mon Jun 20 22:34:28 2011
@@ -29,7 +29,7 @@ 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.MessageWriter;
import org.apache.james.mime4j.dom.MessageServiceFactory;
import org.apache.james.mime4j.dom.SingleBody;
import org.apache.james.mime4j.stream.Field;
@@ -56,7 +56,7 @@ public class Message implements Headers
*/
public Message(InputStream is) throws IOException, MimeException {
MessageBuilder mb = newMessageBuilder().newMessageBuilder();
- org.apache.james.mime4j.dom.Message mImpl = mb.parse(new EOLConvertingInputStream(is));
+ org.apache.james.mime4j.dom.Message mImpl = mb.parseMessage(new EOLConvertingInputStream(is));
this.message = mImpl;
}
@@ -92,9 +92,9 @@ public class Message implements Headers
private List<String> convertFields(List<Field> res) {
List<String> res2 = new LinkedList<String>();
- MessageFormatter mf;
+ MessageWriter mw;
try {
- mf = newMessageBuilder().newMessageFormatter();
+ mw = newMessageBuilder().newMessageWriter();
} catch (MimeException e1) {
return res2;
}
@@ -102,7 +102,7 @@ public class Message implements Headers
ByteArrayOutputStream bos = new ByteArrayOutputStream();
String field = null;
try {
- mf.writeField(f, bos);
+ mw.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: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org