You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by rd...@apache.org on 2008/05/18 12:30:41 UTC
svn commit: r657532 - in /james/server/trunk:
imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/base/
imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/
imapserver-function/s...
Author: rdonkin
Date: Sun May 18 03:30:41 2008
New Revision: 657532
URL: http://svn.apache.org/viewvc?rev=657532&view=rev
Log:
Improved name
Added:
james/server/trunk/mailbox-library/src/main/java/org/apache/james/mailboxmanager/MessageRange.java
- copied, changed from r657512, james/server/trunk/mailbox-library/src/main/java/org/apache/james/mailboxmanager/GeneralMessageSet.java
james/server/trunk/mailbox-library/src/main/java/org/apache/james/mailboxmanager/impl/MessageRangeImpl.java
- copied, changed from r657512, james/server/trunk/mailbox-library/src/main/java/org/apache/james/mailboxmanager/impl/GeneralMessageSetImpl.java
Removed:
james/server/trunk/mailbox-library/src/main/java/org/apache/james/mailboxmanager/GeneralMessageSet.java
james/server/trunk/mailbox-library/src/main/java/org/apache/james/mailboxmanager/impl/GeneralMessageSetImpl.java
Modified:
james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/base/SelectedMailboxSessionImpl.java
james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/AbstractMailboxSelectionProcessor.java
james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/CloseProcessor.java
james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/CopyProcessor.java
james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/ExpungeProcessor.java
james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/FetchProcessor.java
james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/StoreProcessor.java
james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/SelectedMailboxSession.java
james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/commands/CloseCommand.java
james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/commands/CopyCommand.java
james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/commands/ExpungeCommand.java
james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/commands/FetchCommand.java
james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/commands/SelectCommand.java
james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/commands/StoreCommand.java
james/server/trunk/mailbox-library/src/main/java/org/apache/james/mailboxmanager/mailbox/Mailbox.java
james/server/trunk/mailbox-library/src/main/java/org/apache/james/mailboxmanager/manager/MailboxManager.java
james/server/trunk/phoenix-deployment/src/test/org/apache/james/imapserver/handler/session/AbstractSessionTest.java
james/server/trunk/phoenix-deployment/src/test/org/apache/james/mailboxmanager/AbstractMailboxSelfTestCase.java
james/server/trunk/phoenix-deployment/src/test/org/apache/james/mailboxmanager/torque/TorqueMailboxTestCase.java
james/server/trunk/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailbox.java
james/server/trunk/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManager.java
Modified: james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/base/SelectedMailboxSessionImpl.java
URL: http://svn.apache.org/viewvc/james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/base/SelectedMailboxSessionImpl.java?rev=657532&r1=657531&r2=657532&view=diff
==============================================================================
--- james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/base/SelectedMailboxSessionImpl.java (original)
+++ james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/base/SelectedMailboxSessionImpl.java Sun May 18 03:30:41 2008
@@ -35,12 +35,12 @@
import org.apache.james.imap.message.response.imap4rev1.FetchResponse;
import org.apache.james.imap.message.response.imap4rev1.RecentResponse;
import org.apache.james.imap.message.response.imap4rev1.status.UntaggedNoResponse;
-import org.apache.james.mailboxmanager.GeneralMessageSet;
+import org.apache.james.mailboxmanager.MessageRange;
import org.apache.james.mailboxmanager.MailboxManagerException;
import org.apache.james.mailboxmanager.MailboxSession;
import org.apache.james.mailboxmanager.MessageResult;
import org.apache.james.mailboxmanager.impl.FetchGroupImpl;
-import org.apache.james.mailboxmanager.impl.GeneralMessageSetImpl;
+import org.apache.james.mailboxmanager.impl.MessageRangeImpl;
import org.apache.james.mailboxmanager.mailbox.Mailbox;
import org.apache.james.mailboxmanager.util.MailboxEventAnalyser;
import org.apache.james.mailboxmanager.util.UidToMsnConverter;
@@ -138,7 +138,7 @@
try {
for (final Iterator it = events.flagUpdateUids(); it.hasNext();) {
Long uid = (Long) it.next();
- GeneralMessageSet messageSet = GeneralMessageSetImpl.oneUid(uid.longValue());
+ MessageRange messageSet = MessageRangeImpl.oneUid(uid.longValue());
addFlagsResponses(responses, useUid, mailbox, messageSet);
}
} catch (MessagingException e) {
@@ -147,7 +147,7 @@
}
}
- private void addFlagsResponses(final List responses, boolean useUid, final Mailbox mailbox, GeneralMessageSet messageSet) throws MailboxManagerException {
+ private void addFlagsResponses(final List responses, boolean useUid, final Mailbox mailbox, MessageRange messageSet) throws MailboxManagerException {
final Iterator it = mailbox.getMessages(messageSet, FetchGroupImpl.FLAGS, mailboxSession);
while (it.hasNext()) {
MessageResult mr = (MessageResult) it.next();
Modified: james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/AbstractMailboxSelectionProcessor.java
URL: http://svn.apache.org/viewvc/james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/AbstractMailboxSelectionProcessor.java?rev=657532&r1=657531&r2=657532&view=diff
==============================================================================
--- james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/AbstractMailboxSelectionProcessor.java (original)
+++ james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/AbstractMailboxSelectionProcessor.java Sun May 18 03:30:41 2008
@@ -46,7 +46,7 @@
import org.apache.james.mailboxmanager.MailboxSession;
import org.apache.james.mailboxmanager.MessageResult;
import org.apache.james.mailboxmanager.impl.FetchGroupImpl;
-import org.apache.james.mailboxmanager.impl.GeneralMessageSetImpl;
+import org.apache.james.mailboxmanager.impl.MessageRangeImpl;
import org.apache.james.mailboxmanager.mailbox.Mailbox;
import org.apache.james.mailboxmanager.manager.MailboxManager;
import org.apache.james.mailboxmanager.manager.MailboxManagerProvider;
@@ -175,7 +175,7 @@
private SelectedImapMailbox createNewSelectedMailbox(final Mailbox mailbox, final MailboxSession mailboxSession,
ImapSession session) throws MailboxManagerException {
final SelectedImapMailbox sessionMailbox;
- final Iterator it = mailbox.getMessages(GeneralMessageSetImpl
+ final Iterator it = mailbox.getMessages(MessageRangeImpl
.all(), FetchGroupImpl.MINIMAL, mailboxSession);
final List uids = new ArrayList();
while(it.hasNext()) {
Modified: james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/CloseProcessor.java
URL: http://svn.apache.org/viewvc/james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/CloseProcessor.java?rev=657532&r1=657531&r2=657532&view=diff
==============================================================================
--- james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/CloseProcessor.java (original)
+++ james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/CloseProcessor.java Sun May 18 03:30:41 2008
@@ -31,7 +31,7 @@
import org.apache.james.mailboxmanager.MailboxManagerException;
import org.apache.james.mailboxmanager.MailboxSession;
import org.apache.james.mailboxmanager.impl.FetchGroupImpl;
-import org.apache.james.mailboxmanager.impl.GeneralMessageSetImpl;
+import org.apache.james.mailboxmanager.impl.MessageRangeImpl;
import org.apache.james.mailboxmanager.mailbox.Mailbox;
public class CloseProcessor extends AbstractImapRequestProcessor {
@@ -50,7 +50,7 @@
if (mailbox.isWriteable()) {
try {
final MailboxSession mailboxSession = ImapSessionUtils.getMailboxSession(session);
- mailbox.expunge(GeneralMessageSetImpl.all(),
+ mailbox.expunge(MessageRangeImpl.all(),
FetchGroupImpl.MINIMAL, mailboxSession);
session.deselect();
// TODO: the following comment was present in the code before
Modified: james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/CopyProcessor.java
URL: http://svn.apache.org/viewvc/james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/CopyProcessor.java?rev=657532&r1=657531&r2=657532&view=diff
==============================================================================
--- james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/CopyProcessor.java (original)
+++ james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/CopyProcessor.java Sun May 18 03:30:41 2008
@@ -31,10 +31,10 @@
import org.apache.james.imap.message.request.imap4rev1.CopyRequest;
import org.apache.james.imapserver.processor.base.AbstractMailboxAwareProcessor;
import org.apache.james.imapserver.processor.base.ImapSessionUtils;
-import org.apache.james.mailboxmanager.GeneralMessageSet;
+import org.apache.james.mailboxmanager.MessageRange;
import org.apache.james.mailboxmanager.MailboxManagerException;
import org.apache.james.mailboxmanager.MailboxSession;
-import org.apache.james.mailboxmanager.impl.GeneralMessageSetImpl;
+import org.apache.james.mailboxmanager.impl.MessageRangeImpl;
import org.apache.james.mailboxmanager.mailbox.Mailbox;
import org.apache.james.mailboxmanager.manager.MailboxManager;
import org.apache.james.mailboxmanager.manager.MailboxManagerProvider;
@@ -76,7 +76,7 @@
highVal = session.getSelected().uid((int)idSet[i].getHighVal());
lowVal = session.getSelected().uid((int)idSet[i].getLowVal());
}
- GeneralMessageSet messageSet = GeneralMessageSetImpl.uidRange(lowVal, highVal);
+ MessageRange messageSet = MessageRangeImpl.uidRange(lowVal, highVal);
final MailboxSession mailboxSession = ImapSessionUtils.getMailboxSession(session);
mailboxManager.copyMessages(messageSet, currentMailbox.getName(),
fullMailboxName, mailboxSession);
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=657532&r1=657531&r2=657532&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 Sun May 18 03:30:41 2008
@@ -35,7 +35,7 @@
import org.apache.james.mailboxmanager.MailboxManagerException;
import org.apache.james.mailboxmanager.MessageResult;
import org.apache.james.mailboxmanager.impl.FetchGroupImpl;
-import org.apache.james.mailboxmanager.impl.GeneralMessageSetImpl;
+import org.apache.james.mailboxmanager.impl.MessageRangeImpl;
import org.apache.james.mailboxmanager.mailbox.Mailbox;
import org.apache.james.mailboxmanager.manager.MailboxManagerProvider;
@@ -57,7 +57,7 @@
no(command, tag, responder, HumanReadableTextKey.MAILBOX_IS_READ_ONLY);
} else {
try {
- final Iterator it = mailbox.expunge(GeneralMessageSetImpl.all(),
+ final Iterator it = mailbox.expunge(MessageRangeImpl.all(),
FetchGroupImpl.MINIMAL, ImapSessionUtils.getMailboxSession(session));
final SelectedImapMailbox mailboxSession = session.getSelected();
if (mailboxSession != null) {
Modified: james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/FetchProcessor.java
URL: http://svn.apache.org/viewvc/james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/FetchProcessor.java?rev=657532&r1=657531&r2=657532&view=diff
==============================================================================
--- james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/FetchProcessor.java (original)
+++ james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/FetchProcessor.java Sun May 18 03:30:41 2008
@@ -51,7 +51,7 @@
import org.apache.james.imapserver.processor.base.AbstractImapRequestProcessor;
import org.apache.james.imapserver.processor.base.ImapSessionUtils;
import org.apache.james.imapserver.store.SimpleMessageAttributes;
-import org.apache.james.mailboxmanager.GeneralMessageSet;
+import org.apache.james.mailboxmanager.MessageRange;
import org.apache.james.mailboxmanager.MailboxManagerException;
import org.apache.james.mailboxmanager.MailboxSession;
import org.apache.james.mailboxmanager.MessageResult;
@@ -60,7 +60,7 @@
import org.apache.james.mailboxmanager.MessageResult.FetchGroup;
import org.apache.james.mailboxmanager.MessageResult.MimePath;
import org.apache.james.mailboxmanager.impl.FetchGroupImpl;
-import org.apache.james.mailboxmanager.impl.GeneralMessageSetImpl;
+import org.apache.james.mailboxmanager.impl.MessageRangeImpl;
import org.apache.james.mailboxmanager.mailbox.Mailbox;
import org.apache.james.mailboxmanager.util.MessageResultUtils;
import org.apache.james.mime4j.field.address.Address;
@@ -104,7 +104,7 @@
highVal = session.getSelected().uid((int)idSet[i].getHighVal());
lowVal = session.getSelected().uid((int) idSet[i].getLowVal());
}
- GeneralMessageSet messageSet = GeneralMessageSetImpl.uidRange(lowVal, highVal);
+ MessageRange messageSet = MessageRangeImpl.uidRange(lowVal, highVal);
final MailboxSession mailboxSession = ImapSessionUtils.getMailboxSession(session);
final Iterator it = mailbox.getMessages(messageSet, resultToFetch, mailboxSession);
while (it.hasNext()) {
@@ -243,7 +243,7 @@
if (fetch.isSetSeen()
&& !resultFlags.contains(Flags.Flag.SEEN)) {
mailbox.setFlags(new Flags(Flags.Flag.SEEN), true, false,
- GeneralMessageSetImpl.oneUid(resultUid), FetchGroupImpl.MINIMAL, mailboxSession);
+ MessageRangeImpl.oneUid(resultUid), FetchGroupImpl.MINIMAL, mailboxSession);
resultFlags.add(Flags.Flag.SEEN);
ensureFlagsResponse = true;
}
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=657532&r1=657531&r2=657532&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 May 18 03:30:41 2008
@@ -35,13 +35,13 @@
import org.apache.james.imap.message.response.imap4rev1.FetchResponse;
import org.apache.james.imapserver.processor.base.AbstractImapRequestProcessor;
import org.apache.james.imapserver.processor.base.ImapSessionUtils;
-import org.apache.james.mailboxmanager.GeneralMessageSet;
+import org.apache.james.mailboxmanager.MessageRange;
import org.apache.james.mailboxmanager.MailboxManagerException;
import org.apache.james.mailboxmanager.MailboxSession;
import org.apache.james.mailboxmanager.MessageResult;
import org.apache.james.mailboxmanager.MessageResult.FetchGroup;
import org.apache.james.mailboxmanager.impl.FetchGroupImpl;
-import org.apache.james.mailboxmanager.impl.GeneralMessageSetImpl;
+import org.apache.james.mailboxmanager.impl.MessageRangeImpl;
import org.apache.james.mailboxmanager.mailbox.Mailbox;
public class StoreProcessor extends AbstractImapRequestProcessor {
@@ -92,7 +92,7 @@
lowVal = selected.uid((int) idSet[i].getLowVal());
highVal = selected.uid((int) idSet[i].getHighVal());
}
- final GeneralMessageSet messageSet = GeneralMessageSetImpl.uidRange(lowVal, highVal);
+ final MessageRange messageSet = MessageRangeImpl.uidRange(lowVal, highVal);
final MailboxSession mailboxSession = ImapSessionUtils.getMailboxSession(session);
final Iterator it = mailbox.setFlags(flags, value,
replace, messageSet, STORE_FETCH_GROUP, mailboxSession);
Modified: james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/SelectedMailboxSession.java
URL: http://svn.apache.org/viewvc/james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/SelectedMailboxSession.java?rev=657532&r1=657531&r2=657532&view=diff
==============================================================================
--- james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/SelectedMailboxSession.java (original)
+++ james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/SelectedMailboxSession.java Sun May 18 03:30:41 2008
@@ -26,11 +26,11 @@
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.commons.collections.IteratorUtils;
-import org.apache.james.mailboxmanager.GeneralMessageSet;
+import org.apache.james.mailboxmanager.MessageRange;
import org.apache.james.mailboxmanager.MailboxManagerException;
import org.apache.james.mailboxmanager.MailboxSession;
import org.apache.james.mailboxmanager.impl.FetchGroupImpl;
-import org.apache.james.mailboxmanager.impl.GeneralMessageSetImpl;
+import org.apache.james.mailboxmanager.impl.MessageRangeImpl;
import org.apache.james.mailboxmanager.mailbox.Mailbox;
import org.apache.james.mailboxmanager.util.MailboxEventAnalyser;
import org.apache.james.mailboxmanager.util.UidToMsnConverter;
@@ -71,7 +71,7 @@
List results = new ArrayList();
for (final Iterator it = events.flagUpdateUids(); it.hasNext();) {
Long uid = (Long) it.next();
- GeneralMessageSet messageSet = GeneralMessageSetImpl.oneUid(uid.longValue());
+ MessageRange messageSet = MessageRangeImpl.oneUid(uid.longValue());
final Iterator messages = mailbox.getMessages(messageSet, FetchGroupImpl.FLAGS, mailboxSession);
results.addAll(IteratorUtils.toList(messages));
}
Modified: james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/commands/CloseCommand.java
URL: http://svn.apache.org/viewvc/james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/commands/CloseCommand.java?rev=657532&r1=657531&r2=657532&view=diff
==============================================================================
--- james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/commands/CloseCommand.java (original)
+++ james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/commands/CloseCommand.java Sun May 18 03:30:41 2008
@@ -26,7 +26,7 @@
import org.apache.james.imapserver.store.MailboxException;
import org.apache.james.mailboxmanager.MailboxManagerException;
import org.apache.james.mailboxmanager.impl.FetchGroupImpl;
-import org.apache.james.mailboxmanager.impl.GeneralMessageSetImpl;
+import org.apache.james.mailboxmanager.impl.MessageRangeImpl;
import org.apache.james.mailboxmanager.mailbox.Mailbox;
/**
@@ -49,7 +49,7 @@
Mailbox mailbox = session.getSelected().getMailbox();
if ( session.getSelected().getMailbox().isWriteable() ) {
try {
- mailbox.expunge(GeneralMessageSetImpl.all(),FetchGroupImpl.MINIMAL, session.getMailboxSession());
+ mailbox.expunge(MessageRangeImpl.all(),FetchGroupImpl.MINIMAL, session.getMailboxSession());
} catch (MailboxManagerException e) {
throw new MailboxException(e);
}
Modified: james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/commands/CopyCommand.java
URL: http://svn.apache.org/viewvc/james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/commands/CopyCommand.java?rev=657532&r1=657531&r2=657532&view=diff
==============================================================================
--- james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/commands/CopyCommand.java (original)
+++ james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/commands/CopyCommand.java Sun May 18 03:30:41 2008
@@ -24,10 +24,10 @@
import org.apache.james.imapserver.ImapSession;
import org.apache.james.imapserver.ProtocolException;
import org.apache.james.imapserver.store.MailboxException;
-import org.apache.james.mailboxmanager.GeneralMessageSet;
+import org.apache.james.mailboxmanager.MessageRange;
import org.apache.james.mailboxmanager.MailboxManagerException;
import org.apache.james.mailboxmanager.MailboxSession;
-import org.apache.james.mailboxmanager.impl.GeneralMessageSetImpl;
+import org.apache.james.mailboxmanager.impl.MessageRangeImpl;
import org.apache.james.mailboxmanager.mailbox.Mailbox;
/**
@@ -79,8 +79,8 @@
lowVal = session.getSelected().uid((int) idSet[i].getLowVal());
highVal = session.getSelected().uid((int) idSet[i].getHighVal());
}
- GeneralMessageSet messageSet
- = GeneralMessageSetImpl.uidRange(lowVal,highVal);
+ MessageRange messageSet
+ = MessageRangeImpl.uidRange(lowVal,highVal);
final MailboxSession mailboxSession = session.getMailboxSession();
session.getMailboxManager().copyMessages(messageSet,currentMailbox.getName(), mailboxName, mailboxSession);
}
Modified: james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/commands/ExpungeCommand.java
URL: http://svn.apache.org/viewvc/james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/commands/ExpungeCommand.java?rev=657532&r1=657531&r2=657532&view=diff
==============================================================================
--- james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/commands/ExpungeCommand.java (original)
+++ james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/commands/ExpungeCommand.java Sun May 18 03:30:41 2008
@@ -26,7 +26,7 @@
import org.apache.james.imapserver.store.MailboxException;
import org.apache.james.mailboxmanager.MailboxManagerException;
import org.apache.james.mailboxmanager.impl.FetchGroupImpl;
-import org.apache.james.mailboxmanager.impl.GeneralMessageSetImpl;
+import org.apache.james.mailboxmanager.impl.MessageRangeImpl;
import org.apache.james.mailboxmanager.mailbox.Mailbox;
/**
@@ -53,7 +53,7 @@
}
try {
- mailbox.expunge(GeneralMessageSetImpl.all(),FetchGroupImpl.MINIMAL, session.getMailboxSession());
+ mailbox.expunge(MessageRangeImpl.all(),FetchGroupImpl.MINIMAL, session.getMailboxSession());
} catch (MailboxManagerException e) {
throw new MailboxException(e);
}
Modified: james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/commands/FetchCommand.java
URL: http://svn.apache.org/viewvc/james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/commands/FetchCommand.java?rev=657532&r1=657531&r2=657532&view=diff
==============================================================================
--- james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/commands/FetchCommand.java (original)
+++ james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/commands/FetchCommand.java Sun May 18 03:30:41 2008
@@ -39,14 +39,14 @@
import org.apache.james.imapserver.SelectedMailboxSession;
import org.apache.james.imapserver.store.MailboxException;
import org.apache.james.imapserver.store.SimpleMessageAttributes;
-import org.apache.james.mailboxmanager.GeneralMessageSet;
+import org.apache.james.mailboxmanager.MessageRange;
import org.apache.james.mailboxmanager.MailboxManagerException;
import org.apache.james.mailboxmanager.MailboxSession;
import org.apache.james.mailboxmanager.MessageResult;
import org.apache.james.mailboxmanager.MessageResult.Content;
import org.apache.james.mailboxmanager.MessageResult.FetchGroup;
import org.apache.james.mailboxmanager.impl.FetchGroupImpl;
-import org.apache.james.mailboxmanager.impl.GeneralMessageSetImpl;
+import org.apache.james.mailboxmanager.impl.MessageRangeImpl;
import org.apache.james.mailboxmanager.mailbox.Mailbox;
import org.apache.james.mailboxmanager.util.MessageResultUtils;
import org.apache.james.mime4j.field.address.Address;
@@ -107,7 +107,7 @@
lowVal = selected.uid((int) idSet[i].getLowVal());
highVal = selected.uid((int) idSet[i].getHighVal());
}
- final GeneralMessageSet messageSet=GeneralMessageSetImpl.uidRange(lowVal,highVal);
+ final MessageRange messageSet=MessageRangeImpl.uidRange(lowVal,highVal);
final Iterator it;
final MailboxSession mailboxSession;
try {
@@ -142,7 +142,7 @@
if (fetch.isSetSeen()
&& !result.getFlags().contains(Flags.Flag.SEEN)) {
mailbox.setFlags(new Flags(Flags.Flag.SEEN), true, false,
- GeneralMessageSetImpl.oneUid(result.getUid()), FetchGroupImpl.MINIMAL, session);
+ MessageRangeImpl.oneUid(result.getUid()), FetchGroupImpl.MINIMAL, session);
result.getFlags().add(Flags.Flag.SEEN);
ensureFlagsResponse = true;
}
Modified: james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/commands/SelectCommand.java
URL: http://svn.apache.org/viewvc/james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/commands/SelectCommand.java?rev=657532&r1=657531&r2=657532&view=diff
==============================================================================
--- james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/commands/SelectCommand.java (original)
+++ james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/commands/SelectCommand.java Sun May 18 03:30:41 2008
@@ -28,7 +28,7 @@
import org.apache.james.mailboxmanager.MailboxManagerException;
import org.apache.james.mailboxmanager.MessageResult;
import org.apache.james.mailboxmanager.impl.FetchGroupImpl;
-import org.apache.james.mailboxmanager.impl.GeneralMessageSetImpl;
+import org.apache.james.mailboxmanager.impl.MessageRangeImpl;
import org.apache.james.mailboxmanager.mailbox.Mailbox;
import java.util.ArrayList;
@@ -94,7 +94,7 @@
private boolean selectMailbox(String mailboxName, ImapSession session, boolean readOnly) throws MailboxException, MailboxManagerException {
Mailbox mailbox = session.getMailboxManager().getMailbox(mailboxName, false);
- final Iterator it = mailbox.getMessages(GeneralMessageSetImpl
+ final Iterator it = mailbox.getMessages(MessageRangeImpl
.all(), FetchGroupImpl.MINIMAL, session.getMailboxSession());
final List uids = new ArrayList();
while(it.hasNext()) {
Modified: james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/commands/StoreCommand.java
URL: http://svn.apache.org/viewvc/james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/commands/StoreCommand.java?rev=657532&r1=657531&r2=657532&view=diff
==============================================================================
--- james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/commands/StoreCommand.java (original)
+++ james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/commands/StoreCommand.java Sun May 18 03:30:41 2008
@@ -25,11 +25,11 @@
import org.apache.james.imapserver.ProtocolException;
import org.apache.james.imapserver.SelectedMailboxSession;
import org.apache.james.imapserver.store.MailboxException;
-import org.apache.james.mailboxmanager.GeneralMessageSet;
+import org.apache.james.mailboxmanager.MessageRange;
import org.apache.james.mailboxmanager.MailboxManagerException;
import org.apache.james.mailboxmanager.MailboxSession;
import org.apache.james.mailboxmanager.impl.FetchGroupImpl;
-import org.apache.james.mailboxmanager.impl.GeneralMessageSetImpl;
+import org.apache.james.mailboxmanager.impl.MessageRangeImpl;
import org.apache.james.mailboxmanager.mailbox.Mailbox;
import javax.mail.Flags;
@@ -99,7 +99,7 @@
lowVal = selected.uid((int) idSet[i].getLowVal());
highVal = selected.uid((int) idSet[i].getHighVal());
}
- final GeneralMessageSet messageSet = GeneralMessageSetImpl
+ final MessageRange messageSet = MessageRangeImpl
.uidRange(lowVal, highVal);
mailbox.setFlags(flags, value, replace, messageSet, FetchGroupImpl.MINIMAL, mailboxSession);
Copied: james/server/trunk/mailbox-library/src/main/java/org/apache/james/mailboxmanager/MessageRange.java (from r657512, james/server/trunk/mailbox-library/src/main/java/org/apache/james/mailboxmanager/GeneralMessageSet.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/mailbox-library/src/main/java/org/apache/james/mailboxmanager/MessageRange.java?p2=james/server/trunk/mailbox-library/src/main/java/org/apache/james/mailboxmanager/MessageRange.java&p1=james/server/trunk/mailbox-library/src/main/java/org/apache/james/mailboxmanager/GeneralMessageSet.java&r1=657512&r2=657532&rev=657532&view=diff
==============================================================================
--- james/server/trunk/mailbox-library/src/main/java/org/apache/james/mailboxmanager/GeneralMessageSet.java (original)
+++ james/server/trunk/mailbox-library/src/main/java/org/apache/james/mailboxmanager/MessageRange.java Sun May 18 03:30:41 2008
@@ -26,7 +26,7 @@
*
*/
-public interface GeneralMessageSet {
+public interface MessageRange {
public static int TYPE_UID=2;
public static int TYPE_ALL=16;
Copied: james/server/trunk/mailbox-library/src/main/java/org/apache/james/mailboxmanager/impl/MessageRangeImpl.java (from r657512, james/server/trunk/mailbox-library/src/main/java/org/apache/james/mailboxmanager/impl/GeneralMessageSetImpl.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/mailbox-library/src/main/java/org/apache/james/mailboxmanager/impl/MessageRangeImpl.java?p2=james/server/trunk/mailbox-library/src/main/java/org/apache/james/mailboxmanager/impl/MessageRangeImpl.java&p1=james/server/trunk/mailbox-library/src/main/java/org/apache/james/mailboxmanager/impl/GeneralMessageSetImpl.java&r1=657512&r2=657532&rev=657532&view=diff
==============================================================================
--- james/server/trunk/mailbox-library/src/main/java/org/apache/james/mailboxmanager/impl/GeneralMessageSetImpl.java (original)
+++ james/server/trunk/mailbox-library/src/main/java/org/apache/james/mailboxmanager/impl/MessageRangeImpl.java Sun May 18 03:30:41 2008
@@ -19,9 +19,9 @@
package org.apache.james.mailboxmanager.impl;
-import org.apache.james.mailboxmanager.GeneralMessageSet;
+import org.apache.james.mailboxmanager.MessageRange;
-public class GeneralMessageSetImpl implements GeneralMessageSet {
+public class MessageRangeImpl implements MessageRange {
private static final int NOT_A_UID = -1;
@@ -32,7 +32,7 @@
private final long uidTo;
- private GeneralMessageSetImpl(final int type, final long uidFrom, final long uidTo) {
+ private MessageRangeImpl(final int type, final long uidFrom, final long uidTo) {
super();
this.type = type;
this.uidFrom = uidFrom;
@@ -52,21 +52,21 @@
}
- public static GeneralMessageSet oneUid(long uid) {
- GeneralMessageSetImpl result = new GeneralMessageSetImpl(TYPE_UID, uid, uid);
+ public static MessageRange oneUid(long uid) {
+ MessageRangeImpl result = new MessageRangeImpl(TYPE_UID, uid, uid);
return result;
}
- public static GeneralMessageSet all() {
- GeneralMessageSetImpl result = new GeneralMessageSetImpl(TYPE_ALL, NOT_A_UID, NOT_A_UID);
+ public static MessageRange all() {
+ MessageRangeImpl result = new MessageRangeImpl(TYPE_ALL, NOT_A_UID, NOT_A_UID);
return result;
}
- public static GeneralMessageSet uidRange(long from, long to) {
+ public static MessageRange uidRange(long from, long to) {
if (to == Long.MAX_VALUE) {
to = NOT_A_UID;
}
- GeneralMessageSetImpl result = new GeneralMessageSetImpl(TYPE_UID, from, to);
+ MessageRangeImpl result = new MessageRangeImpl(TYPE_UID, from, to);
return result;
}
Modified: james/server/trunk/mailbox-library/src/main/java/org/apache/james/mailboxmanager/mailbox/Mailbox.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailbox-library/src/main/java/org/apache/james/mailboxmanager/mailbox/Mailbox.java?rev=657532&r1=657531&r2=657532&view=diff
==============================================================================
--- james/server/trunk/mailbox-library/src/main/java/org/apache/james/mailboxmanager/mailbox/Mailbox.java (original)
+++ james/server/trunk/mailbox-library/src/main/java/org/apache/james/mailboxmanager/mailbox/Mailbox.java Sun May 18 03:30:41 2008
@@ -25,7 +25,7 @@
import javax.mail.Flags;
import javax.mail.internet.MimeMessage;
-import org.apache.james.mailboxmanager.GeneralMessageSet;
+import org.apache.james.mailboxmanager.MessageRange;
import org.apache.james.mailboxmanager.MailboxListener;
import org.apache.james.mailboxmanager.MailboxManagerException;
import org.apache.james.mailboxmanager.MailboxSession;
@@ -112,7 +112,7 @@
* @throws MailboxManagerException
* if anything went wrong
*/
- Iterator expunge(GeneralMessageSet set, FetchGroup fetchGroup, MailboxSession mailboxSession) throws MailboxManagerException;
+ Iterator expunge(MessageRange set, FetchGroup fetchGroup, MailboxSession mailboxSession) throws MailboxManagerException;
/**
@@ -135,7 +135,7 @@
* @throws MailboxManagerException
*/
Iterator setFlags(Flags flags, boolean value, boolean replace,
- GeneralMessageSet set, FetchGroup fetchGroup, MailboxSession mailboxSession) throws MailboxManagerException;
+ MessageRange set, FetchGroup fetchGroup, MailboxSession mailboxSession) throws MailboxManagerException;
/**
* @param internalDate
@@ -172,7 +172,7 @@
* @throws MailboxManagerException
*/
- Iterator getMessages(GeneralMessageSet set, FetchGroup fetchGroup, MailboxSession mailboxSession)
+ Iterator getMessages(MessageRange set, FetchGroup fetchGroup, MailboxSession mailboxSession)
throws MailboxManagerException;
/**
Modified: james/server/trunk/mailbox-library/src/main/java/org/apache/james/mailboxmanager/manager/MailboxManager.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailbox-library/src/main/java/org/apache/james/mailboxmanager/manager/MailboxManager.java?rev=657532&r1=657531&r2=657532&view=diff
==============================================================================
--- james/server/trunk/mailbox-library/src/main/java/org/apache/james/mailboxmanager/manager/MailboxManager.java (original)
+++ james/server/trunk/mailbox-library/src/main/java/org/apache/james/mailboxmanager/manager/MailboxManager.java Sun May 18 03:30:41 2008
@@ -19,7 +19,7 @@
package org.apache.james.mailboxmanager.manager;
-import org.apache.james.mailboxmanager.GeneralMessageSet;
+import org.apache.james.mailboxmanager.MessageRange;
import org.apache.james.mailboxmanager.ListResult;
import org.apache.james.mailboxmanager.MailboxExistsException;
import org.apache.james.mailboxmanager.MailboxManagerException;
@@ -117,7 +117,7 @@
* name of the destination mailbox
* @param session <code>MailboxSession</code>, not null
*/
- void copyMessages(GeneralMessageSet set, String from, String to, MailboxSession session) throws MailboxManagerException;
+ void copyMessages(MessageRange set, String from, String to, MailboxSession session) throws MailboxManagerException;
/**
* TODO: Expression requires parsing. Probably easier for the caller to
Modified: james/server/trunk/phoenix-deployment/src/test/org/apache/james/imapserver/handler/session/AbstractSessionTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/phoenix-deployment/src/test/org/apache/james/imapserver/handler/session/AbstractSessionTest.java?rev=657532&r1=657531&r2=657532&view=diff
==============================================================================
--- james/server/trunk/phoenix-deployment/src/test/org/apache/james/imapserver/handler/session/AbstractSessionTest.java (original)
+++ james/server/trunk/phoenix-deployment/src/test/org/apache/james/imapserver/handler/session/AbstractSessionTest.java Sun May 18 03:30:41 2008
@@ -48,14 +48,14 @@
import org.apache.james.imapserver.client.Command;
import org.apache.james.imapserver.mock.MockImapHandler;
import org.apache.james.imapserver.mock.MockImapHandlerConfigurationData;
-import org.apache.james.mailboxmanager.GeneralMessageSet;
+import org.apache.james.mailboxmanager.MessageRange;
import org.apache.james.mailboxmanager.ListResult;
import org.apache.james.mailboxmanager.MailboxManagerException;
import org.apache.james.mailboxmanager.MailboxSession;
import org.apache.james.mailboxmanager.MessageResult;
import org.apache.james.mailboxmanager.MessageResult.FetchGroup;
import org.apache.james.mailboxmanager.impl.FetchGroupImpl;
-import org.apache.james.mailboxmanager.impl.GeneralMessageSetImpl;
+import org.apache.james.mailboxmanager.impl.MessageRangeImpl;
import org.apache.james.mailboxmanager.mailbox.Mailbox;
import org.apache.james.mailboxmanager.manager.MailboxExpression;
import org.apache.james.mailboxmanager.manager.MailboxManager;
@@ -129,7 +129,7 @@
public MimeMessage[] getMessages(String folder) throws MailboxManagerException {
Mailbox mailbox=getMailbox(folder);
- Iterator iterator =mailbox.getMessages(GeneralMessageSetImpl.all(),FetchGroupImpl.MIME_MESSAGE, mailboxSession);
+ Iterator iterator =mailbox.getMessages(MessageRangeImpl.all(),FetchGroupImpl.MIME_MESSAGE, mailboxSession);
List messages = IteratorUtils.toList(iterator);
MimeMessage[] mms=new MimeMessage[messages.size()];
for (int i = 0; i < messages.size(); i++) {
@@ -140,7 +140,7 @@
public long[] getUids(String folder) throws MailboxManagerException {
Mailbox mailbox=getMailbox(folder);
- Iterator iterator = mailbox.getMessages(GeneralMessageSetImpl.all(),FetchGroupImpl.MINIMAL, mailboxSession);
+ Iterator iterator = mailbox.getMessages(MessageRangeImpl.all(),FetchGroupImpl.MINIMAL, mailboxSession);
List messages = IteratorUtils.toList(iterator);
long[] uids=new long[messages.size()];
for (int i = 0; i < messages.size(); i++) {
@@ -186,8 +186,8 @@
public void deleteAll(String folder) throws MailboxManagerException {
Mailbox mailbox=getMailbox(folder);
- mailbox.setFlags(new Flags(Flag.DELETED),true,false,GeneralMessageSetImpl.all(), FetchGroupImpl.MINIMAL, mailboxSession);
- mailbox.expunge(GeneralMessageSetImpl.all(),FetchGroupImpl.MINIMAL, mailboxSession);
+ mailbox.setFlags(new Flags(Flag.DELETED),true,false,MessageRangeImpl.all(), FetchGroupImpl.MINIMAL, mailboxSession);
+ mailbox.expunge(MessageRangeImpl.all(),FetchGroupImpl.MINIMAL, mailboxSession);
}
public BufferedReader handleRequestReader(String s) throws ProtocolException
{
@@ -271,10 +271,10 @@
public void setFlags(String mailboxName,long fromUid,long toUid,Flags flags, boolean value, boolean replace) throws MailboxManagerException {
Mailbox mailbox=getMailbox(mailboxName);
- mailbox.setFlags(flags, value, replace, GeneralMessageSetImpl.uidRange(fromUid, toUid), FetchGroupImpl.MINIMAL, mailboxSession);
+ mailbox.setFlags(flags, value, replace, MessageRangeImpl.uidRange(fromUid, toUid), FetchGroupImpl.MINIMAL, mailboxSession);
}
private Mailbox getMailbox(String mailboxName) throws MailboxManagerException {
- int[] neededSets = new int[] {GeneralMessageSet.TYPE_UID};
+ int[] neededSets = new int[] {MessageRange.TYPE_UID};
int neededResults= FetchGroup.MIME_MESSAGE + FetchGroup.FLAGS;
Mailbox mailboxSession= mailboxManager.getMailbox(mailboxName, false);
return mailboxSession;
Modified: james/server/trunk/phoenix-deployment/src/test/org/apache/james/mailboxmanager/AbstractMailboxSelfTestCase.java
URL: http://svn.apache.org/viewvc/james/server/trunk/phoenix-deployment/src/test/org/apache/james/mailboxmanager/AbstractMailboxSelfTestCase.java?rev=657532&r1=657531&r2=657532&view=diff
==============================================================================
--- james/server/trunk/phoenix-deployment/src/test/org/apache/james/mailboxmanager/AbstractMailboxSelfTestCase.java (original)
+++ james/server/trunk/phoenix-deployment/src/test/org/apache/james/mailboxmanager/AbstractMailboxSelfTestCase.java Sun May 18 03:30:41 2008
@@ -31,7 +31,7 @@
import org.apache.commons.collections.IteratorUtils;
import org.apache.james.mailboxmanager.impl.FetchGroupImpl;
-import org.apache.james.mailboxmanager.impl.GeneralMessageSetImpl;
+import org.apache.james.mailboxmanager.impl.MessageRangeImpl;
import org.apache.james.mailboxmanager.impl.MailboxListenerCollector;
import org.apache.james.mailboxmanager.mailbox.Mailbox;
import org.apache.james.mailboxmanager.manager.MailboxManager;
@@ -80,8 +80,8 @@
mr=mailbox.getFirstUnseen(FetchGroupImpl.MINIMAL, mailboxSession);
assertNotNull(mr);
assertEquals(6, mr.getUid());
- mailbox.setFlags(new Flags(Flags.Flag.DELETED), true, false, GeneralMessageSetImpl.uidRange(1,3), FetchGroupImpl.MINIMAL, mailboxSession);
- mailbox.expunge(GeneralMessageSetImpl.all(), FetchGroupImpl.MINIMAL, mailboxSession);
+ mailbox.setFlags(new Flags(Flags.Flag.DELETED), true, false, MessageRangeImpl.uidRange(1,3), FetchGroupImpl.MINIMAL, mailboxSession);
+ mailbox.expunge(MessageRangeImpl.all(), FetchGroupImpl.MINIMAL, mailboxSession);
mr=mailbox.getFirstUnseen(FetchGroupImpl.MINIMAL, mailboxSession);
assertNotNull(mr);
assertEquals(6, mr.getUid());
Modified: james/server/trunk/phoenix-deployment/src/test/org/apache/james/mailboxmanager/torque/TorqueMailboxTestCase.java
URL: http://svn.apache.org/viewvc/james/server/trunk/phoenix-deployment/src/test/org/apache/james/mailboxmanager/torque/TorqueMailboxTestCase.java?rev=657532&r1=657531&r2=657532&view=diff
==============================================================================
--- james/server/trunk/phoenix-deployment/src/test/org/apache/james/mailboxmanager/torque/TorqueMailboxTestCase.java (original)
+++ james/server/trunk/phoenix-deployment/src/test/org/apache/james/mailboxmanager/torque/TorqueMailboxTestCase.java Sun May 18 03:30:41 2008
@@ -29,7 +29,7 @@
import org.apache.james.mailboxmanager.MessageResult;
import org.apache.james.mailboxmanager.TestUtil;
import org.apache.james.mailboxmanager.impl.FetchGroupImpl;
-import org.apache.james.mailboxmanager.impl.GeneralMessageSetImpl;
+import org.apache.james.mailboxmanager.impl.MessageRangeImpl;
import org.apache.james.mailboxmanager.impl.MailboxListenerCollector;
import org.apache.james.mailboxmanager.mailbox.Mailbox;
import org.apache.james.mailboxmanager.torque.om.MailboxRow;
@@ -78,7 +78,7 @@
mr = MailboxRowPeer.retrieveByPK(mr.getMailboxId());
assertEquals(1, mr.getLastUid());
- List messageResult=IteratorUtils.toList(torqueMailbox.getMessages(GeneralMessageSetImpl.oneUid(1l),FetchGroupImpl.MIME_MESSAGE, session));
+ List messageResult=IteratorUtils.toList(torqueMailbox.getMessages(MessageRangeImpl.oneUid(1l),FetchGroupImpl.MIME_MESSAGE, session));
assertNotNull(messageResult);
assertEquals(1,messageResult.size());
//((MessageResult)messageResult.get(0)).getMimeMessage().writeTo(System.out);
@@ -86,8 +86,8 @@
Flags f=new Flags();
f.add(Flags.Flag.DELETED);
- torqueMailbox.setFlags(f,true,false, GeneralMessageSetImpl.oneUid(1l), FetchGroupImpl.MINIMAL, session);
- List messageResults=IteratorUtils.toList(torqueMailbox.expunge(GeneralMessageSetImpl.all(),FetchGroupImpl.MINIMAL, session));
+ torqueMailbox.setFlags(f,true,false, MessageRangeImpl.oneUid(1l), FetchGroupImpl.MINIMAL, session);
+ List messageResults=IteratorUtils.toList(torqueMailbox.expunge(MessageRangeImpl.all(),FetchGroupImpl.MINIMAL, session));
assertEquals(1,messageResults.size());
assertEquals(1l,((MessageResult)messageResults.get(0)).getUid());
}
Modified: james/server/trunk/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailbox.java
URL: http://svn.apache.org/viewvc/james/server/trunk/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailbox.java?rev=657532&r1=657531&r2=657532&view=diff
==============================================================================
--- james/server/trunk/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailbox.java (original)
+++ james/server/trunk/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailbox.java Sun May 18 03:30:41 2008
@@ -41,7 +41,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.commons.logging.impl.AvalonLogger;
-import org.apache.james.mailboxmanager.GeneralMessageSet;
+import org.apache.james.mailboxmanager.MessageRange;
import org.apache.james.mailboxmanager.MailboxListener;
import org.apache.james.mailboxmanager.MailboxManagerException;
import org.apache.james.mailboxmanager.MailboxSession;
@@ -234,13 +234,13 @@
return myMailboxRow;
}
- private Criteria criteriaForMessageSet(GeneralMessageSet set)
+ private Criteria criteriaForMessageSet(MessageRange set)
throws MailboxManagerException {
Criteria criteria = new Criteria();
criteria.addAscendingOrderByColumn(MessageRowPeer.UID);
- if (set.getType() == GeneralMessageSet.TYPE_ALL) {
+ if (set.getType() == MessageRange.TYPE_ALL) {
// empty Criteria = everything
- } else if (set.getType() == GeneralMessageSet.TYPE_UID) {
+ } else if (set.getType() == MessageRange.TYPE_UID) {
if (set.getUidFrom() == set.getUidTo()) {
criteria.add(MessageRowPeer.UID, set.getUidFrom());
@@ -261,7 +261,7 @@
return criteria;
}
- public Iterator getMessages(final GeneralMessageSet set, FetchGroup fetchGroup, MailboxSession mailboxSession)
+ public Iterator getMessages(final MessageRange set, FetchGroup fetchGroup, MailboxSession mailboxSession)
throws MailboxManagerException {
try {
lock.readLock().acquire();
@@ -298,11 +298,11 @@
return results;
}
- private static UidRange uidRangeForMessageSet(GeneralMessageSet set)
+ private static UidRange uidRangeForMessageSet(MessageRange set)
throws MailboxManagerException {
- if (set.getType() == GeneralMessageSet.TYPE_UID) {
+ if (set.getType() == MessageRange.TYPE_UID) {
return new UidRange(set.getUidFrom(), set.getUidTo());
- } else if (set.getType() == GeneralMessageSet.TYPE_ALL) {
+ } else if (set.getType() == MessageRange.TYPE_ALL) {
return new UidRange(1, -1);
} else {
throw new MailboxManagerException("unsupported MessageSet: "
@@ -428,7 +428,7 @@
}
}
- public Iterator expunge(GeneralMessageSet set, FetchGroup fetchGroup, MailboxSession mailboxSession)
+ public Iterator expunge(MessageRange set, FetchGroup fetchGroup, MailboxSession mailboxSession)
throws MailboxManagerException {
try {
lock.writeLock().acquire();
@@ -443,7 +443,7 @@
}
}
- private Iterator doExpunge(final GeneralMessageSet set, FetchGroup fetchGroup) throws MailboxManagerException {
+ private Iterator doExpunge(final MessageRange set, FetchGroup fetchGroup) throws MailboxManagerException {
checkAccess();
try {
// TODO put this into a serializable transaction
@@ -485,7 +485,7 @@
}
public Iterator setFlags(Flags flags, boolean value, boolean replace,
- GeneralMessageSet set, FetchGroup fetchGroup, MailboxSession mailboxSession)
+ MessageRange set, FetchGroup fetchGroup, MailboxSession mailboxSession)
throws MailboxManagerException {
try {
lock.writeLock().acquire();
@@ -501,7 +501,7 @@
}
private Iterator doSetFlags(Flags flags, boolean value, boolean replace,
- final GeneralMessageSet set, FetchGroup fetchGroup, MailboxSession mailboxSession) throws MailboxManagerException {
+ final MessageRange set, FetchGroup fetchGroup, MailboxSession mailboxSession) throws MailboxManagerException {
checkAccess();
try {
// TODO put this into a serializeable transaction
Modified: james/server/trunk/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManager.java
URL: http://svn.apache.org/viewvc/james/server/trunk/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManager.java?rev=657532&r1=657531&r2=657532&view=diff
==============================================================================
--- james/server/trunk/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManager.java (original)
+++ james/server/trunk/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManager.java Sun May 18 03:30:41 2008
@@ -31,7 +31,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.commons.logging.impl.SimpleLog;
-import org.apache.james.mailboxmanager.GeneralMessageSet;
+import org.apache.james.mailboxmanager.MessageRange;
import org.apache.james.mailboxmanager.ListResult;
import org.apache.james.mailboxmanager.MailboxExistsException;
import org.apache.james.mailboxmanager.MailboxManagerException;
@@ -204,7 +204,7 @@
}
}
- public void copyMessages(GeneralMessageSet set, String from, String to, MailboxSession session) throws MailboxManagerException {
+ public void copyMessages(MessageRange set, String from, String to, MailboxSession session) throws MailboxManagerException {
Mailbox toMailbox= getMailbox(to, false);
Mailbox fromMailbox = getMailbox(from, false);
Iterator it = fromMailbox.getMessages(set, FROM_FETCH_GROUP, session);
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org