Author: bago
Date: Sun Apr 17 12:53:34 2011
New Revision: 1094139
URL: http://svn.apache.org/viewvc?rev=1094139&view=rev
Log:
updated code to reflect current mime4j trunk (MIME4J-191, MIME4J-192). Code
still depends on "MimeWriter" (MIME4J-193)
Modified:
james/jdkim/trunk/main/src/main/java/org/apache/james/jdkim/impl/Message.java
james/jdkim/trunk/main/src/main/java/org/apache/james/jdkim/tagvalue/TagValue.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=1094139&r1=1094138&r2=1094139&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
Sun Apr 17 12:53:34 2011
@@ -33,7 +33,7 @@ import org.apache.james.mime4j.dom.Messa
import org.apache.james.mime4j.dom.SingleBody;
import org.apache.james.mime4j.dom.field.Field;
import org.apache.james.mime4j.io.EOLConvertingInputStream;
-import org.apache.james.mime4j.message.MessageBuilderImpl;
+import org.apache.james.mime4j.message.MimeWriter;
import org.apache.james.mime4j.stream.MimeEntityConfig;
/**
@@ -57,10 +57,6 @@ public class Message implements Headers
public Message(InputStream is) throws IOException, MimeException {
MessageBuilder mb = newMessageBuilder();
- if (mb instanceof MessageBuilderImpl) {
- ((MessageBuilderImpl) mb).setFlatMode(true);
- ((MessageBuilderImpl) mb).setContentDecoding(false);
- }
org.apache.james.mime4j.dom.Message mImpl = mb.parse(new
EOLConvertingInputStream(is));
this.message = mImpl;
@@ -73,8 +69,12 @@ public class Message implements Headers
MessageServiceFactory mbf = MessageServiceFactory.newInstance();
mbf.setAttribute("MimeEntityConfig", mec);
+ mbf.setAttribute("FlatMode", true);
+ mbf.setAttribute("ContentDecoding", false);
+
// mbf.setProperty("MaxLineLength", 10000);
MessageBuilder mb = mbf.newMessageBuilder();
+
return mb;
}
@@ -100,8 +100,10 @@ public class Message implements Headers
ByteArrayOutputStream bos = new ByteArrayOutputStream();
String field = null;
try {
- f.writeTo(bos);
- field = new String(bos.toByteArray());
+ MimeWriter.DEFAULT.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);
} catch (IOException e) {
}
res2.add(field);
Modified:
james/jdkim/trunk/main/src/main/java/org/apache/james/jdkim/tagvalue/TagValue.java
URL:
http://svn.apache.org/viewvc/james/jdkim/trunk/main/src/main/java/org/apache/james/jdkim/tagvalue/TagValue.java?rev=1094139&r1=1094138&r2=1094139&view=diff
==============================================================================
---
james/jdkim/trunk/main/src/main/java/org/apache/james/jdkim/tagvalue/TagValue.java
(original)
+++
james/jdkim/trunk/main/src/main/java/org/apache/james/jdkim/tagvalue/TagValue.java
Sun Apr 17 12:53:34 2011
@@ -149,7 +149,7 @@ public class TagValue {
&& trimFWS(rest, 0, rest.length() - 1, true).length()
> 0) {
throw new IllegalStateException(
"Unexpected termination at position " + i + ": "
- + data);
+ + data + " | [" + rest + "]");
}
i = data.length();
continue;
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
