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 er...@apache.org on 2015/05/29 06:19:40 UTC
svn commit: r1682364 - in /james/mailbox/trunk: ./
lucene/src/main/java/org/apache/james/mailbox/lucene/search/
maildir/src/main/java/org/apache/james/mailbox/maildir/mail/model/
store/src/main/java/org/apache/james/mailbox/store/ store/src/main/java/o...
Author: eric
Date: Fri May 29 04:19:39 2015
New Revision: 1682364
URL: http://svn.apache.org/r1682364
Log:
Mailbox: update mime4j to 0.8.0-SNAPSHOT, patch contributed by Matthieu Baechler (MAILBOX-230)
Modified:
james/mailbox/trunk/lucene/src/main/java/org/apache/james/mailbox/lucene/search/LuceneMessageSearchIndex.java
james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/model/MaildirMessage.java
james/mailbox/trunk/pom.xml
james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/MimeDescriptorImpl.java
james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/ResultUtils.java
james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/StoreMessageManager.java
james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/search/MessageSearcher.java
james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/search/MessageSearches.java
james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/search/SearchUtil.java
james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/streaming/PartContentBuilder.java
Modified: james/mailbox/trunk/lucene/src/main/java/org/apache/james/mailbox/lucene/search/LuceneMessageSearchIndex.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/lucene/src/main/java/org/apache/james/mailbox/lucene/search/LuceneMessageSearchIndex.java?rev=1682364&r1=1682363&r2=1682364&view=diff
==============================================================================
--- james/mailbox/trunk/lucene/src/main/java/org/apache/james/mailbox/lucene/search/LuceneMessageSearchIndex.java (original)
+++ james/mailbox/trunk/lucene/src/main/java/org/apache/james/mailbox/lucene/search/LuceneMessageSearchIndex.java Fri May 29 04:19:39 2015
@@ -70,7 +70,7 @@ import org.apache.james.mime4j.dom.addre
import org.apache.james.mime4j.dom.datetime.DateTime;
import org.apache.james.mime4j.dom.field.DateTimeField;
import org.apache.james.mime4j.field.address.AddressFormatter;
-import org.apache.james.mime4j.field.address.LenientAddressBuilder;
+import org.apache.james.mime4j.field.address.LenientAddressParser;
import org.apache.james.mime4j.field.datetime.parser.DateTimeParser;
import org.apache.james.mime4j.message.SimpleContentHandler;
import org.apache.james.mime4j.parser.MimeStreamParser;
@@ -519,7 +519,7 @@ public class LuceneMessageSearchIndex<Id
if (field != null) {
// not sure if we really should reparse it. It maybe be better to check just for the right type.
// But this impl was easier in the first place
- AddressList aList = LenientAddressBuilder.DEFAULT.parseAddressList(MimeUtil.unfold(f.getBody()));
+ AddressList aList = LenientAddressParser.DEFAULT.parseAddressList(MimeUtil.unfold(f.getBody()));
for (int i = 0; i < aList.size(); i++) {
Address address = aList.get(i);
if (address instanceof org.apache.james.mime4j.dom.address.Mailbox) {
@@ -625,10 +625,11 @@ public class LuceneMessageSearchIndex<Id
}
};
- MimeConfig config = new MimeConfig();
- config.setMaxLineLen(-1);
+ MimeConfig config = MimeConfig.custom()
+ .setMaxLineLen(-1)
+ .setMaxContentLen(-1)
+ .build();
//config.setStrictParsing(false);
- config.setMaxContentLen(-1);
MimeStreamParser parser = new MimeStreamParser(config);
parser.setContentDecoding(true);
parser.setContentHandler(handler);
Modified: james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/model/MaildirMessage.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/model/MaildirMessage.java?rev=1682364&r1=1682363&r2=1682364&view=diff
==============================================================================
--- james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/model/MaildirMessage.java (original)
+++ james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/model/MaildirMessage.java Fri May 29 04:19:39 2015
@@ -227,8 +227,7 @@ public class MaildirMessage extends Abst
// Disable line length... This should be handled by the smtp server
// component and not the parser itself
// https://issues.apache.org/jira/browse/IMAP-122
- MimeConfig config = new MimeConfig();
- config.setMaxLineLen(-1);
+ MimeConfig config = MimeConfig.custom().setMaxLineLen(-1).build();
final MimeTokenStream parser = new MimeTokenStream(config, new DefaultBodyDescriptorBuilder());
parser.setRecursionMode(RecursionMode.M_NO_RECURSE);
parser.parse(tmpMsgIn.newStream(0, -1));
Modified: james/mailbox/trunk/pom.xml
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/pom.xml?rev=1682364&r1=1682363&r2=1682364&view=diff
==============================================================================
--- james/mailbox/trunk/pom.xml (original)
+++ james/mailbox/trunk/pom.xml Fri May 29 04:19:39 2015
@@ -89,7 +89,7 @@
<openjpa.version>2.2.1</openjpa.version>
<javax.persistence.version>1.0.2</javax.persistence.version>
<javax.inject.version>1</javax.inject.version>
- <apache-mime4j.version>0.7.2</apache-mime4j.version>
+ <apache-mime4j.version>0.8.0-SNAPSHOT</apache-mime4j.version>
<javax.mail.version>1.4.1</javax.mail.version>
<activation.version>1.1.1</activation.version>
<jmock.version>2.5.1</jmock.version>
Modified: james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/MimeDescriptorImpl.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/MimeDescriptorImpl.java?rev=1682364&r1=1682363&r2=1682364&view=diff
==============================================================================
--- james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/MimeDescriptorImpl.java (original)
+++ james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/MimeDescriptorImpl.java Fri May 29 04:19:39 2015
@@ -62,10 +62,7 @@ public class MimeDescriptorImpl implemen
public static MimeDescriptorImpl build(final InputStream stream) throws IOException, MimeException {
// Disable line length limit
// See https://issues.apache.org/jira/browse/IMAP-132
- MimeConfig config = new MimeConfig();
- config.setMaxLineLen(-1);
- config.setMaxHeaderLen(-1);
-
+ MimeConfig config = MimeConfig.custom().setMaxLineLen(-1).setMaxHeaderLen(-1).build();
//
final MimeTokenStream parser = new MimeTokenStream(config, new DefaultBodyDescriptorBuilder());
Modified: james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/ResultUtils.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/ResultUtils.java?rev=1682364&r1=1682363&r2=1682364&view=diff
==============================================================================
--- james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/ResultUtils.java (original)
+++ james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/ResultUtils.java Fri May 29 04:19:39 2015
@@ -55,9 +55,7 @@ public class ResultUtils {
public static List<MessageResult.Header> createHeaders(final Message<?> document) throws IOException {
final List<MessageResult.Header> results = new ArrayList<MessageResult.Header>();
- MimeConfig config = new MimeConfig();
- config.setMaxLineLen(-1);
- config.setMaxHeaderLen(-1);
+ MimeConfig config = MimeConfig.custom().setMaxLineLen(-1).setMaxHeaderLen(-1).build();
final MimeStreamParser parser = new MimeStreamParser(config);
parser.setContentHandler(new AbstractContentHandler() {
@Override
Modified: james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/StoreMessageManager.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/StoreMessageManager.java?rev=1682364&r1=1682363&r2=1682364&view=diff
==============================================================================
--- james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/StoreMessageManager.java (original)
+++ james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/StoreMessageManager.java Fri May 29 04:19:39 2015
@@ -266,9 +266,7 @@ public class StoreMessageManager<Id> imp
// Disable line length... This should be handled by the smtp server
// component and not the parser itself
// https://issues.apache.org/jira/browse/IMAP-122
- MimeConfig config = new MimeConfig();
- config.setMaxLineLen(-1);
- config.setMaxHeaderLen(-1);
+ MimeConfig config = MimeConfig.custom().setMaxLineLen(-1).setMaxHeaderLen(-1).build();
final MimeTokenStream parser = new MimeTokenStream(config, new DefaultBodyDescriptorBuilder());
Modified: james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/search/MessageSearcher.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/search/MessageSearcher.java?rev=1682364&r1=1682363&r2=1682364&view=diff
==============================================================================
--- james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/search/MessageSearcher.java (original)
+++ james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/search/MessageSearcher.java Fri May 29 04:19:39 2015
@@ -155,9 +155,7 @@ public class MessageSearcher {
final CharBuffer buffer) throws IOException, MimeException {
try {
boolean result = false;
- MimeConfig config = new MimeConfig();
- config.setMaxLineLen(-1);
- config.setMaxHeaderLen(-1);
+ MimeConfig config = MimeConfig.custom().setMaxLineLen(-1).setMaxHeaderLen(-1).build();
MimeTokenStream parser = new MimeTokenStream(config); parser.parse(input);
while (!result && parser.next() != EntityState.T_END_OF_STREAM) {
Modified: james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/search/MessageSearches.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/search/MessageSearches.java?rev=1682364&r1=1682363&r2=1682364&view=diff
==============================================================================
--- james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/search/MessageSearches.java (original)
+++ james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/search/MessageSearches.java Fri May 29 04:19:39 2015
@@ -54,7 +54,7 @@ import org.apache.james.mime4j.dom.addre
import org.apache.james.mime4j.dom.address.MailboxList;
import org.apache.james.mime4j.dom.datetime.DateTime;
import org.apache.james.mime4j.field.address.AddressFormatter;
-import org.apache.james.mime4j.field.address.LenientAddressBuilder;
+import org.apache.james.mime4j.field.address.LenientAddressParser;
import org.apache.james.mime4j.field.datetime.parser.DateTimeParser;
import org.apache.james.mime4j.field.datetime.parser.ParseException;
import org.slf4j.Logger;
@@ -367,7 +367,7 @@ public class MessageSearches implements
final String name = header.getName();
if (headerName.equalsIgnoreCase(name)) {
final String value = header.getValue();
- AddressList aList = LenientAddressBuilder.DEFAULT.parseAddressList(value);
+ AddressList aList = LenientAddressParser.DEFAULT.parseAddressList(value);
for (int i = 0; i < aList.size(); i++) {
Address address = aList.get(i);
if (address instanceof Mailbox) {
Modified: james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/search/SearchUtil.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/search/SearchUtil.java?rev=1682364&r1=1682363&r2=1682364&view=diff
==============================================================================
--- james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/search/SearchUtil.java (original)
+++ james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/search/SearchUtil.java Fri May 29 04:19:39 2015
@@ -28,7 +28,7 @@ import org.apache.james.mime4j.dom.addre
import org.apache.james.mime4j.dom.address.Group;
import org.apache.james.mime4j.dom.address.Mailbox;
import org.apache.james.mime4j.dom.address.MailboxList;
-import org.apache.james.mime4j.field.address.LenientAddressBuilder;
+import org.apache.james.mime4j.field.address.LenientAddressParser;
import org.apache.james.mime4j.util.MimeUtil;
/**
@@ -107,7 +107,7 @@ public class SearchUtil {
* @return display
*/
public static String getDisplayAddress(String headerValue) {
- AddressList addressList = LenientAddressBuilder.DEFAULT.parseAddressList(MimeUtil.unfold(headerValue));
+ AddressList addressList = LenientAddressParser.DEFAULT.parseAddressList(MimeUtil.unfold(headerValue));
if (addressList != null && addressList.isEmpty() == false) {
Address address = addressList.get(0);
if (address instanceof Mailbox) {
@@ -149,7 +149,7 @@ public class SearchUtil {
* @return mailbox
*/
public static String getMailboxAddress(String headerValue) {
- AddressList aList = LenientAddressBuilder.DEFAULT.parseAddressList(headerValue);
+ AddressList aList = LenientAddressParser.DEFAULT.parseAddressList(headerValue);
for (int i = 0; i < aList.size(); i++) {
Address address = aList.get(i);
if (address instanceof Mailbox) {
Modified: james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/streaming/PartContentBuilder.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/streaming/PartContentBuilder.java?rev=1682364&r1=1682363&r2=1682364&view=diff
==============================================================================
--- james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/streaming/PartContentBuilder.java (original)
+++ james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/streaming/PartContentBuilder.java Fri May 29 04:19:39 2015
@@ -49,9 +49,7 @@ public class PartContentBuilder {
private boolean topLevel = true;
public PartContentBuilder() {
- MimeConfig config = new MimeConfig();
- config.setMaxLineLen(-1);
- config.setMaxHeaderLen(-1);
+ MimeConfig config = MimeConfig.custom().setMaxLineLen(-1).setMaxHeaderLen(-1).build();
parser = new MimeTokenStream(config);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org