Author: rdonkin
Date: Sun Mar 30 05:18:19 2008
New Revision: 642725
URL: http://svn.apache.org/viewvc?rev=642725&view=rev
Log:
Report RECENT accurately on STORE
Modified:
james/server/trunk/experimental-seda-imap-function/src/test/resources/org/apache/james/test/functional/imap/scripts/Copy.test
james/server/trunk/experimental-seda-imap-function/src/test/resources/org/apache/james/test/functional/imap/scripts/SearchAtoms.test
james/server/trunk/experimental-seda-imap-function/src/test/resources/org/apache/james/test/functional/imap/scripts/SearchCombinations.test
james/server/trunk/experimental-seda-imap-function/src/test/resources/org/apache/james/test/functional/imap/scripts/Store.test
james/server/trunk/experimental-seda-imap-function/src/test/resources/org/apache/james/test/functional/imap/scripts/UidSearchAtoms.test
james/server/trunk/experimental-seda-imap-function/src/test/resources/org/apache/james/test/functional/imap/scripts/UidSearchCombinations.test
james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/StoreProcessor.java
Modified:
james/server/trunk/experimental-seda-imap-function/src/test/resources/org/apache/james/test/functional/imap/scripts/Copy.test
URL:
http://svn.apache.org/viewvc/james/server/trunk/experimental-seda-imap-function/src/test/resources/org/apache/james/test/functional/imap/scripts/Copy.test?rev=642725&r1=642724&r2=642725&view=diff
==============================================================================
---
james/server/trunk/experimental-seda-imap-function/src/test/resources/org/apache/james/test/functional/imap/scripts/Copy.test
(original)
+++
james/server/trunk/experimental-seda-imap-function/src/test/resources/org/apache/james/test/functional/imap/scripts/Copy.test
Sun Mar 30 05:18:19 2008
@@ -25,7 +25,7 @@
# mark one message as deleted before copying (to check that flags are copied)
C: a1 STORE 3 FLAGS (\Deleted)
-S: \* 3 FETCH \(FLAGS \(\\Deleted\)\)
+S: \* 3 FETCH \(FLAGS \(\\Deleted \\Recent\)\)
S: a1 OK STORE completed.
# copy messages 2-4
@@ -39,7 +39,7 @@
# Modify an original after copying, to ensure it's not the same message.
C: a1 STORE 2 FLAGS (\Flagged)
-S: \* 2 FETCH \(FLAGS \(\\Flagged\)\)
+S: \* 2 FETCH \(FLAGS \(\\Flagged \\Recent\)\)
S: a1 OK STORE completed.
C: a1 SELECT copied
Modified:
james/server/trunk/experimental-seda-imap-function/src/test/resources/org/apache/james/test/functional/imap/scripts/SearchAtoms.test
URL:
http://svn.apache.org/viewvc/james/server/trunk/experimental-seda-imap-function/src/test/resources/org/apache/james/test/functional/imap/scripts/SearchAtoms.test?rev=642725&r1=642724&r2=642725&view=diff
==============================================================================
---
james/server/trunk/experimental-seda-imap-function/src/test/resources/org/apache/james/test/functional/imap/scripts/SearchAtoms.test
(original)
+++
james/server/trunk/experimental-seda-imap-function/src/test/resources/org/apache/james/test/functional/imap/scripts/SearchAtoms.test
Sun Mar 30 05:18:19 2008
@@ -1512,79 +1512,79 @@
S: \* 19 RECENT
S: A22 OK APPEND completed\.
C: A23 STORE 1:9 +FLAGS (\FLAGGED)
-S: \* 1 FETCH \(FLAGS \(\\Flagged\)\)
-S: \* 2 FETCH \(FLAGS \(\\Flagged\)\)
-S: \* 3 FETCH \(FLAGS \(\\Flagged\)\)
-S: \* 4 FETCH \(FLAGS \(\\Flagged\)\)
-S: \* 5 FETCH \(FLAGS \(\\Flagged\)\)
-S: \* 6 FETCH \(FLAGS \(\\Flagged\)\)
-S: \* 7 FETCH \(FLAGS \(\\Flagged\)\)
-S: \* 8 FETCH \(FLAGS \(\\Flagged\)\)
-S: \* 9 FETCH \(FLAGS \(\\Flagged\)\)
+S: \* 1 FETCH \(FLAGS \(\\Flagged \\Recent\)\)
+S: \* 2 FETCH \(FLAGS \(\\Flagged \\Recent\)\)
+S: \* 3 FETCH \(FLAGS \(\\Flagged \\Recent\)\)
+S: \* 4 FETCH \(FLAGS \(\\Flagged \\Recent\)\)
+S: \* 5 FETCH \(FLAGS \(\\Flagged \\Recent\)\)
+S: \* 6 FETCH \(FLAGS \(\\Flagged \\Recent\)\)
+S: \* 7 FETCH \(FLAGS \(\\Flagged \\Recent\)\)
+S: \* 8 FETCH \(FLAGS \(\\Flagged \\Recent\)\)
+S: \* 9 FETCH \(FLAGS \(\\Flagged \\Recent\)\)
S: A23 OK STORE completed\.
C: A24 STORE 1:4 +FLAGS (\ANSWERED)
-S: \* 1 FETCH \(FLAGS \(\\Answered \\Flagged\)\)
-S: \* 2 FETCH \(FLAGS \(\\Answered \\Flagged\)\)
-S: \* 3 FETCH \(FLAGS \(\\Answered \\Flagged\)\)
-S: \* 4 FETCH \(FLAGS \(\\Answered \\Flagged\)\)
+S: \* 1 FETCH \(FLAGS \(\\Answered \\Flagged \\Recent\)\)
+S: \* 2 FETCH \(FLAGS \(\\Answered \\Flagged \\Recent\)\)
+S: \* 3 FETCH \(FLAGS \(\\Answered \\Flagged \\Recent\)\)
+S: \* 4 FETCH \(FLAGS \(\\Answered \\Flagged \\Recent\)\)
S: A24 OK STORE completed\.
C: A25 STORE 10:14 +FLAGS (\ANSWERED)
-S: \* 10 FETCH \(FLAGS \(\\Answered\)\)
-S: \* 11 FETCH \(FLAGS \(\\Answered\)\)
-S: \* 12 FETCH \(FLAGS \(\\Answered\)\)
-S: \* 13 FETCH \(FLAGS \(\\Answered\)\)
-S: \* 14 FETCH \(FLAGS \(\\Answered\)\)
+S: \* 10 FETCH \(FLAGS \(\\Answered \\Recent\)\)
+S: \* 11 FETCH \(FLAGS \(\\Answered \\Recent\)\)
+S: \* 12 FETCH \(FLAGS \(\\Answered \\Recent\)\)
+S: \* 13 FETCH \(FLAGS \(\\Answered \\Recent\)\)
+S: \* 14 FETCH \(FLAGS \(\\Answered \\Recent\)\)
S: A25 OK STORE completed\.
C: A26 STORE 1:2 +FLAGS (\SEEN)
-S: \* 1 FETCH \(FLAGS \(\\Answered \\Flagged \\Seen\)\)
-S: \* 2 FETCH \(FLAGS \(\\Answered \\Flagged \\Seen\)\)
+S: \* 1 FETCH \(FLAGS \(\\Answered \\Flagged \\Recent \\Seen\)\)
+S: \* 2 FETCH \(FLAGS \(\\Answered \\Flagged \\Recent \\Seen\)\)
S: A26 OK STORE completed\.
C: A27 STORE 5:7 +FLAGS (\SEEN)
-S: \* 5 FETCH \(FLAGS \(\\Flagged \\Seen\)\)
-S: \* 6 FETCH \(FLAGS \(\\Flagged \\Seen\)\)
-S: \* 7 FETCH \(FLAGS \(\\Flagged \\Seen\)\)
+S: \* 5 FETCH \(FLAGS \(\\Flagged \\Recent \\Seen\)\)
+S: \* 6 FETCH \(FLAGS \(\\Flagged \\Recent \\Seen\)\)
+S: \* 7 FETCH \(FLAGS \(\\Flagged \\Recent \\Seen\)\)
S: A27 OK STORE completed\.
C: A28 STORE 10:12 +FLAGS (\SEEN)
-S: \* 10 FETCH \(FLAGS \(\\Answered \\Seen\)\)
-S: \* 11 FETCH \(FLAGS \(\\Answered \\Seen\)\)
-S: \* 12 FETCH \(FLAGS \(\\Answered \\Seen\)\)
+S: \* 10 FETCH \(FLAGS \(\\Answered \\Recent \\Seen\)\)
+S: \* 11 FETCH \(FLAGS \(\\Answered \\Recent \\Seen\)\)
+S: \* 12 FETCH \(FLAGS \(\\Answered \\Recent \\Seen\)\)
S: A28 OK STORE completed\.
C: A29 STORE 15:17 +FLAGS (\SEEN)
-S: \* 15 FETCH \(FLAGS \(\\Seen\)\)
-S: \* 16 FETCH \(FLAGS \(\\Seen\)\)
-S: \* 17 FETCH \(FLAGS \(\\Seen\)\)
+S: \* 15 FETCH \(FLAGS \(\\Recent \\Seen\)\)
+S: \* 16 FETCH \(FLAGS \(\\Recent \\Seen\)\)
+S: \* 17 FETCH \(FLAGS \(\\Recent \\Seen\)\)
S: A29 OK STORE completed\.
C: A30 STORE 1 +FLAGS (\DRAFT)
-S: \* 1 FETCH \(FLAGS \(\\Answered \\Draft \\Flagged \\Seen\)\)
+S: \* 1 FETCH \(FLAGS \(\\Answered \\Draft \\Flagged \\Recent \\Seen\)\)
S: A30 OK STORE completed\.
C: A31 STORE 3 +FLAGS (\DRAFT)
-S: \* 3 FETCH \(FLAGS \(\\Answered \\Draft \\Flagged\)\)
+S: \* 3 FETCH \(FLAGS \(\\Answered \\Draft \\Flagged \\Recent\)\)
S: A31 OK STORE completed\.
C: A32 STORE 5 +FLAGS (\DRAFT)
-S: \* 5 FETCH \(FLAGS \(\\Draft \\Flagged \\Seen\)\)
+S: \* 5 FETCH \(FLAGS \(\\Draft \\Flagged \\Recent \\Seen\)\)
S: A32 OK STORE completed\.
C: A33 STORE 7 +FLAGS (\DRAFT)
-S: \* 7 FETCH \(FLAGS \(\\Draft \\Flagged \\Seen\)\)
+S: \* 7 FETCH \(FLAGS \(\\Draft \\Flagged \\Recent \\Seen\)\)
S: A33 OK STORE completed\.
C: A34 STORE 9 +FLAGS (\DRAFT)
-S: \* 9 FETCH \(FLAGS \(\\Draft \\Flagged\)\)
+S: \* 9 FETCH \(FLAGS \(\\Draft \\Flagged \\Recent\)\)
S: A34 OK STORE completed\.
C: A35 STORE 11 +FLAGS (\DRAFT)
-S: \* 11 FETCH \(FLAGS \(\\Answered \\Draft \\Seen\)\)
+S: \* 11 FETCH \(FLAGS \(\\Answered \\Draft \\Recent \\Seen\)\)
S: A35 OK STORE completed\.
C: A36 STORE 13 +FLAGS (\DRAFT)
-S: \* 13 FETCH \(FLAGS \(\\Answered \\Draft\)\)
+S: \* 13 FETCH \(FLAGS \(\\Answered \\Draft \\Recent\)\)
S: A36 OK STORE completed\.
C: A37 STORE 15 +FLAGS (\DRAFT)
-S: \* 15 FETCH \(FLAGS \(\\Draft \\Seen\)\)
+S: \* 15 FETCH \(FLAGS \(\\Draft \\Recent \\Seen\)\)
S: A37 OK STORE completed\.
C: A38 STORE 17 +FLAGS (\DRAFT)
-S: \* 17 FETCH \(FLAGS \(\\Draft \\Seen\)\)
+S: \* 17 FETCH \(FLAGS \(\\Draft \\Recent \\Seen\)\)
S: A38 OK STORE completed\.
C: A39 STORE 1:3 +FLAGS (\DELETED)
-S: \* 1 FETCH \(FLAGS \(\\Answered \\Deleted \\Draft \\Flagged \\Seen\)\)
-S: \* 2 FETCH \(FLAGS \(\\Answered \\Deleted \\Flagged \\Seen\)\)
-S: \* 3 FETCH \(FLAGS \(\\Answered \\Deleted \\Draft \\Flagged\)\)
+S: \* 1 FETCH \(FLAGS \(\\Answered \\Deleted \\Draft \\Flagged \\Recent
\\Seen\)\)
+S: \* 2 FETCH \(FLAGS \(\\Answered \\Deleted \\Flagged \\Recent \\Seen\)\)
+S: \* 3 FETCH \(FLAGS \(\\Answered \\Deleted \\Draft \\Flagged \\Recent\)\)
S: A39 OK STORE completed\.
C: A40 SEARCH ALL
S: \* SEARCH 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19
Modified:
james/server/trunk/experimental-seda-imap-function/src/test/resources/org/apache/james/test/functional/imap/scripts/SearchCombinations.test
URL:
http://svn.apache.org/viewvc/james/server/trunk/experimental-seda-imap-function/src/test/resources/org/apache/james/test/functional/imap/scripts/SearchCombinations.test?rev=642725&r1=642724&r2=642725&view=diff
==============================================================================
---
james/server/trunk/experimental-seda-imap-function/src/test/resources/org/apache/james/test/functional/imap/scripts/SearchCombinations.test
(original)
+++
james/server/trunk/experimental-seda-imap-function/src/test/resources/org/apache/james/test/functional/imap/scripts/SearchCombinations.test
Sun Mar 30 05:18:19 2008
@@ -1512,79 +1512,79 @@
S: \* 19 RECENT
S: A22 OK APPEND completed\.
C: A23 STORE 1:9 +FLAGS (\FLAGGED)
-S: \* 1 FETCH \(FLAGS \(\\Flagged\)\)
-S: \* 2 FETCH \(FLAGS \(\\Flagged\)\)
-S: \* 3 FETCH \(FLAGS \(\\Flagged\)\)
-S: \* 4 FETCH \(FLAGS \(\\Flagged\)\)
-S: \* 5 FETCH \(FLAGS \(\\Flagged\)\)
-S: \* 6 FETCH \(FLAGS \(\\Flagged\)\)
-S: \* 7 FETCH \(FLAGS \(\\Flagged\)\)
-S: \* 8 FETCH \(FLAGS \(\\Flagged\)\)
-S: \* 9 FETCH \(FLAGS \(\\Flagged\)\)
+S: \* 1 FETCH \(FLAGS \(\\Flagged \\Recent\)\)
+S: \* 2 FETCH \(FLAGS \(\\Flagged \\Recent\)\)
+S: \* 3 FETCH \(FLAGS \(\\Flagged \\Recent\)\)
+S: \* 4 FETCH \(FLAGS \(\\Flagged \\Recent\)\)
+S: \* 5 FETCH \(FLAGS \(\\Flagged \\Recent\)\)
+S: \* 6 FETCH \(FLAGS \(\\Flagged \\Recent\)\)
+S: \* 7 FETCH \(FLAGS \(\\Flagged \\Recent\)\)
+S: \* 8 FETCH \(FLAGS \(\\Flagged \\Recent\)\)
+S: \* 9 FETCH \(FLAGS \(\\Flagged \\Recent\)\)
S: A23 OK STORE completed\.
C: A24 STORE 1:4 +FLAGS (\ANSWERED)
-S: \* 1 FETCH \(FLAGS \(\\Answered \\Flagged\)\)
-S: \* 2 FETCH \(FLAGS \(\\Answered \\Flagged\)\)
-S: \* 3 FETCH \(FLAGS \(\\Answered \\Flagged\)\)
-S: \* 4 FETCH \(FLAGS \(\\Answered \\Flagged\)\)
+S: \* 1 FETCH \(FLAGS \(\\Answered \\Flagged \\Recent\)\)
+S: \* 2 FETCH \(FLAGS \(\\Answered \\Flagged \\Recent\)\)
+S: \* 3 FETCH \(FLAGS \(\\Answered \\Flagged \\Recent\)\)
+S: \* 4 FETCH \(FLAGS \(\\Answered \\Flagged \\Recent\)\)
S: A24 OK STORE completed\.
C: A25 STORE 10:14 +FLAGS (\ANSWERED)
-S: \* 10 FETCH \(FLAGS \(\\Answered\)\)
-S: \* 11 FETCH \(FLAGS \(\\Answered\)\)
-S: \* 12 FETCH \(FLAGS \(\\Answered\)\)
-S: \* 13 FETCH \(FLAGS \(\\Answered\)\)
-S: \* 14 FETCH \(FLAGS \(\\Answered\)\)
+S: \* 10 FETCH \(FLAGS \(\\Answered \\Recent\)\)
+S: \* 11 FETCH \(FLAGS \(\\Answered \\Recent\)\)
+S: \* 12 FETCH \(FLAGS \(\\Answered \\Recent\)\)
+S: \* 13 FETCH \(FLAGS \(\\Answered \\Recent\)\)
+S: \* 14 FETCH \(FLAGS \(\\Answered \\Recent\)\)
S: A25 OK STORE completed\.
C: A26 STORE 1:2 +FLAGS (\SEEN)
-S: \* 1 FETCH \(FLAGS \(\\Answered \\Flagged \\Seen\)\)
-S: \* 2 FETCH \(FLAGS \(\\Answered \\Flagged \\Seen\)\)
+S: \* 1 FETCH \(FLAGS \(\\Answered \\Flagged \\Recent \\Seen\)\)
+S: \* 2 FETCH \(FLAGS \(\\Answered \\Flagged \\Recent \\Seen\)\)
S: A26 OK STORE completed\.
C: A27 STORE 5:7 +FLAGS (\SEEN)
-S: \* 5 FETCH \(FLAGS \(\\Flagged \\Seen\)\)
-S: \* 6 FETCH \(FLAGS \(\\Flagged \\Seen\)\)
-S: \* 7 FETCH \(FLAGS \(\\Flagged \\Seen\)\)
+S: \* 5 FETCH \(FLAGS \(\\Flagged \\Recent \\Seen\)\)
+S: \* 6 FETCH \(FLAGS \(\\Flagged \\Recent \\Seen\)\)
+S: \* 7 FETCH \(FLAGS \(\\Flagged \\Recent \\Seen\)\)
S: A27 OK STORE completed\.
C: A28 STORE 10:12 +FLAGS (\SEEN)
-S: \* 10 FETCH \(FLAGS \(\\Answered \\Seen\)\)
-S: \* 11 FETCH \(FLAGS \(\\Answered \\Seen\)\)
-S: \* 12 FETCH \(FLAGS \(\\Answered \\Seen\)\)
+S: \* 10 FETCH \(FLAGS \(\\Answered \\Recent \\Seen\)\)
+S: \* 11 FETCH \(FLAGS \(\\Answered \\Recent \\Seen\)\)
+S: \* 12 FETCH \(FLAGS \(\\Answered \\Recent \\Seen\)\)
S: A28 OK STORE completed\.
C: A29 STORE 15:17 +FLAGS (\SEEN)
-S: \* 15 FETCH \(FLAGS \(\\Seen\)\)
-S: \* 16 FETCH \(FLAGS \(\\Seen\)\)
-S: \* 17 FETCH \(FLAGS \(\\Seen\)\)
+S: \* 15 FETCH \(FLAGS \(\\Recent \\Seen\)\)
+S: \* 16 FETCH \(FLAGS \(\\Recent \\Seen\)\)
+S: \* 17 FETCH \(FLAGS \(\\Recent \\Seen\)\)
S: A29 OK STORE completed\.
C: A30 STORE 1 +FLAGS (\DRAFT)
-S: \* 1 FETCH \(FLAGS \(\\Answered \\Draft \\Flagged \\Seen\)\)
+S: \* 1 FETCH \(FLAGS \(\\Answered \\Draft \\Flagged \\Recent \\Seen\)\)
S: A30 OK STORE completed\.
C: A31 STORE 3 +FLAGS (\DRAFT)
-S: \* 3 FETCH \(FLAGS \(\\Answered \\Draft \\Flagged\)\)
+S: \* 3 FETCH \(FLAGS \(\\Answered \\Draft \\Flagged \\Recent\)\)
S: A31 OK STORE completed\.
C: A32 STORE 5 +FLAGS (\DRAFT)
-S: \* 5 FETCH \(FLAGS \(\\Draft \\Flagged \\Seen\)\)
+S: \* 5 FETCH \(FLAGS \(\\Draft \\Flagged \\Recent \\Seen\)\)
S: A32 OK STORE completed\.
C: A33 STORE 7 +FLAGS (\DRAFT)
-S: \* 7 FETCH \(FLAGS \(\\Draft \\Flagged \\Seen\)\)
+S: \* 7 FETCH \(FLAGS \(\\Draft \\Flagged \\Recent \\Seen\)\)
S: A33 OK STORE completed\.
C: A34 STORE 9 +FLAGS (\DRAFT)
-S: \* 9 FETCH \(FLAGS \(\\Draft \\Flagged\)\)
+S: \* 9 FETCH \(FLAGS \(\\Draft \\Flagged \\Recent\)\)
S: A34 OK STORE completed\.
C: A35 STORE 11 +FLAGS (\DRAFT)
-S: \* 11 FETCH \(FLAGS \(\\Answered \\Draft \\Seen\)\)
+S: \* 11 FETCH \(FLAGS \(\\Answered \\Draft \\Recent \\Seen\)\)
S: A35 OK STORE completed\.
C: A36 STORE 13 +FLAGS (\DRAFT)
-S: \* 13 FETCH \(FLAGS \(\\Answered \\Draft\)\)
+S: \* 13 FETCH \(FLAGS \(\\Answered \\Draft \\Recent\)\)
S: A36 OK STORE completed\.
C: A37 STORE 15 +FLAGS (\DRAFT)
-S: \* 15 FETCH \(FLAGS \(\\Draft \\Seen\)\)
+S: \* 15 FETCH \(FLAGS \(\\Draft \\Recent \\Seen\)\)
S: A37 OK STORE completed\.
C: A38 STORE 17 +FLAGS (\DRAFT)
-S: \* 17 FETCH \(FLAGS \(\\Draft \\Seen\)\)
+S: \* 17 FETCH \(FLAGS \(\\Draft \\Recent \\Seen\)\)
S: A38 OK STORE completed\.
C: A39 STORE 1:3 +FLAGS (\DELETED)
-S: \* 1 FETCH \(FLAGS \(\\Answered \\Deleted \\Draft \\Flagged \\Seen\)\)
-S: \* 2 FETCH \(FLAGS \(\\Answered \\Deleted \\Flagged \\Seen\)\)
-S: \* 3 FETCH \(FLAGS \(\\Answered \\Deleted \\Draft \\Flagged\)\)
+S: \* 1 FETCH \(FLAGS \(\\Answered \\Deleted \\Draft \\Flagged \\Recent
\\Seen\)\)
+S: \* 2 FETCH \(FLAGS \(\\Answered \\Deleted \\Flagged \\Recent \\Seen\)\)
+S: \* 3 FETCH \(FLAGS \(\\Answered \\Deleted \\Draft \\Flagged \\Recent\)\)
S: A39 OK STORE completed\.
C: A40 SEARCH BODY o UNDRAFT UNFLAGGED ANSWERED
S: \* SEARCH 10 12 14
Modified:
james/server/trunk/experimental-seda-imap-function/src/test/resources/org/apache/james/test/functional/imap/scripts/Store.test
URL:
http://svn.apache.org/viewvc/james/server/trunk/experimental-seda-imap-function/src/test/resources/org/apache/james/test/functional/imap/scripts/Store.test?rev=642725&r1=642724&r2=642725&view=diff
==============================================================================
---
james/server/trunk/experimental-seda-imap-function/src/test/resources/org/apache/james/test/functional/imap/scripts/Store.test
(original)
+++
james/server/trunk/experimental-seda-imap-function/src/test/resources/org/apache/james/test/functional/imap/scripts/Store.test
Sun Mar 30 05:18:19 2008
@@ -26,7 +26,7 @@
#Simple store
C: f2 STORE 1 FLAGS (\Deleted)
-S: \* 1 FETCH \(FLAGS \(\\Deleted\)\)
+S: \* 1 FETCH \(FLAGS \(\\Deleted \\Recent\)\)
S: f2 OK STORE completed.
C: f3 FETCH 1 (FLAGS)
@@ -43,7 +43,7 @@
#Add to existing flags
C: f2 STORE 1 +FLAGS (\Deleted)
-S: \* 1 FETCH \(FLAGS \(\\Deleted \\Draft \\Flagged\)\)
+S: \* 1 FETCH \(FLAGS \(\\Deleted \\Draft \\Flagged \\Recent\)\)
S: f2 OK STORE completed.
C: f1 FETCH 1 (FLAGS)
@@ -59,8 +59,8 @@
S: f1 OK FETCH completed.
C: f4 STORE 3:4 FLAGS (\Flagged)
-S: \* 3 FETCH \(FLAGS \(\\Flagged\)\)
-S: \* 4 FETCH \(FLAGS \(\\Flagged\)\)
+S: \* 3 FETCH \(FLAGS \(\\Flagged \\Recent\)\)
+S: \* 4 FETCH \(FLAGS \(\\Flagged \\Recent\)\)
S: f4 OK STORE completed.
C: f1 FETCH 1:4 (FLAGS)
Modified:
james/server/trunk/experimental-seda-imap-function/src/test/resources/org/apache/james/test/functional/imap/scripts/UidSearchAtoms.test
URL:
http://svn.apache.org/viewvc/james/server/trunk/experimental-seda-imap-function/src/test/resources/org/apache/james/test/functional/imap/scripts/UidSearchAtoms.test?rev=642725&r1=642724&r2=642725&view=diff
==============================================================================
---
james/server/trunk/experimental-seda-imap-function/src/test/resources/org/apache/james/test/functional/imap/scripts/UidSearchAtoms.test
(original)
+++
james/server/trunk/experimental-seda-imap-function/src/test/resources/org/apache/james/test/functional/imap/scripts/UidSearchAtoms.test
Sun Mar 30 05:18:19 2008
@@ -37,7 +37,7 @@
S: \* 1 RECENT
S: A4 OK APPEND completed\.
C: A5 STORE 1 FLAGS (\DELETED)
-S: \* 1 FETCH \(FLAGS \(\\Deleted\)\)
+S: \* 1 FETCH \(FLAGS \(\\Deleted \\Recent\)\)
S: A5 OK STORE completed\.
C: A6 EXPUNGE
S: \* 1 EXPUNGE
@@ -55,7 +55,7 @@
S: \* 1 RECENT
S: A7 OK APPEND completed\.
C: A8 STORE 1 FLAGS (\DELETED)
-S: \* 1 FETCH \(FLAGS \(\\Deleted\)\)
+S: \* 1 FETCH \(FLAGS \(\\Deleted \\Recent\)\)
S: A8 OK STORE completed\.
C: A9 EXPUNGE
S: \* 1 EXPUNGE
@@ -73,7 +73,7 @@
S: \* 1 RECENT
S: A10 OK APPEND completed\.
C: A11 STORE 1 FLAGS (\DELETED)
-S: \* 1 FETCH \(FLAGS \(\\Deleted\)\)
+S: \* 1 FETCH \(FLAGS \(\\Deleted \\Recent\)\)
S: A11 OK STORE completed\.
C: A12 EXPUNGE
S: \* 1 EXPUNGE
@@ -91,7 +91,7 @@
S: \* 1 RECENT
S: A13 OK APPEND completed\.
C: A14 STORE 1 FLAGS (\DELETED)
-S: \* 1 FETCH \(FLAGS \(\\Deleted\)\)
+S: \* 1 FETCH \(FLAGS \(\\Deleted \\Recent\)\)
S: A14 OK STORE completed\.
C: A15 EXPUNGE
S: \* 1 EXPUNGE
@@ -109,7 +109,7 @@
S: \* 1 RECENT
S: A16 OK APPEND completed\.
C: A17 STORE 1 FLAGS (\DELETED)
-S: \* 1 FETCH \(FLAGS \(\\Deleted\)\)
+S: \* 1 FETCH \(FLAGS \(\\Deleted \\Recent\)\)
S: A17 OK STORE completed\.
C: A18 EXPUNGE
S: \* 1 EXPUNGE
@@ -127,7 +127,7 @@
S: \* 1 RECENT
S: A19 OK APPEND completed\.
C: A20 STORE 1 FLAGS (\DELETED)
-S: \* 1 FETCH \(FLAGS \(\\Deleted\)\)
+S: \* 1 FETCH \(FLAGS \(\\Deleted \\Recent\)\)
S: A20 OK STORE completed\.
C: A21 EXPUNGE
S: \* 1 EXPUNGE
@@ -145,7 +145,7 @@
S: \* 1 RECENT
S: A22 OK APPEND completed\.
C: A23 STORE 1 FLAGS (\DELETED)
-S: \* 1 FETCH \(FLAGS \(\\Deleted\)\)
+S: \* 1 FETCH \(FLAGS \(\\Deleted \\Recent\)\)
S: A23 OK STORE completed\.
C: A24 EXPUNGE
S: \* 1 EXPUNGE
@@ -163,7 +163,7 @@
S: \* 1 RECENT
S: A25 OK APPEND completed\.
C: A26 STORE 1 FLAGS (\DELETED)
-S: \* 1 FETCH \(FLAGS \(\\Deleted\)\)
+S: \* 1 FETCH \(FLAGS \(\\Deleted \\Recent\)\)
S: A26 OK STORE completed\.
C: A27 EXPUNGE
S: \* 1 EXPUNGE
@@ -181,7 +181,7 @@
S: \* 1 RECENT
S: A28 OK APPEND completed\.
C: A29 STORE 1 FLAGS (\DELETED)
-S: \* 1 FETCH \(FLAGS \(\\Deleted\)\)
+S: \* 1 FETCH \(FLAGS \(\\Deleted \\Recent\)\)
S: A29 OK STORE completed\.
C: A30 EXPUNGE
S: \* 1 EXPUNGE
@@ -199,7 +199,7 @@
S: \* 1 RECENT
S: A31 OK APPEND completed\.
C: A32 STORE 1 FLAGS (\DELETED)
-S: \* 1 FETCH \(FLAGS \(\\Deleted\)\)
+S: \* 1 FETCH \(FLAGS \(\\Deleted \\Recent\)\)
S: A32 OK STORE completed\.
C: A33 EXPUNGE
S: \* 1 EXPUNGE
@@ -217,7 +217,7 @@
S: \* 1 RECENT
S: A34 OK APPEND completed\.
C: A35 STORE 1 FLAGS (\DELETED)
-S: \* 1 FETCH \(FLAGS \(\\Deleted\)\)
+S: \* 1 FETCH \(FLAGS \(\\Deleted \\Recent\)\)
S: A35 OK STORE completed\.
C: A36 EXPUNGE
S: \* 1 EXPUNGE
@@ -235,7 +235,7 @@
S: \* 1 RECENT
S: A37 OK APPEND completed\.
C: A38 STORE 1 FLAGS (\DELETED)
-S: \* 1 FETCH \(FLAGS \(\\Deleted\)\)
+S: \* 1 FETCH \(FLAGS \(\\Deleted \\Recent\)\)
S: A38 OK STORE completed\.
C: A39 EXPUNGE
S: \* 1 EXPUNGE
@@ -253,7 +253,7 @@
S: \* 1 RECENT
S: A40 OK APPEND completed\.
C: A41 STORE 1 FLAGS (\DELETED)
-S: \* 1 FETCH \(FLAGS \(\\Deleted\)\)
+S: \* 1 FETCH \(FLAGS \(\\Deleted \\Recent\)\)
S: A41 OK STORE completed\.
C: A42 EXPUNGE
S: \* 1 EXPUNGE
@@ -271,7 +271,7 @@
S: \* 1 RECENT
S: A43 OK APPEND completed\.
C: A44 STORE 1 FLAGS (\DELETED)
-S: \* 1 FETCH \(FLAGS \(\\Deleted\)\)
+S: \* 1 FETCH \(FLAGS \(\\Deleted \\Recent\)\)
S: A44 OK STORE completed\.
C: A45 EXPUNGE
S: \* 1 EXPUNGE
@@ -289,7 +289,7 @@
S: \* 1 RECENT
S: A46 OK APPEND completed\.
C: A47 STORE 1 FLAGS (\DELETED)
-S: \* 1 FETCH \(FLAGS \(\\Deleted\)\)
+S: \* 1 FETCH \(FLAGS \(\\Deleted \\Recent\)\)
S: A47 OK STORE completed\.
C: A48 EXPUNGE
S: \* 1 EXPUNGE
@@ -307,7 +307,7 @@
S: \* 1 RECENT
S: A49 OK APPEND completed\.
C: A50 STORE 1 FLAGS (\DELETED)
-S: \* 1 FETCH \(FLAGS \(\\Deleted\)\)
+S: \* 1 FETCH \(FLAGS \(\\Deleted \\Recent\)\)
S: A50 OK STORE completed\.
C: A51 EXPUNGE
S: \* 1 EXPUNGE
@@ -325,7 +325,7 @@
S: \* 1 RECENT
S: A52 OK APPEND completed\.
C: A53 STORE 1 FLAGS (\DELETED)
-S: \* 1 FETCH \(FLAGS \(\\Deleted\)\)
+S: \* 1 FETCH \(FLAGS \(\\Deleted \\Recent\)\)
S: A53 OK STORE completed\.
C: A54 EXPUNGE
S: \* 1 EXPUNGE
@@ -343,7 +343,7 @@
S: \* 1 RECENT
S: A55 OK APPEND completed\.
C: A56 STORE 1 FLAGS (\DELETED)
-S: \* 1 FETCH \(FLAGS \(\\Deleted\)\)
+S: \* 1 FETCH \(FLAGS \(\\Deleted \\Recent\)\)
S: A56 OK STORE completed\.
C: A57 EXPUNGE
S: \* 1 EXPUNGE
@@ -361,7 +361,7 @@
S: \* 1 RECENT
S: A58 OK APPEND completed\.
C: A59 STORE 1 FLAGS (\DELETED)
-S: \* 1 FETCH \(FLAGS \(\\Deleted\)\)
+S: \* 1 FETCH \(FLAGS \(\\Deleted \\Recent\)\)
S: A59 OK STORE completed\.
C: A60 EXPUNGE
S: \* 1 EXPUNGE
@@ -379,7 +379,7 @@
S: \* 1 RECENT
S: A61 OK APPEND completed\.
C: A62 STORE 1 FLAGS (\DELETED)
-S: \* 1 FETCH \(FLAGS \(\\Deleted\)\)
+S: \* 1 FETCH \(FLAGS \(\\Deleted \\Recent\)\)
S: A62 OK STORE completed\.
C: A63 EXPUNGE
S: \* 1 EXPUNGE
@@ -1872,79 +1872,79 @@
S: \* 19 RECENT
S: A82 OK APPEND completed\.
C: A83 STORE 1:9 +FLAGS (\FLAGGED)
-S: \* 1 FETCH \(FLAGS \(\\Flagged\)\)
-S: \* 2 FETCH \(FLAGS \(\\Flagged\)\)
-S: \* 3 FETCH \(FLAGS \(\\Flagged\)\)
-S: \* 4 FETCH \(FLAGS \(\\Flagged\)\)
-S: \* 5 FETCH \(FLAGS \(\\Flagged\)\)
-S: \* 6 FETCH \(FLAGS \(\\Flagged\)\)
-S: \* 7 FETCH \(FLAGS \(\\Flagged\)\)
-S: \* 8 FETCH \(FLAGS \(\\Flagged\)\)
-S: \* 9 FETCH \(FLAGS \(\\Flagged\)\)
+S: \* 1 FETCH \(FLAGS \(\\Flagged \\Recent\)\)
+S: \* 2 FETCH \(FLAGS \(\\Flagged \\Recent\)\)
+S: \* 3 FETCH \(FLAGS \(\\Flagged \\Recent\)\)
+S: \* 4 FETCH \(FLAGS \(\\Flagged \\Recent\)\)
+S: \* 5 FETCH \(FLAGS \(\\Flagged \\Recent\)\)
+S: \* 6 FETCH \(FLAGS \(\\Flagged \\Recent\)\)
+S: \* 7 FETCH \(FLAGS \(\\Flagged \\Recent\)\)
+S: \* 8 FETCH \(FLAGS \(\\Flagged \\Recent\)\)
+S: \* 9 FETCH \(FLAGS \(\\Flagged \\Recent\)\)
S: A83 OK STORE completed\.
C: A84 STORE 1:4 +FLAGS (\ANSWERED)
-S: \* 1 FETCH \(FLAGS \(\\Answered \\Flagged\)\)
-S: \* 2 FETCH \(FLAGS \(\\Answered \\Flagged\)\)
-S: \* 3 FETCH \(FLAGS \(\\Answered \\Flagged\)\)
-S: \* 4 FETCH \(FLAGS \(\\Answered \\Flagged\)\)
+S: \* 1 FETCH \(FLAGS \(\\Answered \\Flagged \\Recent\)\)
+S: \* 2 FETCH \(FLAGS \(\\Answered \\Flagged \\Recent\)\)
+S: \* 3 FETCH \(FLAGS \(\\Answered \\Flagged \\Recent\)\)
+S: \* 4 FETCH \(FLAGS \(\\Answered \\Flagged \\Recent\)\)
S: A84 OK STORE completed\.
C: A85 STORE 10:14 +FLAGS (\ANSWERED)
-S: \* 10 FETCH \(FLAGS \(\\Answered\)\)
-S: \* 11 FETCH \(FLAGS \(\\Answered\)\)
-S: \* 12 FETCH \(FLAGS \(\\Answered\)\)
-S: \* 13 FETCH \(FLAGS \(\\Answered\)\)
-S: \* 14 FETCH \(FLAGS \(\\Answered\)\)
+S: \* 10 FETCH \(FLAGS \(\\Answered \\Recent\)\)
+S: \* 11 FETCH \(FLAGS \(\\Answered \\Recent\)\)
+S: \* 12 FETCH \(FLAGS \(\\Answered \\Recent\)\)
+S: \* 13 FETCH \(FLAGS \(\\Answered \\Recent\)\)
+S: \* 14 FETCH \(FLAGS \(\\Answered \\Recent\)\)
S: A85 OK STORE completed\.
C: A86 STORE 1:2 +FLAGS (\SEEN)
-S: \* 1 FETCH \(FLAGS \(\\Answered \\Flagged \\Seen\)\)
-S: \* 2 FETCH \(FLAGS \(\\Answered \\Flagged \\Seen\)\)
+S: \* 1 FETCH \(FLAGS \(\\Answered \\Flagged \\Recent \\Seen\)\)
+S: \* 2 FETCH \(FLAGS \(\\Answered \\Flagged \\Recent \\Seen\)\)
S: A86 OK STORE completed\.
C: A87 STORE 5:7 +FLAGS (\SEEN)
-S: \* 5 FETCH \(FLAGS \(\\Flagged \\Seen\)\)
-S: \* 6 FETCH \(FLAGS \(\\Flagged \\Seen\)\)
-S: \* 7 FETCH \(FLAGS \(\\Flagged \\Seen\)\)
+S: \* 5 FETCH \(FLAGS \(\\Flagged \\Recent \\Seen\)\)
+S: \* 6 FETCH \(FLAGS \(\\Flagged \\Recent \\Seen\)\)
+S: \* 7 FETCH \(FLAGS \(\\Flagged \\Recent \\Seen\)\)
S: A87 OK STORE completed\.
C: A88 STORE 10:12 +FLAGS (\SEEN)
-S: \* 10 FETCH \(FLAGS \(\\Answered \\Seen\)\)
-S: \* 11 FETCH \(FLAGS \(\\Answered \\Seen\)\)
-S: \* 12 FETCH \(FLAGS \(\\Answered \\Seen\)\)
+S: \* 10 FETCH \(FLAGS \(\\Answered \\Recent \\Seen\)\)
+S: \* 11 FETCH \(FLAGS \(\\Answered \\Recent \\Seen\)\)
+S: \* 12 FETCH \(FLAGS \(\\Answered \\Recent \\Seen\)\)
S: A88 OK STORE completed\.
C: A89 STORE 15:17 +FLAGS (\SEEN)
-S: \* 15 FETCH \(FLAGS \(\\Seen\)\)
-S: \* 16 FETCH \(FLAGS \(\\Seen\)\)
-S: \* 17 FETCH \(FLAGS \(\\Seen\)\)
+S: \* 15 FETCH \(FLAGS \(\\Recent \\Seen\)\)
+S: \* 16 FETCH \(FLAGS \(\\Recent \\Seen\)\)
+S: \* 17 FETCH \(FLAGS \(\\Recent \\Seen\)\)
S: A89 OK STORE completed\.
C: A90 STORE 1 +FLAGS (\DRAFT)
-S: \* 1 FETCH \(FLAGS \(\\Answered \\Draft \\Flagged \\Seen\)\)
+S: \* 1 FETCH \(FLAGS \(\\Answered \\Draft \\Flagged \\Recent \\Seen\)\)
S: A90 OK STORE completed\.
C: A91 STORE 3 +FLAGS (\DRAFT)
-S: \* 3 FETCH \(FLAGS \(\\Answered \\Draft \\Flagged\)\)
+S: \* 3 FETCH \(FLAGS \(\\Answered \\Draft \\Flagged \\Recent\)\)
S: A91 OK STORE completed\.
C: A92 STORE 5 +FLAGS (\DRAFT)
-S: \* 5 FETCH \(FLAGS \(\\Draft \\Flagged \\Seen\)\)
+S: \* 5 FETCH \(FLAGS \(\\Draft \\Flagged \\Recent \\Seen\)\)
S: A92 OK STORE completed\.
C: A93 STORE 7 +FLAGS (\DRAFT)
-S: \* 7 FETCH \(FLAGS \(\\Draft \\Flagged \\Seen\)\)
+S: \* 7 FETCH \(FLAGS \(\\Draft \\Flagged \\Recent \\Seen\)\)
S: A93 OK STORE completed\.
C: A94 STORE 9 +FLAGS (\DRAFT)
-S: \* 9 FETCH \(FLAGS \(\\Draft \\Flagged\)\)
+S: \* 9 FETCH \(FLAGS \(\\Draft \\Flagged \\Recent\)\)
S: A94 OK STORE completed\.
C: A95 STORE 11 +FLAGS (\DRAFT)
-S: \* 11 FETCH \(FLAGS \(\\Answered \\Draft \\Seen\)\)
+S: \* 11 FETCH \(FLAGS \(\\Answered \\Draft \\Recent \\Seen\)\)
S: A95 OK STORE completed\.
C: A96 STORE 13 +FLAGS (\DRAFT)
-S: \* 13 FETCH \(FLAGS \(\\Answered \\Draft\)\)
+S: \* 13 FETCH \(FLAGS \(\\Answered \\Draft \\Recent\)\)
S: A96 OK STORE completed\.
C: A97 STORE 15 +FLAGS (\DRAFT)
-S: \* 15 FETCH \(FLAGS \(\\Draft \\Seen\)\)
+S: \* 15 FETCH \(FLAGS \(\\Draft \\Recent \\Seen\)\)
S: A97 OK STORE completed\.
C: A98 STORE 17 +FLAGS (\DRAFT)
-S: \* 17 FETCH \(FLAGS \(\\Draft \\Seen\)\)
+S: \* 17 FETCH \(FLAGS \(\\Draft \\Recent \\Seen\)\)
S: A98 OK STORE completed\.
C: A99 STORE 1:3 +FLAGS (\DELETED)
-S: \* 1 FETCH \(FLAGS \(\\Answered \\Deleted \\Draft \\Flagged \\Seen\)\)
-S: \* 2 FETCH \(FLAGS \(\\Answered \\Deleted \\Flagged \\Seen\)\)
-S: \* 3 FETCH \(FLAGS \(\\Answered \\Deleted \\Draft \\Flagged\)\)
+S: \* 1 FETCH \(FLAGS \(\\Answered \\Deleted \\Draft \\Flagged \\Recent
\\Seen\)\)
+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 UID SEARCH ALL
S: \* SEARCH 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39
Modified:
james/server/trunk/experimental-seda-imap-function/src/test/resources/org/apache/james/test/functional/imap/scripts/UidSearchCombinations.test
URL:
http://svn.apache.org/viewvc/james/server/trunk/experimental-seda-imap-function/src/test/resources/org/apache/james/test/functional/imap/scripts/UidSearchCombinations.test?rev=642725&r1=642724&r2=642725&view=diff
==============================================================================
---
james/server/trunk/experimental-seda-imap-function/src/test/resources/org/apache/james/test/functional/imap/scripts/UidSearchCombinations.test
(original)
+++
james/server/trunk/experimental-seda-imap-function/src/test/resources/org/apache/james/test/functional/imap/scripts/UidSearchCombinations.test
Sun Mar 30 05:18:19 2008
@@ -37,7 +37,7 @@
S: \* 1 RECENT
S: A4 OK APPEND completed\.
C: A5 STORE 1 FLAGS (\DELETED)
-S: \* 1 FETCH \(FLAGS \(\\Deleted\)\)
+S: \* 1 FETCH \(FLAGS \(\\Deleted \\Recent\)\)
S: A5 OK STORE completed\.
C: A6 EXPUNGE
S: \* 1 EXPUNGE
@@ -55,7 +55,7 @@
S: \* 1 RECENT
S: A7 OK APPEND completed\.
C: A8 STORE 1 FLAGS (\DELETED)
-S: \* 1 FETCH \(FLAGS \(\\Deleted\)\)
+S: \* 1 FETCH \(FLAGS \(\\Deleted \\Recent\)\)
S: A8 OK STORE completed\.
C: A9 EXPUNGE
S: \* 1 EXPUNGE
@@ -73,7 +73,7 @@
S: \* 1 RECENT
S: A10 OK APPEND completed\.
C: A11 STORE 1 FLAGS (\DELETED)
-S: \* 1 FETCH \(FLAGS \(\\Deleted\)\)
+S: \* 1 FETCH \(FLAGS \(\\Deleted \\Recent\)\)
S: A11 OK STORE completed\.
C: A12 EXPUNGE
S: \* 1 EXPUNGE
@@ -91,7 +91,7 @@
S: \* 1 RECENT
S: A13 OK APPEND completed\.
C: A14 STORE 1 FLAGS (\DELETED)
-S: \* 1 FETCH \(FLAGS \(\\Deleted\)\)
+S: \* 1 FETCH \(FLAGS \(\\Deleted \\Recent\)\)
S: A14 OK STORE completed\.
C: A15 EXPUNGE
S: \* 1 EXPUNGE
@@ -109,7 +109,7 @@
S: \* 1 RECENT
S: A16 OK APPEND completed\.
C: A17 STORE 1 FLAGS (\DELETED)
-S: \* 1 FETCH \(FLAGS \(\\Deleted\)\)
+S: \* 1 FETCH \(FLAGS \(\\Deleted \\Recent\)\)
S: A17 OK STORE completed\.
C: A18 EXPUNGE
S: \* 1 EXPUNGE
@@ -127,7 +127,7 @@
S: \* 1 RECENT
S: A19 OK APPEND completed\.
C: A20 STORE 1 FLAGS (\DELETED)
-S: \* 1 FETCH \(FLAGS \(\\Deleted\)\)
+S: \* 1 FETCH \(FLAGS \(\\Deleted \\Recent\)\)
S: A20 OK STORE completed\.
C: A21 EXPUNGE
S: \* 1 EXPUNGE
@@ -145,7 +145,7 @@
S: \* 1 RECENT
S: A22 OK APPEND completed\.
C: A23 STORE 1 FLAGS (\DELETED)
-S: \* 1 FETCH \(FLAGS \(\\Deleted\)\)
+S: \* 1 FETCH \(FLAGS \(\\Deleted \\Recent\)\)
S: A23 OK STORE completed\.
C: A24 EXPUNGE
S: \* 1 EXPUNGE
@@ -163,7 +163,7 @@
S: \* 1 RECENT
S: A25 OK APPEND completed\.
C: A26 STORE 1 FLAGS (\DELETED)
-S: \* 1 FETCH \(FLAGS \(\\Deleted\)\)
+S: \* 1 FETCH \(FLAGS \(\\Deleted \\Recent\)\)
S: A26 OK STORE completed\.
C: A27 EXPUNGE
S: \* 1 EXPUNGE
@@ -181,7 +181,7 @@
S: \* 1 RECENT
S: A28 OK APPEND completed\.
C: A29 STORE 1 FLAGS (\DELETED)
-S: \* 1 FETCH \(FLAGS \(\\Deleted\)\)
+S: \* 1 FETCH \(FLAGS \(\\Deleted \\Recent\)\)
S: A29 OK STORE completed\.
C: A30 EXPUNGE
S: \* 1 EXPUNGE
@@ -199,7 +199,7 @@
S: \* 1 RECENT
S: A31 OK APPEND completed\.
C: A32 STORE 1 FLAGS (\DELETED)
-S: \* 1 FETCH \(FLAGS \(\\Deleted\)\)
+S: \* 1 FETCH \(FLAGS \(\\Deleted \\Recent\)\)
S: A32 OK STORE completed\.
C: A33 EXPUNGE
S: \* 1 EXPUNGE
@@ -217,7 +217,7 @@
S: \* 1 RECENT
S: A34 OK APPEND completed\.
C: A35 STORE 1 FLAGS (\DELETED)
-S: \* 1 FETCH \(FLAGS \(\\Deleted\)\)
+S: \* 1 FETCH \(FLAGS \(\\Deleted \\Recent\)\)
S: A35 OK STORE completed\.
C: A36 EXPUNGE
S: \* 1 EXPUNGE
@@ -235,7 +235,7 @@
S: \* 1 RECENT
S: A37 OK APPEND completed\.
C: A38 STORE 1 FLAGS (\DELETED)
-S: \* 1 FETCH \(FLAGS \(\\Deleted\)\)
+S: \* 1 FETCH \(FLAGS \(\\Deleted \\Recent\)\)
S: A38 OK STORE completed\.
C: A39 EXPUNGE
S: \* 1 EXPUNGE
@@ -253,7 +253,7 @@
S: \* 1 RECENT
S: A40 OK APPEND completed\.
C: A41 STORE 1 FLAGS (\DELETED)
-S: \* 1 FETCH \(FLAGS \(\\Deleted\)\)
+S: \* 1 FETCH \(FLAGS \(\\Deleted \\Recent\)\)
S: A41 OK STORE completed\.
C: A42 EXPUNGE
S: \* 1 EXPUNGE
@@ -271,7 +271,7 @@
S: \* 1 RECENT
S: A43 OK APPEND completed\.
C: A44 STORE 1 FLAGS (\DELETED)
-S: \* 1 FETCH \(FLAGS \(\\Deleted\)\)
+S: \* 1 FETCH \(FLAGS \(\\Deleted \\Recent\)\)
S: A44 OK STORE completed\.
C: A45 EXPUNGE
S: \* 1 EXPUNGE
@@ -289,7 +289,7 @@
S: \* 1 RECENT
S: A46 OK APPEND completed\.
C: A47 STORE 1 FLAGS (\DELETED)
-S: \* 1 FETCH \(FLAGS \(\\Deleted\)\)
+S: \* 1 FETCH \(FLAGS \(\\Deleted \\Recent\)\)
S: A47 OK STORE completed\.
C: A48 EXPUNGE
S: \* 1 EXPUNGE
@@ -307,7 +307,7 @@
S: \* 1 RECENT
S: A49 OK APPEND completed\.
C: A50 STORE 1 FLAGS (\DELETED)
-S: \* 1 FETCH \(FLAGS \(\\Deleted\)\)
+S: \* 1 FETCH \(FLAGS \(\\Deleted \\Recent\)\)
S: A50 OK STORE completed\.
C: A51 EXPUNGE
S: \* 1 EXPUNGE
@@ -325,7 +325,7 @@
S: \* 1 RECENT
S: A52 OK APPEND completed\.
C: A53 STORE 1 FLAGS (\DELETED)
-S: \* 1 FETCH \(FLAGS \(\\Deleted\)\)
+S: \* 1 FETCH \(FLAGS \(\\Deleted \\Recent\)\)
S: A53 OK STORE completed\.
C: A54 EXPUNGE
S: \* 1 EXPUNGE
@@ -343,7 +343,7 @@
S: \* 1 RECENT
S: A55 OK APPEND completed\.
C: A56 STORE 1 FLAGS (\DELETED)
-S: \* 1 FETCH \(FLAGS \(\\Deleted\)\)
+S: \* 1 FETCH \(FLAGS \(\\Deleted \\Recent\)\)
S: A56 OK STORE completed\.
C: A57 EXPUNGE
S: \* 1 EXPUNGE
@@ -361,7 +361,7 @@
S: \* 1 RECENT
S: A58 OK APPEND completed\.
C: A59 STORE 1 FLAGS (\DELETED)
-S: \* 1 FETCH \(FLAGS \(\\Deleted\)\)
+S: \* 1 FETCH \(FLAGS \(\\Deleted \\Recent\)\)
S: A59 OK STORE completed\.
C: A60 EXPUNGE
S: \* 1 EXPUNGE
@@ -379,7 +379,7 @@
S: \* 1 RECENT
S: A61 OK APPEND completed\.
C: A62 STORE 1 FLAGS (\DELETED)
-S: \* 1 FETCH \(FLAGS \(\\Deleted\)\)
+S: \* 1 FETCH \(FLAGS \(\\Deleted \\Recent\)\)
S: A62 OK STORE completed\.
C: A63 EXPUNGE
S: \* 1 EXPUNGE
@@ -1872,79 +1872,79 @@
S: \* 19 RECENT
S: A82 OK APPEND completed\.
C: A83 STORE 1:9 +FLAGS (\FLAGGED)
-S: \* 1 FETCH \(FLAGS \(\\Flagged\)\)
-S: \* 2 FETCH \(FLAGS \(\\Flagged\)\)
-S: \* 3 FETCH \(FLAGS \(\\Flagged\)\)
-S: \* 4 FETCH \(FLAGS \(\\Flagged\)\)
-S: \* 5 FETCH \(FLAGS \(\\Flagged\)\)
-S: \* 6 FETCH \(FLAGS \(\\Flagged\)\)
-S: \* 7 FETCH \(FLAGS \(\\Flagged\)\)
-S: \* 8 FETCH \(FLAGS \(\\Flagged\)\)
-S: \* 9 FETCH \(FLAGS \(\\Flagged\)\)
+S: \* 1 FETCH \(FLAGS \(\\Flagged \\Recent\)\)
+S: \* 2 FETCH \(FLAGS \(\\Flagged \\Recent\)\)
+S: \* 3 FETCH \(FLAGS \(\\Flagged \\Recent\)\)
+S: \* 4 FETCH \(FLAGS \(\\Flagged \\Recent\)\)
+S: \* 5 FETCH \(FLAGS \(\\Flagged \\Recent\)\)
+S: \* 6 FETCH \(FLAGS \(\\Flagged \\Recent\)\)
+S: \* 7 FETCH \(FLAGS \(\\Flagged \\Recent\)\)
+S: \* 8 FETCH \(FLAGS \(\\Flagged \\Recent\)\)
+S: \* 9 FETCH \(FLAGS \(\\Flagged \\Recent\)\)
S: A83 OK STORE completed\.
C: A84 STORE 1:4 +FLAGS (\ANSWERED)
-S: \* 1 FETCH \(FLAGS \(\\Answered \\Flagged\)\)
-S: \* 2 FETCH \(FLAGS \(\\Answered \\Flagged\)\)
-S: \* 3 FETCH \(FLAGS \(\\Answered \\Flagged\)\)
-S: \* 4 FETCH \(FLAGS \(\\Answered \\Flagged\)\)
+S: \* 1 FETCH \(FLAGS \(\\Answered \\Flagged \\Recent\)\)
+S: \* 2 FETCH \(FLAGS \(\\Answered \\Flagged \\Recent\)\)
+S: \* 3 FETCH \(FLAGS \(\\Answered \\Flagged \\Recent\)\)
+S: \* 4 FETCH \(FLAGS \(\\Answered \\Flagged \\Recent\)\)
S: A84 OK STORE completed\.
C: A85 STORE 10:14 +FLAGS (\ANSWERED)
-S: \* 10 FETCH \(FLAGS \(\\Answered\)\)
-S: \* 11 FETCH \(FLAGS \(\\Answered\)\)
-S: \* 12 FETCH \(FLAGS \(\\Answered\)\)
-S: \* 13 FETCH \(FLAGS \(\\Answered\)\)
-S: \* 14 FETCH \(FLAGS \(\\Answered\)\)
+S: \* 10 FETCH \(FLAGS \(\\Answered \\Recent\)\)
+S: \* 11 FETCH \(FLAGS \(\\Answered \\Recent\)\)
+S: \* 12 FETCH \(FLAGS \(\\Answered \\Recent\)\)
+S: \* 13 FETCH \(FLAGS \(\\Answered \\Recent\)\)
+S: \* 14 FETCH \(FLAGS \(\\Answered \\Recent\)\)
S: A85 OK STORE completed\.
C: A86 STORE 1:2 +FLAGS (\SEEN)
-S: \* 1 FETCH \(FLAGS \(\\Answered \\Flagged \\Seen\)\)
-S: \* 2 FETCH \(FLAGS \(\\Answered \\Flagged \\Seen\)\)
+S: \* 1 FETCH \(FLAGS \(\\Answered \\Flagged \\Recent \\Seen\)\)
+S: \* 2 FETCH \(FLAGS \(\\Answered \\Flagged \\Recent \\Seen\)\)
S: A86 OK STORE completed\.
C: A87 STORE 5:7 +FLAGS (\SEEN)
-S: \* 5 FETCH \(FLAGS \(\\Flagged \\Seen\)\)
-S: \* 6 FETCH \(FLAGS \(\\Flagged \\Seen\)\)
-S: \* 7 FETCH \(FLAGS \(\\Flagged \\Seen\)\)
+S: \* 5 FETCH \(FLAGS \(\\Flagged \\Recent \\Seen\)\)
+S: \* 6 FETCH \(FLAGS \(\\Flagged \\Recent \\Seen\)\)
+S: \* 7 FETCH \(FLAGS \(\\Flagged \\Recent \\Seen\)\)
S: A87 OK STORE completed\.
C: A88 STORE 10:12 +FLAGS (\SEEN)
-S: \* 10 FETCH \(FLAGS \(\\Answered \\Seen\)\)
-S: \* 11 FETCH \(FLAGS \(\\Answered \\Seen\)\)
-S: \* 12 FETCH \(FLAGS \(\\Answered \\Seen\)\)
+S: \* 10 FETCH \(FLAGS \(\\Answered \\Recent \\Seen\)\)
+S: \* 11 FETCH \(FLAGS \(\\Answered \\Recent \\Seen\)\)
+S: \* 12 FETCH \(FLAGS \(\\Answered \\Recent \\Seen\)\)
S: A88 OK STORE completed\.
C: A89 STORE 15:17 +FLAGS (\SEEN)
-S: \* 15 FETCH \(FLAGS \(\\Seen\)\)
-S: \* 16 FETCH \(FLAGS \(\\Seen\)\)
-S: \* 17 FETCH \(FLAGS \(\\Seen\)\)
+S: \* 15 FETCH \(FLAGS \(\\Recent \\Seen\)\)
+S: \* 16 FETCH \(FLAGS \(\\Recent \\Seen\)\)
+S: \* 17 FETCH \(FLAGS \(\\Recent \\Seen\)\)
S: A89 OK STORE completed\.
C: A90 STORE 1 +FLAGS (\DRAFT)
-S: \* 1 FETCH \(FLAGS \(\\Answered \\Draft \\Flagged \\Seen\)\)
+S: \* 1 FETCH \(FLAGS \(\\Answered \\Draft \\Flagged \\Recent \\Seen\)\)
S: A90 OK STORE completed\.
C: A91 STORE 3 +FLAGS (\DRAFT)
-S: \* 3 FETCH \(FLAGS \(\\Answered \\Draft \\Flagged\)\)
+S: \* 3 FETCH \(FLAGS \(\\Answered \\Draft \\Flagged \\Recent\)\)
S: A91 OK STORE completed\.
C: A92 STORE 5 +FLAGS (\DRAFT)
-S: \* 5 FETCH \(FLAGS \(\\Draft \\Flagged \\Seen\)\)
+S: \* 5 FETCH \(FLAGS \(\\Draft \\Flagged \\Recent \\Seen\)\)
S: A92 OK STORE completed\.
C: A93 STORE 7 +FLAGS (\DRAFT)
-S: \* 7 FETCH \(FLAGS \(\\Draft \\Flagged \\Seen\)\)
+S: \* 7 FETCH \(FLAGS \(\\Draft \\Flagged \\Recent \\Seen\)\)
S: A93 OK STORE completed\.
C: A94 STORE 9 +FLAGS (\DRAFT)
-S: \* 9 FETCH \(FLAGS \(\\Draft \\Flagged\)\)
+S: \* 9 FETCH \(FLAGS \(\\Draft \\Flagged \\Recent\)\)
S: A94 OK STORE completed\.
C: A95 STORE 11 +FLAGS (\DRAFT)
-S: \* 11 FETCH \(FLAGS \(\\Answered \\Draft \\Seen\)\)
+S: \* 11 FETCH \(FLAGS \(\\Answered \\Draft \\Recent \\Seen\)\)
S: A95 OK STORE completed\.
C: A96 STORE 13 +FLAGS (\DRAFT)
-S: \* 13 FETCH \(FLAGS \(\\Answered \\Draft\)\)
+S: \* 13 FETCH \(FLAGS \(\\Answered \\Draft \\Recent\)\)
S: A96 OK STORE completed\.
C: A97 STORE 15 +FLAGS (\DRAFT)
-S: \* 15 FETCH \(FLAGS \(\\Draft \\Seen\)\)
+S: \* 15 FETCH \(FLAGS \(\\Draft \\Recent \\Seen\)\)
S: A97 OK STORE completed\.
C: A98 STORE 17 +FLAGS (\DRAFT)
-S: \* 17 FETCH \(FLAGS \(\\Draft \\Seen\)\)
+S: \* 17 FETCH \(FLAGS \(\\Draft \\Recent \\Seen\)\)
S: A98 OK STORE completed\.
C: A99 STORE 1:3 +FLAGS (\DELETED)
-S: \* 1 FETCH \(FLAGS \(\\Answered \\Deleted \\Draft \\Flagged \\Seen\)\)
-S: \* 2 FETCH \(FLAGS \(\\Answered \\Deleted \\Flagged \\Seen\)\)
-S: \* 3 FETCH \(FLAGS \(\\Answered \\Deleted \\Draft \\Flagged\)\)
+S: \* 1 FETCH \(FLAGS \(\\Answered \\Deleted \\Draft \\Flagged \\Recent
\\Seen\)\)
+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 UID SEARCH BODY o UNDRAFT UNFLAGGED ANSWERED
S: \* SEARCH 30 32 34
Modified:
james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/StoreProcessor.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/StoreProcessor.java?rev=642725&r1=642724&r2=642725&view=diff
==============================================================================
---
james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/StoreProcessor.java
(original)
+++
james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/StoreProcessor.java
Sun Mar 30 05:18:19 2008
@@ -30,6 +30,7 @@
import
org.apache.james.api.imap.message.response.imap4rev1.StatusResponseFactory;
import org.apache.james.api.imap.process.ImapProcessor;
import org.apache.james.api.imap.process.ImapSession;
+import org.apache.james.api.imap.process.SelectedImapMailbox;
import org.apache.james.imap.message.request.imap4rev1.StoreRequest;
import org.apache.james.imap.message.response.imap4rev1.FetchResponse;
import org.apache.james.imapserver.processor.base.AbstractImapRequestProcessor;
@@ -85,12 +86,13 @@
for (int i = 0; i < idSet.length; i++) {
final long lowVal;
final long highVal;
+ final SelectedImapMailbox selected = session.getSelected();
if (useUids) {
lowVal = idSet[i].getLowVal();
highVal = idSet[i].getHighVal();
} else {
- lowVal = session.getSelected().uid((int)
idSet[i].getLowVal());
- highVal = session.getSelected().uid((int)
idSet[i].getHighVal());
+ lowVal = selected.uid((int) idSet[i].getLowVal());
+ highVal = selected.uid((int) idSet[i].getHighVal());
}
final GeneralMessageSet messageSet =
GeneralMessageSetImpl.uidRange(lowVal, highVal);
final MailboxSession mailboxSession =
ImapSessionUtils.getMailboxSession(session);
@@ -99,13 +101,17 @@
if (!silent) {
while(it.hasNext()) {
final MessageResult result = (MessageResult) it.next();
- final int msn =
session.getSelected().msn(result.getUid());
+ final long uid = result.getUid();
+ final int msn = selected.msn(uid);
final Flags resultFlags = result.getFlags();
final Long resultUid;
if (useUids) {
- resultUid = new Long(result.getUid());
+ resultUid = new Long(uid);
} else {
resultUid = null;
+ }
+ if (selected.isRecent(uid)) {
+ resultFlags.add(Flags.Flag.RECENT);
}
final FetchResponse response
= new FetchResponse(msn, resultFlags, resultUid,
null, null, null, null, null);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
