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 [2/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/jcr/src/main/java/org/apache/james/mailbox/jcr/Persistent.java (from r991286, james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/Persistent.java)
URL: http://svn.apache.org/viewvc/james/imap/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/Persistent.java?p2=james/imap/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/Persistent.java&p1=james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/Persistent.java&r1=991286&r2=993124&rev=993124&view=diff
==============================================================================
--- james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/Persistent.java (original)
+++ james/imap/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/Persistent.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.jcr;
+package org.apache.james.mailbox.jcr;
 
 import java.io.IOException;
 

Copied: james/imap/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/JCRMailboxMapper.java (from r993114, james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/mail/JCRMailboxMapper.java)
URL: http://svn.apache.org/viewvc/james/imap/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/JCRMailboxMapper.java?p2=james/imap/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/JCRMailboxMapper.java&p1=james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/mail/JCRMailboxMapper.java&r1=993114&r2=993124&rev=993124&view=diff
==============================================================================
--- james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/mail/JCRMailboxMapper.java (original)
+++ james/imap/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/JCRMailboxMapper.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.jcr.mail;
+package org.apache.james.mailbox.jcr.mail;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -34,18 +34,18 @@ import org.apache.jackrabbit.JcrConstant
 import org.apache.jackrabbit.commons.JcrUtils;
 import org.apache.jackrabbit.util.ISO9075;
 import org.apache.jackrabbit.util.Text;
-import org.apache.james.imap.jcr.AbstractJCRScalingMapper;
-import org.apache.james.imap.jcr.MailboxSessionJCRRepository;
-import org.apache.james.imap.jcr.NodeLocker;
-import org.apache.james.imap.jcr.NodeLocker.NodeLockedExecution;
-import org.apache.james.imap.jcr.mail.model.JCRMailbox;
-import org.apache.james.imap.store.mail.MailboxMapper;
-import org.apache.james.imap.store.mail.model.Mailbox;
 import org.apache.james.mailbox.MailboxConstants;
 import org.apache.james.mailbox.MailboxException;
 import org.apache.james.mailbox.MailboxNotFoundException;
 import org.apache.james.mailbox.MailboxPath;
 import org.apache.james.mailbox.MailboxSession;
+import org.apache.james.mailbox.jcr.AbstractJCRScalingMapper;
+import org.apache.james.mailbox.jcr.MailboxSessionJCRRepository;
+import org.apache.james.mailbox.jcr.NodeLocker;
+import org.apache.james.mailbox.jcr.NodeLocker.NodeLockedExecution;
+import org.apache.james.mailbox.jcr.mail.model.JCRMailbox;
+import org.apache.james.mailbox.store.mail.MailboxMapper;
+import org.apache.james.mailbox.store.mail.model.Mailbox;
 
 /**
  * JCR implementation of a MailboxMapper
@@ -62,7 +62,7 @@ public class JCRMailboxMapper extends Ab
      * (non-Javadoc)
      * 
      * @see
-     * org.apache.james.imap.store.mail.MailboxMapper#delete(org.apache.james
+     * org.apache.james.mailbox.store.mail.MailboxMapper#delete(org.apache.james
      * .imap.store.mail.model.Mailbox)
      */
     public void delete(Mailbox<String> mailbox) throws MailboxException {
@@ -81,7 +81,7 @@ public class JCRMailboxMapper extends Ab
     /*
      * (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 {
         try {
@@ -96,7 +96,7 @@ public class JCRMailboxMapper extends Ab
 
     /*
      * (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<String> findMailboxById(String mailboxId) throws MailboxException, MailboxNotFoundException {
         try {
@@ -111,7 +111,7 @@ public class JCRMailboxMapper extends Ab
 
     /*
      * (non-Javadoc)
-     * @see org.apache.james.imap.store.mail.MailboxMapper#findMailboxByPath(org.apache.james.imap.api.MailboxPath)
+     * @see org.apache.james.mailbox.store.mail.MailboxMapper#findMailboxByPath(org.apache.james.imap.api.MailboxPath)
      */
     public Mailbox<String> findMailboxByPath(MailboxPath path) throws MailboxException, MailboxNotFoundException {
         try {
@@ -142,7 +142,7 @@ public class JCRMailboxMapper extends Ab
 
     /*
      * (non-Javadoc)
-     * @see org.apache.james.imap.store.mail.MailboxMapper#findMailboxWithPathLike(org.apache.james.imap.api.MailboxPath)
+     * @see org.apache.james.mailbox.store.mail.MailboxMapper#findMailboxWithPathLike(org.apache.james.imap.api.MailboxPath)
      */
     public List<Mailbox<String>> findMailboxWithPathLike(MailboxPath path) throws MailboxException {
         List<Mailbox<String>> mailboxList = new ArrayList<Mailbox<String>>();
@@ -174,7 +174,7 @@ public class JCRMailboxMapper extends Ab
      * (non-Javadoc)
      * 
      * @see
-     * org.apache.james.imap.store.mail.MailboxMapper#save(org.apache.james.
+     * org.apache.james.mailbox.store.mail.MailboxMapper#save(org.apache.james.
      * imap.store.mail.model.Mailbox)
      */
     public void save(Mailbox<String> mailbox) throws MailboxException {
@@ -235,7 +235,7 @@ public class JCRMailboxMapper extends Ab
     /*
      * (non-Javadoc)
      * 
-     * @see org.apache.james.imap.store.mail.MailboxMapper#hasChildren(org.apache.james.
+     * @see org.apache.james.mailbox.store.mail.MailboxMapper#hasChildren(org.apache.james.
      * imap.store.mail.model.Mailbox)
      */
     public boolean hasChildren(Mailbox<String> mailbox)

Copied: james/imap/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/JCRMessageMapper.java (from r993114, james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/mail/JCRMessageMapper.java)
URL: http://svn.apache.org/viewvc/james/imap/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/JCRMessageMapper.java?p2=james/imap/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/JCRMessageMapper.java&p1=james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/mail/JCRMessageMapper.java&r1=993114&r2=993124&rev=993124&view=diff
==============================================================================
--- james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/mail/JCRMessageMapper.java (original)
+++ james/imap/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/JCRMessageMapper.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.jcr.mail;
+package org.apache.james.mailbox.jcr.mail;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -38,16 +38,6 @@ import org.apache.commons.logging.Log;
 import org.apache.jackrabbit.JcrConstants;
 import org.apache.jackrabbit.commons.JcrUtils;
 import org.apache.jackrabbit.util.ISO9075;
-import org.apache.james.imap.jcr.AbstractJCRMapper;
-import org.apache.james.imap.jcr.MailboxSessionJCRRepository;
-import org.apache.james.imap.jcr.NodeLocker;
-import org.apache.james.imap.jcr.NodeLocker.NodeLockedExecution;
-import org.apache.james.imap.jcr.mail.model.JCRMailbox;
-import org.apache.james.imap.jcr.mail.model.JCRMessage;
-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.mailbox.MailboxException;
 import org.apache.james.mailbox.MailboxSession;
 import org.apache.james.mailbox.MessageRange;
@@ -55,6 +45,16 @@ import org.apache.james.mailbox.SearchQu
 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.jcr.AbstractJCRMapper;
+import org.apache.james.mailbox.jcr.MailboxSessionJCRRepository;
+import org.apache.james.mailbox.jcr.NodeLocker;
+import org.apache.james.mailbox.jcr.NodeLocker.NodeLockedExecution;
+import org.apache.james.mailbox.jcr.mail.model.JCRMailbox;
+import org.apache.james.mailbox.jcr.mail.model.JCRMessage;
+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;
 
 /**
  * JCR implementation of a {@link MessageMapper}
@@ -144,7 +144,7 @@ public class JCRMessageMapper extends Ab
      * (non-Javadoc)
      * 
      * @see
-     * org.apache.james.imap.store.mail.MessageMapper#countMessagesInMailbox()
+     * org.apache.james.mailbox.store.mail.MessageMapper#countMessagesInMailbox()
      */
     public long countMessagesInMailbox(Mailbox<String> mailbox) throws MailboxException {
         try {
@@ -172,7 +172,7 @@ public class JCRMessageMapper extends Ab
      * (non-Javadoc)
      * 
      * @see
-     * org.apache.james.imap.store.mail.MessageMapper#countUnseenMessagesInMailbox
+     * org.apache.james.mailbox.store.mail.MessageMapper#countUnseenMessagesInMailbox
      * ()
      */
     public long countUnseenMessagesInMailbox(Mailbox<String> mailbox) throws MailboxException {
@@ -201,7 +201,7 @@ public class JCRMessageMapper extends Ab
 
     /*
      * (non-Javadoc)
-     * @see org.apache.james.imap.store.mail.MessageMapper#delete(java.lang.Object, org.apache.james.imap.store.mail.model.MailboxMembership)
+     * @see org.apache.james.mailbox.store.mail.MessageMapper#delete(java.lang.Object, org.apache.james.mailbox.store.mail.model.MailboxMembership)
      */
     public void delete(Mailbox<String> mailbox, MailboxMembership<String> message) throws MailboxException {
         JCRMessage membership = (JCRMessage) message;
@@ -219,7 +219,7 @@ public class JCRMessageMapper extends Ab
      * (non-Javadoc)
      * 
      * @see
-     * org.apache.james.imap.store.mail.MessageMapper#findInMailbox(org.apache
+     * org.apache.james.mailbox.store.mail.MessageMapper#findInMailbox(org.apache
      * .james.imap.mailbox.MessageRange)
      */
     public List<MailboxMembership<String>> findInMailbox(Mailbox<String> mailbox, MessageRange set) throws MailboxException {
@@ -372,7 +372,7 @@ public class JCRMessageMapper extends Ab
      * (non-Javadoc)
      * 
      * @see
-     * org.apache.james.imap.store.mail.MessageMapper#findMarkedForDeletionInMailbox
+     * org.apache.james.mailbox.store.mail.MessageMapper#findMarkedForDeletionInMailbox
      * (org.apache.james.mailbox.MessageRange)
      */
     public List<MailboxMembership<String>> findMarkedForDeletionInMailbox(Mailbox<String> mailbox, MessageRange set) throws MailboxException {
@@ -409,7 +409,7 @@ public class JCRMessageMapper extends Ab
      * (non-Javadoc)
      * 
      * @see
-     * org.apache.james.imap.store.mail.MessageMapper#findRecentMessagesInMailbox
+     * org.apache.james.mailbox.store.mail.MessageMapper#findRecentMessagesInMailbox
      * ()
      */
     public List<MailboxMembership<String>> findRecentMessagesInMailbox(Mailbox<String> mailbox, int limit) throws MailboxException {
@@ -440,7 +440,7 @@ public class JCRMessageMapper extends Ab
 
     /*
      * (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<String> mailbox) throws MailboxException {
         try {
@@ -465,7 +465,7 @@ public class JCRMessageMapper extends Ab
 
     /*
      * (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<String> mailbox, MailboxMembership<String> message) throws MailboxException {
         final JCRMessage membership = (JCRMessage) message;
@@ -603,7 +603,7 @@ public class JCRMessageMapper extends Ab
 
     /*
      * (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<String> mailbox, SearchQuery query) throws MailboxException {
         try {
@@ -696,7 +696,7 @@ public class JCRMessageMapper extends Ab
     
     /*
      * (non-Javadoc)
-     * @see org.apache.james.imap.store.mail.MessageMapper#copy(java.lang.Object, long, org.apache.james.imap.store.mail.model.MailboxMembership)
+     * @see org.apache.james.mailbox.store.mail.MessageMapper#copy(java.lang.Object, long, org.apache.james.mailbox.store.mail.model.MailboxMembership)
      */
     public long copy(Mailbox<String> mailbox, MailboxMembership<String> oldmessage) throws MailboxException{
         try {

Modified: james/imap/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRHeader.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRHeader.java?rev=993124&r1=991286&r2=993124&view=diff
==============================================================================
--- james/imap/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRHeader.java (original)
+++ james/imap/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRHeader.java Mon Sep  6 18:59:58 2010
@@ -16,16 +16,16 @@
  * specific language governing permissions and limitations      *
  * under the License.                                           *
  ****************************************************************/
-package org.apache.james.imap.jcr.mail.model;
+package org.apache.james.mailbox.jcr.mail.model;
 
 import javax.jcr.Node;
 import javax.jcr.RepositoryException;
 
 import org.apache.commons.logging.Log;
-import org.apache.james.imap.jcr.Persistent;
-import org.apache.james.imap.jcr.JCRImapConstants;
-import org.apache.james.imap.store.mail.model.AbstractComparableHeader;
-import org.apache.james.imap.store.mail.model.Header;
+import org.apache.james.mailbox.jcr.JCRImapConstants;
+import org.apache.james.mailbox.jcr.Persistent;
+import org.apache.james.mailbox.store.mail.model.AbstractComparableHeader;
+import org.apache.james.mailbox.store.mail.model.Header;
 
 /**
  * JCR implementation of a {@link Header}
@@ -69,7 +69,7 @@ public class JCRHeader extends AbstractC
     
     /*
      * (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() {
         if (isPersistent()) {
@@ -84,7 +84,7 @@ public class JCRHeader extends AbstractC
 
     /*
      * (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() {
         if (isPersistent()) {
@@ -99,7 +99,7 @@ public class JCRHeader extends AbstractC
 
     /*
      * (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() {
         if (isPersistent()) {
@@ -115,7 +115,7 @@ public class JCRHeader extends AbstractC
 
     /*
      * (non-Javadoc)
-     * @see org.apache.james.imap.jcr.IsPersistent#getNode()
+     * @see org.apache.james.mailbox.jcr.IsPersistent#getNode()
      */
     public Node getNode() {
         return node;
@@ -123,7 +123,7 @@ public class JCRHeader extends AbstractC
 
     /*
      * (non-Javadoc)
-     * @see org.apache.james.imap.jcr.IsPersistent#isPersistent()
+     * @see org.apache.james.mailbox.jcr.IsPersistent#isPersistent()
      */
     public boolean isPersistent() {
         return node != null;
@@ -131,7 +131,7 @@ public class JCRHeader extends AbstractC
 
     /*
      * (non-Javadoc)
-     * @see org.apache.james.imap.jcr.IsPersistent#merge(javax.jcr.Node)
+     * @see org.apache.james.mailbox.jcr.IsPersistent#merge(javax.jcr.Node)
      */
     public void merge(Node node) throws RepositoryException {
         node.setProperty(FIELDNAME_PROPERTY, getFieldName());

Copied: james/imap/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRMailbox.java (from r993114, james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/mail/model/JCRMailbox.java)
URL: http://svn.apache.org/viewvc/james/imap/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRMailbox.java?p2=james/imap/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRMailbox.java&p1=james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/mail/model/JCRMailbox.java&r1=993114&r2=993124&rev=993124&view=diff
==============================================================================
--- james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/mail/model/JCRMailbox.java (original)
+++ james/imap/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRMailbox.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.jcr.mail.model;
+package org.apache.james.mailbox.jcr.mail.model;
 
 import javax.jcr.Node;
 import javax.jcr.RepositoryException;
@@ -24,10 +24,10 @@ import javax.jcr.RepositoryException;
 import org.apache.commons.logging.Log;
 import org.apache.jackrabbit.JcrConstants;
 import org.apache.jackrabbit.util.Text;
-import org.apache.james.imap.jcr.JCRImapConstants;
-import org.apache.james.imap.jcr.Persistent;
-import org.apache.james.imap.store.mail.model.Mailbox;
 import org.apache.james.mailbox.MailboxPath;
+import org.apache.james.mailbox.jcr.JCRImapConstants;
+import org.apache.james.mailbox.jcr.Persistent;
+import org.apache.james.mailbox.store.mail.model.Mailbox;
 
 
 /**
@@ -78,7 +78,7 @@ public class JCRMailbox implements Mailb
 
     /*
      * (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() {
         if (isPersistent()) {
@@ -94,7 +94,7 @@ public class JCRMailbox implements Mailb
    
     /*
      * (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() {
         if (isPersistent()) {
@@ -109,7 +109,7 @@ public class JCRMailbox implements Mailb
 
     /*
      * (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() {
         if (isPersistent()) {
@@ -124,7 +124,7 @@ public class JCRMailbox implements Mailb
 
     /*
      * (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) {  
         if (isPersistent()) {
@@ -144,7 +144,7 @@ public class JCRMailbox implements Mailb
 
     /*
      * (non-Javadoc)
-     * @see org.apache.james.imap.jcr.Persistent#getNode()
+     * @see org.apache.james.mailbox.jcr.Persistent#getNode()
      */
     public Node getNode() {
         return node;
@@ -152,7 +152,7 @@ public class JCRMailbox implements Mailb
 
     /*
      * (non-Javadoc)
-     * @see org.apache.james.imap.jcr.Persistent#isPersistent()
+     * @see org.apache.james.mailbox.jcr.Persistent#isPersistent()
      */
     public boolean isPersistent() {
         return node != null;
@@ -160,7 +160,7 @@ public class JCRMailbox implements Mailb
 
     /*
      * (non-Javadoc)
-     * @see org.apache.james.imap.jcr.Persistent#merge(javax.jcr.Node)
+     * @see org.apache.james.mailbox.jcr.Persistent#merge(javax.jcr.Node)
      */
     public void  merge(Node node) throws RepositoryException {
         node.setProperty(NAME_PROPERTY, getName());
@@ -210,7 +210,7 @@ public class JCRMailbox implements Mailb
 
     /*
      * (non-Javadoc)
-     * @see org.apache.james.imap.store.mail.model.Mailbox#getMailboxId()
+     * @see org.apache.james.mailbox.store.mail.model.Mailbox#getMailboxId()
      */
     public String getMailboxId() {
         if (isPersistent()) {
@@ -225,7 +225,7 @@ public class JCRMailbox implements Mailb
 
     /*
      * (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() {
         if (isPersistent()) {
@@ -240,7 +240,7 @@ public class JCRMailbox implements Mailb
 
     /*
      * (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() {
         if (isPersistent()) {
@@ -260,7 +260,7 @@ public class JCRMailbox implements Mailb
 
     /*
      * (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) {
         if (isPersistent()) {
@@ -277,7 +277,7 @@ public class JCRMailbox implements Mailb
 
     /*
      * (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) {
         if (isPersistent()) {

Copied: james/imap/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRMessage.java (from r993114, james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/mail/model/JCRMessage.java)
URL: http://svn.apache.org/viewvc/james/imap/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRMessage.java?p2=james/imap/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRMessage.java&p1=james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/mail/model/JCRMessage.java&r1=993114&r2=993124&rev=993124&view=diff
==============================================================================
--- james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/mail/model/JCRMessage.java (original)
+++ james/imap/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRMessage.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.jcr.mail.model;
+package org.apache.james.mailbox.jcr.mail.model;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
@@ -35,16 +35,16 @@ import javax.mail.Flags;
 import org.apache.commons.logging.Log;
 import org.apache.jackrabbit.JcrConstants;
 import org.apache.jackrabbit.commons.JcrUtils;
-import org.apache.james.imap.jcr.JCRImapConstants;
-import org.apache.james.imap.jcr.Persistent;
-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.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.jcr.JCRImapConstants;
+import org.apache.james.mailbox.jcr.Persistent;
+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.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;
 
 /**
  * JCR implementation of {@link Message}
@@ -171,7 +171,7 @@ public class JCRMessage extends Abstract
     
     /*
      * (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() {
         if (isPersistent()) {
@@ -188,7 +188,7 @@ public class JCRMessage extends Abstract
 
     /*
      * (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() {
         if (isPersistent()) {
@@ -208,7 +208,7 @@ public class JCRMessage extends Abstract
 
     /*
      * (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() {
         if (isPersistent()) {
@@ -224,7 +224,7 @@ public class JCRMessage extends Abstract
 
     /*
      * (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() {
         if (isPersistent()) {
@@ -244,7 +244,7 @@ public class JCRMessage extends Abstract
 
     /*
      * (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() {
         if (isPersistent()) {
@@ -260,7 +260,7 @@ public class JCRMessage extends Abstract
 
     /*
      * (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() {
         if (isPersistent()) {
@@ -279,7 +279,7 @@ public class JCRMessage extends Abstract
 
     /*
      * (non-Javadoc)
-     * @see org.apache.james.imap.jcr.Persistent#getNode()
+     * @see org.apache.james.mailbox.jcr.Persistent#getNode()
      */
     public Node getNode() {
         return node;
@@ -287,7 +287,7 @@ public class JCRMessage extends Abstract
 
     /*
      * (non-Javadoc)
-     * @see org.apache.james.imap.jcr.Persistent#isPersistent()
+     * @see org.apache.james.mailbox.jcr.Persistent#isPersistent()
      */
     public boolean isPersistent() {
         return node != null;
@@ -306,7 +306,7 @@ public class JCRMessage extends Abstract
     
     /*
      * (non-Javadoc)
-     * @see org.apache.james.imap.jcr.Persistent#merge(javax.jcr.Node)
+     * @see org.apache.james.mailbox.jcr.Persistent#merge(javax.jcr.Node)
      */
     public void merge(Node node) throws RepositoryException, IOException {
 
@@ -428,7 +428,7 @@ public class JCRMessage extends Abstract
 
     /*
      * (non-Javadoc)
-     * @see org.apache.james.imap.store.mail.model.AbstractDocument#getRawFullContent()
+     * @see org.apache.james.mailbox.store.mail.model.AbstractDocument#getRawFullContent()
      */
     protected InputStream getRawFullContent() {
         if (isPersistent()) {
@@ -447,7 +447,7 @@ public class JCRMessage extends Abstract
 
     /*
      * (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();
@@ -478,7 +478,7 @@ public class JCRMessage extends Abstract
      * (non-Javadoc)
      * 
      * @see
-     * org.apache.james.imap.store.mail.model.MailboxMembership#getMessage()
+     * org.apache.james.mailbox.store.mail.model.MailboxMembership#getMessage()
      */
     public Message getMessage() {
         if (isPersistent()) {
@@ -493,7 +493,7 @@ public class JCRMessage extends Abstract
      * (non-Javadoc)
      * 
      * @see
-     * org.apache.james.imap.store.mail.model.MailboxMembership#getInternalDate
+     * org.apache.james.mailbox.store.mail.model.MailboxMembership#getInternalDate
      * ()
      */
     public Date getInternalDate() {
@@ -516,7 +516,7 @@ public class JCRMessage extends Abstract
      * (non-Javadoc)
      * 
      * @see
-     * org.apache.james.imap.store.mail.model.MailboxMembership#getMailboxId()
+     * org.apache.james.mailbox.store.mail.model.MailboxMembership#getMailboxId()
      */
     public String getMailboxId() {
         if (isPersistent()) {
@@ -534,7 +534,7 @@ public class JCRMessage extends Abstract
     /*
      * (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() {
         if (isPersistent()) {
@@ -553,7 +553,7 @@ public class JCRMessage extends Abstract
      * (non-Javadoc)
      * 
      * @see
-     * org.apache.james.imap.store.mail.model.MailboxMembership#isAnswered()
+     * org.apache.james.mailbox.store.mail.model.MailboxMembership#isAnswered()
      */
     public boolean isAnswered() {
         if (isPersistent()) {
@@ -574,7 +574,7 @@ public class JCRMessage extends Abstract
     /*
      * (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() {
         if (isPersistent()) {
@@ -595,7 +595,7 @@ public class JCRMessage extends Abstract
     /*
      * (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() {
         if (isPersistent()) {
@@ -614,7 +614,7 @@ public class JCRMessage extends Abstract
     /*
      * (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() {
         if (isPersistent()) {
@@ -634,7 +634,7 @@ public class JCRMessage extends Abstract
     /*
      * (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() {
         if (isPersistent()) {
@@ -653,7 +653,7 @@ public class JCRMessage extends Abstract
     /*
      * (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() {
         if (isPersistent()) {
@@ -672,7 +672,7 @@ public class JCRMessage extends Abstract
      * (non-Javadoc)
      * 
      * @see
-     * org.apache.james.imap.store.mail.model.MailboxMembership#setFlags(javax
+     * org.apache.james.mailbox.store.mail.model.MailboxMembership#setFlags(javax
      * .mail.Flags)
      */
     public void setFlags(Flags flags) {
@@ -707,7 +707,7 @@ public class JCRMessage extends Abstract
      * (non-Javadoc)
      * 
      * @see
-     * org.apache.james.imap.store.mail.model.MailboxMembership#unsetRecent()
+     * org.apache.james.mailbox.store.mail.model.MailboxMembership#unsetRecent()
      */
     public void unsetRecent() {
         if (isPersistent()) {

Modified: james/imap/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRProperty.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRProperty.java?rev=993124&r1=991286&r2=993124&view=diff
==============================================================================
--- james/imap/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRProperty.java (original)
+++ james/imap/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRProperty.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.jcr.mail.model;
+package org.apache.james.mailbox.jcr.mail.model;
 
 import javax.jcr.Node;
 import javax.jcr.RepositoryException;
 
 import org.apache.commons.logging.Log;
-import org.apache.james.imap.jcr.Persistent;
-import org.apache.james.imap.jcr.JCRImapConstants;
 
-import org.apache.james.imap.store.mail.model.AbstractComparableProperty;
-import org.apache.james.imap.store.mail.model.Property;
+import org.apache.james.mailbox.jcr.JCRImapConstants;
+import org.apache.james.mailbox.jcr.Persistent;
+import org.apache.james.mailbox.store.mail.model.AbstractComparableProperty;
+import org.apache.james.mailbox.store.mail.model.Property;
 
 /**
  * JCR implementation of {@link Property}
@@ -66,7 +66,7 @@ public class JCRProperty extends Abstrac
      * (non-Javadoc)
      * 
      * @see
-     * org.apache.james.imap.store.mail.model.AbstractComparableProperty#getOrder
+     * org.apache.james.mailbox.store.mail.model.AbstractComparableProperty#getOrder
      * ()
      */
     public int getOrder() {
@@ -84,7 +84,7 @@ public class JCRProperty extends Abstrac
     /*
      * (non-Javadoc)
      * 
-     * @see org.apache.james.imap.jcr.IsPersistent#getNode()
+     * @see org.apache.james.mailbox.jcr.IsPersistent#getNode()
      */
     public Node getNode() {
         return node;
@@ -93,7 +93,7 @@ public class JCRProperty extends Abstrac
     /*
      * (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() {
         if (isPersistent()) {
@@ -110,7 +110,7 @@ public class JCRProperty extends Abstrac
     /*
      * (non-Javadoc)
      * 
-     * @see org.apache.james.imap.store.mail.model.Property#getNamespace()
+     * @see org.apache.james.mailbox.store.mail.model.Property#getNamespace()
      */
     public String getNamespace() {
         if (isPersistent()) {
@@ -127,7 +127,7 @@ public class JCRProperty extends Abstrac
     /*
      * (non-Javadoc)
      * 
-     * @see org.apache.james.imap.store.mail.model.Property#getValue()
+     * @see org.apache.james.mailbox.store.mail.model.Property#getValue()
      */
     public String getValue() {
         if (isPersistent()) {
@@ -144,7 +144,7 @@ public class JCRProperty extends Abstrac
     /*
      * (non-Javadoc)
      * 
-     * @see org.apache.james.imap.jcr.IsPersistent#isPersistent()
+     * @see org.apache.james.mailbox.jcr.IsPersistent#isPersistent()
      */
     public boolean isPersistent() {
         return node != null;
@@ -153,7 +153,7 @@ public class JCRProperty extends Abstrac
     /*
      * (non-Javadoc)
      * 
-     * @see org.apache.james.imap.jcr.IsPersistent#merge(javax.jcr.Node)
+     * @see org.apache.james.mailbox.jcr.IsPersistent#merge(javax.jcr.Node)
      */
     public void merge(Node node) throws RepositoryException {
         node.setProperty(NAMESPACE_PROPERTY, getNamespace());

Copied: james/imap/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/user/JCRSubscriptionMapper.java (from r993114, james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/user/JCRSubscriptionMapper.java)
URL: http://svn.apache.org/viewvc/james/imap/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/user/JCRSubscriptionMapper.java?p2=james/imap/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/user/JCRSubscriptionMapper.java&p1=james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/user/JCRSubscriptionMapper.java&r1=993114&r2=993124&rev=993124&view=diff
==============================================================================
--- james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/user/JCRSubscriptionMapper.java (original)
+++ james/imap/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/user/JCRSubscriptionMapper.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.jcr.user;
+package org.apache.james.mailbox.jcr.user;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -34,15 +34,15 @@ import javax.jcr.query.QueryResult;
 import org.apache.commons.logging.Log;
 import org.apache.jackrabbit.commons.JcrUtils;
 import org.apache.jackrabbit.util.Text;
-import org.apache.james.imap.jcr.AbstractJCRScalingMapper;
-import org.apache.james.imap.jcr.MailboxSessionJCRRepository;
-import org.apache.james.imap.jcr.NodeLocker;
-import org.apache.james.imap.jcr.user.model.JCRSubscription;
-import org.apache.james.imap.store.user.SubscriptionMapper;
-import org.apache.james.imap.store.user.model.Subscription;
 import org.apache.james.mailbox.MailboxConstants;
 import org.apache.james.mailbox.MailboxSession;
 import org.apache.james.mailbox.SubscriptionException;
+import org.apache.james.mailbox.jcr.AbstractJCRScalingMapper;
+import org.apache.james.mailbox.jcr.MailboxSessionJCRRepository;
+import org.apache.james.mailbox.jcr.NodeLocker;
+import org.apache.james.mailbox.jcr.user.model.JCRSubscription;
+import org.apache.james.mailbox.store.user.SubscriptionMapper;
+import org.apache.james.mailbox.store.user.model.Subscription;
 
 /**
  * JCR implementation of a SubscriptionManager
@@ -58,7 +58,7 @@ public class JCRSubscriptionMapper exten
      * (non-Javadoc)
      * 
      * @see
-     * org.apache.james.imap.store.user.SubscriptionMapper#delete(org.apache
+     * org.apache.james.mailbox.store.user.SubscriptionMapper#delete(org.apache
      * .james.imap.store.user.model.Subscription)
      */
     public void delete(Subscription subscription) throws SubscriptionException {
@@ -95,7 +95,7 @@ public class JCRSubscriptionMapper exten
 
     /*
      * (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 {
         try {
@@ -123,7 +123,7 @@ public class JCRSubscriptionMapper exten
      * (non-Javadoc)
      * 
      * @see
-     * org.apache.james.imap.store.user.SubscriptionMapper#findSubscriptionsForUser
+     * org.apache.james.mailbox.store.user.SubscriptionMapper#findSubscriptionsForUser
      * (java.lang.String)
      */
     public List<Subscription> findSubscriptionsForUser(String user) throws SubscriptionException {
@@ -159,7 +159,7 @@ public class JCRSubscriptionMapper exten
      * (non-Javadoc)
      * 
      * @see
-     * org.apache.james.imap.store.user.SubscriptionMapper#save(org.apache.james
+     * org.apache.james.mailbox.store.user.SubscriptionMapper#save(org.apache.james
      * .imap.store.user.model.Subscription)
      */
     public void save(Subscription subscription) throws SubscriptionException {

Modified: james/imap/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/user/model/JCRSubscription.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/user/model/JCRSubscription.java?rev=993124&r1=991286&r2=993124&view=diff
==============================================================================
--- james/imap/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/user/model/JCRSubscription.java (original)
+++ james/imap/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/user/model/JCRSubscription.java Mon Sep  6 18:59:58 2010
@@ -17,7 +17,7 @@
  * under the License.                                           *
  ****************************************************************/
 
-package org.apache.james.imap.jcr.user.model;
+package org.apache.james.mailbox.jcr.user.model;
 
 
 import java.util.ArrayList;
@@ -28,9 +28,9 @@ import javax.jcr.RepositoryException;
 import javax.jcr.Value;
 
 import org.apache.commons.logging.Log;
-import org.apache.james.imap.jcr.Persistent;
-import org.apache.james.imap.jcr.JCRImapConstants;
-import org.apache.james.imap.store.user.model.Subscription;
+import org.apache.james.mailbox.jcr.JCRImapConstants;
+import org.apache.james.mailbox.jcr.Persistent;
+import org.apache.james.mailbox.store.user.model.Subscription;
 
 /**
  * JCR implementation of a {@link Subscription}.
@@ -62,7 +62,7 @@ public class JCRSubscription implements 
     /*
      * (non-Javadoc)
      * 
-     * @see org.apache.james.imap.store.user.model.Subscription#getMailbox()
+     * @see org.apache.james.mailbox.store.user.model.Subscription#getMailbox()
      */
     public String getMailbox() {
         return mailbox;
@@ -71,7 +71,7 @@ public class JCRSubscription implements 
     /*
      * (non-Javadoc)
      * 
-     * @see org.apache.james.imap.store.user.model.Subscription#getUser()
+     * @see org.apache.james.mailbox.store.user.model.Subscription#getUser()
      */
     public String getUser() {
         if (isPersistent()) {
@@ -88,7 +88,7 @@ public class JCRSubscription implements 
     /*
      * (non-Javadoc)
      * 
-     * @see org.apache.james.imap.jcr.NodeAware#getNode()
+     * @see org.apache.james.mailbox.jcr.NodeAware#getNode()
      */
     public Node getNode() {
         return node;
@@ -97,7 +97,7 @@ public class JCRSubscription implements 
 
     /*
      * (non-Javadoc)
-     * @see org.apache.james.imap.jcr.IsPersistent#isPersistent()
+     * @see org.apache.james.mailbox.jcr.IsPersistent#isPersistent()
      */
     public boolean isPersistent() {
         return node != null;
@@ -105,7 +105,7 @@ public class JCRSubscription implements 
 
     /*
      * (non-Javadoc)
-     * @see org.apache.james.imap.jcr.IsPersistent#merge(javax.jcr.Node)
+     * @see org.apache.james.mailbox.jcr.IsPersistent#merge(javax.jcr.Node)
      */
     public void merge(Node node) throws RepositoryException{
         node.setProperty(USERNAME_PROPERTY, getUser());

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

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

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

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

Modified: james/imap/trunk/jcr/src/test/java/org/apache/james/mailbox/jcr/FetchBodySectionTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/jcr/src/test/java/org/apache/james/mailbox/jcr/FetchBodySectionTest.java?rev=993124&r1=991286&r2=993124&view=diff
==============================================================================
--- james/imap/trunk/jcr/src/test/java/org/apache/james/mailbox/jcr/FetchBodySectionTest.java (original)
+++ james/imap/trunk/jcr/src/test/java/org/apache/james/mailbox/jcr/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.jcr;
+package org.apache.james.mailbox.jcr;
 
 import org.apache.james.imap.functional.suite.FetchBodySection;
 

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

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

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

Copied: james/imap/trunk/jcr/src/test/java/org/apache/james/mailbox/jcr/JCRHostSystem.java (from r993114, james/imap/trunk/jcr/src/test/java/org/apache/james/imap/jcr/JCRHostSystem.java)
URL: http://svn.apache.org/viewvc/james/imap/trunk/jcr/src/test/java/org/apache/james/mailbox/jcr/JCRHostSystem.java?p2=james/imap/trunk/jcr/src/test/java/org/apache/james/mailbox/jcr/JCRHostSystem.java&p1=james/imap/trunk/jcr/src/test/java/org/apache/james/imap/jcr/JCRHostSystem.java&r1=993114&r2=993124&rev=993124&view=diff
==============================================================================
--- james/imap/trunk/jcr/src/test/java/org/apache/james/imap/jcr/JCRHostSystem.java (original)
+++ james/imap/trunk/jcr/src/test/java/org/apache/james/mailbox/jcr/JCRHostSystem.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.jcr;
+package org.apache.james.mailbox.jcr;
 
 import java.io.File;
 
@@ -28,15 +28,15 @@ 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.jcr.GlobalMailboxSessionJCRRepository;
-import org.apache.james.imap.jcr.JCRMailboxManager;
-import org.apache.james.imap.jcr.JCRMailboxSessionMapperFactory;
-import org.apache.james.imap.jcr.JCRSubscriptionManager;
-import org.apache.james.imap.jcr.JCRUtils;
-import org.apache.james.imap.jcr.JCRVmNodeLocker;
 import org.apache.james.imap.main.DefaultImapDecoderFactory;
 import org.apache.james.imap.processor.main.DefaultImapProcessorFactory;
 import org.apache.james.mailbox.MailboxSession;
+import org.apache.james.mailbox.jcr.GlobalMailboxSessionJCRRepository;
+import org.apache.james.mailbox.jcr.JCRMailboxManager;
+import org.apache.james.mailbox.jcr.JCRMailboxSessionMapperFactory;
+import org.apache.james.mailbox.jcr.JCRSubscriptionManager;
+import org.apache.james.mailbox.jcr.JCRUtils;
+import org.apache.james.mailbox.jcr.JCRVmNodeLocker;
 import org.apache.james.test.functional.HostSystem;
 import org.xml.sax.InputSource;
 

Copied: james/imap/trunk/jcr/src/test/java/org/apache/james/mailbox/jcr/JCRStressTest.java (from r993114, james/imap/trunk/jcr/src/test/java/org/apache/james/imap/jcr/JCRStressTest.java)
URL: http://svn.apache.org/viewvc/james/imap/trunk/jcr/src/test/java/org/apache/james/mailbox/jcr/JCRStressTest.java?p2=james/imap/trunk/jcr/src/test/java/org/apache/james/mailbox/jcr/JCRStressTest.java&p1=james/imap/trunk/jcr/src/test/java/org/apache/james/imap/jcr/JCRStressTest.java&r1=993114&r2=993124&rev=993124&view=diff
==============================================================================
--- james/imap/trunk/jcr/src/test/java/org/apache/james/imap/jcr/JCRStressTest.java (original)
+++ james/imap/trunk/jcr/src/test/java/org/apache/james/mailbox/jcr/JCRStressTest.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.jcr;
+package org.apache.james.mailbox.jcr;
 
 import java.io.File;
 
@@ -26,14 +26,14 @@ import org.apache.commons.logging.impl.S
 import org.apache.jackrabbit.core.RepositoryImpl;
 import org.apache.jackrabbit.core.config.RepositoryConfig;
 import org.apache.james.imap.functional.AbstractStressTest;
-import org.apache.james.imap.jcr.GlobalMailboxSessionJCRRepository;
-import org.apache.james.imap.jcr.JCRMailboxManager;
-import org.apache.james.imap.jcr.JCRMailboxSessionMapperFactory;
-import org.apache.james.imap.jcr.JCRUtils;
-import org.apache.james.imap.jcr.JCRVmNodeLocker;
-import org.apache.james.imap.jcr.MailboxSessionJCRRepository;
-import org.apache.james.imap.store.StoreMailboxManager;
 import org.apache.james.mailbox.MailboxSession;
+import org.apache.james.mailbox.jcr.GlobalMailboxSessionJCRRepository;
+import org.apache.james.mailbox.jcr.JCRMailboxManager;
+import org.apache.james.mailbox.jcr.JCRMailboxSessionMapperFactory;
+import org.apache.james.mailbox.jcr.JCRUtils;
+import org.apache.james.mailbox.jcr.JCRVmNodeLocker;
+import org.apache.james.mailbox.jcr.MailboxSessionJCRRepository;
+import org.apache.james.mailbox.store.StoreMailboxManager;
 import org.junit.After;
 import org.junit.Before;
 import org.xml.sax.InputSource;

Modified: james/imap/trunk/jcr/src/test/java/org/apache/james/mailbox/jcr/ListingTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/jcr/src/test/java/org/apache/james/mailbox/jcr/ListingTest.java?rev=993124&r1=991286&r2=993124&view=diff
==============================================================================
--- james/imap/trunk/jcr/src/test/java/org/apache/james/mailbox/jcr/ListingTest.java (original)
+++ james/imap/trunk/jcr/src/test/java/org/apache/james/mailbox/jcr/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.jcr;
+package org.apache.james.mailbox.jcr;
 
 import org.apache.james.imap.functional.suite.Listing;
 

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

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

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

Modified: james/imap/trunk/jcr/src/test/java/org/apache/james/mailbox/jcr/SearchTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/jcr/src/test/java/org/apache/james/mailbox/jcr/SearchTest.java?rev=993124&r1=991286&r2=993124&view=diff
==============================================================================
--- james/imap/trunk/jcr/src/test/java/org/apache/james/mailbox/jcr/SearchTest.java (original)
+++ james/imap/trunk/jcr/src/test/java/org/apache/james/mailbox/jcr/SearchTest.java Mon Sep  6 18:59:58 2010
@@ -1,4 +1,4 @@
-package org.apache.james.imap.jcr;
+package org.apache.james.mailbox.jcr;
 
 import org.apache.james.imap.functional.suite.Search;
 

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

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

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

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

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

Modified: james/imap/trunk/jpa/pom.xml
URL: http://svn.apache.org/viewvc/james/imap/trunk/jpa/pom.xml?rev=993124&r1=993123&r2=993124&view=diff
==============================================================================
--- james/imap/trunk/jpa/pom.xml (original)
+++ james/imap/trunk/jpa/pom.xml Mon Sep  6 18:59:58 2010
@@ -130,7 +130,7 @@
         <artifactId>openjpa-maven-plugin</artifactId>
         <version>1.1</version>
         <configuration>
-          <includes>org/apache/james/imap/jpa/*/model/**/*.class</includes>
+          <includes>org/apache/james/mailbox/jpa/*/model/**/*.class</includes>
           <addDefaultConstructor>true</addDefaultConstructor>
           <enforcePropertyRestrictions>true</enforcePropertyRestrictions>
           <toolProperties>
@@ -140,7 +140,7 @@
             </property>   
             <property>
               <name>metaDataFactory</name>
-              <value>jpa(Types=org.apache.james.imap.jpa.mail.model.JPAHeader;org.apache.james.imap.jpa.mail.model.JPAMailbox;org.apache.james.imap.jpa.mail.model.openjpa.AbstractJPAMailboxMembership;org.apache.james.imap.jpa.mail.model.openjpa.JPAMailboxMembership;org.apache.james.imap.jpa.mail.model.openjpa.JPAStreamingMailboxMembership;org.apache.james.imap.jpa.mail.model.openjpa.AbstractJPAMessage;org.apache.james.imap.jpa.mail.model.openjpa.JPAMessage;org.apache.james.imap.jpa.mail.model.openjpa.JPAStreamingMessage;org.apache.james.imap.jpa.mail.model.JPAProperty;org.apache.james.imap.jpa.user.model.JPASubscription)</value>
+              <value>jpa(Types=org.apache.james.mailbox.jpa.mail.model.JPAHeader;org.apache.james.mailbox.jpa.mail.model.JPAMailbox;org.apache.james.mailbox.jpa.mail.model.openjpa.AbstractJPAMailboxMembership;org.apache.james.mailbox.jpa.mail.model.openjpa.JPAMailboxMembership;org.apache.james.mailbox.jpa.mail.model.openjpa.JPAStreamingMailboxMembership;org.apache.james.mailbox.jpa.mail.model.openjpa.AbstractJPAMessage;org.apache.james.mailbox.jpa.mail.model.openjpa.JPAMessage;org.apache.james.mailbox.jpa.mail.model.openjpa.JPAStreamingMessage;org.apache.james.mailbox.jpa.mail.model.JPAProperty;org.apache.james.mailbox.jpa.user.model.JPASubscription)</value>
             </property>           
           </toolProperties>
         </configuration>

Copied: james/imap/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/JPAMailboxManager.java (from r993114, james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/JPAMailboxManager.java)
URL: http://svn.apache.org/viewvc/james/imap/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/JPAMailboxManager.java?p2=james/imap/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/JPAMailboxManager.java&p1=james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/JPAMailboxManager.java&r1=993114&r2=993124&rev=993124&view=diff
==============================================================================
--- james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/JPAMailboxManager.java (original)
+++ james/imap/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/JPAMailboxManager.java Mon Sep  6 18:59:58 2010
@@ -16,19 +16,19 @@
  * specific language governing permissions and limitations      *
  * under the License.                                           *
  ****************************************************************/
-package org.apache.james.imap.jpa;
+package org.apache.james.mailbox.jpa;
 
-import org.apache.james.imap.jpa.mail.model.JPAMailbox;
-import org.apache.james.imap.jpa.user.model.JPASubscription;
-import org.apache.james.imap.store.Authenticator;
-import org.apache.james.imap.store.StoreMailboxManager;
-import org.apache.james.imap.store.mail.MailboxMapper;
-import org.apache.james.imap.store.mail.model.Mailbox;
-import org.apache.james.imap.store.transaction.TransactionalMapper;
-import org.apache.james.imap.store.user.model.Subscription;
 import org.apache.james.mailbox.MailboxException;
 import org.apache.james.mailbox.MailboxPath;
 import org.apache.james.mailbox.MailboxSession;
+import org.apache.james.mailbox.jpa.mail.model.JPAMailbox;
+import org.apache.james.mailbox.jpa.user.model.JPASubscription;
+import org.apache.james.mailbox.store.Authenticator;
+import org.apache.james.mailbox.store.StoreMailboxManager;
+import org.apache.james.mailbox.store.mail.MailboxMapper;
+import org.apache.james.mailbox.store.mail.model.Mailbox;
+import org.apache.james.mailbox.store.transaction.TransactionalMapper;
+import org.apache.james.mailbox.store.user.model.Subscription;
 
 /**
  * JPA implementation of {@link StoreMailboxManager}
@@ -72,7 +72,7 @@ public abstract class JPAMailboxManager 
 
     /*
      * (non-Javadoc)
-     * @see org.apache.james.imap.store.StoreMailboxManager#createSubscription(org.apache.james.mailbox.MailboxSession, java.lang.String)
+     * @see org.apache.james.mailbox.store.StoreMailboxManager#createSubscription(org.apache.james.mailbox.MailboxSession, java.lang.String)
      */
     protected Subscription createSubscription(final MailboxSession session, final String mailbox) {
         final Subscription newSubscription = new JPASubscription(session.getUser().getUserName(), mailbox);

Copied: james/imap/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/JPAMailboxSessionMapperFactory.java (from r993114, james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/JPAMailboxSessionMapperFactory.java)
URL: http://svn.apache.org/viewvc/james/imap/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/JPAMailboxSessionMapperFactory.java?p2=james/imap/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/JPAMailboxSessionMapperFactory.java&p1=james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/JPAMailboxSessionMapperFactory.java&r1=993114&r2=993124&rev=993124&view=diff
==============================================================================
--- james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/JPAMailboxSessionMapperFactory.java (original)
+++ james/imap/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/JPAMailboxSessionMapperFactory.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.jpa;
+package org.apache.james.mailbox.jpa;
 
 import javax.persistence.EntityManager;
 import javax.persistence.EntityManagerFactory;
 
-import org.apache.james.imap.jpa.mail.JPAMailboxMapper;
-import org.apache.james.imap.jpa.mail.JPAMessageMapper;
-import org.apache.james.imap.jpa.user.JPASubscriptionMapper;
-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.user.SubscriptionMapper;
 import org.apache.james.mailbox.MailboxConstants;
 import org.apache.james.mailbox.MailboxSession;
+import org.apache.james.mailbox.jpa.mail.JPAMailboxMapper;
+import org.apache.james.mailbox.jpa.mail.JPAMessageMapper;
+import org.apache.james.mailbox.jpa.user.JPASubscriptionMapper;
+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.user.SubscriptionMapper;
 
 /**
  * JPA implementation of {@link MailboxSessionMapperFactory}

Copied: james/imap/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/JPAMessageManager.java (from r993114, james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/JPAMessageManager.java)
URL: http://svn.apache.org/viewvc/james/imap/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/JPAMessageManager.java?p2=james/imap/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/JPAMessageManager.java&p1=james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/JPAMessageManager.java&r1=993114&r2=993124&rev=993124&view=diff
==============================================================================
--- james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/JPAMessageManager.java (original)
+++ james/imap/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/JPAMessageManager.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.jpa;
+package org.apache.james.mailbox.jpa;
 
 import java.io.InputStream;
 import java.util.ArrayList;
@@ -25,14 +25,14 @@ import java.util.List;
 
 import javax.mail.Flags;
 
-import org.apache.james.imap.jpa.mail.model.JPAHeader;
-import org.apache.james.imap.jpa.mail.model.openjpa.JPAMailboxMembership;
-import org.apache.james.imap.store.MapperStoreMessageManager;
-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.mailbox.MailboxException;
+import org.apache.james.mailbox.jpa.mail.model.JPAHeader;
+import org.apache.james.mailbox.jpa.mail.model.openjpa.JPAMailboxMembership;
+import org.apache.james.mailbox.store.MapperStoreMessageManager;
+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.util.MailboxEventDispatcher;
 
 /**

Copied: james/imap/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/JPASubscriptionManager.java (from r993114, james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/JPASubscriptionManager.java)
URL: http://svn.apache.org/viewvc/james/imap/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/JPASubscriptionManager.java?p2=james/imap/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/JPASubscriptionManager.java&p1=james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/JPASubscriptionManager.java&r1=993114&r2=993124&rev=993124&view=diff
==============================================================================
--- james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/JPASubscriptionManager.java (original)
+++ james/imap/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/JPASubscriptionManager.java Mon Sep  6 18:59:58 2010
@@ -16,12 +16,12 @@
  * specific language governing permissions and limitations      *
  * under the License.                                           *
  ****************************************************************/
-package org.apache.james.imap.jpa;
+package org.apache.james.mailbox.jpa;
 
-import org.apache.james.imap.jpa.user.model.JPASubscription;
-import org.apache.james.imap.store.StoreSubscriptionManager;
-import org.apache.james.imap.store.user.model.Subscription;
 import org.apache.james.mailbox.MailboxSession;
+import org.apache.james.mailbox.jpa.user.model.JPASubscription;
+import org.apache.james.mailbox.store.StoreSubscriptionManager;
+import org.apache.james.mailbox.store.user.model.Subscription;
 
 /**
  * JPA implementation of {@link StoreSubscriptionManager}
@@ -35,7 +35,7 @@ public class JPASubscriptionManager exte
     
     /*
      * (non-Javadoc)
-     * @see org.apache.james.imap.store.StoreSubscriptionManager#createSubscription(org.apache.james.mailbox.MailboxSession, java.lang.String)
+     * @see org.apache.james.mailbox.store.StoreSubscriptionManager#createSubscription(org.apache.james.mailbox.MailboxSession, java.lang.String)
      */
     protected Subscription createSubscription(final MailboxSession session, final String mailbox) {
         final Subscription newSubscription = new JPASubscription(session.getUser().getUserName(), mailbox);

Copied: james/imap/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/JPATransactionalMapper.java (from r993114, james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/JPATransactionalMapper.java)
URL: http://svn.apache.org/viewvc/james/imap/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/JPATransactionalMapper.java?p2=james/imap/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/JPATransactionalMapper.java&p1=james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/JPATransactionalMapper.java&r1=993114&r2=993124&rev=993124&view=diff
==============================================================================
--- james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/JPATransactionalMapper.java (original)
+++ james/imap/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/JPATransactionalMapper.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.jpa;
+package org.apache.james.mailbox.jpa;
 
 import javax.persistence.EntityManager;
 import javax.persistence.EntityManagerFactory;
 import javax.persistence.EntityTransaction;
 import javax.persistence.PersistenceException;
 
-import org.apache.james.imap.store.transaction.TransactionalMapper;
 import org.apache.james.mailbox.MailboxException;
+import org.apache.james.mailbox.store.transaction.TransactionalMapper;
 
 /**
  * JPA implementation of TransactionMapper. This class is not thread-safe!
@@ -53,7 +53,7 @@ public abstract class JPATransactionalMa
 
     /*
      * (non-Javadoc)
-     * @see org.apache.james.imap.store.transaction.AbstractTransactionalMapper#begin()
+     * @see org.apache.james.mailbox.store.transaction.AbstractTransactionalMapper#begin()
      */
     protected void begin() throws MailboxException {
         try {
@@ -76,7 +76,7 @@ public abstract class JPATransactionalMa
 
     /*
      * (non-Javadoc)
-     * @see org.apache.james.imap.store.transaction.AbstractTransactionalMapper#rollback()
+     * @see org.apache.james.mailbox.store.transaction.AbstractTransactionalMapper#rollback()
      */
     protected void rollback() throws MailboxException {
         EntityTransaction transaction = entityManager.getTransaction();

Copied: james/imap/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/JPAMailboxMapper.java (from r993114, james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/JPAMailboxMapper.java)
URL: http://svn.apache.org/viewvc/james/imap/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/JPAMailboxMapper.java?p2=james/imap/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/JPAMailboxMapper.java&p1=james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/JPAMailboxMapper.java&r1=993114&r2=993124&rev=993124&view=diff
==============================================================================
--- james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/JPAMailboxMapper.java (original)
+++ james/imap/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/JPAMailboxMapper.java Mon Sep  6 18:59:58 2010
@@ -17,7 +17,7 @@
  * under the License.                                           *
  ****************************************************************/
 
-package org.apache.james.imap.jpa.mail;
+package org.apache.james.mailbox.jpa.mail;
 
 import java.util.List;
 
@@ -27,14 +27,14 @@ import javax.persistence.NoResultExcepti
 import javax.persistence.PersistenceException;
 import javax.persistence.RollbackException;
 
-import org.apache.james.imap.jpa.JPATransactionalMapper;
-import org.apache.james.imap.jpa.mail.model.JPAMailbox;
-import org.apache.james.imap.store.mail.MailboxMapper;
-import org.apache.james.imap.store.mail.model.Mailbox;
 import org.apache.james.mailbox.MailboxException;
 import org.apache.james.mailbox.MailboxExistsException;
 import org.apache.james.mailbox.MailboxNotFoundException;
 import org.apache.james.mailbox.MailboxPath;
+import org.apache.james.mailbox.jpa.JPATransactionalMapper;
+import org.apache.james.mailbox.jpa.mail.model.JPAMailbox;
+import org.apache.james.mailbox.store.mail.MailboxMapper;
+import org.apache.james.mailbox.store.mail.model.Mailbox;
 
 /**
  * Data access management for mailbox.
@@ -71,7 +71,7 @@ public class JPAMailboxMapper extends JP
     }
     
     /**
-     * @see org.apache.james.imap.store.mail.MailboxMapper#save(Mailbox)
+     * @see org.apache.james.mailbox.store.mail.MailboxMapper#save(Mailbox)
      */
     public void save(Mailbox<Long> mailbox) throws MailboxException {
         try {
@@ -83,7 +83,7 @@ public class JPAMailboxMapper extends JP
     }
 
     /**
-     * @see org.apache.james.imap.store.mail.MailboxMapper#findMailboxByPath(java.lang.String)
+     * @see org.apache.james.mailbox.store.mail.MailboxMapper#findMailboxByPath(java.lang.String)
      */
     public Mailbox<Long> findMailboxByPath(MailboxPath mailboxPath) throws MailboxException, MailboxNotFoundException {
         try {
@@ -101,7 +101,7 @@ public class JPAMailboxMapper extends JP
     }
 
     /**
-     * @see org.apache.james.imap.store.mail.MailboxMapper#delete(Mailbox)
+     * @see org.apache.james.mailbox.store.mail.MailboxMapper#delete(Mailbox)
      */
     public void delete(Mailbox<Long> mailbox) throws MailboxException {
         try {  
@@ -114,7 +114,7 @@ public class JPAMailboxMapper extends JP
 
     /*
      * (non-Javadoc)
-     * @see org.apache.james.imap.store.mail.MailboxMapper#findMailboxWithPathLike(org.apache.james.imap.api.MailboxPath)
+     * @see org.apache.james.mailbox.store.mail.MailboxMapper#findMailboxWithPathLike(org.apache.james.imap.api.MailboxPath)
      */
     @SuppressWarnings("unchecked")
     public List<Mailbox<Long>> findMailboxWithPathLike(MailboxPath path) throws MailboxException {
@@ -130,7 +130,7 @@ public class JPAMailboxMapper extends JP
     }
 
     /**
-     * @see org.apache.james.imap.store.mail.MailboxMapper#deleteAll()
+     * @see org.apache.james.mailbox.store.mail.MailboxMapper#deleteAll()
      */
     public void deleteAll() throws MailboxException {
         try {
@@ -141,7 +141,7 @@ public class JPAMailboxMapper extends JP
     }
 
     /**
-     * @see org.apache.james.imap.store.mail.MailboxMapper#findMailboxById(long)
+     * @see org.apache.james.mailbox.store.mail.MailboxMapper#findMailboxById(long)
      */
     public Mailbox<Long> findMailboxById(Long mailboxId) throws MailboxException, MailboxNotFoundException  {
         try {
@@ -154,7 +154,7 @@ public class JPAMailboxMapper extends JP
     }
 
     /**
-     * @see org.apache.james.imap.store.mail.MailboxMapper#hasChildren(java.lang.String)
+     * @see org.apache.james.mailbox.store.mail.MailboxMapper#hasChildren(java.lang.String)
      */
     public boolean hasChildren(Mailbox<Long> mailbox) throws MailboxException,
             MailboxNotFoundException {



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