[prev in list] [next in list] [prev in thread] [next in thread]
List: james-dev
Subject: [2/5] james-project git commit: JAMES-2034 switch apache-mime4j.version from 0.8.0 to 0.8.1-SNAPSHOT
From: btellier () apache ! org
Date: 2017-05-31 6:58:25
Message-ID: 9c59dfa59b5044638b0b0b9c6b3586d4 () git ! apache ! org
[Download RAW message or body]
JAMES-2034 switch apache-mime4j.version from 0.8.0 to 0.8.1-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/83019ff5
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/83019ff5
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/83019ff5
Branch: refs/heads/master
Commit: 83019ff51d3b4b43f46aec8d91def442f8a1ab7e
Parents: d76e3c0
Author: Luc DUZAN <lduzan@linagora.com>
Authored: Wed May 24 17:44:44 2017 +0200
Committer: benwa <btellier@linagora.com>
Committed: Wed May 31 13:56:58 2017 +0700
----------------------------------------------------------------------
.../util/mime/MessageContentExtractorTest.java | 46 ++++++++++----------
server/pom.xml | 2 +-
.../apache/james/jmap/model/MessageFactory.java | 4 +-
.../james/jmap/model/MessageFactoryTest.java | 3 --
4 files changed, 26 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/83019ff5/server/container/ut \
il-java8/src/test/java/org/apache/james/util/mime/MessageContentExtractorTest.java
----------------------------------------------------------------------
diff --git a/server/container/util-java8/src/test/java/org/apache/james/util/mime/MessageContentExtractorTest.java \
b/server/container/util-java8/src/test/java/org/apache/james/util/mime/MessageContentExtractorTest.java
index 0a4750f..940a0ad 100644
--- a/server/container/util-java8/src/test/java/org/apache/james/util/mime/MessageContentExtractorTest.java
+++ b/server/container/util-java8/src/test/java/org/apache/james/util/mime/MessageContentExtractorTest.java
@@ -33,8 +33,8 @@ import org.apache.james.mime4j.message.BasicBodyFactory;
import org.apache.james.mime4j.message.BodyPart;
import org.apache.james.mime4j.message.BodyPartBuilder;
import org.apache.james.mime4j.message.HeaderImpl;
-import org.apache.james.mime4j.message.MessageBuilder;
import org.apache.james.mime4j.message.MultipartBuilder;
+import org.apache.james.mime4j.dom.Message;
import org.apache.james.mime4j.stream.Field;
import org.apache.james.mime4j.util.ByteSequence;
import org.apache.james.util.mime.MessageContentExtractor.MessageContent;
@@ -97,7 +97,7 @@ public class MessageContentExtractorTest {
@Test
public void extractShouldReturnEmptyWhenBinaryContentOnly() throws IOException {
- Message message = MessageBuilder.create()
+ Message message = Message.Builder.of()
.setBody(BasicBodyFactory.INSTANCE.binaryBody(BINARY_CONTENT, \
Charsets.UTF_8))
.build();
MessageContent actual = testee.extract(message);
@@ -107,7 +107,7 @@ public class MessageContentExtractorTest {
@Test
public void extractShouldReturnTextOnlyWhenTextOnlyBody() throws IOException {
- Message message = MessageBuilder.create()
+ Message message = Message.Builder.of()
.setBody(TEXT_CONTENT, Charsets.UTF_8)
.build();
MessageContent actual = testee.extract(message);
@@ -117,7 +117,7 @@ public class MessageContentExtractorTest {
@Test
public void extractShouldReturnHtmlOnlyWhenHtmlOnlyBody() throws IOException {
- Message message = MessageBuilder.create()
+ Message message = Message.Builder.of()
.setBody(HTML_CONTENT, "html", Charsets.UTF_8)
.build();
MessageContent actual = testee.extract(message);
@@ -131,7 +131,7 @@ public class MessageContentExtractorTest {
.addBodyPart(textPart)
.addBodyPart(htmlPart)
.build();
- Message message = MessageBuilder.create()
+ Message message = Message.Builder.of()
.setBody(multipart)
.build();
MessageContent actual = testee.extract(message);
@@ -144,7 +144,7 @@ public class MessageContentExtractorTest {
Multipart multipart = MultipartBuilder.create("alternative")
.addBodyPart(htmlPart)
.build();
- Message message = MessageBuilder.create()
+ Message message = Message.Builder.of()
.setBody(multipart)
.build();
MessageContent actual = testee.extract(message);
@@ -157,7 +157,7 @@ public class MessageContentExtractorTest {
Multipart multipart = MultipartBuilder.create("alternative")
.addBodyPart(textPart)
.build();
- Message message = MessageBuilder.create()
+ Message message = Message.Builder.of()
.setBody(multipart)
.build();
MessageContent actual = testee.extract(message);
@@ -172,7 +172,7 @@ public class MessageContentExtractorTest {
.addBodyPart(htmlPart)
.addBodyPart(textPart)
.build();
- Message message = MessageBuilder.create()
+ Message message = Message.Builder.of()
.setBody(multipart)
.build();
MessageContent actual = testee.extract(message);
@@ -193,7 +193,7 @@ public class MessageContentExtractorTest {
.setContentDisposition("inline")
.build())
.build();
- Message message = MessageBuilder.create()
+ Message message = Message.Builder.of()
.setBody(multipart)
.build();
@@ -207,7 +207,7 @@ public class MessageContentExtractorTest {
Multipart multipart = MultipartBuilder.create("mixed")
.addBodyPart(textAttachment)
.build();
- Message message = MessageBuilder.create()
+ Message message = Message.Builder.of()
.setBody(multipart)
.build();
MessageContent actual = testee.extract(message);
@@ -221,7 +221,7 @@ public class MessageContentExtractorTest {
.addBodyPart(htmlPart)
.addBodyPart(textPart)
.build();
- Message message = MessageBuilder.create()
+ Message message = Message.Builder.of()
.setBody(multipart)
.build();
MessageContent actual = testee.extract(message);
@@ -240,7 +240,7 @@ public class MessageContentExtractorTest {
Multipart multipartMixed = MultipartBuilder.create("mixed")
.addBodyPart(multipartAlternative)
.build();
- Message message = MessageBuilder.create()
+ Message message = Message.Builder.of()
.setBody(multipartMixed)
.build();
MessageContent actual = testee.extract(message);
@@ -253,7 +253,7 @@ public class MessageContentExtractorTest {
Multipart multipart = MultipartBuilder.create("related")
.addBodyPart(htmlPart)
.build();
- Message message = MessageBuilder.create()
+ Message message = Message.Builder.of()
.setBody(multipart)
.build();
MessageContent actual = testee.extract(message);
@@ -271,7 +271,7 @@ public class MessageContentExtractorTest {
Multipart multipartAlternative = MultipartBuilder.create("alternative")
.addBodyPart(multipartRelated)
.build();
- Message message = MessageBuilder.create()
+ Message message = Message.Builder.of()
.setBody(multipartAlternative)
.build();
MessageContent actual = testee.extract(message);
@@ -291,7 +291,7 @@ public class MessageContentExtractorTest {
Multipart multipartAlternative = MultipartBuilder.create("alternative")
.addBodyPart(inlinedHTMLPart)
.build();
- Message message = MessageBuilder.create()
+ Message message = Message.Builder.of()
.setBody(multipartAlternative)
.build();
@@ -316,7 +316,7 @@ public class MessageContentExtractorTest {
Multipart multipartAlternative = MultipartBuilder.create("alternative")
.addBodyPart(inlinedHTMLPart)
.build();
- Message message = MessageBuilder.create()
+ Message message = Message.Builder.of()
.setBody(multipartAlternative)
.build();
@@ -341,7 +341,7 @@ public class MessageContentExtractorTest {
Multipart multipartAlternative = MultipartBuilder.create("alternative")
.addBodyPart(inlinedTextPart)
.build();
- Message message = MessageBuilder.create()
+ Message message = Message.Builder.of()
.setBody(multipartAlternative)
.build();
@@ -366,7 +366,7 @@ public class MessageContentExtractorTest {
Multipart multipartAlternative = MultipartBuilder.create("alternative")
.addBodyPart(inlinedTextPart)
.build();
- Message message = MessageBuilder.create()
+ Message message = Message.Builder.of()
.setBody(multipartAlternative)
.build();
@@ -391,7 +391,7 @@ public class MessageContentExtractorTest {
.addBodyPart(inlineText)
.build();
- Message message = MessageBuilder.create()
+ Message message = Message.Builder.of()
.setBody(multipartMixed)
.build();
@@ -414,7 +414,7 @@ public class MessageContentExtractorTest {
.addBodyPart(multipartRelated)
.build();
- Message message = MessageBuilder.create()
+ Message message = Message.Builder.of()
.setBody(multipartAlternative)
.build();
@@ -492,7 +492,7 @@ public class MessageContentExtractorTest {
@Test
public void extractShouldRespectCharsetWhenOtherThanUTF8() throws IOException {
String text = "éééé\r\nèèèè\r\nà à à à ";
- Message message = MessageBuilder.create()
+ Message message = Message.Builder.of()
.setBody(text, Charset.forName("windows-1252"))
.build();
MessageContent actual = testee.extract(message);
@@ -502,7 +502,7 @@ public class MessageContentExtractorTest {
@Test
public void extractShouldRespectCharsetWhenUTF8() throws IOException {
String text = "éééé\r\nèèèè\r\nà à à à ";
- Message message = MessageBuilder.create()
+ Message message = Message.Builder.of()
.setBody(text, Charsets.UTF_8)
.build();
MessageContent actual = testee.extract(message);
@@ -512,7 +512,7 @@ public class MessageContentExtractorTest {
@Test
public void extractShouldUseUSASCIIWhenNoCharset() throws IOException {
String text = "éééé\r\nèèèè\r\nà à à à ";
- Message message = MessageBuilder.create()
+ Message message = Message.Builder.of()
.setBody(text, null)
.build();
MessageContent actual = testee.extract(message);
http://git-wip-us.apache.org/repos/asf/james-project/blob/83019ff5/server/pom.xml
----------------------------------------------------------------------
diff --git a/server/pom.xml b/server/pom.xml
index 2999ce3..f2749ee 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -119,7 +119,7 @@
<productName>Apache-James Mail Server</productName>
<activemq.version>5.10.2</activemq.version>
- <apache-mime4j.version>0.8.0</apache-mime4j.version>
+ <apache-mime4j.version>0.8.1-SNAPSHOT</apache-mime4j.version>
<camel.version>2.13.4</camel.version>
<derby.version>10.9.1.0</derby.version>
<hadoop.version>1.1.1</hadoop.version>
http://git-wip-us.apache.org/repos/asf/james-project/blob/83019ff5/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/MessageFactory.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/MessageFactory.java \
b/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/MessageFactory.java \
index c99c371..afce368 100644
--- a/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/MessageFactory.java
+++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/MessageFactory.java
@@ -134,8 +134,8 @@ public class MessageFactory {
private org.apache.james.mime4j.dom.Message parse(MetaDataWithContent message) \
throws MailboxException { try {
- return MessageBuilder
- .create()
+ return org.apache.james.mime4j.dom.Message.Builder
+ .of()
.use(MIME_ENTITY_CONFIG)
.parse(message.getContent())
.build();
http://git-wip-us.apache.org/repos/asf/james-project/blob/83019ff5/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/MessageFactoryTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/MessageFactoryTest.java \
b/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/MessageFactoryTest.java
index a976feb..0cd8c5f 100644
--- a/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/MessageFactoryTest.java
+++ b/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/MessageFactoryTest.java
@@ -71,7 +71,6 @@ public class MessageFactoryTest {
}
@Test
- @Ignore
public void emptyMailShouldBeLoadedIntoMessage() throws Exception {
MetaDataWithContent testMail = MetaDataWithContent.builder()
.uid(MessageUid.of(2))
@@ -113,7 +112,6 @@ public class MessageFactoryTest {
}
@Test
- @Ignore
public void headersShouldBeSetIntoMessage() throws Exception {
String headers = "From: user <user@domain>\n"
+ "Subject: test subject\n"
@@ -341,7 +339,6 @@ public class MessageFactoryTest {
}
@Test
- @Ignore
public void mailWithBigLinesShouldBeLoadedIntoMessage() throws Exception {
MetaDataWithContent testMail = MetaDataWithContent.builder()
.uid(MessageUid.of(2))
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic