james-server-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nor...@apache.org
Subject svn commit: r993114 [4/4] - in /james/imap/trunk: api/src/main/java/org/apache/james/imap/api/process/ deployment/src/test/java/org/apache/james/imap/functional/ jcr/src/main/java/org/apache/james/imap/jcr/ jcr/src/main/java/org/apache/james/imap/jcr/m...
Date Mon, 06 Sep 2010 18:09:39 GMT
Modified: james/imap/trunk/store/src/main/java/org/apache/james/imap/store/streaming/AbstractFullContent.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/store/src/main/java/org/apache/james/imap/store/streaming/AbstractFullContent.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/store/src/main/java/org/apache/james/imap/store/streaming/AbstractFullContent.java
(original)
+++ james/imap/trunk/store/src/main/java/org/apache/james/imap/store/streaming/AbstractFullContent.java
Mon Sep  6 18:09:32 2010
@@ -24,10 +24,10 @@ import java.nio.channels.WritableByteCha
 import java.util.Iterator;
 import java.util.List;
 
-import org.apache.james.imap.mailbox.Content;
-import org.apache.james.imap.mailbox.MessageResult;
-import org.apache.james.imap.mailbox.MessageResult.Header;
 import org.apache.james.imap.store.ResultUtils;
+import org.apache.james.mailbox.Content;
+import org.apache.james.mailbox.MessageResult;
+import org.apache.james.mailbox.MessageResult.Header;
 
 /**
  * Abstract base class for {@link Content} implementations which hold the headers and 
@@ -59,7 +59,7 @@ public abstract class AbstractFullConten
 
     /*
      * (non-Javadoc)
-     * @see org.apache.james.imap.mailbox.Content#writeTo(java.nio.channels.WritableByteChannel)
+     * @see org.apache.james.mailbox.Content#writeTo(java.nio.channels.WritableByteChannel)
      */
     public final void writeTo(WritableByteChannel channel) throws IOException {
         ByteBuffer newLine = ByteBuffer.wrap(ResultUtils.BYTES_NEW_LINE);

Modified: james/imap/trunk/store/src/main/java/org/apache/james/imap/store/streaming/ByteContent.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/store/src/main/java/org/apache/james/imap/store/streaming/ByteContent.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/store/src/main/java/org/apache/james/imap/store/streaming/ByteContent.java
(original)
+++ james/imap/trunk/store/src/main/java/org/apache/james/imap/store/streaming/ByteContent.java
Mon Sep  6 18:09:32 2010
@@ -26,7 +26,7 @@ import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.nio.channels.WritableByteChannel;
 
-import org.apache.james.imap.mailbox.Content;
+import org.apache.james.mailbox.Content;
 
 public final class ByteContent implements Content {
 
@@ -41,7 +41,7 @@ public final class ByteContent implement
 
     /*
      * (non-Javadoc)
-     * @see org.apache.james.imap.mailbox.Content#size()
+     * @see org.apache.james.mailbox.Content#size()
      */
     public long size() {
         return size;
@@ -49,7 +49,7 @@ public final class ByteContent implement
 
     /*
      * (non-Javadoc)
-     * @see org.apache.james.imap.mailbox.Content#writeTo(java.nio.channels.WritableByteChannel)
+     * @see org.apache.james.mailbox.Content#writeTo(java.nio.channels.WritableByteChannel)
      */
     public void writeTo(WritableByteChannel channel) throws IOException {
         contents.rewind();

Modified: james/imap/trunk/store/src/main/java/org/apache/james/imap/store/streaming/FullByteContent.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/store/src/main/java/org/apache/james/imap/store/streaming/FullByteContent.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/store/src/main/java/org/apache/james/imap/store/streaming/FullByteContent.java
(original)
+++ james/imap/trunk/store/src/main/java/org/apache/james/imap/store/streaming/FullByteContent.java
Mon Sep  6 18:09:32 2010
@@ -27,7 +27,7 @@ import java.nio.ByteBuffer;
 import java.nio.channels.WritableByteChannel;
 import java.util.List;
 
-import org.apache.james.imap.mailbox.MessageResult;
+import org.apache.james.mailbox.MessageResult;
 
 /**
  * Content which holds the full content, including {@link Header} objets
@@ -45,7 +45,7 @@ public final class FullByteContent exten
 
     /*
      * (non-Javadoc)
-     * @see org.apache.james.imap.mailbox.Content#size()
+     * @see org.apache.james.mailbox.Content#size()
      */
     public long size() {
         return size;

Modified: james/imap/trunk/store/src/main/java/org/apache/james/imap/store/streaming/InputStreamContent.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/store/src/main/java/org/apache/james/imap/store/streaming/InputStreamContent.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/store/src/main/java/org/apache/james/imap/store/streaming/InputStreamContent.java
(original)
+++ james/imap/trunk/store/src/main/java/org/apache/james/imap/store/streaming/InputStreamContent.java
Mon Sep  6 18:09:32 2010
@@ -23,7 +23,7 @@ import java.io.InputStream;
 import java.nio.ByteBuffer;
 import java.nio.channels.WritableByteChannel;
 
-import org.apache.james.imap.mailbox.Content;
+import org.apache.james.mailbox.Content;
 
 /**
  * {@link Content} which is stored in a {@link InputStream}
@@ -41,7 +41,7 @@ public final class InputStreamContent im
     
     /*
      * (non-Javadoc)
-     * @see org.apache.james.imap.mailbox.Content#size()
+     * @see org.apache.james.mailbox.Content#size()
      */
     public long size() {
         return size;
@@ -49,7 +49,7 @@ public final class InputStreamContent im
 
     /*
      * (non-Javadoc)
-     * @see org.apache.james.imap.mailbox.Content#writeTo(java.nio.channels.WritableByteChannel)
+     * @see org.apache.james.mailbox.Content#writeTo(java.nio.channels.WritableByteChannel)
      */
     public void writeTo(WritableByteChannel channel) throws IOException {
         

Modified: james/imap/trunk/store/src/main/java/org/apache/james/imap/store/streaming/InputStreamFullContent.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/store/src/main/java/org/apache/james/imap/store/streaming/InputStreamFullContent.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/store/src/main/java/org/apache/james/imap/store/streaming/InputStreamFullContent.java
(original)
+++ james/imap/trunk/store/src/main/java/org/apache/james/imap/store/streaming/InputStreamFullContent.java
Mon Sep  6 18:09:32 2010
@@ -24,7 +24,7 @@ import java.nio.ByteBuffer;
 import java.nio.channels.WritableByteChannel;
 import java.util.List;
 
-import org.apache.james.imap.mailbox.MessageResult;
+import org.apache.james.mailbox.MessageResult;
 
 
 /**
@@ -49,7 +49,7 @@ public class InputStreamFullContent exte
 
     /*
      * (non-Javadoc)
-     * @see org.apache.james.imap.mailbox.Content#size()
+     * @see org.apache.james.mailbox.Content#size()
      */
     public final long size() {
         return size;

Modified: james/imap/trunk/store/src/main/java/org/apache/james/imap/store/streaming/PartContentBuilder.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/store/src/main/java/org/apache/james/imap/store/streaming/PartContentBuilder.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/store/src/main/java/org/apache/james/imap/store/streaming/PartContentBuilder.java
(original)
+++ james/imap/trunk/store/src/main/java/org/apache/james/imap/store/streaming/PartContentBuilder.java
Mon Sep  6 18:09:32 2010
@@ -26,10 +26,10 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import org.apache.james.imap.mailbox.Content;
-import org.apache.james.imap.mailbox.MessageResult;
-import org.apache.james.imap.mailbox.MessageResult.Header;
 import org.apache.james.imap.store.ResultHeader;
+import org.apache.james.mailbox.Content;
+import org.apache.james.mailbox.MessageResult;
+import org.apache.james.mailbox.MessageResult.Header;
 import org.apache.james.mime4j.MimeException;
 import org.apache.james.mime4j.parser.MimeEntityConfig;
 import org.apache.james.mime4j.parser.MimeTokenStream;

Modified: james/imap/trunk/store/src/main/java/org/apache/james/imap/store/transaction/Mapper.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/store/src/main/java/org/apache/james/imap/store/transaction/Mapper.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/store/src/main/java/org/apache/james/imap/store/transaction/Mapper.java
(original)
+++ james/imap/trunk/store/src/main/java/org/apache/james/imap/store/transaction/Mapper.java
Mon Sep  6 18:09:32 2010
@@ -19,7 +19,7 @@
 
 package org.apache.james.imap.store.transaction;
 
-import org.apache.james.imap.mailbox.MailboxException;
+import org.apache.james.mailbox.MailboxException;
 
 /**
  * Mapper which execute units of work in a {@link Transaction}

Modified: james/imap/trunk/store/src/main/java/org/apache/james/imap/store/transaction/NonTransactionalMapper.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/store/src/main/java/org/apache/james/imap/store/transaction/NonTransactionalMapper.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/store/src/main/java/org/apache/james/imap/store/transaction/NonTransactionalMapper.java
(original)
+++ james/imap/trunk/store/src/main/java/org/apache/james/imap/store/transaction/NonTransactionalMapper.java
Mon Sep  6 18:09:32 2010
@@ -18,7 +18,7 @@
  ****************************************************************/
 package org.apache.james.imap.store.transaction;
 
-import org.apache.james.imap.mailbox.MailboxException;
+import org.apache.james.mailbox.MailboxException;
 
 /**
  * A Mapper which does no transaction handling. It just executes the execute() method

Modified: james/imap/trunk/store/src/main/java/org/apache/james/imap/store/transaction/TransactionalMapper.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/store/src/main/java/org/apache/james/imap/store/transaction/TransactionalMapper.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/store/src/main/java/org/apache/james/imap/store/transaction/TransactionalMapper.java
(original)
+++ james/imap/trunk/store/src/main/java/org/apache/james/imap/store/transaction/TransactionalMapper.java
Mon Sep  6 18:09:32 2010
@@ -19,7 +19,7 @@
 
 package org.apache.james.imap.store.transaction;
 
-import org.apache.james.imap.mailbox.MailboxException;
+import org.apache.james.mailbox.MailboxException;
 
 /**
  *

Modified: james/imap/trunk/store/src/main/java/org/apache/james/imap/store/user/SubscriptionMapper.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/store/src/main/java/org/apache/james/imap/store/user/SubscriptionMapper.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/store/src/main/java/org/apache/james/imap/store/user/SubscriptionMapper.java
(original)
+++ james/imap/trunk/store/src/main/java/org/apache/james/imap/store/user/SubscriptionMapper.java
Mon Sep  6 18:09:32 2010
@@ -20,9 +20,9 @@ package org.apache.james.imap.store.user
 
 import java.util.List;
 
-import org.apache.james.imap.mailbox.SubscriptionException;
 import org.apache.james.imap.store.transaction.Mapper;
 import org.apache.james.imap.store.user.model.Subscription;
+import org.apache.james.mailbox.SubscriptionException;
 
 /**
  * Mapper for {@link Subscription}

Modified: james/imap/trunk/store/src/test/java/org/apache/james/imap/store/PartContentBuilderComplexMultipartTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/store/src/test/java/org/apache/james/imap/store/PartContentBuilderComplexMultipartTest.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/store/src/test/java/org/apache/james/imap/store/PartContentBuilderComplexMultipartTest.java
(original)
+++ james/imap/trunk/store/src/test/java/org/apache/james/imap/store/PartContentBuilderComplexMultipartTest.java
Mon Sep  6 18:09:32 2010
@@ -27,9 +27,9 @@ import java.io.InputStream;
 import java.nio.charset.Charset;
 import java.util.List;
 
-import org.apache.james.imap.mailbox.MessageResult.Header;
 import org.apache.james.imap.store.streaming.PartContentBuilder;
 import org.apache.james.imap.store.streaming.PartContentBuilder.PartNotFoundException;
+import org.apache.james.mailbox.MessageResult.Header;
 import org.junit.Before;
 import org.junit.Test;
 

Modified: james/imap/trunk/store/src/test/java/org/apache/james/imap/store/PartContentBuilderMultipartAlternativeTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/store/src/test/java/org/apache/james/imap/store/PartContentBuilderMultipartAlternativeTest.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/store/src/test/java/org/apache/james/imap/store/PartContentBuilderMultipartAlternativeTest.java
(original)
+++ james/imap/trunk/store/src/test/java/org/apache/james/imap/store/PartContentBuilderMultipartAlternativeTest.java
Mon Sep  6 18:09:32 2010
@@ -26,8 +26,8 @@ import java.io.InputStream;
 import java.nio.charset.Charset;
 import java.util.List;
 
-import org.apache.james.imap.mailbox.MessageResult.Header;
 import org.apache.james.imap.store.streaming.PartContentBuilder;
+import org.apache.james.mailbox.MessageResult.Header;
 import org.junit.Before;
 import org.junit.Test;
 

Modified: james/imap/trunk/store/src/test/java/org/apache/james/imap/store/SearchUtilsMultipartMixedTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/store/src/test/java/org/apache/james/imap/store/SearchUtilsMultipartMixedTest.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/store/src/test/java/org/apache/james/imap/store/SearchUtilsMultipartMixedTest.java
(original)
+++ james/imap/trunk/store/src/test/java/org/apache/james/imap/store/SearchUtilsMultipartMixedTest.java
Mon Sep  6 18:09:32 2010
@@ -25,8 +25,8 @@ import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.Collection;
 
-import org.apache.james.imap.mailbox.SearchQuery;
 import org.apache.james.imap.store.mail.model.MailboxMembership;
+import org.apache.james.mailbox.SearchQuery;
 import org.junit.Before;
 import org.junit.Test;
 

Modified: james/imap/trunk/store/src/test/java/org/apache/james/imap/store/SearchUtilsRFC822Test.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/store/src/test/java/org/apache/james/imap/store/SearchUtilsRFC822Test.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/store/src/test/java/org/apache/james/imap/store/SearchUtilsRFC822Test.java
(original)
+++ james/imap/trunk/store/src/test/java/org/apache/james/imap/store/SearchUtilsRFC822Test.java
Mon Sep  6 18:09:32 2010
@@ -25,8 +25,8 @@ import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.Collection;
 
-import org.apache.james.imap.mailbox.SearchQuery;
 import org.apache.james.imap.store.mail.model.MailboxMembership;
+import org.apache.james.mailbox.SearchQuery;
 import org.junit.Before;
 import org.junit.Test;
 

Modified: james/imap/trunk/store/src/test/java/org/apache/james/imap/store/SearchUtilsTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/store/src/test/java/org/apache/james/imap/store/SearchUtilsTest.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/store/src/test/java/org/apache/james/imap/store/SearchUtilsTest.java
(original)
+++ james/imap/trunk/store/src/test/java/org/apache/james/imap/store/SearchUtilsTest.java
Mon Sep  6 18:09:32 2010
@@ -27,8 +27,8 @@ import java.util.Date;
 
 import javax.mail.Flags;
 
-import org.apache.james.imap.mailbox.SearchQuery;
 import org.apache.james.imap.store.mail.model.MailboxMembership;
+import org.apache.james.mailbox.SearchQuery;
 import org.junit.Before;
 import org.junit.Test;
 

Modified: james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/LockException.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/LockException.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/LockException.java
(original)
+++ james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/LockException.java
Mon Sep  6 18:09:32 2010
@@ -21,7 +21,8 @@ package org.apache.james.mailboxmanager.
 
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.locks.Lock;
-import org.apache.james.imap.mailbox.MailboxException;
+
+import org.apache.james.mailbox.MailboxException;
 
 /**
  * Indicates that required locks cannot be acquired at this time.

Modified: james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/MessageFlags.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/MessageFlags.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/MessageFlags.java
(original)
+++ james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/MessageFlags.java
Mon Sep  6 18:09:32 2010
@@ -25,7 +25,7 @@ import java.util.Iterator;
 import javax.mail.Flags;
 import javax.mail.MessagingException;
 
-import org.apache.james.imap.mailbox.MessageResult;
+import org.apache.james.mailbox.MessageResult;
 
 /**
  * Represents the flags for a message.

Modified: james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/MessageRowUtils.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/MessageRowUtils.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/MessageRowUtils.java
(original)
+++ james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/MessageRowUtils.java
Mon Sep  6 18:09:32 2010
@@ -32,18 +32,18 @@ import java.util.List;
 
 import javax.mail.Flags;
 
-import org.apache.james.imap.mailbox.Content;
-import org.apache.james.imap.mailbox.MailboxException;
-import org.apache.james.imap.mailbox.MessageResult;
-import org.apache.james.imap.mailbox.MimeDescriptor;
-import org.apache.james.imap.mailbox.MessageResult.FetchGroup;
-import org.apache.james.imap.mailbox.MessageResult.MimePath;
-import org.apache.james.imap.mailbox.util.MessageResultImpl;
 import org.apache.james.imap.store.MimeDescriptorImpl;
 import org.apache.james.imap.store.ResultHeader;
 import org.apache.james.imap.store.streaming.ByteContent;
 import org.apache.james.imap.store.streaming.FullByteContent;
 import org.apache.james.imap.store.streaming.PartContentBuilder;
+import org.apache.james.mailbox.Content;
+import org.apache.james.mailbox.MailboxException;
+import org.apache.james.mailbox.MessageResult;
+import org.apache.james.mailbox.MimeDescriptor;
+import org.apache.james.mailbox.MessageResult.FetchGroup;
+import org.apache.james.mailbox.MessageResult.MimePath;
+import org.apache.james.mailbox.util.MessageResultImpl;
 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/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/MessageSearches.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/MessageSearches.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/MessageSearches.java
(original)
+++ james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/MessageSearches.java
Mon Sep  6 18:09:32 2010
@@ -34,9 +34,9 @@ import javax.mail.Flags;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.james.imap.mailbox.SearchQuery;
-import org.apache.james.imap.mailbox.SearchQuery.NumericRange;
 import org.apache.james.imap.store.MessageSearcher;
+import org.apache.james.mailbox.SearchQuery;
+import org.apache.james.mailbox.SearchQuery.NumericRange;
 import org.apache.james.mailboxmanager.torque.om.MessageFlags;
 import org.apache.james.mailboxmanager.torque.om.MessageHeader;
 import org.apache.james.mailboxmanager.torque.om.MessageRow;

Modified: james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailbox.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailbox.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailbox.java
(original)
+++ james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailbox.java
Mon Sep  6 18:09:32 2010
@@ -45,22 +45,22 @@ import javax.mail.Flags;
 import javax.mail.MessagingException;
 import javax.mail.internet.MimeMessage;
 
-import org.apache.james.imap.mailbox.MailboxNotFoundException;
-import org.apache.james.imap.mailbox.MailboxPath;
-import org.apache.james.imap.mailbox.MessageManager;
-import org.apache.james.imap.mailbox.MailboxConstants;
-import org.apache.james.imap.mailbox.MailboxException;
-import org.apache.james.imap.mailbox.MailboxListener;
-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.store.MailboxMetaData;
 import org.apache.james.imap.store.streaming.CRLFOutputStream;
+import org.apache.james.mailbox.MailboxConstants;
+import org.apache.james.mailbox.MailboxException;
+import org.apache.james.mailbox.MailboxListener;
+import org.apache.james.mailbox.MailboxNotFoundException;
+import org.apache.james.mailbox.MailboxPath;
+import org.apache.james.mailbox.MailboxSession;
+import org.apache.james.mailbox.MessageManager;
+import org.apache.james.mailbox.MessageRange;
+import org.apache.james.mailbox.MessageResult;
+import org.apache.james.mailbox.SearchQuery;
+import org.apache.james.mailbox.MessageResult.FetchGroup;
+import org.apache.james.mailbox.SearchQuery.Criterion;
+import org.apache.james.mailbox.SearchQuery.NumericRange;
+import org.apache.james.mailbox.util.FetchGroupImpl;
 import org.apache.james.mailboxmanager.torque.om.MailboxRow;
 import org.apache.james.mailboxmanager.torque.om.MailboxRowPeer;
 import org.apache.james.mailboxmanager.torque.om.MessageBody;
@@ -704,7 +704,7 @@ public class TorqueMailbox implements Me
 
     /*
      * (non-Javadoc)
-     * @see org.apache.james.imap.mailbox.Mailbox#isWriteable(org.apache.james.imap.mailbox.MailboxSession)
+     * @see org.apache.james.mailbox.Mailbox#isWriteable(org.apache.james.mailbox.MailboxSession)
      */
     public boolean isWriteable(MailboxSession session) {
         return true;
@@ -819,7 +819,7 @@ public class TorqueMailbox implements Me
 
     }
     /**
-     * @see org.apache.james.imap.mailbox.MessageManager#getMetaData(boolean, MailboxSession,
org.apache.james.imap.mailbox.MessageManager.MetaData.FetchGroup)
+     * @see org.apache.james.mailbox.MessageManager#getMetaData(boolean, MailboxSession,
org.apache.james.mailbox.MessageManager.MetaData.FetchGroup)
      */
     public MetaData getMetaData(boolean resetRecent, MailboxSession mailboxSession, MessageManager.MetaData.FetchGroup
fetchGroup) throws MailboxException {
         final List<Long> recent = recent(resetRecent, mailboxSession);

Modified: james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManager.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManager.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManager.java
(original)
+++ james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManager.java
Mon Sep  6 18:09:32 2010
@@ -31,24 +31,24 @@ import java.util.concurrent.locks.Reentr
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.james.imap.mailbox.BadCredentialsException;
-import org.apache.james.imap.mailbox.MailboxManager;
-import org.apache.james.imap.mailbox.MailboxPath;
-import org.apache.james.imap.mailbox.MessageManager;
-import org.apache.james.imap.mailbox.MailboxConstants;
-import org.apache.james.imap.mailbox.MailboxException;
-import org.apache.james.imap.mailbox.MailboxExistsException;
-import org.apache.james.imap.mailbox.MailboxListener;
-import org.apache.james.imap.mailbox.MailboxMetaData;
-import org.apache.james.imap.mailbox.MailboxNotFoundException;
-import org.apache.james.imap.mailbox.MailboxQuery;
-import org.apache.james.imap.mailbox.MailboxSession;
-import org.apache.james.imap.mailbox.MessageRange;
-import org.apache.james.imap.mailbox.StandardMailboxMetaDataComparator;
-import org.apache.james.imap.mailbox.MailboxMetaData.Selectability;
-import org.apache.james.imap.mailbox.util.SimpleMailboxMetaData;
 import org.apache.james.imap.store.Authenticator;
 import org.apache.james.imap.store.SimpleMailboxSession;
+import org.apache.james.mailbox.BadCredentialsException;
+import org.apache.james.mailbox.MailboxConstants;
+import org.apache.james.mailbox.MailboxException;
+import org.apache.james.mailbox.MailboxExistsException;
+import org.apache.james.mailbox.MailboxListener;
+import org.apache.james.mailbox.MailboxManager;
+import org.apache.james.mailbox.MailboxMetaData;
+import org.apache.james.mailbox.MailboxNotFoundException;
+import org.apache.james.mailbox.MailboxPath;
+import org.apache.james.mailbox.MailboxQuery;
+import org.apache.james.mailbox.MailboxSession;
+import org.apache.james.mailbox.MessageManager;
+import org.apache.james.mailbox.MessageRange;
+import org.apache.james.mailbox.StandardMailboxMetaDataComparator;
+import org.apache.james.mailbox.MailboxMetaData.Selectability;
+import org.apache.james.mailbox.util.SimpleMailboxMetaData;
 import org.apache.james.mailboxmanager.torque.om.MailboxRow;
 import org.apache.james.mailboxmanager.torque.om.MailboxRowPeer;
 import org.apache.torque.TorqueException;
@@ -101,7 +101,7 @@ public class TorqueMailboxManager implem
     
     /*
      * (non-Javadoc)
-     * @see org.apache.james.imap.mailbox.MailboxManager#createSystemSession(java.lang.String,
org.apache.commons.logging.Log)
+     * @see org.apache.james.mailbox.MailboxManager#createSystemSession(java.lang.String,
org.apache.commons.logging.Log)
      */
     public MailboxSession createSystemSession(String userName, Log log) {
         return createSession(userName, null, log);
@@ -129,7 +129,7 @@ public class TorqueMailboxManager implem
     
     /*
      * (non-Javadoc)
-     * @see org.apache.james.imap.mailbox.MailboxManager#getDelimiter()
+     * @see org.apache.james.mailbox.MailboxManager#getDelimiter()
      */
     public final char getDelimiter() {
         return MailboxConstants.DEFAULT_DELIMITER;
@@ -148,7 +148,7 @@ public class TorqueMailboxManager implem
     
     /*
      * (non-Javadoc)
-     * @see org.apache.james.imap.mailbox.MailboxManager#login(java.lang.String, java.lang.String,
org.apache.commons.logging.Log)
+     * @see org.apache.james.mailbox.MailboxManager#login(java.lang.String, java.lang.String,
org.apache.commons.logging.Log)
      */
     public MailboxSession login(String userid, String passwd, Log log) throws BadCredentialsException,
MailboxException {
         if (login(userid, passwd)) {

Modified: james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueResultIterator.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueResultIterator.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueResultIterator.java
(original)
+++ james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueResultIterator.java
Mon Sep  6 18:09:32 2010
@@ -30,12 +30,12 @@ import javax.mail.internet.MimeMessage;
 import org.apache.commons.collections.Buffer;
 import org.apache.commons.collections.BufferUtils;
 import org.apache.commons.collections.buffer.BoundedFifoBuffer;
-import org.apache.james.imap.mailbox.Content;
-import org.apache.james.imap.mailbox.MailboxException;
-import org.apache.james.imap.mailbox.MessageResult;
-import org.apache.james.imap.mailbox.MimeDescriptor;
-import org.apache.james.imap.mailbox.MessageResult.FetchGroup;
-import org.apache.james.imap.mailbox.util.FetchGroupImpl;
+import org.apache.james.mailbox.Content;
+import org.apache.james.mailbox.MailboxException;
+import org.apache.james.mailbox.MessageResult;
+import org.apache.james.mailbox.MimeDescriptor;
+import org.apache.james.mailbox.MessageResult.FetchGroup;
+import org.apache.james.mailbox.util.FetchGroupImpl;
 import org.apache.james.mailboxmanager.torque.om.MessageRow;
 import org.apache.james.mime4j.MimeException;
 import org.apache.torque.TorqueException;

Modified: james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/UidChangeTracker.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/UidChangeTracker.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/UidChangeTracker.java
(original)
+++ james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/UidChangeTracker.java
Mon Sep  6 18:09:32 2010
@@ -30,11 +30,11 @@ import java.util.TreeSet;
 
 import javax.mail.Flags;
 
-import org.apache.james.imap.mailbox.MailboxConstants;
-import org.apache.james.imap.mailbox.MailboxListener;
-import org.apache.james.imap.mailbox.MailboxPath;
-import org.apache.james.imap.mailbox.util.MailboxEventDispatcher;
-import org.apache.james.imap.mailbox.MessageRange;
+import org.apache.james.mailbox.MailboxConstants;
+import org.apache.james.mailbox.MailboxListener;
+import org.apache.james.mailbox.MailboxPath;
+import org.apache.james.mailbox.MessageRange;
+import org.apache.james.mailbox.util.MailboxEventDispatcher;
 
 /**
  * 

Modified: james/imap/trunk/torque/src/test/java/org/apache/james/mailboxmanager/torque/PartContentBuilderComplexMultipartTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/torque/src/test/java/org/apache/james/mailboxmanager/torque/PartContentBuilderComplexMultipartTest.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/torque/src/test/java/org/apache/james/mailboxmanager/torque/PartContentBuilderComplexMultipartTest.java
(original)
+++ james/imap/trunk/torque/src/test/java/org/apache/james/mailboxmanager/torque/PartContentBuilderComplexMultipartTest.java
Mon Sep  6 18:09:32 2010
@@ -26,10 +26,10 @@ import java.io.InputStream;
 import java.nio.charset.Charset;
 import java.util.List;
 
-import org.apache.james.imap.mailbox.MessageResult.Header;
 import org.apache.james.imap.store.StringBuilderChannel;
 import org.apache.james.imap.store.streaming.PartContentBuilder;
 import org.apache.james.imap.store.streaming.PartContentBuilder.PartNotFoundException;
+import org.apache.james.mailbox.MessageResult.Header;
 import org.junit.Before;
 import org.junit.Test;
 

Modified: james/imap/trunk/torque/src/test/java/org/apache/james/mailboxmanager/torque/PartContentBuilderMultipartAlternativeTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/torque/src/test/java/org/apache/james/mailboxmanager/torque/PartContentBuilderMultipartAlternativeTest.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/torque/src/test/java/org/apache/james/mailboxmanager/torque/PartContentBuilderMultipartAlternativeTest.java
(original)
+++ james/imap/trunk/torque/src/test/java/org/apache/james/mailboxmanager/torque/PartContentBuilderMultipartAlternativeTest.java
Mon Sep  6 18:09:32 2010
@@ -26,9 +26,9 @@ import java.io.InputStream;
 import java.nio.charset.Charset;
 import java.util.List;
 
-import org.apache.james.imap.mailbox.MessageResult.Header;
 import org.apache.james.imap.store.StringBuilderChannel;
 import org.apache.james.imap.store.streaming.PartContentBuilder;
+import org.apache.james.mailbox.MessageResult.Header;
 import org.junit.Before;
 import org.junit.Test;
 

Modified: james/imap/trunk/torque/src/test/java/org/apache/james/mailboxmanager/torque/SearchUtilsMultipartMixedTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/torque/src/test/java/org/apache/james/mailboxmanager/torque/SearchUtilsMultipartMixedTest.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/torque/src/test/java/org/apache/james/mailboxmanager/torque/SearchUtilsMultipartMixedTest.java
(original)
+++ james/imap/trunk/torque/src/test/java/org/apache/james/mailboxmanager/torque/SearchUtilsMultipartMixedTest.java
Mon Sep  6 18:09:32 2010
@@ -26,7 +26,7 @@ import java.util.ArrayList;
 import java.util.Collection;
 
 import org.apache.james.imap.api.ImapConstants;
-import org.apache.james.imap.mailbox.SearchQuery;
+import org.apache.james.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/imap/trunk/torque/src/test/java/org/apache/james/mailboxmanager/torque/SearchUtilsRFC822Test.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/torque/src/test/java/org/apache/james/mailboxmanager/torque/SearchUtilsRFC822Test.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/torque/src/test/java/org/apache/james/mailboxmanager/torque/SearchUtilsRFC822Test.java
(original)
+++ james/imap/trunk/torque/src/test/java/org/apache/james/mailboxmanager/torque/SearchUtilsRFC822Test.java
Mon Sep  6 18:09:32 2010
@@ -26,7 +26,7 @@ import java.util.ArrayList;
 import java.util.Collection;
 
 import org.apache.james.imap.api.ImapConstants;
-import org.apache.james.imap.mailbox.SearchQuery;
+import org.apache.james.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/imap/trunk/torque/src/test/java/org/apache/james/mailboxmanager/torque/SearchUtilsTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/torque/src/test/java/org/apache/james/mailboxmanager/torque/SearchUtilsTest.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/torque/src/test/java/org/apache/james/mailboxmanager/torque/SearchUtilsTest.java
(original)
+++ james/imap/trunk/torque/src/test/java/org/apache/james/mailboxmanager/torque/SearchUtilsTest.java
Mon Sep  6 18:09:32 2010
@@ -28,7 +28,7 @@ import java.util.Date;
 import javax.mail.Flags;
 
 import org.apache.james.imap.api.ImapConstants;
-import org.apache.james.imap.mailbox.SearchQuery;
+import org.apache.james.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;

Modified: james/imap/trunk/torque/src/test/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManagerProviderSingleton.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/torque/src/test/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManagerProviderSingleton.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/torque/src/test/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManagerProviderSingleton.java
(original)
+++ james/imap/trunk/torque/src/test/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManagerProviderSingleton.java
Mon Sep  6 18:09:32 2010
@@ -28,8 +28,8 @@ import java.util.Locale;
 import org.apache.commons.configuration.BaseConfiguration;
 import org.apache.james.imap.functional.ImapHostSystem;
 import org.apache.james.imap.functional.InMemoryUserManager;
-import org.apache.james.imap.mailbox.MailboxManager;
-import org.apache.james.imap.mailbox.SubscriptionManager;
+import org.apache.james.mailbox.MailboxManager;
+import org.apache.james.mailbox.SubscriptionManager;
 import org.apache.james.mailboxmanager.torque.om.MailboxRowPeer;
 import org.apache.james.mailboxmanager.torque.om.MessageBodyPeer;
 import org.apache.james.mailboxmanager.torque.om.MessageFlagsPeer;



---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org


Mime
View raw message