Repository: james-project Updated Branches: refs/heads/master 485406252 -> 7d6cbe24a
JAMES-2571 Deprecate main HBase components Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/a84ae7f9 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/a84ae7f9 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/a84ae7f9 Branch: refs/heads/master Commit: a84ae7f9b1c6a211d41316b7a0c7d52269a2a17f Parents: 4df51a5 Author: Antoine Duprat <[email protected]> Authored: Tue Oct 23 11:34:31 2018 +0200 Committer: Benoit Tellier <[email protected]> Committed: Wed Oct 31 08:48:29 2018 +0700 ---------------------------------------------------------------------- .../org/apache/james/mailbox/hbase/HBaseMailboxManager.java | 6 +++++- .../james/mailbox/hbase/HBaseMailboxSessionMapperFactory.java | 3 +++ .../org/apache/james/mailbox/hbase/HBaseMessageManager.java | 5 ++++- .../apache/james/mailrepository/file/MBoxMailRepository.java | 2 +- .../apache/james/mailrepository/MBoxMailRepositoryTest.java | 2 +- .../org/apache/james/domainlist/hbase/HBaseDomainList.java | 4 ++++ .../org/apache/james/rrt/hbase/HBaseRecipientRewriteTable.java | 4 ++++ .../src/main/java/org/apache/james/system/hbase/TablePool.java | 4 ++++ .../java/org/apache/james/user/hbase/HBaseUsersRepository.java | 4 ++++ .../org/apache/james/mailrepository/jcr/JCRMailRepository.java | 2 +- 10 files changed, 31 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/a84ae7f9/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/HBaseMailboxManager.java ---------------------------------------------------------------------- diff --git a/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/HBaseMailboxManager.java b/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/HBaseMailboxManager.java index 5606185..902b4dd 100644 --- a/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/HBaseMailboxManager.java +++ b/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/HBaseMailboxManager.java @@ -41,8 +41,12 @@ import org.apache.james.mailbox.store.transaction.Mapper; /** * HBase implementation of {@link StoreMailboxManager} - * + * + * @Deprecated: See JAMES-2571 The HBase implementation is not enough maintained and thus will be removed from James in version 3.3.0. Please prefer using + * other MailboxManagers or contribute the HBase mailbox maintenance. + * */ +@Deprecated public class HBaseMailboxManager extends StoreMailboxManager { public static final EnumSet<MailboxCapabilities> MAILBOX_CAPABILITIES = EnumSet.of(MailboxCapabilities.Namespace); http://git-wip-us.apache.org/repos/asf/james-project/blob/a84ae7f9/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/HBaseMailboxSessionMapperFactory.java ---------------------------------------------------------------------- diff --git a/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/HBaseMailboxSessionMapperFactory.java b/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/HBaseMailboxSessionMapperFactory.java index 1c840af..e6e67b3 100644 --- a/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/HBaseMailboxSessionMapperFactory.java +++ b/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/HBaseMailboxSessionMapperFactory.java @@ -56,7 +56,10 @@ import org.apache.james.mailbox.store.user.SubscriptionMapper; /** * HBase implementation of {@link MailboxSessionMapperFactory} * + * @Deprecated: See JAMES-2571 The HBase implementation is not enough maintained and thus will be removed from James in version 3.3.0. Please prefer using + * other MailboxManagers or contribute the HBase mailbox maintenance. */ +@Deprecated public class HBaseMailboxSessionMapperFactory extends MailboxSessionMapperFactory { private final Configuration conf; http://git-wip-us.apache.org/repos/asf/james-project/blob/a84ae7f9/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/HBaseMessageManager.java ---------------------------------------------------------------------- diff --git a/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/HBaseMessageManager.java b/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/HBaseMessageManager.java index be64742..7072590 100644 --- a/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/HBaseMessageManager.java +++ b/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/HBaseMessageManager.java @@ -37,8 +37,11 @@ import org.apache.james.mailbox.store.search.MessageSearchIndex; /** * HBase implementation of MessageManager. - * + * + * @Deprecated: See JAMES-2571 The HBase implementation is not enough maintained and thus will be removed from James in version 3.3.0. Please prefer using + * other MailboxManagers or contribute the HBase mailbox maintenance. */ +@Deprecated public class HBaseMessageManager extends StoreMessageManager { public HBaseMessageManager(MailboxSessionMapperFactory mapperFactory, http://git-wip-us.apache.org/repos/asf/james-project/blob/a84ae7f9/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 e4f8350..15b89ba 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 @@ -116,7 +116,7 @@ import com.google.common.hash.Hashing; * 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 + * @Deprecated: See JAMES-2323 * * Will be removed in James 3.2.0 upcoming release. * http://git-wip-us.apache.org/repos/asf/james-project/blob/a84ae7f9/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 3af04b3..97c1085 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 @@ -37,7 +37,7 @@ 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 + * @Deprecated: See JAMES-2323 * * Will be removed in James 3.2.0 upcoming release. * http://git-wip-us.apache.org/repos/asf/james-project/blob/a84ae7f9/server/data/data-hbase/src/main/java/org/apache/james/domainlist/hbase/HBaseDomainList.java ---------------------------------------------------------------------- diff --git a/server/data/data-hbase/src/main/java/org/apache/james/domainlist/hbase/HBaseDomainList.java b/server/data/data-hbase/src/main/java/org/apache/james/domainlist/hbase/HBaseDomainList.java index 7713320..1eeb571 100644 --- a/server/data/data-hbase/src/main/java/org/apache/james/domainlist/hbase/HBaseDomainList.java +++ b/server/data/data-hbase/src/main/java/org/apache/james/domainlist/hbase/HBaseDomainList.java @@ -43,7 +43,11 @@ import org.slf4j.LoggerFactory; /** * Implementation of the DomainList for a HBase persistence. + * + * @Deprecated: See JAMES-2571 The HBase implementation is not enough maintained and thus will be removed from James in version 3.3.0. Please prefer using + * other MailboxManagers or contribute the HBase mailbox maintenance. */ +@Deprecated public class HBaseDomainList extends AbstractDomainList { /** http://git-wip-us.apache.org/repos/asf/james-project/blob/a84ae7f9/server/data/data-hbase/src/main/java/org/apache/james/rrt/hbase/HBaseRecipientRewriteTable.java ---------------------------------------------------------------------- diff --git a/server/data/data-hbase/src/main/java/org/apache/james/rrt/hbase/HBaseRecipientRewriteTable.java b/server/data/data-hbase/src/main/java/org/apache/james/rrt/hbase/HBaseRecipientRewriteTable.java index 6b1a1ce..95aefe0 100644 --- a/server/data/data-hbase/src/main/java/org/apache/james/rrt/hbase/HBaseRecipientRewriteTable.java +++ b/server/data/data-hbase/src/main/java/org/apache/james/rrt/hbase/HBaseRecipientRewriteTable.java @@ -51,7 +51,11 @@ import com.google.common.base.Splitter; /** * Implementation of the RecipientRewriteTable for a HBase persistence. + * + * @Deprecated: See JAMES-2571 The HBase implementation is not enough maintained and thus will be removed from James in version 3.3.0. Please prefer using + * other MailboxManagers or contribute the HBase mailbox maintenance. */ +@Deprecated public class HBaseRecipientRewriteTable extends AbstractRecipientRewriteTable { private static final Logger log = LoggerFactory.getLogger(HBaseRecipientRewriteTable.class.getName()); http://git-wip-us.apache.org/repos/asf/james-project/blob/a84ae7f9/server/data/data-hbase/src/main/java/org/apache/james/system/hbase/TablePool.java ---------------------------------------------------------------------- diff --git a/server/data/data-hbase/src/main/java/org/apache/james/system/hbase/TablePool.java b/server/data/data-hbase/src/main/java/org/apache/james/system/hbase/TablePool.java index b1ca529..8fa434f 100644 --- a/server/data/data-hbase/src/main/java/org/apache/james/system/hbase/TablePool.java +++ b/server/data/data-hbase/src/main/java/org/apache/james/system/hbase/TablePool.java @@ -36,8 +36,12 @@ import org.apache.james.user.hbase.def.HUsersRepository; * Table Pool singleton to get the DomainList, RecipientRewriteTable and UserRepository HBase tables. * * TODO Two getInstance methods are public, one for the impl, one for the tests. This is not good. + * + * @Deprecated: See JAMES-2571 The HBase implementation is not enough maintained and thus will be removed from James in version 3.3.0. Please prefer using + * other MailboxManagers or contribute the HBase mailbox maintenance. */ @SuppressWarnings("deprecation") +@Deprecated public class TablePool { private static Configuration configuration; http://git-wip-us.apache.org/repos/asf/james-project/blob/a84ae7f9/server/data/data-hbase/src/main/java/org/apache/james/user/hbase/HBaseUsersRepository.java ---------------------------------------------------------------------- diff --git a/server/data/data-hbase/src/main/java/org/apache/james/user/hbase/HBaseUsersRepository.java b/server/data/data-hbase/src/main/java/org/apache/james/user/hbase/HBaseUsersRepository.java index b3001c5..7d8e82c 100644 --- a/server/data/data-hbase/src/main/java/org/apache/james/user/hbase/HBaseUsersRepository.java +++ b/server/data/data-hbase/src/main/java/org/apache/james/user/hbase/HBaseUsersRepository.java @@ -46,7 +46,11 @@ import org.slf4j.LoggerFactory; /** * Implementation of the UserRepository for a HBase persistence. + * + * @Deprecated: See JAMES-2571 The HBase implementation is not enough maintained and thus will be removed from James in version 3.3.0. Please prefer using + * other MailboxManagers or contribute the HBase mailbox maintenance. */ +@Deprecated public class HBaseUsersRepository extends AbstractUsersRepository { /** http://git-wip-us.apache.org/repos/asf/james-project/blob/a84ae7f9/server/data/data-jcr/src/main/java/org/apache/james/mailrepository/jcr/JCRMailRepository.java ---------------------------------------------------------------------- diff --git a/server/data/data-jcr/src/main/java/org/apache/james/mailrepository/jcr/JCRMailRepository.java b/server/data/data-jcr/src/main/java/org/apache/james/mailrepository/jcr/JCRMailRepository.java index a546847..a2f6166 100644 --- a/server/data/data-jcr/src/main/java/org/apache/james/mailrepository/jcr/JCRMailRepository.java +++ b/server/data/data-jcr/src/main/java/org/apache/james/mailrepository/jcr/JCRMailRepository.java @@ -70,7 +70,7 @@ import org.slf4j.LoggerFactory; /** * Mail repository that is backed by a JCR content repository. * - * @Depracted: See JAMES-2323 + * @Deprecated: See JAMES-2323 * * Will be removed in James 3.2.0 upcoming release. * --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
