james-server-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nor...@apache.org
Subject svn commit: r993124 [4/7] - in /james/imap/trunk: 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/mail/ jcr/src/main/java/org/apache/james/imap/jcr/mail...
Date Mon, 06 Sep 2010 19:00:12 GMT
Copied: james/imap/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMessageMapper.java (from r993114, james/imap/trunk/maildir/src/main/java/org/apache/james/imap/maildir/mail/MaildirMessageMapper.java)
URL: http://svn.apache.org/viewvc/james/imap/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMessageMapper.java?p2=james/imap/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMessageMapper.java&p1=james/imap/trunk/maildir/src/main/java/org/apache/james/imap/maildir/mail/MaildirMessageMapper.java&r1=993114&r2=993124&rev=993124&view=diff
==============================================================================
--- james/imap/trunk/maildir/src/main/java/org/apache/james/imap/maildir/mail/MaildirMessageMapper.java (original)
+++ james/imap/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMessageMapper.java Mon Sep  6 18:59:58 2010
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations      *
  * under the License.                                           *
  ****************************************************************/
-package org.apache.james.imap.maildir.mail;
+package org.apache.james.mailbox.maildir.mail;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -35,27 +35,27 @@ import java.util.Map.Entry;
 import javax.mail.util.SharedFileInputStream;
 
 import org.apache.commons.io.FileUtils;
-import org.apache.james.imap.maildir.MaildirFolder;
-import org.apache.james.imap.maildir.MaildirMessageName;
-import org.apache.james.imap.maildir.MaildirStore;
-import org.apache.james.imap.maildir.UidConstraint;
-import org.apache.james.imap.maildir.mail.model.MaildirHeader;
-import org.apache.james.imap.maildir.mail.model.MaildirMessage;
-import org.apache.james.imap.store.SearchQueryIterator;
-import org.apache.james.imap.store.mail.MessageMapper;
-import org.apache.james.imap.store.mail.model.Header;
-import org.apache.james.imap.store.mail.model.Mailbox;
-import org.apache.james.imap.store.mail.model.MailboxMembership;
-import org.apache.james.imap.store.mail.model.PropertyBuilder;
-import org.apache.james.imap.store.streaming.ConfigurableMimeTokenStream;
-import org.apache.james.imap.store.streaming.CountingInputStream;
-import org.apache.james.imap.store.transaction.NonTransactionalMapper;
 import org.apache.james.mailbox.MailboxException;
 import org.apache.james.mailbox.MessageRange;
 import org.apache.james.mailbox.SearchQuery;
 import org.apache.james.mailbox.MessageRange.Type;
 import org.apache.james.mailbox.SearchQuery.Criterion;
 import org.apache.james.mailbox.SearchQuery.NumericRange;
+import org.apache.james.mailbox.maildir.MaildirFolder;
+import org.apache.james.mailbox.maildir.MaildirMessageName;
+import org.apache.james.mailbox.maildir.MaildirStore;
+import org.apache.james.mailbox.maildir.UidConstraint;
+import org.apache.james.mailbox.maildir.mail.model.MaildirHeader;
+import org.apache.james.mailbox.maildir.mail.model.MaildirMessage;
+import org.apache.james.mailbox.store.SearchQueryIterator;
+import org.apache.james.mailbox.store.mail.MessageMapper;
+import org.apache.james.mailbox.store.mail.model.Header;
+import org.apache.james.mailbox.store.mail.model.Mailbox;
+import org.apache.james.mailbox.store.mail.model.MailboxMembership;
+import org.apache.james.mailbox.store.mail.model.PropertyBuilder;
+import org.apache.james.mailbox.store.streaming.ConfigurableMimeTokenStream;
+import org.apache.james.mailbox.store.streaming.CountingInputStream;
+import org.apache.james.mailbox.store.transaction.NonTransactionalMapper;
 import org.apache.james.mime4j.MimeException;
 import org.apache.james.mime4j.descriptor.MaximalBodyDescriptor;
 import org.apache.james.mime4j.parser.MimeEntityConfig;
