Author: rdonkin
Date: Wed Feb 6 12:09:35 2008
New Revision: 619136
URL: http://svn.apache.org/viewvc?rev=619136&view=rev
Log:
Expunge now works
Modified:
james/server/trunk/experimental-seda-imap-function/src/test/resources/org/apache/james/test/functional/imap/scripts/AppendExpunge.test
james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/ExpungeProcessor.java
james/server/trunk/phoenix-deployment/src/test/org/apache/james/experimental/imapserver/ExperimentalAuthenticatedStateTest.java
Modified:
james/server/trunk/experimental-seda-imap-function/src/test/resources/org/apache/james/test/functional/imap/scripts/AppendExpunge.test
URL:
http://svn.apache.org/viewvc/james/server/trunk/experimental-seda-imap-function/src/test/resources/org/apache/james/test/functional/imap/scripts/AppendExpunge.test?rev=619136&r1=619135&r2=619136&view=diff
==============================================================================
---
james/server/trunk/experimental-seda-imap-function/src/test/resources/org/apache/james/test/functional/imap/scripts/AppendExpunge.test
(original)
+++
james/server/trunk/experimental-seda-imap-function/src/test/resources/org/apache/james/test/functional/imap/scripts/AppendExpunge.test
Wed Feb 6 12:09:35 2008
@@ -20,7 +20,7 @@
S: 10 OK CREATE completed.
C: a001 STATUS appendexpunge (MESSAGES)
-S: \* STATUS appendexpunge \(MESSAGES 0\)
+S: \* STATUS "appendexpunge" \(MESSAGES 0\)
S: a001 OK STATUS completed.
C: A002 APPEND appendexpunge (\Deleted) {310+}
@@ -62,42 +62,44 @@
C:
S: A004 OK APPEND completed.
-C: a1 STATUS appendexpunge (MESSAGES)
-S: \* STATUS appendexpunge \(MESSAGES 3\)
-S: a1 OK STATUS completed.
+C: A005 STATUS appendexpunge (MESSAGES)
+S: \* STATUS "appendexpunge" \(MESSAGES 3\)
+S: A005 OK STATUS completed.
-C: a1 SELECT appendexpunge
+C: A006 SELECT appendexpunge
S: \* FLAGS \(\\Answered \\Deleted \\Draft \\Flagged \\Seen\)
S: \* 3 EXISTS
S: \* \d+ RECENT
S: \* OK \[UIDVALIDITY \d+\]
S: \* OK \[UNSEEN 1\] Message 1 is the first unseen
S: \* OK \[PERMANENTFLAGS \(\\Answered \\Deleted \\Draft \\Flagged \\Seen\)\]
-S: a1 OK \[READ-WRITE\] SELECT completed.
+S: A006 OK \[READ-WRITE\] SELECT completed.
-C: a1 EXPUNGE
+C: A109 STORE 1:2 FLAGS.SILENT (\Deleted)
+S: A109 OK STORE completed.
+
+C: A007 EXPUNGE
S: \* 1 EXPUNGE
S: \* 2 EXPUNGE
-S: a1 OK EXPUNGE completed.
+S: A007 OK EXPUNGE completed.
-C: a1 STATUS appendexpunge (MESSAGES)
-S: \* STATUS appendexpunge \(MESSAGES 1\)
-S: a1 OK STATUS completed.
+C: A008 STATUS appendexpunge (MESSAGES)
+S: \* STATUS "appendexpunge" \(MESSAGES 1\)
+S: A008 OK STATUS completed.
-C: f2 STORE 1 FLAGS.SILENT (\Deleted)
-S: f2 OK STORE completed.
+C: A009 STORE 1 FLAGS.SILENT (\Deleted)
+S: A009 OK STORE completed.
-C: a1 EXPUNGE
+C: A010 EXPUNGE
S: \* 1 EXPUNGE
-S: a1 OK EXPUNGE completed.
-
-C: a1 STATUS appendexpunge (MESSAGES)
-S: \* STATUS appendexpunge \(MESSAGES 0\)
-S: a1 OK STATUS completed.
+S: A010 OK EXPUNGE completed.
-C: a1 DELETE appendexpunge
-S: a1 OK DELETE completed.
+C: A011 STATUS appendexpunge (MESSAGES)
+S: \* STATUS "appendexpunge" \(MESSAGES 0\)
+S: A011 OK STATUS completed.
+C: A012 DELETE appendexpunge
+S: A012 OK DELETE completed.
Modified:
james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/ExpungeProcessor.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/ExpungeProcessor.java?rev=619136&r1=619135&r2=619136&view=diff
==============================================================================
---
james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/ExpungeProcessor.java
(original)
+++
james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/ExpungeProcessor.java
Wed Feb 6 12:09:35 2008
@@ -52,7 +52,6 @@
protected void doProcess(ImapRequest message,
ImapSession session, String tag, ImapCommand command, Responder
responder)
throws MailboxException, AuthorizationException, ProtocolException
{
- final ExpungeRequest request = (ExpungeRequest) message;
ImapMailbox mailbox = ImapSessionUtils.getMailbox(session);
if (!mailbox.isWriteable()) {
no(command, tag, responder,
HumanReadableTextKey.MAILBOX_IS_READ_ONLY);
Modified:
james/server/trunk/phoenix-deployment/src/test/org/apache/james/experimental/imapserver/ExperimentalAuthenticatedStateTest.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/phoenix-deployment/src/test/org/apache/james/experimental/imapserver/ExperimentalAuthenticatedStateTest.java?rev=619136&r1=619135&r2=619136&view=diff
==============================================================================
---
james/server/trunk/phoenix-deployment/src/test/org/apache/james/experimental/imapserver/ExperimentalAuthenticatedStateTest.java
(original)
+++
james/server/trunk/phoenix-deployment/src/test/org/apache/james/experimental/imapserver/ExperimentalAuthenticatedStateTest.java
Wed Feb 6 12:09:35 2008
@@ -26,24 +26,12 @@
super(HostSystemFactory.createStandardImap());
}
- public void testAppendExpungeUS() throws Exception {
-// TODO: EXPUNGE does not return correct flags
- }
-
public void testListNamespaceUS() throws Exception {
// TODO: root mailbox should be marked as Noselect
}
- public void testAppendExpungeITALY() throws Exception {
-// TODO: \recent flag is returned by FLAGS - specification seems
ambiguoITALY on this
- }
-
public void testListNamespaceITALY() throws Exception {
// TODO: root mailbox should be marked as Noselect
- }
-
- public void testAppendExpungeKOREA() throws Exception {
-// TODO: \recent flag is returned by FLAGS - specification seems
ambiguoKOREA on this
}
public void testListNamespaceKOREA() throws Exception {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
