Modified: james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailbox.java URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailbox.java?rev=730395&r1=730394&r2=730395&view=diff ============================================================================== --- james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailbox.java (original) +++ james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailbox.java Wed Dec 31 05:42:24 2008 @@ -38,18 +38,19 @@ import org.apache.commons.collections.IteratorUtils; import org.apache.commons.logging.Log; import org.apache.james.api.imap.AbstractLogEnabled; -import org.apache.james.mailboxmanager.MailboxListener; -import org.apache.james.mailboxmanager.MailboxManagerException; -import org.apache.james.mailboxmanager.MailboxSession; -import org.apache.james.mailboxmanager.MessageRange; -import org.apache.james.mailboxmanager.MessageResult; -import org.apache.james.mailboxmanager.SearchQuery; -import org.apache.james.mailboxmanager.MessageResult.FetchGroup; -import org.apache.james.mailboxmanager.SearchQuery.Criterion; -import org.apache.james.mailboxmanager.SearchQuery.NumericRange; -import org.apache.james.mailboxmanager.impl.FetchGroupImpl; -import org.apache.james.mailboxmanager.impl.UidChangeTracker; -import org.apache.james.mailboxmanager.mailbox.Mailbox; +import org.apache.james.imap.mailbox.Mailbox; +import org.apache.james.imap.mailbox.MailboxListener; +import org.apache.james.imap.mailbox.MailboxException; +import org.apache.james.imap.mailbox.MailboxSession; +import org.apache.james.imap.mailbox.MessageRange; +import org.apache.james.imap.mailbox.MessageResult; +import org.apache.james.imap.mailbox.SearchQuery; +import org.apache.james.imap.mailbox.MessageResult.FetchGroup; +import org.apache.james.imap.mailbox.SearchQuery.Criterion; +import org.apache.james.imap.mailbox.SearchQuery.NumericRange; +import org.apache.james.imap.mailbox.util.FetchGroupImpl; +import org.apache.james.imap.mailbox.util.UidChangeTracker; +import org.apache.james.imap.mailbox.util.UidRange; import org.apache.james.mailboxmanager.torque.om.MailboxRow; import org.apache.james.mailboxmanager.torque.om.MailboxRowPeer; import org.apache.james.mailboxmanager.torque.om.MessageBody; @@ -58,7 +59,6 @@ import org.apache.james.mailboxmanager.torque.om.MessageHeader; import org.apache.james.mailboxmanager.torque.om.MessageRow; import org.apache.james.mailboxmanager.torque.om.MessageRowPeer; -import org.apache.james.mailboxmanager.util.UidRange; import org.apache.torque.NoRowsException; import org.apache.torque.TooManyRowsException; import org.apache.torque.TorqueException; @@ -97,7 +97,7 @@ } public int getMessageCount(MailboxSession mailboxSession) - throws MailboxManagerException { + throws MailboxException { try { lock.readLock().acquire(); try { @@ -105,19 +105,19 @@ try { return getMailboxRow().countMessages(); } catch (Exception e) { - throw new MailboxManagerException(e); + throw new MailboxException(e); } } finally { lock.readLock().release(); } } catch (InterruptedException e) { - throw new MailboxManagerException(e); + throw new MailboxException(e); } } public MessageResult appendMessage(MimeMessage message, Date internalDate, FetchGroup fetchGroup, MailboxSession mailboxSession) - throws MailboxManagerException { + throws MailboxException { try { checkAccess(); @@ -157,14 +157,14 @@ getUidChangeTracker().found(messageResult); return messageResult; } catch (Exception e) { - throw new MailboxManagerException(e); + throw new MailboxException(e); } } else { // mailboxRow==null - throw new MailboxManagerException("Mailbox has been deleted"); + throw new MailboxException("Mailbox has been deleted"); } } catch (InterruptedException e) { - throw new MailboxManagerException(e); + throw new MailboxException(e); } } @@ -232,15 +232,15 @@ } private MailboxRow reserveNextUid() throws InterruptedException, - MailboxManagerException { + MailboxException { final MailboxRow myMailboxRow; try { lock.writeLock().acquire(); myMailboxRow = getMailboxRow().consumeNextUid(); } catch (TorqueException e) { - throw new MailboxManagerException(e); + throw new MailboxException(e); } catch (SQLException e) { - throw new MailboxManagerException(e); + throw new MailboxException(e); } finally { lock.writeLock().release(); } @@ -248,7 +248,7 @@ } private Criteria criteriaForMessageSet(MessageRange set) - throws MailboxManagerException { + throws MailboxException { Criteria criteria = new Criteria(); criteria.addAscendingOrderByColumn(MessageRowPeer.UID); if (set.getType() == MessageRange.TYPE_ALL) { @@ -270,14 +270,14 @@ criteria.add(criterion1); } } else { - throw new MailboxManagerException("Unsupported MessageSet: " + throw new MailboxException("Unsupported MessageSet: " + set.getType()); } return criteria; } public Iterator getMessages(final MessageRange set, FetchGroup fetchGroup, - MailboxSession mailboxSession) throws MailboxManagerException { + MailboxSession mailboxSession) throws MailboxException { try { lock.readLock().acquire(); try { @@ -289,21 +289,21 @@ .getMailboxId()); return getMessages(fetchGroup, range, c); } catch (TorqueException e) { - throw new MailboxManagerException(e); + throw new MailboxException(e); } catch (MessagingException e) { - throw new MailboxManagerException(e); + throw new MailboxException(e); } } finally { lock.readLock().release(); } } catch (InterruptedException e) { - throw new MailboxManagerException(e); + throw new MailboxException(e); } } private TorqueResultIterator getMessages(FetchGroup result, UidRange range, Criteria c) throws TorqueException, MessagingException, - MailboxManagerException { + MailboxException { List rows = MessageRowPeer.doSelectJoinMessageFlags(c); final TorqueResultIterator results = getResults(result, rows); getUidChangeTracker().found(range, results.getMessageFlags()); @@ -319,20 +319,20 @@ } private static UidRange uidRangeForMessageSet(MessageRange set) - throws MailboxManagerException { + throws MailboxException { if (set.getType() == MessageRange.TYPE_UID) { return new UidRange(set.getUidFrom(), set.getUidTo()); } else if (set.getType() == MessageRange.TYPE_ALL) { return new UidRange(1, -1); } else { - throw new MailboxManagerException("unsupported MessageSet: " + throw new MailboxException("unsupported MessageSet: " + set.getType()); } } public MessageResult fillMessageResult(MessageRow messageRow, FetchGroup result) throws TorqueException, MessagingException, - MailboxManagerException { + MailboxException { return MessageRowUtils.loadMessageResult(messageRow, result); } @@ -347,7 +347,7 @@ } public long[] recent(boolean reset, MailboxSession mailboxSession) - throws MailboxManagerException { + throws MailboxException { try { lock.readLock().acquire(); try { @@ -367,12 +367,12 @@ } return results; } catch (TorqueException e) { - throw new MailboxManagerException(e); + throw new MailboxException(e); } finally { lock.readLock().release(); } } catch (InterruptedException e) { - throw new MailboxManagerException(e); + throw new MailboxException(e); } } @@ -389,7 +389,7 @@ } public MessageResult getFirstUnseen(FetchGroup fetchGroup, - MailboxSession mailboxSession) throws MailboxManagerException { + MailboxSession mailboxSession) throws MailboxException { try { lock.readLock().acquire(); try { @@ -420,20 +420,20 @@ return null; } } catch (TorqueException e) { - throw new MailboxManagerException(e); + throw new MailboxException(e); } catch (MessagingException e) { - throw new MailboxManagerException(e); + throw new MailboxException(e); } } finally { lock.readLock().release(); } } catch (InterruptedException e) { - throw new MailboxManagerException(e); + throw new MailboxException(e); } } public int getUnseenCount(MailboxSession mailboxSession) - throws MailboxManagerException { + throws MailboxException { try { lock.readLock().acquire(); try { @@ -443,20 +443,20 @@ new Flags(Flags.Flag.SEEN), false); return count; } catch (TorqueException e) { - throw new MailboxManagerException(e); + throw new MailboxException(e); } catch (DataSetException e) { - throw new MailboxManagerException(e); + throw new MailboxException(e); } } finally { lock.readLock().release(); } } catch (InterruptedException e) { - throw new MailboxManagerException(e); + throw new MailboxException(e); } } public Iterator expunge(MessageRange set, FetchGroup fetchGroup, - MailboxSession mailboxSession) throws MailboxManagerException { + MailboxSession mailboxSession) throws MailboxException { try { lock.writeLock().acquire(); try { @@ -466,12 +466,12 @@ } } catch (InterruptedException e) { - throw new MailboxManagerException(e); + throw new MailboxException(e); } } private Iterator doExpunge(final MessageRange set, FetchGroup fetchGroup) - throws MailboxManagerException { + throws MailboxException { checkAccess(); try { // TODO put this into a serializable transaction @@ -502,7 +502,7 @@ getUidChangeTracker().expunged(uids); return messageResults.iterator(); } catch (Exception e) { - throw new MailboxManagerException(e); + throw new MailboxException(e); } } @@ -518,7 +518,7 @@ public Iterator setFlags(Flags flags, boolean value, boolean replace, MessageRange set, FetchGroup fetchGroup, - MailboxSession mailboxSession) throws MailboxManagerException { + MailboxSession mailboxSession) throws MailboxException { try { lock.writeLock().acquire(); try { @@ -529,13 +529,13 @@ } } catch (InterruptedException e) { - throw new MailboxManagerException(e); + throw new MailboxException(e); } } private Iterator doSetFlags(Flags flags, boolean value, boolean replace, final MessageRange set, FetchGroup fetchGroup, - MailboxSession mailboxSession) throws MailboxManagerException { + MailboxSession mailboxSession) throws MailboxException { checkAccess(); try { // TODO put this into a serializeable transaction @@ -566,18 +566,18 @@ FetchGroup.FLAGS); final TorqueResultIterator resultIterator = new TorqueResultIterator( messageRows, orFetchGroup); - final org.apache.james.mailboxmanager.impl.MessageFlags[] messageFlags = resultIterator + final org.apache.james.imap.mailbox.util.MessageFlags[] messageFlags = resultIterator .getMessageFlags(); tracker.flagsUpdated(messageFlags, mailboxSession.getSessionId()); tracker.found(uidRange, messageFlags); return resultIterator; } catch (Exception e) { - throw new MailboxManagerException(e); + throw new MailboxException(e); } } public void addListener(MailboxListener listener) - throws MailboxManagerException { + throws MailboxException { checkAccess(); tracker.addMailboxListener(listener); } @@ -590,7 +590,7 @@ } public long getUidValidity(MailboxSession mailboxSession) - throws MailboxManagerException { + throws MailboxException { try { lock.readLock().acquire(); try { @@ -602,13 +602,13 @@ } } catch (InterruptedException e) { - throw new MailboxManagerException(e); + throw new MailboxException(e); } } public long getUidNext(MailboxSession mailboxSession) - throws MailboxManagerException { + throws MailboxException { try { lock.readLock().acquire(); try { @@ -622,22 +622,22 @@ mailboxRow.getLastUid()); return getUidChangeTracker().getLastUid() + 1; } else { - throw new MailboxManagerException( + throw new MailboxException( "Mailbox has been deleted"); } } catch (NoRowsException e) { - throw new MailboxManagerException(e); + throw new MailboxException(e); } catch (TooManyRowsException e) { - throw new MailboxManagerException(e); + throw new MailboxException(e); } catch (TorqueException e) { - throw new MailboxManagerException(e); + throw new MailboxException(e); } } finally { lock.readLock().release(); } } catch (InterruptedException e) { - throw new MailboxManagerException(e); + throw new MailboxException(e); } } @@ -660,7 +660,7 @@ } public Iterator search(SearchQuery query, FetchGroup fetchGroup, - MailboxSession mailboxSession) throws MailboxManagerException { + MailboxSession mailboxSession) throws MailboxException { try { lock.readLock().acquire(); try { @@ -688,12 +688,12 @@ return getResults(fetchGroup, filteredMessages); } catch (TorqueException e) { - throw new MailboxManagerException(e); + throw new MailboxException(e); } finally { lock.readLock().release(); } } catch (InterruptedException e) { - throw new MailboxManagerException(e); + throw new MailboxException(e); } } @@ -746,7 +746,7 @@ } public void copyTo(MessageRange set, TorqueMailbox toMailbox, - MailboxSession session) throws MailboxManagerException { + MailboxSession session) throws MailboxException { try { lock.readLock().acquire(); try { @@ -758,20 +758,20 @@ List rows = MessageRowPeer.doSelectJoinMessageFlags(c); toMailbox.copy(rows, session); } catch (TorqueException e) { - throw new MailboxManagerException(e); + throw new MailboxException(e); } catch (MessagingException e) { - throw new MailboxManagerException(e); + throw new MailboxException(e); } } finally { lock.readLock().release(); } } catch (InterruptedException e) { - throw new MailboxManagerException(e); + throw new MailboxException(e); } } private void copy(List rows, MailboxSession session) - throws MailboxManagerException { + throws MailboxException { try { for (Iterator iter = rows.iterator(); iter.hasNext();) { MessageRow fromRow = (MessageRow) iter.next(); @@ -818,11 +818,11 @@ } } } catch (TorqueException e) { - throw new MailboxManagerException(e); + throw new MailboxException(e); } catch (InterruptedException e) { - throw new MailboxManagerException(e); + throw new MailboxException(e); } catch (MessagingException e) { - throw new MailboxManagerException(e); + throw new MailboxException(e); } }
Modified: james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManager.java URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManager.java?rev=730395&r1=730394&r2=730395&view=diff ============================================================================== --- james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManager.java (original) +++ james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManager.java Wed Dec 31 05:42:24 2008 @@ -31,17 +31,17 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.impl.SimpleLog; -import org.apache.james.mailboxmanager.ListResult; -import org.apache.james.mailboxmanager.MailboxExistsException; -import org.apache.james.mailboxmanager.MailboxManagerException; -import org.apache.james.mailboxmanager.MailboxNotFoundException; -import org.apache.james.mailboxmanager.MailboxSession; -import org.apache.james.mailboxmanager.MessageRange; -import org.apache.james.mailboxmanager.impl.ListResultImpl; -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.manager.SubscriptionException; +import org.apache.james.imap.mailbox.ListResult; +import org.apache.james.imap.mailbox.Mailbox; +import org.apache.james.imap.mailbox.MailboxExistsException; +import org.apache.james.imap.mailbox.MailboxException; +import org.apache.james.imap.mailbox.MailboxExpression; +import org.apache.james.imap.mailbox.MailboxManager; +import org.apache.james.imap.mailbox.MailboxNotFoundException; +import org.apache.james.imap.mailbox.MailboxSession; +import org.apache.james.imap.mailbox.MessageRange; +import org.apache.james.imap.mailbox.SubscriptionException; +import org.apache.james.imap.mailbox.util.ListResultImpl; import org.apache.james.mailboxmanager.torque.om.MailboxRow; import org.apache.james.mailboxmanager.torque.om.MailboxRowPeer; import org.apache.torque.TorqueException; @@ -72,12 +72,12 @@ } public Mailbox getMailbox(String mailboxName, boolean autoCreate) - throws MailboxManagerException { + throws MailboxException { return doGetMailbox(mailboxName, autoCreate); } private TorqueMailbox doGetMailbox(String mailboxName, boolean autoCreate) - throws MailboxManagerException { + throws MailboxException { if (autoCreate && !existsMailbox(mailboxName)) { getLog().info("autocreated mailbox " + mailboxName); createMailbox(mailboxName); @@ -105,12 +105,12 @@ } } } catch (TorqueException e) { - throw new MailboxManagerException(e); + throw new MailboxException(e); } } public void createMailbox(String namespaceName) - throws MailboxManagerException { + throws MailboxException { getLog().debug("createMailbox " + namespaceName); final int length = namespaceName.length(); if (length == 0) { @@ -147,7 +147,7 @@ } } - private void doCreate(String namespaceName) throws MailboxManagerException { + private void doCreate(String namespaceName) throws MailboxException { MailboxRow mr = new MailboxRow(); mr.setName(namespaceName); mr.setLastUid(0); @@ -155,12 +155,12 @@ try { mr.save(); } catch (Exception e) { - throw new MailboxManagerException(e); + throw new MailboxException(e); } } public void deleteMailbox(String mailboxName, MailboxSession session) - throws MailboxManagerException { + throws MailboxException { getLog().info("deleteMailbox " + mailboxName); synchronized (mailboxes) { try { @@ -176,13 +176,13 @@ mailbox.deleted(session); } } catch (TorqueException e) { - throw new MailboxManagerException(e); + throw new MailboxException(e); } } } public void renameMailbox(String from, String to) - throws MailboxManagerException { + throws MailboxException { getLog().debug("renameMailbox " + from + " to " + to); try { synchronized (mailboxes) { @@ -221,19 +221,19 @@ } } } catch (TorqueException e) { - throw new MailboxManagerException(e); + throw new MailboxException(e); } } public void copyMessages(MessageRange set, String from, String to, - MailboxSession session) throws MailboxManagerException { + MailboxSession session) throws MailboxException { TorqueMailbox toMailbox = doGetMailbox(to, false); TorqueMailbox fromMailbox = doGetMailbox(from, false); fromMailbox.copyTo(set, toMailbox, session); } public ListResult[] list(final MailboxExpression mailboxExpression) - throws MailboxManagerException { + throws MailboxException { final char localWildcard = mailboxExpression.getLocalWildcard(); final char freeWildcard = mailboxExpression.getFreeWildcard(); final String base = mailboxExpression.getBase(); @@ -269,7 +269,7 @@ Arrays.sort(results); return results; } catch (TorqueException e) { - throw new MailboxManagerException(e); + throw new MailboxException(e); } } @@ -279,7 +279,7 @@ } public boolean existsMailbox(String mailboxName) - throws MailboxManagerException { + throws MailboxException { Criteria c = new Criteria(); c.add(MailboxRowPeer.NAME, mailboxName); CountHelper countHelper = new CountHelper(); @@ -294,24 +294,24 @@ if (count == 1) { return true; } else { - throw new MailboxManagerException("found " + count + throw new MailboxException("found " + count + " mailboxes"); } } } } catch (TorqueException e) { - throw new MailboxManagerException(e); + throw new MailboxException(e); } } - public void deleteEverything() throws MailboxManagerException { + public void deleteEverything() throws MailboxException { try { MailboxRowPeer.doDelete(new Criteria().and( MailboxRowPeer.MAILBOX_ID, new Integer(-1), Criteria.GREATER_THAN)); mailboxes.clear(); } catch (TorqueException e) { - throw new MailboxManagerException(e); + throw new MailboxException(e); } } Modified: james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailboxSession.java URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailboxSession.java?rev=730395&r1=730394&r2=730395&view=diff ============================================================================== --- james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailboxSession.java (original) +++ james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailboxSession.java Wed Dec 31 05:42:24 2008 @@ -19,7 +19,7 @@ package org.apache.james.mailboxmanager.torque; -import org.apache.james.mailboxmanager.MailboxSession; +import org.apache.james.imap.mailbox.MailboxSession; /** * Describes a mailbox session. Modified: james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueResultIterator.java URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueResultIterator.java?rev=730395&r1=730394&r2=730395&view=diff ============================================================================== --- james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueResultIterator.java (original) +++ james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueResultIterator.java Wed Dec 31 05:42:24 2008 @@ -30,11 +30,11 @@ import org.apache.commons.collections.Buffer; import org.apache.commons.collections.BufferUtils; import org.apache.commons.collections.buffer.BoundedFifoBuffer; -import org.apache.james.mailboxmanager.MailboxManagerException; -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.MessageFlags; +import org.apache.james.imap.mailbox.MailboxException; +import org.apache.james.imap.mailbox.MessageResult; +import org.apache.james.imap.mailbox.MessageResult.FetchGroup; +import org.apache.james.imap.mailbox.util.FetchGroupImpl; +import org.apache.james.imap.mailbox.util.MessageFlags; import org.apache.james.mailboxmanager.torque.om.MessageRow; import org.apache.torque.TorqueException; @@ -86,8 +86,8 @@ this.fetchGroup); } catch (TorqueException e) { result = new UnloadedMessageResult(messageRow, - new MailboxManagerException(e)); - } catch (MailboxManagerException e) { + new MailboxException(e)); + } catch (MailboxException e) { result = new UnloadedMessageResult(messageRow, e); } return result; @@ -101,7 +101,7 @@ private static final FetchGroup FETCH_GROUP = new FetchGroupImpl( FetchGroup.INTERNAL_DATE | FetchGroup.SIZE); - private final MailboxManagerException exception; + private final MailboxException exception; private final Date internalDate; @@ -110,7 +110,7 @@ private final long uid; public UnloadedMessageResult(final MessageRow row, - final MailboxManagerException exception) { + final MailboxException exception) { super(); internalDate = row.getInternalDate(); size = row.getSize(); @@ -118,11 +118,11 @@ this.exception = exception; } - public Flags getFlags() throws MailboxManagerException { + public Flags getFlags() throws MailboxException { throw exception; } - public Content getFullContent() throws MailboxManagerException { + public Content getFullContent() throws MailboxException { throw exception; } @@ -138,11 +138,11 @@ return null; } - public Content getBody() throws MailboxManagerException { + public Content getBody() throws MailboxException { throw exception; } - public MimeMessage getMimeMessage() throws MailboxManagerException { + public MimeMessage getMimeMessage() throws MailboxException { throw exception; } @@ -162,7 +162,7 @@ return 0; } - public Iterator headers() throws MailboxManagerException { + public Iterator headers() throws MailboxException { throw exception; } @@ -174,36 +174,36 @@ } public Content getMessageBody(MimePath path) - throws MailboxManagerException { + throws MailboxException { throw exception; } public Content getFullContent(MimePath path) - throws MailboxManagerException { + throws MailboxException { throw exception; } public Iterator iterateHeaders(MimePath path) - throws MailboxManagerException { + throws MailboxException { throw exception; } public Iterator iterateMimeHeaders(MimePath path) - throws MailboxManagerException { + throws MailboxException { throw exception; } - public Content getBody(MimePath path) throws MailboxManagerException { + public Content getBody(MimePath path) throws MailboxException { throw exception; } public Content getMimeBody(MimePath path) - throws MailboxManagerException { + throws MailboxException { throw exception; } public MimeDescriptor getMimeDescriptor() - throws MailboxManagerException { + throws MailboxException { throw exception; } Modified: james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/UserManager.java URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/UserManager.java?rev=730395&r1=730394&r2=730395&view=diff ============================================================================== --- james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/UserManager.java (original) +++ james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/UserManager.java Wed Dec 31 05:42:24 2008 @@ -21,7 +21,7 @@ import java.util.Collection; -import org.apache.james.mailboxmanager.manager.SubscriptionException; +import org.apache.james.imap.mailbox.SubscriptionException; public interface UserManager { Modified: james/protocols/imap/trunk/torque/src/test/java/org/apache/james/mailboxmanager/torque/SearchUtilsMultipartMixedTest.java URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/torque/src/test/java/org/apache/james/mailboxmanager/torque/SearchUtilsMultipartMixedTest.java?rev=730395&r1=730394&r2=730395&view=diff ============================================================================== --- james/protocols/imap/trunk/torque/src/test/java/org/apache/james/mailboxmanager/torque/SearchUtilsMultipartMixedTest.java (original) +++ james/protocols/imap/trunk/torque/src/test/java/org/apache/james/mailboxmanager/torque/SearchUtilsMultipartMixedTest.java Wed Dec 31 05:42:24 2008 @@ -26,7 +26,7 @@ import junit.framework.TestCase; import org.apache.james.api.imap.ImapConstants; -import org.apache.james.mailboxmanager.SearchQuery; +import org.apache.james.imap.mailbox.SearchQuery; import org.apache.james.mailboxmanager.torque.om.MessageBody; import org.apache.james.mailboxmanager.torque.om.MessageHeader; import org.apache.james.mailboxmanager.torque.om.MessageRow; Modified: james/protocols/imap/trunk/torque/src/test/java/org/apache/james/mailboxmanager/torque/SearchUtilsRFC822Test.java URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/torque/src/test/java/org/apache/james/mailboxmanager/torque/SearchUtilsRFC822Test.java?rev=730395&r1=730394&r2=730395&view=diff ============================================================================== --- james/protocols/imap/trunk/torque/src/test/java/org/apache/james/mailboxmanager/torque/SearchUtilsRFC822Test.java (original) +++ james/protocols/imap/trunk/torque/src/test/java/org/apache/james/mailboxmanager/torque/SearchUtilsRFC822Test.java Wed Dec 31 05:42:24 2008 @@ -26,7 +26,7 @@ import junit.framework.TestCase; import org.apache.james.api.imap.ImapConstants; -import org.apache.james.mailboxmanager.SearchQuery; +import org.apache.james.imap.mailbox.SearchQuery; import org.apache.james.mailboxmanager.torque.om.MessageBody; import org.apache.james.mailboxmanager.torque.om.MessageHeader; import org.apache.james.mailboxmanager.torque.om.MessageRow; Modified: james/protocols/imap/trunk/torque/src/test/java/org/apache/james/mailboxmanager/torque/SearchUtilsTest.java URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/torque/src/test/java/org/apache/james/mailboxmanager/torque/SearchUtilsTest.java?rev=730395&r1=730394&r2=730395&view=diff ============================================================================== --- james/protocols/imap/trunk/torque/src/test/java/org/apache/james/mailboxmanager/torque/SearchUtilsTest.java (original) +++ james/protocols/imap/trunk/torque/src/test/java/org/apache/james/mailboxmanager/torque/SearchUtilsTest.java Wed Dec 31 05:42:24 2008 @@ -26,7 +26,7 @@ import javax.mail.Flags; import org.apache.james.api.imap.ImapConstants; -import org.apache.james.mailboxmanager.SearchQuery; +import org.apache.james.imap.mailbox.SearchQuery; import org.apache.james.mailboxmanager.torque.om.MessageFlags; import org.apache.james.mailboxmanager.torque.om.MessageHeader; import org.apache.james.mailboxmanager.torque.om.MessageRow; --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
