Author: norman
Date: Sat Jan 9 09:51:56 2010
New Revision: 897400
URL: http://svn.apache.org/viewvc?rev=897400&view=rev
Log:
More refactoring to reuse stuff of store module (IMAP-102)
Removed:
james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/MimeDescriptorImpl.java
james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/UserManager.java
Modified:
james/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/torque/SimpleUserManager.java
james/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManagerProviderSingleton.java
james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/MessageRowUtils.java
james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManager.java
Modified:
james/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/torque/SimpleUserManager.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/torque/SimpleUserManager.java?rev=897400&r1=897399&r2=897400&view=diff
==============================================================================
---
james/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/torque/SimpleUserManager.java
(original)
+++
james/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/torque/SimpleUserManager.java
Sat Jan 9 09:51:56 2010
@@ -24,8 +24,10 @@
import java.util.Map;
import org.apache.james.imap.mailbox.SubscriptionException;
+import org.apache.james.imap.store.Authenticator;
+import org.apache.james.imap.store.Subscriber;
-public class SimpleUserManager implements UserManager {
+public class SimpleUserManager implements Subscriber, Authenticator {
private final Map<String, UserDetails> users;
Modified:
james/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManagerProviderSingleton.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManagerProviderSingleton.java?rev=897400&r1=897399&r2=897400&view=diff
==============================================================================
---
james/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManagerProviderSingleton.java
(original)
+++
james/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManagerProviderSingleton.java
Sat Jan 9 09:51:56 2010
@@ -177,7 +177,7 @@
if (TORQUE_MAILBOX_MANAGER == null) {
USER_MANAGER = new SimpleUserManager();
initialize();
- TORQUE_MAILBOX_MANAGER = new TorqueMailboxManager(USER_MANAGER);
+ TORQUE_MAILBOX_MANAGER = new TorqueMailboxManager(USER_MANAGER,
USER_MANAGER);
}
return TORQUE_MAILBOX_MANAGER;
}
Modified:
james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/MessageRowUtils.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/MessageRowUtils.java?rev=897400&r1=897399&r2=897400&view=diff
==============================================================================
---
james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/MessageRowUtils.java
(original)
+++
james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/MessageRowUtils.java
Sat Jan 9 09:51:56 2010
@@ -41,6 +41,7 @@
import org.apache.james.imap.mailbox.util.MessageResultImpl;
import org.apache.james.imap.store.ByteContent;
import org.apache.james.imap.store.FullContent;
+import org.apache.james.imap.store.MimeDescriptorImpl;
import org.apache.james.imap.store.PartContentBuilder;
import org.apache.james.imap.store.ResultHeader;
import org.apache.james.mailboxmanager.torque.om.MessageBody;
Modified:
james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManager.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManager.java?rev=897400&r1=897399&r2=897400&view=diff
==============================================================================
---
james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManager.java
(original)
+++
james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManager.java
Sat Jan 9 09:51:56 2010
@@ -48,6 +48,8 @@
import org.apache.james.imap.mailbox.SubscriptionException;
import org.apache.james.imap.mailbox.MailboxMetaData.Selectability;
import org.apache.james.imap.mailbox.util.SimpleMailboxMetaData;
+import org.apache.james.imap.store.Authenticator;
+import org.apache.james.imap.store.Subscriber;
import org.apache.james.mailboxmanager.torque.om.MailboxRow;
import org.apache.james.mailboxmanager.torque.om.MailboxRowPeer;
import org.apache.torque.TorqueException;
@@ -68,18 +70,21 @@
private final Map<String, TorqueMailbox> mailboxes;
- private final UserManager userManager;
-
private final char delimiter;
+
+ private final Authenticator authenticator;
+
+ private final Subscriber subscriper;
- public TorqueMailboxManager(final UserManager userManager) {
- this(userManager, '.');
+ public TorqueMailboxManager(final Authenticator authenticator, final
Subscriber subscriper) {
+ this(authenticator, subscriper, '.');
}
- public TorqueMailboxManager(final UserManager userManager, final char
delimiter) {
+ public TorqueMailboxManager(final Authenticator authenticator, final
Subscriber subscriper, final char delimiter) {
this.lock = new ReentrantReadWriteLock();
mailboxes = new HashMap<String, TorqueMailbox>();
- this.userManager = userManager;
+ this.authenticator = authenticator;
+ this.subscriper = subscriper;
this.delimiter = delimiter;
}
@@ -368,21 +373,21 @@
}
public boolean login(String userid, String passwd) {
- return userManager.isAuthentic(userid, passwd);
+ return authenticator.isAuthentic(userid, passwd);
}
public void subscribe(MailboxSession session, String mailbox)
throws SubscriptionException {
- userManager.subscribe(session.getUser().getUserName(), mailbox);
+ subscriper.subscribe(session.getUser().getUserName(), mailbox);
}
public Collection<String> subscriptions(MailboxSession session) throws
SubscriptionException {
- return userManager.subscriptions(session.getUser().getUserName());
+ return subscriper.subscriptions(session.getUser().getUserName());
}
public void unsubscribe(MailboxSession session, String mailbox)
throws SubscriptionException {
- userManager.unsubscribe(session.getUser().getUserName(), mailbox);
+ subscriper.unsubscribe(session.getUser().getUserName(), mailbox);
}
public void addListener(String mailboxName, MailboxListener listener,
MailboxSession session) throws MailboxException {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
