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=655092&r1=655091&r2=655092&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 07:15:52 2008 @@ -36,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.ImapMailbox; +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.userrepository.DefaultUser; @@ -241,7 +241,7 @@ final MailboxManager mailboxManager = mailboxManagerProvider.getMailboxManager(); final MailboxSession session = mailboxManager.createSession(); - ImapMailbox inbox = mailboxManager.getImapMailbox(inboxName, true); + Mailbox inbox = mailboxManager.getMailbox(inboxName, true); if (inbox == null) { String error = "Mailbox for user " + username
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=655092&r1=655091&r2=655092&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 Sat May 10 07:15:52 2008 @@ -48,8 +48,7 @@ import org.apache.james.mailboxmanager.SearchQuery.NumericRange; import org.apache.james.mailboxmanager.impl.FetchGroupImpl; import org.apache.james.mailboxmanager.impl.GeneralMessageSetImpl; -import org.apache.james.mailboxmanager.mailbox.AbstractImapMailbox; -import org.apache.james.mailboxmanager.mailbox.ImapMailbox; +import org.apache.james.mailboxmanager.mailbox.Mailbox; import org.apache.james.mailboxmanager.torque.om.MailboxRow; import org.apache.james.mailboxmanager.torque.om.MailboxRowPeer; import org.apache.james.mailboxmanager.torque.om.MessageBody; @@ -60,6 +59,7 @@ import org.apache.james.mailboxmanager.torque.om.MessageRowPeer; import org.apache.james.mailboxmanager.tracking.UidChangeTracker; import org.apache.james.mailboxmanager.tracking.UidRange; +import org.apache.james.mailboxmanager.util.AbstractLogFactoryAware; import org.apache.james.mailboxmanager.util.UidToKeyConverter; import org.apache.james.mailboxmanager.util.UidToKeyConverterImpl; import org.apache.torque.NoRowsException; @@ -72,7 +72,7 @@ import com.sun.mail.util.CRLFOutputStream; import com.workingdogs.village.DataSetException; -public class TorqueMailbox extends AbstractImapMailbox implements ImapMailbox { +public class TorqueMailbox extends AbstractLogFactoryAware implements Mailbox { private boolean open = 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=655092&r1=655091&r2=655092&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 Sat May 10 07:15:52 2008 @@ -41,7 +41,6 @@ import org.apache.james.mailboxmanager.MessageResult.FetchGroup; import org.apache.james.mailboxmanager.impl.FetchGroupImpl; import org.apache.james.mailboxmanager.impl.ListResultImpl; -import org.apache.james.mailboxmanager.mailbox.ImapMailbox; import org.apache.james.mailboxmanager.mailbox.Mailbox; import org.apache.james.mailboxmanager.manager.MailboxExpression; import org.apache.james.mailboxmanager.manager.MailboxManager; @@ -71,14 +70,7 @@ managers = new HashMap(); } - public Mailbox getMailbox(String mailboxName, - boolean autoCreate) throws MailboxManagerException { - - return getImapMailbox(mailboxName, autoCreate); - } - - - public ImapMailbox getImapMailbox(String mailboxName, boolean autoCreate) + public Mailbox getMailbox(String mailboxName, boolean autoCreate) throws MailboxManagerException { if (autoCreate && !existsMailbox(mailboxName)) { getLog().info("autocreated mailbox " + mailboxName); @@ -92,7 +84,7 @@ if (mailboxRow != null) { getLog().debug("Loaded mailbox "+mailboxName); - ImapMailbox torqueMailbox = (ImapMailbox) managers.get(mailboxName); + Mailbox torqueMailbox = (Mailbox) managers.get(mailboxName); if (torqueMailbox == null) { torqueMailbox = new TorqueMailbox(mailboxRow, lock, getLog()); managers.put(mailboxName, torqueMailbox); @@ -213,8 +205,8 @@ } public void copyMessages(GeneralMessageSet set, String from, String to, MailboxSession session) throws MailboxManagerException { - ImapMailbox toMailbox= getImapMailbox(to, false); - ImapMailbox fromMailbox = getImapMailbox(from, false); + Mailbox toMailbox= getMailbox(to, false); + Mailbox fromMailbox = getMailbox(from, false); Iterator it = fromMailbox.getMessages(set, FROM_FETCH_GROUP, session); while (it.hasNext()) { final MessageResult result = (MessageResult) it.next(); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
