Author: rdonkin
Date: Wed Dec 31 08:01:47 2008
New Revision: 730410

URL: http://svn.apache.org/viewvc?rev=730410&view=rev
Log:
Revise packaging to allow space for user subscription

Added:
    james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/
    
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/MailboxMapper.java
      - copied, changed from r730402, 
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/map/MailboxMapper.java
    
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/Mapper.java
      - copied, changed from r730402, 
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/map/Mapper.java
    
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/MessageMapper.java
      - copied, changed from r730402, 
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/map/MessageMapper.java
    
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/map/
    
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/map/openjpa/
    
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/map/openjpa/OpenJPAMailboxMapper.java
      - copied, changed from r730402, 
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/openjpa/OpenJPAMailboxMapper.java
    
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/model/
    
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/model/Header.java
   (contents, props changed)
      - copied, changed from r730402, 
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/Header.java
    
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/model/Mailbox.java
   (contents, props changed)
      - copied, changed from r730402, 
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/Mailbox.java
    
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/model/Message.java
   (contents, props changed)
      - copied, changed from r730402, 
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/Message.java
Removed:
    james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/map/
    
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/Header.java
    
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/Mailbox.java
    
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/Message.java
    
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/openjpa/
Modified:
    
james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/imap/functional/jpa/JPAHostSystem.java
    james/protocols/imap/trunk/jpa/build.xml
    
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/JPAMailbox.java
    
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/JPAMailboxManager.java
    
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/JPAResultIterator.java
    
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/MessageRowUtils.java
    
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/MessageSearches.java
    
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/ResultHeader.java
    
james/protocols/imap/trunk/jpa/src/test/java/org/apache/james/imap/jpa/MessageBuilder.java
    
james/protocols/imap/trunk/jpa/src/test/java/org/apache/james/imap/jpa/MessageRowUtilsTest.java
    
james/protocols/imap/trunk/jpa/src/test/java/org/apache/james/imap/jpa/SearchUtilsMultipartMixedTest.java
    
james/protocols/imap/trunk/jpa/src/test/java/org/apache/james/imap/jpa/SearchUtilsRFC822Test.java
    
james/protocols/imap/trunk/jpa/src/test/java/org/apache/james/imap/jpa/SearchUtilsTest.java

Modified: 
james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/imap/functional/jpa/JPAHostSystem.java
URL: 
http://svn.apache.org/viewvc/james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/imap/functional/jpa/JPAHostSystem.java?rev=730410&r1=730409&r2=730410&view=diff
==============================================================================
--- 
james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/imap/functional/jpa/JPAHostSystem.java
 (original)
+++ 
james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/imap/functional/jpa/JPAHostSystem.java
 Wed Dec 31 08:01:47 2008
@@ -54,7 +54,7 @@
         properties.put("openjpa.Log", "JDBC=WARN, SQL=WARN, Runtime=WARN");
         properties.put("openjpa.ConnectionFactoryProperties", 
"PrettyPrint=true, PrettyPrintLineLength=72");
         properties.put("openjpa.jdbc.SynchronizeMappings", 
"buildSchema(ForeignKeys=true)");
-        properties.put("openjpa.MetaDataFactory", 
"jpa(Types=org.apache.james.imap.jpa.om.Header;org.apache.james.imap.jpa.om.Mailbox;org.apache.james.imap.jpa.om.Message)");
+        properties.put("openjpa.MetaDataFactory", 
"jpa(Types=org.apache.james.imap.jpa.mail.model.Header;org.apache.james.imap.jpa.mail.model.Mailbox;org.apache.james.imap.jpa.mail.model.Message)");
         
         userManager = new InMemoryUserManager();
         final EntityManagerFactory entityManagerFactory = 
OpenJPAPersistence.getEntityManagerFactory(properties);

Modified: james/protocols/imap/trunk/jpa/build.xml
URL: 
http://svn.apache.org/viewvc/james/protocols/imap/trunk/jpa/build.xml?rev=730410&r1=730409&r2=730410&view=diff
==============================================================================
--- james/protocols/imap/trunk/jpa/build.xml (original)
+++ james/protocols/imap/trunk/jpa/build.xml Wed Dec 31 08:01:47 2008
@@ -64,7 +64,7 @@
             </classpath>   
             <config
                log="TOOL=TRACE"   
-               
metaDataFactory="jpa(Types=org.apache.james.imap.jpa.om.Header;org.apache.james.imap.jpa.om.Mailbox;org.apache.james.imap.jpa.om.Message)"/>
   
