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

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

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

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

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

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

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

Modified: james/imap/trunk/memory/src/test/java/org/apache/james/mailbox/inmemory/InMemoryHostSystem.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/memory/src/test/java/org/apache/james/mailbox/inmemory/InMemoryHostSystem.java?rev=993124&r1=991286&r2=993124&view=diff
==============================================================================
--- james/imap/trunk/memory/src/test/java/org/apache/james/mailbox/inmemory/InMemoryHostSystem.java (original)
+++ james/imap/trunk/memory/src/test/java/org/apache/james/mailbox/inmemory/InMemoryHostSystem.java Mon Sep  6 18:59:58 2010
@@ -17,17 +17,17 @@
  * under the License.                                           *
  ****************************************************************/
 
-package org.apache.james.imap.functional.inmemory;
+package org.apache.james.mailbox.inmemory;
 
 import org.apache.james.imap.api.process.ImapProcessor;
 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.inmemory.InMemoryMailboxManager;
-import org.apache.james.imap.inmemory.InMemoryMailboxSessionMapperFactory;
-import org.apache.james.imap.inmemory.InMemorySubscriptionManager;
 import org.apache.james.imap.main.DefaultImapDecoderFactory;
 import org.apache.james.imap.processor.main.DefaultImapProcessorFactory;
