You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@james.apache.org by bt...@apache.org on 2022/11/22 07:11:53 UTC
[james-project] 08/12: JAMES-3858 Alter SELECT / EXAMINE to include untagged mailboxId responses
This is an automated email from the ASF dual-hosted git repository.
btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 20f6ac713b0f1da909c712e8ef2c3aa4442d1fff
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Fri Nov 18 08:46:11 2022 +0700
JAMES-3858 Alter SELECT / EXAMINE to include untagged mailboxId responses
---
.../mpt/imapmailbox/suite/base/BasicImapCommands.java | 1 +
.../org/apache/james/imap/scripts/AppendExamineInbox.test | 2 ++
.../org/apache/james/imap/scripts/AppendExpunge.test | 1 +
.../org/apache/james/imap/scripts/AppendSelectInbox.test | 2 ++
.../org/apache/james/imap/scripts/AppendToSelected.test | 1 +
.../org/apache/james/imap/scripts/AuthenticatePlain.test | 4 ++++
.../org/apache/james/imap/scripts/BodyPartialFetch.test | 2 ++
.../org/apache/james/imap/scripts/ComplexMail.test | 1 +
.../imap/scripts/ConcurrentAppendUIDToMSNMapping.test | 1 +
.../apache/james/imap/scripts/ConcurrentCrossExpunge.test | 2 ++
.../james/imap/scripts/ConcurrentDeleteSelected.test | 1 +
.../james/imap/scripts/ConcurrentExistsResponse.test | 3 +++
.../james/imap/scripts/ConcurrentExpungeResponse.test | 4 ++++
.../imap/scripts/ConcurrentExpungeUIDToMSNMapping.test | 2 ++
.../apache/james/imap/scripts/ConcurrentFetchResponse.test | 4 ++++
.../james/imap/scripts/ConcurrentRenameSelected.test | 1 +
.../james/imap/scripts/ConcurrentRenameSelectedSub.test | 1 +
.../main/resources/org/apache/james/imap/scripts/Copy.test | 1 +
.../org/apache/james/imap/scripts/ExamineEmpty.test | 3 +++
.../org/apache/james/imap/scripts/ExpungeBasics.test | 3 +++
.../org/apache/james/imap/scripts/FetchHeaderFields.test | 3 +++
.../apache/james/imap/scripts/FetchHeaderFieldsNot.test | 3 +++
.../james/imap/scripts/FetchMultipartAlternative.test | 3 +++
.../james/imap/scripts/FetchMultipartBodyStructure.test | 1 +
.../org/apache/james/imap/scripts/FetchMultipartMixed.test | 3 +++
.../james/imap/scripts/FetchMultipartMixedComplex.test | 3 +++
.../org/apache/james/imap/scripts/FetchRFC822Mixed.test | 1 +
.../james/imap/scripts/FetchSimpleBodyStructure.test | 1 +
.../apache/james/imap/scripts/FetchStructureComplex.test | 1 +
.../apache/james/imap/scripts/FetchStructureEmbedded.test | 1 +
.../org/apache/james/imap/scripts/HeaderPartialFetch.test | 2 ++
.../org/apache/james/imap/scripts/MimePartialFetch.test | 2 ++
.../main/resources/org/apache/james/imap/scripts/Move.test | 1 +
.../james/imap/scripts/PeekMultipartAlternative.test | 3 +++
.../org/apache/james/imap/scripts/PeekMultipartMixed.test | 1 +
.../resources/org/apache/james/imap/scripts/Quota.test | 1 +
.../resources/org/apache/james/imap/scripts/Recent.test | 1 +
.../resources/org/apache/james/imap/scripts/Rename.test | 14 ++++++++++++++
.../org/apache/james/imap/scripts/RenameSelected.test | 3 +++
.../org/apache/james/imap/scripts/SearchAtoms.test | 1 +
.../org/apache/james/imap/scripts/SearchCombinations.test | 1 +
.../james/imap/scripts/SearchOptionAggregations.test | 1 +
.../org/apache/james/imap/scripts/SearchOptionSave.test | 1 +
.../org/apache/james/imap/scripts/SelectAppend.test | 1 +
.../org/apache/james/imap/scripts/SelectEmpty.test | 3 +++
.../org/apache/james/imap/scripts/SelectInbox.test | 1 +
.../org/apache/james/imap/scripts/SelectUnseen.test | 5 +++++
.../org/apache/james/imap/scripts/SelectedStateSetup.test | 1 +
.../resources/org/apache/james/imap/scripts/Status.test | 1 +
.../org/apache/james/imap/scripts/TextPartialFetch.test | 2 ++
.../org/apache/james/imap/scripts/UidSearchAtoms.test | 1 +
.../apache/james/imap/scripts/UidSearchAtomsIndexer.test | 2 ++
.../apache/james/imap/scripts/UidSearchCombinations.test | 1 +
.../org/apache/james/imap/scripts/UserFlagsSupport.test | 1 +
.../apache/james/imap/api/display/HumanReadableText.java | 1 +
.../james/imap/processor/AbstractSelectionProcessor.java | 7 +++++++
56 files changed, 119 insertions(+)
diff --git a/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/imapmailbox/suite/base/BasicImapCommands.java b/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/imapmailbox/suite/base/BasicImapCommands.java
index 0590606285..1cc96efddf 100644
--- a/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/imapmailbox/suite/base/BasicImapCommands.java
+++ b/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/imapmailbox/suite/base/BasicImapCommands.java
@@ -45,6 +45,7 @@ public class BasicImapCommands implements ImapTestConstants {
ProtocolInteractor preElements = scriptedTestProtocol.preElements();
preElements.cl("abcd SELECT inbox");
+ preElements.sl("\\* OK \\[MAILBOXID \\(.+\\)\\] Ok", "BasicImapCommands");
preElements.sl("\\* FLAGS \\(\\\\Answered \\\\Deleted \\\\Draft \\\\Flagged \\\\Seen\\)", "BasicImapCommands");
preElements.sl("\\* \\d+ EXISTS", "BasicImapCommands");
preElements.sl("\\* \\d+ RECENT", "BasicImapCommands");
diff --git a/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/AppendExamineInbox.test b/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/AppendExamineInbox.test
index d3b564463c..575206d27f 100644
--- a/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/AppendExamineInbox.test
+++ b/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/AppendExamineInbox.test
@@ -44,6 +44,7 @@ C:
S: A003 OK (\[.+\] )?APPEND completed.
C: abcd EXAMINE inbox
+S: \* OK \[MAILBOXID \(.+\)\] Ok
S: \* FLAGS \(\\Answered \\Deleted \\Draft \\Flagged \\Seen\)
S: \* 2 EXISTS
S: \* 2 RECENT
@@ -56,6 +57,7 @@ S: abcd OK \[READ-ONLY\] EXAMINE completed.
# Try again to ensure that no changes to flags were made.
C: abcd EXAMINE inbox
+S: \* OK \[MAILBOXID \(.+\)\] Ok
S: \* FLAGS \(\\Answered \\Deleted \\Draft \\Flagged \\Seen\)
S: \* 2 EXISTS
S: \* 2 RECENT
diff --git a/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/AppendExpunge.test b/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/AppendExpunge.test
index 4fb7fe5211..2c6eaa324c 100644
--- a/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/AppendExpunge.test
+++ b/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/AppendExpunge.test
@@ -67,6 +67,7 @@ S: \* STATUS "appendexpunge" \(MESSAGES 3\)
S: A005 OK STATUS completed.
C: A006 SELECT appendexpunge
+S: \* OK \[MAILBOXID \(.+\)\] Ok
S: \* FLAGS \(\\Answered \\Deleted \\Draft \\Flagged \\Seen\)
S: \* 3 EXISTS
S: \* \d+ RECENT
diff --git a/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/AppendSelectInbox.test b/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/AppendSelectInbox.test
index e894fb4b83..cb5d5c9ceb 100644
--- a/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/AppendSelectInbox.test
+++ b/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/AppendSelectInbox.test
@@ -44,6 +44,7 @@ C:
S: A003 OK (\[.+\] )?APPEND completed.
C: abcd SELECT inbox
+S: \* OK \[MAILBOXID \(.+\)\] Ok
S: \* FLAGS \(\\Answered \\Deleted \\Draft \\Flagged \\Seen\)
S: \* 2 EXISTS
S: \* 2 RECENT
@@ -56,6 +57,7 @@ S: abcd OK \[READ-WRITE\] SELECT completed.
# Try again to ensure that no changes to flags were made.
C: abcd SELECT "INBOX"
+S: \* OK \[MAILBOXID \(.+\)\] Ok
S: \* FLAGS \(\\Answered \\Deleted \\Draft \\Flagged \\Seen\)
S: \* 2 EXISTS
S: \* 2 RECENT
diff --git a/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/AppendToSelected.test b/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/AppendToSelected.test
index 6517800621..653c9c357b 100644
--- a/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/AppendToSelected.test
+++ b/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/AppendToSelected.test
@@ -35,6 +35,7 @@ C:
S: A003 OK (\[.+\] )?APPEND completed.
C: a7 select appendBox
+S: \* OK \[MAILBOXID \(.+\)\] Ok
S: \* FLAGS \(\\Answered \\Deleted \\Draft \\Flagged \\Seen\)
S: \* 1 EXISTS
S: \* 1 RECENT
diff --git a/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/AuthenticatePlain.test b/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/AuthenticatePlain.test
index 6bdf831cf0..b5ca18a5c6 100644
--- a/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/AuthenticatePlain.test
+++ b/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/AuthenticatePlain.test
@@ -26,6 +26,7 @@ S: 0001 OK AUTHENTICATE completed.
# Ensure we are imapuser
C: 0002 SELECT imapuser
SUB {
+S: \* OK \[MAILBOXID \(.+\)\] Ok
S: \* FLAGS .*
S: \* .* EXISTS
S: \* .* RECENT
@@ -47,6 +48,7 @@ S: 0003 OK AUTHENTICATE completed.
# Ensure we are imapuser
C: 0004 SELECT imapuser
SUB {
+S: \* OK \[MAILBOXID \(.+\)\] Ok
S: \* FLAGS .*
S: \* .* EXISTS
S: \* .* RECENT
@@ -66,6 +68,7 @@ S: A002 OK AUTHENTICATE completed.
# Ensure we are imapuser
C: 0004 SELECT imapuser
SUB {
+S: \* OK \[MAILBOXID \(.+\)\] Ok
S: \* FLAGS .*
S: \* .* EXISTS
S: \* .* RECENT
@@ -103,6 +106,7 @@ S: 0007 OK AUTHENTICATE completed.
# Ensure we are delegate
C: 0008 SELECT delegate
SUB {
+S: \* OK \[MAILBOXID \(.+\)\] Ok
S: \* FLAGS .*
S: \* .* EXISTS
S: \* .* RECENT
diff --git a/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/BodyPartialFetch.test b/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/BodyPartialFetch.test
index 9253ff3335..0858eeee23 100644
--- a/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/BodyPartialFetch.test
+++ b/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/BodyPartialFetch.test
@@ -19,6 +19,7 @@
C: A2 CREATE testmailbox
S: A2 OK \[MAILBOXID \(.+\)\] CREATE completed\.
C: A3 SELECT testmailbox
+S: \* OK \[MAILBOXID \(.+\)\] Ok
S: \* FLAGS \(\\Answered \\Deleted \\Draft \\Flagged \\Seen\)
S: \* 0 EXISTS
S: \* 0 RECENT
@@ -66,6 +67,7 @@ S: \* 1 EXISTS
S: \* 1 RECENT
S: A4 OK (\[.+\] )?APPEND completed\.
C: A5 SELECT testmailbox
+S: \* OK \[MAILBOXID \(.+\)\] Ok
S: \* FLAGS \(\\Answered \\Deleted \\Draft \\Flagged \\Seen\)
S: \* 1 EXISTS
S: \* 1 RECENT
diff --git a/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/ComplexMail.test b/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/ComplexMail.test
index 9e2b5bc9fb..84134a0e2a 100644
--- a/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/ComplexMail.test
+++ b/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/ComplexMail.test
@@ -23,6 +23,7 @@
C: A2 CREATE testmailbox
S: A2 OK \[MAILBOXID \(.+\)\] CREATE completed\.
C: A3 SELECT testmailbox
+S: \* OK \[MAILBOXID \(.+\)\] Ok
S: \* FLAGS \(\\Answered \\Deleted \\Draft \\Flagged \\Seen\)
S: \* 0 EXISTS
S: \* 0 RECENT
diff --git a/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/ConcurrentAppendUIDToMSNMapping.test b/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/ConcurrentAppendUIDToMSNMapping.test
index cc41dd277b..c9ac046ceb 100644
--- a/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/ConcurrentAppendUIDToMSNMapping.test
+++ b/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/ConcurrentAppendUIDToMSNMapping.test
@@ -83,6 +83,7 @@ S: 1e OK (\[.+\] )?APPEND completed.
SESSION: 2
C: 2a SELECT expungeresponse
+S: \* OK \[MAILBOXID \(.+\)\] Ok
S: \* FLAGS \(\\Answered \\Deleted \\Draft \\Flagged \\Seen\)
S: \* 4 EXISTS
S: \* 4 RECENT
diff --git a/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/ConcurrentCrossExpunge.test b/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/ConcurrentCrossExpunge.test
index 15dadd5cec..9e58474812 100644
--- a/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/ConcurrentCrossExpunge.test
+++ b/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/ConcurrentCrossExpunge.test
@@ -73,6 +73,7 @@ C:
S: 1d OK (\[.+\] )?APPEND completed.
C: 1e SELECT alpha
+S: \* OK \[MAILBOXID \(.+\)\] Ok
S: \* FLAGS \(\\Answered \\Deleted \\Draft \\Flagged \\Seen\)
S: \* 4 EXISTS
S: \* 4 RECENT
@@ -92,6 +93,7 @@ S: 1h OK STORE completed.
SESSION: 2
C: 2e SELECT alpha
+S: \* OK \[MAILBOXID \(.+\)\] Ok
S: \* FLAGS \(\\Answered \\Deleted \\Draft \\Flagged \\Seen\)
S: \* 4 EXISTS
S: \* 0 RECENT
diff --git a/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/ConcurrentDeleteSelected.test b/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/ConcurrentDeleteSelected.test
index a4de264f8e..f5da77c7b4 100644
--- a/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/ConcurrentDeleteSelected.test
+++ b/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/ConcurrentDeleteSelected.test
@@ -40,6 +40,7 @@ C:
S: 1b OK (\[.+\] )?APPEND completed.
C: 1c SELECT deleteconcurrent
+S: \* OK \[MAILBOXID \(.+\)\] Ok
S: \* FLAGS \(\\Answered \\Deleted \\Draft \\Flagged \\Seen\)
S: \* 1 EXISTS
S: \* 1 RECENT
diff --git a/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/ConcurrentExistsResponse.test b/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/ConcurrentExistsResponse.test
index 7638139f6d..41dc25860e 100644
--- a/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/ConcurrentExistsResponse.test
+++ b/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/ConcurrentExistsResponse.test
@@ -28,6 +28,7 @@ S: 1b OK STATUS completed.
SESSION: 2
C: 2a SELECT existsresponse
+S: \* OK \[MAILBOXID \(.+\)\] Ok
S: \* FLAGS \(\\Answered \\Deleted \\Draft \\Flagged \\Seen\)
S: \* 0 EXISTS
S: \* 0 RECENT
@@ -39,6 +40,7 @@ S: 2a OK \[READ-WRITE\] SELECT completed.
SESSION: 3
C: 3a SELECT existsresponse
+S: \* OK \[MAILBOXID \(.+\)\] Ok
S: \* FLAGS \(\\Answered \\Deleted \\Draft \\Flagged \\Seen\)
S: \* 0 EXISTS
S: \* 0 RECENT
@@ -50,6 +52,7 @@ S: 3a OK \[READ-WRITE\] SELECT completed.
SESSION: 4
C: 4a SELECT existsresponse
+S: \* OK \[MAILBOXID \(.+\)\] Ok
S: \* FLAGS \(\\Answered \\Deleted \\Draft \\Flagged \\Seen\)
S: \* 0 EXISTS
S: \* 0 RECENT
diff --git a/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/ConcurrentExpungeResponse.test b/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/ConcurrentExpungeResponse.test
index 0dca5b85b4..ad88aae1ba 100644
--- a/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/ConcurrentExpungeResponse.test
+++ b/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/ConcurrentExpungeResponse.test
@@ -73,6 +73,7 @@ C:
S: 1d OK (\[.+\] )?APPEND completed.
C: 1e SELECT expungeresponse
+S: \* OK \[MAILBOXID \(.+\)\] Ok
S: \* FLAGS \(\\Answered \\Deleted \\Draft \\Flagged \\Seen\)
S: \* 4 EXISTS
S: \* 4 RECENT
@@ -85,6 +86,7 @@ S: 1e OK \[READ-WRITE\] SELECT completed.
SESSION: 2
C: 2a SELECT expungeresponse
+S: \* OK \[MAILBOXID \(.+\)\] Ok
S: \* FLAGS \(\\Answered \\Deleted \\Draft \\Flagged \\Seen\)
S: \* 4 EXISTS
S: \* 0 RECENT
@@ -97,6 +99,7 @@ S: 2a OK \[READ-WRITE\] SELECT completed.
SESSION: 3
C: 3a SELECT expungeresponse
+S: \* OK \[MAILBOXID \(.+\)\] Ok
S: \* FLAGS \(\\Answered \\Deleted \\Draft \\Flagged \\Seen\)
S: \* 4 EXISTS
S: \* 0 RECENT
@@ -125,6 +128,7 @@ S: 2b OK NOOP completed.
# Now select with a new session - we have sessions 2,3 and 4 in different states
SESSION: 4
C: 4a SELECT expungeresponse
+S: \* OK \[MAILBOXID \(.+\)\] Ok
S: \* FLAGS \(\\Answered \\Deleted \\Draft \\Flagged \\Seen\)
S: \* 2 EXISTS
S: \* 0 RECENT
diff --git a/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/ConcurrentExpungeUIDToMSNMapping.test b/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/ConcurrentExpungeUIDToMSNMapping.test
index 6270947ef4..f052c576ad 100644
--- a/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/ConcurrentExpungeUIDToMSNMapping.test
+++ b/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/ConcurrentExpungeUIDToMSNMapping.test
@@ -79,6 +79,7 @@ C:
S: 1e OK (\[.+\] )?APPEND completed.
C: 1f SELECT expungeresponse
+S: \* OK \[MAILBOXID \(.+\)\] Ok
S: \* FLAGS \(\\Answered \\Deleted \\Draft \\Flagged \\Seen\)
S: \* 4 EXISTS
S: \* 4 RECENT
@@ -94,6 +95,7 @@ S: 1f OK \[READ-WRITE\] SELECT completed.
SESSION: 2
C: 2a SELECT expungeresponse
+S: \* OK \[MAILBOXID \(.+\)\] Ok
S: \* FLAGS \(\\Answered \\Deleted \\Draft \\Flagged \\Seen\)
S: \* 4 EXISTS
S: \* 0 RECENT
diff --git a/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/ConcurrentFetchResponse.test b/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/ConcurrentFetchResponse.test
index e70216da4a..5c47077536 100644
--- a/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/ConcurrentFetchResponse.test
+++ b/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/ConcurrentFetchResponse.test
@@ -53,6 +53,7 @@ C:
S: 1c OK (\[.+\] )?APPEND completed.
C: 1d SELECT multibox
+S: \* OK \[MAILBOXID \(.+\)\] Ok
S: \* FLAGS \(\\Answered \\Deleted \\Draft \\Flagged \\Seen\)
S: \* 2 EXISTS
S: \* 2 RECENT
@@ -65,6 +66,7 @@ S: 1d OK \[READ-WRITE\] SELECT completed.
SESSION: 2
C: 2a SELECT multibox
+S: \* OK \[MAILBOXID \(.+\)\] Ok
S: \* FLAGS \(\\Answered \\Deleted \\Draft \\Flagged \\Seen\)
S: \* 2 EXISTS
S: \* 0 RECENT
@@ -77,6 +79,7 @@ S: 2a OK \[READ-WRITE\] SELECT completed.
SESSION: 3
C: 3a SELECT multibox
+S: \* OK \[MAILBOXID \(.+\)\] Ok
S: \* FLAGS \(\\Answered \\Deleted \\Draft \\Flagged \\Seen\)
S: \* 2 EXISTS
S: \* 0 RECENT
@@ -89,6 +92,7 @@ S: 3a OK \[READ-WRITE\] SELECT completed.
SESSION: 4
C: 4a SELECT multibox
+S: \* OK \[MAILBOXID \(.+\)\] Ok
S: \* FLAGS \(\\Answered \\Deleted \\Draft \\Flagged \\Seen\)
S: \* 2 EXISTS
S: \* 0 RECENT
diff --git a/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/ConcurrentRenameSelected.test b/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/ConcurrentRenameSelected.test
index 5bbed67054..91b766d800 100644
--- a/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/ConcurrentRenameSelected.test
+++ b/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/ConcurrentRenameSelected.test
@@ -39,6 +39,7 @@ C:
S: 1b OK (\[.+\] )?APPEND completed.
C: 1c SELECT renameconcurrent
+S: \* OK \[MAILBOXID \(.+\)\] Ok
S: \* FLAGS \(\\Answered \\Deleted \\Draft \\Flagged \\Seen\)
S: \* 1 EXISTS
S: \* 1 RECENT
diff --git a/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/ConcurrentRenameSelectedSub.test b/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/ConcurrentRenameSelectedSub.test
index cbc3b13aa8..6485dc48b2 100644
--- a/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/ConcurrentRenameSelectedSub.test
+++ b/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/ConcurrentRenameSelectedSub.test
@@ -41,6 +41,7 @@ C:
S: 1b OK (\[.+\] )?APPEND completed.
C: 1c SELECT parent.child
+S: \* OK \[MAILBOXID \(.+\)\] Ok
S: \* FLAGS \(\\Answered \\Deleted \\Draft \\Flagged \\Seen\)
S: \* 1 EXISTS
S: \* 1 RECENT
diff --git a/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/Copy.test b/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/Copy.test
index 1c84125f5c..f7118049f6 100644
--- a/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/Copy.test
+++ b/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/Copy.test
@@ -43,6 +43,7 @@ S: \* 2 FETCH \(FLAGS \(\\Flagged \\Recent\)\)
S: a6 OK STORE completed.
C: a7 SELECT copied
+S: \* OK \[MAILBOXID \(.+\)\] Ok
S: \* FLAGS \(\\Answered \\Deleted \\Draft \\Flagged \\Seen\)
S: \* 3 EXISTS
S: \* 3 RECENT
diff --git a/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/ExamineEmpty.test b/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/ExamineEmpty.test
index ddfae06e7f..29219a4943 100644
--- a/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/ExamineEmpty.test
+++ b/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/ExamineEmpty.test
@@ -27,6 +27,7 @@ C: 13 CREATE test1.subfolder1
S: 13 OK \[MAILBOXID \(.+\)\] CREATE completed.
C: abcd EXAMINE test
+S: \* OK \[MAILBOXID \(.+\)\] Ok
S: \* FLAGS \(\\Answered \\Deleted \\Draft \\Flagged \\Seen\)
S: \* 0 EXISTS
S: \* 0 RECENT
@@ -37,6 +38,7 @@ S: \* OK \[UIDNEXT 1\].*
S: abcd OK \[READ-ONLY\] EXAMINE completed.
C: abcd EXAMINE test.subfolder
+S: \* OK \[MAILBOXID \(.+\)\] Ok
S: \* FLAGS \(\\Answered \\Deleted \\Draft \\Flagged \\Seen\)
S: \* 0 EXISTS
S: \* 0 RECENT
@@ -47,6 +49,7 @@ S: \* OK \[UIDNEXT 1\].*
S: abcd OK \[READ-ONLY\] EXAMINE completed.
C: abcd EXAMINE test1
+S: \* OK \[MAILBOXID \(.+\)\] Ok
S: \* FLAGS \(\\Answered \\Deleted \\Draft \\Flagged \\Seen\)
S: \* 0 EXISTS
S: \* 0 RECENT
diff --git a/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/ExpungeBasics.test b/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/ExpungeBasics.test
index 7f5f113a26..93f34459fd 100644
--- a/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/ExpungeBasics.test
+++ b/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/ExpungeBasics.test
@@ -19,6 +19,7 @@
C: A2 CREATE testmailbox
S: A2 OK \[MAILBOXID \(.+\)\] CREATE completed.
C: A3 SELECT testmailbox
+S: \* OK \[MAILBOXID \(.+\)\] Ok
S: \* FLAGS \(\\Answered \\Deleted \\Draft \\Flagged \\Seen\)
S: \* 0 EXISTS
S: \* 0 RECENT
@@ -680,6 +681,7 @@ S: \* 10 EXISTS
S: \* 10 RECENT
S: A13 OK (\[.+\] )?APPEND completed.
C: A14 SELECT testmailbox
+S: \* OK \[MAILBOXID \(.+\)\] Ok
S: \* FLAGS \(\\Answered \\Deleted \\Draft \\Flagged \\Seen\)
S: \* 10 EXISTS
S: \* 10 RECENT
@@ -705,6 +707,7 @@ S: \* 5 EXPUNGE
S: \* 7 RECENT
S: A18 OK EXPUNGE completed.
C: A19 SELECT testmailbox
+S: \* OK \[MAILBOXID \(.+\)\] Ok
S: \* FLAGS \(\\Answered \\Deleted \\Draft \\Flagged \\Seen\)
S: \* 7 EXISTS
S: \* 7 RECENT
diff --git a/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/FetchHeaderFields.test b/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/FetchHeaderFields.test
index 4be4020bd1..8fdd3b6213 100644
--- a/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/FetchHeaderFields.test
+++ b/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/FetchHeaderFields.test
@@ -20,6 +20,7 @@
C: A2 CREATE testmailbox
S: A2 OK \[MAILBOXID \(.+\)\] CREATE completed\.
C: A3 SELECT testmailbox
+S: \* OK \[MAILBOXID \(.+\)\] Ok
S: \* FLAGS \(\\Answered \\Deleted \\Draft \\Flagged \\Seen\)
S: \* 0 EXISTS
S: \* 0 RECENT
@@ -274,6 +275,7 @@ S: \* 9 EXISTS
S: \* 9 RECENT
S: A12 OK (\[.+\] )?APPEND completed\.
C: A13 SELECT testmailbox
+S: \* OK \[MAILBOXID \(.+\)\] Ok
S: \* FLAGS \(\\Answered \\Deleted \\Draft \\Flagged \\Seen\)
S: \* 9 EXISTS
S: \* 9 RECENT
@@ -580,6 +582,7 @@ S:
S: \)
S: A15 OK FETCH completed\.
C: A16 SELECT testmailbox
+S: \* OK \[MAILBOXID \(.+\)\] Ok
S: \* FLAGS \(\\Answered \\Deleted \\Draft \\Flagged \\Seen\)
S: \* 9 EXISTS
S: \* 9 RECENT
diff --git a/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/FetchHeaderFieldsNot.test b/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/FetchHeaderFieldsNot.test
index f33359ec55..5f608c8eb5 100644
--- a/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/FetchHeaderFieldsNot.test
+++ b/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/FetchHeaderFieldsNot.test
@@ -20,6 +20,7 @@
C: A2 CREATE testmailbox
S: A2 OK \[MAILBOXID \(.+\)\] CREATE completed\.
C: A3 SELECT testmailbox
+S: \* OK \[MAILBOXID \(.+\)\] Ok
S: \* FLAGS \(\\Answered \\Deleted \\Draft \\Flagged \\Seen\)
S: \* 0 EXISTS
S: \* 0 RECENT
@@ -274,6 +275,7 @@ S: \* 9 EXISTS
S: \* 9 RECENT
S: A12 OK (\[.+\] )?APPEND completed\.
C: A13 SELECT testmailbox
+S: \* OK \[MAILBOXID \(.+\)\] Ok
S: \* FLAGS \(\\Answered \\Deleted \\Draft \\Flagged \\Seen\)
S: \* 9 EXISTS
S: \* 9 RECENT
@@ -557,6 +559,7 @@ S:
S: \)
S: A15 OK FETCH completed\.
C: A16 SELECT testmailbox
+S: \* OK \[MAILBOXID \(.+\)\] Ok
S: \* FLAGS \(\\Answered \\Deleted \\Draft \\Flagged \\Seen\)
S: \* 9 EXISTS
S: \* 9 RECENT
diff --git a/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/FetchMultipartAlternative.test b/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/FetchMultipartAlternative.test
index 017fb1eee4..8280ca1a73 100644
--- a/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/FetchMultipartAlternative.test
+++ b/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/FetchMultipartAlternative.test
@@ -20,6 +20,7 @@
C: A2 CREATE testmailbox
S: A2 OK \[MAILBOXID \(.+\)\] CREATE completed\.
C: A3 SELECT testmailbox
+S: \* OK \[MAILBOXID \(.+\)\] Ok
S: \* FLAGS \(\\Answered \\Deleted \\Draft \\Flagged \\Seen\)
S: \* 0 EXISTS
S: \* 0 RECENT
@@ -60,6 +61,7 @@ S: \* 1 EXISTS
S: \* 1 RECENT
S: A4 OK (\[.+\] )?APPEND completed\.
C: A5 SELECT testmailbox
+S: \* OK \[MAILBOXID \(.+\)\] Ok
S: \* FLAGS \(\\Answered \\Deleted \\Draft \\Flagged \\Seen\)
S: \* 1 EXISTS
S: \* 1 RECENT
@@ -151,6 +153,7 @@ S: "http://www\.w3\.org/TR/xhtml1/DTD/xhtml1-strict\.dtd">
S: <html><head><title>Rhubarb</title></head><body>Rhubarb!</body></html>\)
S: A11 OK FETCH completed\.
C: A12 SELECT testmailbox
+S: \* OK \[MAILBOXID \(.+\)\] Ok
S: \* FLAGS \(\\Answered \\Deleted \\Draft \\Flagged \\Seen\)
S: \* 1 EXISTS
S: \* 1 RECENT
diff --git a/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/FetchMultipartBodyStructure.test b/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/FetchMultipartBodyStructure.test
index 3a04c4c5d1..8a7b4a8429 100644
--- a/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/FetchMultipartBodyStructure.test
+++ b/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/FetchMultipartBodyStructure.test
@@ -1,6 +1,7 @@
C: A2 CREATE testmailbox
S: A2 OK \[MAILBOXID \(.+\)\] CREATE completed\.
C: A3 SELECT testmailbox
+S: \* OK \[MAILBOXID \(.+\)\] Ok
S: \* FLAGS \(\\Answered \\Deleted \\Draft \\Flagged \\Seen\)
S: \* 0 EXISTS
S: \* 0 RECENT
diff --git a/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/FetchMultipartMixed.test b/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/FetchMultipartMixed.test
index 712e41dc35..a647004a04 100644
--- a/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/FetchMultipartMixed.test
+++ b/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/FetchMultipartMixed.test
@@ -20,6 +20,7 @@
C: A2 CREATE testmailbox
S: A2 OK \[MAILBOXID \(.+\)\] CREATE completed\.
C: A3 SELECT testmailbox
+S: \* OK \[MAILBOXID \(.+\)\] Ok
S: \* FLAGS \(\\Answered \\Deleted \\Draft \\Flagged \\Seen\)
S: \* 0 EXISTS
S: \* 0 RECENT
@@ -67,6 +68,7 @@ S: \* 1 EXISTS
S: \* 1 RECENT
S: A4 OK (\[.+\] )?APPEND completed\.
C: A5 SELECT testmailbox
+S: \* OK \[MAILBOXID \(.+\)\] Ok
S: \* FLAGS \(\\Answered \\Deleted \\Draft \\Flagged \\Seen\)
S: \* 1 EXISTS
S: \* 1 RECENT
@@ -178,6 +180,7 @@ S: 1234567890ABCDEFGHIJKLMNOPQ
S: \)
S: A12 OK FETCH completed\.
C: A13 SELECT testmailbox
+S: \* OK \[MAILBOXID \(.+\)\] Ok
S: \* FLAGS \(\\Answered \\Deleted \\Draft \\Flagged \\Seen\)
S: \* 1 EXISTS
S: \* 1 RECENT
diff --git a/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/FetchMultipartMixedComplex.test b/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/FetchMultipartMixedComplex.test
index 47359f0403..80aea8f335 100644
--- a/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/FetchMultipartMixedComplex.test
+++ b/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/FetchMultipartMixedComplex.test
@@ -20,6 +20,7 @@
C: A2 CREATE testmailbox
S: A2 OK \[MAILBOXID \(.+\)\] CREATE completed\.
C: A3 SELECT testmailbox
+S: \* OK \[MAILBOXID \(.+\)\] Ok
S: \* FLAGS \(\\Answered \\Deleted \\Draft \\Flagged \\Seen\)
S: \* 0 EXISTS
S: \* 0 RECENT
@@ -124,6 +125,7 @@ S: \* 1 EXISTS
S: \* 1 RECENT
S: A4 OK (\[.+\] )?APPEND completed\.
C: A5 SELECT testmailbox
+S: \* OK \[MAILBOXID \(.+\)\] Ok
S: \* FLAGS \(\\Answered \\Deleted \\Draft \\Flagged \\Seen\)
S: \* 1 EXISTS
S: \* 1 RECENT
@@ -563,6 +565,7 @@ S: Rhubard\?Custard\?
S: \)
S: A25 OK FETCH completed\.
C: A26 SELECT testmailbox
+S: \* OK \[MAILBOXID \(.+\)\] Ok
S: \* FLAGS \(\\Answered \\Deleted \\Draft \\Flagged \\Seen\)
S: \* 1 EXISTS
S: \* 1 RECENT
diff --git a/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/FetchRFC822Mixed.test b/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/FetchRFC822Mixed.test
index e6ac4b6848..7bfed82917 100644
--- a/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/FetchRFC822Mixed.test
+++ b/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/FetchRFC822Mixed.test
@@ -19,6 +19,7 @@
C: A2 CREATE testmailbox
S: A2 OK \[MAILBOXID \(.+\)\] CREATE completed\.
C: A3 SELECT testmailbox
+S: \* OK \[MAILBOXID \(.+\)\] Ok
S: \* FLAGS \(\\Answered \\Deleted \\Draft \\Flagged \\Seen\)
S: \* 0 EXISTS
S: \* 0 RECENT
diff --git a/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/FetchSimpleBodyStructure.test b/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/FetchSimpleBodyStructure.test
index f169be703d..0f5fe7f81a 100644
--- a/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/FetchSimpleBodyStructure.test
+++ b/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/FetchSimpleBodyStructure.test
@@ -19,6 +19,7 @@
C: A2 CREATE testmailbox
S: A2 OK \[MAILBOXID \(.+\)\] CREATE completed\.
C: A3 SELECT testmailbox
+S: \* OK \[MAILBOXID \(.+\)\] Ok
S: \* FLAGS \(\\Answered \\Deleted \\Draft \\Flagged \\Seen\)
S: \* 0 EXISTS
S: \* 0 RECENT
diff --git a/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/FetchStructureComplex.test b/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/FetchStructureComplex.test
index e93a605d23..853dbeb6bb 100644
--- a/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/FetchStructureComplex.test
+++ b/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/FetchStructureComplex.test
@@ -19,6 +19,7 @@
C: A2 CREATE testmailbox
S: A2 OK \[MAILBOXID \(.+\)\] CREATE completed\.
C: A3 SELECT testmailbox
+S: \* OK \[MAILBOXID \(.+\)\] Ok
S: \* FLAGS \(\\Answered \\Deleted \\Draft \\Flagged \\Seen\)
S: \* 0 EXISTS
S: \* 0 RECENT
diff --git a/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/FetchStructureEmbedded.test b/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/FetchStructureEmbedded.test
index 2af758fac0..3b2e146461 100644
--- a/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/FetchStructureEmbedded.test
+++ b/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/FetchStructureEmbedded.test
@@ -19,6 +19,7 @@
C: A2 CREATE testmailbox
S: A2 OK \[MAILBOXID \(.+\)\] CREATE completed\.
C: A3 SELECT testmailbox
+S: \* OK \[MAILBOXID \(.+\)\] Ok
S: \* FLAGS \(\\Answered \\Deleted \\Draft \\Flagged \\Seen\)
S: \* 0 EXISTS
S: \* 0 RECENT
diff --git a/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/HeaderPartialFetch.test b/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/HeaderPartialFetch.test
index 883e7e4049..c457c1eda2 100644
--- a/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/HeaderPartialFetch.test
+++ b/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/HeaderPartialFetch.test
@@ -19,6 +19,7 @@
C: A2 CREATE testmailbox
S: A2 OK \[MAILBOXID \(.+\)\] CREATE completed\.
C: A3 SELECT testmailbox
+S: \* OK \[MAILBOXID \(.+\)\] Ok
S: \* FLAGS \(\\Answered \\Deleted \\Draft \\Flagged \\Seen\)
S: \* 0 EXISTS
S: \* 0 RECENT
@@ -123,6 +124,7 @@ S: \* 1 EXISTS
S: \* 1 RECENT
S: A4 OK (\[.+\] )?APPEND completed\.
C: A5 SELECT testmailbox
+S: \* OK \[MAILBOXID \(.+\)\] Ok
S: \* FLAGS \(\\Answered \\Deleted \\Draft \\Flagged \\Seen\)
S: \* 1 EXISTS
S: \* 1 RECENT
diff --git a/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/MimePartialFetch.test b/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/MimePartialFetch.test
index ba950ff44a..156fdda44c 100644
--- a/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/MimePartialFetch.test
+++ b/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/MimePartialFetch.test
@@ -19,6 +19,7 @@
C: A2 CREATE testmailbox
S: A2 OK \[MAILBOXID \(.+\)\] CREATE completed\.
C: A3 SELECT testmailbox
+S: \* OK \[MAILBOXID \(.+\)\] Ok
S: \* FLAGS \(\\Answered \\Deleted \\Draft \\Flagged \\Seen\)
S: \* 0 EXISTS
S: \* 0 RECENT
@@ -123,6 +124,7 @@ S: \* 1 EXISTS
S: \* 1 RECENT
S: A4 OK (\[.+\] )?APPEND completed\.
C: A5 SELECT testmailbox
+S: \* OK \[MAILBOXID \(.+\)\] Ok
S: \* FLAGS \(\\Answered \\Deleted \\Draft \\Flagged \\Seen\)
S: \* 1 EXISTS
S: \* 1 RECENT
diff --git a/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/Move.test b/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/Move.test
index a10ce4f479..4475a7898c 100644
--- a/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/Move.test
+++ b/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/Move.test
@@ -55,6 +55,7 @@ S: \* STATUS "selected" \(MESSAGES 2\)
S: a5 OK STATUS completed.
C: a7 SELECT moved
+S: \* OK \[MAILBOXID \(.+\)\] Ok
S: \* FLAGS \(\\Answered \\Deleted \\Draft \\Flagged \\Seen\)
S: \* 2 EXISTS
S: \* \d+ RECENT
diff --git a/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/PeekMultipartAlternative.test b/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/PeekMultipartAlternative.test
index ac7a2a47d8..4191befd36 100644
--- a/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/PeekMultipartAlternative.test
+++ b/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/PeekMultipartAlternative.test
@@ -20,6 +20,7 @@
C: A2 CREATE testmailbox
S: A2 OK \[MAILBOXID \(.+\)\] Create completed\.
C: A3 SELECT testmailbox
+S: \* OK \[MAILBOXID \(.+\)\] Ok
S: \* FLAGS \(\\Answered \\Flagged \\Deleted \\Seen \\Draft\)
S: \* OK \[PERMANENTFLAGS \(\\Answered \\Flagged \\Deleted \\Seen \\Draft \\\*\)\] Flags permitted\.
S: \* 0 EXISTS
@@ -60,6 +61,7 @@ S: \* 1 EXISTS
S: \* 1 RECENT
S: A4 OK Append completed\.
C: A5 SELECT testmailbox
+S: \* OK \[MAILBOXID \(.+\)\] Ok
S: \* FLAGS \(\\Answered \\Flagged \\Deleted \\Seen \\Draft\)
S: \* OK \[PERMANENTFLAGS \(\\Answered \\Flagged \\Deleted \\Seen \\Draft \\\*\)\] Flags permitted\.
S: \* 1 EXISTS
@@ -151,6 +153,7 @@ S: "http://www\.w3\.org/TR/xhtml1/DTD/xhtml1-strict\.dtd">
S: <html><head><title>Rhubarb</title></head><body>Rhubarb!</body></html>\)
S: A11 OK Fetch completed\.
C: A12 SELECT testmailbox
+S: \* OK \[MAILBOXID \(.+\)\] Ok
S: \* FLAGS \(\\Answered \\Flagged \\Deleted \\Seen \\Draft\)
S: \* OK \[PERMANENTFLAGS \(\\Answered \\Flagged \\Deleted \\Seen \\Draft \\\*\)\] Flags permitted\.
S: \* 1 EXISTS
diff --git a/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/PeekMultipartMixed.test b/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/PeekMultipartMixed.test
index c09fdb7db5..ce17ae26d6 100644
--- a/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/PeekMultipartMixed.test
+++ b/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/PeekMultipartMixed.test
@@ -20,6 +20,7 @@
C: A2 CREATE testmailbox
S: A2 OK \[MAILBOXID \(.+\)\] Create completed\.
C: A3 SELECT testmailbox
+S: \* OK \[MAILBOXID \(.+\)\] Ok
S: \* FLAGS \(\\Answered \\Flagged \\Deleted \\Seen \\Draft\)
S: \* OK \[PERMANENTFLAGS \(\\Answered \\Flagged \\Deleted \\Seen \\Draft \\\*\)\] Flags permitted\.
S: \* 0 EXISTS
diff --git a/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/Quota.test b/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/Quota.test
index b2b3559e6b..9b6648cdb4 100644
--- a/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/Quota.test
+++ b/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/Quota.test
@@ -21,6 +21,7 @@ C: 10 CREATE #private.imapuser.test
S: 10 OK \[MAILBOXID \(.+\)\] CREATE completed.
C: A002 SELECT #private.imapuser.test
+S: \* OK \[MAILBOXID \(.+\)\] Ok
S: \* FLAGS \(\\Answered \\Deleted \\Draft \\Flagged \\Seen\)
S: \* 0 EXISTS
S: \* 0 RECENT
diff --git a/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/Recent.test b/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/Recent.test
index fdff2f3b66..3250687e27 100644
--- a/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/Recent.test
+++ b/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/Recent.test
@@ -20,6 +20,7 @@ C: A2 CREATE testmailbox
S: A2 OK \[MAILBOXID \(.+\)\] CREATE completed\.
C: A5 SELECT testmailbox
+S: \* OK \[MAILBOXID \(.+\)\] Ok
S: \* FLAGS \(\\Answered \\Deleted \\Draft \\Flagged \\Seen\)
S: \* 0 EXISTS
S: \* 0 RECENT
diff --git a/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/Rename.test b/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/Rename.test
index 48fa8f1ec5..88441c4d60 100644
--- a/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/Rename.test
+++ b/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/Rename.test
@@ -19,6 +19,7 @@
C: A2 CREATE testmailbox
S: A2 OK \[MAILBOXID \(.+\)\] CREATE completed\.
C: A3 SELECT testmailbox
+S: \* OK \[MAILBOXID \(.+\)\] Ok
S: \* FLAGS \(\\Answered \\Deleted \\Draft \\Flagged \\Seen\)
S: \* 0 EXISTS
S: \* 0 RECENT
@@ -1946,6 +1947,7 @@ S: \* 2 FETCH \(FLAGS \(\\Answered \\Deleted \\Flagged \\Recent \\Seen\)\)
S: \* 3 FETCH \(FLAGS \(\\Answered \\Deleted \\Draft \\Flagged \\Recent\)\)
S: A99 OK STORE completed\.
C: A100 SELECT testmailbox
+S: \* OK \[MAILBOXID \(.+\)\] Ok
S: \* FLAGS \(\\Answered \\Deleted \\Draft \\Flagged \\Seen\)
S: \* 19 EXISTS
S: \* 19 RECENT
@@ -2074,6 +2076,7 @@ S: A101 OK FETCH completed\.
C: A102 CREATE other
S: A102 OK \[MAILBOXID \(.+\)\] CREATE completed\.
C: A103 SELECT other
+S: \* OK \[MAILBOXID \(.+\)\] Ok
S: \* FLAGS \(\\Answered \\Deleted \\Draft \\Flagged \\Seen\)
S: \* 0 EXISTS
S: \* 0 RECENT
@@ -2339,6 +2342,7 @@ S: A104 OK (\[.+\] )?APPEND completed\.
C: A105 CREATE base
S: A105 OK \[MAILBOXID \(.+\)\] CREATE completed\.
C: A106 SELECT base
+S: \* OK \[MAILBOXID \(.+\)\] Ok
S: \* FLAGS \(\\Answered \\Deleted \\Draft \\Flagged \\Seen\)
S: \* 0 EXISTS
S: \* 0 RECENT
@@ -2350,6 +2354,7 @@ S: A106 OK \[READ-WRITE\] SELECT completed\.
C: A107 RENAME testmailbox moved
S: A107 OK RENAME completed\.
C: A108 SELECT moved
+S: \* OK \[MAILBOXID \(.+\)\] Ok
S: \* FLAGS \(\\Answered \\Deleted \\Draft \\Flagged \\Seen\)
S: \* 19 EXISTS
S: \* 0 RECENT
@@ -2482,6 +2487,7 @@ S: A111 NO (.)*
C: A112 SELECT testmailbox
S: A112 NO (.)*
C: A113 SELECT moved
+S: \* OK \[MAILBOXID \(.+\)\] Ok
S: \* FLAGS \(\\Answered \\Deleted \\Draft \\Flagged \\Seen\)
S: \* 19 EXISTS
S: \* 0 RECENT
@@ -2492,6 +2498,7 @@ S: \* OK \[HIGHESTMODSEQ \d+\].*
S: \* OK \[UIDNEXT 40\].*
S: A113 OK \[READ-WRITE\] SELECT completed\.
C: A114 SELECT other
+S: \* OK \[MAILBOXID \(.+\)\] Ok
S: \* FLAGS \(\\Answered \\Deleted \\Draft \\Flagged \\Seen\)
S: \* 1 EXISTS
S: \* 0 RECENT
@@ -2502,6 +2509,7 @@ S: \* OK \[HIGHESTMODSEQ \d+\].*
S: \* OK \[UIDNEXT 2\].*
S: A114 OK \[READ-WRITE\] SELECT completed\.
C: A115 SELECT base
+S: \* OK \[MAILBOXID \(.+\)\] Ok
S: \* FLAGS \(\\Answered \\Deleted \\Draft \\Flagged \\Seen\)
S: \* 0 EXISTS
S: \* 0 RECENT
@@ -2517,6 +2525,7 @@ S: A117 NO (.)*
C: A118 RENAME other testmailbox
S: A118 OK RENAME completed\.
C: A119 SELECT testmailbox
+S: \* OK \[MAILBOXID \(.+\)\] Ok
S: \* FLAGS \(\\Answered \\Deleted \\Draft \\Flagged \\Seen\)
S: \* 1 EXISTS
S: \* 0 RECENT
@@ -2527,6 +2536,7 @@ S: \* OK \[HIGHESTMODSEQ \d+\].*
S: \* OK \[UIDNEXT 2\].*
S: A119 OK \[READ-WRITE\] SELECT completed\.
C: A120 SELECT moved
+S: \* OK \[MAILBOXID \(.+\)\] Ok
S: \* FLAGS \(\\Answered \\Deleted \\Draft \\Flagged \\Seen\)
S: \* 19 EXISTS
S: \* 0 RECENT
@@ -2539,6 +2549,7 @@ S: A120 OK \[READ-WRITE\] SELECT completed\.
C: A121 SELECT other
S: A121 NO (.)*
C: A122 SELECT base
+S: \* OK \[MAILBOXID \(.+\)\] Ok
S: \* FLAGS \(\\Answered \\Deleted \\Draft \\Flagged \\Seen\)
S: \* 0 EXISTS
S: \* 0 RECENT
@@ -2560,6 +2571,7 @@ S: A127 NO (.)*
C: A128 RENAME testmailbox Inbox
S: A128 NO (.)*
C: A129 SELECT testmailbox
+S: \* OK \[MAILBOXID \(.+\)\] Ok
S: \* FLAGS \(\\Answered \\Deleted \\Draft \\Flagged \\Seen\)
S: \* 1 EXISTS
S: \* 0 RECENT
@@ -2570,6 +2582,7 @@ S: \* OK \[HIGHESTMODSEQ \d+\].*
S: \* OK \[UIDNEXT 2\].*
S: A129 OK \[READ-WRITE\] SELECT completed\.
C: A130 SELECT moved
+S: \* OK \[MAILBOXID \(.+\)\] Ok
S: \* FLAGS \(\\Answered \\Deleted \\Draft \\Flagged \\Seen\)
S: \* 19 EXISTS
S: \* 0 RECENT
@@ -2582,6 +2595,7 @@ S: A130 OK \[READ-WRITE\] SELECT completed\.
C: A131 SELECT other
S: A131 (.)*
C: A132 SELECT base
+S: \* OK \[MAILBOXID \(.+\)\] Ok
S: \* FLAGS \(\\Answered \\Deleted \\Draft \\Flagged \\Seen\)
S: \* 0 EXISTS
S: \* 0 RECENT
diff --git a/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/RenameSelected.test b/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/RenameSelected.test
index c3f91c4130..279e4bc15a 100644
--- a/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/RenameSelected.test
+++ b/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/RenameSelected.test
@@ -19,6 +19,7 @@
C: A2 CREATE testmailbox
S: A2 OK \[MAILBOXID \(.+\)\] CREATE completed\.
C: A3 SELECT testmailbox
+S: \* OK \[MAILBOXID \(.+\)\] Ok
S: \* FLAGS \(\\Answered \\Deleted \\Draft \\Flagged \\Seen\)
S: \* 0 EXISTS
S: \* 0 RECENT
@@ -85,6 +86,7 @@ S: \* 5 EXISTS
S: \* 5 RECENT
S: A8 OK (\[.+\] )?APPEND completed\.
C: A9 SELECT testmailbox
+S: \* OK \[MAILBOXID \(.+\)\] Ok
S: \* FLAGS \(\\Answered \\Deleted \\Draft \\Flagged \\Seen\)
S: \* 5 EXISTS
S: \* 5 RECENT
@@ -218,6 +220,7 @@ S: A17 OK FETCH completed\.
C: A18 SELECT testmailbox
S: A18 NO SELECT failed. No such mailbox\.
C: A19 SELECT anothermailbox
+S: \* OK \[MAILBOXID \(.+\)\] Ok
S: \* FLAGS \(\\Answered \\Deleted \\Draft \\Flagged \\Seen\)
S: \* 5 EXISTS
S: \* 5 RECENT
diff --git a/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/SearchAtoms.test b/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/SearchAtoms.test
index 635913fb70..64ec08c07b 100644
--- a/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/SearchAtoms.test
+++ b/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/SearchAtoms.test
@@ -19,6 +19,7 @@
C: A2 CREATE testmailbox
S: A2 OK \[MAILBOXID \(.+\)\] CREATE completed\.
C: A3 SELECT testmailbox
+S: \* OK \[MAILBOXID \(.+\)\] Ok
S: \* FLAGS \(\\Answered \\Deleted \\Draft \\Flagged \\Seen\)
S: \* 0 EXISTS
S: \* 0 RECENT
diff --git a/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/SearchCombinations.test b/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/SearchCombinations.test
index 8ea41bb0d3..c3e4d4ee99 100644
--- a/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/SearchCombinations.test
+++ b/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/SearchCombinations.test
@@ -19,6 +19,7 @@
C: A2 CREATE testmailbox
S: A2 OK \[MAILBOXID \(.+\)\] CREATE completed\.
C: A3 SELECT testmailbox
+S: \* OK \[MAILBOXID \(.+\)\] Ok
S: \* FLAGS \(\\Answered \\Deleted \\Draft \\Flagged \\Seen\)
S: \* 0 EXISTS
S: \* 0 RECENT
diff --git a/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/SearchOptionAggregations.test b/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/SearchOptionAggregations.test
index 965a80096b..c408a3f4f4 100644
--- a/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/SearchOptionAggregations.test
+++ b/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/SearchOptionAggregations.test
@@ -23,6 +23,7 @@ C: A2 CREATE testmailbox
S: A2 OK \[MAILBOXID \(.+\)\] CREATE completed\.
C: A3 SELECT testmailbox
+S: \* OK \[MAILBOXID \(.+\)\] Ok
S: \* FLAGS \(\\Answered \\Deleted \\Draft \\Flagged \\Seen\)
S: \* 0 EXISTS
S: \* 0 RECENT
diff --git a/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/SearchOptionSave.test b/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/SearchOptionSave.test
index 735929db85..a5ca5f8b80 100644
--- a/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/SearchOptionSave.test
+++ b/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/SearchOptionSave.test
@@ -23,6 +23,7 @@ C: A2 CREATE testmailbox
S: A2 OK \[MAILBOXID \(.+\)\] CREATE completed\.
C: A3 SELECT testmailbox
+S: \* OK \[MAILBOXID \(.+\)\] Ok
S: \* FLAGS \(\\Answered \\Deleted \\Draft \\Flagged \\Seen\)
S: \* 0 EXISTS
S: \* 0 RECENT
diff --git a/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/SelectAppend.test b/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/SelectAppend.test
index c504829060..9a9a75d35f 100644
--- a/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/SelectAppend.test
+++ b/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/SelectAppend.test
@@ -20,6 +20,7 @@ C: 10 CREATE selectappend
S: 10 OK \[MAILBOXID \(.+\)\] CREATE completed.
C: 10 SELECT selectappend
+S: \* OK \[MAILBOXID \(.+\)\] Ok
S: \* FLAGS \(\\Answered \\Deleted \\Draft \\Flagged \\Seen\)
S: \* 0 EXISTS
S: \* 0 RECENT
diff --git a/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/SelectEmpty.test b/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/SelectEmpty.test
index 201deb60fe..97d41aec66 100644
--- a/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/SelectEmpty.test
+++ b/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/SelectEmpty.test
@@ -27,6 +27,7 @@ C: 13 CREATE test1.subfolder1
S: 13 OK \[MAILBOXID \(.+\)\] CREATE completed.
C: abcd SELECT test
+S: \* OK \[MAILBOXID \(.+\)\] Ok
S: \* FLAGS \(\\Answered \\Deleted \\Draft \\Flagged \\Seen\)
S: \* 0 EXISTS
S: \* 0 RECENT
@@ -38,6 +39,7 @@ S: abcd OK \[READ-WRITE\] SELECT completed.
C: abcd SELECT test.subfolder
SUB {
+S: \* OK \[MAILBOXID \(.+\)\] Ok
S: \* FLAGS \(\\Answered \\Deleted \\Draft \\Flagged \\Seen\)
S: \* 0 EXISTS
S: \* 0 RECENT
@@ -49,6 +51,7 @@ S: \* OK \[UIDNEXT 1\].*
S: abcd OK \[READ-WRITE\] SELECT completed.
C: abcd SELECT test1
+S: \* OK \[MAILBOXID \(.+\)\] Ok
S: \* FLAGS \(\\Answered \\Deleted \\Draft \\Flagged \\Seen\)
S: \* 0 EXISTS
S: \* 0 RECENT
diff --git a/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/SelectInbox.test b/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/SelectInbox.test
index 26734df7d1..496a6e04d3 100644
--- a/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/SelectInbox.test
+++ b/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/SelectInbox.test
@@ -17,6 +17,7 @@
# under the License. #
################################################################
C: abcd SELECT inbox
+S: \* OK \[MAILBOXID \(.+\)\] Ok
S: \* FLAGS \(\\Answered \\Deleted \\Draft \\Flagged \\Seen\)
S: \* \d+ EXISTS
S: \* \d+ RECENT
diff --git a/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/SelectUnseen.test b/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/SelectUnseen.test
index 989cd6c02f..c94c3b8f98 100644
--- a/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/SelectUnseen.test
+++ b/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/SelectUnseen.test
@@ -23,6 +23,7 @@ C: 10 CREATE another
S: 10 OK \[MAILBOXID \(.+\)\] CREATE completed.
C: 10 SELECT selectappend
+S: \* OK \[MAILBOXID \(.+\)\] Ok
S: \* FLAGS \(\\Answered \\Deleted \\Draft \\Flagged \\Seen\)
S: \* 0 EXISTS
S: \* 0 RECENT
@@ -67,6 +68,7 @@ S: \* 2 RECENT
S: A009 OK (\[.+\] )?APPEND completed.
C: 20 SELECT another
+S: \* OK \[MAILBOXID \(.+\)\] Ok
S: \* FLAGS \(\\Answered \\Deleted \\Draft \\Flagged \\Seen\)
S: \* 0 EXISTS
S: \* 0 RECENT
@@ -77,6 +79,7 @@ S: \* OK \[UIDNEXT 1\].*
S: 20 OK \[READ-WRITE\] SELECT completed.
C: 21 SELECT selectappend
+S: \* OK \[MAILBOXID \(.+\)\] Ok
S: \* FLAGS \(\\Answered \\Deleted \\Draft \\Flagged \\Seen\)
S: \* 2 EXISTS
S: \* 0 RECENT
@@ -102,6 +105,7 @@ S: \)
S: 30 OK FETCH completed.
C: 30 SELECT another
+S: \* OK \[MAILBOXID \(.+\)\] Ok
S: \* FLAGS \(\\Answered \\Deleted \\Draft \\Flagged \\Seen\)
S: \* 0 EXISTS
S: \* 0 RECENT
@@ -112,6 +116,7 @@ S: \* OK \[UIDNEXT 1\].*
S: 30 OK \[READ-WRITE\] SELECT completed.
C: 40 SELECT selectappend
+S: \* OK \[MAILBOXID \(.+\)\] Ok
S: \* FLAGS \(\\Answered \\Deleted \\Draft \\Flagged \\Seen\)
S: \* 2 EXISTS
S: \* 0 RECENT
diff --git a/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/SelectedStateSetup.test b/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/SelectedStateSetup.test
index 1d8781cb03..ecdfa71ca7 100644
--- a/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/SelectedStateSetup.test
+++ b/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/SelectedStateSetup.test
@@ -72,6 +72,7 @@ C:
S: A006 OK (\[.+\] )?APPEND completed.
C: a1 SELECT selected
+S: \* OK \[MAILBOXID \(.+\)\] Ok
S: \* FLAGS \(\\Answered \\Deleted \\Draft \\Flagged \\Seen\)
S: \* 4 EXISTS
S: \* 4 RECENT
diff --git a/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/Status.test b/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/Status.test
index e134f271e9..ea37d3085d 100644
--- a/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/Status.test
+++ b/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/Status.test
@@ -102,6 +102,7 @@ C:
S: A011 OK (\[.+\] )?APPEND completed.
C: 10 SELECT statustest
+S: \* OK \[MAILBOXID \(.+\)\] Ok
S: \* FLAGS \(\\Answered \\Deleted \\Draft \\Flagged \\Seen\)
S: \* 4 EXISTS
S: \* 4 RECENT
diff --git a/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/TextPartialFetch.test b/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/TextPartialFetch.test
index 2a55940fe3..8616905baf 100644
--- a/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/TextPartialFetch.test
+++ b/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/TextPartialFetch.test
@@ -19,6 +19,7 @@
C: A2 CREATE testmailbox
S: A2 OK \[MAILBOXID \(.+\)\] CREATE completed\.
C: A3 SELECT testmailbox
+S: \* OK \[MAILBOXID \(.+\)\] Ok
S: \* FLAGS \(\\Answered \\Deleted \\Draft \\Flagged \\Seen\)
S: \* 0 EXISTS
S: \* 0 RECENT
@@ -123,6 +124,7 @@ S: \* 1 EXISTS
S: \* 1 RECENT
S: A4 OK (\[.+\] )?APPEND completed\.
C: A5 SELECT testmailbox
+S: \* OK \[MAILBOXID \(.+\)\] Ok
S: \* FLAGS \(\\Answered \\Deleted \\Draft \\Flagged \\Seen\)
S: \* 1 EXISTS
S: \* 1 RECENT
diff --git a/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/UidSearchAtoms.test b/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/UidSearchAtoms.test
index fd64d991a2..1e7a4b4920 100644
--- a/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/UidSearchAtoms.test
+++ b/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/UidSearchAtoms.test
@@ -19,6 +19,7 @@
C: A2 CREATE testmailbox
S: A2 OK \[MAILBOXID \(.+\)\] CREATE completed\.
C: A3 SELECT testmailbox
+S: \* OK \[MAILBOXID \(.+\)\] Ok
S: \* FLAGS \(\\Answered \\Deleted \\Draft \\Flagged \\Seen\)
S: \* 0 EXISTS
S: \* 0 RECENT
diff --git a/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/UidSearchAtomsIndexer.test b/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/UidSearchAtomsIndexer.test
index b5ee419685..72868bddd6 100644
--- a/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/UidSearchAtomsIndexer.test
+++ b/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/UidSearchAtomsIndexer.test
@@ -20,6 +20,7 @@ C: A2 CREATE testmailbox
S: A2 OK \[MAILBOXID \(.+\)\] CREATE completed\.
C: A3 SELECT testmailbox
+S: \* OK \[MAILBOXID \(.+\)\] Ok
S: \* FLAGS \(\\Answered \\Deleted \\Draft \\Flagged \\Seen\)
S: \* 0 EXISTS
S: \* 0 RECENT
@@ -2294,6 +2295,7 @@ C: A200 CREATE secondmailbox
S: A200 OK \[MAILBOXID \(.+\)\] CREATE completed\.
C: A201 SELECT secondmailbox
+S: \* OK \[MAILBOXID \(.+\)\] Ok
S: \* FLAGS \(\\Answered \\Deleted \\Draft \\Flagged \\Seen\)
S: \* 0 EXISTS
S: \* 0 RECENT
diff --git a/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/UidSearchCombinations.test b/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/UidSearchCombinations.test
index b90f339909..5f36fbf9e3 100644
--- a/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/UidSearchCombinations.test
+++ b/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/UidSearchCombinations.test
@@ -19,6 +19,7 @@
C: A2 CREATE testmailbox
S: A2 OK \[MAILBOXID \(.+\)\] CREATE completed\.
C: A3 SELECT testmailbox
+S: \* OK \[MAILBOXID \(.+\)\] Ok
S: \* FLAGS \(\\Answered \\Deleted \\Draft \\Flagged \\Seen\)
S: \* 0 EXISTS
S: \* 0 RECENT
diff --git a/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/UserFlagsSupport.test b/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/UserFlagsSupport.test
index 8bbe074a57..5324893264 100644
--- a/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/UserFlagsSupport.test
+++ b/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/UserFlagsSupport.test
@@ -21,6 +21,7 @@ C: A2 CREATE testmailbox
S: A2 OK \[MAILBOXID \(.+\)\] CREATE completed\.
C: A3 SELECT testmailbox
+S: \* OK \[MAILBOXID \(.+\)\] Ok
S: \* FLAGS \(\\Answered \\Deleted \\Draft \\Flagged \\Seen\)
S: \* 0 EXISTS
S: \* 0 RECENT
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/api/display/HumanReadableText.java b/protocols/imap/src/main/java/org/apache/james/imap/api/display/HumanReadableText.java
index d7a9ed6c34..33e0d1ce76 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/api/display/HumanReadableText.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/api/display/HumanReadableText.java
@@ -47,6 +47,7 @@ public class HumanReadableText {
public static final HumanReadableText NO_MOD_SEQ = new HumanReadableText("org.apache.james.imap.NO_MOD_SEQ", "Sorry, this mailbox format doesn't support modsequences");
public static final HumanReadableText UID_VALIDITY = new HumanReadableText("org.apache.james.imap.UID_VALIDITY", "UIDs valid");
+ public static final HumanReadableText OK = new HumanReadableText("org.apache.james.imap.Ok", "Ok");
public static HumanReadableText permanentFlags(Flags flags) {
String text;
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractSelectionProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractSelectionProcessor.java
index 4e131d2db6..93b3515655 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractSelectionProcessor.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractSelectionProcessor.java
@@ -60,6 +60,7 @@ import org.apache.james.mailbox.MessageUid;
import org.apache.james.mailbox.ModSeq;
import org.apache.james.mailbox.exception.MailboxException;
import org.apache.james.mailbox.exception.MailboxNotFoundException;
+import org.apache.james.mailbox.model.MailboxId;
import org.apache.james.mailbox.model.MailboxPath;
import org.apache.james.mailbox.model.MessageRange;
import org.apache.james.mailbox.model.UidValidity;
@@ -132,6 +133,7 @@ abstract class AbstractSelectionProcessor<R extends AbstractMailboxSelectionRequ
.doOnNext(metaData -> {
SelectedMailbox selected = session.getSelected();
+ mailboxId(responder, selected.getMailboxId());
flags(responder, selected);
exists(responder, metaData);
recent(responder, selected);
@@ -383,6 +385,11 @@ abstract class AbstractSelectionProcessor<R extends AbstractMailboxSelectionRequ
responder.respond(existsResponse);
}
+ private void mailboxId(Responder responder, MailboxId mailboxId) {
+ StatusResponse untaggedOk = statusResponseFactory.untaggedOk(HumanReadableText.OK, ResponseCode.mailboxId(mailboxId));
+ responder.respond(untaggedOk);
+ }
+
private Mono<MailboxMetaData> selectMailbox(MailboxPath mailboxPath, ImapSession session, Responder responder) {
final MailboxManager mailboxManager = getMailboxManager();
final MailboxSession mailboxSession = session.getMailboxSession();
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org