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 ad...@apache.org on 2017/11/23 08:04:07 UTC

[2/6] james-project git commit: JAMES-2227 Add missing default mailboxes

JAMES-2227 Add missing default mailboxes


Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/314495a3
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/314495a3
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/314495a3

Branch: refs/heads/master
Commit: 314495a3bb1b80bb687f53108eb7084d8567292f
Parents: 9fc7e72
Author: Antoine Duprat <ad...@linagora.com>
Authored: Tue Nov 21 14:52:50 2017 +0100
Committer: Antoine Duprat <ad...@linagora.com>
Committed: Thu Nov 23 09:01:13 2017 +0100

----------------------------------------------------------------------
 .../main/java/org/apache/james/jmap/DefaultMailboxes.java    | 3 +++
 .../main/java/org/apache/james/jmap/model/mailbox/Role.java  | 8 ++++----
 2 files changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/james-project/blob/314495a3/server/protocols/jmap/src/main/java/org/apache/james/jmap/DefaultMailboxes.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/DefaultMailboxes.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/DefaultMailboxes.java
index 7a91514..2cdfbec 100644
--- a/server/protocols/jmap/src/main/java/org/apache/james/jmap/DefaultMailboxes.java
+++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/DefaultMailboxes.java
@@ -31,6 +31,9 @@ public interface DefaultMailboxes {
     String SENT = "Sent";
     String TRASH = "Trash";
     String DRAFTS = "Drafts";
+    String ARCHIVE = "Archive";
+    String SPAM = "Spam";
+    String TEMPLATES = "Templates";
 
     List<String> DEFAULT_MAILBOXES = ImmutableList.of(INBOX, OUTBOX, SENT, TRASH, DRAFTS);
 }

http://git-wip-us.apache.org/repos/asf/james-project/blob/314495a3/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/mailbox/Role.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/mailbox/Role.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/mailbox/Role.java
index cb769a5..6bac1f3 100644
--- a/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/mailbox/Role.java
+++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/mailbox/Role.java
@@ -41,12 +41,12 @@ public class Role {
     public static final Role OUTBOX = new Role("outbox", DefaultMailboxes.OUTBOX);
     public static final Role SENT = new Role("sent", DefaultMailboxes.SENT);
     public static final Role TRASH = new Role("trash", DefaultMailboxes.TRASH);
-    public static final Role ARCHIVE = new Role("archive");
-    public static final Role SPAM = new Role("spam");
-    public static final Role TEMPLATES = new Role("templates");
+    public static final Role ARCHIVE = new Role("archive", DefaultMailboxes.ARCHIVE);
+    public static final Role SPAM = new Role("spam", DefaultMailboxes.SPAM);
+    public static final Role TEMPLATES = new Role("templates", DefaultMailboxes.TEMPLATES);
     
     private static final Map<String, Role> ROLES = 
-            ImmutableList.<Role>of(INBOX, ARCHIVE, DRAFTS, OUTBOX, SENT, TRASH, SPAM, TEMPLATES)
+            ImmutableList.<Role>of(INBOX, DRAFTS, OUTBOX, SENT, TRASH, ARCHIVE, SPAM, TEMPLATES)
                 .stream()
                 .collect(Collectors.toMap((Role x) -> x.name.toLowerCase(Locale.US), Function.identity()));
     


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