You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by no...@apache.org on 2011/06/20 08:08:52 UTC
svn commit: r1137510 - in /james/mailbox/trunk:
jcr/src/main/java/org/apache/james/mailbox/jcr/
jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/
jpa/src/main/java/org/apache/james/mailbox/jpa/
jpa/src/main/java/org/apache/james/mailbox/jpa/ma...
Author: norman
Date: Mon Jun 20 06:08:50 2011
New Revision: 1137510
URL: http://svn.apache.org/viewvc?rev=1137510&view=rev
Log:
Its now possible to directly use StoreMailboxManager and StoreMessageManager, so we can remove some of its sub-classes. Part of MAILBOX-98
Added:
james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/model/MaildirMessage.java
- copied, changed from r1137418, james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/model/LazyLoadingMaildirMessage.java
james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/
james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/PropertyBuilder.java
- copied, changed from r1137418, james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/PropertyBuilder.java
james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/SimpleMailbox.java
- copied, changed from r1137418, james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/SimpleMailbox.java
james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/SimpleMessage.java
- copied, changed from r1137419, james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/SimpleMessage.java
james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/SimpleProperty.java
- copied, changed from r1137418, james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/SimpleProperty.java
james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/user/model/impl/
james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/user/model/impl/SimpleSubscription.java
- copied, changed from r1137418, james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/user/model/SimpleSubscription.java
Removed:
james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirMailboxManager.java
james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirMessageManager.java
james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirSubscriptionManager.java
james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/model/LazyLoadingMaildirMessage.java
james/mailbox/trunk/memory/src/main/java/org/apache/james/mailbox/inmemory/InMemoryStoreMessageManager.java
james/mailbox/trunk/memory/src/main/java/org/apache/james/mailbox/inmemory/InMemorySubscriptionManager.java
james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/PropertyBuilder.java
james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/SimpleMailbox.java
james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/SimpleMessage.java
james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/SimpleProperty.java
james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/user/model/SimpleSubscription.java
Modified:
james/mailbox/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRMessageManager.java
james/mailbox/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRMessage.java
james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/JPAMessageManager.java
james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/AbstractJPAMessage.java
james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/JPAMessage.java
james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/JPAStreamingMessage.java
james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/openjpa/OpenJPAMessageManager.java
james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirStore.java
james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMailboxMapper.java
james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMessageMapper.java
james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/user/MaildirSubscriptionMapper.java
james/mailbox/trunk/maildir/src/test/java/org/apache/james/mailbox/maildir/MaildirMailboxManagerTest.java
james/mailbox/trunk/maildir/src/test/java/org/apache/james/mailbox/maildir/MaildirStressTest.java
james/mailbox/trunk/maildir/src/test/java/org/apache/james/mailbox/maildir/MaildirSubscriptionManagerTest.java
james/mailbox/trunk/memory/src/main/java/org/apache/james/mailbox/inmemory/InMemoryMailboxManager.java
james/mailbox/trunk/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryMailboxMapper.java
james/mailbox/trunk/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryMessageMapper.java
james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/MimeDescriptorImpl.java
james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/StoreMailboxManager.java
james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/StoreMessageManager.java
james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/StoreSubscriptionManager.java
Modified: james/mailbox/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRMessageManager.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRMessageManager.java?rev=1137510&r1=1137509&r2=1137510&view=diff
==============================================================================
--- james/mailbox/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRMessageManager.java (original)
+++ james/mailbox/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRMessageManager.java Mon Jun 20 06:08:50 2011
@@ -31,7 +31,7 @@ import org.apache.james.mailbox.store.Ma
import org.apache.james.mailbox.store.MailboxSessionMapperFactory;
import org.apache.james.mailbox.store.StoreMessageManager;
import org.apache.james.mailbox.store.mail.model.Message;
-import org.apache.james.mailbox.store.mail.model.PropertyBuilder;
+import org.apache.james.mailbox.store.mail.model.impl.PropertyBuilder;
import org.apache.james.mailbox.store.search.MessageSearchIndex;
import org.slf4j.Logger;
Modified: james/mailbox/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRMessage.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRMessage.java?rev=1137510&r1=1137509&r2=1137510&view=diff
==============================================================================
--- james/mailbox/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRMessage.java (original)
+++ james/mailbox/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRMessage.java Mon Jun 20 06:08:50 2011
@@ -44,7 +44,7 @@ import org.apache.james.mailbox.store.Re
import org.apache.james.mailbox.store.mail.model.AbstractMessage;
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.mail.model.impl.PropertyBuilder;
import org.apache.james.mailbox.store.streaming.LazySkippingInputStream;
import org.slf4j.Logger;
Modified: james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/JPAMessageManager.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/JPAMessageManager.java?rev=1137510&r1=1137509&r2=1137510&view=diff
==============================================================================
--- james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/JPAMessageManager.java (original)
+++ james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/JPAMessageManager.java Mon Jun 20 06:08:50 2011
@@ -32,7 +32,7 @@ import org.apache.james.mailbox.store.Ma
import org.apache.james.mailbox.store.StoreMessageManager;
import org.apache.james.mailbox.store.mail.model.Mailbox;
import org.apache.james.mailbox.store.mail.model.Message;
-import org.apache.james.mailbox.store.mail.model.PropertyBuilder;
+import org.apache.james.mailbox.store.mail.model.impl.PropertyBuilder;
import org.apache.james.mailbox.store.search.MessageSearchIndex;
/**
Modified: james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/AbstractJPAMessage.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/AbstractJPAMessage.java?rev=1137510&r1=1137509&r2=1137510&view=diff
==============================================================================
--- james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/AbstractJPAMessage.java (original)
+++ james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/AbstractJPAMessage.java Mon Jun 20 06:08:50 2011
@@ -44,7 +44,7 @@ import org.apache.james.mailbox.jpa.mail
import org.apache.james.mailbox.store.mail.model.AbstractMessage;
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.mail.model.impl.PropertyBuilder;
import org.apache.openjpa.persistence.jdbc.ElementJoinColumn;
import org.apache.openjpa.persistence.jdbc.ElementJoinColumns;
import org.apache.openjpa.persistence.jdbc.Index;
Modified: james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/JPAMessage.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/JPAMessage.java?rev=1137510&r1=1137509&r2=1137510&view=diff
==============================================================================
--- james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/JPAMessage.java (original)
+++ james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/JPAMessage.java Mon Jun 20 06:08:50 2011
@@ -36,7 +36,7 @@ import org.apache.commons.io.IOUtils;
import org.apache.james.mailbox.MailboxException;
import org.apache.james.mailbox.jpa.mail.model.JPAMailbox;
import org.apache.james.mailbox.store.mail.model.Message;
-import org.apache.james.mailbox.store.mail.model.PropertyBuilder;
+import org.apache.james.mailbox.store.mail.model.impl.PropertyBuilder;
@Entity(name="Message")
@Table(name="JAMES_MAIL")
Modified: james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/JPAStreamingMessage.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/JPAStreamingMessage.java?rev=1137510&r1=1137509&r2=1137510&view=diff
==============================================================================
--- james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/JPAStreamingMessage.java (original)
+++ james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/JPAStreamingMessage.java Mon Jun 20 06:08:50 2011
@@ -35,7 +35,7 @@ import org.apache.james.mailbox.MailboxE
import org.apache.james.mailbox.jpa.mail.model.JPAMailbox;
import org.apache.james.mailbox.store.ResultUtils;
import org.apache.james.mailbox.store.mail.model.Message;
-import org.apache.james.mailbox.store.mail.model.PropertyBuilder;
+import org.apache.james.mailbox.store.mail.model.impl.PropertyBuilder;
import org.apache.openjpa.persistence.Persistent;
/**
Modified: james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/openjpa/OpenJPAMessageManager.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/openjpa/OpenJPAMessageManager.java?rev=1137510&r1=1137509&r2=1137510&view=diff
==============================================================================
--- james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/openjpa/OpenJPAMessageManager.java (original)
+++ james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/openjpa/OpenJPAMessageManager.java Mon Jun 20 06:08:50 2011
@@ -32,7 +32,7 @@ import org.apache.james.mailbox.store.Ma
import org.apache.james.mailbox.store.MailboxSessionMapperFactory;
import org.apache.james.mailbox.store.mail.model.Mailbox;
import org.apache.james.mailbox.store.mail.model.Message;
-import org.apache.james.mailbox.store.mail.model.PropertyBuilder;
+import org.apache.james.mailbox.store.mail.model.impl.PropertyBuilder;
import org.apache.james.mailbox.store.search.MessageSearchIndex;
/**
Modified: james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirStore.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirStore.java?rev=1137510&r1=1137509&r2=1137510&view=diff
==============================================================================
--- james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirStore.java (original)
+++ james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirStore.java Mon Jun 20 06:08:50 2011
@@ -30,7 +30,7 @@ import org.apache.james.mailbox.MailboxP
import org.apache.james.mailbox.MailboxSession;
import org.apache.james.mailbox.store.JVMMailboxPathLocker;
import org.apache.james.mailbox.store.mail.model.Mailbox;
-import org.apache.james.mailbox.store.mail.model.SimpleMailbox;
+import org.apache.james.mailbox.store.mail.model.impl.SimpleMailbox;
public class MaildirStore {
Modified: james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMailboxMapper.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMailboxMapper.java?rev=1137510&r1=1137509&r2=1137510&view=diff
==============================================================================
--- james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMailboxMapper.java (original)
+++ james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMailboxMapper.java Mon Jun 20 06:08:50 2011
@@ -38,7 +38,7 @@ import org.apache.james.mailbox.maildir.
import org.apache.james.mailbox.maildir.MaildirStore;
import org.apache.james.mailbox.store.mail.MailboxMapper;
import org.apache.james.mailbox.store.mail.model.Mailbox;
-import org.apache.james.mailbox.store.mail.model.SimpleMailbox;
+import org.apache.james.mailbox.store.mail.model.impl.SimpleMailbox;
import org.apache.james.mailbox.store.transaction.NonTransactionalMapper;
public class MaildirMailboxMapper extends NonTransactionalMapper implements MailboxMapper<Integer> {
Modified: james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMessageMapper.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMessageMapper.java?rev=1137510&r1=1137509&r2=1137510&view=diff
==============================================================================
--- james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMessageMapper.java (original)
+++ james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMessageMapper.java Mon Jun 20 06:08:50 2011
@@ -44,13 +44,13 @@ import org.apache.james.mailbox.MessageR
import org.apache.james.mailbox.maildir.MaildirFolder;
import org.apache.james.mailbox.maildir.MaildirMessageName;
import org.apache.james.mailbox.maildir.MaildirStore;
-import org.apache.james.mailbox.maildir.mail.model.LazyLoadingMaildirMessage;
+import org.apache.james.mailbox.maildir.mail.model.MaildirMessage;
import org.apache.james.mailbox.store.ResultUtils;
import org.apache.james.mailbox.store.mail.AbstractMessageMapper;
import org.apache.james.mailbox.store.mail.SimpleMessageMetaData;
import org.apache.james.mailbox.store.mail.model.Mailbox;
import org.apache.james.mailbox.store.mail.model.Message;
-import org.apache.james.mailbox.store.mail.model.SimpleMessage;
+import org.apache.james.mailbox.store.mail.model.impl.SimpleMessage;
public class MaildirMessageMapper extends AbstractMessageMapper<Integer> {
@@ -156,7 +156,7 @@ public class MaildirMessageMapper extend
ArrayList<Message<Integer>> messages = new ArrayList<Message<Integer>>();
if (messageName != null) {
- messages.add(new LazyLoadingMaildirMessage(mailbox, uid, messageName));
+ messages.add(new MaildirMessage(mailbox, uid, messageName));
}
return messages;
@@ -177,7 +177,7 @@ public class MaildirMessageMapper extend
ArrayList<Message<Integer>> messages = new ArrayList<Message<Integer>>();
for (Entry<Long, MaildirMessageName> entry : uidMap.entrySet()) {
- messages.add(new LazyLoadingMaildirMessage(mailbox, entry.getKey(), entry.getValue()));
+ messages.add(new MaildirMessage(mailbox, entry.getKey(), entry.getValue()));
}
return messages;
} catch (IOException e) {
@@ -195,7 +195,7 @@ public class MaildirMessageMapper extend
ArrayList<Message<Integer>> filtered = new ArrayList<Message<Integer>>(uidMap.size());
for (Entry<Long, MaildirMessageName> entry : uidMap.entrySet())
- filtered.add(new LazyLoadingMaildirMessage(mailbox, entry.getKey(), entry.getValue()));
+ filtered.add(new MaildirMessage(mailbox, entry.getKey(), entry.getValue()));
return filtered;
} catch (IOException e) {
throw new MailboxException("Failure while search for Messages in Mailbox " + mailbox, e );
@@ -210,7 +210,7 @@ public class MaildirMessageMapper extend
MaildirMessageName messageName = folder.getMessageNameByUid(mailboxSession, uid);
ArrayList<Message<Integer>> messages = new ArrayList<Message<Integer>>();
if (MaildirMessageName.FILTER_DELETED_MESSAGES.accept(null, messageName.getFullName())) {
- messages.add(new LazyLoadingMaildirMessage(mailbox, uid, messageName));
+ messages.add(new MaildirMessage(mailbox, uid, messageName));
}
return messages;
Copied: james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/model/MaildirMessage.java (from r1137418, james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/model/LazyLoadingMaildirMessage.java)
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/model/MaildirMessage.java?p2=james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/model/MaildirMessage.java&p1=james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/model/LazyLoadingMaildirMessage.java&r1=1137418&r2=1137510&rev=1137510&view=diff
==============================================================================
--- james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/model/LazyLoadingMaildirMessage.java (original)
+++ james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/model/MaildirMessage.java Mon Jun 20 06:08:50 2011
@@ -37,7 +37,7 @@ import org.apache.james.mailbox.maildir.
import org.apache.james.mailbox.store.mail.model.AbstractMessage;
import org.apache.james.mailbox.store.mail.model.Mailbox;
import org.apache.james.mailbox.store.mail.model.Property;
-import org.apache.james.mailbox.store.mail.model.PropertyBuilder;
+import org.apache.james.mailbox.store.mail.model.impl.PropertyBuilder;
import org.apache.james.mailbox.store.streaming.ConfigurableMimeTokenStream;
import org.apache.james.mailbox.store.streaming.CountingInputStream;
import org.apache.james.mailbox.store.streaming.LazySkippingInputStream;
@@ -46,7 +46,7 @@ import org.apache.james.mime4j.descripto
import org.apache.james.mime4j.parser.MimeEntityConfig;
import org.apache.james.mime4j.parser.MimeTokenStream;
-public class LazyLoadingMaildirMessage extends AbstractMessage<Integer> {
+public class MaildirMessage extends AbstractMessage<Integer> {
private MaildirMessageName messageName;
private int bodyStartOctet;
@@ -63,7 +63,7 @@ public class LazyLoadingMaildirMessage e
protected boolean newMessage;
private long modSeq;
- public LazyLoadingMaildirMessage(Mailbox<Integer> mailbox, long uid, MaildirMessageName messageName) throws IOException {
+ public MaildirMessage(Mailbox<Integer> mailbox, long uid, MaildirMessageName messageName) throws IOException {
this.mailbox = mailbox;
setUid(uid);
setModSeq(messageName.getFile().lastModified());
Modified: james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/user/MaildirSubscriptionMapper.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/user/MaildirSubscriptionMapper.java?rev=1137510&r1=1137509&r2=1137510&view=diff
==============================================================================
--- james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/user/MaildirSubscriptionMapper.java (original)
+++ james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/user/MaildirSubscriptionMapper.java Mon Jun 20 06:08:50 2011
@@ -34,8 +34,8 @@ import org.apache.james.mailbox.Subscrip
import org.apache.james.mailbox.maildir.MaildirStore;
import org.apache.james.mailbox.store.transaction.NonTransactionalMapper;
import org.apache.james.mailbox.store.user.SubscriptionMapper;
-import org.apache.james.mailbox.store.user.model.SimpleSubscription;
import org.apache.james.mailbox.store.user.model.Subscription;
+import org.apache.james.mailbox.store.user.model.impl.SimpleSubscription;
public class MaildirSubscriptionMapper extends NonTransactionalMapper implements SubscriptionMapper {
Modified: james/mailbox/trunk/maildir/src/test/java/org/apache/james/mailbox/maildir/MaildirMailboxManagerTest.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/maildir/src/test/java/org/apache/james/mailbox/maildir/MaildirMailboxManagerTest.java?rev=1137510&r1=1137509&r2=1137510&view=diff
==============================================================================
--- james/mailbox/trunk/maildir/src/test/java/org/apache/james/mailbox/maildir/MaildirMailboxManagerTest.java (original)
+++ james/mailbox/trunk/maildir/src/test/java/org/apache/james/mailbox/maildir/MaildirMailboxManagerTest.java Mon Jun 20 06:08:50 2011
@@ -36,6 +36,7 @@ import org.apache.james.mailbox.MailboxM
import org.apache.james.mailbox.MailboxPath;
import org.apache.james.mailbox.MailboxSession;
import org.apache.james.mailbox.store.JVMMailboxPathLocker;
+import org.apache.james.mailbox.store.StoreMailboxManager;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -112,7 +113,7 @@ public class MaildirMailboxManagerTest e
MaildirStore store = new MaildirStore(MAILDIR_HOME + "/%domain/%user", new JVMMailboxPathLocker());
MaildirMailboxSessionMapperFactory mf = new MaildirMailboxSessionMapperFactory(store);
- MaildirMailboxManager manager = new MaildirMailboxManager(mf, null);
+ StoreMailboxManager<Integer> manager = new StoreMailboxManager<Integer>(mf, null, new JVMMailboxPathLocker());
manager.init();
@@ -139,7 +140,7 @@ public class MaildirMailboxManagerTest e
private void doTestListWithMaildirStoreConfiguration(String maildirStoreConfiguration) throws MailboxException, UnsupportedEncodingException {
MaildirStore store = new MaildirStore(MAILDIR_HOME + maildirStoreConfiguration, new JVMMailboxPathLocker());
MaildirMailboxSessionMapperFactory mf = new MaildirMailboxSessionMapperFactory(store);
- MaildirMailboxManager manager = new MaildirMailboxManager(mf, null);
+ StoreMailboxManager<Integer> manager = new StoreMailboxManager<Integer>(mf, null, new JVMMailboxPathLocker());
manager.init();
setMailboxManager(manager);
try {
Modified: james/mailbox/trunk/maildir/src/test/java/org/apache/james/mailbox/maildir/MaildirStressTest.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/maildir/src/test/java/org/apache/james/mailbox/maildir/MaildirStressTest.java?rev=1137510&r1=1137509&r2=1137510&view=diff
==============================================================================
--- james/mailbox/trunk/maildir/src/test/java/org/apache/james/mailbox/maildir/MaildirStressTest.java (original)
+++ james/mailbox/trunk/maildir/src/test/java/org/apache/james/mailbox/maildir/MaildirStressTest.java Mon Jun 20 06:08:50 2011
@@ -26,6 +26,7 @@ import org.apache.james.mailbox.Abstract
import org.apache.james.mailbox.MailboxException;
import org.apache.james.mailbox.MailboxManager;
import org.apache.james.mailbox.store.JVMMailboxPathLocker;
+import org.apache.james.mailbox.store.StoreMailboxManager;
import org.junit.After;
import org.junit.Before;
@@ -33,14 +34,14 @@ public class MaildirStressTest extends A
private static final String MAILDIR_HOME = "target/Maildir";
- private MaildirMailboxManager mailboxManager;
+ private StoreMailboxManager<Integer> mailboxManager;
@Before
public void setUp() throws MailboxException {
MaildirStore store = new MaildirStore(MAILDIR_HOME + "/%user", new JVMMailboxPathLocker());
MaildirMailboxSessionMapperFactory mf = new MaildirMailboxSessionMapperFactory(store);
- mailboxManager = new MaildirMailboxManager(mf, null);
+ mailboxManager = new StoreMailboxManager<Integer>(mf, null, new JVMMailboxPathLocker());
mailboxManager.init();
}
Modified: james/mailbox/trunk/maildir/src/test/java/org/apache/james/mailbox/maildir/MaildirSubscriptionManagerTest.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/maildir/src/test/java/org/apache/james/mailbox/maildir/MaildirSubscriptionManagerTest.java?rev=1137510&r1=1137509&r2=1137510&view=diff
==============================================================================
--- james/mailbox/trunk/maildir/src/test/java/org/apache/james/mailbox/maildir/MaildirSubscriptionManagerTest.java (original)
+++ james/mailbox/trunk/maildir/src/test/java/org/apache/james/mailbox/maildir/MaildirSubscriptionManagerTest.java Mon Jun 20 06:08:50 2011
@@ -21,6 +21,7 @@ package org.apache.james.mailbox.maildir
import org.apache.james.mailbox.AbstractSubscriptionManagerTest;
import org.apache.james.mailbox.SubscriptionManager;
import org.apache.james.mailbox.store.JVMMailboxPathLocker;
+import org.apache.james.mailbox.store.StoreSubscriptionManager;
public class MaildirSubscriptionManagerTest extends AbstractSubscriptionManagerTest{
@@ -28,7 +29,7 @@ public class MaildirSubscriptionManagerT
public SubscriptionManager createSubscriptionManager() {
MaildirStore store = new MaildirStore("target/Maildir/%domain/%user", new JVMMailboxPathLocker());
MaildirMailboxSessionMapperFactory factory = new MaildirMailboxSessionMapperFactory(store);
- MaildirSubscriptionManager sm = new MaildirSubscriptionManager(factory);
+ StoreSubscriptionManager sm = new StoreSubscriptionManager(factory);
return sm;
}
Modified: james/mailbox/trunk/memory/src/main/java/org/apache/james/mailbox/inmemory/InMemoryMailboxManager.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/memory/src/main/java/org/apache/james/mailbox/inmemory/InMemoryMailboxManager.java?rev=1137510&r1=1137509&r2=1137510&view=diff
==============================================================================
--- james/mailbox/trunk/memory/src/main/java/org/apache/james/mailbox/inmemory/InMemoryMailboxManager.java (original)
+++ james/mailbox/trunk/memory/src/main/java/org/apache/james/mailbox/inmemory/InMemoryMailboxManager.java Mon Jun 20 06:08:50 2011
@@ -20,13 +20,11 @@
package org.apache.james.mailbox.inmemory;
import org.apache.james.mailbox.MailboxException;
-import org.apache.james.mailbox.MailboxSession;
import org.apache.james.mailbox.store.Authenticator;
import org.apache.james.mailbox.store.JVMMailboxPathLocker;
import org.apache.james.mailbox.store.MailboxSessionMapperFactory;
import org.apache.james.mailbox.store.StoreMailboxManager;
-import org.apache.james.mailbox.store.StoreMessageManager;
-import org.apache.james.mailbox.store.mail.model.Mailbox;
+
public class InMemoryMailboxManager extends StoreMailboxManager<Long> {
@@ -34,10 +32,6 @@ public class InMemoryMailboxManager exte
super(mapperFactory, authenticator, new JVMMailboxPathLocker());
}
- @Override
- protected StoreMessageManager<Long> createMessageManager(Mailbox<Long> mailboxRow, MailboxSession session) throws MailboxException {
- return new InMemoryStoreMessageManager(getMapperFactory(), getMessageSearchIndex(), getEventDispatcher(), mailboxRow);
- }
/**
* Delete every Mailbox which exists
Modified: james/mailbox/trunk/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryMailboxMapper.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryMailboxMapper.java?rev=1137510&r1=1137509&r2=1137510&view=diff
==============================================================================
--- james/mailbox/trunk/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryMailboxMapper.java (original)
+++ james/mailbox/trunk/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryMailboxMapper.java Mon Jun 20 06:08:50 2011
@@ -29,7 +29,7 @@ import org.apache.james.mailbox.MailboxN
import org.apache.james.mailbox.MailboxPath;
import org.apache.james.mailbox.store.mail.MailboxMapper;
import org.apache.james.mailbox.store.mail.model.Mailbox;
-import org.apache.james.mailbox.store.mail.model.SimpleMailbox;
+import org.apache.james.mailbox.store.mail.model.impl.SimpleMailbox;
public class InMemoryMailboxMapper implements MailboxMapper<Long> {
Modified: james/mailbox/trunk/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryMessageMapper.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryMessageMapper.java?rev=1137510&r1=1137509&r2=1137510&view=diff
==============================================================================
--- james/mailbox/trunk/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryMessageMapper.java (original)
+++ james/mailbox/trunk/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryMessageMapper.java Mon Jun 20 06:08:50 2011
@@ -35,7 +35,7 @@ import org.apache.james.mailbox.store.ma
import org.apache.james.mailbox.store.mail.SimpleMessageMetaData;
import org.apache.james.mailbox.store.mail.model.Mailbox;
import org.apache.james.mailbox.store.mail.model.Message;
-import org.apache.james.mailbox.store.mail.model.SimpleMessage;
+import org.apache.james.mailbox.store.mail.model.impl.SimpleMessage;
public class InMemoryMessageMapper extends AbstractMessageMapper<Long> {
Modified: james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/MimeDescriptorImpl.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/MimeDescriptorImpl.java?rev=1137510&r1=1137509&r2=1137510&view=diff
==============================================================================
--- james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/MimeDescriptorImpl.java (original)
+++ james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/MimeDescriptorImpl.java Mon Jun 20 06:08:50 2011
@@ -32,7 +32,7 @@ import org.apache.james.mailbox.MessageR
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.mail.model.impl.PropertyBuilder;
import org.apache.james.mailbox.store.streaming.ConfigurableMimeTokenStream;
import org.apache.james.mailbox.store.streaming.CountingInputStream;
import org.apache.james.mime4j.MimeException;
Modified: james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/StoreMailboxManager.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/StoreMailboxManager.java?rev=1137510&r1=1137509&r2=1137510&view=diff
==============================================================================
--- james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/StoreMailboxManager.java (original)
+++ james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/StoreMailboxManager.java Mon Jun 20 06:08:50 2011
@@ -45,7 +45,7 @@ import org.apache.james.mailbox.MailboxP
import org.apache.james.mailbox.MailboxSession.SessionType;
import org.apache.james.mailbox.store.mail.MailboxMapper;
import org.apache.james.mailbox.store.mail.model.Mailbox;
-import org.apache.james.mailbox.store.mail.model.SimpleMailbox;
+import org.apache.james.mailbox.store.mail.model.impl.SimpleMailbox;
import org.apache.james.mailbox.store.search.ListeningMessageSearchIndex;
import org.apache.james.mailbox.store.search.MessageSearchIndex;
import org.apache.james.mailbox.store.search.SimpleMessageSearchIndex;
@@ -62,7 +62,7 @@ import org.slf4j.Logger;
*
* @param <Id>
*/
-public abstract class StoreMailboxManager<Id> implements MailboxManager {
+public class StoreMailboxManager<Id> implements MailboxManager {
public static final char SQL_WILDCARD_CHAR = '%';
@@ -84,6 +84,10 @@ public abstract class StoreMailboxManage
this.locker = locker;
this.mailboxSessionMapperFactory = mailboxSessionMapperFactory;
}
+
+ public StoreMailboxManager(MailboxSessionMapperFactory<Id> mailboxSessionMapperFactory, final Authenticator authenticator) {
+ this(mailboxSessionMapperFactory, authenticator, new JVMMailboxPathLocker());
+ }
/**
* Init the {@link MailboxManager}
@@ -218,12 +222,16 @@ public abstract class StoreMailboxManage
}
/**
- * Create a {@link MapperStoreMessageManager} for the given Mailbox
+ * Create a {@link MapperStoreMessageManager} for the given Mailbox. By default this will return a {@link StoreMessageManager}. If
+ * your implementation needs something different, just override this method
*
- * @param mailboxRow
+ * @param mailbox
+ * @param session
* @return storeMailbox
*/
- protected abstract StoreMessageManager<Id> createMessageManager(Mailbox<Id> mailboxRow, MailboxSession session) throws MailboxException;
+ protected StoreMessageManager<Id> createMessageManager(Mailbox<Id> mailbox, MailboxSession session) throws MailboxException {
+ return new StoreMessageManager<Id>(getMapperFactory(), getMessageSearchIndex(), getEventDispatcher(), mailbox);
+ }
/**
* Create a Mailbox for the given namespace
Modified: james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/StoreMessageManager.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/StoreMessageManager.java?rev=1137510&r1=1137509&r2=1137510&view=diff
==============================================================================
--- james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/StoreMessageManager.java (original)
+++ james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/StoreMessageManager.java Mon Jun 20 06:08:50 2011
@@ -52,8 +52,8 @@ import org.apache.james.mailbox.store.ma
import org.apache.james.mailbox.store.mail.MessageMapperFactory;
import org.apache.james.mailbox.store.mail.model.Mailbox;
import org.apache.james.mailbox.store.mail.model.Message;
-import org.apache.james.mailbox.store.mail.model.PropertyBuilder;
-import org.apache.james.mailbox.store.mail.model.SimpleMessage;
+import org.apache.james.mailbox.store.mail.model.impl.PropertyBuilder;
+import org.apache.james.mailbox.store.mail.model.impl.SimpleMessage;
import org.apache.james.mailbox.store.search.MessageSearchIndex;
import org.apache.james.mailbox.store.streaming.BodyOffsetInputStream;
import org.apache.james.mailbox.store.streaming.ConfigurableMimeTokenStream;
Modified: james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/StoreSubscriptionManager.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/StoreSubscriptionManager.java?rev=1137510&r1=1137509&r2=1137510&view=diff
==============================================================================
--- james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/StoreSubscriptionManager.java (original)
+++ james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/StoreSubscriptionManager.java Mon Jun 20 06:08:50 2011
@@ -30,8 +30,8 @@ import org.apache.james.mailbox.Subscrip
import org.apache.james.mailbox.store.transaction.Mapper;
import org.apache.james.mailbox.store.user.SubscriptionMapper;
import org.apache.james.mailbox.store.user.SubscriptionMapperFactory;
-import org.apache.james.mailbox.store.user.model.SimpleSubscription;
import org.apache.james.mailbox.store.user.model.Subscription;
+import org.apache.james.mailbox.store.user.model.impl.SimpleSubscription;
/**
* Manages subscriptions.
Copied: james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/PropertyBuilder.java (from r1137418, james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/PropertyBuilder.java)
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/PropertyBuilder.java?p2=james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/PropertyBuilder.java&p1=james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/PropertyBuilder.java&r1=1137418&r2=1137510&rev=1137510&view=diff
==============================================================================
--- james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/PropertyBuilder.java (original)
+++ james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/PropertyBuilder.java Mon Jun 20 06:08:50 2011
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.mailbox.store.mail.model;
+package org.apache.james.mailbox.store.mail.model.impl;
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;
@@ -47,6 +47,8 @@ import java.util.Map;
import java.util.SortedMap;
import java.util.TreeMap;
+import org.apache.james.mailbox.store.mail.model.Property;
+
/**
* Builds properties
*/
Copied: james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/SimpleMailbox.java (from r1137418, james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/SimpleMailbox.java)
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/SimpleMailbox.java?p2=james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/SimpleMailbox.java&p1=james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/SimpleMailbox.java&r1=1137418&r2=1137510&rev=1137510&view=diff
==============================================================================
--- james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/SimpleMailbox.java (original)
+++ james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/SimpleMailbox.java Mon Jun 20 06:08:50 2011
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.mailbox.store.mail.model;
+package org.apache.james.mailbox.store.mail.model.impl;
import org.apache.james.mailbox.MailboxPath;
import org.apache.james.mailbox.store.mail.model.Mailbox;
Copied: james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/SimpleMessage.java (from r1137419, james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/SimpleMessage.java)
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/SimpleMessage.java?p2=james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/SimpleMessage.java&p1=james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/SimpleMessage.java&r1=1137419&r2=1137510&rev=1137510&view=diff
==============================================================================
--- james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/SimpleMessage.java (original)
+++ james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/SimpleMessage.java Mon Jun 20 06:08:50 2011
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mailbox.store.mail.model;
+package org.apache.james.mailbox.store.mail.model.impl;
import java.io.IOException;
import java.io.InputStream;
@@ -33,8 +33,9 @@ import org.apache.commons.io.IOUtils;
import org.apache.james.mailbox.MailboxException;
import org.apache.james.mailbox.store.ResultUtils;
import org.apache.james.mailbox.store.mail.model.AbstractMessage;
+import org.apache.james.mailbox.store.mail.model.Mailbox;
+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;
public class SimpleMessage<Id> extends AbstractMessage<Id> {
Copied: james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/SimpleProperty.java (from r1137418, james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/SimpleProperty.java)
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/SimpleProperty.java?p2=james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/SimpleProperty.java&p1=james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/SimpleProperty.java&r1=1137418&r2=1137510&rev=1137510&view=diff
==============================================================================
--- james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/SimpleProperty.java (original)
+++ james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/SimpleProperty.java Mon Jun 20 06:08:50 2011
@@ -16,7 +16,10 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.mailbox.store.mail.model;
+package org.apache.james.mailbox.store.mail.model.impl;
+
+import org.apache.james.mailbox.store.mail.model.AbstractComparableProperty;
+import org.apache.james.mailbox.store.mail.model.Property;
public final class SimpleProperty extends AbstractComparableProperty<SimpleProperty> {
private String namespace;
Copied: james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/user/model/impl/SimpleSubscription.java (from r1137418, james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/user/model/SimpleSubscription.java)
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/user/model/impl/SimpleSubscription.java?p2=james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/user/model/impl/SimpleSubscription.java&p1=james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/user/model/SimpleSubscription.java&r1=1137418&r2=1137510&rev=1137510&view=diff
==============================================================================
--- james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/user/model/SimpleSubscription.java (original)
+++ james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/user/model/impl/SimpleSubscription.java Mon Jun 20 06:08:50 2011
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.mailbox.store.user.model;
+package org.apache.james.mailbox.store.user.model.impl;
import org.apache.james.mailbox.store.user.model.Subscription;
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org