Author: rdonkin
Date: Sat May 10 04:17:20 2008
New Revision: 655047
URL: http://svn.apache.org/viewvc?rev=655047&view=rev
Log:
Remove mail repository methods to consolidate on a more concise interface.
Removed:
james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/repository/
james/server/trunk/phoenix-deployment/src/test/org/apache/james/mailboxmanager/repository/MailboxManagerMailRepositoryTest.java
james/server/trunk/phoenix-deployment/src/test/org/apache/james/mailboxmanager/torque/repository/TorqueMailboxManagerMailRepositoryNativeTestCase.java
Modified:
james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/mailbox/ImapMailbox.java
james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/mailbox/Mailbox.java
james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/mailets/sieve/Actions.java
james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/mailets/sieve/SieveToMultiMailbox.java
james/server/trunk/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/MessageRowUtils.java
Modified:
james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/mailbox/ImapMailbox.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/mailbox/ImapMailbox.java?rev=655047&r1=655046&r2=655047&view=diff
==============================================================================
---
james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/mailbox/ImapMailbox.java
(original)
+++
james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/mailbox/ImapMailbox.java
Sat May 10 04:17:20 2008
@@ -136,6 +136,7 @@
* James delivery? Should we use MimeMessage.getReceivedDate()?
* @param fetchGroup
* which fields to be returned in MessageResult
+ * or null for minimal fetch group only
* @param mailboxSession TODO
* @return MessageResult with the fields defined by <b>result</b>
* <ul>
Modified:
james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/mailbox/Mailbox.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/mailbox/Mailbox.java?rev=655047&r1=655046&r2=655047&view=diff
==============================================================================
---
james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/mailbox/Mailbox.java
(original)
+++
james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/mailbox/Mailbox.java
Sat May 10 04:17:20 2008
@@ -39,17 +39,5 @@
int getMessageCount(MailboxSession mailboxSession) throws
MailboxManagerException;
- /** @param mailboxSession TODO
- * @return the key */
- String store(MimeMessage message, MailboxSession mailboxSession) throws
MailboxManagerException;
-
- /** @param mailboxSession TODO
- * @return keys */
- Collection list(MailboxSession mailboxSession) throws
MailboxManagerException;
-
- MimeMessage retrieve(String key, MailboxSession mailboxSession) throws
MailboxManagerException;
-
- void remove(String key, MailboxSession mailboxSession) throws
MailboxManagerException;
-
boolean isWriteable();
}
Modified:
james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/mailets/sieve/Actions.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/mailets/sieve/Actions.java?rev=655047&r1=655046&r2=655047&view=diff
==============================================================================
---
james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/mailets/sieve/Actions.java
(original)
+++
james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/mailets/sieve/Actions.java
Sat May 10 04:17:20 2008
@@ -23,6 +23,7 @@
import java.net.UnknownHostException;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.Date;
import javax.mail.Address;
import javax.mail.MessagingException;
@@ -34,7 +35,7 @@
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.james.Constants;
import org.apache.james.mailboxmanager.MailboxSession;
-import org.apache.james.mailboxmanager.mailbox.Mailbox;
+import org.apache.james.mailboxmanager.mailbox.ImapMailbox;
import org.apache.james.mailboxmanager.manager.MailboxManager;
import org.apache.james.mailboxmanager.manager.MailboxManagerProvider;
import org.apache.james.services.User;
@@ -122,9 +123,9 @@
mailboxManagerProvider.getPersonalDefaultNamespace(user).getName()
+ destinationMailbox;
final MailboxManager mailboxManager =
mailboxManagerProvider.getMailboxManager();
- Mailbox mailbox=mailboxManager.getImapMailbox(mailboxName, true);
+ ImapMailbox mailbox=mailboxManager.getImapMailbox(mailboxName,
true);
final MailboxSession session = mailboxManager.createSession();
- mailbox.store(localMessage, session);
+ mailbox.appendMessage(localMessage, new Date(), null, session);
session.close();
delivered = true;
}
Modified:
james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/mailets/sieve/SieveToMultiMailbox.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/mailets/sieve/SieveToMultiMailbox.java?rev=655047&r1=655046&r2=655047&view=diff
==============================================================================
---
james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/mailets/sieve/SieveToMultiMailbox.java
(original)
+++
james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/mailets/sieve/SieveToMultiMailbox.java
Sat May 10 04:17:20 2008
@@ -22,6 +22,7 @@
import java.io.File;
import java.io.FileInputStream;
import java.util.Collection;
+import java.util.Date;
import java.util.Enumeration;
import java.util.Iterator;
import java.util.Vector;
@@ -35,7 +36,7 @@
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.james.Constants;
import org.apache.james.mailboxmanager.MailboxSession;
-import org.apache.james.mailboxmanager.mailbox.Mailbox;
+import org.apache.james.mailboxmanager.mailbox.ImapMailbox;
import org.apache.james.mailboxmanager.manager.MailboxManager;
import org.apache.james.mailboxmanager.manager.MailboxManagerProvider;
import org.apache.james.userrepository.DefaultUser;
@@ -240,14 +241,14 @@
final MailboxManager mailboxManager =
mailboxManagerProvider.getMailboxManager();
final MailboxSession session = mailboxManager.createSession();
- Mailbox inbox = mailboxManager.getImapMailbox(inboxName, true);
+ ImapMailbox inbox = mailboxManager.getImapMailbox(inboxName, true);
if (inbox == null) {
String error = "Mailbox for user " + username
+ " was not found on this server.";
throw new MessagingException(error);
}
- inbox.store(message, session);
+ inbox.appendMessage(message, new Date(), null, session);
session.close();
}
Modified:
james/server/trunk/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/MessageRowUtils.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/MessageRowUtils.java?rev=655047&r1=655046&r2=655047&view=diff
==============================================================================
---
james/server/trunk/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/MessageRowUtils.java
(original)
+++
james/server/trunk/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/MessageRowUtils.java
Sat May 10 04:17:20 2008
@@ -115,55 +115,57 @@
public static MessageResult loadMessageResult(final MessageRow messageRow,
final FetchGroup fetchGroup,
final UidToKeyConverter uidToKeyConverter)
throws TorqueException, MailboxManagerException {
+
MessageResultImpl messageResult = new MessageResultImpl();
messageResult.setUid(messageRow.getUid());
-
- int content = fetchGroup.content();
- if ((content & FetchGroup.MIME_MESSAGE) > 0) {
-
messageResult.setMimeMessage(TorqueMimeMessage.createMessage(messageRow));
- content -= FetchGroup.MIME_MESSAGE;
- }
- if ((content & FetchGroup.FLAGS) > 0) {
- org.apache.james.mailboxmanager.torque.om.MessageFlags messageFlags
- = messageRow.getMessageFlags();
- if (messageFlags!=null) {
- messageResult.setFlags(messageFlags.getFlagsObject());
- }
- content -= FetchGroup.FLAGS;
- }
- if ((content & FetchGroup.SIZE) > 0) {
- messageResult.setSize(messageRow.getSize());
- content -= FetchGroup.SIZE;
- }
- if ((content & FetchGroup.INTERNAL_DATE) > 0) {
- messageResult.setInternalDate(messageRow.getInternalDate());
- content -= FetchGroup.INTERNAL_DATE;
- }
- if ((content & FetchGroup.KEY) > 0) {
- messageResult.setKey(uidToKeyConverter.toKey(messageRow.getUid()));
- content -= FetchGroup.KEY;
- }
- if ((content & FetchGroup.HEADERS) > 0) {
- addHeaders(messageRow, messageResult);
- content -= FetchGroup.HEADERS;
- }
- if ((content & FetchGroup.BODY_CONTENT) > 0) {
- addBody(messageRow, messageResult);
- content -= FetchGroup.BODY_CONTENT;
- }
- if ((content & FetchGroup.FULL_CONTENT) > 0) {
- addFullContent(messageRow, messageResult);
- content -= FetchGroup.FULL_CONTENT;
- }
- if (content != 0) {
- throw new TorqueException("Unsupported result: " + content);
- }
- try {
- addPartContent(fetchGroup, messageRow, messageResult);
- } catch (IOException e) {
- throw new TorqueException("Cannot parse message", e);
- } catch (MimeException e) {
- throw new TorqueException("Cannot parse message", e);
+ if (fetchGroup != null) {
+ int content = fetchGroup.content();
+ if ((content & FetchGroup.MIME_MESSAGE) > 0) {
+
messageResult.setMimeMessage(TorqueMimeMessage.createMessage(messageRow));
+ content -= FetchGroup.MIME_MESSAGE;
+ }
+ if ((content & FetchGroup.FLAGS) > 0) {
+ org.apache.james.mailboxmanager.torque.om.MessageFlags
messageFlags
+ = messageRow.getMessageFlags();
+ if (messageFlags!=null) {
+ messageResult.setFlags(messageFlags.getFlagsObject());
+ }
+ content -= FetchGroup.FLAGS;
+ }
+ if ((content & FetchGroup.SIZE) > 0) {
+ messageResult.setSize(messageRow.getSize());
+ content -= FetchGroup.SIZE;
+ }
+ if ((content & FetchGroup.INTERNAL_DATE) > 0) {
+ messageResult.setInternalDate(messageRow.getInternalDate());
+ content -= FetchGroup.INTERNAL_DATE;
+ }
+ if ((content & FetchGroup.KEY) > 0) {
+
messageResult.setKey(uidToKeyConverter.toKey(messageRow.getUid()));
+ content -= FetchGroup.KEY;
+ }
+ if ((content & FetchGroup.HEADERS) > 0) {
+ addHeaders(messageRow, messageResult);
+ content -= FetchGroup.HEADERS;
+ }
+ if ((content & FetchGroup.BODY_CONTENT) > 0) {
+ addBody(messageRow, messageResult);
+ content -= FetchGroup.BODY_CONTENT;
+ }
+ if ((content & FetchGroup.FULL_CONTENT) > 0) {
+ addFullContent(messageRow, messageResult);
+ content -= FetchGroup.FULL_CONTENT;
+ }
+ if (content != 0) {
+ throw new TorqueException("Unsupported result: " + content);
+ }
+ try {
+ addPartContent(fetchGroup, messageRow, messageResult);
+ } catch (IOException e) {
+ throw new TorqueException("Cannot parse message", e);
+ } catch (MimeException e) {
+ throw new TorqueException("Cannot parse message", e);
+ }
}
return messageResult;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