+import org.apache.james.mailbox.inmemory.InMemoryMailboxManager;
+import org.apache.james.mailbox.inmemory.InMemoryMailboxSessionMapperFactory;
+import org.apache.james.mailbox.inmemory.InMemorySubscriptionManager;
 import org.apache.james.test.functional.HostSystem;
 
 public class InMemoryHostSystem extends ImapHostSystem {

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

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

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

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

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

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

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

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

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

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

Copied: james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/Authenticator.java (from r991286, james/imap/trunk/store/src/main/java/org/apache/james/imap/store/Authenticator.java)
URL: http://svn.apache.org/viewvc/james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/Authenticator.java?p2=james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/Authenticator.java&p1=james/imap/trunk/store/src/main/java/org/apache/james/imap/store/Authenticator.java&r1=991286&r2=993124&rev=993124&view=diff
==============================================================================
--- james/imap/trunk/store/src/main/java/org/apache/james/imap/store/Authenticator.java (original)
+++ james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/Authenticator.java Mon Sep  6 18:59:58 2010
@@ -17,7 +17,7 @@
  * under the License.                                           *
  ****************************************************************/
 
-package org.apache.james.imap.store;
+package org.apache.james.mailbox.store;
 
 /**
  * Authenticates user credentials.

Copied: james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/DelegatingMailboxListener.java (from r993114, james/imap/trunk/store/src/main/java/org/apache/james/imap/store/DelegatingMailboxListener.java)
URL: http://svn.apache.org/viewvc/james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/DelegatingMailboxListener.java?p2=james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/DelegatingMailboxListener.java&p1=james/imap/trunk/store/src/main/java/org/apache/james/imap/store/DelegatingMailboxListener.java&r1=993114&r2=993124&rev=993124&view=diff
==============================================================================
--- james/imap/trunk/store/src/main/java/org/apache/james/imap/store/DelegatingMailboxListener.java (original)
+++ james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/DelegatingMailboxListener.java Mon Sep  6 18:59:58 2010
@@ -17,7 +17,7 @@
  * under the License.                                           *
  ****************************************************************/
 
-package org.apache.james.imap.store;
+package org.apache.james.mailbox.store;
 
 import java.util.ArrayList;
 import java.util.HashMap;

Copied: james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/MailboxMembershipComparator.java (from r991286, james/imap/trunk/store/src/main/java/org/apache/james/imap/store/MailboxMembershipComparator.java)
URL: http://svn.apache.org/viewvc/james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/MailboxMembershipComparator.java?p2=james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/MailboxMembershipComparator.java&p1=james/imap/trunk/store/src/main/java/org/apache/james/imap/store/MailboxMembershipComparator.java&r1=991286&r2=993124&rev=993124&view=diff
==============================================================================
--- james/imap/trunk/store/src/main/java/org/apache/james/imap/store/MailboxMembershipComparator.java (original)
+++ james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/MailboxMembershipComparator.java Mon Sep  6 18:59:58 2010
@@ -17,11 +17,11 @@
  * under the License.                                           *
  ****************************************************************/
 
-package org.apache.james.imap.store;
+package org.apache.james.mailbox.store;
 
 import java.util.Comparator;
 
-import org.apache.james.imap.store.mail.model.MailboxMembership;
+import org.apache.james.mailbox.store.mail.model.MailboxMembership;
 
 /**
  * UID comparator for mailbox membership.

Copied: james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/MailboxMetaData.java (from r993114, james/imap/trunk/store/src/main/java/org/apache/james/imap/store/MailboxMetaData.java)
URL: http://svn.apache.org/viewvc/james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/MailboxMetaData.java?p2=james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/MailboxMetaData.java&p1=james/imap/trunk/store/src/main/java/org/apache/james/imap/store/MailboxMetaData.java&r1=993114&r2=993124&rev=993124&view=diff
==============================================================================
--- james/imap/trunk/store/src/main/java/org/apache/james/imap/store/MailboxMetaData.java (original)
+++ james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/MailboxMetaData.java Mon Sep  6 18:59:58 2010
@@ -17,7 +17,7 @@
  * under the License.                                           *
  ****************************************************************/
 
-package org.apache.james.imap.store;
+package org.apache.james.mailbox.store;
 
 import java.util.ArrayList;
 import java.util.List;

Copied: james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/MailboxPathLock.java (from r993114, james/imap/trunk/store/src/main/java/org/apache/james/imap/store/MailboxPathLock.java)
URL: http://svn.apache.org/viewvc/james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/MailboxPathLock.java?p2=james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/MailboxPathLock.java&p1=james/imap/trunk/store/src/main/java/org/apache/james/imap/store/MailboxPathLock.java&r1=993114&r2=993124&rev=993124&view=diff
==============================================================================
--- james/imap/trunk/store/src/main/java/org/apache/james/imap/store/MailboxPathLock.java (original)
+++ james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/MailboxPathLock.java Mon Sep  6 18:59:58 2010
@@ -17,7 +17,7 @@
  * under the License.                                           *
  ****************************************************************/
 
-package org.apache.james.imap.store;
+package org.apache.james.mailbox.store;
 
 import java.util.HashMap;
 import java.util.Map;

Copied: james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/MailboxSessionMapperFactory.java (from r993114, james/imap/trunk/store/src/main/java/org/apache/james/imap/store/MailboxSessionMapperFactory.java)
URL: http://svn.apache.org/viewvc/james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/MailboxSessionMapperFactory.java?p2=james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/MailboxSessionMapperFactory.java&p1=james/imap/trunk/store/src/main/java/org/apache/james/imap/store/MailboxSessionMapperFactory.java&r1=993114&r2=993124&rev=993124&view=diff
==============================================================================
--- james/imap/trunk/store/src/main/java/org/apache/james/imap/store/MailboxSessionMapperFactory.java (original)
+++ james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/MailboxSessionMapperFactory.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.store;
+package org.apache.james.mailbox.store;
 
-import org.apache.james.imap.store.mail.MailboxMapper;
-import org.apache.james.imap.store.mail.MessageMapper;
-import org.apache.james.imap.store.transaction.Mapper;
-import org.apache.james.imap.store.user.SubscriptionMapper;
 import org.apache.james.mailbox.MailboxException;
 import org.apache.james.mailbox.MailboxSession;
 import org.apache.james.mailbox.RequestAware;
 import org.apache.james.mailbox.SubscriptionException;
+import org.apache.james.mailbox.store.mail.MailboxMapper;
+import org.apache.james.mailbox.store.mail.MessageMapper;
+import org.apache.james.mailbox.store.transaction.Mapper;
+import org.apache.james.mailbox.store.user.SubscriptionMapper;
 
 /**
  * Maintain mapper instances by {@link MailboxSession}. So only one mapper instance is used

Copied: james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/MapperStoreMessageManager.java (from r993114, james/imap/trunk/store/src/main/java/org/apache/james/imap/store/MapperStoreMessageManager.java)
URL: http://svn.apache.org/viewvc/james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/MapperStoreMessageManager.java?p2=james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/MapperStoreMessageManager.java&p1=james/imap/trunk/store/src/main/java/org/apache/james/imap/store/MapperStoreMessageManager.java&r1=993114&r2=993124&rev=993124&view=diff
==============================================================================
--- james/imap/trunk/store/src/main/java/org/apache/james/imap/store/MapperStoreMessageManager.java (original)
+++ james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/MapperStoreMessageManager.java Mon Sep  6 18:59:58 2010
@@ -17,7 +17,7 @@
  * under the License.                                           *
  ****************************************************************/
 
-package org.apache.james.imap.store;
+package org.apache.james.mailbox.store;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -28,16 +28,16 @@ import java.util.TreeSet;
 import javax.mail.Flags;
 import javax.mail.MessagingException;
 
-import org.apache.james.imap.store.mail.MessageMapper;
-import org.apache.james.imap.store.mail.model.Mailbox;
-import org.apache.james.imap.store.mail.model.MailboxMembership;
-import org.apache.james.imap.store.transaction.Mapper;
 import org.apache.james.mailbox.MailboxException;
 import org.apache.james.mailbox.MailboxSession;
 import org.apache.james.mailbox.MessageRange;
 import org.apache.james.mailbox.MessageResult;
 import org.apache.james.mailbox.SearchQuery;
 import org.apache.james.mailbox.MessageResult.FetchGroup;
+import org.apache.james.mailbox.store.mail.MessageMapper;
+import org.apache.james.mailbox.store.mail.model.Mailbox;
+import org.apache.james.mailbox.store.mail.model.MailboxMembership;
+import org.apache.james.mailbox.store.transaction.Mapper;
 import org.apache.james.mailbox.util.MailboxEventDispatcher;
 
 /**
@@ -151,7 +151,7 @@ public abstract class MapperStoreMessage
     
     /*
      * (non-Javadoc)
-     * @see org.apache.james.imap.store.AbstractStoreMessageManager#updateFlags(javax.mail.Flags, boolean, boolean, org.apache.james.mailbox.MessageRange, org.apache.james.mailbox.MailboxSession)
+     * @see org.apache.james.mailbox.store.AbstractStoreMessageManager#updateFlags(javax.mail.Flags, boolean, boolean, org.apache.james.mailbox.MessageRange, org.apache.james.mailbox.MailboxSession)
      */
     public Iterator<UpdatedFlag> updateFlags(final Flags flags, final boolean value, final boolean replace,
             final MessageRange set, MailboxSession mailboxSession) throws MailboxException {
@@ -224,7 +224,7 @@ public abstract class MapperStoreMessage
     
     /*
      * (non-Javadoc)
-     * @see org.apache.james.imap.store.AbstractStoreMessageManager#copy(org.apache.james.mailbox.MessageRange, org.apache.james.imap.store.AbstractStoreMessageManager, org.apache.james.mailbox.MailboxSession)
+     * @see org.apache.james.mailbox.store.AbstractStoreMessageManager#copy(org.apache.james.mailbox.MessageRange, org.apache.james.mailbox.store.AbstractStoreMessageManager, org.apache.james.mailbox.MailboxSession)
      */
     protected Iterator<Long> copy(MessageRange set, StoreMessageManager<Id> toMailbox, MailboxSession session) throws MailboxException {
         MapperStoreMessageManager<Id> to = (MapperStoreMessageManager<Id>) toMailbox;
@@ -242,7 +242,7 @@ public abstract class MapperStoreMessage
 
     /*
      * (non-Javadoc)
-     * @see org.apache.james.imap.store.AbstractStoreMessageManager#countUnseenMessagesInMailbox(org.apache.james.mailbox.MailboxSession)
+     * @see org.apache.james.mailbox.store.AbstractStoreMessageManager#countUnseenMessagesInMailbox(org.apache.james.mailbox.MailboxSession)
      */
     protected long countUnseenMessagesInMailbox(MailboxSession session) throws MailboxException {
         MessageMapper<Id> messageMapper = mapperFactory.getMessageMapper(session);
@@ -253,7 +253,7 @@ public abstract class MapperStoreMessage
 
     /*
      * (non-Javadoc)
-     * @see org.apache.james.imap.store.AbstractStoreMessageManager#findFirstUnseenMessageUid(org.apache.james.mailbox.MailboxSession)
+     * @see org.apache.james.mailbox.store.AbstractStoreMessageManager#findFirstUnseenMessageUid(org.apache.james.mailbox.MailboxSession)
      */
     protected Long findFirstUnseenMessageUid(MailboxSession session) throws MailboxException{
         MessageMapper<Id> messageMapper = mapperFactory.getMessageMapper(session);

Copied: james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/MessageSearcher.java (from r991286, james/imap/trunk/store/src/main/java/org/apache/james/imap/store/MessageSearcher.java)
URL: http://svn.apache.org/viewvc/james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/MessageSearcher.java?p2=james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/MessageSearcher.java&p1=james/imap/trunk/store/src/main/java/org/apache/james/imap/store/MessageSearcher.java&r1=991286&r2=993124&rev=993124&view=diff
==============================================================================
--- james/imap/trunk/store/src/main/java/org/apache/james/imap/store/MessageSearcher.java (original)
+++ james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/MessageSearcher.java Mon Sep  6 18:59:58 2010
@@ -17,7 +17,7 @@
  * under the License.                                           *
  ****************************************************************/
 
-package org.apache.james.imap.store;
+package org.apache.james.mailbox.store;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -29,7 +29,7 @@ import java.nio.charset.UnsupportedChars
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.james.imap.store.streaming.ConfigurableMimeTokenStream;
+import org.apache.james.mailbox.store.streaming.ConfigurableMimeTokenStream;
 import org.apache.james.mime4j.MimeException;
 import org.apache.james.mime4j.parser.MimeEntityConfig;
 import org.apache.james.mime4j.parser.MimeTokenStream;

Copied: james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/MessageSearches.java (from r993114, james/imap/trunk/store/src/main/java/org/apache/james/imap/store/MessageSearches.java)
URL: http://svn.apache.org/viewvc/james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/MessageSearches.java?p2=james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/MessageSearches.java&p1=james/imap/trunk/store/src/main/java/org/apache/james/imap/store/MessageSearches.java&r1=993114&r2=993124&rev=993124&view=diff
==============================================================================
--- james/imap/trunk/store/src/main/java/org/apache/james/imap/store/MessageSearches.java (original)
+++ james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/MessageSearches.java Mon Sep  6 18:59:58 2010
@@ -17,7 +17,7 @@
  * under the License.                                           *
  ****************************************************************/
 
-package org.apache.james.imap.store;
+package org.apache.james.mailbox.store;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -34,12 +34,12 @@ import javax.mail.Flags;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.james.imap.store.mail.model.Header;
-import org.apache.james.imap.store.mail.model.MailboxMembership;
 import org.apache.james.mailbox.MailboxException;
 import org.apache.james.mailbox.SearchQuery;
 import org.apache.james.mailbox.UnsupportedSearchException;
 import org.apache.james.mailbox.SearchQuery.NumericRange;
+import org.apache.james.mailbox.store.mail.model.Header;
+import org.apache.james.mailbox.store.mail.model.MailboxMembership;
 import org.apache.james.mime4j.MimeException;
 import org.apache.james.mime4j.field.datetime.DateTime;
 import org.apache.james.mime4j.field.datetime.parser.DateTimeParser;

Copied: james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/MimeDescriptorImpl.java (from r993114, james/imap/trunk/store/src/main/java/org/apache/james/imap/store/MimeDescriptorImpl.java)
URL: http://svn.apache.org/viewvc/james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/MimeDescriptorImpl.java?p2=james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/MimeDescriptorImpl.java&p1=james/imap/trunk/store/src/main/java/org/apache/james/imap/store/MimeDescriptorImpl.java&r1=993114&r2=993124&rev=993124&view=diff
==============================================================================
--- james/imap/trunk/store/src/main/java/org/apache/james/imap/store/MimeDescriptorImpl.java (original)
+++ james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/MimeDescriptorImpl.java Mon Sep  6 18:59:58 2010
@@ -17,7 +17,7 @@
  * under the License.                                           *
  ****************************************************************/
 
-package org.apache.james.imap.store;
+package org.apache.james.mailbox.store;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -28,13 +28,13 @@ import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
 
-import org.apache.james.imap.store.mail.model.Message;
-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.ConfigurableMimeTokenStream;
-import org.apache.james.imap.store.streaming.CountingInputStream;
 import org.apache.james.mailbox.MessageResult;
 import org.apache.james.mailbox.MimeDescriptor;
+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.ConfigurableMimeTokenStream;
+import org.apache.james.mailbox.store.streaming.CountingInputStream;
 import org.apache.james.mime4j.MimeException;
 import org.apache.james.mime4j.descriptor.MaximalBodyDescriptor;
 import org.apache.james.mime4j.parser.MimeEntityConfig;

Copied: james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/ResultHeader.java (from r993114, james/imap/trunk/store/src/main/java/org/apache/james/imap/store/ResultHeader.java)
URL: http://svn.apache.org/viewvc/james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/ResultHeader.java?p2=james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/ResultHeader.java&p1=james/imap/trunk/store/src/main/java/org/apache/james/imap/store/ResultHeader.java&r1=993114&r2=993124&rev=993124&view=diff
==============================================================================
--- james/imap/trunk/store/src/main/java/org/apache/james/imap/store/ResultHeader.java (original)
+++ james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/ResultHeader.java Mon Sep  6 18:59:58 2010
@@ -20,16 +20,16 @@
 /**
  * 
  */
-package org.apache.james.imap.store;
+package org.apache.james.mailbox.store;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.nio.channels.WritableByteChannel;
 
-import org.apache.james.imap.store.mail.model.Header;
 import org.apache.james.mailbox.Content;
 import org.apache.james.mailbox.MailboxException;
 import org.apache.james.mailbox.MessageResult;
+import org.apache.james.mailbox.store.mail.model.Header;
 
 public final class ResultHeader implements MessageResult.Header, Content {
     private final String name;

Copied: james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/ResultIterator.java (from r993114, james/imap/trunk/store/src/main/java/org/apache/james/imap/store/ResultIterator.java)
URL: http://svn.apache.org/viewvc/james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/ResultIterator.java?p2=james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/ResultIterator.java&p1=james/imap/trunk/store/src/main/java/org/apache/james/imap/store/ResultIterator.java&r1=993114&r2=993124&rev=993124&view=diff
==============================================================================
--- james/imap/trunk/store/src/main/java/org/apache/james/imap/store/ResultIterator.java (original)
+++ james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/ResultIterator.java Mon Sep  6 18:59:58 2010
@@ -17,7 +17,7 @@
  * under the License.                                           *
  ****************************************************************/
 
-package org.apache.james.imap.store;
+package org.apache.james.mailbox.store;
 
 import java.util.ArrayList;
 import java.util.Date;
@@ -26,12 +26,12 @@ import java.util.NoSuchElementException;
 
 import javax.mail.Flags;
 
-import org.apache.james.imap.store.mail.model.MailboxMembership;
 import org.apache.james.mailbox.Content;
 import org.apache.james.mailbox.MailboxException;
 import org.apache.james.mailbox.MessageResult;
 import org.apache.james.mailbox.MimeDescriptor;
 import org.apache.james.mailbox.MessageResult.FetchGroup;
+import org.apache.james.mailbox.store.mail.model.MailboxMembership;
 
 /**
  * {@link Iterator} implementation for {@link MessageResult}

Copied: james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/ResultUtils.java (from r993114, james/imap/trunk/store/src/main/java/org/apache/james/imap/store/ResultUtils.java)
URL: http://svn.apache.org/viewvc/james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/ResultUtils.java?p2=james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/ResultUtils.java&p1=james/imap/trunk/store/src/main/java/org/apache/james/imap/store/ResultUtils.java&r1=993114&r2=993124&rev=993124&view=diff
==============================================================================
--- james/imap/trunk/store/src/main/java/org/apache/james/imap/store/ResultUtils.java (original)
+++ james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/ResultUtils.java Mon Sep  6 18:59:58 2010
@@ -17,7 +17,7 @@
  * under the License.                                           *
  ****************************************************************/
 
-package org.apache.james.imap.store;
+package org.apache.james.mailbox.store;
 
 import java.io.FilterInputStream;
 import java.io.IOException;
@@ -31,17 +31,17 @@ import java.util.List;
 
 import javax.swing.text.Document;
 
-import org.apache.james.imap.store.mail.model.Header;
-import org.apache.james.imap.store.mail.model.MailboxMembership;
-import org.apache.james.imap.store.streaming.InputStreamContent;
-import org.apache.james.imap.store.streaming.PartContentBuilder;
-import org.apache.james.imap.store.streaming.RewindableInputStream;
 import org.apache.james.mailbox.Content;
 import org.apache.james.mailbox.MailboxException;
 import org.apache.james.mailbox.MessageResult;
 import org.apache.james.mailbox.MimeDescriptor;
 import org.apache.james.mailbox.MessageResult.FetchGroup;
 import org.apache.james.mailbox.MessageResult.MimePath;
+import org.apache.james.mailbox.store.mail.model.Header;
+import org.apache.james.mailbox.store.mail.model.MailboxMembership;
+import org.apache.james.mailbox.store.streaming.InputStreamContent;
+import org.apache.james.mailbox.store.streaming.PartContentBuilder;
+import org.apache.james.mailbox.store.streaming.RewindableInputStream;
 import org.apache.james.mailbox.util.MessageResultImpl;
 import org.apache.james.mime4j.MimeException;
 
@@ -57,11 +57,11 @@ public class ResultUtils {
     static final Charset US_ASCII = Charset.forName("US-ASCII");
 
     public static List<MessageResult.Header> createHeaders(MailboxMembership<?> message) {
-        final org.apache.james.imap.store.mail.model.Message document = message.getMessage();
+        final org.apache.james.mailbox.store.mail.model.Message document = message.getMessage();
         return createHeaders(document);
     }
 
-    public static List<MessageResult.Header> createHeaders(final org.apache.james.imap.store.mail.model.Message document) {
+    public static List<MessageResult.Header> createHeaders(final org.apache.james.mailbox.store.mail.model.Message document) {
         final List<Header> headers = getSortedHeaders(document);
 
         final List<MessageResult.Header> results = new ArrayList<MessageResult.Header>(headers.size());
@@ -72,7 +72,7 @@ public class ResultUtils {
         return results;
     }
 
-    private static List<Header> getSortedHeaders(final org.apache.james.imap.store.mail.model.Message document) {
+    private static List<Header> getSortedHeaders(final org.apache.james.mailbox.store.mail.model.Message document) {
         final List<Header> headers = new ArrayList<Header>(document.getHeaders());
         Collections.sort(headers);
         return headers;
@@ -232,7 +232,7 @@ public class ResultUtils {
     }
 
     /**
-     * Return an {@link InputStream} which holds the content of the {@link org.apache.james.imap.store.mail.model.Message} which is linked in the {@link MailboxMembership}
+     * Return an {@link InputStream} which holds the content of the {@link org.apache.james.mailbox.store.mail.model.Message} which is linked in the {@link MailboxMembership}
      * 
      * @param membership
      * @return stream
@@ -240,19 +240,19 @@ public class ResultUtils {
      */
 
     public static InputStream toInput(final MailboxMembership<?> membership) throws IOException {
-        final org.apache.james.imap.store.mail.model.Message document = membership.getMessage();
+        final org.apache.james.mailbox.store.mail.model.Message document = membership.getMessage();
         return toInput(document);
     }
    
 
     /**
-     * Return an {@link InputStream} which holds the content of the given {@link org.apache.james.imap.store.mail.model.Message}
+     * Return an {@link InputStream} which holds the content of the given {@link org.apache.james.mailbox.store.mail.model.Message}
      * 
      * @param document
      * @return stream
      * @throws IOException 
      */
-    public static InputStream toInput(final org.apache.james.imap.store.mail.model.Message document) throws IOException {
+    public static InputStream toInput(final org.apache.james.mailbox.store.mail.model.Message document) throws IOException {
         final List<Header> headers = getSortedHeaders(document);
         final StringBuffer headersToString = new StringBuffer(headers.size() * 50);
         for (Header header: headers) {

Copied: james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/SearchQueryIterator.java (from r993114, james/imap/trunk/store/src/main/java/org/apache/james/imap/store/SearchQueryIterator.java)
URL: http://svn.apache.org/viewvc/james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/SearchQueryIterator.java?p2=james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/SearchQueryIterator.java&p1=james/imap/trunk/store/src/main/java/org/apache/james/imap/store/SearchQueryIterator.java&r1=993114&r2=993124&rev=993124&view=diff
==============================================================================
--- james/imap/trunk/store/src/main/java/org/apache/james/imap/store/SearchQueryIterator.java (original)
+++ james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/SearchQueryIterator.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.store;
+package org.apache.james.mailbox.store;
 
 import java.util.Iterator;
 import java.util.NoSuchElementException;
 
 import org.apache.commons.logging.Log;
-import org.apache.james.imap.store.mail.model.MailboxMembership;
 import org.apache.james.mailbox.MailboxException;
 import org.apache.james.mailbox.SearchQuery;
+import org.apache.james.mailbox.store.mail.model.MailboxMembership;
 
 /**
  * {@link Iterator} implementation which use a {@link MessageSearches} instance to lazy 

Copied: james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/SimpleMailboxSession.java (from r993114, james/imap/trunk/store/src/main/java/org/apache/james/imap/store/SimpleMailboxSession.java)
URL: http://svn.apache.org/viewvc/james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/SimpleMailboxSession.java?p2=james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/SimpleMailboxSession.java&p1=james/imap/trunk/store/src/main/java/org/apache/james/imap/store/SimpleMailboxSession.java&r1=993114&r2=993124&rev=993124&view=diff
==============================================================================
--- james/imap/trunk/store/src/main/java/org/apache/james/imap/store/SimpleMailboxSession.java (original)
+++ james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/SimpleMailboxSession.java Mon Sep  6 18:59:58 2010
@@ -17,7 +17,7 @@
  * under the License.                                           *
  ****************************************************************/
 
-package org.apache.james.imap.store;
+package org.apache.james.mailbox.store;
 
 import java.util.ArrayList;
 import java.util.Collection;

Copied: james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/StoreMailboxManager.java (from r993114, james/imap/trunk/store/src/main/java/org/apache/james/imap/store/StoreMailboxManager.java)
URL: http://svn.apache.org/viewvc/james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/StoreMailboxManager.java?p2=james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/StoreMailboxManager.java&p1=james/imap/trunk/store/src/main/java/org/apache/james/imap/store/StoreMailboxManager.java&r1=993114&r2=993124&rev=993124&view=diff
==============================================================================
--- james/imap/trunk/store/src/main/java/org/apache/james/imap/store/StoreMailboxManager.java (original)
+++ james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/StoreMailboxManager.java Mon Sep  6 18:59:58 2010
@@ -17,7 +17,7 @@
  * under the License.                                           *
  ****************************************************************/
 
-package org.apache.james.imap.store;
+package org.apache.james.mailbox.store;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -29,9 +29,6 @@ import javax.mail.Flags;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.james.imap.store.mail.MailboxMapper;
-import org.apache.james.imap.store.mail.model.Mailbox;
-import org.apache.james.imap.store.transaction.Mapper;
 import org.apache.james.mailbox.BadCredentialsException;
 import org.apache.james.mailbox.MailboxConstants;
 import org.apache.james.mailbox.MailboxException;
@@ -46,6 +43,9 @@ import org.apache.james.mailbox.MailboxS
 import org.apache.james.mailbox.MessageRange;
 import org.apache.james.mailbox.StandardMailboxMetaDataComparator;
 import org.apache.james.mailbox.MailboxMetaData.Selectability;
+import org.apache.james.mailbox.store.mail.MailboxMapper;
+import org.apache.james.mailbox.store.mail.model.Mailbox;
+import org.apache.james.mailbox.store.transaction.Mapper;
 import org.apache.james.mailbox.util.MailboxEventDispatcher;
 import org.apache.james.mailbox.util.SimpleMailboxMetaData;
 

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

Copied: james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/StoreMessageManager.java (from r993114, james/imap/trunk/store/src/main/java/org/apache/james/imap/store/StoreMessageManager.java)
URL: http://svn.apache.org/viewvc/james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/StoreMessageManager.java?p2=james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/StoreMessageManager.java&p1=james/imap/trunk/store/src/main/java/org/apache/james/imap/store/StoreMessageManager.java&r1=993114&r2=993124&rev=993124&view=diff
==============================================================================
--- james/imap/trunk/store/src/main/java/org/apache/james/imap/store/StoreMessageManager.java (original)
+++ james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/StoreMessageManager.java Mon Sep  6 18:59:58 2010
@@ -17,7 +17,7 @@
  * under the License.                                           *
  ****************************************************************/
 
-package org.apache.james.imap.store;
+package org.apache.james.mailbox.store;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -36,18 +36,18 @@ import javax.mail.Flags;
 import javax.mail.MessagingException;
 import javax.mail.util.SharedFileInputStream;
 
-import org.apache.james.imap.store.mail.MessageMapper;
-import org.apache.james.imap.store.mail.model.Header;
-import org.apache.james.imap.store.mail.model.Mailbox;
-import org.apache.james.imap.store.mail.model.MailboxMembership;
-import org.apache.james.imap.store.mail.model.PropertyBuilder;
-import org.apache.james.imap.store.streaming.ConfigurableMimeTokenStream;
-import org.apache.james.imap.store.streaming.CountingInputStream;
 import org.apache.james.mailbox.MailboxException;
 import org.apache.james.mailbox.MailboxListener;
 import org.apache.james.mailbox.MailboxNotFoundException;
 import org.apache.james.mailbox.MailboxSession;
 import org.apache.james.mailbox.MessageRange;
+import org.apache.james.mailbox.store.mail.MessageMapper;
+import org.apache.james.mailbox.store.mail.model.Header;
+import org.apache.james.mailbox.store.mail.model.Mailbox;
+import org.apache.james.mailbox.store.mail.model.MailboxMembership;
+import org.apache.james.mailbox.store.mail.model.PropertyBuilder;
+import org.apache.james.mailbox.store.streaming.ConfigurableMimeTokenStream;
+import org.apache.james.mailbox.store.streaming.CountingInputStream;
 import org.apache.james.mailbox.util.MailboxEventDispatcher;
 import org.apache.james.mime4j.MimeException;
 import org.apache.james.mime4j.descriptor.MaximalBodyDescriptor;

Copied: james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/StoreSubscriptionManager.java (from r993114, james/imap/trunk/store/src/main/java/org/apache/james/imap/store/StoreSubscriptionManager.java)
URL: http://svn.apache.org/viewvc/james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/StoreSubscriptionManager.java?p2=james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/StoreSubscriptionManager.java&p1=james/imap/trunk/store/src/main/java/org/apache/james/imap/store/StoreSubscriptionManager.java&r1=993114&r2=993124&rev=993124&view=diff
==============================================================================
--- james/imap/trunk/store/src/main/java/org/apache/james/imap/store/StoreSubscriptionManager.java (original)
+++ james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/StoreSubscriptionManager.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.store;
+package org.apache.james.mailbox.store;
 
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.List;
 
-import org.apache.james.imap.store.transaction.Mapper;
-import org.apache.james.imap.store.user.SubscriptionMapper;
-import org.apache.james.imap.store.user.model.Subscription;
 import org.apache.james.mailbox.MailboxException;
 import org.apache.james.mailbox.MailboxSession;
 import org.apache.james.mailbox.SubscriptionException;
 import org.apache.james.mailbox.SubscriptionManager;
+import org.apache.james.mailbox.store.transaction.Mapper;
+import org.apache.james.mailbox.store.user.SubscriptionMapper;
+import org.apache.james.mailbox.store.user.model.Subscription;
 
 /**
  * Manages subscriptions.

Copied: james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/UpdatedFlag.java (from r991286, james/imap/trunk/store/src/main/java/org/apache/james/imap/store/UpdatedFlag.java)
URL: http://svn.apache.org/viewvc/james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/UpdatedFlag.java?p2=james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/UpdatedFlag.java&p1=james/imap/trunk/store/src/main/java/org/apache/james/imap/store/UpdatedFlag.java&r1=991286&r2=993124&rev=993124&view=diff
==============================================================================
--- james/imap/trunk/store/src/main/java/org/apache/james/imap/store/UpdatedFlag.java (original)
+++ james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/UpdatedFlag.java Mon Sep  6 18:59:58 2010
@@ -35,7 +35,7 @@
  * under the License.                                           *
  ****************************************************************/
 
-package org.apache.james.imap.store;
+package org.apache.james.mailbox.store;
 
 import javax.mail.Flags;
 

Copied: james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/MailboxMapper.java (from r993114, james/imap/trunk/store/src/main/java/org/apache/james/imap/store/mail/MailboxMapper.java)
URL: http://svn.apache.org/viewvc/james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/MailboxMapper.java?p2=james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/MailboxMapper.java&p1=james/imap/trunk/store/src/main/java/org/apache/james/imap/store/mail/MailboxMapper.java&r1=993114&r2=993124&rev=993124&view=diff
==============================================================================
--- james/imap/trunk/store/src/main/java/org/apache/james/imap/store/mail/MailboxMapper.java (original)
+++ james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/MailboxMapper.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.store.mail;
+package org.apache.james.mailbox.store.mail;
 
 import java.util.List;
 
-import org.apache.james.imap.store.mail.model.Mailbox;
-import org.apache.james.imap.store.transaction.Mapper;
 import org.apache.james.mailbox.MailboxException;
 import org.apache.james.mailbox.MailboxNotFoundException;
 import org.apache.james.mailbox.MailboxPath;
+import org.apache.james.mailbox.store.mail.model.Mailbox;
+import org.apache.james.mailbox.store.transaction.Mapper;
 
 /**
  * Mapper for {@link Mailbox} actions. A {@link MailboxMapper} has a lifecycle from the start of a request 

Copied: james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/MessageMapper.java (from r993114, james/imap/trunk/store/src/main/java/org/apache/james/imap/store/mail/MessageMapper.java)
URL: http://svn.apache.org/viewvc/james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/MessageMapper.java?p2=james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/MessageMapper.java&p1=james/imap/trunk/store/src/main/java/org/apache/james/imap/store/mail/MessageMapper.java&r1=993114&r2=993124&rev=993124&view=diff
==============================================================================
--- james/imap/trunk/store/src/main/java/org/apache/james/imap/store/mail/MessageMapper.java (original)
+++ james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/MessageMapper.java Mon Sep  6 18:59:58 2010
@@ -16,18 +16,18 @@
  * specific language governing permissions and limitations      *
  * under the License.                                           *
  ****************************************************************/
-package org.apache.james.imap.store.mail;
+package org.apache.james.mailbox.store.mail;
 
 import java.util.Iterator;
 import java.util.List;
 
-import org.apache.james.imap.store.mail.model.Message;
-import org.apache.james.imap.store.mail.model.Mailbox;
-import org.apache.james.imap.store.mail.model.MailboxMembership;
-import org.apache.james.imap.store.transaction.Mapper;
 import org.apache.james.mailbox.MailboxException;
 import org.apache.james.mailbox.MessageRange;
 import org.apache.james.mailbox.SearchQuery;
+import org.apache.james.mailbox.store.mail.model.Mailbox;
+import org.apache.james.mailbox.store.mail.model.MailboxMembership;
+import org.apache.james.mailbox.store.mail.model.Message;
+import org.apache.james.mailbox.store.transaction.Mapper;
 
 /**
  * Maps {@link Message} in a {@link org.apache.james.mailbox.MessageManager}. A {@link MessageMapper} has a lifecycle from the start of a request 

Modified: james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/AbstractComparableHeader.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/AbstractComparableHeader.java?rev=993124&r1=991286&r2=993124&view=diff
==============================================================================
--- james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/AbstractComparableHeader.java (original)
+++ james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/AbstractComparableHeader.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.store.mail.model;
+package org.apache.james.mailbox.store.mail.model;
 
 /**
  * Abstract base class for Header implementations which implements the compare

Modified: james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/AbstractComparableProperty.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/AbstractComparableProperty.java?rev=993124&r1=991286&r2=993124&view=diff
==============================================================================
--- james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/AbstractComparableProperty.java (original)
+++ james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/AbstractComparableProperty.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.store.mail.model;
+package org.apache.james.mailbox.store.mail.model;
 
 /**
  * Abstract base class for Property implementations which implements the compare of Properties

Modified: james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/AbstractMailboxMembership.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/AbstractMailboxMembership.java?rev=993124&r1=991286&r2=993124&view=diff
==============================================================================
--- james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/AbstractMailboxMembership.java (original)
+++ james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/AbstractMailboxMembership.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.store.mail.model;
+package org.apache.james.mailbox.store.mail.model;
 
 import javax.mail.Flags;
 
@@ -29,7 +29,7 @@ public abstract class AbstractMailboxMem
 
 
     /**
-     * @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();

Modified: james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/AbstractMessage.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/AbstractMessage.java?rev=993124&r1=991286&r2=993124&view=diff
==============================================================================
--- james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/AbstractMessage.java (original)
+++ james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/AbstractMessage.java Mon Sep  6 18:59:58 2010
@@ -16,13 +16,13 @@
  * specific language governing permissions and limitations      *
  * under the License.                                           *
  ****************************************************************/
-package org.apache.james.imap.store.mail.model;
+package org.apache.james.mailbox.store.mail.model;
 
 import java.io.IOException;
 import java.io.InputStream;
 
-import org.apache.james.imap.store.streaming.LazySkippingInputStream;
-import org.apache.james.imap.store.streaming.RewindableInputStream;
+import org.apache.james.mailbox.store.streaming.LazySkippingInputStream;
+import org.apache.james.mailbox.store.streaming.RewindableInputStream;
 
 
 /**
@@ -50,7 +50,7 @@ public abstract class AbstractMessage im
     
     /*
      * (non-Javadoc)
-     * @see org.apache.james.imap.store.mail.model.Document#getFullContent()
+     * @see org.apache.james.mailbox.store.mail.model.Document#getFullContent()
      */
     public RewindableInputStream getFullContent() throws IOException {
         return new RewindableInputStream(getRawFullContent()) {
@@ -64,7 +64,7 @@ public abstract class AbstractMessage im
 
     /*
      * (non-Javadoc)
-     * @see org.apache.james.imap.store.mail.model.Document#getBodyContent()
+     * @see org.apache.james.mailbox.store.mail.model.Document#getBodyContent()
      */
     public RewindableInputStream getBodyContent() throws IOException {
         return new RewindableInputStream(new LazySkippingInputStream(getRawFullContent(), getBodyStartOctet())) {

Modified: james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/Header.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/Header.java?rev=993124&r1=991286&r2=993124&view=diff
==============================================================================
--- james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/Header.java (original)
+++ james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/Header.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.store.mail.model;
+package org.apache.james.mailbox.store.mail.model;
 
 /**
  * 

Modified: james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/Mailbox.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/Mailbox.java?rev=993124&r1=991286&r2=993124&view=diff
==============================================================================
--- james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/Mailbox.java (original)
+++ james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/Mailbox.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.store.mail.model;
+package org.apache.james.mailbox.store.mail.model;
 
 /**
  * Models long term mailbox data.

Modified: james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/MailboxMembership.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/MailboxMembership.java?rev=993124&r1=991286&r2=993124&view=diff
==============================================================================
--- james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/MailboxMembership.java (original)
+++ james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/MailboxMembership.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.store.mail.model;
+package org.apache.james.mailbox.store.mail.model;
 
 import java.util.Date;
 

Modified: james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/Message.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/Message.java?rev=993124&r1=991286&r2=993124&view=diff
==============================================================================
--- james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/Message.java (original)
+++ james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/Message.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.store.mail.model;
+package org.apache.james.mailbox.store.mail.model;
 
 import java.io.IOException;
 import java.util.List;
 
-import org.apache.james.imap.store.streaming.RewindableInputStream;
+import org.apache.james.mailbox.store.streaming.RewindableInputStream;
 
 /**
  * A MIME message, consisting of meta-data (including MIME headers)

Modified: james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/Property.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/Property.java?rev=993124&r1=991286&r2=993124&view=diff
==============================================================================
--- james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/Property.java (original)
+++ james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/Property.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.store.mail.model;
+package org.apache.james.mailbox.store.mail.model;
 
 
 /**

Modified: james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/PropertyBuilder.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/PropertyBuilder.java?rev=993124&r1=991286&r2=993124&view=diff
==============================================================================
--- james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/PropertyBuilder.java (original)
+++ james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/PropertyBuilder.java Mon Sep  6 18:59:58 2010
@@ -16,29 +16,29 @@
  * specific language governing permissions and limitations      *
  * under the License.                                           *
  ****************************************************************/
-package org.apache.james.imap.store.mail.model;
+package org.apache.james.mailbox.store.mail.model;
 
-import static org.apache.james.imap.store.mail.model.StandardNames.MIME_CONTENT_DESCRIPTION_NAME;
-import static org.apache.james.imap.store.mail.model.StandardNames.MIME_CONTENT_DESCRIPTION_SPACE;
-import static org.apache.james.imap.store.mail.model.StandardNames.MIME_CONTENT_DISPOSITION_PARAMETER_SPACE;
-import static org.apache.james.imap.store.mail.model.StandardNames.MIME_CONTENT_DISPOSITION_SPACE;
-import static org.apache.james.imap.store.mail.model.StandardNames.MIME_CONTENT_DISPOSITION_TYPE_NAME;
-import static org.apache.james.imap.store.mail.model.StandardNames.MIME_CONTENT_ID_NAME;
-import static org.apache.james.imap.store.mail.model.StandardNames.MIME_CONTENT_ID_SPACE;
-import static org.apache.james.imap.store.mail.model.StandardNames.MIME_CONTENT_LANGUAGE_NAME;
-import static org.apache.james.imap.store.mail.model.StandardNames.MIME_CONTENT_LANGUAGE_SPACE;
-import static org.apache.james.imap.store.mail.model.StandardNames.MIME_CONTENT_LOCATION_NAME;
-import static org.apache.james.imap.store.mail.model.StandardNames.MIME_CONTENT_LOCATION_SPACE;
-import static org.apache.james.imap.store.mail.model.StandardNames.MIME_CONTENT_MD5_NAME;
-import static org.apache.james.imap.store.mail.model.StandardNames.MIME_CONTENT_MD5_SPACE;
-import static org.apache.james.imap.store.mail.model.StandardNames.MIME_CONTENT_TRANSFER_ENCODING_NAME;
-import static org.apache.james.imap.store.mail.model.StandardNames.MIME_CONTENT_TRANSFER_ENCODING_SPACE;
-import static org.apache.james.imap.store.mail.model.StandardNames.MIME_CONTENT_TYPE_PARAMETER_BOUNDARY_NAME;
-import static org.apache.james.imap.store.mail.model.StandardNames.MIME_CONTENT_TYPE_PARAMETER_CHARSET_NAME;
-import static org.apache.james.imap.store.mail.model.StandardNames.MIME_CONTENT_TYPE_PARAMETER_SPACE;
-import static org.apache.james.imap.store.mail.model.StandardNames.MIME_MEDIA_TYPE_NAME;
-import static org.apache.james.imap.store.mail.model.StandardNames.MIME_MIME_TYPE_SPACE;
-import static org.apache.james.imap.store.mail.model.StandardNames.MIME_SUB_TYPE_NAME;
+import static org.apache.james.mailbox.store.mail.model.StandardNames.MIME_CONTENT_DESCRIPTION_NAME;
+import static org.apache.james.mailbox.store.mail.model.StandardNames.MIME_CONTENT_DESCRIPTION_SPACE;
+import static org.apache.james.mailbox.store.mail.model.StandardNames.MIME_CONTENT_DISPOSITION_PARAMETER_SPACE;
+import static org.apache.james.mailbox.store.mail.model.StandardNames.MIME_CONTENT_DISPOSITION_SPACE;
+import static org.apache.james.mailbox.store.mail.model.StandardNames.MIME_CONTENT_DISPOSITION_TYPE_NAME;
+import static org.apache.james.mailbox.store.mail.model.StandardNames.MIME_CONTENT_ID_NAME;
+import static org.apache.james.mailbox.store.mail.model.StandardNames.MIME_CONTENT_ID_SPACE;
+import static org.apache.james.mailbox.store.mail.model.StandardNames.MIME_CONTENT_LANGUAGE_NAME;
+import static org.apache.james.mailbox.store.mail.model.StandardNames.MIME_CONTENT_LANGUAGE_SPACE;
+import static org.apache.james.mailbox.store.mail.model.StandardNames.MIME_CONTENT_LOCATION_NAME;
+import static org.apache.james.mailbox.store.mail.model.StandardNames.MIME_CONTENT_LOCATION_SPACE;
+import static org.apache.james.mailbox.store.mail.model.StandardNames.MIME_CONTENT_MD5_NAME;
+import static org.apache.james.mailbox.store.mail.model.StandardNames.MIME_CONTENT_MD5_SPACE;
+import static org.apache.james.mailbox.store.mail.model.StandardNames.MIME_CONTENT_TRANSFER_ENCODING_NAME;
+import static org.apache.james.mailbox.store.mail.model.StandardNames.MIME_CONTENT_TRANSFER_ENCODING_SPACE;
+import static org.apache.james.mailbox.store.mail.model.StandardNames.MIME_CONTENT_TYPE_PARAMETER_BOUNDARY_NAME;
+import static org.apache.james.mailbox.store.mail.model.StandardNames.MIME_CONTENT_TYPE_PARAMETER_CHARSET_NAME;
+import static org.apache.james.mailbox.store.mail.model.StandardNames.MIME_CONTENT_TYPE_PARAMETER_SPACE;
+import static org.apache.james.mailbox.store.mail.model.StandardNames.MIME_MEDIA_TYPE_NAME;
+import static org.apache.james.mailbox.store.mail.model.StandardNames.MIME_MIME_TYPE_SPACE;
+import static org.apache.james.mailbox.store.mail.model.StandardNames.MIME_SUB_TYPE_NAME;
 
 import java.util.ArrayList;
 import java.util.Iterator;

Modified: james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/StandardNames.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/StandardNames.java?rev=993124&r1=991286&r2=993124&view=diff
==============================================================================
--- james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/StandardNames.java (original)
+++ james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/StandardNames.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.store.mail.model;
+package org.apache.james.mailbox.store.mail.model;
 
 /**
  * <p>Conventional meta-data names for standard properties.</p>

Copied: james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/streaming/AbstractFullContent.java (from r993114, james/imap/trunk/store/src/main/java/org/apache/james/imap/store/streaming/AbstractFullContent.java)
URL: http://svn.apache.org/viewvc/james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/streaming/AbstractFullContent.java?p2=james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/streaming/AbstractFullContent.java&p1=james/imap/trunk/store/src/main/java/org/apache/james/imap/store/streaming/AbstractFullContent.java&r1=993114&r2=993124&rev=993124&view=diff
==============================================================================
--- james/imap/trunk/store/src/main/java/org/apache/james/imap/store/streaming/AbstractFullContent.java (original)
+++ james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/streaming/AbstractFullContent.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.store.streaming;
+package org.apache.james.mailbox.store.streaming;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
@@ -24,10 +24,10 @@ import java.nio.channels.WritableByteCha
 import java.util.Iterator;
 import java.util.List;
 
-import org.apache.james.imap.store.ResultUtils;
 import org.apache.james.mailbox.Content;
 import org.apache.james.mailbox.MessageResult;
 import org.apache.james.mailbox.MessageResult.Header;
+import org.apache.james.mailbox.store.ResultUtils;
 
 /**
  * Abstract base class for {@link Content} implementations which hold the headers and 

Copied: james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/streaming/ByteContent.java (from r993114, james/imap/trunk/store/src/main/java/org/apache/james/imap/store/streaming/ByteContent.java)
URL: http://svn.apache.org/viewvc/james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/streaming/ByteContent.java?p2=james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/streaming/ByteContent.java&p1=james/imap/trunk/store/src/main/java/org/apache/james/imap/store/streaming/ByteContent.java&r1=993114&r2=993124&rev=993124&view=diff
==============================================================================
--- james/imap/trunk/store/src/main/java/org/apache/james/imap/store/streaming/ByteContent.java (original)
+++ james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/streaming/ByteContent.java Mon Sep  6 18:59:58 2010
@@ -20,7 +20,7 @@
 /**
  * 
  */
-package org.apache.james.imap.store.streaming;
+package org.apache.james.mailbox.store.streaming;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;

Modified: james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/streaming/CRLFOutputStream.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/streaming/CRLFOutputStream.java?rev=993124&r1=991286&r2=993124&view=diff
==============================================================================
--- james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/streaming/CRLFOutputStream.java (original)
+++ james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/streaming/CRLFOutputStream.java Mon Sep  6 18:59:58 2010
@@ -17,7 +17,7 @@
  * under the License.                                           *
  ****************************************************************/
 
-package org.apache.james.imap.store.streaming;
+package org.apache.james.mailbox.store.streaming;
 
 import java.io.FilterOutputStream;
 import java.io.IOException;

Modified: james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/streaming/ConfigurableMimeTokenStream.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/streaming/ConfigurableMimeTokenStream.java?rev=993124&r1=991286&r2=993124&view=diff
==============================================================================
--- james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/streaming/ConfigurableMimeTokenStream.java (original)
+++ james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/streaming/ConfigurableMimeTokenStream.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.store.streaming;
+package org.apache.james.mailbox.store.streaming;
 
 import org.apache.james.mime4j.parser.MimeEntityConfig;
 import org.apache.james.mime4j.parser.MimeTokenStream;

Modified: james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/streaming/CountingInputStream.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/streaming/CountingInputStream.java?rev=993124&r1=991286&r2=993124&view=diff
==============================================================================
--- james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/streaming/CountingInputStream.java (original)
+++ james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/streaming/CountingInputStream.java Mon Sep  6 18:59:58 2010
@@ -19,7 +19,7 @@
 /**
  * 
  */
-package org.apache.james.imap.store.streaming;
+package org.apache.james.mailbox.store.streaming;
 
 import java.io.IOException;
 import java.io.InputStream;

Copied: james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/streaming/FullByteContent.java (from r993114, james/imap/trunk/store/src/main/java/org/apache/james/imap/store/streaming/FullByteContent.java)
URL: http://svn.apache.org/viewvc/james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/streaming/FullByteContent.java?p2=james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/streaming/FullByteContent.java&p1=james/imap/trunk/store/src/main/java/org/apache/james/imap/store/streaming/FullByteContent.java&r1=993114&r2=993124&rev=993124&view=diff
==============================================================================
--- james/imap/trunk/store/src/main/java/org/apache/james/imap/store/streaming/FullByteContent.java (original)
+++ james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/streaming/FullByteContent.java Mon Sep  6 18:59:58 2010
@@ -20,7 +20,7 @@
 /**
  * 
  */
-package org.apache.james.imap.store.streaming;
+package org.apache.james.mailbox.store.streaming;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;

Copied: james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/streaming/InputStreamContent.java (from r993114, james/imap/trunk/store/src/main/java/org/apache/james/imap/store/streaming/InputStreamContent.java)
URL: http://svn.apache.org/viewvc/james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/streaming/InputStreamContent.java?p2=james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/streaming/InputStreamContent.java&p1=james/imap/trunk/store/src/main/java/org/apache/james/imap/store/streaming/InputStreamContent.java&r1=993114&r2=993124&rev=993124&view=diff
==============================================================================
--- james/imap/trunk/store/src/main/java/org/apache/james/imap/store/streaming/InputStreamContent.java (original)
+++ james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/streaming/InputStreamContent.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.store.streaming;
+package org.apache.james.mailbox.store.streaming;
 
 import java.io.IOException;
 import java.io.InputStream;

Copied: james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/streaming/InputStreamFullContent.java (from r993114, james/imap/trunk/store/src/main/java/org/apache/james/imap/store/streaming/InputStreamFullContent.java)
URL: http://svn.apache.org/viewvc/james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/streaming/InputStreamFullContent.java?p2=james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/streaming/InputStreamFullContent.java&p1=james/imap/trunk/store/src/main/java/org/apache/james/imap/store/streaming/InputStreamFullContent.java&r1=993114&r2=993124&rev=993124&view=diff
==============================================================================
--- james/imap/trunk/store/src/main/java/org/apache/james/imap/store/streaming/InputStreamFullContent.java (original)
+++ james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/streaming/InputStreamFullContent.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.store.streaming;
+package org.apache.james.mailbox.store.streaming;
 
 import java.io.IOException;
 import java.io.InputStream;

Modified: james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/streaming/LazySkippingInputStream.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/streaming/LazySkippingInputStream.java?rev=993124&r1=991286&r2=993124&view=diff
==============================================================================
--- james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/streaming/LazySkippingInputStream.java (original)
+++ james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/streaming/LazySkippingInputStream.java Mon Sep  6 18:59:58 2010
@@ -17,7 +17,7 @@
  * under the License.                                           *
  ****************************************************************/
 
-package org.apache.james.imap.store.streaming;
+package org.apache.james.mailbox.store.streaming;
 
 import java.io.FilterInputStream;
 import java.io.IOException;

Copied: james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/streaming/PartContentBuilder.java (from r993114, james/imap/trunk/store/src/main/java/org/apache/james/imap/store/streaming/PartContentBuilder.java)
URL: http://svn.apache.org/viewvc/james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/streaming/PartContentBuilder.java?p2=james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/streaming/PartContentBuilder.java&p1=james/imap/trunk/store/src/main/java/org/apache/james/imap/store/streaming/PartContentBuilder.java&r1=993114&r2=993124&rev=993124&view=diff
==============================================================================
--- james/imap/trunk/store/src/main/java/org/apache/james/imap/store/streaming/PartContentBuilder.java (original)
+++ james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/streaming/PartContentBuilder.java Mon Sep  6 18:59:58 2010
@@ -17,7 +17,7 @@
  * under the License.                                           *
  ****************************************************************/
 
-package org.apache.james.imap.store.streaming;
+package org.apache.james.mailbox.store.streaming;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -26,10 +26,10 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import org.apache.james.imap.store.ResultHeader;
 import org.apache.james.mailbox.Content;
 import org.apache.james.mailbox.MessageResult;
 import org.apache.james.mailbox.MessageResult.Header;
+import org.apache.james.mailbox.store.ResultHeader;
 import org.apache.james.mime4j.MimeException;
 import org.apache.james.mime4j.parser.MimeEntityConfig;
 import org.apache.james.mime4j.parser.MimeTokenStream;

Modified: james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/streaming/RewindableInputStream.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/streaming/RewindableInputStream.java?rev=993124&r1=991286&r2=993124&view=diff
==============================================================================
--- james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/streaming/RewindableInputStream.java (original)
+++ james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/streaming/RewindableInputStream.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.store.streaming;
+package org.apache.james.mailbox.store.streaming;
 
 import java.io.FilterInputStream;
 import java.io.IOException;



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