+               
metaDataFactory="jpa(Types=org.apache.james.imap.jpa.mail.model.Header;org.apache.james.imap.jpa.mail.model.Mailbox;org.apache.james.imap.jpa.mail.model.Message)"/>
   
           </openjpac>
     </target> 
 </project>

Modified: 
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/JPAMailbox.java
URL: 
http://svn.apache.org/viewvc/james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/JPAMailbox.java?rev=730410&r1=730409&r2=730410&view=diff
==============================================================================
--- 
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/JPAMailbox.java
 (original)
+++ 
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/JPAMailbox.java
 Wed Dec 31 08:01:47 2008
@@ -37,12 +37,12 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.james.api.imap.AbstractLogEnabled;
-import org.apache.james.imap.jpa.map.MailboxMapper;
-import org.apache.james.imap.jpa.map.MessageMapper;
-import org.apache.james.imap.jpa.om.Header;
-import org.apache.james.imap.jpa.om.Mailbox;
-import org.apache.james.imap.jpa.om.Message;
-import org.apache.james.imap.jpa.om.openjpa.OpenJPAMailboxMapper;
+import org.apache.james.imap.jpa.mail.MailboxMapper;
+import org.apache.james.imap.jpa.mail.MessageMapper;
+import org.apache.james.imap.jpa.mail.map.openjpa.OpenJPAMailboxMapper;
+import org.apache.james.imap.jpa.mail.model.Header;
+import org.apache.james.imap.jpa.mail.model.Mailbox;
+import org.apache.james.imap.jpa.mail.model.Message;
 import org.apache.james.imap.mailbox.MailboxListener;
 import org.apache.james.imap.mailbox.MailboxException;
 import org.apache.james.imap.mailbox.MailboxSession;

Modified: 
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/JPAMailboxManager.java
URL: 
http://svn.apache.org/viewvc/james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/JPAMailboxManager.java?rev=730410&r1=730409&r2=730410&view=diff
==============================================================================
--- 
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/JPAMailboxManager.java
 (original)
+++ 
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/JPAMailboxManager.java
 Wed Dec 31 08:01:47 2008
@@ -32,9 +32,9 @@
 import javax.persistence.PersistenceException;
 
 import org.apache.james.api.imap.AbstractLogEnabled;
-import org.apache.james.imap.jpa.map.MailboxMapper;
-import org.apache.james.imap.jpa.om.Mailbox;
-import org.apache.james.imap.jpa.om.openjpa.OpenJPAMailboxMapper;
+import org.apache.james.imap.jpa.mail.MailboxMapper;
+import org.apache.james.imap.jpa.mail.map.openjpa.OpenJPAMailboxMapper;
+import org.apache.james.imap.jpa.mail.model.Mailbox;
 import org.apache.james.imap.mailbox.ListResult;
 import org.apache.james.imap.mailbox.MailboxExistsException;
 import org.apache.james.imap.mailbox.MailboxException;

Modified: 
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/JPAResultIterator.java
URL: 
http://svn.apache.org/viewvc/james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/JPAResultIterator.java?rev=730410&r1=730409&r2=730410&view=diff
==============================================================================
--- 
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/JPAResultIterator.java
 (original)
+++ 
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/JPAResultIterator.java
 Wed Dec 31 08:01:47 2008
@@ -29,7 +29,7 @@
 import javax.mail.Flags;
 import javax.mail.internet.MimeMessage;
 
-import org.apache.james.imap.jpa.om.Message;
+import org.apache.james.imap.jpa.mail.model.Message;
 import org.apache.james.imap.mailbox.MailboxException;
 import org.apache.james.imap.mailbox.MessageResult;
 import org.apache.james.imap.mailbox.MessageResult.FetchGroup;

Modified: 
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/MessageRowUtils.java
URL: 
http://svn.apache.org/viewvc/james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/MessageRowUtils.java?rev=730410&r1=730409&r2=730410&view=diff
==============================================================================
--- 
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/MessageRowUtils.java
 (original)
+++ 
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/MessageRowUtils.java
 Wed Dec 31 08:01:47 2008
@@ -32,8 +32,8 @@
 
 import javax.mail.Flags;
 
-import org.apache.james.imap.jpa.om.Header;
-import org.apache.james.imap.jpa.om.Message;
+import org.apache.james.imap.jpa.mail.model.Header;
+import org.apache.james.imap.jpa.mail.model.Message;
 import org.apache.james.imap.mailbox.MailboxException;
 import org.apache.james.imap.mailbox.MessageResult;
 import org.apache.james.imap.mailbox.MessageResult.Content;