@@ -73,7 +73,7 @@ public class MaildirMessageMapper extend
 
     /*
      * (non-Javadoc)
-     * @see org.apache.james.imap.store.mail.MessageMapper#copy(org.apache.james.imap.store.mail.model.Mailbox, org.apache.james.imap.store.mail.model.MailboxMembership)
+     * @see org.apache.james.mailbox.store.mail.MessageMapper#copy(org.apache.james.mailbox.store.mail.model.Mailbox, org.apache.james.mailbox.store.mail.model.MailboxMembership)
      */
     public long copy(Mailbox<Integer> mailbox, MailboxMembership<Integer> original)
     throws MailboxException {
@@ -84,7 +84,7 @@ public class MaildirMessageMapper extend
 
     /* 
      * (non-Javadoc)
-     * @see org.apache.james.imap.store.mail.MessageMapper#countMessagesInMailbox(org.apache.james.imap.store.mail.model.Mailbox)
+     * @see org.apache.james.mailbox.store.mail.MessageMapper#countMessagesInMailbox(org.apache.james.mailbox.store.mail.model.Mailbox)
      */
     public long countMessagesInMailbox(Mailbox<Integer> mailbox) throws MailboxException {
         MaildirFolder folder = maildirStore.createMaildirFolder(mailbox);
@@ -101,7 +101,7 @@ public class MaildirMessageMapper extend
 
     /* 
      * (non-Javadoc)
-     * @see org.apache.james.imap.store.mail.MessageMapper#countUnseenMessagesInMailbox(org.apache.james.imap.store.mail.model.Mailbox)
+     * @see org.apache.james.mailbox.store.mail.MessageMapper#countUnseenMessagesInMailbox(org.apache.james.mailbox.store.mail.model.Mailbox)
      */
     public long countUnseenMessagesInMailbox(Mailbox<Integer> mailbox) throws MailboxException {
         MaildirFolder folder = maildirStore.createMaildirFolder(mailbox);
@@ -118,7 +118,7 @@ public class MaildirMessageMapper extend
 
     /* 
      * (non-Javadoc)
-     * @see org.apache.james.imap.store.mail.MessageMapper#delete(org.apache.james.imap.store.mail.model.Mailbox, org.apache.james.imap.store.mail.model.MailboxMembership)
+     * @see org.apache.james.mailbox.store.mail.MessageMapper#delete(org.apache.james.mailbox.store.mail.model.Mailbox, org.apache.james.mailbox.store.mail.model.MailboxMembership)
      */
     public void delete(Mailbox<Integer> mailbox, MailboxMembership<Integer> message) throws MailboxException {
         MaildirFolder folder = maildirStore.createMaildirFolder(mailbox);
@@ -131,7 +131,7 @@ public class MaildirMessageMapper extend
 
     /* 
      * (non-Javadoc)
-     * @see org.apache.james.imap.store.mail.MessageMapper#findInMailbox(org.apache.james.imap.store.mail.model.Mailbox, org.apache.james.mailbox.MessageRange)
+     * @see org.apache.james.mailbox.store.mail.MessageMapper#findInMailbox(org.apache.james.mailbox.store.mail.model.Mailbox, org.apache.james.mailbox.MessageRange)
      */
     public List<MailboxMembership<Integer>> findInMailbox(Mailbox<Integer> mailbox, MessageRange set)
     throws MailboxException {
@@ -195,7 +195,7 @@ public class MaildirMessageMapper extend
 
     /* 
      * (non-Javadoc)
-     * @see org.apache.james.imap.store.mail.MessageMapper#findMarkedForDeletionInMailbox(org.apache.james.imap.store.mail.model.Mailbox, org.apache.james.mailbox.MessageRange)
+     * @see org.apache.james.mailbox.store.mail.MessageMapper#findMarkedForDeletionInMailbox(org.apache.james.mailbox.store.mail.model.Mailbox, org.apache.james.mailbox.MessageRange)
      */
     public List<MailboxMembership<Integer>> findMarkedForDeletionInMailbox(Mailbox<Integer> mailbox, MessageRange set) throws MailboxException {
         List<MailboxMembership<Integer>> results = new ArrayList<MailboxMembership<Integer>>();
@@ -254,7 +254,7 @@ public class MaildirMessageMapper extend
 
     /* 
      * (non-Javadoc)
-     * @see org.apache.james.imap.store.mail.MessageMapper#findRecentMessagesInMailbox(org.apache.james.imap.store.mail.model.Mailbox, int)
+     * @see org.apache.james.mailbox.store.mail.MessageMapper#findRecentMessagesInMailbox(org.apache.james.mailbox.store.mail.model.Mailbox, int)
      */
     public List<MailboxMembership<Integer>> findRecentMessagesInMailbox(Mailbox<Integer> mailbox, int limit)
     throws MailboxException {
@@ -273,7 +273,7 @@ public class MaildirMessageMapper extend
 
     /*
      * (non-Javadoc)
-     * @see org.apache.james.imap.store.mail.MessageMapper#findFirstUnseenMessageUid(org.apache.james.imap.store.mail.model.Mailbox)
+     * @see org.apache.james.mailbox.store.mail.MessageMapper#findFirstUnseenMessageUid(org.apache.james.mailbox.store.mail.model.Mailbox)
      */
     public Long findFirstUnseenMessageUid(Mailbox<Integer> mailbox)
     throws MailboxException {
@@ -287,8 +287,8 @@ public class MaildirMessageMapper extend
 
     /* 
      * (non-Javadoc)
-     * @see org.apache.james.imap.store.mail.MessageMapper#save(org.apache.james.imap.store.mail.model.Mailbox,
-     * org.apache.james.imap.store.mail.model.MailboxMembership)
+     * @see org.apache.james.mailbox.store.mail.MessageMapper#save(org.apache.james.mailbox.store.mail.model.Mailbox,
+     * org.apache.james.mailbox.store.mail.model.MailboxMembership)
      */
     public long save(Mailbox<Integer> mailbox, MailboxMembership<Integer> message)
     throws MailboxException {
@@ -377,7 +377,7 @@ public class MaildirMessageMapper extend
 
     /*
      * (non-Javadoc)
-     * @see org.apache.james.imap.store.mail.MessageMapper#searchMailbox(org.apache.james.imap.store.mail.model.Mailbox, org.apache.james.mailbox.SearchQuery)
+     * @see org.apache.james.mailbox.store.mail.MessageMapper#searchMailbox(org.apache.james.mailbox.store.mail.model.Mailbox, org.apache.james.mailbox.SearchQuery)
      */
     public Iterator<Long> searchMailbox(Mailbox<Integer> mailbox, SearchQuery query)
     throws MailboxException {
@@ -432,7 +432,7 @@ public class MaildirMessageMapper extend
 
     /* 
      * (non-Javadoc)
-     * @see org.apache.james.imap.store.transaction.TransactionalMapper#endRequest()
+     * @see org.apache.james.mailbox.store.transaction.TransactionalMapper#endRequest()
      */
     public void endRequest() {
         // not used

Modified: james/imap/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/model/MaildirHeader.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/model/MaildirHeader.java?rev=993124&r1=991286&r2=993124&view=diff
==============================================================================
--- james/imap/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/model/MaildirHeader.java (original)
+++ james/imap/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/model/MaildirHeader.java Mon Sep  6 18:59:58 2010
@@ -17,10 +17,10 @@
  * under the License.                                           *
  ****************************************************************/
 
-package org.apache.james.imap.maildir.mail.model;
+package org.apache.james.mailbox.maildir.mail.model;
 
-import org.apache.james.imap.store.mail.model.AbstractComparableHeader;
-import org.apache.james.imap.store.mail.model.Header;
+import org.apache.james.mailbox.store.mail.model.AbstractComparableHeader;
+import org.apache.james.mailbox.store.mail.model.Header;
 
 public class MaildirHeader extends AbstractComparableHeader {
 
@@ -45,7 +45,7 @@ public class MaildirHeader extends Abstr
     
 	/*
 	 * (non-Javadoc)
-	 * @see org.apache.james.imap.store.mail.model.Header#getFieldName()
+	 * @see org.apache.james.mailbox.store.mail.model.Header#getFieldName()
 	 */
 	public String getFieldName() {
 		return field;
@@ -53,7 +53,7 @@ public class MaildirHeader extends Abstr
 
 	/*
 	 * (non-Javadoc)
-	 * @see org.apache.james.imap.store.mail.model.Header#getLineNumber()
+	 * @see org.apache.james.mailbox.store.mail.model.Header#getLineNumber()
 	 */
 	public int getLineNumber() {
 		return lineNumber;
@@ -61,7 +61,7 @@ public class MaildirHeader extends Abstr
 
 	/*
 	 * (non-Javadoc)
-	 * @see org.apache.james.imap.store.mail.model.Header#getValue()
+	 * @see org.apache.james.mailbox.store.mail.model.Header#getValue()
 	 */
 	public String getValue() {
 		return value;

Copied: james/imap/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/model/MaildirMailbox.java (from r993114, james/imap/trunk/maildir/src/main/java/org/apache/james/imap/maildir/mail/model/MaildirMailbox.java)
URL: http://svn.apache.org/viewvc/james/imap/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/model/MaildirMailbox.java?p2=james/imap/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/model/MaildirMailbox.java&p1=james/imap/trunk/maildir/src/main/java/org/apache/james/imap/maildir/mail/model/MaildirMailbox.java&r1=993114&r2=993124&rev=993124&view=diff
==============================================================================
--- james/imap/trunk/maildir/src/main/java/org/apache/james/imap/maildir/mail/model/MaildirMailbox.java (original)
+++ james/imap/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/model/MaildirMailbox.java Mon Sep  6 18:59:58 2010
@@ -16,10 +16,10 @@
  * specific language governing permissions and limitations      *
  * under the License.                                           *
  ****************************************************************/
-package org.apache.james.imap.maildir.mail.model;
+package org.apache.james.mailbox.maildir.mail.model;
 
-import org.apache.james.imap.store.mail.model.Mailbox;
 import org.apache.james.mailbox.MailboxPath;
+import org.apache.james.mailbox.store.mail.model.Mailbox;
 
 public class MaildirMailbox implements Mailbox<Integer> {
 
@@ -49,7 +49,7 @@ public class MaildirMailbox implements M
 
 	/*
 	 * (non-Javadoc)
-	 * @see org.apache.james.imap.store.mail.model.Mailbox#consumeUid()
+	 * @see org.apache.james.mailbox.store.mail.model.Mailbox#consumeUid()
 	 */
 	public void consumeUid() {
 		lastUid++;
@@ -57,7 +57,7 @@ public class MaildirMailbox implements M
 
 	/*
 	 * (non-Javadoc)
-	 * @see org.apache.james.imap.store.mail.model.Mailbox#getLastUid()
+	 * @see org.apache.james.mailbox.store.mail.model.Mailbox#getLastUid()
 	 */
 	public long getLastUid() {
 		return lastUid;
@@ -69,35 +69,35 @@ public class MaildirMailbox implements M
 
 	/*
 	 * (non-Javadoc)
-	 * @see org.apache.james.imap.store.mail.model.Mailbox#getMailboxId()
+	 * @see org.apache.james.mailbox.store.mail.model.Mailbox#getMailboxId()
 	 */
 	public Integer getMailboxId() {
 	    return id;
 	}
 
     /* (non-Javadoc)
-     * @see org.apache.james.imap.store.mail.model.Mailbox#getNamespace()
+     * @see org.apache.james.mailbox.store.mail.model.Mailbox#getNamespace()
      */
     public String getNamespace() {
         return namespace;
     }
 
     /* (non-Javadoc)
-     * @see org.apache.james.imap.store.mail.model.Mailbox#setNamespace(java.lang.String)
+     * @see org.apache.james.mailbox.store.mail.model.Mailbox#setNamespace(java.lang.String)
      */
     public void setNamespace(String namespace) {
         this.namespace = namespace;
     }
 
     /* (non-Javadoc)
-     * @see org.apache.james.imap.store.mail.model.Mailbox#getUser()
+     * @see org.apache.james.mailbox.store.mail.model.Mailbox#getUser()
      */
     public String getUser() {
         return user;
     }
 
     /* (non-Javadoc)
-     * @see org.apache.james.imap.store.mail.model.Mailbox#setUser(java.lang.String)
+     * @see org.apache.james.mailbox.store.mail.model.Mailbox#setUser(java.lang.String)
      */
     public void setUser(String user) {
         this.user = user;
@@ -105,7 +105,7 @@ public class MaildirMailbox implements M
 
 	/*
 	 * (non-Javadoc)
-	 * @see org.apache.james.imap.store.mail.model.Mailbox#getName()
+	 * @see org.apache.james.mailbox.store.mail.model.Mailbox#getName()
 	 */
 	public String getName() {
 		return name;
@@ -113,7 +113,7 @@ public class MaildirMailbox implements M
 
     /*
      * (non-Javadoc)
-     * @see org.apache.james.imap.store.mail.model.Mailbox#setName(java.lang.String)
+     * @see org.apache.james.mailbox.store.mail.model.Mailbox#setName(java.lang.String)
      */
     public void setName(String name) {
         this.name = name;
@@ -121,7 +121,7 @@ public class MaildirMailbox implements M
 
 	/*
 	 * (non-Javadoc)
-	 * @see org.apache.james.imap.store.mail.model.Mailbox#getUidValidity()
+	 * @see org.apache.james.mailbox.store.mail.model.Mailbox#getUidValidity()
 	 */
 	public long getUidValidity() {
 		return uidValidity;

Copied: james/imap/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/model/MaildirMessage.java (from r993114, james/imap/trunk/maildir/src/main/java/org/apache/james/imap/maildir/mail/model/MaildirMessage.java)
URL: http://svn.apache.org/viewvc/james/imap/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/model/MaildirMessage.java?p2=james/imap/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/model/MaildirMessage.java&p1=james/imap/trunk/maildir/src/main/java/org/apache/james/imap/maildir/mail/model/MaildirMessage.java&r1=993114&r2=993124&rev=993124&view=diff
==============================================================================
--- james/imap/trunk/maildir/src/main/java/org/apache/james/imap/maildir/mail/model/MaildirMessage.java (original)
+++ james/imap/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/model/MaildirMessage.java Mon Sep  6 18:59:58 2010
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations      *
  * under the License.                                           *
  ****************************************************************/
-package org.apache.james.imap.maildir.mail.model;
+package org.apache.james.mailbox.maildir.mail.model;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
@@ -28,16 +28,16 @@ import java.util.List;
 import javax.mail.Flags;
 
 import org.apache.commons.lang.NotImplementedException;
-import org.apache.james.imap.maildir.MaildirMessageName;
-import org.apache.james.imap.store.mail.model.AbstractMessage;
-import org.apache.james.imap.store.mail.model.Message;
-import org.apache.james.imap.store.mail.model.Header;
-import org.apache.james.imap.store.mail.model.Mailbox;
-import org.apache.james.imap.store.mail.model.MailboxMembership;
-import org.apache.james.imap.store.mail.model.Property;
-import org.apache.james.imap.store.mail.model.PropertyBuilder;
-import org.apache.james.imap.store.streaming.StreamUtils;
 import org.apache.james.mailbox.MailboxException;
+import org.apache.james.mailbox.maildir.MaildirMessageName;
+import org.apache.james.mailbox.store.mail.model.AbstractMessage;
+import org.apache.james.mailbox.store.mail.model.Header;
+import org.apache.james.mailbox.store.mail.model.Mailbox;
+import org.apache.james.mailbox.store.mail.model.MailboxMembership;
+import org.apache.james.mailbox.store.mail.model.Message;
+import org.apache.james.mailbox.store.mail.model.Property;
+import org.apache.james.mailbox.store.mail.model.PropertyBuilder;
+import org.apache.james.mailbox.store.streaming.StreamUtils;
 
 public class MaildirMessage extends AbstractMessage implements MailboxMembership<Integer> {
 
@@ -178,7 +178,7 @@ public class MaildirMessage extends Abst
 
     /* 
      * (non-Javadoc)
-     * @see org.apache.james.imap.store.mail.model.AbstractDocument#getBodyStartOctet()
+     * @see org.apache.james.mailbox.store.mail.model.AbstractDocument#getBodyStartOctet()
      */
     @Override
     protected int getBodyStartOctet() {
@@ -187,7 +187,7 @@ public class MaildirMessage extends Abst
 
     /* 
      * (non-Javadoc)
-     * @see org.apache.james.imap.store.mail.model.AbstractDocument#getRawFullContent()
+     * @see org.apache.james.mailbox.store.mail.model.AbstractDocument#getRawFullContent()
      */
     @Override
     protected InputStream getRawFullContent() {
@@ -196,7 +196,7 @@ public class MaildirMessage extends Abst
 
     /* 
      * (non-Javadoc)
-     * @see org.apache.james.imap.store.mail.model.Document#getFullContentOctets()
+     * @see org.apache.james.mailbox.store.mail.model.Document#getFullContentOctets()
      */
     public long getFullContentOctets() {
         return size;
@@ -204,7 +204,7 @@ public class MaildirMessage extends Abst
 
     /* 
      * (non-Javadoc)
-     * @see org.apache.james.imap.store.mail.model.Document#getHeaders()
+     * @see org.apache.james.mailbox.store.mail.model.Document#getHeaders()
      */
     public List<Header> getHeaders() {
         return new ArrayList<Header>(headers);
@@ -212,7 +212,7 @@ public class MaildirMessage extends Abst
 
     /* 
      * (non-Javadoc)
-     * @see org.apache.james.imap.store.mail.model.Document#getMediaType()
+     * @see org.apache.james.mailbox.store.mail.model.Document#getMediaType()
      */
     public String getMediaType() {
         return mediaType;
@@ -220,7 +220,7 @@ public class MaildirMessage extends Abst
 
     /* 
      * (non-Javadoc)
-     * @see org.apache.james.imap.store.mail.model.Document#getProperties()
+     * @see org.apache.james.mailbox.store.mail.model.Document#getProperties()
      */
     public List<Property> getProperties() {
         return new ArrayList<Property>(properties);
@@ -228,7 +228,7 @@ public class MaildirMessage extends Abst
 
     /* 
      * (non-Javadoc)
-     * @see org.apache.james.imap.store.mail.model.Document#getSubType()
+     * @see org.apache.james.mailbox.store.mail.model.Document#getSubType()
      */
     public String getSubType() {
         return subType;
@@ -236,7 +236,7 @@ public class MaildirMessage extends Abst
 
     /* 
      * (non-Javadoc)
-     * @see org.apache.james.imap.store.mail.model.Document#getTextualLineCount()
+     * @see org.apache.james.mailbox.store.mail.model.Document#getTextualLineCount()
      */
     public Long getTextualLineCount() {
         return textualLineCount;
@@ -244,7 +244,7 @@ public class MaildirMessage extends Abst
 
     /* 
      * (non-Javadoc)
-     * @see org.apache.james.imap.store.mail.model.MailboxMembership#createFlags()
+     * @see org.apache.james.mailbox.store.mail.model.MailboxMembership#createFlags()
      */
     public Flags createFlags() {
         final Flags flags = new Flags();
@@ -272,7 +272,7 @@ public class MaildirMessage extends Abst
 
     /* 
      * (non-Javadoc)
-     * @see org.apache.james.imap.store.mail.model.MailboxMembership#getMessage()
+     * @see org.apache.james.mailbox.store.mail.model.MailboxMembership#getMessage()
      */
     public Message getMessage() {
         return this;
@@ -280,7 +280,7 @@ public class MaildirMessage extends Abst
 
     /* 
      * (non-Javadoc)
-     * @see org.apache.james.imap.store.mail.model.MailboxMembership#getInternalDate()
+     * @see org.apache.james.mailbox.store.mail.model.MailboxMembership#getInternalDate()
      */
     public Date getInternalDate() {
         return internalDate;
@@ -296,7 +296,7 @@ public class MaildirMessage extends Abst
 
     /* 
      * (non-Javadoc)
-     * @see org.apache.james.imap.store.mail.model.MailboxMembership#getMailboxId()
+     * @see org.apache.james.mailbox.store.mail.model.MailboxMembership#getMailboxId()
      */
     public Integer getMailboxId() {
         throw new NotImplementedException();
@@ -304,7 +304,7 @@ public class MaildirMessage extends Abst
 
     /* 
      * (non-Javadoc)
-     * @see org.apache.james.imap.store.mail.model.MailboxMembership#getUid()
+     * @see org.apache.james.mailbox.store.mail.model.MailboxMembership#getUid()
      */
     public long getUid() {
         return uid;
@@ -321,7 +321,7 @@ public class MaildirMessage extends Abst
 
     /* 
      * (non-Javadoc)
-     * @see org.apache.james.imap.store.mail.model.MailboxMembership#isAnswered()
+     * @see org.apache.james.mailbox.store.mail.model.MailboxMembership#isAnswered()
      */
     public boolean isAnswered() {
         return answered;
@@ -329,7 +329,7 @@ public class MaildirMessage extends Abst
 
     /* 
      * (non-Javadoc)
-     * @see org.apache.james.imap.store.mail.model.MailboxMembership#isDeleted()
+     * @see org.apache.james.mailbox.store.mail.model.MailboxMembership#isDeleted()
      */
     public boolean isDeleted() {
         return deleted;
@@ -337,7 +337,7 @@ public class MaildirMessage extends Abst
 
     /* 
      * (non-Javadoc)
-     * @see org.apache.james.imap.store.mail.model.MailboxMembership#isDraft()
+     * @see org.apache.james.mailbox.store.mail.model.MailboxMembership#isDraft()
      */
     public boolean isDraft() {
         return draft;
@@ -345,7 +345,7 @@ public class MaildirMessage extends Abst
 
     /* 
      * (non-Javadoc)
-     * @see org.apache.james.imap.store.mail.model.MailboxMembership#isFlagged()
+     * @see org.apache.james.mailbox.store.mail.model.MailboxMembership#isFlagged()
      */
     public boolean isFlagged() {
         return flagged;
@@ -353,7 +353,7 @@ public class MaildirMessage extends Abst
 
     /* 
      * (non-Javadoc)
-     * @see org.apache.james.imap.store.mail.model.MailboxMembership#isRecent()
+     * @see org.apache.james.mailbox.store.mail.model.MailboxMembership#isRecent()
      */
     public boolean isRecent() {
         return recent;
@@ -361,7 +361,7 @@ public class MaildirMessage extends Abst
 
     /* 
      * (non-Javadoc)
-     * @see org.apache.james.imap.store.mail.model.MailboxMembership#isSeen()
+     * @see org.apache.james.mailbox.store.mail.model.MailboxMembership#isSeen()
      */
     public boolean isSeen() {
         return seen;
@@ -369,7 +369,7 @@ public class MaildirMessage extends Abst
 
     /* 
      * (non-Javadoc)
-     * @see org.apache.james.imap.store.mail.model.MailboxMembership#setFlags(javax.mail.Flags)
+     * @see org.apache.james.mailbox.store.mail.model.MailboxMembership#setFlags(javax.mail.Flags)
      */
     public void setFlags(Flags flags) {
         if (flags != null) {
@@ -385,7 +385,7 @@ public class MaildirMessage extends Abst
 
     /* 
      * (non-Javadoc)
-     * @see org.apache.james.imap.store.mail.model.MailboxMembership#unsetRecent()
+     * @see org.apache.james.mailbox.store.mail.model.MailboxMembership#unsetRecent()
      */
     public void unsetRecent() {
         modified = true;

Modified: james/imap/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/model/MaildirProperty.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/model/MaildirProperty.java?rev=993124&r1=991286&r2=993124&view=diff
==============================================================================
--- james/imap/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/model/MaildirProperty.java (original)
+++ james/imap/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/model/MaildirProperty.java Mon Sep  6 18:59:58 2010
@@ -16,10 +16,10 @@
  * specific language governing permissions and limitations      *
  * under the License.                                           *
  ****************************************************************/
-package org.apache.james.imap.maildir.mail.model;
+package org.apache.james.mailbox.maildir.mail.model;
 
-import org.apache.james.imap.store.mail.model.AbstractComparableProperty;
-import org.apache.james.imap.store.mail.model.Property;
+import org.apache.james.mailbox.store.mail.model.AbstractComparableProperty;
+import org.apache.james.mailbox.store.mail.model.Property;
 
 public class MaildirProperty extends AbstractComparableProperty<MaildirProperty> {
 
@@ -41,7 +41,7 @@ public class MaildirProperty extends Abs
     
     /* 
      * (non-Javadoc)
-     * @see org.apache.james.imap.store.mail.model.AbstractComparableProperty#getOrder()
+     * @see org.apache.james.mailbox.store.mail.model.AbstractComparableProperty#getOrder()
      */
     @Override
     public int getOrder() {
@@ -50,7 +50,7 @@ public class MaildirProperty extends Abs
 
     /* 
      * (non-Javadoc)
-     * @see org.apache.james.imap.store.mail.model.Property#getLocalName()
+     * @see org.apache.james.mailbox.store.mail.model.Property#getLocalName()
      */
     public String getLocalName() {
         return localName;

Copied: james/imap/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/user/MaildirSubscriptionMapper.java (from r993114, james/imap/trunk/maildir/src/main/java/org/apache/james/imap/maildir/user/MaildirSubscriptionMapper.java)
URL: http://svn.apache.org/viewvc/james/imap/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/user/MaildirSubscriptionMapper.java?p2=james/imap/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/user/MaildirSubscriptionMapper.java&p1=james/imap/trunk/maildir/src/main/java/org/apache/james/imap/maildir/user/MaildirSubscriptionMapper.java&r1=993114&r2=993124&rev=993124&view=diff
==============================================================================
--- james/imap/trunk/maildir/src/main/java/org/apache/james/imap/maildir/user/MaildirSubscriptionMapper.java (original)
+++ james/imap/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/user/MaildirSubscriptionMapper.java Mon Sep  6 18:59:58 2010
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations      *
  * under the License.                                           *
  ****************************************************************/
-package org.apache.james.imap.maildir.user;
+package org.apache.james.mailbox.maildir.user;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -30,11 +30,11 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-import org.apache.james.imap.maildir.user.model.MaildirSubscription;
-import org.apache.james.imap.store.transaction.NonTransactionalMapper;
-import org.apache.james.imap.store.user.SubscriptionMapper;
-import org.apache.james.imap.store.user.model.Subscription;
 import org.apache.james.mailbox.SubscriptionException;
+import org.apache.james.mailbox.maildir.user.model.MaildirSubscription;
+import org.apache.james.mailbox.store.transaction.NonTransactionalMapper;
+import org.apache.james.mailbox.store.user.SubscriptionMapper;
+import org.apache.james.mailbox.store.user.model.Subscription;
 
 public class MaildirSubscriptionMapper extends NonTransactionalMapper implements SubscriptionMapper {
 
@@ -48,7 +48,7 @@ public class MaildirSubscriptionMapper e
     
     /* 
      * (non-Javadoc)
-     * @see org.apache.james.imap.store.user.SubscriptionMapper#delete(org.apache.james.imap.store.user.model.Subscription)
+     * @see org.apache.james.mailbox.store.user.SubscriptionMapper#delete(org.apache.james.mailbox.store.user.model.Subscription)
      */
     public void delete(Subscription subscription) throws SubscriptionException {
      // TODO: we need some kind of file locking here
@@ -65,7 +65,7 @@ public class MaildirSubscriptionMapper e
 
     /* 
      * (non-Javadoc)
-     * @see org.apache.james.imap.store.user.SubscriptionMapper#findSubscriptionsForUser(java.lang.String)
+     * @see org.apache.james.mailbox.store.user.SubscriptionMapper#findSubscriptionsForUser(java.lang.String)
      */
     public List<Subscription> findSubscriptionsForUser(String user) throws SubscriptionException {
         Set<String> subscriptionNames = readSubscriptionsForUser(user);
@@ -78,7 +78,7 @@ public class MaildirSubscriptionMapper e
 
     /* 
      * (non-Javadoc)
-     * @see org.apache.james.imap.store.user.SubscriptionMapper#findMailboxSubscriptionForUser(java.lang.String, java.lang.String)
+     * @see org.apache.james.mailbox.store.user.SubscriptionMapper#findMailboxSubscriptionForUser(java.lang.String, java.lang.String)
      */
     public Subscription findMailboxSubscriptionForUser(String user, String mailbox) throws SubscriptionException {
         File userRoot = new File(createFolderNameFromUser(user));
@@ -95,7 +95,7 @@ public class MaildirSubscriptionMapper e
 
     /*
      * (non-Javadoc)
-     * @see org.apache.james.imap.store.user.SubscriptionMapper#save(org.apache.james.imap.store.user.model.Subscription)
+     * @see org.apache.james.mailbox.store.user.SubscriptionMapper#save(org.apache.james.mailbox.store.user.model.Subscription)
      */
     public void save(Subscription subscription) throws SubscriptionException {
         // TODO: we need some kind of file locking here
@@ -112,7 +112,7 @@ public class MaildirSubscriptionMapper e
 
     /*
      * (non-Javadoc)
-     * @see org.apache.james.imap.store.transaction.TransactionalMapper#endRequest()
+     * @see org.apache.james.mailbox.store.transaction.TransactionalMapper#endRequest()
      */
     public void endRequest() {
         // nothing to do

Modified: james/imap/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/user/model/MaildirSubscription.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/user/model/MaildirSubscription.java?rev=993124&r1=991286&r2=993124&view=diff
==============================================================================
--- james/imap/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/user/model/MaildirSubscription.java (original)
+++ james/imap/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/user/model/MaildirSubscription.java Mon Sep  6 18:59:58 2010
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations      *
  * under the License.                                           *
  ****************************************************************/
-package org.apache.james.imap.maildir.user.model;
+package org.apache.james.mailbox.maildir.user.model;
 
-import org.apache.james.imap.store.user.model.Subscription;
+import org.apache.james.mailbox.store.user.model.Subscription;
 
 public class MaildirSubscription implements Subscription {
 

Modified: james/imap/trunk/maildir/src/test/java/org/apache/james/mailbox/functional/maildir/AuthenticatedStateTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/maildir/src/test/java/org/apache/james/mailbox/functional/maildir/AuthenticatedStateTest.java?rev=993124&r1=991286&r2=993124&view=diff
==============================================================================
--- james/imap/trunk/maildir/src/test/java/org/apache/james/mailbox/functional/maildir/AuthenticatedStateTest.java (original)
+++ james/imap/trunk/maildir/src/test/java/org/apache/james/mailbox/functional/maildir/AuthenticatedStateTest.java Mon Sep  6 18:59:58 2010
@@ -17,7 +17,7 @@
  * under the License.                                           *
  ****************************************************************/
 
-package org.apache.james.imap.functional.maildir;
+package org.apache.james.mailbox.functional.maildir;
 
 import org.apache.james.imap.functional.suite.AuthenticatedState;
 

Modified: james/imap/trunk/maildir/src/test/java/org/apache/james/mailbox/functional/maildir/ConcurrentSessionsTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/maildir/src/test/java/org/apache/james/mailbox/functional/maildir/ConcurrentSessionsTest.java?rev=993124&r1=991286&r2=993124&view=diff
==============================================================================
--- james/imap/trunk/maildir/src/test/java/org/apache/james/mailbox/functional/maildir/ConcurrentSessionsTest.java (original)
+++ james/imap/trunk/maildir/src/test/java/org/apache/james/mailbox/functional/maildir/ConcurrentSessionsTest.java Mon Sep  6 18:59:58 2010
@@ -17,7 +17,7 @@
  * under the License.                                           *
  ****************************************************************/
 
-package org.apache.james.imap.functional.maildir;
+package org.apache.james.mailbox.functional.maildir;
 
 import org.apache.james.imap.functional.suite.ConcurrentSessions;
 

Modified: james/imap/trunk/maildir/src/test/java/org/apache/james/mailbox/functional/maildir/EventTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/maildir/src/test/java/org/apache/james/mailbox/functional/maildir/EventTest.java?rev=993124&r1=991286&r2=993124&view=diff
==============================================================================
--- james/imap/trunk/maildir/src/test/java/org/apache/james/mailbox/functional/maildir/EventTest.java (original)
+++ james/imap/trunk/maildir/src/test/java/org/apache/james/mailbox/functional/maildir/EventTest.java Mon Sep  6 18:59:58 2010
@@ -17,7 +17,7 @@
  * under the License.                                           *
  ****************************************************************/
 
-package org.apache.james.imap.functional.maildir;
+package org.apache.james.mailbox.functional.maildir;
 
 import org.apache.james.imap.functional.suite.Events;
 

Modified: james/imap/trunk/maildir/src/test/java/org/apache/james/mailbox/functional/maildir/ExpungeTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/maildir/src/test/java/org/apache/james/mailbox/functional/maildir/ExpungeTest.java?rev=993124&r1=991286&r2=993124&view=diff
==============================================================================
--- james/imap/trunk/maildir/src/test/java/org/apache/james/mailbox/functional/maildir/ExpungeTest.java (original)
+++ james/imap/trunk/maildir/src/test/java/org/apache/james/mailbox/functional/maildir/ExpungeTest.java Mon Sep  6 18:59:58 2010
@@ -17,7 +17,7 @@
  * under the License.                                           *
  ****************************************************************/
 
-package org.apache.james.imap.functional.maildir;
+package org.apache.james.mailbox.functional.maildir;
 
 import org.apache.james.imap.functional.suite.Expunge;
 

Modified: james/imap/trunk/maildir/src/test/java/org/apache/james/mailbox/functional/maildir/FetchBodySectionTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/maildir/src/test/java/org/apache/james/mailbox/functional/maildir/FetchBodySectionTest.java?rev=993124&r1=991286&r2=993124&view=diff
==============================================================================
--- james/imap/trunk/maildir/src/test/java/org/apache/james/mailbox/functional/maildir/FetchBodySectionTest.java (original)
+++ james/imap/trunk/maildir/src/test/java/org/apache/james/mailbox/functional/maildir/FetchBodySectionTest.java Mon Sep  6 18:59:58 2010
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations      *
  * under the License.                                           *
  ****************************************************************/
-package org.apache.james.imap.functional.maildir;
+package org.apache.james.mailbox.functional.maildir;
 
 import org.apache.james.imap.functional.suite.FetchBodySection;
 

Modified: james/imap/trunk/maildir/src/test/java/org/apache/james/mailbox/functional/maildir/FetchBodyStructureTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/maildir/src/test/java/org/apache/james/mailbox/functional/maildir/FetchBodyStructureTest.java?rev=993124&r1=991286&r2=993124&view=diff
==============================================================================
--- james/imap/trunk/maildir/src/test/java/org/apache/james/mailbox/functional/maildir/FetchBodyStructureTest.java (original)
+++ james/imap/trunk/maildir/src/test/java/org/apache/james/mailbox/functional/maildir/FetchBodyStructureTest.java Mon Sep  6 18:59:58 2010
@@ -17,7 +17,7 @@
  * under the License.                                           *
  ****************************************************************/
 
-package org.apache.james.imap.functional.maildir;
+package org.apache.james.mailbox.functional.maildir;
 
 import org.apache.james.imap.functional.suite.FetchBodyStructure;
 

Modified: james/imap/trunk/maildir/src/test/java/org/apache/james/mailbox/functional/maildir/FetchHeadersTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/maildir/src/test/java/org/apache/james/mailbox/functional/maildir/FetchHeadersTest.java?rev=993124&r1=991286&r2=993124&view=diff
==============================================================================
--- james/imap/trunk/maildir/src/test/java/org/apache/james/mailbox/functional/maildir/FetchHeadersTest.java (original)
+++ james/imap/trunk/maildir/src/test/java/org/apache/james/mailbox/functional/maildir/FetchHeadersTest.java Mon Sep  6 18:59:58 2010
@@ -17,7 +17,7 @@
  * under the License.                                           *
  ****************************************************************/
 
-package org.apache.james.imap.functional.maildir;
+package org.apache.james.mailbox.functional.maildir;
 
 import org.apache.james.imap.functional.suite.FetchHeaders;
 

Modified: james/imap/trunk/maildir/src/test/java/org/apache/james/mailbox/functional/maildir/FetchTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/maildir/src/test/java/org/apache/james/mailbox/functional/maildir/FetchTest.java?rev=993124&r1=991286&r2=993124&view=diff
==============================================================================
--- james/imap/trunk/maildir/src/test/java/org/apache/james/mailbox/functional/maildir/FetchTest.java (original)
+++ james/imap/trunk/maildir/src/test/java/org/apache/james/mailbox/functional/maildir/FetchTest.java Mon Sep  6 18:59:58 2010
@@ -17,7 +17,7 @@
  * under the License.                                           *
  ****************************************************************/
 
-package org.apache.james.imap.functional.maildir;
+package org.apache.james.mailbox.functional.maildir;
 
 import org.apache.james.imap.functional.suite.Fetch;
 

Modified: james/imap/trunk/maildir/src/test/java/org/apache/james/mailbox/functional/maildir/ListingTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/maildir/src/test/java/org/apache/james/mailbox/functional/maildir/ListingTest.java?rev=993124&r1=991286&r2=993124&view=diff
==============================================================================
--- james/imap/trunk/maildir/src/test/java/org/apache/james/mailbox/functional/maildir/ListingTest.java (original)
+++ james/imap/trunk/maildir/src/test/java/org/apache/james/mailbox/functional/maildir/ListingTest.java Mon Sep  6 18:59:58 2010
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations      *
  * under the License.                                           *
  ****************************************************************/
-package org.apache.james.imap.functional.maildir;
+package org.apache.james.mailbox.functional.maildir;
 
 import org.apache.james.imap.functional.suite.Listing;
 

Modified: james/imap/trunk/maildir/src/test/java/org/apache/james/mailbox/functional/maildir/MaildirHostSystem.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/maildir/src/test/java/org/apache/james/mailbox/functional/maildir/MaildirHostSystem.java?rev=993124&r1=991286&r2=993124&view=diff
==============================================================================
--- james/imap/trunk/maildir/src/test/java/org/apache/james/mailbox/functional/maildir/MaildirHostSystem.java (original)
+++ james/imap/trunk/maildir/src/test/java/org/apache/james/mailbox/functional/maildir/MaildirHostSystem.java Mon Sep  6 18:59:58 2010
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations      *
  * under the License.                                           *
  ****************************************************************/
-package org.apache.james.imap.functional.maildir;
+package org.apache.james.mailbox.functional.maildir;
 
 import java.io.File;
 
@@ -25,11 +25,11 @@ import org.apache.james.imap.api.process
 import org.apache.james.imap.encode.main.DefaultImapEncoderFactory;
 import org.apache.james.imap.functional.ImapHostSystem;
 import org.apache.james.imap.functional.InMemoryUserManager;
-import org.apache.james.imap.maildir.MaildirMailboxManager;
-import org.apache.james.imap.maildir.MaildirMailboxSessionMapperFactory;
-import org.apache.james.imap.maildir.MaildirSubscriptionManager;
 import org.apache.james.imap.main.DefaultImapDecoderFactory;
 import org.apache.james.imap.processor.main.DefaultImapProcessorFactory;
+import org.apache.james.mailbox.maildir.MaildirMailboxManager;
+import org.apache.james.mailbox.maildir.MaildirMailboxSessionMapperFactory;
+import org.apache.james.mailbox.maildir.MaildirSubscriptionManager;
 import org.apache.james.test.functional.HostSystem;
 
 public class MaildirHostSystem extends ImapHostSystem {

Copied: james/imap/trunk/maildir/src/test/java/org/apache/james/mailbox/functional/maildir/MaildirStressTest.java (from r993114, james/imap/trunk/maildir/src/test/java/org/apache/james/imap/functional/maildir/MaildirStressTest.java)
URL: http://svn.apache.org/viewvc/james/imap/trunk/maildir/src/test/java/org/apache/james/mailbox/functional/maildir/MaildirStressTest.java?p2=james/imap/trunk/maildir/src/test/java/org/apache/james/mailbox/functional/maildir/MaildirStressTest.java&p1=james/imap/trunk/maildir/src/test/java/org/apache/james/imap/functional/maildir/MaildirStressTest.java&r1=993114&r2=993124&rev=993124&view=diff
==============================================================================
--- james/imap/trunk/maildir/src/test/java/org/apache/james/imap/functional/maildir/MaildirStressTest.java (original)
+++ james/imap/trunk/maildir/src/test/java/org/apache/james/mailbox/functional/maildir/MaildirStressTest.java Mon Sep  6 18:59:58 2010
@@ -16,17 +16,17 @@
  * specific language governing permissions and limitations      *
  * under the License.                                           *
  ****************************************************************/
-package org.apache.james.imap.functional.maildir;
+package org.apache.james.mailbox.functional.maildir;
 
 import java.io.File;
 import java.io.IOException;
 
 import org.apache.commons.io.FileUtils;
 import org.apache.james.imap.functional.AbstractStressTest;
-import org.apache.james.imap.maildir.MaildirMailboxManager;
-import org.apache.james.imap.maildir.MaildirMailboxSessionMapperFactory;
-import org.apache.james.imap.store.StoreMailboxManager;
 import org.apache.james.mailbox.MailboxException;
+import org.apache.james.mailbox.maildir.MaildirMailboxManager;
+import org.apache.james.mailbox.maildir.MaildirMailboxSessionMapperFactory;
+import org.apache.james.mailbox.store.StoreMailboxManager;
 import org.junit.After;
 import org.junit.Before;
 

Modified: james/imap/trunk/maildir/src/test/java/org/apache/james/mailbox/functional/maildir/NonAuthenticatedStateTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/maildir/src/test/java/org/apache/james/mailbox/functional/maildir/NonAuthenticatedStateTest.java?rev=993124&r1=991286&r2=993124&view=diff
==============================================================================
--- james/imap/trunk/maildir/src/test/java/org/apache/james/mailbox/functional/maildir/NonAuthenticatedStateTest.java (original)
+++ james/imap/trunk/maildir/src/test/java/org/apache/james/mailbox/functional/maildir/NonAuthenticatedStateTest.java Mon Sep  6 18:59:58 2010
@@ -17,7 +17,7 @@
  * under the License.                                           *
  ****************************************************************/
 
-package org.apache.james.imap.functional.maildir;
+package org.apache.james.mailbox.functional.maildir;
 
 import org.apache.james.imap.functional.suite.NonAuthenticatedState;
 

Modified: james/imap/trunk/maildir/src/test/java/org/apache/james/mailbox/functional/maildir/OsDetector.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/maildir/src/test/java/org/apache/james/mailbox/functional/maildir/OsDetector.java?rev=993124&r1=991286&r2=993124&view=diff
==============================================================================
--- james/imap/trunk/maildir/src/test/java/org/apache/james/mailbox/functional/maildir/OsDetector.java (original)
+++ james/imap/trunk/maildir/src/test/java/org/apache/james/mailbox/functional/maildir/OsDetector.java Mon Sep  6 18:59:58 2010
@@ -17,7 +17,7 @@
  * under the License.                                           *
  ****************************************************************/
 
-package org.apache.james.imap.functional.maildir;
+package org.apache.james.mailbox.functional.maildir;
 
 public class OsDetector {
 

Modified: james/imap/trunk/maildir/src/test/java/org/apache/james/mailbox/functional/maildir/PartialFetchTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/maildir/src/test/java/org/apache/james/mailbox/functional/maildir/PartialFetchTest.java?rev=993124&r1=991286&r2=993124&view=diff
==============================================================================
--- james/imap/trunk/maildir/src/test/java/org/apache/james/mailbox/functional/maildir/PartialFetchTest.java (original)
+++ james/imap/trunk/maildir/src/test/java/org/apache/james/mailbox/functional/maildir/PartialFetchTest.java Mon Sep  6 18:59:58 2010
@@ -17,7 +17,7 @@
  * under the License.                                           *
  ****************************************************************/
 
-package org.apache.james.imap.functional.maildir;
+package org.apache.james.mailbox.functional.maildir;
 
 import org.apache.james.imap.functional.suite.PartialFetch;
 

Modified: james/imap/trunk/maildir/src/test/java/org/apache/james/mailbox/functional/maildir/RenameTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/maildir/src/test/java/org/apache/james/mailbox/functional/maildir/RenameTest.java?rev=993124&r1=991286&r2=993124&view=diff
==============================================================================
--- james/imap/trunk/maildir/src/test/java/org/apache/james/mailbox/functional/maildir/RenameTest.java (original)
+++ james/imap/trunk/maildir/src/test/java/org/apache/james/mailbox/functional/maildir/RenameTest.java Mon Sep  6 18:59:58 2010
@@ -17,7 +17,7 @@
  * under the License.                                           *
  ****************************************************************/
 
-package org.apache.james.imap.functional.maildir;
+package org.apache.james.mailbox.functional.maildir;
 
 import org.apache.james.imap.functional.suite.Rename;
 

Modified: james/imap/trunk/maildir/src/test/java/org/apache/james/mailbox/functional/maildir/SecurityTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/maildir/src/test/java/org/apache/james/mailbox/functional/maildir/SecurityTest.java?rev=993124&r1=991286&r2=993124&view=diff
==============================================================================
--- james/imap/trunk/maildir/src/test/java/org/apache/james/mailbox/functional/maildir/SecurityTest.java (original)
+++ james/imap/trunk/maildir/src/test/java/org/apache/james/mailbox/functional/maildir/SecurityTest.java Mon Sep  6 18:59:58 2010
@@ -17,7 +17,7 @@
  * under the License.                                           *
  ****************************************************************/
 
-package org.apache.james.imap.functional.maildir;
+package org.apache.james.mailbox.functional.maildir;
 
 import org.apache.james.imap.functional.suite.Security;
 

Modified: james/imap/trunk/maildir/src/test/java/org/apache/james/mailbox/functional/maildir/SelectTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/maildir/src/test/java/org/apache/james/mailbox/functional/maildir/SelectTest.java?rev=993124&r1=991286&r2=993124&view=diff
==============================================================================
--- james/imap/trunk/maildir/src/test/java/org/apache/james/mailbox/functional/maildir/SelectTest.java (original)
+++ james/imap/trunk/maildir/src/test/java/org/apache/james/mailbox/functional/maildir/SelectTest.java Mon Sep  6 18:59:58 2010
@@ -17,7 +17,7 @@
  * under the License.                                           *
  ****************************************************************/
 
-package org.apache.james.imap.functional.maildir;
+package org.apache.james.mailbox.functional.maildir;
 
 import org.apache.james.imap.functional.suite.Select;
 

Modified: james/imap/trunk/maildir/src/test/java/org/apache/james/mailbox/functional/maildir/SelectedInboxTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/maildir/src/test/java/org/apache/james/mailbox/functional/maildir/SelectedInboxTest.java?rev=993124&r1=991286&r2=993124&view=diff
==============================================================================
--- james/imap/trunk/maildir/src/test/java/org/apache/james/mailbox/functional/maildir/SelectedInboxTest.java (original)
+++ james/imap/trunk/maildir/src/test/java/org/apache/james/mailbox/functional/maildir/SelectedInboxTest.java Mon Sep  6 18:59:58 2010
@@ -17,7 +17,7 @@
  * under the License.                                           *
  ****************************************************************/
 
-package org.apache.james.imap.functional.maildir;
+package org.apache.james.mailbox.functional.maildir;
 
 import org.apache.james.imap.functional.suite.SelectedInbox;
 

Modified: james/imap/trunk/maildir/src/test/java/org/apache/james/mailbox/functional/maildir/SelectedStateTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/maildir/src/test/java/org/apache/james/mailbox/functional/maildir/SelectedStateTest.java?rev=993124&r1=991286&r2=993124&view=diff
==============================================================================
--- james/imap/trunk/maildir/src/test/java/org/apache/james/mailbox/functional/maildir/SelectedStateTest.java (original)
+++ james/imap/trunk/maildir/src/test/java/org/apache/james/mailbox/functional/maildir/SelectedStateTest.java Mon Sep  6 18:59:58 2010
@@ -17,7 +17,7 @@
  * under the License.                                           *
  ****************************************************************/
 
-package org.apache.james.imap.functional.maildir;
+package org.apache.james.mailbox.functional.maildir;
 
 import org.apache.james.imap.functional.suite.SelectedState;
 

Modified: james/imap/trunk/maildir/src/test/java/org/apache/james/mailbox/functional/maildir/UidSearchTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/maildir/src/test/java/org/apache/james/mailbox/functional/maildir/UidSearchTest.java?rev=993124&r1=991286&r2=993124&view=diff
==============================================================================
--- james/imap/trunk/maildir/src/test/java/org/apache/james/mailbox/functional/maildir/UidSearchTest.java (original)
+++ james/imap/trunk/maildir/src/test/java/org/apache/james/mailbox/functional/maildir/UidSearchTest.java Mon Sep  6 18:59:58 2010
@@ -17,7 +17,7 @@
  * under the License.                                           *
  ****************************************************************/
 
-package org.apache.james.imap.functional.maildir;
+package org.apache.james.mailbox.functional.maildir;
 
 import org.apache.james.imap.functional.suite.UidSearch;
 import org.junit.Test;

Copied: james/imap/trunk/memory/src/main/java/org/apache/james/mailbox/inmemory/InMemoryMailboxManager.java (from r993114, james/imap/trunk/memory/src/main/java/org/apache/james/imap/inmemory/InMemoryMailboxManager.java)
URL: http://svn.apache.org/viewvc/james/imap/trunk/memory/src/main/java/org/apache/james/mailbox/inmemory/InMemoryMailboxManager.java?p2=james/imap/trunk/memory/src/main/java/org/apache/james/mailbox/inmemory/InMemoryMailboxManager.java&p1=james/imap/trunk/memory/src/main/java/org/apache/james/imap/inmemory/InMemoryMailboxManager.java&r1=993114&r2=993124&rev=993124&view=diff
==============================================================================
--- james/imap/trunk/memory/src/main/java/org/apache/james/imap/inmemory/InMemoryMailboxManager.java (original)
+++ james/imap/trunk/memory/src/main/java/org/apache/james/mailbox/inmemory/InMemoryMailboxManager.java Mon Sep  6 18:59:58 2010
@@ -17,17 +17,17 @@
  * under the License.                                           *
  ****************************************************************/
 
-package org.apache.james.imap.inmemory;
+package org.apache.james.mailbox.inmemory;
 
-import org.apache.james.imap.inmemory.mail.model.InMemoryMailbox;
-import org.apache.james.imap.store.Authenticator;
-import org.apache.james.imap.store.MailboxSessionMapperFactory;
-import org.apache.james.imap.store.StoreMailboxManager;
-import org.apache.james.imap.store.MapperStoreMessageManager;
-import org.apache.james.imap.store.mail.model.Mailbox;
 import org.apache.james.mailbox.MailboxException;
 import org.apache.james.mailbox.MailboxPath;
 import org.apache.james.mailbox.MailboxSession;
+import org.apache.james.mailbox.inmemory.mail.model.InMemoryMailbox;
+import org.apache.james.mailbox.store.Authenticator;
+import org.apache.james.mailbox.store.MailboxSessionMapperFactory;
+import org.apache.james.mailbox.store.MapperStoreMessageManager;
+import org.apache.james.mailbox.store.StoreMailboxManager;
+import org.apache.james.mailbox.store.mail.model.Mailbox;
 import org.apache.james.mailbox.util.MailboxEventDispatcher;
 
 public class InMemoryMailboxManager extends StoreMailboxManager<Long> {

Copied: james/imap/trunk/memory/src/main/java/org/apache/james/mailbox/inmemory/InMemoryMailboxSessionMapperFactory.java (from r993114, james/imap/trunk/memory/src/main/java/org/apache/james/imap/inmemory/InMemoryMailboxSessionMapperFactory.java)
URL: http://svn.apache.org/viewvc/james/imap/trunk/memory/src/main/java/org/apache/james/mailbox/inmemory/InMemoryMailboxSessionMapperFactory.java?p2=james/imap/trunk/memory/src/main/java/org/apache/james/mailbox/inmemory/InMemoryMailboxSessionMapperFactory.java&p1=james/imap/trunk/memory/src/main/java/org/apache/james/imap/inmemory/InMemoryMailboxSessionMapperFactory.java&r1=993114&r2=993124&rev=993124&view=diff
==============================================================================
--- james/imap/trunk/memory/src/main/java/org/apache/james/imap/inmemory/InMemoryMailboxSessionMapperFactory.java (original)
+++ james/imap/trunk/memory/src/main/java/org/apache/james/mailbox/inmemory/InMemoryMailboxSessionMapperFactory.java Mon Sep  6 18:59:58 2010
@@ -16,20 +16,20 @@
  * specific language governing permissions and limitations      *
  * under the License.                                           *
  ****************************************************************/
-package org.apache.james.imap.inmemory;
+package org.apache.james.mailbox.inmemory;
 
-import org.apache.james.imap.inmemory.mail.InMemoryMailboxMapper;
-import org.apache.james.imap.inmemory.mail.InMemoryMessageMapper;
-import org.apache.james.imap.inmemory.user.InMemorySubscriptionMapper;
-import org.apache.james.imap.store.MailboxSessionMapperFactory;
-import org.apache.james.imap.store.mail.MailboxMapper;
-import org.apache.james.imap.store.mail.MessageMapper;
-import org.apache.james.imap.store.transaction.Mapper;
-import org.apache.james.imap.store.user.SubscriptionMapper;
 import org.apache.james.mailbox.MailboxConstants;
 import org.apache.james.mailbox.MailboxException;
 import org.apache.james.mailbox.MailboxSession;
 import org.apache.james.mailbox.SubscriptionException;
+import org.apache.james.mailbox.inmemory.mail.InMemoryMailboxMapper;
+import org.apache.james.mailbox.inmemory.mail.InMemoryMessageMapper;
+import org.apache.james.mailbox.inmemory.user.InMemorySubscriptionMapper;
+import org.apache.james.mailbox.store.MailboxSessionMapperFactory;
+import org.apache.james.mailbox.store.mail.MailboxMapper;
+import org.apache.james.mailbox.store.mail.MessageMapper;
+import org.apache.james.mailbox.store.transaction.Mapper;
+import org.apache.james.mailbox.store.user.SubscriptionMapper;
 
 public class InMemoryMailboxSessionMapperFactory extends MailboxSessionMapperFactory<Long> {
 

Copied: james/imap/trunk/memory/src/main/java/org/apache/james/mailbox/inmemory/InMemoryStoreMessageManager.java (from r993114, james/imap/trunk/memory/src/main/java/org/apache/james/imap/inmemory/InMemoryStoreMessageManager.java)
URL: http://svn.apache.org/viewvc/james/imap/trunk/memory/src/main/java/org/apache/james/mailbox/inmemory/InMemoryStoreMessageManager.java?p2=james/imap/trunk/memory/src/main/java/org/apache/james/mailbox/inmemory/InMemoryStoreMessageManager.java&p1=james/imap/trunk/memory/src/main/java/org/apache/james/imap/inmemory/InMemoryStoreMessageManager.java&r1=993114&r2=993124&rev=993124&view=diff
==============================================================================
--- james/imap/trunk/memory/src/main/java/org/apache/james/imap/inmemory/InMemoryStoreMessageManager.java (original)
+++ james/imap/trunk/memory/src/main/java/org/apache/james/mailbox/inmemory/InMemoryStoreMessageManager.java Mon Sep  6 18:59:58 2010
@@ -17,7 +17,7 @@
  * under the License.                                           *
  ****************************************************************/
 
-package org.apache.james.imap.inmemory;
+package org.apache.james.mailbox.inmemory;
 
 import java.io.ByteArrayOutputStream;
 import java.io.InputStream;
@@ -26,15 +26,15 @@ import java.util.List;
 
 import javax.mail.Flags;
 
-import org.apache.james.imap.inmemory.mail.model.InMemoryMailbox;
-import org.apache.james.imap.inmemory.mail.model.SimpleHeader;
-import org.apache.james.imap.inmemory.mail.model.SimpleMailboxMembership;
-import org.apache.james.imap.store.MailboxSessionMapperFactory;
-import org.apache.james.imap.store.MapperStoreMessageManager;
-import org.apache.james.imap.store.mail.model.Header;
-import org.apache.james.imap.store.mail.model.MailboxMembership;
-import org.apache.james.imap.store.mail.model.PropertyBuilder;
 import org.apache.james.mailbox.MailboxException;
+import org.apache.james.mailbox.inmemory.mail.model.InMemoryMailbox;
+import org.apache.james.mailbox.inmemory.mail.model.SimpleHeader;
+import org.apache.james.mailbox.inmemory.mail.model.SimpleMailboxMembership;
+import org.apache.james.mailbox.store.MailboxSessionMapperFactory;
+import org.apache.james.mailbox.store.MapperStoreMessageManager;
+import org.apache.james.mailbox.store.mail.model.Header;
+import org.apache.james.mailbox.store.mail.model.MailboxMembership;
+import org.apache.james.mailbox.store.mail.model.PropertyBuilder;
 import org.apache.james.mailbox.util.MailboxEventDispatcher;
 
 public class InMemoryStoreMessageManager extends MapperStoreMessageManager<Long> {

Copied: james/imap/trunk/memory/src/main/java/org/apache/james/mailbox/inmemory/InMemorySubscriptionManager.java (from r993114, james/imap/trunk/memory/src/main/java/org/apache/james/imap/inmemory/InMemorySubscriptionManager.java)
URL: http://svn.apache.org/viewvc/james/imap/trunk/memory/src/main/java/org/apache/james/mailbox/inmemory/InMemorySubscriptionManager.java?p2=james/imap/trunk/memory/src/main/java/org/apache/james/mailbox/inmemory/InMemorySubscriptionManager.java&p1=james/imap/trunk/memory/src/main/java/org/apache/james/imap/inmemory/InMemorySubscriptionManager.java&r1=993114&r2=993124&rev=993124&view=diff
==============================================================================
--- james/imap/trunk/memory/src/main/java/org/apache/james/imap/inmemory/InMemorySubscriptionManager.java (original)
+++ james/imap/trunk/memory/src/main/java/org/apache/james/mailbox/inmemory/InMemorySubscriptionManager.java Mon Sep  6 18:59:58 2010
@@ -16,15 +16,15 @@
  * specific language governing permissions and limitations      *
  * under the License.                                           *
  ****************************************************************/
-package org.apache.james.imap.inmemory;
+package org.apache.james.mailbox.inmemory;
 
-import org.apache.james.imap.inmemory.user.model.InMemorySubscription;
-import org.apache.james.imap.store.MailboxSessionMapperFactory;
-import org.apache.james.imap.store.StoreSubscriptionManager;
-import org.apache.james.imap.store.transaction.Mapper.Transaction;
-import org.apache.james.imap.store.user.model.Subscription;
 import org.apache.james.mailbox.MailboxException;
 import org.apache.james.mailbox.MailboxSession;
+import org.apache.james.mailbox.inmemory.user.model.InMemorySubscription;
+import org.apache.james.mailbox.store.MailboxSessionMapperFactory;
+import org.apache.james.mailbox.store.StoreSubscriptionManager;
+import org.apache.james.mailbox.store.transaction.Mapper.Transaction;
+import org.apache.james.mailbox.store.user.model.Subscription;
 
 /**
  * Stores subscriptions in memory.
@@ -42,7 +42,7 @@ public class InMemorySubscriptionManager
 
     /*
      * (non-Javadoc)
-     * @see org.apache.james.imap.store.transaction.TransactionalMapper#execute(org.apache.james.imap.store.transaction.TransactionalMapper.Transaction)
+     * @see org.apache.james.mailbox.store.transaction.TransactionalMapper#execute(org.apache.james.mailbox.store.transaction.TransactionalMapper.Transaction)
      */
     public void execute(Transaction transaction) throws MailboxException {
         transaction.run();
@@ -50,7 +50,7 @@ public class InMemorySubscriptionManager
 
     /*
      * (non-Javadoc)
-     * @see org.apache.james.imap.store.transaction.TransactionalMapper#dispose()
+     * @see org.apache.james.mailbox.store.transaction.TransactionalMapper#dispose()
      */
     public void dispose() {
         // do nothing

Copied: james/imap/trunk/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryMailboxMapper.java (from r993114, james/imap/trunk/memory/src/main/java/org/apache/james/imap/inmemory/mail/InMemoryMailboxMapper.java)
URL: http://svn.apache.org/viewvc/james/imap/trunk/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryMailboxMapper.java?p2=james/imap/trunk/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryMailboxMapper.java&p1=james/imap/trunk/memory/src/main/java/org/apache/james/imap/inmemory/mail/InMemoryMailboxMapper.java&r1=993114&r2=993124&rev=993124&view=diff
==============================================================================
--- james/imap/trunk/memory/src/main/java/org/apache/james/imap/inmemory/mail/InMemoryMailboxMapper.java (original)
+++ james/imap/trunk/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryMailboxMapper.java Mon Sep  6 18:59:58 2010
@@ -16,20 +16,20 @@
  * specific language governing permissions and limitations      *
  * under the License.                                           *
  ****************************************************************/
-package org.apache.james.imap.inmemory.mail;
+package org.apache.james.mailbox.inmemory.mail;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-import org.apache.james.imap.inmemory.mail.model.InMemoryMailbox;
-import org.apache.james.imap.store.mail.MailboxMapper;
-import org.apache.james.imap.store.mail.model.Mailbox;
-import org.apache.james.imap.store.transaction.NonTransactionalMapper;
 import org.apache.james.mailbox.MailboxException;
 import org.apache.james.mailbox.MailboxNotFoundException;
 import org.apache.james.mailbox.MailboxPath;
+import org.apache.james.mailbox.inmemory.mail.model.InMemoryMailbox;
+import org.apache.james.mailbox.store.mail.MailboxMapper;
+import org.apache.james.mailbox.store.mail.model.Mailbox;
+import org.apache.james.mailbox.store.transaction.NonTransactionalMapper;
 
 public class InMemoryMailboxMapper extends NonTransactionalMapper implements MailboxMapper<Long> {
     
@@ -44,7 +44,7 @@ public class InMemoryMailboxMapper exten
 
     /*
      * (non-Javadoc)
-     * @see org.apache.james.imap.store.mail.MailboxMapper#delete(org.apache.james.imap.store.mail.model.Mailbox)
+     * @see org.apache.james.mailbox.store.mail.MailboxMapper#delete(org.apache.james.mailbox.store.mail.model.Mailbox)
      */
     public void delete(Mailbox<Long> mailbox) throws MailboxException {
         mailboxesById.remove(mailbox.getMailboxId());
@@ -52,7 +52,7 @@ public class InMemoryMailboxMapper exten
 
     /*
      * (non-Javadoc)
-     * @see org.apache.james.imap.store.mail.MailboxMapper#deleteAll()
+     * @see org.apache.james.mailbox.store.mail.MailboxMapper#deleteAll()
      */
     public void deleteAll() throws MailboxException {
         mailboxesById.clear();
@@ -61,7 +61,7 @@ public class InMemoryMailboxMapper exten
 
     /*
      * (non-Javadoc)
-     * @see org.apache.james.imap.store.mail.MailboxMapper#findMailboxById(java.lang.Object)
+     * @see org.apache.james.mailbox.store.mail.MailboxMapper#findMailboxById(java.lang.Object)
      */
     public Mailbox<Long> findMailboxById(Long mailboxId) throws MailboxException, MailboxNotFoundException {
         Mailbox<Long> mailbox = mailboxesById.get(mailboxesById);
@@ -74,7 +74,7 @@ public class InMemoryMailboxMapper exten
 
     /*
      * (non-Javadoc)
-     * @see org.apache.james.imap.store.mail.MailboxMapper#findMailboxByName(java.lang.String)
+     * @see org.apache.james.mailbox.store.mail.MailboxMapper#findMailboxByName(java.lang.String)
      */
     public synchronized Mailbox<Long> findMailboxByPath(MailboxPath path) throws MailboxException, MailboxNotFoundException {
         Mailbox<Long> result = null;
@@ -94,7 +94,7 @@ public class InMemoryMailboxMapper exten
 
     /*
      * (non-Javadoc)
-     * @see org.apache.james.imap.store.mail.MailboxMapper#findMailboxWithNameLike(java.lang.String)
+     * @see org.apache.james.mailbox.store.mail.MailboxMapper#findMailboxWithNameLike(java.lang.String)
      */
     public List<Mailbox<Long>> findMailboxWithPathLike(MailboxPath path) throws MailboxException {
         final String regex = path.getName().replace("%", ".*");
@@ -109,7 +109,7 @@ public class InMemoryMailboxMapper exten
 
     /*
      * (non-Javadoc)
-     * @see org.apache.james.imap.store.mail.MailboxMapper#save(org.apache.james.imap.store.mail.model.Mailbox)
+     * @see org.apache.james.mailbox.store.mail.MailboxMapper#save(org.apache.james.mailbox.store.mail.model.Mailbox)
      */
     public void save(Mailbox<Long> mailbox) throws MailboxException {
         mailboxesById.put(mailbox.getMailboxId(), (InMemoryMailbox) mailbox);
@@ -124,7 +124,7 @@ public class InMemoryMailboxMapper exten
 
     /*
      * (non-Javadoc)
-     * @see org.apache.james.imap.store.mail.MailboxMapper#hasChildren(org.apache.james.imap.store.mail.model.Mailbox)
+     * @see org.apache.james.mailbox.store.mail.MailboxMapper#hasChildren(org.apache.james.mailbox.store.mail.model.Mailbox)
      */
     public boolean hasChildren(Mailbox<Long> mailbox) throws MailboxException,
             MailboxNotFoundException {

Copied: james/imap/trunk/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryMessageMapper.java (from r993114, james/imap/trunk/memory/src/main/java/org/apache/james/imap/inmemory/mail/InMemoryMessageMapper.java)
URL: http://svn.apache.org/viewvc/james/imap/trunk/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryMessageMapper.java?p2=james/imap/trunk/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryMessageMapper.java&p1=james/imap/trunk/memory/src/main/java/org/apache/james/imap/inmemory/mail/InMemoryMessageMapper.java&r1=993114&r2=993124&rev=993124&view=diff
==============================================================================
--- james/imap/trunk/memory/src/main/java/org/apache/james/imap/inmemory/mail/InMemoryMessageMapper.java (original)
+++ james/imap/trunk/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryMessageMapper.java Mon Sep  6 18:59:58 2010
@@ -17,7 +17,7 @@
  * under the License.                                           *
  ****************************************************************/
 
-package org.apache.james.imap.inmemory.mail;
+package org.apache.james.mailbox.inmemory.mail;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -26,17 +26,17 @@ import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-import org.apache.james.imap.inmemory.mail.model.InMemoryMailbox;
-import org.apache.james.imap.inmemory.mail.model.SimpleMailboxMembership;
-import org.apache.james.imap.store.MailboxMembershipComparator;
-import org.apache.james.imap.store.SearchQueryIterator;
-import org.apache.james.imap.store.mail.MessageMapper;
-import org.apache.james.imap.store.mail.model.Mailbox;
-import org.apache.james.imap.store.mail.model.MailboxMembership;
-import org.apache.james.imap.store.transaction.NonTransactionalMapper;
 import org.apache.james.mailbox.MailboxException;
 import org.apache.james.mailbox.MessageRange;
 import org.apache.james.mailbox.SearchQuery;
+import org.apache.james.mailbox.inmemory.mail.model.InMemoryMailbox;
+import org.apache.james.mailbox.inmemory.mail.model.SimpleMailboxMembership;
+import org.apache.james.mailbox.store.MailboxMembershipComparator;
+import org.apache.james.mailbox.store.SearchQueryIterator;
+import org.apache.james.mailbox.store.mail.MessageMapper;
+import org.apache.james.mailbox.store.mail.model.Mailbox;
+import org.apache.james.mailbox.store.mail.model.MailboxMembership;
+import org.apache.james.mailbox.store.transaction.NonTransactionalMapper;
 
 public class InMemoryMessageMapper extends NonTransactionalMapper implements MessageMapper<Long> {
 
@@ -58,7 +58,7 @@ public class InMemoryMessageMapper exten
     
     /*
      * (non-Javadoc)
-     * @see org.apache.james.imap.store.mail.MessageMapper#countMessagesInMailbox()
+     * @see org.apache.james.mailbox.store.mail.MessageMapper#countMessagesInMailbox()
      */
     public long countMessagesInMailbox(Mailbox<Long> mailbox) throws MailboxException {
         return getMembershipByUidForMailbox(mailbox).size();
@@ -66,7 +66,7 @@ public class InMemoryMessageMapper exten
 
     /*
      * (non-Javadoc)
-     * @see org.apache.james.imap.store.mail.MessageMapper#countUnseenMessagesInMailbox()
+     * @see org.apache.james.mailbox.store.mail.MessageMapper#countUnseenMessagesInMailbox()
      */
     public long countUnseenMessagesInMailbox(Mailbox<Long> mailbox) throws MailboxException {
         long count = 0;
@@ -80,7 +80,7 @@ public class InMemoryMessageMapper exten
 
     /*
      * (non-Javadoc)
-     * @see org.apache.james.imap.store.mail.MessageMapper#delete(org.apache.james.imap.store.mail.model.MailboxMembership)
+     * @see org.apache.james.mailbox.store.mail.MessageMapper#delete(org.apache.james.mailbox.store.mail.model.MailboxMembership)
      */
     public void delete(Mailbox<Long> mailbox, MailboxMembership<Long> message) throws MailboxException {
         getMembershipByUidForMailbox(mailbox).remove(message.getUid());
@@ -88,7 +88,7 @@ public class InMemoryMessageMapper exten
 
     /*
      * (non-Javadoc)
-     * @see org.apache.james.imap.store.mail.MessageMapper#findInMailbox(java.lang.Object, org.apache.james.mailbox.MessageRange)
+     * @see org.apache.james.mailbox.store.mail.MessageMapper#findInMailbox(java.lang.Object, org.apache.james.mailbox.MessageRange)
      */
     @SuppressWarnings("unchecked")
     public List<MailboxMembership<Long>> findInMailbox(Mailbox<Long> mailbox, MessageRange set) throws MailboxException {
@@ -132,7 +132,7 @@ public class InMemoryMessageMapper exten
 
     /*
      * (non-Javadoc)
-     * @see org.apache.james.imap.store.mail.MessageMapper#findMarkedForDeletionInMailbox(org.apache.james.mailbox.MessageRange)
+     * @see org.apache.james.mailbox.store.mail.MessageMapper#findMarkedForDeletionInMailbox(org.apache.james.mailbox.MessageRange)
      */
     public List<MailboxMembership<Long>> findMarkedForDeletionInMailbox(Mailbox<Long> mailbox, MessageRange set) throws MailboxException {
         final List<MailboxMembership<Long>> results = findInMailbox(mailbox, set);
@@ -146,7 +146,7 @@ public class InMemoryMessageMapper exten
 
     /*
      * (non-Javadoc)
-     * @see org.apache.james.imap.store.mail.MessageMapper#findRecentMessagesInMailbox()
+     * @see org.apache.james.mailbox.store.mail.MessageMapper#findRecentMessagesInMailbox()
      */
     public List<MailboxMembership<Long>> findRecentMessagesInMailbox(Mailbox<Long> mailbox,int limit) throws MailboxException {
         final List<MailboxMembership<Long>> results = new ArrayList<MailboxMembership<Long>>();
@@ -164,7 +164,7 @@ public class InMemoryMessageMapper exten
 
     /*
      * (non-Javadoc)
-     * @see org.apache.james.imap.store.mail.MessageMapper#findFirstUnseenMessageUid(org.apache.james.imap.store.mail.model.Mailbox)
+     * @see org.apache.james.mailbox.store.mail.MessageMapper#findFirstUnseenMessageUid(org.apache.james.mailbox.store.mail.model.Mailbox)
      */
     public Long findFirstUnseenMessageUid(Mailbox<Long> mailbox) throws MailboxException {
         List<MailboxMembership<Long>> memberships = new ArrayList<MailboxMembership<Long>>(getMembershipByUidForMailbox(mailbox).values());
@@ -180,7 +180,7 @@ public class InMemoryMessageMapper exten
 
     /*
      * (non-Javadoc)
-     * @see org.apache.james.imap.store.mail.MessageMapper#save(org.apache.james.imap.store.mail.model.MailboxMembership)
+     * @see org.apache.james.mailbox.store.mail.MessageMapper#save(org.apache.james.mailbox.store.mail.model.MailboxMembership)
      */
     public long save(Mailbox<Long> mailbox, MailboxMembership<Long> message) throws MailboxException {
         getMembershipByUidForMailbox(mailbox).put(message.getUid(), message);
@@ -190,7 +190,7 @@ public class InMemoryMessageMapper exten
 
     /*
      * (non-Javadoc)
-     * @see org.apache.james.imap.store.mail.MessageMapper#searchMailbox(org.apache.james.imap.store.mail.model.Mailbox, org.apache.james.mailbox.SearchQuery)
+     * @see org.apache.james.mailbox.store.mail.MessageMapper#searchMailbox(org.apache.james.mailbox.store.mail.model.Mailbox, org.apache.james.mailbox.SearchQuery)
      */
     public Iterator<Long> searchMailbox(Mailbox<Long> mailbox, SearchQuery query) throws MailboxException {
         List<MailboxMembership<?>> memberships = new ArrayList<MailboxMembership<?>>(getMembershipByUidForMailbox(mailbox).values());
@@ -213,7 +213,7 @@ public class InMemoryMessageMapper exten
   
     /*
      * (non-Javadoc)
-     * @see org.apache.james.imap.store.mail.MessageMapper#copy(org.apache.james.imap.store.mail.model.Mailbox, org.apache.james.imap.store.mail.model.MailboxMembership)
+     * @see org.apache.james.mailbox.store.mail.MessageMapper#copy(org.apache.james.mailbox.store.mail.model.Mailbox, org.apache.james.mailbox.store.mail.model.MailboxMembership)
      */
     public long copy(Mailbox<Long> mailbox, MailboxMembership<Long> original) throws MailboxException {
         ((InMemoryMailbox) mailbox).consumeUid();

Copied: james/imap/trunk/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/model/InMemoryMailbox.java (from r993114, james/imap/trunk/memory/src/main/java/org/apache/james/imap/inmemory/mail/model/InMemoryMailbox.java)
URL: http://svn.apache.org/viewvc/james/imap/trunk/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/model/InMemoryMailbox.java?p2=james/imap/trunk/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/model/InMemoryMailbox.java&p1=james/imap/trunk/memory/src/main/java/org/apache/james/imap/inmemory/mail/model/InMemoryMailbox.java&r1=993114&r2=993124&rev=993124&view=diff
==============================================================================
--- james/imap/trunk/memory/src/main/java/org/apache/james/imap/inmemory/mail/model/InMemoryMailbox.java (original)
+++ james/imap/trunk/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/model/InMemoryMailbox.java Mon Sep  6 18:59:58 2010
@@ -17,12 +17,12 @@
  * under the License.                                           *
  ****************************************************************/
 
-package org.apache.james.imap.inmemory.mail.model;
+package org.apache.james.mailbox.inmemory.mail.model;
 
 import java.util.concurrent.atomic.AtomicLong;
 
-import org.apache.james.imap.store.mail.model.Mailbox;
 import org.apache.james.mailbox.MailboxPath;
+import org.apache.james.mailbox.store.mail.model.Mailbox;
 
 /**
  * Mailbox data which is stored only in memory.

Modified: james/imap/trunk/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/model/SimpleHeader.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/model/SimpleHeader.java?rev=993124&r1=991286&r2=993124&view=diff
==============================================================================
--- james/imap/trunk/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/model/SimpleHeader.java (original)
+++ james/imap/trunk/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/model/SimpleHeader.java Mon Sep  6 18:59:58 2010
@@ -17,9 +17,9 @@
  * under the License.                                           *
  ****************************************************************/
 
-package org.apache.james.imap.inmemory.mail.model;
+package org.apache.james.mailbox.inmemory.mail.model;
 
-import org.apache.james.imap.store.mail.model.AbstractComparableHeader;
+import org.apache.james.mailbox.store.mail.model.AbstractComparableHeader;
 
 public class SimpleHeader extends AbstractComparableHeader {
 

Modified: james/imap/trunk/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/model/SimpleMailboxMembership.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/model/SimpleMailboxMembership.java?rev=993124&r1=991286&r2=993124&view=diff
==============================================================================
--- james/imap/trunk/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/model/SimpleMailboxMembership.java (original)
+++ james/imap/trunk/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/model/SimpleMailboxMembership.java Mon Sep  6 18:59:58 2010
@@ -17,7 +17,7 @@
  * under the License.                                           *
  ****************************************************************/
 
-package org.apache.james.imap.inmemory.mail.model;
+package org.apache.james.mailbox.inmemory.mail.model;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
@@ -26,14 +26,14 @@ import java.util.List;
 
 import javax.mail.Flags;
 
-import org.apache.james.imap.store.mail.model.AbstractMailboxMembership;
-import org.apache.james.imap.store.mail.model.Message;
-import org.apache.james.imap.store.mail.model.Header;
-import org.apache.james.imap.store.mail.model.MailboxMembership;
-import org.apache.james.imap.store.mail.model.Property;
-import org.apache.james.imap.store.mail.model.PropertyBuilder;
-import org.apache.james.imap.store.streaming.LazySkippingInputStream;
-import org.apache.james.imap.store.streaming.RewindableInputStream;
+import org.apache.james.mailbox.store.mail.model.AbstractMailboxMembership;
+import org.apache.james.mailbox.store.mail.model.Header;
+import org.apache.james.mailbox.store.mail.model.MailboxMembership;
+import org.apache.james.mailbox.store.mail.model.Message;
+import org.apache.james.mailbox.store.mail.model.Property;
+import org.apache.james.mailbox.store.mail.model.PropertyBuilder;
+import org.apache.james.mailbox.store.streaming.LazySkippingInputStream;
+import org.apache.james.mailbox.store.streaming.RewindableInputStream;
 
 public class SimpleMailboxMembership extends AbstractMailboxMembership<Long> implements Message, Comparable<MailboxMembership<Long>> {
 

Copied: james/imap/trunk/memory/src/main/java/org/apache/james/mailbox/inmemory/user/InMemorySubscriptionMapper.java (from r991286, james/imap/trunk/memory/src/main/java/org/apache/james/imap/inmemory/user/InMemorySubscriptionMapper.java)
URL: http://svn.apache.org/viewvc/james/imap/trunk/memory/src/main/java/org/apache/james/mailbox/inmemory/user/InMemorySubscriptionMapper.java?p2=james/imap/trunk/memory/src/main/java/org/apache/james/mailbox/inmemory/user/InMemorySubscriptionMapper.java&p1=james/imap/trunk/memory/src/main/java/org/apache/james/imap/inmemory/user/InMemorySubscriptionMapper.java&r1=991286&r2=993124&rev=993124&view=diff
==============================================================================
--- james/imap/trunk/memory/src/main/java/org/apache/james/imap/inmemory/user/InMemorySubscriptionMapper.java (original)
+++ james/imap/trunk/memory/src/main/java/org/apache/james/mailbox/inmemory/user/InMemorySubscriptionMapper.java Mon Sep  6 18:59:58 2010
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations      *
  * under the License.                                           *
  ****************************************************************/
-package org.apache.james.imap.inmemory.user;
+package org.apache.james.mailbox.inmemory.user;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -24,9 +24,9 @@ import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-import org.apache.james.imap.store.transaction.NonTransactionalMapper;
-import org.apache.james.imap.store.user.SubscriptionMapper;
-import org.apache.james.imap.store.user.model.Subscription;
+import org.apache.james.mailbox.store.transaction.NonTransactionalMapper;
+import org.apache.james.mailbox.store.user.SubscriptionMapper;
+import org.apache.james.mailbox.store.user.model.Subscription;
 
 public class InMemorySubscriptionMapper extends NonTransactionalMapper implements SubscriptionMapper {
     
@@ -39,7 +39,7 @@ public class InMemorySubscriptionMapper 
 
     /*
      * (non-Javadoc)
-     * @see org.apache.james.imap.store.user.SubscriptionMapper#delete(org.apache.james.imap.store.user.model.Subscription)
+     * @see org.apache.james.mailbox.store.user.SubscriptionMapper#delete(org.apache.james.mailbox.store.user.model.Subscription)
      */
     public synchronized void delete(Subscription subscription) {
         final String user = subscription.getUser();
@@ -51,7 +51,7 @@ public class InMemorySubscriptionMapper 
 
     /*
      * (non-Javadoc)
-     * @see org.apache.james.imap.store.user.SubscriptionMapper#findMailboxSubscriptionForUser(java.lang.String, java.lang.String)
+     * @see org.apache.james.mailbox.store.user.SubscriptionMapper#findMailboxSubscriptionForUser(java.lang.String, java.lang.String)
      */
     public Subscription findMailboxSubscriptionForUser(String user, String mailbox) {
         final List<Subscription> subscriptions = subscriptionsByUser.get(user);
@@ -69,7 +69,7 @@ public class InMemorySubscriptionMapper 
 
     /*
      * (non-Javadoc)
-     * @see org.apache.james.imap.store.user.SubscriptionMapper#findSubscriptionsForUser(java.lang.String)
+     * @see org.apache.james.mailbox.store.user.SubscriptionMapper#findSubscriptionsForUser(java.lang.String)
      */
     @SuppressWarnings("unchecked")
     public List<Subscription> findSubscriptionsForUser(String user) {
@@ -86,7 +86,7 @@ public class InMemorySubscriptionMapper 
 
     /*
      * (non-Javadoc)
-     * @see org.apache.james.imap.store.user.SubscriptionMapper#save(org.apache.james.imap.store.user.model.Subscription)
+     * @see org.apache.james.mailbox.store.user.SubscriptionMapper#save(org.apache.james.mailbox.store.user.model.Subscription)
      */
     public synchronized void save(Subscription subscription) {
         final String user = subscription.getUser();

Copied: james/imap/trunk/memory/src/main/java/org/apache/james/mailbox/inmemory/user/model/InMemorySubscription.java (from r993114, james/imap/trunk/memory/src/main/java/org/apache/james/imap/inmemory/user/model/InMemorySubscription.java)
URL: http://svn.apache.org/viewvc/james/imap/trunk/memory/src/main/java/org/apache/james/mailbox/inmemory/user/model/InMemorySubscription.java?p2=james/imap/trunk/memory/src/main/java/org/apache/james/mailbox/inmemory/user/model/InMemorySubscription.java&p1=james/imap/trunk/memory/src/main/java/org/apache/james/imap/inmemory/user/model/InMemorySubscription.java&r1=993114&r2=993124&rev=993124&view=diff
==============================================================================
--- james/imap/trunk/memory/src/main/java/org/apache/james/imap/inmemory/user/model/InMemorySubscription.java (original)
+++ james/imap/trunk/memory/src/main/java/org/apache/james/mailbox/inmemory/user/model/InMemorySubscription.java Mon Sep  6 18:59:58 2010
@@ -16,10 +16,10 @@
  * specific language governing permissions and limitations      *
  * under the License.                                           *
  ****************************************************************/
-package org.apache.james.imap.inmemory.user.model;
+package org.apache.james.mailbox.inmemory.user.model;
 
-import org.apache.james.imap.store.user.model.Subscription;
 import org.apache.james.mailbox.MailboxSession.User;
+import org.apache.james.mailbox.store.user.model.Subscription;
 
 public class InMemorySubscription implements Subscription {
 

Modified: james/imap/trunk/memory/src/test/java/org/apache/james/mailbox/inmemory/AuthenticatedStateTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/memory/src/test/java/org/apache/james/mailbox/inmemory/AuthenticatedStateTest.java?rev=993124&r1=991286&r2=993124&view=diff
==============================================================================
--- james/imap/trunk/memory/src/test/java/org/apache/james/mailbox/inmemory/AuthenticatedStateTest.java (original)
+++ james/imap/trunk/memory/src/test/java/org/apache/james/mailbox/inmemory/AuthenticatedStateTest.java Mon Sep  6 18:59:58 2010
@@ -17,7 +17,7 @@
  * under the License.                                           *
  ****************************************************************/
 
-package org.apache.james.imap.functional.inmemory;
+package org.apache.james.mailbox.inmemory;
 
 import org.apache.james.imap.functional.suite.AuthenticatedState;
 



---------------------------------------------------------------------
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