Author: rdonkin
Date: Mon Dec 3 12:07:32 2007
New Revision: 600653
URL: http://svn.apache.org/viewvc?rev=600653&view=rev
Log:
Removed session interfaces. Only one instance per mailbox means that session
data will need to be passed in.
Removed:
james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/mailbox/GeneralMailboxSession.java
james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/mailbox/MailboxSession.java
james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/wrapper/SessionMailboxWrapper.java
james/server/trunk/phoenix-deployment/src/test/org/apache/james/mailboxmanager/wrapper/SessionMailboxWrapperTest.java
Modified:
james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/impl/DefaultMailboxManagerProvider.java
james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/mailbox/ImapMailboxSession.java
james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/mailbox/Mailbox.java
james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/manager/MailboxManager.java
james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/manager/MailboxManagerProvider.java
james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/repository/MailboxManagerMailRepository.java
james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/wrapper/FlaggedSessionMailboxWrapper.java
james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/wrapper/NumberStableSessionWrapper.java
james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/base/SelectedMailboxSessionImpl.java
james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/SelectedMailboxSession.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/AbstractMailboxManagerSelfTestCase.java
james/server/trunk/phoenix-deployment/src/test/org/apache/james/mailboxmanager/torque/repository/TorqueMailboxManagerMailRepositoryNativeTestCase.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/TorqueMailbox.java
james/server/trunk/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManager.java
Modified:
james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/impl/DefaultMailboxManagerProvider.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/impl/DefaultMailboxManagerProvider.java?rev=600653&r1=600652&r2=600653&view=diff
==============================================================================
---
james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/impl/DefaultMailboxManagerProvider.java
(original)
+++
james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/impl/DefaultMailboxManagerProvider.java
Mon Dec 3 12:07:32 2007
@@ -31,7 +31,7 @@
import org.apache.james.mailboxmanager.MailboxManagerException;
import org.apache.james.mailboxmanager.Namespace;
import org.apache.james.mailboxmanager.Namespaces;
-import org.apache.james.mailboxmanager.mailbox.MailboxSession;
+import org.apache.james.mailboxmanager.mailbox.Mailbox;
import org.apache.james.mailboxmanager.manager.MailboxManager;
import org.apache.james.mailboxmanager.manager.MailboxManagerProvider;
import org.apache.james.services.User;
@@ -49,8 +49,8 @@
private ServiceManager serviceManager;
- public MailboxSession getInboxSession(User user) throws
MailboxManagerException {
- return
getMailboxManagerInstance().getMailboxSession(getInboxName(user),true);
+ public Mailbox getInbox(User user) throws MailboxManagerException {
+ return getMailboxManagerInstance().getMailbox(getInboxName(user),true);
}
public MailboxManager getMailboxManagerInstance()
@@ -58,9 +58,9 @@
return mailboxManager;
}
- public MailboxSession getMailboxSession(User authUser, String mailboxName,
+ public Mailbox getMailbox(User authUser, String mailboxName,
boolean autoCreate) throws MailboxManagerException {
- return getMailboxManagerInstance().getMailboxSession(
+ return getMailboxManagerInstance().getMailbox(
mailboxName, autoCreate);
}
Modified:
james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/mailbox/ImapMailboxSession.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/mailbox/ImapMailboxSession.java?rev=600653&r1=600652&r2=600653&view=diff
==============================================================================
---
james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/mailbox/ImapMailboxSession.java
(original)
+++
james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/mailbox/ImapMailboxSession.java
Mon Dec 3 12:07:32 2007
@@ -34,5 +34,5 @@
* should only be provided by the session</p>
*/
-public interface ImapMailboxSession extends ImapMailbox, MailboxListener,
GeneralMailboxSession, EventQueueingSessionMailbox {
+public interface ImapMailboxSession extends ImapMailbox, MailboxListener,
EventQueueingSessionMailbox {
}
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=600653&r1=600652&r2=600653&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
Mon Dec 3 12:07:32 2007
@@ -58,4 +58,5 @@
void remove(String key) throws MailboxManagerException;
+ boolean isWriteable();
}
Modified:
james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/manager/MailboxManager.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/manager/MailboxManager.java?rev=600653&r1=600652&r2=600653&view=diff
==============================================================================
---
james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/manager/MailboxManager.java
(original)
+++
james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/manager/MailboxManager.java
Mon Dec 3 12:07:32 2007
@@ -23,9 +23,8 @@
import org.apache.james.mailboxmanager.ListResult;
import org.apache.james.mailboxmanager.MailboxManagerException;
import org.apache.james.mailboxmanager.mailbox.GeneralMailbox;
-import org.apache.james.mailboxmanager.mailbox.GeneralMailboxSession;
import org.apache.james.mailboxmanager.mailbox.ImapMailboxSession;
-import org.apache.james.mailboxmanager.mailbox.MailboxSession;
+import org.apache.james.mailboxmanager.mailbox.Mailbox;
import org.apache.james.services.User;
@@ -74,7 +73,7 @@
* @param mailboxName
* @throws MailboxManagerException
*/
- MailboxSession getMailboxSession(String mailboxName, boolean autoCreate)
+ Mailbox getMailbox(String mailboxName, boolean autoCreate)
throws MailboxManagerException;
/**
@@ -84,7 +83,7 @@
* @throws MailboxManagerException
*/
- GeneralMailboxSession getGeneralMailboxSession(String mailboxName) throws
MailboxManagerException;
+ GeneralMailbox getGeneralMailbox(String mailboxName) throws
MailboxManagerException;
/**
* Gets an session suitable for IMAP.
Modified:
james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/manager/MailboxManagerProvider.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/manager/MailboxManagerProvider.java?rev=600653&r1=600652&r2=600653&view=diff
==============================================================================
---
james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/manager/MailboxManagerProvider.java
(original)
+++
james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/manager/MailboxManagerProvider.java
Mon Dec 3 12:07:32 2007
@@ -22,14 +22,14 @@
import org.apache.james.mailboxmanager.MailboxManagerException;
import org.apache.james.mailboxmanager.Namespace;
import org.apache.james.mailboxmanager.Namespaces;
-import org.apache.james.mailboxmanager.mailbox.MailboxSession;
+import org.apache.james.mailboxmanager.mailbox.Mailbox;
import org.apache.james.services.User;
public interface MailboxManagerProvider {
public MailboxManager getMailboxManagerInstance() throws
MailboxManagerException;
- MailboxSession getInboxSession(User user) throws MailboxManagerException;
+ Mailbox getInbox(User user) throws MailboxManagerException;
/**
* @param authUser the authorized User for checking credentials
@@ -37,7 +37,7 @@
* @throws MailboxManagerException
*/
- MailboxSession getMailboxSession(User authUser, String mailboxName,
+ Mailbox getMailbox(User authUser, String mailboxName,
boolean autoCreate) throws MailboxManagerException;
/**
Modified:
james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/repository/MailboxManagerMailRepository.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/repository/MailboxManagerMailRepository.java?rev=600653&r1=600652&r2=600653&view=diff
==============================================================================
---
james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/repository/MailboxManagerMailRepository.java
(original)
+++
james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/repository/MailboxManagerMailRepository.java
Mon Dec 3 12:07:32 2007
@@ -38,7 +38,6 @@
import org.apache.james.core.MailImpl;
import org.apache.james.mailboxmanager.MailboxManagerException;
import org.apache.james.mailboxmanager.mailbox.Mailbox;
-import org.apache.james.mailboxmanager.mailbox.MailboxSession;
import org.apache.james.mailboxmanager.manager.MailboxManagerProvider;
import org.apache.mailet.Mail;
@@ -309,7 +308,7 @@
class MailboxGateKeeper {
int open = 0;
- MailboxSession mailboxSession = null;
+ Mailbox mailboxSession = null;
synchronized void use() {
open++;
@@ -323,11 +322,6 @@
if (open < 1) {
if (open == 0) {
if (mailboxSession != null) {
- try {
- mailboxSession.close();
- } catch (MailboxManagerException e) {
- getLogger().error("error closing Mailbox", e);
- }
mailboxSession=null;
}
} else {
@@ -342,7 +336,7 @@
throw new RuntimeException("use<1 !");
}
if (mailboxSession == null) {
- mailboxSession = getMailboxManagerProvider().getMailboxSession(
+ mailboxSession = getMailboxManagerProvider().getMailbox(
null, mailboxName, true);
}
return mailboxSession;
Modified:
james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/wrapper/FlaggedSessionMailboxWrapper.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/wrapper/FlaggedSessionMailboxWrapper.java?rev=600653&r1=600652&r2=600653&view=diff
==============================================================================
---
james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/wrapper/FlaggedSessionMailboxWrapper.java
(original)
+++
james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/wrapper/FlaggedSessionMailboxWrapper.java
Mon Dec 3 12:07:32 2007
@@ -19,16 +19,18 @@
package org.apache.james.mailboxmanager.wrapper;
+import java.util.Date;
import java.util.Iterator;
import javax.mail.Flags;
+import javax.mail.internet.MimeMessage;
import org.apache.james.mailboxmanager.GeneralMessageSet;
import org.apache.james.mailboxmanager.MailboxManagerException;
import org.apache.james.mailboxmanager.MessageResult;
import org.apache.james.mailboxmanager.mailbox.FlaggedMailbox;
-public class FlaggedSessionMailboxWrapper extends SessionMailboxWrapper {
+public class FlaggedSessionMailboxWrapper extends NumberStableSessionWrapper {
public FlaggedSessionMailboxWrapper(FlaggedMailbox flaggedMailbox) throws
MailboxManagerException {
super(flaggedMailbox);
@@ -61,5 +63,48 @@
public Iterator setFlags(Flags flags, boolean value, boolean replace,
GeneralMessageSet set, int result) throws MailboxManagerException {
final Iterator results = ((FlaggedMailbox) mailbox).setFlags(flags,
value, replace,toUidSet(set), result);
return addMsn(results);
+ }
+
+ public MessageResult appendMessage(MimeMessage message, Date internalDate,
+ int result) throws MailboxManagerException {
+ return addMsnResult(mailbox.appendMessage(message, internalDate,
noMsnResult(result)),result);
+ }
+
+ public int getMessageCount() throws MailboxManagerException {
+ return mailbox.getMessageCount();
+ }
+
+ public int getMessageResultTypes() {
+ return mailbox.getMessageResultTypes() | MessageResult.MSN;
+ }
+
+ public Iterator getMessages(GeneralMessageSet set, int result)
+ throws MailboxManagerException {
+ return addMsn(mailbox.getMessages(toUidSet(set),
+ noMsnResult(result)));
+ }
+
+ public int getMessageSetTypes() {
+ return mailbox.getMessageSetTypes() | GeneralMessageSet.TYPE_MSN;
+ }
+
+ public String getName() throws MailboxManagerException {
+ return mailbox.getName();
+ }
+
+ public MessageResult updateMessage(GeneralMessageSet messageSet,
MimeMessage message, int result) throws MailboxManagerException {
+ return addMsnResult(mailbox.updateMessage(toUidSet(messageSet),
message, noMsnResult(result)),result);
+ }
+
+ public boolean isWriteable() {
+ return true;
+ }
+
+ public void remove(GeneralMessageSet set) throws MailboxManagerException {
+ mailbox.remove(toUidSet(set));
+ }
+
+ public long getSessionId() {
+ return mailbox.getSessionId();
}
}
Modified:
james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/wrapper/NumberStableSessionWrapper.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/wrapper/NumberStableSessionWrapper.java?rev=600653&r1=600652&r2=600653&view=diff
==============================================================================
---
james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/wrapper/NumberStableSessionWrapper.java
(original)
+++
james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/wrapper/NumberStableSessionWrapper.java
Mon Dec 3 12:07:32 2007
@@ -330,5 +330,9 @@
MailboxListener getListenerObject() {
return eventDispatcher;
}
+
+ public boolean isWriteable() {
+ return true;
+ }
}
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=600653&r1=600652&r2=600653&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
Mon Dec 3 12:07:32 2007
@@ -62,13 +62,6 @@
*/
public void deselect() {
mailbox.removeListener(events);
- try {
- mailbox.close();
- } catch (MailboxManagerException e) {
- final Logger logger = getLogger();
- logger.warn("Cannot close selected mailbox" + e.getMessage());
- logger.debug("Failed to close selected mailbox. Deselection will
continue.", e);
- }
mailbox = null;
}
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=600653&r1=600652&r2=600653&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
Mon Dec 3 12:07:32 2007
@@ -72,7 +72,6 @@
public void close() throws MailboxManagerException {
mailbox.removeListener(events);
- mailbox.close();
mailbox=null;
}
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=600653&r1=600652&r2=600653&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
Mon Dec 3 12:07:32 2007
@@ -53,7 +53,7 @@
import org.apache.james.mailboxmanager.MailboxManagerException;
import org.apache.james.mailboxmanager.MessageResult;
import org.apache.james.mailboxmanager.impl.GeneralMessageSetImpl;
-import org.apache.james.mailboxmanager.mailbox.GeneralMailboxSession;
+import org.apache.james.mailboxmanager.mailbox.GeneralMailbox;
import org.apache.james.mailboxmanager.mailbox.ImapMailboxSession;
import org.apache.james.mailboxmanager.manager.MailboxExpression;
import org.apache.james.mailboxmanager.manager.MailboxManager;
@@ -94,29 +94,26 @@
}
public void appendMessagesClosed(String folder,MimeMessage[] msgs) throws
MailboxManagerException, MessagingException {
- GeneralMailboxSession mailbox=getImapMailboxSession(folder);
+ GeneralMailbox mailbox=getImapMailboxSession(folder);
for (int i = 0; i < msgs.length; i++) {
msgs[i].setFlags(new Flags(Flags.Flag.RECENT), true);
mailbox.appendMessage(msgs[i],new Date(),MessageResult.NOTHING);
}
- mailbox.close();
}
public long[] addUIDMessagesOpen(String folder,MimeMessage[] msgs) throws
MailboxManagerException, MessagingException {
- GeneralMailboxSession mailbox=getImapMailboxSession(folder);
+ GeneralMailbox mailbox=getImapMailboxSession(folder);
long[] uids=new long[msgs.length];
for (int i = 0; i < msgs.length; i++) {
msgs[i].setFlags(new Flags(Flags.Flag.RECENT), false);
uids[i]=mailbox.appendMessage(msgs[i],new
Date(),MessageResult.UID).getUid();
}
- mailbox.close();
return uids;
}
public long getUidValidity(String folder) throws MailboxManagerException {
ImapMailboxSession mailbox=getImapMailboxSession(folder);
long uidv=mailbox.getUidValidity();
- mailbox.close();
return uidv;
}
@@ -124,31 +121,28 @@
public long getUidNext(String folder) throws MailboxManagerException {
ImapMailboxSession mailbox=getImapMailboxSession(folder);
long uidNext=mailbox.getUidNext();
- mailbox.close();
return uidNext;
}
public MimeMessage[] getMessages(String folder) throws
MailboxManagerException {
- GeneralMailboxSession mailbox=getImapMailboxSession(folder);
+ GeneralMailbox mailbox=getImapMailboxSession(folder);
Iterator iterator
=mailbox.getMessages(GeneralMessageSetImpl.all(),MessageResult.MIME_MESSAGE);
List messages = IteratorUtils.toList(iterator);
MimeMessage[] mms=new MimeMessage[messages.size()];
for (int i = 0; i < messages.size(); i++) {
mms[i]=((MessageResult) messages.get(i)).getMimeMessage();
}
- mailbox.close();
return mms;
}
public long[] getUids(String folder) throws MailboxManagerException {
- GeneralMailboxSession mailbox=getImapMailboxSession(folder);
+ GeneralMailbox mailbox=getImapMailboxSession(folder);
Iterator iterator =
mailbox.getMessages(GeneralMessageSetImpl.all(),MessageResult.UID);
List messages = IteratorUtils.toList(iterator);
long[] uids=new long[messages.size()];
for (int i = 0; i < messages.size(); i++) {
uids[i]=((MessageResult)messages.get(i)).getUid();
}
- mailbox.close();
return uids;
}
@@ -191,7 +185,6 @@
ImapMailboxSession mailbox=getImapMailboxSession(folder);
mailbox.setFlags(new
Flags(Flag.DELETED),true,false,GeneralMessageSetImpl.all(),
MessageResult.NOTHING);
mailbox.expunge(GeneralMessageSetImpl.all(),MessageResult.NOTHING);
- mailbox.close();
}
public BufferedReader handleRequestReader(String s) throws
ProtocolException
{
@@ -276,7 +269,6 @@
public void setFlags(String mailboxName,long fromUid,long toUid,Flags
flags, boolean value, boolean replace) throws MailboxManagerException {
ImapMailboxSession mailbox=getImapMailboxSession(mailboxName);
mailbox.setFlags(flags, value, replace,
GeneralMessageSetImpl.uidRange(fromUid, toUid), MessageResult.NOTHING);
- mailbox.close();
}
private ImapMailboxSession getImapMailboxSession(String mailboxName)
throws MailboxManagerException {
int[] neededSets = new int[] {GeneralMessageSet.TYPE_UID};
Modified:
james/server/trunk/phoenix-deployment/src/test/org/apache/james/mailboxmanager/AbstractMailboxManagerSelfTestCase.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/phoenix-deployment/src/test/org/apache/james/mailboxmanager/AbstractMailboxManagerSelfTestCase.java?rev=600653&r1=600652&r2=600653&view=diff
==============================================================================
---
james/server/trunk/phoenix-deployment/src/test/org/apache/james/mailboxmanager/AbstractMailboxManagerSelfTestCase.java
(original)
+++
james/server/trunk/phoenix-deployment/src/test/org/apache/james/mailboxmanager/AbstractMailboxManagerSelfTestCase.java
Mon Dec 3 12:07:32 2007
@@ -23,7 +23,6 @@
import java.util.Iterator;
import java.util.Set;
-import org.apache.james.mailboxmanager.mailbox.GeneralMailboxSession;
import org.apache.james.mailboxmanager.manager.MailboxExpression;
import org.apache.james.mailboxmanager.manager.MailboxManager;
import org.apache.james.mailboxmanager.manager.MailboxManagerProvider;
Modified:
james/server/trunk/phoenix-deployment/src/test/org/apache/james/mailboxmanager/torque/repository/TorqueMailboxManagerMailRepositoryNativeTestCase.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/phoenix-deployment/src/test/org/apache/james/mailboxmanager/torque/repository/TorqueMailboxManagerMailRepositoryNativeTestCase.java?rev=600653&r1=600652&r2=600653&view=diff
==============================================================================
---
james/server/trunk/phoenix-deployment/src/test/org/apache/james/mailboxmanager/torque/repository/TorqueMailboxManagerMailRepositoryNativeTestCase.java
(original)
+++
james/server/trunk/phoenix-deployment/src/test/org/apache/james/mailboxmanager/torque/repository/TorqueMailboxManagerMailRepositoryNativeTestCase.java
Mon Dec 3 12:07:32 2007
@@ -36,7 +36,7 @@
import org.apache.james.mailboxmanager.MailboxManagerException;
import org.apache.james.mailboxmanager.MessageResult;
import org.apache.james.mailboxmanager.impl.GeneralMessageSetImpl;
-import org.apache.james.mailboxmanager.mailbox.GeneralMailboxSession;
+import org.apache.james.mailboxmanager.mailbox.GeneralMailbox;
import org.apache.james.mailboxmanager.manager.MailboxManager;
import
org.apache.james.mailboxmanager.mock.TorqueMailboxManagerProviderSingleton;
import
org.apache.james.mailboxmanager.redundant.AbstractMailRepositoryNativeTestCase;
@@ -46,7 +46,7 @@
AbstractMailRepositoryNativeTestCase {
private static final String TUSER_INBOX = "#mail.tuser.INBOX";
- GeneralMailboxSession shadowMailbox = null;
+ GeneralMailbox shadowMailbox = null;
protected void configureRepository() throws Exception {
TorqueMailboxManagerProviderSingleton.reset();
@@ -129,7 +129,7 @@
}
- protected GeneralMailboxSession getShadowMailbox() {
+ protected GeneralMailbox getShadowMailbox() {
if (shadowMailbox == null) {
try {
MailboxManager mailboxManager=
TorqueMailboxManagerProviderSingleton
@@ -138,7 +138,7 @@
if (!mailboxManager.existsMailbox(TUSER_INBOX)) {
mailboxManager.createMailbox(TUSER_INBOX);
}
- shadowMailbox =
mailboxManager.getGeneralMailboxSession(TUSER_INBOX);
+ shadowMailbox = mailboxManager.getGeneralMailbox(TUSER_INBOX);
} catch (Exception e) {
throw new RuntimeException(e);
}
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=600653&r1=600652&r2=600653&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
Mon Dec 3 12:07:32 2007
@@ -33,7 +33,7 @@
import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.james.Constants;
-import org.apache.james.mailboxmanager.mailbox.MailboxSession;
+import org.apache.james.mailboxmanager.mailbox.Mailbox;
import org.apache.james.mailboxmanager.manager.MailboxManagerProvider;
import org.apache.james.services.User;
import org.apache.james.userrepository.DefaultUser;
@@ -111,10 +111,8 @@
user=new DefaultUser(recipient.getUser(), null);
MimeMessage localMessage = createMimeMessage(aMail, recipient);
- MailboxSession
mailbox=mailboxManagerProvider.getMailboxSession(user, destinationMailbox,
true);
+ Mailbox mailbox=mailboxManagerProvider.getMailbox(user,
destinationMailbox, true);
mailbox.store(localMessage);
- mailbox.close();
-
delivered = true;
}
catch (MessagingException ex)
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=600653&r1=600652&r2=600653&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
Mon Dec 3 12:07:32 2007
@@ -34,7 +34,7 @@
import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.james.Constants;
-import org.apache.james.mailboxmanager.mailbox.MailboxSession;
+import org.apache.james.mailboxmanager.mailbox.Mailbox;
import org.apache.james.mailboxmanager.manager.MailboxManagerProvider;
import org.apache.james.userrepository.DefaultUser;
import org.apache.jsieve.SieveFactory;
@@ -232,7 +232,7 @@
}
void storeMessageInbox(String username, MimeMessage message) throws
MessagingException {
- MailboxSession inbox = getMailboxManagerProvider().getInboxSession(
+ Mailbox inbox = getMailboxManagerProvider().getInbox(
new DefaultUser(username, null));
if (inbox == null) {
String error = "Mailbox for user " + username
@@ -240,7 +240,6 @@
throw new MessagingException(error);
}
inbox.store(message);
- inbox.close();
}
/**
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=600653&r1=600652&r2=600653&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
Mon Dec 3 12:07:32 2007
@@ -806,5 +806,9 @@
}
return set;
}
+
+ public boolean isWriteable() {
+ return true;
+ }
}
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=600653&r1=600652&r2=600653&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
Mon Dec 3 12:07:32 2007
@@ -38,10 +38,9 @@
import org.apache.james.mailboxmanager.MessageResult;
import org.apache.james.mailboxmanager.impl.ListResultImpl;
import org.apache.james.mailboxmanager.mailbox.GeneralMailbox;
-import org.apache.james.mailboxmanager.mailbox.GeneralMailboxSession;
import org.apache.james.mailboxmanager.mailbox.ImapMailbox;
import org.apache.james.mailboxmanager.mailbox.ImapMailboxSession;
-import org.apache.james.mailboxmanager.mailbox.MailboxSession;
+import org.apache.james.mailboxmanager.mailbox.Mailbox;
import org.apache.james.mailboxmanager.manager.MailboxExpression;
import org.apache.james.mailboxmanager.manager.MailboxManager;
import org.apache.james.mailboxmanager.torque.om.MailboxRow;
@@ -71,7 +70,7 @@
managers = new HashMap();
}
- public MailboxSession getMailboxSession(String mailboxName,
+ public Mailbox getMailbox(String mailboxName,
boolean autoCreate) throws MailboxManagerException {
if (autoCreate && !existsMailbox(mailboxName)) {
getLog().info("autocreated mailbox " + mailboxName);
@@ -82,7 +81,7 @@
- public GeneralMailboxSession getGeneralMailboxSession(String mailboxName)
+ public GeneralMailbox getGeneralMailbox(String mailboxName)
throws MailboxManagerException {
return getImapMailboxSession(mailboxName);
}
@@ -201,7 +200,7 @@
}
public void copyMessages(GeneralMailbox from, GeneralMessageSet set,
String to) throws MailboxManagerException {
- GeneralMailboxSession
toMailbox=(GeneralMailboxSession)getGeneralMailboxSession(to);
+ GeneralMailbox toMailbox=(GeneralMailbox)getGeneralMailbox(to);
Iterator it = from.getMessages(set, MessageResult.MIME_MESSAGE |
MessageResult.INTERNAL_DATE);
while (it.hasNext()) {
@@ -209,8 +208,6 @@
final MimeMessage mimeMessage = result.getMimeMessage();
toMailbox.appendMessage(mimeMessage, result.getInternalDate(),
MessageResult.NOTHING);
}
-
- toMailbox.close();
}
public ListResult[] list(final MailboxExpression mailboxExpression) throws
MailboxManagerException {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