Modified: 
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/MessageSearches.java
URL: 
http://svn.apache.org/viewvc/james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/MessageSearches.java?rev=730410&r1=730409&r2=730410&view=diff
==============================================================================
--- 
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/MessageSearches.java
 (original)
+++ 
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/MessageSearches.java
 Wed Dec 31 08:01:47 2008
@@ -34,8 +34,8 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.james.imap.jpa.om.Header;
-import org.apache.james.imap.jpa.om.Message;
+import org.apache.james.imap.jpa.mail.model.Header;
+import org.apache.james.imap.jpa.mail.model.Message;
 import org.apache.james.imap.mailbox.MailboxException;
 import org.apache.james.imap.mailbox.SearchQuery;
 import org.apache.james.imap.mailbox.UnsupportedSearchException;

Modified: 
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/ResultHeader.java
URL: 
http://svn.apache.org/viewvc/james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/ResultHeader.java?rev=730410&r1=730409&r2=730410&view=diff
==============================================================================
--- 
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/ResultHeader.java
 (original)
+++ 
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/ResultHeader.java
 Wed Dec 31 08:01:47 2008
@@ -28,7 +28,7 @@
 
 import javax.mail.MessagingException;
 
-import org.apache.james.imap.jpa.om.Header;
+import org.apache.james.imap.jpa.mail.model.Header;
 import org.apache.james.imap.mailbox.MailboxException;
 import org.apache.james.imap.mailbox.MessageResult;
 import org.apache.james.imap.mailbox.MessageResult.Content;

Copied: 
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/MailboxMapper.java
 (from r730402, 
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/map/MailboxMapper.java)
URL: 
http://svn.apache.org/viewvc/james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/MailboxMapper.java?p2=james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/MailboxMapper.java&p1=james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/map/MailboxMapper.java&r1=730402&r2=730410&rev=730410&view=diff
==============================================================================
--- 
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/map/MailboxMapper.java
 (original)
+++ 
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/MailboxMapper.java
 Wed Dec 31 08:01:47 2008
@@ -17,13 +17,13 @@
  * under the License.                                           *
  ****************************************************************/
 
-package org.apache.james.imap.jpa.map;
+package org.apache.james.imap.jpa.mail;
 
 import java.util.List;
 
 import javax.persistence.EntityManager;
 
-import org.apache.james.imap.jpa.om.Mailbox;
+import org.apache.james.imap.jpa.mail.model.Mailbox;
 
 /**
  * Data access management for mailbox.

Copied: 
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/Mapper.java
 (from r730402, 
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/map/Mapper.java)
URL: 
http://svn.apache.org/viewvc/james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/Mapper.java?p2=james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/Mapper.java&p1=james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/map/Mapper.java&r1=730402&r2=730410&rev=730410&view=diff
==============================================================================
--- 
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/map/Mapper.java
 (original)
+++ 
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/Mapper.java
 Wed Dec 31 08:01:47 2008
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations      *
  * under the License.                                           *
  ****************************************************************/
-package org.apache.james.imap.jpa.map;
+package org.apache.james.imap.jpa.mail;
 
 import javax.persistence.EntityManager;
 

Copied: 
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/MessageMapper.java
 (from r730402, 
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/map/MessageMapper.java)
URL: 
http://svn.apache.org/viewvc/james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/MessageMapper.java?p2=james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/MessageMapper.java&p1=james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/map/MessageMapper.java&r1=730402&r2=730410&rev=730410&view=diff
==============================================================================
--- 
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/map/MessageMapper.java
 (original)
+++ 
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/MessageMapper.java
 Wed Dec 31 08:01:47 2008
@@ -16,13 +16,13 @@
  * specific language governing permissions and limitations      *
  * under the License.                                           *
  ****************************************************************/
-package org.apache.james.imap.jpa.map;
+package org.apache.james.imap.jpa.mail;
 
 import java.util.List;
 
 import javax.persistence.EntityManager;
 
-import org.apache.james.imap.jpa.om.Message;
+import org.apache.james.imap.jpa.mail.model.Message;
 import org.apache.james.imap.mailbox.MessageRange;
 import org.apache.james.imap.mailbox.SearchQuery;
 import org.apache.james.imap.mailbox.SearchQuery.Criterion;

