Author: rdonkin
Date: Sat Feb 2 02:02:46 2008
New Revision: 617776
URL: http://svn.apache.org/viewvc?rev=617776&view=rev
Log:
Subscription implementation complete
Modified:
james/server/trunk/experimental-seda-imap-function/src/test/resources/org/apache/james/test/functional/imap/scripts/Subscribe.test
james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/UnsubscribeProcessor.java
james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/main/DefaultImapProcessorFactory.java
james/server/trunk/phoenix-deployment/src/test/org/apache/james/experimental/imapserver/ExperimentalAuthenticatedStateTest.java
james/server/trunk/phoenix-deployment/src/test/org/apache/james/experimental/imapserver/ExperimentalSelectedInboxTest.java
Modified:
james/server/trunk/experimental-seda-imap-function/src/test/resources/org/apache/james/test/functional/imap/scripts/Subscribe.test
URL:
http://svn.apache.org/viewvc/james/server/trunk/experimental-seda-imap-function/src/test/resources/org/apache/james/test/functional/imap/scripts/Subscribe.test?rev=617776&r1=617775&r2=617776&view=diff
==============================================================================
---
james/server/trunk/experimental-seda-imap-function/src/test/resources/org/apache/james/test/functional/imap/scripts/Subscribe.test
(original)
+++
james/server/trunk/experimental-seda-imap-function/src/test/resources/org/apache/james/test/functional/imap/scripts/Subscribe.test
Sat Feb 2 02:02:46 2008
@@ -29,63 +29,69 @@
C: a01 LSUB "" "*"
S: a01 OK LSUB completed.
-C: a01 SUBSCRIBE subscribetest
-S: a01 OK SUBSCRIBE completed.
+C: a02 SUBSCRIBE subscribetest
+S: a02 OK SUBSCRIBE completed.
-C: a01 LSUB "" "*"
-S: \* LSUB \(\) \"\.\" subscribetest
-S: a01 OK LSUB completed.
+C: a03 LSUB "" "*"
+S: \* LSUB \(\) \"\.\" \"subscribetest\"
+S: a03 OK LSUB completed.
-C: a01 SUBSCRIBE subscribetest.subfolder
-S: a01 OK SUBSCRIBE completed.
+C: a04 SUBSCRIBE subscribetest.subfolder
+S: a04 OK SUBSCRIBE completed.
-C: a01 SUBSCRIBE subscribetest1.subfolder1
-S: a01 OK SUBSCRIBE completed.
+C: a05 SUBSCRIBE subscribetest1.subfolder1
+S: a05 OK SUBSCRIBE completed.
# LIST All subscribed
-C: a01 LSUB "" "*"
+C: a06 LSUB "" "*"
SUB {
-S: \* LSUB \(\) \"\.\" subscribetest
-S: \* LSUB \(\) \"\.\" subscribetest\.subfolder
-S: \* LSUB \(\) \"\.\" subscribetest1\.subfolder1
+S: \* LSUB \(\) \"\.\" \"subscribetest\"
+S: \* LSUB \(\) \"\.\" \"subscribetest\.subfolder\"
+S: \* LSUB \(\) \"\.\" \"subscribetest1\.subfolder1\"
}
-S: a01 OK LSUB completed.
+S: a06 OK LSUB completed.
# LIST A subset of subscribed
-C: a01 LSUB "subscribetest" "sub*"
-S: \* LSUB \(\) \"\.\" subscribetest\.subfolder
-S: a01 OK LSUB completed.
+C: a07 LSUB "" "subscribetest.sub*"
+S: \* LSUB \(\) \"\.\" \"subscribetest\.subfolder\"
+S: a07 OK LSUB completed.
# Unsubscribe from a parent mailbox, make sure that subscribetest.subfolder is
still subscribed.
-C: a01 UNSUBSCRIBE subscribetest
-S: a01 OK UNSUBSCRIBE completed.
+C: a08 UNSUBSCRIBE subscribetest
+S: a08 OK UNSUBSCRIBE completed.
-C: a01 LSUB "subscribetest" "sub*"
-S: \* LSUB \(\) \"\.\" subscribetest\.subfolder
-S: a01 OK LSUB completed.
+C: a09 LSUB "" "sub*"
+S: \* LSUB \(\) \"\.\" \"subscribetest\.subfolder\"
+S: \* LSUB \(\) \"\.\" \"subscribetest1\.subfolder1\"
+S: a09 OK LSUB completed.
+
+C: b01 LSUB "" "%"
+S: \* LSUB \(\\Noselect\) \"\.\" \"subscribetest\"
+S: \* LSUB \(\\Noselect\) \"\.\" \"subscribetest1\"
+S: b01 OK LSUB completed.
# Attempt to unsubscribe from a mailbox that isn't subscribed
-C: a01 UNSUBSCRIBE subscribetest1
-S: a01 OK UNSUBSCRIBE completed.
+C: a10 UNSUBSCRIBE subscribetest1
+S: a10 OK UNSUBSCRIBE completed.
-C: a01 UNSUBSCRIBE subscribetest.subfolder
-S: a01 OK UNSUBSCRIBE completed.
+C: a11 UNSUBSCRIBE subscribetest.subfolder
+S: a11 OK UNSUBSCRIBE completed.
# LIST All subscribed
-C: a01 LSUB "" "*"
-S: \* LSUB \(\) \"\.\" subscribetest1\.subfolder1
-S: a01 OK LSUB completed.
+C: a12 LSUB "" "*"
+S: \* LSUB \(\) \"\.\" \"subscribetest1\.subfolder1\"
+S: a12 OK LSUB completed.
# Cleanup
-C: a01 UNSUBSCRIBE subscribetest1.subfolder1
-S: a01 OK UNSUBSCRIBE completed.
+C: a13 UNSUBSCRIBE subscribetest1.subfolder1
+S: a13 OK UNSUBSCRIBE completed.
-C: a1 DELETE subscribetest1.subfolder1
-S: a1 OK DELETE completed.
-C: a1 DELETE subscribetest1
-S: a1 OK DELETE completed.
-C: a1 DELETE subscribetest.subfolder
-S: a1 OK DELETE completed.
-C: a1 DELETE subscribetest
-S: a1 OK DELETE completed.
\ No newline at end of file
+C: a14 DELETE subscribetest1.subfolder1
+S: a14 OK DELETE completed.
+C: a15 DELETE subscribetest1
+S: a15 OK DELETE completed.
+C: a16 DELETE subscribetest.subfolder
+S: a16 OK DELETE completed.
+C: a17 DELETE subscribetest
+S: a17 OK DELETE completed.
\ No newline at end of file
Modified:
james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/UnsubscribeProcessor.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/UnsubscribeProcessor.java?rev=617776&r1=617775&r2=617776&view=diff
==============================================================================
---
james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/UnsubscribeProcessor.java
(original)
+++
james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/UnsubscribeProcessor.java
Sat Feb 2 02:02:46 2008
@@ -56,7 +56,7 @@
final User user = ImapSessionUtils.getUser(session);
final String userName = user.getUserName();
try {
- subscriber.subscribe(userName, mailboxName);
+ subscriber.unsubscribe(userName, mailboxName);
unsolicitedResponses(session, responder, false);
okComplete(command, tag, responder);
Modified:
james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/main/DefaultImapProcessorFactory.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/main/DefaultImapProcessorFactory.java?rev=617776&r1=617775&r2=617776&view=diff
==============================================================================
---
james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/main/DefaultImapProcessorFactory.java
(original)
+++
james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/main/DefaultImapProcessorFactory.java
Sat Feb 2 02:02:46 2008
@@ -56,6 +56,7 @@
UserMetaDataRespository userMetaDataRepository) {
setUsersRepository(usersRepository);
setMailboxManagerProvider(mailboxManagerProvider);
+ setUserMetaDataRepository(userMetaDataRepository);
}
public final MailboxManagerProvider getMailboxManagerProvider() {
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=617776&r1=617775&r2=617776&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
Sat Feb 2 02:02:46 2008
@@ -26,11 +26,6 @@
super(HostSystemFactory.createStandardImap());
}
- public void testSubscribeUS() throws Exception {
- // TODO: user is automatically subscribed to INBOX.
- // Check whether this is correct behaviour
- }
-
public void testAppendExpungeUS() throws Exception {
// TODO: EXPUNGE does not return correct flags
}
@@ -38,22 +33,13 @@
public void testListNamespaceUS() throws Exception {
// TODO: root mailbox should be marked as Noselect
}
-
- public void testSubscribeITALY() throws Exception {
-// TODO: \recent flag is returned by FLAGS - specification seems
ambiguoITALY on this
- }
-
+
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 testSubscribeKOREA() throws Exception {
-// TODO: \recent flag is returned by FLAGS - specification seems
ambiguoKOREA on this
}
public void testAppendExpungeKOREA() throws Exception {
Modified:
james/server/trunk/phoenix-deployment/src/test/org/apache/james/experimental/imapserver/ExperimentalSelectedInboxTest.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/phoenix-deployment/src/test/org/apache/james/experimental/imapserver/ExperimentalSelectedInboxTest.java?rev=617776&r1=617775&r2=617776&view=diff
==============================================================================
---
james/server/trunk/phoenix-deployment/src/test/org/apache/james/experimental/imapserver/ExperimentalSelectedInboxTest.java
(original)
+++
james/server/trunk/phoenix-deployment/src/test/org/apache/james/experimental/imapserver/ExperimentalSelectedInboxTest.java
Sat Feb 2 02:02:46 2008
@@ -30,24 +30,12 @@
public void testListNamespaceUS() throws Exception {
//// scriptTest("ListNamespace", Locale.US);
}
-
- public void testSubscribeUS() throws Exception {
- //// scriptTest("Subscribe", Locale.US);
- }
public void testListNamespaceITALY() throws Exception {
// scriptTest("ListNamespace", Locale.ITALY);
}
- public void testSubscribeITALY() throws Exception {
- // scriptTest("Subscribe", Locale.ITALY);
- }
-
public void testListNamespaceKOREA() throws Exception {
// scriptTest("ListNamespace", Locale.KOREA);
- }
-
- public void testSubscribeKOREA() throws Exception {
- // scriptTest("Subscribe", Locale.KOREA);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
