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 bt...@apache.org on 2018/01/30 08:12:27 UTC
[16/16] james-project git commit: JAMES-2323 Deprecate
MboxMailRepository
JAMES-2323 Deprecate MboxMailRepository
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/1d6f4b7c
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/1d6f4b7c
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/1d6f4b7c
Branch: refs/heads/master
Commit: 1d6f4b7c47fba73c74c3e85e1e6893a7a47d0c58
Parents: b9a820f
Author: benwa <bt...@linagora.com>
Authored: Mon Jan 29 16:34:38 2018 +0700
Committer: benwa <bt...@linagora.com>
Committed: Tue Jan 30 15:11:15 2018 +0700
----------------------------------------------------------------------
server/app/src/main/resources/mailrepositorystore.xml | 9 ---------
.../data-api/src/main/resources/mailrepositorystore.xml | 6 ------
.../james/mailrepository/file/MBoxMailRepository.java | 8 +++++++-
.../apache/james/mailrepository/MBoxMailRepositoryTest.java | 7 +++++++
src/site/xdoc/server/config-mailrepositorystore.xml | 3 +++
5 files changed, 17 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/1d6f4b7c/server/app/src/main/resources/mailrepositorystore.xml
----------------------------------------------------------------------
diff --git a/server/app/src/main/resources/mailrepositorystore.xml b/server/app/src/main/resources/mailrepositorystore.xml
index 291fa24..5ddddc8 100644
--- a/server/app/src/main/resources/mailrepositorystore.xml
+++ b/server/app/src/main/resources/mailrepositorystore.xml
@@ -67,15 +67,6 @@
<filestore>file://var/dbmail</filestore>
</config>
</mailrepository>
-
- <!-- The mbox repository is designed for MAIL only; SPOOL performance would be less than ideal-->
- <mailrepository class="org.apache.james.mailrepository.file.MBoxMailRepository">
- <protocols>
- <protocol>mbox</protocol>
- </protocols>
- <!-- Set if the messages should be listed sorted. False by default -->
- <config FIFO="false"/>
- </mailrepository>
<!-- If you enable this you need to make sure that embedded Jackrabbit instance is started as well. Check the container configuration -->
<!--
http://git-wip-us.apache.org/repos/asf/james-project/blob/1d6f4b7c/server/data/data-api/src/main/resources/mailrepositorystore.xml
----------------------------------------------------------------------
diff --git a/server/data/data-api/src/main/resources/mailrepositorystore.xml b/server/data/data-api/src/main/resources/mailrepositorystore.xml
index 971b70f..e20739f 100644
--- a/server/data/data-api/src/main/resources/mailrepositorystore.xml
+++ b/server/data/data-api/src/main/resources/mailrepositorystore.xml
@@ -46,11 +46,5 @@
<filestore>file://var/dbmail</filestore>
</config>
</mailrepository>
- <mailrepository class="org.apache.james.mailrepository.file.MBoxMailRepository">
- <protocols>
- <protocol>mbox</protocol>
- </protocols>
- <config FIFO="false"/>
- </mailrepository>
</mailrepositories>
</mailrepositorystore>
http://git-wip-us.apache.org/repos/asf/james-project/blob/1d6f4b7c/server/data/data-file/src/main/java/org/apache/james/mailrepository/file/MBoxMailRepository.java
----------------------------------------------------------------------
diff --git a/server/data/data-file/src/main/java/org/apache/james/mailrepository/file/MBoxMailRepository.java b/server/data/data-file/src/main/java/org/apache/james/mailrepository/file/MBoxMailRepository.java
index fa9ba5d..00f05e2 100755
--- a/server/data/data-file/src/main/java/org/apache/james/mailrepository/file/MBoxMailRepository.java
+++ b/server/data/data-file/src/main/java/org/apache/james/mailrepository/file/MBoxMailRepository.java
@@ -114,8 +114,14 @@ import com.google.common.hash.Hashing;
* slower (read from disk and parse). Therefore this implementation is best
* suited to people who wish to use the mbox format for taking data out of James
* and into something else (IMAP server or mail list displayer)
+ *
+ * @Depracted: See JAMES-2323
+ *
+ * Will be removed in James 3.2.0 upcoming release.
+ *
+ * Use a modern, maintained MailRepository instead. For instead FileMailRepository.
*/
-
+@Deprecated
public class MBoxMailRepository implements MailRepository, Configurable {
private static final Logger LOGGER = LoggerFactory.getLogger(MBoxMailRepository.class);
http://git-wip-us.apache.org/repos/asf/james-project/blob/1d6f4b7c/server/data/data-file/src/test/java/org/apache/james/mailrepository/MBoxMailRepositoryTest.java
----------------------------------------------------------------------
diff --git a/server/data/data-file/src/test/java/org/apache/james/mailrepository/MBoxMailRepositoryTest.java b/server/data/data-file/src/test/java/org/apache/james/mailrepository/MBoxMailRepositoryTest.java
index 3cbb431..b874cd9 100644
--- a/server/data/data-file/src/test/java/org/apache/james/mailrepository/MBoxMailRepositoryTest.java
+++ b/server/data/data-file/src/test/java/org/apache/james/mailrepository/MBoxMailRepositoryTest.java
@@ -36,7 +36,14 @@ import org.junit.Test;
*
* NOTE this previously extended AbstractMailRepositoryTest to run all of the
* common mail repository tests on the MBox implementation.
+ *
+ * @Depracted: See JAMES-2323
+ *
+ * Will be removed in James 3.2.0 upcoming release.
+ *
+ * Use a modern, maintained MailRepository instead. For instead FileMailRepository.
*/
+@Deprecated
public class MBoxMailRepositoryTest {
protected MailRepository getMailRepository() throws Exception {
http://git-wip-us.apache.org/repos/asf/james-project/blob/1d6f4b7c/src/site/xdoc/server/config-mailrepositorystore.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/server/config-mailrepositorystore.xml b/src/site/xdoc/server/config-mailrepositorystore.xml
index 62e24b5..3d0b9f8 100644
--- a/src/site/xdoc/server/config-mailrepositorystore.xml
+++ b/src/site/xdoc/server/config-mailrepositorystore.xml
@@ -88,6 +88,9 @@
</subsection>
<subsection name="MBox Repositories">
+
+ <p>Warning: deprecated. This feature will be removed as part of James release 3.2.0 unless it is maintained.
+ See https://issues.apache.org/jira/browse/JAMES-2323. Use File Repositories instead.</p>
<p>The MBox file format repository.</p>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org