Copied: 
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/map/openjpa/OpenJPAMailboxMapper.java
 (from r730402, 
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/openjpa/OpenJPAMailboxMapper.java)
URL: 
http://svn.apache.org/viewvc/james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/map/openjpa/OpenJPAMailboxMapper.java?p2=james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/map/openjpa/OpenJPAMailboxMapper.java&p1=james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/openjpa/OpenJPAMailboxMapper.java&r1=730402&r2=730410&rev=730410&view=diff
==============================================================================
--- 
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/openjpa/OpenJPAMailboxMapper.java
 (original)
+++ 
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/map/openjpa/OpenJPAMailboxMapper.java
 Wed Dec 31 08:01:47 2008
@@ -17,12 +17,12 @@
  * under the License.                                           *
  ****************************************************************/
 
-package org.apache.james.imap.jpa.om.openjpa;
+package org.apache.james.imap.jpa.mail.map.openjpa;
 
 import javax.persistence.EntityManager;
 
-import org.apache.james.imap.jpa.map.MailboxMapper;
-import org.apache.james.imap.jpa.om.Mailbox;
+import org.apache.james.imap.jpa.mail.MailboxMapper;
+import org.apache.james.imap.jpa.mail.model.Mailbox;
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
 import org.apache.openjpa.persistence.OpenJPAPersistence;
 

Copied: 
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/model/Header.java
 (from r730402, 
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/Header.java)
URL: 
http://svn.apache.org/viewvc/james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/model/Header.java?p2=james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/model/Header.java&p1=james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/Header.java&r1=730402&r2=730410&rev=730410&view=diff
==============================================================================
--- 
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/Header.java
 (original)
+++ 
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/model/Header.java
 Wed Dec 31 08:01:47 2008
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations      *
  * under the License.                                           *
  ****************************************************************/
-package org.apache.james.imap.jpa.om;
+package org.apache.james.imap.jpa.mail.model;
 
 import javax.persistence.Basic;
 import javax.persistence.Column;

Propchange: 
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/model/Header.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: 
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/model/Mailbox.java
 (from r730402, 
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/Mailbox.java)
URL: 
http://svn.apache.org/viewvc/james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/model/Mailbox.java?p2=james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/model/Mailbox.java&p1=james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/Mailbox.java&r1=730402&r2=730410&rev=730410&view=diff
==============================================================================
--- 
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/Mailbox.java
 (original)
+++ 
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/model/Mailbox.java
 Wed Dec 31 08:01:47 2008
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations      *
  * under the License.                                           *
  ****************************************************************/
-package org.apache.james.imap.jpa.om;
+package org.apache.james.imap.jpa.mail.model;
 
 import javax.persistence.Basic;
 import javax.persistence.Entity;

Propchange: 
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/model/Mailbox.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: 
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/model/Message.java
 (from r730402, 
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/Message.java)
URL: 
http://svn.apache.org/viewvc/james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/model/Message.java?p2=james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/model/Message.java&p1=james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/Message.java&r1=730402&r2=730410&rev=730410&view=diff
==============================================================================
--- 
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/Message.java
 (original)
+++ 
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/model/Message.java
 Wed Dec 31 08:01:47 2008
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations      *
  * under the License.                                           *
  ****************************************************************/
-package org.apache.james.imap.jpa.om;
+package org.apache.james.imap.jpa.mail.model;
 
 import java.io.Serializable;
 import java.util.ArrayList;

Propchange: 
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/model/Message.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Modified: 
james/protocols/imap/trunk/jpa/src/test/java/org/apache/james/imap/jpa/MessageBuilder.java
URL: 
http://svn.apache.org/viewvc/james/protocols/imap/trunk/jpa/src/test/java/org/apache/james/imap/jpa/MessageBuilder.java?rev=730410&r1=730409&r2=730410&view=diff
==============================================================================
--- 
james/protocols/imap/trunk/jpa/src/test/java/org/apache/james/imap/jpa/MessageBuilder.java
 (original)
+++ 
james/protocols/imap/trunk/jpa/src/test/java/org/apache/james/imap/jpa/MessageBuilder.java
 Wed Dec 31 08:01:47 2008
@@ -24,8 +24,8 @@
 
 import javax.mail.Flags;
 
