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 ro...@apache.org on 2016/07/19 13:39:02 UTC

[05/10] james-project git commit: JAMES-1799 Extract ListeningMessageSearchIndex tests from ES implementation

http://git-wip-us.apache.org/repos/asf/james-project/blob/d5b3a42c/mailbox/elasticsearch/src/test/resources/documents/mail1.eml
----------------------------------------------------------------------
diff --git a/mailbox/elasticsearch/src/test/resources/documents/mail1.eml b/mailbox/elasticsearch/src/test/resources/documents/mail1.eml
deleted file mode 100644
index 3850a62..0000000
--- a/mailbox/elasticsearch/src/test/resources/documents/mail1.eml
+++ /dev/null
@@ -1,69 +0,0 @@
-Return-Path: <se...@james.apache.org>
-Received: from mx1.minet.net (mx1.minet.net [192.168.102.25])
-	 by imap (Cyrus v2.4.16-Debian-2.4.16-4+deb7u1) with LMTPA;
-	 Thu, 04 Jun 2015 11:23:39 +0200
-X-Sieve: CMU Sieve 2.4
-Received: from localhost (spam.minet.net [192.168.102.97])
-	by mx1.minet.net (Postfix) with ESMTP id 0113F385C15
-	for <be...@minet.net>; Thu,  4 Jun 2015 11:23:43 +0200 (CEST)
-X-Virus-Scanned: by amavisd-new using ClamAV at minet.net
-X-Spam-Flag: NO
-X-Spam-Score: -1.51
-X-Spam-Level:
-X-Spam-Status: No, score=-1.51 required=1 tests=[BAYES_00=-1.5,
-	T_RP_MATCHES_RCVD=-0.01] autolearn=ham
-Received: from mx2.minet.net ([IPv6:::ffff:192.168.102.26])
-	by localhost (spam.minet.net [::ffff:192.168.102.97]) (amavisd-new, port 10024)
-	with ESMTP id IeILbadS9lo5 for <be...@minet.net>;
-	Thu,  4 Jun 2015 09:23:42 +0000 (UTC)
-Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=140.211.11.3; helo=mail.apache.org; envelope-from=server-dev-return-56862-benwa=minet.net@james.apache.org; receiver=benwa@minet.net
-Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
-	by mx2.minet.net (Postfix) with SMTP id CDE83A1C7FC
-	for <be...@minet.net>; Thu,  4 Jun 2015 11:23:40 +0200 (CEST)
-Received: (qmail 37249 invoked by uid 500); 4 Jun 2015 09:23:38 -0000
-Mailing-List: contact server-dev-help@james.apache.org; run by ezmlm
-Precedence: bulk
-List-Unsubscribe: <ma...@james.apache.org>
-List-Help: <ma...@james.apache.org>
-List-Post: <ma...@james.apache.org>
-List-Id: "James Developers List" <server-dev.james.apache.org>
-Reply-To: "James Developers List" <se...@james.apache.org>
-Delivered-To: mailing list server-dev@james.apache.org
-Received: (qmail 37236 invoked by uid 99); 4 Jun 2015 09:23:38 -0000
-Received: from arcas.apache.org (HELO arcas.apache.org) (140.211.11.28)
-    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 04 Jun 2015 09:23:38 +0000
-Date: Thu, 4 Jun 2015 09:23:37 +0000 (UTC)
-From: "Tellier Benoit (JIRA)" <ji...@apache.org>
-To: "abc" <se...@james.apache.org>
-Message-ID: <JI...@Atlassian.JIRA>
-In-Reply-To: <JI...@Atlassian.JIRA>
-References: <JI...@Atlassian.JIRA> <JI...@arcas>
-Subject: [jira] [Created] (MAILBOX-234) Convert Message into JSON
-MIME-Version: 1.0
-Content-Type: text/plain; charset=utf-8
-Content-Transfer-Encoding: 7bit
-X-JIRA-FingerPrint: 30527f35849b9dde25b450d4833f0394
-
-Tellier Benoit created MAILBOX-234:
---------------------------------------
-
-             Summary: Convert Message into JSON
-                 Key: MAILBOX-234
-                 URL: https://issues.apache.org/jira/browse/MAILBOX-234
-             Project: James Mailbox
-          Issue Type: New Feature
-            Reporter: Tellier Benoit
-
-
-This would give us the ability to index e-mails in ElasticSearch.
-
-
-
---
-This message was sent by Atlassian JIRA
-(v6.3.4#6332)
-
----------------------------------------------------------------------
-To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
-For additional commands, e-mail: server-dev-help@james.apache.org
-

http://git-wip-us.apache.org/repos/asf/james-project/blob/d5b3a42c/mailbox/elasticsearch/src/test/resources/documents/mail2.eml
----------------------------------------------------------------------
diff --git a/mailbox/elasticsearch/src/test/resources/documents/mail2.eml b/mailbox/elasticsearch/src/test/resources/documents/mail2.eml
deleted file mode 100644
index 9c2c413..0000000
--- a/mailbox/elasticsearch/src/test/resources/documents/mail2.eml
+++ /dev/null
@@ -1,83 +0,0 @@
-Return-Path: <se...@james.apache.org>
-Received: from mx2.minet.net (mx2.minet.net [192.168.102.26])
-	 by imap (Cyrus v2.4.16-Debian-2.4.16-4+deb7u1) with LMTPA;
-	 Thu, 04 Jun 2015 11:27:36 +0200
-X-Sieve: CMU Sieve 2.4
-Received: from localhost (spam.minet.net [192.168.102.97])
-	by mx2.minet.net (Postfix) with ESMTP id D65F3A1CA35
-	for <be...@minet.net>; Thu,  4 Jun 2015 11:27:40 +0200 (CEST)
-X-Virus-Scanned: by amavisd-new using ClamAV at minet.net
-X-Spam-Flag: NO
-X-Spam-Score: -1.51
-X-Spam-Level:
-X-Spam-Status: No, score=-1.51 required=1 tests=[BAYES_00=-1.5,
-	T_RP_MATCHES_RCVD=-0.01] autolearn=ham
-Received: from mx2.minet.net ([IPv6:::ffff:192.168.102.26])
-	by localhost (spam.minet.net [::ffff:192.168.102.97]) (amavisd-new, port 10024)
-	with ESMTP id jH3GE2vu5VKE for <be...@minet.net>;
-	Thu,  4 Jun 2015 09:27:40 +0000 (UTC)
-Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=140.211.11.3; helo=mail.apache.org; envelope-from=server-dev-return-56863-benwa=minet.net@james.apache.org; receiver=benwa@minet.net
-Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
-	by mx2.minet.net (Postfix) with SMTP id 85A3AA1CA2C
-	for <be...@minet.net>; Thu,  4 Jun 2015 11:27:38 +0200 (CEST)
-Received: (qmail 43145 invoked by uid 500); 4 Jun 2015 09:27:38 -0000
-Mailing-List: contact server-dev-help@james.apache.org; run by ezmlm
-Precedence: bulk
-List-Unsubscribe: <ma...@james.apache.org>
-List-Help: <ma...@james.apache.org>
-List-Post: <ma...@james.apache.org>
-List-Id: "James Developers List" <server-dev.james.apache.org>
-Reply-To: "James Developers List" <se...@james.apache.org>
-Delivered-To: mailing list server-dev@james.apache.org
-Received: (qmail 43130 invoked by uid 99); 4 Jun 2015 09:27:38 -0000
-Received: from arcas.apache.org (HELO arcas.apache.org) (140.211.11.28)
-    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 04 Jun 2015 09:27:38 +0000
-Date: Thu, 4 Jun 2015 09:27:37 +0000 (UTC)
-From: "efij" <ji...@apache.org>
-To: "aaa" <se...@james.apache.org>
-Cc: abc@abc.org
-Message-ID: <JI...@Atlassian.JIRA>
-In-Reply-To: <JI...@Atlassian.JIRA>
-References: <JI...@Atlassian.JIRA> <JI...@arcas>
-Subject: [jira] [Closed] (MAILBOX-217) We should index attachment in elastic
- search
-MIME-Version: 1.0
-Content-Type: text/plain; charset=utf-8
-Content-Transfer-Encoding: 7bit
-X-JIRA-FingerPrint: 30527f35849b9dde25b450d4833f0394
-
-
-     [ https://issues.apache.org/jira/browse/MAILBOX-217?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ]
-
-Tellier Benoit closed MAILBOX-217.
-----------------------------------
-    Resolution: Duplicate
-
-We are reviewing work I did for this feature.
-
-This issue will be divided in smallest issues.
-
-The first one is MAILBOX-234
-
-> We should index attachment in elastic search
-> --------------------------------------------
->
->                 Key: MAILBOX-217
->                 URL: https://issues.apache.org/jira/browse/MAILBOX-217
->             Project: James Mailbox
->          Issue Type: Improvement
->            Reporter: Tellier Benoit
->
-> Attachment should be indexed in message document as nested document.
-> Their textual content should be available for better search results.
-
-
-
---
-This message was sent by Atlassian JIRA
-(v6.3.4#6332)
-
----------------------------------------------------------------------
-To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
-For additional commands, e-mail: server-dev-help@james.apache.org
-

http://git-wip-us.apache.org/repos/asf/james-project/blob/d5b3a42c/mailbox/elasticsearch/src/test/resources/documents/mail3.eml
----------------------------------------------------------------------
diff --git a/mailbox/elasticsearch/src/test/resources/documents/mail3.eml b/mailbox/elasticsearch/src/test/resources/documents/mail3.eml
deleted file mode 100644
index e9cc325..0000000
--- a/mailbox/elasticsearch/src/test/resources/documents/mail3.eml
+++ /dev/null
@@ -1,97 +0,0 @@
-Return-Path: <se...@james.apache.org>
-Received: from mx1.minet.net (mx1.minet.net [192.168.102.25])
-	 by imap (Cyrus v2.4.16-Debian-2.4.16-4+deb7u1) with LMTPA;
-	 Tue, 02 Jun 2015 10:16:17 +0200
-X-Sieve: CMU Sieve 2.4
-Received: from localhost (spam.minet.net [192.168.102.97])
-	by mx1.minet.net (Postfix) with ESMTP id 52917327827
-	for <be...@minet.net>; Tue,  2 Jun 2015 10:16:22 +0200 (CEST)
-X-Virus-Scanned: by amavisd-new using ClamAV at minet.net
-X-Spam-Flag: NO
-X-Spam-Score: -1.51
-X-Spam-Level:
-X-Spam-Status: No, score=-1.51 required=1 tests=[BAYES_00=-1.5,
-	T_RP_MATCHES_RCVD=-0.01] autolearn=ham
-Received: from mx1.minet.net ([IPv6:::ffff:192.168.102.25])
-	by localhost (spam.minet.net [::ffff:192.168.102.97]) (amavisd-new, port 10024)
-	with ESMTP id rcP3IZbh_eqS for <be...@minet.net>;
-	Tue,  2 Jun 2015 08:16:21 +0000 (UTC)
-Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=140.211.11.3; helo=mail.apache.org; envelope-from=server-dev-return-56848-benwa=minet.net@james.apache.org; receiver=benwa@minet.net
-Authentication-Results: mx1.minet.net; dkim=none reason="no signature";
-	dkim-adsp=none (insecure policy); dkim-atps=neutral
-Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
-	by mx1.minet.net (Postfix) with SMTP id 37EAD327826
-	for <be...@minet.net>; Tue,  2 Jun 2015 10:16:20 +0200 (CEST)
-Received: (qmail 1143 invoked by uid 500); 2 Jun 2015 08:16:20 -0000
-Mailing-List: contact server-dev-help@james.apache.org; run by ezmlm
-Precedence: bulk
-List-Unsubscribe: <ma...@james.apache.org>
-List-Help: <ma...@james.apache.org>
-List-Post: <ma...@james.apache.org>
-List-Id: "James Developers List" <server-dev.james.apache.org>
-Reply-To: "James Developers List" <se...@james.apache.org>
-Delivered-To: mailing list server-dev@james.apache.org
-Received: (qmail 1132 invoked by uid 99); 2 Jun 2015 08:16:20 -0000
-Received: from arcas.apache.org (HELO arcas.apache.org) (140.211.11.28)
-    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 02 Jun 2015 08:16:20 +0000
-Date: Tue, 2 Jun 2015 08:16:19 +0000 (UTC)
-From: "abcd" <ji...@apache.org>
-Cc: zzz@bcd.org
-To: "server" <se...@james.apache.org>
-Message-ID: <JI...@Atlassian.JIRA>
-In-Reply-To: <JI...@Atlassian.JIRA>
-References: <JI...@Atlassian.JIRA> <JI...@arcas>
-Subject: [jira] [Closed] (MAILBOX-11) MailboxQuery ignore namespace
-MIME-Version: 1.0
-Content-Type: text/plain; charset=utf-8
-Content-Transfer-Encoding: quoted-printable
-X-JIRA-FingerPrint: 30527f35849b9dde25b450d4833f0394
-
-
-     [ https://issues.apache.org/jira/browse/MAILBOX-11?page=3Dcom.atlassia=
-n.jira.plugin.system.issuetabpanels:all-tabpanel ]
-
-Eric Charles closed MAILBOX-11.
--------------------------------
-    Resolution: Fixed
-      Assignee: Eric Charles  (was: Norman Maurer)
-
-Committed, Thx Benoit.
-
-> MailboxQuery ignore namespace
-> -----------------------------
->
->                 Key: MAILBOX-11
->                 URL: https://issues.apache.org/jira/browse/MAILBOX-11
->             Project: James Mailbox
->          Issue Type: Bug
->         Environment: Linux, JDK 1.6
->            Reporter: Fran=C3=A7ois-Denis Gonthier
->            Assignee: Eric Charles
->             Fix For: 0.6
->
->         Attachments: 0001-MAILBOX-11-Add-filters-on-namespace-and-user-fo=
-r-sea.patch
->
->
-> MailboxQuery doesn't pay any attention to namespace of the mailbox it is =
-based on. For example, Mozilla Thunderbird might to mailbox search with exp=
-ressions like #private.%. That expression is passed directly to the isExpre=
-ssionMatch method of the MailboxQuery class. This has obviously incorrect r=
-esults.
-> Arguments to the isExpressionMatch method should be parsed to separate th=
-e namespace from the mailbox name or isExpressionMatch should do the parsin=
-g itself. In that case the argument name should be renamed to something lik=
-e 'searchExpression' instead of 'name' which doesn't convey the right meani=
-ng.
-
-
-
---
-This message was sent by Atlassian JIRA
-(v6.3.4#6332)
-
----------------------------------------------------------------------
-To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
-For additional commands, e-mail: server-dev-help@james.apache.org
-

http://git-wip-us.apache.org/repos/asf/james-project/blob/d5b3a42c/mailbox/elasticsearch/src/test/resources/documents/mail4.eml
----------------------------------------------------------------------
diff --git a/mailbox/elasticsearch/src/test/resources/documents/mail4.eml b/mailbox/elasticsearch/src/test/resources/documents/mail4.eml
deleted file mode 100644
index 37ecba1..0000000
--- a/mailbox/elasticsearch/src/test/resources/documents/mail4.eml
+++ /dev/null
@@ -1,83 +0,0 @@
-Return-Path: <ma...@james.apache.org>
-Received: from mx2.minet.net (mx2.minet.net [192.168.102.26])
-	 by imap (Cyrus v2.4.16-Debian-2.4.16-4+deb7u1) with LMTPA;
-	 Fri, 15 May 2015 08:36:03 +0200
-X-Sieve: CMU Sieve 2.4
-Received: from localhost (spam.minet.net [192.168.102.97])
-	by mx2.minet.net (Postfix) with ESMTP id 5AC87A19A4F
-	for <be...@minet.net>; Fri, 15 May 2015 08:36:03 +0200 (CEST)
-X-Virus-Scanned: by amavisd-new using ClamAV at minet.net
-X-Spam-Flag: NO
-X-Spam-Score: -1.51
-X-Spam-Level:
-X-Spam-Status: No, score=-1.51 required=1 tests=[BAYES_00=-1.5,
-	T_RP_MATCHES_RCVD=-0.01] autolearn=ham
-Received: from mx1.minet.net ([IPv6:::ffff:192.168.102.25])
-	by localhost (spam.minet.net [::ffff:192.168.102.97]) (amavisd-new, port 10024)
-	with ESMTP id 2xNJ-Rh-AWoj for <be...@minet.net>;
-	Fri, 15 May 2015 06:36:02 +0000 (UTC)
-Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=140.211.11.3; helo=mail.apache.org; envelope-from=mailet-api-return-812-benwa=minet.net@james.apache.org; receiver=benwa@minet.net
-Authentication-Results: mx1.minet.net; dkim=none reason="no signature";
-	dkim-adsp=none (insecure policy); dkim-atps=neutral
-Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
-	by mx1.minet.net (Postfix) with SMTP id 24F75686039
-	for <be...@minet.net>; Fri, 15 May 2015 08:36:01 +0200 (CEST)
-Received: (qmail 81830 invoked by uid 500); 15 May 2015 06:36:00 -0000
-Mailing-List: contact mailet-api-help@james.apache.org; run by ezmlm
-Precedence: bulk
-List-Help: <ma...@james.apache.org>
-List-Unsubscribe: <ma...@james.apache.org>
-List-Post: <ma...@james.apache.org>
-List-Id: <mailet-api.james.apache.org>
-Reply-To: mailet-api@james.apache.org
-Delivered-To: mailing list mailet-api@james.apache.org
-Received: (qmail 81730 invoked by uid 99); 15 May 2015 06:36:00 -0000
-Received: from arcas.apache.org (HELO arcas.apache.org) (140.211.11.28)
-    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 15 May 2015 06:36:00 +0000
-Date: Fri, 15 May 2015 06:35:59 +0000 (UTC)
-From: "Eric Charles (JIRA)" <ma...@james.apache.org>
-To: "zzz" <ma...@james.apache.org>
-Cc: any@any.com
-Bcc: any@any.com
-Message-ID: <JI...@Atlassian.JIRA>
-In-Reply-To: <JI...@Atlassian.JIRA>
-References: <JI...@Atlassian.JIRA> <JI...@arcas>
-Subject: [jira] [Resolved] (MAILET-94) James Mailet should use latest
- version of other James subprojects
-MIME-Version: 1.0
-Content-Type: text/plain; charset=utf-8
-Content-Transfer-Encoding: 7bit
-X-JIRA-FingerPrint: 30527f35849b9dde25b450d4833f0394
-
-
-     [ https://issues.apache.org/jira/browse/MAILET-94?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ]
-
-Eric Charles resolved MAILET-94.
---------------------------------
-    Resolution: Fixed
-      Assignee: Eric Charles
-
-Patch committed, Thx Matthieu
-
-> James Mailet should use latest version of other James subprojects
-> -----------------------------------------------------------------
->
->                 Key: MAILET-94
->                 URL: https://issues.apache.org/jira/browse/MAILET-94
->             Project: James Mailet
->          Issue Type: Task
->          Components: Build
->            Reporter: Matthieu Baechler
->            Assignee: Eric Charles
->             Fix For: 2.5.1
->
->         Attachments: 0001-JWC-111-update-james-related-projects-to-SNAPSHOT-ve.patch
->
->
-> It should depend on james-project 1.8.3-SNAPSHOT to use only up-to-date component.
-
-
-
---
-This message was sent by Atlassian JIRA
-(v6.3.4#6332)

http://git-wip-us.apache.org/repos/asf/james-project/blob/d5b3a42c/mailbox/elasticsearch/src/test/resources/documents/nonTextual.eml
----------------------------------------------------------------------
diff --git a/mailbox/elasticsearch/src/test/resources/documents/nonTextual.eml b/mailbox/elasticsearch/src/test/resources/documents/nonTextual.eml
deleted file mode 100644
index ce0fa84..0000000
--- a/mailbox/elasticsearch/src/test/resources/documents/nonTextual.eml
+++ /dev/null
@@ -1,196 +0,0 @@
-Return-Path: <bt...@linagora.com>
-Received: from alderaan.linagora.com (smtp.linagora.dc1 [172.16.18.53])
-	 by imap (Cyrus v2.2.13-Debian-2.2.13-19+squeeze3) with LMTPA;
-	 Thu, 18 Jun 2015 12:43:28 +0200
-X-Sieve: CMU Sieve 2.2
-Received: from [10.75.9.154] (unknown [92.103.166.6])
-	(using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits))
-	(No client certificate requested)
-	by alderaan.linagora.com (Postfix) with ESMTPSA id 0EB1078A
-	for <bt...@linagora.com>; Thu, 18 Jun 2015 12:43:28 +0200 (CEST)
-To: btellier@linagora.com
-From: Benoit Tellier <bt...@linagora.com>
-Subject: Test message
-Message-ID: <55...@linagora.com>
-Date: Thu, 18 Jun 2015 12:43:26 +0200
-User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101
- Thunderbird/38.0.1
-MIME-Version: 1.0
-Content-Type: multipart/mixed;
- boundary="------------030000010109090603040500"
-
-This is a multi-part message in MIME format.
---------------030000010109090603040500
-Content-Type: text/plain; charset=utf-8
-Content-Transfer-Encoding: 7bit
-
-This mail have a non textual attachment !
-
---------------030000010109090603040500
-Content-Type: application/vnd.oasis.opendocument.text;
- name="toto.odt"
-Content-Transfer-Encoding: base64
-Content-Disposition: attachment;
- filename="toto.odt"
-
-UEsDBBQAAAgAAGNV0kZexjIMJwAAACcAAAAIAAAAbWltZXR5cGVhcHBsaWNhdGlvbi92bmQu
-b2FzaXMub3BlbmRvY3VtZW50LnRleHRQSwMEFAAACAAAY1XSRnPWCvM4AwAAOAMAABgAAABU
-aHVtYm5haWxzL3RodW1ibmFpbC5wbmeJUE5HDQoaCgAAAA1JSERSAAAAxgAAAQAIAwAAAN+D
-+XIAAAEyUExURXJoXXN0dXZ4e3h3eHl7fnx8gXqCh32IgXuJnoB7fI+Fa4+IbIODe4iEe5+Q
-eISDhICFiISJhIaMiY2Gg4uJgomMjIGJkIuOkY6Uj4SRm4+WkomZnJGKgJGUjJuTh5uWj5GV
-kZGVnJaYkpWbmpmVlZmblJ2en4OYqZSYoJSfqpyeoI6gs5SipJygopKhsZapvKeajKGemKqd
-k6KjnaqilKmrn7SllL2tnaampaarraquo6msrqmusKq2urSwqLu5tLy5uaO2yKu5w77EtrXI
-1sC5p8+8rcHGt83BtdfGttnKus3NysLO3svP0tbRzdrQy9rYztrb2tvg5Nru9+bf3Ozg0PLj
-yfLl0PXo0/vt0uTn7ujn5+jp7Ovw6OL2/en4/fLr5/336vP7/v7+/gAAAP///4uCFGkAAAHB
-SURBVHja7dPbThMBEAbgYgsaQmkEVhfbxR5YDKUIslBUWuTogZI0HGxq0gBt3/8dIE00ek+C
-gW8uZv6Zu+9iUsNHUSkMDAwMDAwMDAwMDAyMJ8o4Of137+z/vfV+h7Nh+a6X+8t/rqN2MxjF
-y9H4fv1wjN1c5eOXdOpdshTNFQuvTrbGk2pzIq6/DJbGnk+udOY/ZYNqsBcnM4WpSqVbquxk
-e7nCRPZ4pZ8Oxhe+vZh+3RzbqC1uzlxvXz0Y4+fpbC7qlVqZ8moUhfH5j8/PkupBMahHYb4V
-Ti7/mm+EH1a/HkXFIG7n33RrpUY4DOOzjeR9v9SefXtYy2YOovX84mZ00R78t7/RWfPiGBgY
-GBgYGBgYGBgYGBgYGBgYGBgYGBgYGBgYGBgYGBgYGBgYGBgYGBgYGBgYGBgYGBgYGBgYGBgY
-GBgYGBgYGBgYGBgYGBgYGBgYGBgYGBgYGBgYGBgYGBgYGBgYGBgYGBgYGBgYGBgYGBgYGBgY
-GBgYGBgYGBgYGBgYGBgYGBgYGBgYGBgYGBgYGBgYGBgYGBgYGBgYGBgYGBgYGBgYGBgYGBgY
-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
-kYFAjQlMyoR0gxy6TkvFM5bzUTnBoe3ix2C904OiPGDwK47P2N6IDKblXuC9sO5cg998lWh6
-7mN6ddPF8d8jlGCcMu5P6rs7ef/n/i7P/xnir7R2RGxAzqNn+pDntPIfVUevUEsHCLT3aNIF
-AQAAgwMAAFBLAwQUAAAIAABjVdJGAAAAAAAAAAAAAAAAGgAAAENvbmZpZ3VyYXRpb25zMi9w
-b3B1cG1lbnUvUEsDBBQAAAgAAGNV0kYAAAAAAAAAAAAAAAAaAAAAQ29uZmlndXJhdGlvbnMy
-L3N0YXR1c2Jhci9QSwMEFAAACAAAY1XSRgAAAAAAAAAAAAAAABgAAABDb25maWd1cmF0aW9u
-czIvdG9vbGJhci9QSwMEFAAACAAAY1XSRgAAAAAAAAAAAAAAABgAAABDb25maWd1cmF0aW9u
-czIvbWVudWJhci9QSwMEFAAACAAAY1XSRgAAAAAAAAAAAAAAABgAAABDb25maWd1cmF0aW9u
-czIvZmxvYXRlci9QSwMEFAAICAgAY1XSRgAAAAAAAAAAAAAAACcAAABDb25maWd1cmF0aW9u
-czIvYWNjZWxlcmF0b3IvY3VycmVudC54bWwDAFBLBwgAAAAAAgAAAAAAAABQSwMEFAAACAAA
-Y1XSRgAAAAAAAAAAAAAAABoAAABDb25maWd1cmF0aW9uczIvdG9vbHBhbmVsL1BLAwQUAAAI
-AABjVdJGAAAAAAAAAAAAAAAAHAAAAENvbmZpZ3VyYXRpb25zMi9wcm9ncmVzc2Jhci9QSwME
-FAAACAAAY1XSRgAAAAAAAAAAAAAAAB8AAABDb25maWd1cmF0aW9uczIvaW1hZ2VzL0JpdG1h
-cHMvUEsDBBQACAgIAGNV0kYAAAAAAAAAAAAAAAAVAAAATUVUQS1JTkYvbWFuaWZlc3QueG1s
-tZTBbsMgDIbvfYqI6xTYeppQ0h4q7Qm6B2DESZHARGCq9u1HqrXJNGVqtO5mY/P/nzBQbU/O
-FkcI0Xis2Qt/ZgWg9o3Brmbv+7fylW03q8opNC1EktegyPsw3tKapYDSq2iiROUgStLS94CN
-18kBkvzeLy9Ot2wCsGabVTH6tcZCmfeH89jdJmvLXtGhZmJOZFx20BhV0rmHmqm+t0Yrym3i
-iA2/APMpJyc4ERNLGPaH5D5QGRsFXUPeYzfDYJzqQAz1RS7aIw18+RxnhAdyMZQX6UYgysOO
-Dxd2QOrxtHS28A+sX2s8NO0dVyd3PS322HlsTZfCRSKuhdIaLOTUB6FTCL8P929edz6HmHBA
-4MlwPVUYzCvx4w/YfAJQSwcIHYDzWRwBAAA+BAAAUEsBAhQAFAAACAAAY1XSRl7GMgwnAAAA
-JwAAAAgAAAAAAAAAAAAAAAAAAAAAAG1pbWV0eXBlUEsBAhQAFAAACAAAY1XSRnPWCvM4AwAA
-OAMAABgAAAAAAAAAAAAAAAAATQAAAFRodW1ibmFpbHMvdGh1bWJuYWlsLnBuZ1BLAQIUABQA
-CAgIAGNV0ka7MF5+tAMAAJ8OAAALAAAAAAAAAAAAAAAAALsDAABjb250ZW50LnhtbFBLAQIU
-ABQACAgIAGNV0kYaWG8FBAYAAE8oAAAMAAAAAAAAAAAAAAAAAKgHAABzZXR0aW5ncy54bWxQ
-SwECFAAUAAgICABjVdJGzd0yKsABAADPAwAACAAAAAAAAAAAAAAAAADmDQAAbWV0YS54bWxQ
-SwECFAAUAAgICABjVdJGXUUkGToIAAD3LgAACgAAAAAAAAAAAAAAAADcDwAAc3R5bGVzLnht
-bFBLAQIUABQACAgIAGNV0ka092jSBQEAAIMDAAAMAAAAAAAAAAAAAAAAAE4YAABtYW5pZmVz
-dC5yZGZQSwECFAAUAAAIAABjVdJGAAAAAAAAAAAAAAAAGgAAAAAAAAAAAAAAAACNGQAAQ29u
-ZmlndXJhdGlvbnMyL3BvcHVwbWVudS9QSwECFAAUAAAIAABjVdJGAAAAAAAAAAAAAAAAGgAA
-AAAAAAAAAAAAAADFGQAAQ29uZmlndXJhdGlvbnMyL3N0YXR1c2Jhci9QSwECFAAUAAAIAABj
-VdJGAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAD9GQAAQ29uZmlndXJhdGlvbnMyL3Rvb2xi
-YXIvUEsBAhQAFAAACAAAY1XSRgAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAMxoAAENvbmZp
-Z3VyYXRpb25zMi9tZW51YmFyL1BLAQIUABQAAAgAAGNV0kYAAAAAAAAAAAAAAAAYAAAAAAAA
-AAAAAAAAAGkaAABDb25maWd1cmF0aW9uczIvZmxvYXRlci9QSwECFAAUAAgICABjVdJGAAAA
-AAIAAAAAAAAAJwAAAAAAAAAAAAAAAACfGgAAQ29uZmlndXJhdGlvbnMyL2FjY2VsZXJhdG9y
-L2N1cnJlbnQueG1sUEsBAhQAFAAACAAAY1XSRgAAAAAAAAAAAAAAABoAAAAAAAAAAAAAAAAA
-9hoAAENvbmZpZ3VyYXRpb25zMi90b29scGFuZWwvUEsBAhQAFAAACAAAY1XSRgAAAAAAAAAA
-AAAAABwAAAAAAAAAAAAAAAAALhsAAENvbmZpZ3VyYXRpb25zMi9wcm9ncmVzc2Jhci9QSwEC
-FAAUAAAIAABjVdJGAAAAAAAAAAAAAAAAHwAAAAAAAAAAAAAAAABoGwAAQ29uZmlndXJhdGlv
-bnMyL2ltYWdlcy9CaXRtYXBzL1BLAQIUABQACAgIAGNV0kYdgPNZHAEAAD4EAAAVAAAAAAAA
-AAAAAAAAAKUbAABNRVRBLUlORi9tYW5pZmVzdC54bWxQSwUGAAAAABEAEQBwBAAABB0AAAAA
-
---------------030000010109090603040500--

http://git-wip-us.apache.org/repos/asf/james-project/blob/d5b3a42c/mailbox/elasticsearch/src/test/resources/documents/nonTextual.json
----------------------------------------------------------------------
diff --git a/mailbox/elasticsearch/src/test/resources/documents/nonTextual.json b/mailbox/elasticsearch/src/test/resources/documents/nonTextual.json
deleted file mode 100644
index f5d345d..0000000
--- a/mailbox/elasticsearch/src/test/resources/documents/nonTextual.json
+++ /dev/null
@@ -1,157 +0,0 @@
-{
-  "id":0,
-  "mailboxId":"18",
-  "modSeq":42,
-  "size":25,
-  "date":"2015-06-07T00:00:00+0200",
-  "mediaType":"plain",
-  "subtype":"text",
-  "userFlags":[],
-  "headers":{
-    "date":[
-      "Thu, 18 Jun 2015 12:43:26 +0200"
-    ],
-    "mime-version":[
-      "1.0"
-    ],
-    "x-sieve":[
-      "CMU Sieve 2.2"
-    ],
-    "return-path":[
-      "<bt...@linagora.com>"
-    ],
-    "subject":[
-      "Test message"
-    ],
-    "message-id":[
-      "<55...@linagora.com>"
-    ],
-    "received":[
-      "from alderaan.linagora.com (smtp.linagora.dc1 [172.16.18.53])\t by imap (Cyrus v2.2.13-Debian-2.2.13-19+squeeze3) with LMTPA;\t Thu, 18 Jun 2015 12:43:28 +0200","from [10.75.9.154] (unknown [92.103.166.6])\t(using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits))\t(No client certificate requested)\tby alderaan.linagora.com (Postfix) with ESMTPSA id 0EB1078A\tfor <bt...@linagora.com>; Thu, 18 Jun 2015 12:43:28 +0200 (CEST)"
-    ],
-    "from":[
-      "Benoit Tellier <bt...@linagora.com>"
-    ],
-    "content-type":[
-      "multipart/mixed; boundary=\"------------030000010109090603040500\""
-    ],
-    "to":[
-      "btellier@linagora.com"
-    ],
-    "user-agent":[
-      "Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.0.1"
-    ]
-  },
-  "from":[
-    {
-      "name":"Benoit Tellier",
-      "address":"btellier@linagora.com"
-    }
-  ],
-  "to":[
-    {
-      "name":"btellier@linagora.com",
-      "address":"btellier@linagora.com"
-    }
-  ],
-  "cc":[],
-  "bcc":[],
-  "replyTo":[],
-  "subject":["Test message"],
-  "sentDate":"2015-06-18T12:43:26+0200",
-  "properties":[
-    {
-      "namespace":"http://james.apache.org/rfc2045/Content-Type",
-      "localName":"type",
-      "value":"plain"
-    },
-    {
-      "namespace":"http://james.apache.org/rfc2045/Content-Type",
-      "localName":"subtype",
-      "value":"text"
-    },
-    {
-      "namespace":"http://james.apache.org/rfc2045",
-      "localName":"Content-Description",
-      "value":"An e-mail"
-    }
-  ],
-  "attachments":[
-    {
-      "mediaType":"text",
-      "subtype":"plain",
-      "fileName":null,
-      "fileExtension":null,
-      "contentDisposition":null,
-      "fileMetadata":{
-        "X-Parsed-By":["org.apache.tika.parser.DefaultParser","org.apache.tika.parser.txt.TXTParser"],
-        "Content-Encoding":["ISO-8859-1"],
-        "Content-Type":["text/plain; charset=ISO-8859-1"]
-      },
-      "headers":{
-        "content-transfer-encoding":["7bit"],
-        "content-type":["text/plain; charset=utf-8"]
-      },
-      "textContent":"This mail have a non textual attachment !\n\n"
-    },
-    {
-      "mediaType":"application",
-      "subtype":"vnd.oasis.opendocument.text",
-      "fileName":"toto.odt",
-      "fileExtension":"odt",
-      "contentDisposition":"attachment",
-      "fileMetadata":{
-        "date":["2015-06-18T12:43:07.489893918"],
-        "meta:paragraph-count":["1"],
-        "meta:word-count":["7"],
-        "Table-Count":["0"],
-        "generator":["LibreOffice/4.4.3.2$Linux_X86_64 LibreOffice_project/40m0$Build-2"],
-        "Word-Count":["7"],
-        "dcterms:created":["2015-06-18T12:41:25.197399866"],
-        "dcterms:modified":["2015-06-18T12:43:07.489893918"],
-        "Last-Modified":["2015-06-18T12:43:07.489893918"],
-        "nbPara":["1"],
-        "Last-Save-Date":["2015-06-18T12:43:07.489893918"],
-        "meta:object-count":["0"],
-        "meta:character-count":["47"],
-        "Paragraph-Count":["1"],
-        "nbImg":["0"],
-        "meta:save-date":["2015-06-18T12:43:07.489893918"],
-        "modified":["2015-06-18T12:43:07.489893918"],
-        "Edit-Time":["PT1M42S"],
-        "meta:image-count":["0"],
-        "Image-Count":["0"],
-        "nbCharacter":["47"],
-        "nbObject":["0"],
-        "nbPage":["1"],
-        "Object-Count":["0"],
-        "nbWord":["7"],
-        "Content-Type":["application/vnd.oasis.opendocument.text"],
-        "X-Parsed-By":["org.apache.tika.parser.DefaultParser","org.apache.tika.parser.odf.OpenDocumentParser"],
-        "meta:creation-date":["2015-06-18T12:41:25.197399866"],
-        "meta:table-count":["0"],
-        "Creation-Date":["2015-06-18T12:41:25.197399866"],
-        "xmpTPg:NPages":["1"],
-        "resourceName":["toto.odt"],
-        "Character Count":["47"],
-        "editing-cycles":["2"],
-        "Page-Count":["1"],
-        "nbTab":["0"],
-        "meta:page-count":["1"]
-      },
-      "headers":{
-        "content-transfer-encoding":["base64"],
-        "content-disposition":["attachment; filename=\"toto.odt\""],
-        "content-type":["application/vnd.oasis.opendocument.text; name=\"toto.odt\""]
-      },
-      "textContent":"Awesome document provided for text extraction�!\n"}
-  ],
-  "textBody":"This mail have a non textual attachment !\n\n",
-  "isAnswered":false,
-  "isDeleted":false,
-  "isDraft":false,
-  "isFlagged":false,
-  "isRecent":false,
-  "hasAttachment":true,
-  "isUnread":true
-}

http://git-wip-us.apache.org/repos/asf/james-project/blob/d5b3a42c/mailbox/elasticsearch/src/test/resources/documents/pgpSignedMail.eml
----------------------------------------------------------------------
diff --git a/mailbox/elasticsearch/src/test/resources/documents/pgpSignedMail.eml b/mailbox/elasticsearch/src/test/resources/documents/pgpSignedMail.eml
deleted file mode 100644
index 75248e4..0000000
--- a/mailbox/elasticsearch/src/test/resources/documents/pgpSignedMail.eml
+++ /dev/null
@@ -1,136 +0,0 @@
-Return-Path: <bo...@lists.debian.org>
-Received: from mx2.minet.net (mx2.minet.net [192.168.102.26])
-	 by imap (Cyrus v2.4.16-Debian-2.4.16-4+deb7u1) with LMTPA;
-	 Wed, 03 Jun 2015 21:19:59 +0200
-X-Sieve: CMU Sieve 2.4
-Received: from localhost (spam.minet.net [192.168.102.97])
-	by mx2.minet.net (Postfix) with ESMTP id 8A9DAA27DA1
-	for <be...@minet.net>; Wed,  3 Jun 2015 21:20:03 +0200 (CEST)
-X-Virus-Scanned: by amavisd-new using ClamAV at minet.net
-X-Spam-Flag: NO
-X-Spam-Score: -1.51
-X-Spam-Level:
-X-Spam-Status: No, score=-1.51 required=1 tests=[BAYES_00=-1.5,
-	T_RP_MATCHES_RCVD=-0.01] autolearn=unavailable
-Received: from mx2.minet.net ([IPv6:::ffff:192.168.102.26])
-	by localhost (spam.minet.net [::ffff:192.168.102.97]) (amavisd-new, port 10024)
-	with ESMTP id cF6J0AAnzsTX for <be...@minet.net>;
-	Wed,  3 Jun 2015 19:20:02 +0000 (UTC)
-Received-SPF: None (no SPF record) identity=mailfrom; client-ip=82.195.75.100; helo=bendel.debian.org; envelope-from=bounce-debian-security-announce=benwa=minet.net@lists.debian.org; receiver=benwa@minet.net
-Received: from bendel.debian.org (bendel.debian.org [82.195.75.100])
-	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
-	(No client certificate requested)
-	by mx2.minet.net (Postfix) with ESMTPS id 7F69FA27D98
-	for <be...@minet.net>; Wed,  3 Jun 2015 21:20:01 +0200 (CEST)
-Received: from localhost (localhost [127.0.0.1])
-	by bendel.debian.org (Postfix) with QMQP
-	id 1C2F6275; Wed,  3 Jun 2015 19:14:50 +0000 (UTC)
-Old-Return-Path: <ca...@master.debian.org>
-X-Original-To: lists-debian-security-announce@bendel.debian.org
-Delivered-To: lists-debian-security-announce@bendel.debian.org
-Received: from localhost (localhost [127.0.0.1])
-	by bendel.debian.org (Postfix) with ESMTP id 7EFBF228
-	for <li...@bendel.debian.org>; Wed,  3 Jun 2015 19:14:39 +0000 (UTC)
-X-Amavis-Spam-Status: No, score=-8.99 tagged_above=-10000 required=5.3
-	tests=[BAYES_00=-2, DIGITS_LETTERS=1, FVGT_m_MULTI_ODD=0.02,
-	LDO_WHITELIST=-5, OUR_MTA_MSGID=2, PGPSIGNATURE=-5,
-	T_RP_MATCHES_RCVD=-0.01] autolearn=ham
-Received: from bendel.debian.org ([127.0.0.1])
-	by localhost (lists.debian.org [127.0.0.1]) (amavisd-new, port 2525)
-	with ESMTP id RiKdt2PVwXOm
-	for <li...@bendel.debian.org>;
-	Wed,  3 Jun 2015 19:14:34 +0000 (UTC)
-Received: from master.debian.org (master.debian.org [IPv6:2001:41b8:202:deb:216:36ff:fe40:4001])
-	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
-	(Client CN "master.debian.org", Issuer "Debian SMTP CA" (not verified))
-	by bendel.debian.org (Postfix) with ESMTPS id ABE761B7
-	for <de...@lists.debian.org>; Wed,  3 Jun 2015 19:14:34 +0000 (UTC)
-Received: from carnil by master.debian.org with local (Exim 4.84)
-	(envelope-from <ca...@master.debian.org>)
-	id 1Z0E7U-0004Bc-Jv
-	for debian-security-announce@lists.debian.org; Wed, 03 Jun 2015 19:14:32 +0000
-From: Markus Koschany <ap...@gambaru.de>
-To: debian-security-announce@lists.debian.org
-Message-Id: <E1...@master.debian.org>
-Date: Wed, 03 Jun 2015 19:14:32 +0000
-X-Debian: PGP check passed for security officers
-Subject: [SECURITY] [DSA 3278-1] libapache-mod-jk security update
-Priority: urgent
-Reply-To: debian-security@lists.debian.org
-X-Rc-Virus: 2007-09-13_01
-X-Rc-Spam: 2008-11-04_01
-Resent-Message-ID: <Aq...@bendel>
-Resent-From: debian-security-announce@lists.debian.org
-X-Mailing-List: <de...@lists.debian.org> archive/latest/2089
-X-Loop: debian-security-announce@lists.debian.org
-List-Id: <debian-security-announce.lists.debian.org>
-List-Post: <ma...@lists.debian.org>
-List-Help: <mailto:debian-security-announce-request@lists.debian.org?subject=help>
-List-Subscribe: <mailto:debian-security-announce-request@lists.debian.org?subject=subscribe>
-List-Unsubscribe: <mailto:debian-security-announce-request@lists.debian.org?subject=unsubscribe>
-Precedence: list
-Resent-Sender: debian-security-announce-request@lists.debian.org
-Resent-Date: Wed,  3 Jun 2015 19:14:50 +0000 (UTC)
-
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
-- -------------------------------------------------------------------------
-Debian Security Advisory DSA-3278-1                   security@debian.org
-http://www.debian.org/security/                           Markus Koschany
-June 03, 2015                          http://www.debian.org/security/faq
-- -------------------------------------------------------------------------
-
-Package        : libapache-mod-jk
-CVE ID         : CVE-2014-8111
-Debian Bug     : 783233
-
-An information disclosure flaw due to incorrect JkMount/JkUnmount
-directives processing was found in the Apache 2 module mod_jk to forward
-requests from the Apache web server to Tomcat. A JkUnmount rule for a
-subtree of a previous JkMount rule could be ignored. This could allow a
-remote attacker to potentially access a private artifact in a tree that
-would otherwise not be accessible to them.
-
-For the oldstable distribution (wheezy), this problem has been fixed
-in version 1:1.2.37-1+deb7u1.
-
-For the stable distribution (jessie), this problem has been fixed in
-version 1:1.2.37-4+deb8u1.
-
-For the testing distribution (stretch), this problem has been fixed
-in version 1:1.2.40+svn150520-1.
-
-For the unstable distribution (sid), this problem has been fixed in
-version 1:1.2.40+svn150520-1.
-
-We recommend that you upgrade your libapache-mod-jk packages.
-
-Further information about Debian Security Advisories, how to apply
-these updates to your system and frequently asked questions can be
-found at: https://www.debian.org/security/
-
-Mailing list: debian-security-announce@lists.debian.org
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1
-
-iQIcBAEBCgAGBQJVb0AhAAoJEAVMuPMTQ89Ef+gP/1e6ZRHna5rrHYiaclwnWg8Y
-YHIjWwqfsnldjqfTirrBtf9TlLZrqIUHhaeaA0PEbzvzqVfh5QToOvvMeFHqXLS2
-4eSmUtc3hb5BQlSvPsuP5RzeDYPy0S2zRaJlQ6dKSXmxb3Zh1drjxUg9kzpEGU9v
-ykwDIRO7w+YpfcNqoxldgL0JOngMa9Qhl/wSwLV559wrESiSp2QifN/JZz2YRvsp
-XeZvCHV5dHYJLfCOn3bQ6QRf0votEFObrW2T14noo/Srxv1n+4sstql7bCDbKW8c
-O3SrlEk7HX5N4qPlG8Jo288NH1gqxXbuJ9SqF1MlIJsYE2UWT2nydfHVM1vMH23+
-Spfd51SfmrK2GSOg2tna29BDGInDZ0Tud+GqsTKMMICgtg7SCK4FIrZYhhFFompG
-li9h7DE96Cbv6J5a8JSIYg/kyzFOO8VcYakOUOJ2Oyo8Tv2a6GJLF9azjsThE7bv
-LBUWbk2cOsd98BYtsUwFKJhqQLBvRCYnw85/WbC8EDmkbyrxIKf0uaF1e6vc9qV9
-4OKmIgbNageXDzrfnc9PrwZ05xPiPhFJUk3Bu3XzosMzqU7XBPhtjkvPGJGcMv9g
-cCepn+vtFQFBR612a4Gm16XN068zbnBR8VHx3PRNIVkPyhoxR55RdFtwPL7FCHX0
-XVZyRUFDwW4cMiJnJ49U
-=M39D
------END PGP SIGNATURE-----
-
-
---
-To UNSUBSCRIBE, email to debian-security-announce-REQUEST@lists.debian.org
-with a subject of "unsubscribe". Trouble? Contact listmaster@lists.debian.org
-Archive: https://lists.debian.org/E1Z0E7U-0004Bc-Jv@master.debian.org
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/james-project/blob/d5b3a42c/mailbox/elasticsearch/src/test/resources/documents/pgpSignedMail.json
----------------------------------------------------------------------
diff --git a/mailbox/elasticsearch/src/test/resources/documents/pgpSignedMail.json b/mailbox/elasticsearch/src/test/resources/documents/pgpSignedMail.json
deleted file mode 100644
index 16e929a..0000000
--- a/mailbox/elasticsearch/src/test/resources/documents/pgpSignedMail.json
+++ /dev/null
@@ -1,173 +0,0 @@
-{
-  "id": 25,
-  "mailboxId": "18",
-  "modSeq": 42,
-  "size": 25,
-  "date": "2015-06-07T00:00:00+0200",
-  "mediaType": "plain",
-  "subtype": "text",
-  "userFlags": [
-	"security",
-	"debian"
-  ],
-  "headers": {
-	"date": [
-	  "Wed, 03 Jun 2015 19:14:32 +0000"
-	],
-	"resent-from": [
-	  "debian-security-announce@lists.debian.org"
-	],
-	"return-path": [
-	  "<bo...@lists.debian.org>"
-	],
-	"subject": [
-	  "[SECURITY] [DSA 3278-1] libapache-mod-jk security update"
-	],
-	"x-debian": [
-	  "PGP check passed for security officers"
-	],
-	"x-spam-score": [
-	  "-1.51"
-	],
-	"list-subscribe": [
-	  "<mailto:debian-security-announce-request@lists.debian.org?subject=subscribe>"
-	],
-	"precedence": [
-	  "list"
-	],
-	"x-sieve": [
-	  "CMU Sieve 2.4"
-	],
-	"list-help": [
-	  "<mailto:debian-security-announce-request@lists.debian.org?subject=help>"
-	],
-	"received-spf": [
-	  "None (no SPF record) identity=mailfrom; client-ip=82.195.75.100; helo=bendel.debian.org; envelope-from=bounce-debian-security-announce=benwa=minet.net@lists.debian.org; receiver=benwa@minet.net"
-	],
-	"x-mailing-list": [
-	  "<de...@lists.debian.org> archive/latest/2089"
-	],
-	"x-spam-level": [
-	  ""
-	],
-	"message-id": [
-	  "<E1...@master.debian.org>"
-	],
-	"resent-message-id": [
-	  "<Aq...@bendel>"
-	],
-	"from": [
-	  "Markus Koschany <ap...@gambaru.de>"
-	],
-	"reply-to": [
-	  "debian-security@lists.debian.org"
-	],
-	"resent-date": [
-	  "Wed,  3 Jun 2015 19:14:50 +0000 (UTC)"
-	],
-	"x-spam-flag": [
-	  "NO"
-	],
-	"x-rc-spam": [
-	  "2008-11-04_01"
-	],
-	"list-unsubscribe": [
-	  "<mailto:debian-security-announce-request@lists.debian.org?subject=unsubscribe>"
-	],
-	"list-post": [
-	  "<ma...@lists.debian.org>"
-	],
-	"received": [
-	  "from mx2.minet.net (mx2.minet.net [192.168.102.26])\t by imap (Cyrus v2.4.16-Debian-2.4.16-4+deb7u1) with LMTPA;\t Wed, 03 Jun 2015 21:19:59 +0200",
-	  "from localhost (spam.minet.net [192.168.102.97])\tby mx2.minet.net (Postfix) with ESMTP id 8A9DAA27DA1\tfor <be...@minet.net>; Wed,  3 Jun 2015 21:20:03 +0200 (CEST)",
-	  "from mx2.minet.net ([IPv6:::ffff:192.168.102.26])\tby localhost (spam.minet.net [::ffff:192.168.102.97]) (amavisd-new, port 10024)\twith ESMTP id cF6J0AAnzsTX for <be...@minet.net>;\tWed,  3 Jun 2015 19:20:02 +0000 (UTC)",
-	  "from bendel.debian.org (bendel.debian.org [82.195.75.100])\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\t(No client certificate requested)\tby mx2.minet.net (Postfix) with ESMTPS id 7F69FA27D98\tfor <be...@minet.net>; Wed,  3 Jun 2015 21:20:01 +0200 (CEST)",
-	  "from localhost (localhost [127.0.0.1])\tby bendel.debian.org (Postfix) with QMQP\tid 1C2F6275; Wed,  3 Jun 2015 19:14:50 +0000 (UTC)",
-	  "from localhost (localhost [127.0.0.1])\tby bendel.debian.org (Postfix) with ESMTP id 7EFBF228\tfor <li...@bendel.debian.org>; Wed,  3 Jun 2015 19:14:39 +0000 (UTC)",
-	  "from bendel.debian.org ([127.0.0.1])\tby localhost (lists.debian.org [127.0.0.1]) (amavisd-new, port 2525)\twith ESMTP id RiKdt2PVwXOm\tfor <li...@bendel.debian.org>;\tWed,  3 Jun 2015 19:14:34 +0000 (UTC)",
-	  "from master.debian.org (master.debian.org [IPv6:2001:41b8:202:deb:216:36ff:fe40:4001])\t(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))\t(Client CN \"master.debian.org\", Issuer \"Debian SMTP CA\" (not verified))\tby bendel.debian.org (Postfix) with ESMTPS id ABE761B7\tfor <de...@lists.debian.org>; Wed,  3 Jun 2015 19:14:34 +0000 (UTC)",
-	  "from carnil by master.debian.org with local (Exim 4.84)\t(envelope-from <ca...@master.debian.org>)\tid 1Z0E7U-0004Bc-Jv\tfor debian-security-announce@lists.debian.org; Wed, 03 Jun 2015 19:14:32 +0000"
-	],
-	"x-rc-virus": [
-	  "2007-09-13_01"
-	],
-	"x-loop": [
-	  "debian-security-announce@lists.debian.org"
-	],
-	"priority": [
-	  "urgent"
-	],
-	"x-virus-scanned": [
-	  "by amavisd-new using ClamAV at minet.net"
-	],
-	"x-spam-status": [
-	  "No, score=-1.51 required=1 tests=[BAYES_00=-1.5,\tT_RP_MATCHES_RCVD=-0.01] autolearn=unavailable"
-	],
-	"delivered-to": [
-	  "lists-debian-security-announce@bendel.debian.org"
-	],
-	"x-amavis-spam-status": [
-	  "No, score=-8.99 tagged_above=-10000 required=5.3\ttests=[BAYES_00=-2, DIGITS_LETTERS=1, FVGT_m_MULTI_ODD=0.02,\tLDO_WHITELIST=-5, OUR_MTA_MSGID=2, PGPSIGNATURE=-5,\tT_RP_MATCHES_RCVD=-0.01] autolearn=ham"
-	],
-	"resent-sender": [
-	  "debian-security-announce-request@lists.debian.org"
-	],
-	"x-original-to": [
-	  "lists-debian-security-announce@bendel.debian.org"
-	],
-	"to": [
-	  "debian-security-announce@lists.debian.org"
-	],
-	"list-id": [
-	  "<debian-security-announce.lists.debian.org>"
-	],
-	"old-return-path": [
-	  "<ca...@master.debian.org>"
-	]
-  },
-  "from": [
-	{
-	  "name": "Markus Koschany",
-	  "address": "apo@gambaru.de"
-	}
-  ],
-  "to": [
-	{
-	  "name": "debian-security-announce@lists.debian.org",
-	  "address": "debian-security-announce@lists.debian.org"
-	}
-  ],
-  "cc": [],
-  "bcc": [],
-  "replyTo": [{"name":"debian-security@lists.debian.org","address":"debian-security@lists.debian.org"}],
-  "subject": [
-	"[SECURITY] [DSA 3278-1] libapache-mod-jk security update"
-  ],
-  "sentDate": "2015-06-03T19:14:32+0000",
-  "properties": [
-	{
-	  "namespace": "http://james.apache.org/rfc2045/Content-Type",
-	  "localName": "type",
-	  "value": "plain"
-	},
-	{
-	  "namespace": "http://james.apache.org/rfc2045/Content-Type",
-	  "localName": "subtype",
-	  "value": "text"
-	},
-	{
-	  "namespace": "http://james.apache.org/rfc2045",
-	  "localName": "Content-Description",
-	  "value": "An e-mail"
-	}
-  ],
-  "attachments": [],
-  "textBody": "-----BEGIN PGP SIGNED MESSAGE-----\nHash: SHA512\n\n- -------------------------------------------------------------------------\nDebian Security Advisory DSA-3278-1                   security@debian.org\nhttp://www.debian.org/security/                           Markus Koschany\nJune 03, 2015                          http://www.debian.org/security/faq\n- -------------------------------------------------------------------------\n\nPackage        : libapache-mod-jk\nCVE ID         : CVE-2014-8111\nDebian Bug     : 783233\n\nAn information disclosure flaw due to incorrect JkMount/JkUnmount\ndirectives processing was found in the Apache 2 module mod_jk to forward\nrequests from the Apache web server to Tomcat. A JkUnmount rule for a\nsubtree of a previous JkMount rule could be ignored. This could allow a\nremote attacker to potentially access a private artifact in a tree that\nwould otherwise not be accessible to them.\n\nFor the oldstable distribution (wheezy), this probl
 em has been fixed\nin version 1:1.2.37-1+deb7u1.\n\nFor the stable distribution (jessie), this problem has been fixed in\nversion 1:1.2.37-4+deb8u1.\n\nFor the testing distribution (stretch), this problem has been fixed\nin version 1:1.2.40+svn150520-1.\n\nFor the unstable distribution (sid), this problem has been fixed in\nversion 1:1.2.40+svn150520-1.\n\nWe recommend that you upgrade your libapache-mod-jk packages.\n\nFurther information about Debian Security Advisories, how to apply\nthese updates to your system and frequently asked questions can be\nfound at: https://www.debian.org/security/\n\nMailing list: debian-security-announce@lists.debian.org\n-----BEGIN PGP SIGNATURE-----\nVersion: GnuPG v1\n\niQIcBAEBCgAGBQJVb0AhAAoJEAVMuPMTQ89Ef+gP/1e6ZRHna5rrHYiaclwnWg8Y\nYHIjWwqfsnldjqfTirrBtf9TlLZrqIUHhaeaA0PEbzvzqVfh5QToOvvMeFHqXLS2\n4eSmUtc3hb5BQlSvPsuP5RzeDYPy0S2zRaJlQ6dKSXmxb3Zh1drjxUg9kzpEGU9v\nykwDIRO7w+YpfcNqoxldgL0JOngMa9Qhl/wSwLV559wrESiSp2QifN/JZz2YRvsp\nXeZvCHV5dHYJLfCOn3
 bQ6QRf0votEFObrW2T14noo/Srxv1n+4sstql7bCDbKW8c\nO3SrlEk7HX5N4qPlG8Jo288NH1gqxXbuJ9SqF1MlIJsYE2UWT2nydfHVM1vMH23+\nSpfd51SfmrK2GSOg2tna29BDGInDZ0Tud+GqsTKMMICgtg7SCK4FIrZYhhFFompG\nli9h7DE96Cbv6J5a8JSIYg/kyzFOO8VcYakOUOJ2Oyo8Tv2a6GJLF9azjsThE7bv\nLBUWbk2cOsd98BYtsUwFKJhqQLBvRCYnw85/WbC8EDmkbyrxIKf0uaF1e6vc9qV9\n4OKmIgbNageXDzrfnc9PrwZ05xPiPhFJUk3Bu3XzosMzqU7XBPhtjkvPGJGcMv9g\ncCepn+vtFQFBR612a4Gm16XN068zbnBR8VHx3PRNIVkPyhoxR55RdFtwPL7FCHX0\nXVZyRUFDwW4cMiJnJ49U\n=M39D\n-----END PGP SIGNATURE-----\n\n\n--\nTo UNSUBSCRIBE, email to debian-security-announce-REQUEST@lists.debian.org\nwith a subject of \"unsubscribe\". Trouble? Contact listmaster@lists.debian.org\nArchive: https://lists.debian.org/E1Z0E7U-0004Bc-Jv@master.debian.org",
-  "isDeleted": true,
-  "isDraft": false,
-  "isAnswered": false,
-  "isFlagged": false,
-  "isRecent": false,
-  "hasAttachment": false,
-  "isUnread": false
-}

http://git-wip-us.apache.org/repos/asf/james-project/blob/d5b3a42c/mailbox/elasticsearch/src/test/resources/documents/recursiveMail.eml
----------------------------------------------------------------------
diff --git a/mailbox/elasticsearch/src/test/resources/documents/recursiveMail.eml b/mailbox/elasticsearch/src/test/resources/documents/recursiveMail.eml
deleted file mode 100644
index 65dae2b..0000000
--- a/mailbox/elasticsearch/src/test/resources/documents/recursiveMail.eml
+++ /dev/null
@@ -1,77 +0,0 @@
-Return-Path: <mb...@linagora.com>
-Received: from alderaan.linagora.com (smtp.linagora.dc1 [172.16.18.53])
-	 by imap (Cyrus v2.2.13-Debian-2.2.13-19+squeeze3) with LMTPA;
-	 Wed, 10 Jun 2015 10:45:29 +0200
-X-Sieve: CMU Sieve 2.2
-Received: from [10.69.2.28] (mne69-10-88-173-78-196.fbx.proxad.net [88.173.78.196])
-	(using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits))
-	(No client certificate requested)
-	by alderaan.linagora.com (Postfix) with ESMTPSA id 7F33E728
-	for <bt...@linagora.com>; Wed, 10 Jun 2015 10:45:28 +0200 (CEST)
-Message-ID: <55...@linagora.com>
-Date: Wed, 10 Jun 2015 10:45:27 +0200
-From: Matthieu Baechler <mb...@linagora.com>
-User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Icedove/31.7.0
-MIME-Version: 1.0
-To: btellier@linagora.com
-Subject: Fwd: Courbe Sprint
-References: <55...@linagora.com>
-In-Reply-To: <55...@linagora.com>
-X-Forwarded-Message-Id: <55...@linagora.com>
-Content-Type: multipart/mixed;
- boundary="------------080603090509090707040003"
-
-This is a multi-part message in MIME format.
---------------080603090509090707040003
-Content-Type: text/plain; charset=utf-8; format=flowed
-Content-Transfer-Encoding: 7bit
-
-Forward as attachment !
-
-
-
---------------080603090509090707040003
-Content-Type: message/rfc822;
- name="Courbe Sprint.eml"
-Content-Transfer-Encoding: 8bit
-Content-Disposition: attachment;
- filename="Courbe Sprint.eml"
-
-Return-Path: <ad...@linagora.com>
-Received: from alderaan.linagora.com (smtp.linagora.dc1 [172.16.18.53])
-	 by imap (Cyrus v2.2.13-Debian-2.2.13-19+squeeze3) with LMTPA;
-	 Wed, 03 Jun 2015 08:59:45 +0200
-X-Sieve: CMU Sieve 2.2
-Received: from [10.69.43.36] (mne69-10-88-173-78-196.fbx.proxad.net [88.173.78.196])
-	(using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits))
-	(No client certificate requested)
-	by alderaan.linagora.com (Postfix) with ESMTPSA id 4FBAF720
-	for <mb...@linagora.com>; Wed,  3 Jun 2015 08:59:45 +0200 (CEST)
-Message-ID: <55...@linagora.com>
-Date: Wed, 03 Jun 2015 08:59:44 +0200
-From: Antoine DUPRAT <ad...@linagora.com>
-User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.6.0
-MIME-Version: 1.0
-To: "mbaechler@linagora.com" <mb...@linagora.com>
-Subject: Courbe Sprint
-Content-Type: multipart/mixed;
- boundary="------------000406070706000403020805"
-
-This is a multi-part message in MIME format.
---------------000406070706000403020805
-Content-Type: text/plain; charset=utf-8; format=flowed
-Content-Transfer-Encoding: 8bit
-
-Textual content of one attachment ( mail signature )
-
---------------000406070706000403020805
-Content-Type: application/vnd.oasis.opendocument.spreadsheet;
- name="Sprint-2015-05-18.ods"
-Content-Transfer-Encoding: base64
-Content-Disposition: attachment;
- filename="Sprint-2015-05-18.ods"
-
-Spread shit datas !
---------------000406070706000403020805--
-
---------------080603090509090707040003--

http://git-wip-us.apache.org/repos/asf/james-project/blob/d5b3a42c/mailbox/elasticsearch/src/test/resources/documents/recursiveMail.json
----------------------------------------------------------------------
diff --git a/mailbox/elasticsearch/src/test/resources/documents/recursiveMail.json b/mailbox/elasticsearch/src/test/resources/documents/recursiveMail.json
deleted file mode 100644
index 2115079..0000000
--- a/mailbox/elasticsearch/src/test/resources/documents/recursiveMail.json
+++ /dev/null
@@ -1,223 +0,0 @@
-{
-  "id": 25,
-  "mailboxId": "18",
-  "modSeq": 42,
-  "size": 25,
-  "date": "2015-06-07T00:00:00+02:00",
-  "mediaType": "plain",
-  "subtype": "text",
-  "userFlags": [
-    "security",
-    "debian"
-  ],
-  "headers": {
-    "date": [
-      "Wed, 10 Jun 2015 10:45:27 +0200"
-    ],
-    "mime-version": [
-      "1.0"
-    ],
-    "in-reply-to": [
-      "<55...@linagora.com>"
-    ],
-    "references": [
-      "<55...@linagora.com>"
-    ],
-    "return-path": [
-      "<mb...@linagora.com>"
-    ],
-    "x-forwarded-message-id": [
-      "<55...@linagora.com>"
-    ],
-    "subject": [
-      "Fwd: Courbe Sprint"
-    ],
-    "received": [
-      "from alderaan.linagora.com (smtp.linagora.dc1 [172.16.18.53])\t by imap (Cyrus v2.2.13-Debian-2.2.13-19+squeeze3) with LMTPA;\t Wed, 10 Jun 2015 10:45:29 +0200",
-      "from [10.69.2.28] (mne69-10-88-173-78-196.fbx.proxad.net [88.173.78.196])\t(using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits))\t(No client certificate requested)\tby alderaan.linagora.com (Postfix) with ESMTPSA id 7F33E728\tfor <bt...@linagora.com>; Wed, 10 Jun 2015 10:45:28 +0200 (CEST)"
-    ],
-    "x-sieve": [
-      "CMU Sieve 2.2"
-    ],
-    "message-id": [
-      "<55...@linagora.com>"
-    ],
-    "from": [
-      "Matthieu Baechler <mb...@linagora.com>"
-    ],
-    "content-type": [
-      "multipart/mixed; boundary=\"------------080603090509090707040003\""
-    ],
-    "to": [
-      "btellier@linagora.com"
-    ],
-    "user-agent": [
-      "Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Icedove/31.7.0"
-    ]
-  },
-  "from": [
-    {
-      "name": "Matthieu Baechler",
-      "address": "mbaechler@linagora.com"
-    }
-  ],
-  "to": [
-    {
-      "name": "btellier@linagora.com",
-      "address": "btellier@linagora.com"
-    }
-  ],
-  "cc": [],
-  "bcc": [],
-  "replyTo": [],
-  "subject": [
-    "Fwd: Courbe Sprint"
-  ],
-  "sentDate": "2015-06-10T10:45:27+02:00",
-  "properties": [
-    {
-      "namespace": "http://james.apache.org/rfc2045/Content-Type",
-      "localName": "type",
-      "value": "plain"
-    },
-    {
-      "namespace": "http://james.apache.org/rfc2045/Content-Type",
-      "localName": "subtype",
-      "value": "text"
-    },
-    {
-      "namespace": "http://james.apache.org/rfc2045",
-      "localName": "Content-Description",
-      "value": "An e-mail"
-    }
-  ],
-  "attachments": [
-    {
-      "textContent": "Forward as attachment !\n\n\n",
-      "mediaType": "text",
-      "subtype": "plain",
-      "fileMetadata":{},
-      "fileName": null,
-      "fileExtension": null,
-      "contentDisposition": null,
-      "headers": {
-        "content-transfer-encoding": [
-          "7bit"
-        ],
-        "content-type": [
-          "text/plain; charset=utf-8; format=flowed"
-        ]
-      }
-    },
-    {
-      "textContent": null,
-      "mediaType": null,
-      "subtype": null,
-      "fileMetadata":{},
-      "fileName": null,
-      "fileExtension": null,
-      "contentDisposition": null,
-      "headers": {
-        "content-transfer-encoding": [
-          "8bit"
-        ],
-        "content-disposition": [
-          "attachment; filename=\"Courbe Sprint.eml\""
-        ],
-        "content-type": [
-          "message/rfc822; name=\"Courbe Sprint.eml\""
-        ]
-      }
-    },
-    {
-      "textContent": null,
-      "mediaType": null,
-      "subtype": null,
-      "fileName": null,
-      "fileMetadata":{},
-      "fileExtension": null,
-      "contentDisposition": null,
-      "headers": {
-        "date": [
-          "Wed, 03 Jun 2015 08:59:44 +0200"
-        ],
-        "mime-version": [
-          "1.0"
-        ],
-        "x-sieve": [
-          "CMU Sieve 2.2"
-        ],
-        "return-path": [
-          "<ad...@linagora.com>"
-        ],
-        "subject": [
-          "Courbe Sprint"
-        ],
-        "message-id": [
-          "<55...@linagora.com>"
-        ],
-        "received": [
-          "from alderaan.linagora.com (smtp.linagora.dc1 [172.16.18.53])\t by imap (Cyrus v2.2.13-Debian-2.2.13-19+squeeze3) with LMTPA;\t Wed, 03 Jun 2015 08:59:45 +0200",
-          "from [10.69.43.36] (mne69-10-88-173-78-196.fbx.proxad.net [88.173.78.196])\t(using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits))\t(No client certificate requested)\tby alderaan.linagora.com (Postfix) with ESMTPSA id 4FBAF720\tfor <mb...@linagora.com>; Wed,  3 Jun 2015 08:59:45 +0200 (CEST)"
-        ],
-        "from": [
-          "Antoine DUPRAT <ad...@linagora.com>"
-        ],
-        "content-type": [
-          "multipart/mixed; boundary=\"------------000406070706000403020805\""
-        ],
-        "to": [
-          "\"mbaechler@linagora.com\" <mb...@linagora.com>"
-        ],
-        "user-agent": [
-          "Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.6.0"
-        ]
-      }
-    },
-    {
-      "textContent": "Textual content of one attachment ( mail signature )\n",
-      "mediaType": "text",
-      "subtype": "plain",
-      "fileName": null,
-      "fileExtension": null,
-      "fileMetadata":{},
-      "contentDisposition": null,
-      "headers": {
-        "content-transfer-encoding": [
-          "8bit"
-        ],
-        "content-type": [
-          "text/plain; charset=utf-8; format=flowed"
-        ]
-      }
-    },
-    {
-      "textContent": null,
-      "fileMetadata":{},
-      "mediaType": "application",
-      "subtype": "vnd.oasis.opendocument.spreadsheet",
-      "fileName": "Sprint-2015-05-18.ods",
-      "fileExtension": "ods",
-      "contentDisposition": "attachment",
-      "headers": {
-        "content-transfer-encoding": [
-          "base64"
-        ],
-        "content-disposition": [
-          "attachment; filename=\"Sprint-2015-05-18.ods\""
-        ],
-        "content-type": [
-          "application/vnd.oasis.opendocument.spreadsheet; name=\"Sprint-2015-05-18.ods\""
-        ]
-      }
-    }
-  ],
-  "textBody": "Forward as attachment !\n\n\n",
-  "isDraft": false,
-  "isFlagged": true,
-  "isRecent": false,
-  "isAnswered": false,
-  "isDeleted": true,
-  "hasAttachment": true,
-  "isUnread": false
-}

http://git-wip-us.apache.org/repos/asf/james-project/blob/d5b3a42c/mailbox/elasticsearch/src/test/resources/documents/spamMail.eml
----------------------------------------------------------------------
diff --git a/mailbox/elasticsearch/src/test/resources/documents/spamMail.eml b/mailbox/elasticsearch/src/test/resources/documents/spamMail.eml
deleted file mode 100644
index 2359ec3..0000000
--- a/mailbox/elasticsearch/src/test/resources/documents/spamMail.eml
+++ /dev/null
@@ -1,143 +0,0 @@
-Return-Path: <ro...@listes.minet.net>
-Received: from mx1.minet.net (mx1.minet.net [192.168.102.25])
-	 by imap (Cyrus v2.4.16-Debian-2.4.16-4+deb7u1) with LMTPA;
-	 Wed, 03 Jun 2015 11:05:45 +0200
-X-Sieve: CMU Sieve 2.4
-Received: from smtp.minet.net (smtp.minet.net [192.168.102.18])
-	by mx1.minet.net (Postfix) with ESMTP id F06FE610F72;
-	Wed,  3 Jun 2015 11:05:48 +0200 (CEST)
-Received: from listes.minet.net (listes.minet.net [192.168.102.29])
-	by smtp.minet.net (Postfix) with ESMTP id AAB15610F70;
-	Wed,  3 Jun 2015 09:05:48 +0000 (UTC)
-DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=minet.net; s=mail;
-	t=1433322348; bh=8OtmVRMX7IWWyQo8WQIi5rKeDEQFghSX2r1WN9/pqUk=;
-	h=From:Date:To:Subject:List-Id:List-Unsubscribe:List-Post:List-Help:
-	 List-Subscribe:From;
-	b=UkthSFXn5mtPnn7sYvDJIxgCk1O36L0p+hTOnI/xTF2WRMGJyXtLyCdFdE5jQ5gE4
-	 EGNdhwmfjaKsoE7IDtc/4GrPvbnM8i9ojpSOBW1hXJPOeYnRgah/4gsXsMJWvmmq/A
-	 4oTnw8ZswFXiShDmBMyaSEZuVrWTdaPBgUhVhGw8=
-Received: from listes.minet.net (listes.minet.net [127.0.0.1])
-	by listes.minet.net (Postfix) with ESMTP id 9CD5BA27FF9;
-	Wed,  3 Jun 2015 09:05:48 +0000 (UTC)
-X-Original-To: root@listes.minet.net
-Delivered-To: root@listes.minet.net
-Received: from mx1.minet.net (mx1.minet.net [192.168.102.25])
- by listes.minet.net (Postfix) with ESMTP id B8C1FA27FEF
- for <ro...@listes.minet.net>; Wed,  3 Jun 2015 09:05:46 +0000 (UTC)
-Received: from localhost (spam.minet.net [192.168.102.97])
- by mx1.minet.net (Postfix) with ESMTP id AD28B610F6D
- for <ro...@listes.minet.net>; Wed,  3 Jun 2015 11:05:46 +0200 (CEST)
-Content-Type: multipart/mixed; boundary="----------=_1433322346-12583-0"
-Content-Transfer-Encoding: 7bit
-MIME-Version: 1.0
-From: "Content-filter at spam.minet.net" <po...@minet.net>
-Date: Wed, 3 Jun 2015 09:05:46 +0000 (UTC)
-To: <ro...@listes.minet.net>
-Message-ID: <VA...@spam.minet.net>
-Subject: [root] UNCHECKED contents in mail FROM <qu...@riseup.net>
-X-BeenThere: root@listes.minet.net
-X-Mailman-Version: 2.1.15
-Precedence: list
-List-Id: <root.listes.minet.net>
-List-Unsubscribe: <https://listes.minet.net/cgi-bin/mailman/options/root>,
- <mailto:root-request@listes.minet.net?subject=unsubscribe>
-List-Post: <ma...@listes.minet.net>
-List-Help: <mailto:root-request@listes.minet.net?subject=help>
-List-Subscribe: <https://listes.minet.net/cgi-bin/mailman/listinfo/root>,
- <mailto:root-request@listes.minet.net?subject=subscribe>
-Errors-To: root-bounces@listes.minet.net
-Sender: "root" <ro...@listes.minet.net>
-
-This is a multi-part message in MIME format...
-
-------------=_1433322346-12583-0
-Content-Type: text/plain; charset="UTF-8"
-Content-Disposition: inline
-Content-Transfer-Encoding: 7bit
-
-No viruses were found.
-
-Content type: Unchecked
-Internal reference code for the message is 12583-16/Ss-IZaXqmZao
-
-According to a 'Received:' trace, the message apparently originated at:
-  [198.252.153.129], [127.0.0.1] localhost [127.0.0.1] Authenticated sender:
-  quentin.h
-
-Return-Path: <qu...@riseup.net>
-From: Quentin <qu...@riseup.net>
-Message-ID: <55...@riseup.net>
-Subject: =?UTF-8?B?UmU6IEZ3ZDogW1RtcGxhYl0gW0FQUEVMIEEgUEFSVElDSVBBVElPTl0=?=
-  =?UTF-8?B?IFdvb3QgZGV2aWNlcyAjMiAgOiB2ZW5leiBmYWlyZSBsZXVyIGhhY2tmw6p0ZSA=?=
-  =?UTF-8?B?YXV4IHBldGl0ZXMgbWFjaGluZXMgcHJvZ3JhbW1hYmxlcyBsZXMgNi03IGp1aW4=?=
-  =?UTF-8?B?IGF1IEphcmRpbiBkJ2FsaWNlL0JsYWNrbG9vcA==?=
-Not quarantined.
-
-The message WILL BE relayed to:
-<ya...@minet.net>
-
-
-------------=_1433322346-12583-0
-Content-Type: text/rfc822-headers; name="header"
-Content-Disposition: inline; filename="header"
-Content-Transfer-Encoding: 7bit
-Content-Description: Message header section
-
-Return-Path: <qu...@riseup.net>
-Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=198.252.153.129; helo=mx1.riseup.net; envelope-from=quentin.h@riseup.net; receiver=yann@minet.net
-Authentication-Results: mx2.minet.net; dkim=pass
-	reason="1024-bit key; insecure key"
-	header.d=riseup.net header.i=@riseup.net header.b=RVs2xP3R;
-	dkim-adsp=pass; dkim-atps=neutral
-Received: from mx1.riseup.net (mx1.riseup.net [198.252.153.129])
-	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
-	(No client certificate requested)
-	by mx2.minet.net (Postfix) with ESMTPS id 6D9E0A27FCA
-	for <ya...@minet.net>; Wed,  3 Jun 2015 11:05:44 +0200 (CEST)
-Received: from plantcutter.riseup.net (plantcutter-pn.riseup.net [10.0.1.121])
-	(using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits))
-	(Client CN "*.riseup.net", Issuer "COMODO RSA Domain Validation Secure Server CA" (verified OK))
-	by mx1.riseup.net (Postfix) with ESMTPS id 5CC6541A75;
-	Wed,  3 Jun 2015 09:05:42 +0000 (UTC)
-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak;
-	t=1433322342; bh=Lz3x5ntYzOhQOpyviKamr5VE0TinfpBCnsivvJzojYk=;
-	h=Date:From:To:Subject:References:In-Reply-To:From;
-	b=RVs2xP3RV4zWi3Jbs6p85cO8s44yLq1LXxwe6NQvgZjsHQdWaMY16jQzSbCRRdCRY
-	 IesTpg1mncqIinhXxL9grw2+0MgO+E0HM0ZPZzXM/xNTGZpALI1X6tDM0rxB+GEnHa
-	 NfGRbWnesWFLyba7am02KbTKeKq7svIBBmSbaFsE=
-Received: from [127.0.0.1] (localhost [127.0.0.1])
-	(Authenticated sender: quentin.h)
-	with ESMTPSA id 6DBAC20827
-Message-ID: <55...@riseup.net>
-Date: Wed, 03 Jun 2015 11:05:37 +0200
-From: Quentin <qu...@riseup.net>
-User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.7.0
-MIME-Version: 1.0
-To: Yann Sionneau <ya...@minet.net>, =?UTF-8?B?U3TDqXBoYW5pZSBPdWlsbG9u?=
- <st...@ouillon.fr>, =?UTF-8?B?TmF0YWxpYSBDYWxkZXJvbiBCZWx0csOhbg==?=
- <na...@calderon.be>
-Subject: =?UTF-8?B?UmU6IEZ3ZDogW1RtcGxhYl0gW0FQUEVMIEEgUEFSVElDSVBBVElPTl0=?=
- =?UTF-8?B?IFdvb3QgZGV2aWNlcyAjMiAgOiB2ZW5leiBmYWlyZSBsZXVyIGhhY2tmw6p0ZSA=?=
- =?UTF-8?B?YXV4IHBldGl0ZXMgbWFjaGluZXMgcHJvZ3JhbW1hYmxlcyBsZXMgNi03IGp1aW4=?=
- =?UTF-8?B?IGF1IEphcmRpbiBkJ2FsaWNlL0JsYWNrbG9vcA==?=
-References: <55...@wootdevices.io> <55...@minet.net>
-In-Reply-To: <55...@minet.net>
-OpenPGP: id=AA5EE4B4EA20E2BEAA70B98E49CBF006922B990A;
-	url=pgp.mit.edu
-Content-Type: multipart/encrypted;
- protocol="application/pgp-encrypted";
- boundary="M0xVhKIvXqi85dG57o5RfCUAoFwhAw1Nh"
-X-Virus-Scanned: clamav-milter 0.98.7 at mx1
-X-Virus-Status: Clean
-
-------------=_1433322346-12583-0
-Content-Type: text/plain; charset="iso-8859-1"
-MIME-Version: 1.0
-Content-Transfer-Encoding: quoted-printable
-Content-Disposition: inline
-
-_______________________________________________
-root mailing list
-root@listes.minet.net
-https://listes.minet.net/cgi-bin/mailman/listinfo/root
-------------=_1433322346-12583-0--

http://git-wip-us.apache.org/repos/asf/james-project/blob/d5b3a42c/mailbox/elasticsearch/src/test/resources/documents/spamMail.json
----------------------------------------------------------------------
diff --git a/mailbox/elasticsearch/src/test/resources/documents/spamMail.json b/mailbox/elasticsearch/src/test/resources/documents/spamMail.json
deleted file mode 100644
index 2dae712..0000000
--- a/mailbox/elasticsearch/src/test/resources/documents/spamMail.json
+++ /dev/null
@@ -1,201 +0,0 @@
-{
-  "id": 0,
-  "mailboxId": "18",
-  "modSeq": 42,
-  "size": 25,
-  "date": "2015-06-07T00:00:00+0200",
-  "mediaType": "plain",
-  "subtype": "text",
-  "userFlags": [],
-  "headers": {
-	"mime-version": [
-	  "1.0"
-	],
-	"date": [
-	  "Wed, 3 Jun 2015 09:05:46 +0000 (UTC)"
-	],
-	"x-beenthere": [
-	  "root@listes.minet.net"
-	],
-	"list-unsubscribe": [
-	  "<https://listes.minet.net/cgi-bin/mailman/options/root>, <mailto:root-request@listes.minet.net?subject=unsubscribe>"
-	],
-	"return-path": [
-	  "<ro...@listes.minet.net>"
-	],
-	"subject": [
-	  "[root] UNCHECKED contents in mail FROM <qu...@riseup.net>"
-	],
-	"list-post": [
-	  "<ma...@listes.minet.net>"
-	],
-	"received": [
-	  "from mx1.minet.net (mx1.minet.net [192.168.102.25])\t by imap (Cyrus v2.4.16-Debian-2.4.16-4+deb7u1) with LMTPA;\t Wed, 03 Jun 2015 11:05:45 +0200",
-	  "from smtp.minet.net (smtp.minet.net [192.168.102.18])\tby mx1.minet.net (Postfix) with ESMTP id F06FE610F72;\tWed,  3 Jun 2015 11:05:48 +0200 (CEST)",
-	  "from listes.minet.net (listes.minet.net [192.168.102.29])\tby smtp.minet.net (Postfix) with ESMTP id AAB15610F70;\tWed,  3 Jun 2015 09:05:48 +0000 (UTC)",
-	  "from listes.minet.net (listes.minet.net [127.0.0.1])\tby listes.minet.net (Postfix) with ESMTP id 9CD5BA27FF9;\tWed,  3 Jun 2015 09:05:48 +0000 (UTC)",
-	  "from mx1.minet.net (mx1.minet.net [192.168.102.25]) by listes.minet.net (Postfix) with ESMTP id B8C1FA27FEF for <ro...@listes.minet.net>; Wed,  3 Jun 2015 09:05:46 +0000 (UTC)",
-	  "from localhost (spam.minet.net [192.168.102.97]) by mx1.minet.net (Postfix) with ESMTP id AD28B610F6D for <ro...@listes.minet.net>; Wed,  3 Jun 2015 11:05:46 +0200 (CEST)"
-	],
-	"errors-to": [
-	  "root-bounces@listes.minet.net"
-	],
-	"precedence": [
-	  "list"
-	],
-	"list-subscribe": [
-	  "<https://listes.minet.net/cgi-bin/mailman/listinfo/root>, <mailto:root-request@listes.minet.net?subject=subscribe>"
-	],
-	"x-sieve": [
-	  "CMU Sieve 2.4"
-	],
-	"list-help": [
-	  "<mailto:root-request@listes.minet.net?subject=help>"
-	],
-	"content-transfer-encoding": [
-	  "7bit"
-	],
-	"sender": [
-	  "\"root\" <ro...@listes.minet.net>"
-	],
-	"delivered-to": [
-	  "root@listes.minet.net"
-	],
-	"x-mailman-version": [
-	  "2.1.15"
-	],
-	"message-id": [
-	  "<VA...@spam.minet.net>"
-	],
-	"content-type": [
-	  "multipart/mixed; boundary=\"----------=_1433322346-12583-0\""
-	],
-	"from": [
-	  "\"Content-filter at spam.minet.net\" <po...@minet.net>"
-	],
-	"x-original-to": [
-	  "root@listes.minet.net"
-	],
-	"to": [
-	  "<ro...@listes.minet.net>"
-	],
-	"list-id": [
-	  "<root.listes.minet.net>"
-	],
-	"dkim-signature": [
-	  "v=1; a=rsa-sha256; c=simple/simple; d=minet.net; s=mail;\tt=1433322348; bh=8OtmVRMX7IWWyQo8WQIi5rKeDEQFghSX2r1WN9/pqUk=;\th=From:Date:To:Subject:List-Id:List-Unsubscribe:List-Post:List-Help:\t List-Subscribe:From;\tb=UkthSFXn5mtPnn7sYvDJIxgCk1O36L0p+hTOnI/xTF2WRMGJyXtLyCdFdE5jQ5gE4\t EGNdhwmfjaKsoE7IDtc/4GrPvbnM8i9ojpSOBW1hXJPOeYnRgah/4gsXsMJWvmmq/A\t 4oTnw8ZswFXiShDmBMyaSEZuVrWTdaPBgUhVhGw8="
-	]
-  },
-  "from": [
-	{
-	  "name": "Content-filter at spam.minet.net",
-	  "address": "postmaster@minet.net"
-	}
-  ],
-  "to": [
-	{
-	  "name": "root@listes.minet.net",
-	  "address": "root@listes.minet.net"
-	}
-  ],
-  "cc": [],
-  "bcc": [],
-  "replyTo": [],
-  "subject": [
-	"[root] UNCHECKED contents in mail FROM <qu...@riseup.net>"
-  ],
-  "sentDate": "2015-06-03T09:05:46+0000",
-  "properties": [
-	{
-	  "namespace": "http://james.apache.org/rfc2045/Content-Type",
-	  "localName": "type",
-	  "value": "plain"
-	},
-	{
-	  "namespace": "http://james.apache.org/rfc2045/Content-Type",
-	  "localName": "subtype",
-	  "value": "text"
-	},
-	{
-	  "namespace": "http://james.apache.org/rfc2045",
-	  "localName": "Content-Description",
-	  "value": "An e-mail"
-	}
-  ],
-  "attachments": [
-	{
-	  "textContent": "No viruses were found.\n\nContent type: Unchecked\nInternal reference code for the message is 12583-16/Ss-IZaXqmZao\n\nAccording to a 'Received:' trace, the message apparently originated at:\n  [198.252.153.129], [127.0.0.1] localhost [127.0.0.1] Authenticated sender:\n  quentin.h\n\nReturn-Path: <qu...@riseup.net>\nFrom: Quentin <qu...@riseup.net>\nMessage-ID: <55...@riseup.net>\nSubject: =?UTF-8?B?UmU6IEZ3ZDogW1RtcGxhYl0gW0FQUEVMIEEgUEFSVElDSVBBVElPTl0=?=\n  =?UTF-8?B?IFdvb3QgZGV2aWNlcyAjMiAgOiB2ZW5leiBmYWlyZSBsZXVyIGhhY2tmw6p0ZSA=?=\n  =?UTF-8?B?YXV4IHBldGl0ZXMgbWFjaGluZXMgcHJvZ3JhbW1hYmxlcyBsZXMgNi03IGp1aW4=?=\n  =?UTF-8?B?IGF1IEphcmRpbiBkJ2FsaWNlL0JsYWNrbG9vcA==?=\nNot quarantined.\n\nThe message WILL BE relayed to:\n<ya...@minet.net>\n\n",
-	  "mediaType": "text",
-	  "subtype": "plain",
-	  "fileName": null,
-	  "fileMetadata":{},
-	  "fileExtension": null,
-	  "contentDisposition": "inline",
-	  "headers": {
-		"content-disposition": [
-		  "inline"
-		],
-		"content-transfer-encoding": [
-		  "7bit"
-		],
-		"content-type": [
-		  "text/plain; charset=\"UTF-8\""
-		]
-	  }
-	},
-	{
-	  "textContent": "Return-Path: <qu...@riseup.net>\nReceived-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=198.252.153.129; helo=mx1.riseup.net; envelope-from=quentin.h@riseup.net; receiver=yann@minet.net\nAuthentication-Results: mx2.minet.net; dkim=pass\n\treason=\"1024-bit key; insecure key\"\n\theader.d=riseup.net header.i=@riseup.net header.b=RVs2xP3R;\n\tdkim-adsp=pass; dkim-atps=neutral\nReceived: from mx1.riseup.net (mx1.riseup.net [198.252.153.129])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby mx2.minet.net (Postfix) with ESMTPS id 6D9E0A27FCA\n\tfor <ya...@minet.net>; Wed,  3 Jun 2015 11:05:44 +0200 (CEST)\nReceived: from plantcutter.riseup.net (plantcutter-pn.riseup.net [10.0.1.121])\n\t(using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits))\n\t(Client CN \"*.riseup.net\", Issuer \"COMODO RSA Domain Validation Secure Server CA\" (verified OK))\n\tby mx1.riseup.net (Postfix) wi
 th ESMTPS id 5CC6541A75;\n\tWed,  3 Jun 2015 09:05:42 +0000 (UTC)\nDKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak;\n\tt=1433322342; bh=Lz3x5ntYzOhQOpyviKamr5VE0TinfpBCnsivvJzojYk=;\n\th=Date:From:To:Subject:References:In-Reply-To:From;\n\tb=RVs2xP3RV4zWi3Jbs6p85cO8s44yLq1LXxwe6NQvgZjsHQdWaMY16jQzSbCRRdCRY\n\t IesTpg1mncqIinhXxL9grw2+0MgO+E0HM0ZPZzXM/xNTGZpALI1X6tDM0rxB+GEnHa\n\t NfGRbWnesWFLyba7am02KbTKeKq7svIBBmSbaFsE=\nReceived: from [127.0.0.1] (localhost [127.0.0.1])\n\t(Authenticated sender: quentin.h)\n\twith ESMTPSA id 6DBAC20827\nMessage-ID: <55...@riseup.net>\nDate: Wed, 03 Jun 2015 11:05:37 +0200\nFrom: Quentin <qu...@riseup.net>\nUser-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.7.0\nMIME-Version: 1.0\nTo: Yann Sionneau <ya...@minet.net>, =?UTF-8?B?U3TDqXBoYW5pZSBPdWlsbG9u?=\n <st...@ouillon.fr>, =?UTF-8?B?TmF0YWxpYSBDYWxkZXJvbiBCZWx0csOhbg==?=\n <na...@calderon.be>\nSubject: =?UTF-8?B?UmU6IE
 Z3ZDogW1RtcGxhYl0gW0FQUEVMIEEgUEFSVElDSVBBVElPTl0=?=\n =?UTF-8?B?IFdvb3QgZGV2aWNlcyAjMiAgOiB2ZW5leiBmYWlyZSBsZXVyIGhhY2tmw6p0ZSA=?=\n =?UTF-8?B?YXV4IHBldGl0ZXMgbWFjaGluZXMgcHJvZ3JhbW1hYmxlcyBsZXMgNi03IGp1aW4=?=\n =?UTF-8?B?IGF1IEphcmRpbiBkJ2FsaWNlL0JsYWNrbG9vcA==?=\nReferences: <55...@wootdevices.io> <55...@minet.net>\nIn-Reply-To: <55...@minet.net>\nOpenPGP: id=AA5EE4B4EA20E2BEAA70B98E49CBF006922B990A;\n\turl=pgp.mit.edu\nContent-Type: multipart/encrypted;\n protocol=\"application/pgp-encrypted\";\n boundary=\"M0xVhKIvXqi85dG57o5RfCUAoFwhAw1Nh\"\nX-Virus-Scanned: clamav-milter 0.98.7 at mx1\nX-Virus-Status: Clean\n",
-	  "mediaType": "text",
-	  "subtype": "rfc822-headers",
-	  "fileName": "header",
-	  "fileExtension": "",
-	  "fileMetadata":{},
-	  "contentDisposition": "inline",
-	  "headers": {
-		"content-disposition": [
-		  "inline; filename=\"header\""
-		],
-		"content-transfer-encoding": [
-		  "7bit"
-		],
-		"content-type": [
-		  "text/rfc822-headers; name=\"header\""
-		],
-		"content-description": [
-		  "Message header section"
-		]
-	  }
-	},
-	{
-	  "textContent": "_______________________________________________\r\nroot mailing list\r\nroot@listes.minet.net\r\nhttps://listes.minet.net/cgi-bin/mailman/listinfo/root",
-	  "mediaType": "text",
-	  "subtype": "plain",
-	  "fileName": null,
-	  "fileMetadata":{},
-	  "fileExtension": null,
-	  "contentDisposition": "inline",
-	  "headers": {
-		"mime-version": [
-		  "1.0"
-		],
-		"content-transfer-encoding": [
-		  "quoted-printable"
-		],
-		"content-disposition": [
-		  "inline"
-		],
-		"content-type": [
-		  "text/plain; charset=\"iso-8859-1\""
-		]
-	  }
-	}
-  ],
-  "textBody": "No viruses were found.\n\nContent type: Unchecked\nInternal reference code for the message is 12583-16/Ss-IZaXqmZao\n\nAccording to a 'Received:' trace, the message apparently originated at:\n  [198.252.153.129], [127.0.0.1] localhost [127.0.0.1] Authenticated sender:\n  quentin.h\n\nReturn-Path: <qu...@riseup.net>\nFrom: Quentin <qu...@riseup.net>\nMessage-ID: <55...@riseup.net>\nSubject: =?UTF-8?B?UmU6IEZ3ZDogW1RtcGxhYl0gW0FQUEVMIEEgUEFSVElDSVBBVElPTl0=?=\n  =?UTF-8?B?IFdvb3QgZGV2aWNlcyAjMiAgOiB2ZW5leiBmYWlyZSBsZXVyIGhhY2tmw6p0ZSA=?=\n  =?UTF-8?B?YXV4IHBldGl0ZXMgbWFjaGluZXMgcHJvZ3JhbW1hYmxlcyBsZXMgNi03IGp1aW4=?=\n  =?UTF-8?B?IGF1IEphcmRpbiBkJ2FsaWNlL0JsYWNrbG9vcA==?=\nNot quarantined.\n\nThe message WILL BE relayed to:\n<ya...@minet.net>\n\n",
-  "isAnswered": false,
-  "isDeleted": false,
-  "isDraft": false,
-  "isFlagged": false,
-  "isRecent": false,
-  "hasAttachment": true,
-  "isUnread": true
-}


---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org