-import org.apache.james.imap.jpa.om.Header;
-import org.apache.james.imap.jpa.om.Message;
+import org.apache.james.imap.jpa.mail.model.Header;
+import org.apache.james.imap.jpa.mail.model.Message;
 
 public class MessageBuilder {
     

Modified: 
james/protocols/imap/trunk/jpa/src/test/java/org/apache/james/imap/jpa/MessageRowUtilsTest.java
URL: 
http://svn.apache.org/viewvc/james/protocols/imap/trunk/jpa/src/test/java/org/apache/james/imap/jpa/MessageRowUtilsTest.java?rev=730410&r1=730409&r2=730410&view=diff
==============================================================================
--- 
james/protocols/imap/trunk/jpa/src/test/java/org/apache/james/imap/jpa/MessageRowUtilsTest.java
 (original)
+++ 
james/protocols/imap/trunk/jpa/src/test/java/org/apache/james/imap/jpa/MessageRowUtilsTest.java
 Wed Dec 31 08:01:47 2008
@@ -21,7 +21,7 @@
 
 import junit.framework.TestCase;
 
-import org.apache.james.imap.jpa.om.Message;
+import org.apache.james.imap.jpa.mail.model.Message;
 
 public class MessageRowUtilsTest extends TestCase {    
     

Modified: 
james/protocols/imap/trunk/jpa/src/test/java/org/apache/james/imap/jpa/SearchUtilsMultipartMixedTest.java
URL: 
http://svn.apache.org/viewvc/james/protocols/imap/trunk/jpa/src/test/java/org/apache/james/imap/jpa/SearchUtilsMultipartMixedTest.java?rev=730410&r1=730409&r2=730410&view=diff
==============================================================================
--- 
james/protocols/imap/trunk/jpa/src/test/java/org/apache/james/imap/jpa/SearchUtilsMultipartMixedTest.java
 (original)
+++ 
james/protocols/imap/trunk/jpa/src/test/java/org/apache/james/imap/jpa/SearchUtilsMultipartMixedTest.java
 Wed Dec 31 08:01:47 2008
@@ -26,7 +26,7 @@
 import junit.framework.TestCase;
 
 import org.apache.james.api.imap.ImapConstants;
-import org.apache.james.imap.jpa.om.Message;
+import org.apache.james.imap.jpa.mail.model.Message;
 import org.apache.james.imap.mailbox.SearchQuery;
 
 public class SearchUtilsMultipartMixedTest extends TestCase {

Modified: 
james/protocols/imap/trunk/jpa/src/test/java/org/apache/james/imap/jpa/SearchUtilsRFC822Test.java
URL: 
http://svn.apache.org/viewvc/james/protocols/imap/trunk/jpa/src/test/java/org/apache/james/imap/jpa/SearchUtilsRFC822Test.java?rev=730410&r1=730409&r2=730410&view=diff
==============================================================================
--- 
james/protocols/imap/trunk/jpa/src/test/java/org/apache/james/imap/jpa/SearchUtilsRFC822Test.java
 (original)
+++ 
james/protocols/imap/trunk/jpa/src/test/java/org/apache/james/imap/jpa/SearchUtilsRFC822Test.java
 Wed Dec 31 08:01:47 2008
@@ -26,7 +26,7 @@
 import junit.framework.TestCase;
 
 import org.apache.james.api.imap.ImapConstants;
-import org.apache.james.imap.jpa.om.Message;
+import org.apache.james.imap.jpa.mail.model.Message;
 import org.apache.james.imap.mailbox.SearchQuery;
 
 public class SearchUtilsRFC822Test extends TestCase {

Modified: 
james/protocols/imap/trunk/jpa/src/test/java/org/apache/james/imap/jpa/SearchUtilsTest.java
URL: 
http://svn.apache.org/viewvc/james/protocols/imap/trunk/jpa/src/test/java/org/apache/james/imap/jpa/SearchUtilsTest.java?rev=730410&r1=730409&r2=730410&view=diff
==============================================================================
--- 
james/protocols/imap/trunk/jpa/src/test/java/org/apache/james/imap/jpa/SearchUtilsTest.java
 (original)
+++ 
james/protocols/imap/trunk/jpa/src/test/java/org/apache/james/imap/jpa/SearchUtilsTest.java
 Wed Dec 31 08:01:47 2008
@@ -28,7 +28,7 @@
 import junit.framework.TestCase;
 
 import org.apache.james.api.imap.ImapConstants;
-import org.apache.james.imap.jpa.om.Message;
+import org.apache.james.imap.jpa.mail.model.Message;
 import org.apache.james.imap.mailbox.SearchQuery;
 
 public class SearchUtilsTest extends TestCase {



---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to