Author: danny
Date: Thu Oct 26 09:08:05 2006
New Revision: 468051
URL: http://svn.apache.org/viewvc?view=rev&rev=468051
Log:
refactored MailRepository interface into Mailet from James
Modified:
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/James.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/mailboxmanager/repository/AbstractMailRepository.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/mailrepository/AbstractMailRepository.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/mailrepository/AvalonMailRepository.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/mailrepository/JDBCMailRepository.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/mailrepository/MBoxMailRepository.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/mailrepository/MailStoreSpoolRepository.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/mailrepository/javamail/AbstractJavamailStoreMailRepository.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/mailrepository/javamail/HashJavamailStoreMailRepository.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/pop3server/POP3Handler.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/pop3server/POP3Session.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/pop3server/PassCmdHandler.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/services/MailServer.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/services/SpoolRepository.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/FromRepository.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/ToMultiRepository.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/ToRepository.java
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/matchers/AbstractStorageQuota.java
james/server/sandbox/mailet-refactorings/src/test/org/apache/james/imapserver/mock/MockMailServer.java
james/server/sandbox/mailet-refactorings/src/test/org/apache/james/mailboxmanager/redundant/AbstractMailRepositoryTestCase.java
james/server/sandbox/mailet-refactorings/src/test/org/apache/james/mailrepository/AbstractMailRepositoryTest.java
james/server/sandbox/mailet-refactorings/src/test/org/apache/james/mailrepository/AvalonMailRepositoryTest.java
james/server/sandbox/mailet-refactorings/src/test/org/apache/james/mailrepository/JDBCMailRepositoryTest.java
james/server/sandbox/mailet-refactorings/src/test/org/apache/james/mailrepository/MBoxMailRepositoryTest.java
james/server/sandbox/mailet-refactorings/src/test/org/apache/james/pop3server/POP3ServerTest.java
james/server/sandbox/mailet-refactorings/src/test/org/apache/james/services/MailServerTestAllImplementations.java
james/server/sandbox/mailet-refactorings/src/test/org/apache/james/test/mock/james/MockMailServer.java
james/server/sandbox/mailet-refactorings/src/test/org/apache/james/transport/mailets/LocalDeliveryTest.java
Modified:
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/James.java
URL:
http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/James.java?view=diff&rev=468051&r1=468050&r2=468051
==============================================================================
---
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/James.java
(original)
+++
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/James.java
Thu Oct 26 09:08:05 2006
@@ -43,7 +43,6 @@
import org.apache.james.services.DomainList;
import org.apache.james.services.FileSystem;
import org.apache.james.services.JamesUsersRepository;
-import org.apache.james.services.MailRepository;
import org.apache.james.services.MailServer;
import org.apache.james.services.ManageableDomainList;
import org.apache.james.services.SpoolRepository;
@@ -52,6 +51,7 @@
import org.apache.james.transport.mailets.LocalDelivery;
import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
+import org.apache.mailet.MailRepository;
import org.apache.mailet.Mailet;
import org.apache.mailet.MailetContext;
import org.apache.mailet.RFC2822Headers;
Modified:
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/mailboxmanager/repository/AbstractMailRepository.java
URL:
http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/mailboxmanager/repository/AbstractMailRepository.java?view=diff&rev=468051&r1=468050&r2=468051
==============================================================================
---
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/mailboxmanager/repository/AbstractMailRepository.java
(original)
+++
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/mailboxmanager/repository/AbstractMailRepository.java
Thu Oct 26 09:08:05 2006
@@ -32,8 +32,8 @@
import org.apache.commons.logging.impl.SimpleLog;
import org.apache.james.mailrepository.javamail.LockAdapter;
import org.apache.james.mailrepository.javamail.LockInterface;
-import org.apache.james.services.MailRepository;
import org.apache.mailet.Mail;
+import org.apache.mailet.MailRepository;
/**
* AbstractMailRepository that uses LockInterface
Modified:
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/mailrepository/AbstractMailRepository.java
URL:
http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/mailrepository/AbstractMailRepository.java?view=diff&rev=468051&r1=468050&r2=468051
==============================================================================
---
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/mailrepository/AbstractMailRepository.java
(original)
+++
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/mailrepository/AbstractMailRepository.java
Thu Oct 26 09:08:05 2006
@@ -28,9 +28,9 @@
import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.avalon.framework.service.Serviceable;
-import org.apache.james.services.MailRepository;
import org.apache.james.util.Lock;
import org.apache.mailet.Mail;
+import org.apache.mailet.MailRepository;
import javax.mail.MessagingException;
@@ -84,7 +84,7 @@
}
/**
- * @see org.apache.james.services.MailRepository#unlock(String)
+ * @see org.apache.mailet.MailRepository#unlock(String)
*/
public boolean unlock(String key) {
if (lock.unlock(key)) {
@@ -106,7 +106,7 @@
}
/**
- * @see org.apache.james.services.MailRepository#lock(String)
+ * @see org.apache.mailet.MailRepository#lock(String)
*/
public boolean lock(String key) {
if (lock.lock(key)) {
@@ -129,7 +129,7 @@
/**
- * @see org.apache.james.services.MailRepository#store(Mail)
+ * @see org.apache.mailet.MailRepository#store(Mail)
*/
public void store(Mail mc) throws MessagingException {
boolean wasLocked = true;
@@ -176,7 +176,7 @@
/**
- * @see org.apache.james.services.MailRepository#remove(Mail)
+ * @see org.apache.mailet.MailRepository#remove(Mail)
*/
public void remove(Mail mail) throws MessagingException {
remove(mail.getName());
@@ -184,7 +184,7 @@
/**
- * @see org.apache.james.services.MailRepository#remove(Collection)
+ * @see org.apache.mailet.MailRepository#remove(Collection)
*/
public void remove(Collection mails) throws MessagingException {
Iterator delList = mails.iterator();
@@ -194,7 +194,7 @@
}
/**
- * @see org.apache.james.services.MailRepository#remove(String)
+ * @see org.apache.mailet.MailRepository#remove(String)
*/
public void remove(String key) throws MessagingException {
if (lock(key)) {
Modified:
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/mailrepository/AvalonMailRepository.java
URL:
http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/mailrepository/AvalonMailRepository.java?view=diff&rev=468051&r1=468050&r2=468051
==============================================================================
---
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/mailrepository/AvalonMailRepository.java
(original)
+++
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/mailrepository/AvalonMailRepository.java
Thu Oct 26 09:08:05 2006
@@ -213,7 +213,7 @@
}
/**
- * @see org.apache.james.services.MailRepository#retrieve(String)
+ * @see org.apache.mailet.MailRepository#retrieve(String)
*/
public Mail retrieve(String key) throws MessagingException {
if ((DEEP_DEBUG) && (getLogger().isDebugEnabled())) {
@@ -260,7 +260,7 @@
/**
- * @see org.apache.james.services.MailRepository#list()
+ * @see org.apache.mailet.MailRepository#list()
*/
public Iterator list() {
// Fix ConcurrentModificationException by cloning
Modified:
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/mailrepository/JDBCMailRepository.java
URL:
http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/mailrepository/JDBCMailRepository.java?view=diff&rev=468051&r1=468050&r2=468051
==============================================================================
---
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/mailrepository/JDBCMailRepository.java
(original)
+++
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/mailrepository/JDBCMailRepository.java
Thu Oct 26 09:08:05 2006
@@ -675,7 +675,7 @@
/**
- * @see org.apache.james.services.MailRepository#retrieve(String)
+ * @see org.apache.mailet.MailRepository#retrieve(String)
*/
public Mail retrieve(String key) throws MessagingException {
if (DEEP_DEBUG) {
@@ -847,7 +847,7 @@
}
/**
- * @see org.apache.james.services.MailRepository#list()
+ * @see org.apache.mailet.MailRepository#list()
*/
public Iterator list() throws MessagingException {
//System.err.println("listing messages");
Modified:
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/mailrepository/MBoxMailRepository.java
URL:
http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/mailrepository/MBoxMailRepository.java?view=diff&rev=468051&r1=468050&r2=468051
==============================================================================
---
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/mailrepository/MBoxMailRepository.java
(original)
+++
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/mailrepository/MBoxMailRepository.java
Thu Oct 26 09:08:05 2006
@@ -52,8 +52,8 @@
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.james.core.MailImpl;
-import org.apache.james.services.MailRepository;
import org.apache.mailet.Mail;
+import org.apache.mailet.MailRepository;
import org.apache.oro.text.regex.MalformedPatternException;
import org.apache.oro.text.regex.Perl5Compiler;
import org.apache.oro.text.regex.Pattern;
@@ -495,7 +495,7 @@
/**
- * @see org.apache.james.services.MailRepository#store(Mail)
+ * @see org.apache.mailet.MailRepository#store(Mail)
*/
public void store(Mail mc) {
@@ -544,7 +544,7 @@
/**
- * @see org.apache.james.services.MailRepository#list()
+ * @see org.apache.mailet.MailRepository#list()
*/
public Iterator list() {
loadKeys();
@@ -571,7 +571,7 @@
}
/**
- * @see org.apache.james.services.MailRepository#retrieve(String)
+ * @see org.apache.mailet.MailRepository#retrieve(String)
*/
public Mail retrieve(String key) {
@@ -601,7 +601,7 @@
}
/**
- * @see org.apache.james.services.MailRepository#remove(Mail)
+ * @see org.apache.mailet.MailRepository#remove(Mail)
*/
public void remove(Mail mail) {
// Convert the message into a key
@@ -668,7 +668,7 @@
/**
- * @see org.apache.james.services.MailRepository#remove(Collection)
+ * @see org.apache.mailet.MailRepository#remove(Collection)
*/
public void remove(final Collection mails)
{
@@ -751,7 +751,7 @@
}
/**
- * @see org.apache.james.services.MailRepository#remove(String)
+ * @see org.apache.mailet.MailRepository#remove(String)
*/
public void remove(String key) {
loadKeys();
@@ -769,14 +769,14 @@
}
/**
- * @see org.apache.james.services.MailRepository#lock(String)
+ * @see org.apache.mailet.MailRepository#lock(String)
*/
public boolean lock(String key) {
return false;
}
/**
- * @see org.apache.james.services.MailRepository#unlock(String)
+ * @see org.apache.mailet.MailRepository#unlock(String)
*/
public boolean unlock(String key) {
return false;
Modified:
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/mailrepository/MailStoreSpoolRepository.java
URL:
http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/mailrepository/MailStoreSpoolRepository.java?view=diff&rev=468051&r1=468050&r2=468051
==============================================================================
---
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/mailrepository/MailStoreSpoolRepository.java
(original)
+++
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/mailrepository/MailStoreSpoolRepository.java
Thu Oct 26 09:08:05 2006
@@ -127,56 +127,56 @@
}
/**
- * @see
org.apache.james.services.MailRepository#store(org.apache.mailet.Mail)
+ * @see org.apache.mailet.MailRepository#store(org.apache.mailet.Mail)
*/
public void store(Mail mc) throws MessagingException {
spoolRep.store(mc);
}
/**
- * @see org.apache.james.services.MailRepository#list()
+ * @see org.apache.mailet.MailRepository#list()
*/
public Iterator list() throws MessagingException {
return spoolRep.list();
}
/**
- * @see org.apache.james.services.MailRepository#retrieve(java.lang.String)
+ * @see org.apache.mailet.MailRepository#retrieve(java.lang.String)
*/
public Mail retrieve(String key) throws MessagingException {
return spoolRep.retrieve(key);
}
/**
- * @see
org.apache.james.services.MailRepository#remove(org.apache.mailet.Mail)
+ * @see org.apache.mailet.MailRepository#remove(org.apache.mailet.Mail)
*/
public void remove(Mail mail) throws MessagingException {
spoolRep.remove(mail);
}
/**
- * @see
org.apache.james.services.MailRepository#remove(java.util.Collection)
+ * @see org.apache.mailet.MailRepository#remove(java.util.Collection)
*/
public void remove(Collection mails) throws MessagingException {
spoolRep.remove(mails);
}
/**
- * @see org.apache.james.services.MailRepository#remove(java.lang.String)
+ * @see org.apache.mailet.MailRepository#remove(java.lang.String)
*/
public void remove(String key) throws MessagingException {
spoolRep.remove(key);
}
/**
- * @see org.apache.james.services.MailRepository#lock(java.lang.String)
+ * @see org.apache.mailet.MailRepository#lock(java.lang.String)
*/
public boolean lock(String key) throws MessagingException {
return spoolRep.lock(key);
}
/**
- * @see org.apache.james.services.MailRepository#unlock(java.lang.String)
+ * @see org.apache.mailet.MailRepository#unlock(java.lang.String)
*/
public boolean unlock(String key) throws MessagingException {
return spoolRep.unlock(key);
Modified:
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/mailrepository/javamail/AbstractJavamailStoreMailRepository.java
URL:
http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/mailrepository/javamail/AbstractJavamailStoreMailRepository.java?view=diff&rev=468051&r1=468050&r2=468051
==============================================================================
---
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/mailrepository/javamail/AbstractJavamailStoreMailRepository.java
(original)
+++
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/mailrepository/javamail/AbstractJavamailStoreMailRepository.java
Thu Oct 26 09:08:05 2006
@@ -44,8 +44,8 @@
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.avalon.framework.service.Serviceable;
import org.apache.james.services.FileSystem;
-import org.apache.james.services.MailRepository;
import org.apache.mailet.Mail;
+import org.apache.mailet.MailRepository;
/**
* MailRepository implementation to store mail in a Javamail store
Modified:
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/mailrepository/javamail/HashJavamailStoreMailRepository.java
URL:
http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/mailrepository/javamail/HashJavamailStoreMailRepository.java?view=diff&rev=468051&r1=468050&r2=468051
==============================================================================
---
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/mailrepository/javamail/HashJavamailStoreMailRepository.java
(original)
+++
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/mailrepository/javamail/HashJavamailStoreMailRepository.java
Thu Oct 26 09:08:05 2006
@@ -89,7 +89,7 @@
* resulting messagenumber and saves result in keyToMsgMap. If Folder
* supports getMessageCount on closed folder, this could be quite efficient
*
- * @see org.apache.james.services.MailRepository#store(Mail)
+ * @see org.apache.mailet.MailRepository#store(Mail)
*/
public synchronized void store(Mail mc) throws MessagingException {
@@ -171,7 +171,7 @@
/**
* calls rehash and uses stored keys in KeyToMsgMap
*
- * @see org.apache.james.services.MailRepository#list()
+ * @see org.apache.mailet.MailRepository#list()
*/
public Iterator list() throws MessagingException {
try {
@@ -192,7 +192,7 @@
/**
* uses getMessageFromInbox, returns null if not found
*
- * @see org.apache.james.services.MailRepository#retrieve(String)
+ * @see org.apache.mailet.MailRepository#retrieve(String)
*/
public Mail retrieve(String key) throws MessagingException {
log.debug("retrieve: " + key);
@@ -220,7 +220,7 @@
* setFlag(Flags.Flag.DELETED, true); on message. removes message from
* KeyToMsgMap. Messagenumbers are recalculated for next guesses.
*
- * @see org.apache.james.services.MailRepository#remove(String)
+ * @see org.apache.mailet.MailRepository#remove(String)
*/
public synchronized void remove(String key) throws MessagingException {
log.debug("HashJavamailStore remove key:" + key);
Modified:
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/pop3server/POP3Handler.java
URL:
http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/pop3server/POP3Handler.java?view=diff&rev=468051&r1=468050&r2=468051
==============================================================================
---
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/pop3server/POP3Handler.java
(original)
+++
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/pop3server/POP3Handler.java
Thu Oct 26 09:08:05 2006
@@ -25,10 +25,10 @@
import org.apache.james.Constants;
import org.apache.james.core.AbstractJamesHandler;
import org.apache.james.core.MailImpl;
-import org.apache.james.services.MailRepository;
import org.apache.james.util.CRLFTerminatedReader;
import org.apache.james.util.watchdog.Watchdog;
import org.apache.mailet.Mail;
+import org.apache.mailet.MailRepository;
import java.io.IOException;
import java.io.OutputStream;
@@ -474,7 +474,7 @@
}
/**
- * @see
org.apache.james.pop3server.POP3Session#setUserInbox(org.apache.james.services.MailRepository)
+ * @see
org.apache.james.pop3server.POP3Session#setUserInbox(org.apache.mailet.MailRepository)
*/
public void setUserInbox(MailRepository userInbox) {
this.userInbox = userInbox;
Modified:
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/pop3server/POP3Session.java
URL:
http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/pop3server/POP3Session.java?view=diff&rev=468051&r1=468050&r2=468051
==============================================================================
---
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/pop3server/POP3Session.java
(original)
+++
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/pop3server/POP3Session.java
Thu Oct 26 09:08:05 2006
@@ -22,8 +22,8 @@
package org.apache.james.pop3server;
-import org.apache.james.services.MailRepository;
import org.apache.james.util.watchdog.Watchdog;
+import org.apache.mailet.MailRepository;
import java.io.IOException;
import java.io.OutputStream;
Modified:
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/pop3server/PassCmdHandler.java
URL:
http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/pop3server/PassCmdHandler.java?view=diff&rev=468051&r1=468050&r2=468051
==============================================================================
---
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/pop3server/PassCmdHandler.java
(original)
+++
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/pop3server/PassCmdHandler.java
Thu Oct 26 09:08:05 2006
@@ -22,8 +22,8 @@
package org.apache.james.pop3server;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.james.services.MailRepository;
import org.apache.james.util.POP3BeforeSMTPHelper;
+import org.apache.mailet.MailRepository;
/**
* Handles PASS command
Modified:
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/services/MailServer.java
URL:
http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/services/MailServer.java?view=diff&rev=468051&r1=468050&r2=468051
==============================================================================
---
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/services/MailServer.java
(original)
+++
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/services/MailServer.java
Thu Oct 26 09:08:05 2006
@@ -23,6 +23,7 @@
import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
+import org.apache.mailet.MailRepository;
import javax.mail.MessagingException;
import javax.mail.internet.MimeMessage;
Modified:
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/services/SpoolRepository.java
URL:
http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/services/SpoolRepository.java?view=diff&rev=468051&r1=468050&r2=468051
==============================================================================
---
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/services/SpoolRepository.java
(original)
+++
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/services/SpoolRepository.java
Thu Oct 26 09:08:05 2006
@@ -22,6 +22,7 @@
package org.apache.james.services;
import org.apache.mailet.Mail;
+import org.apache.mailet.MailRepository;
/**
* Interface for a Repository for Spooling Mails.
Modified:
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/FromRepository.java
URL:
http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/FromRepository.java?view=diff&rev=468051&r1=468050&r2=468051
==============================================================================
---
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/FromRepository.java
(original)
+++
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/FromRepository.java
Thu Oct 26 09:08:05 2006
@@ -27,9 +27,9 @@
import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.james.Constants;
-import org.apache.james.services.MailRepository;
import org.apache.mailet.GenericMailet;
import org.apache.mailet.Mail;
+import org.apache.mailet.MailRepository;
import javax.mail.MessagingException;
Modified:
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/ToMultiRepository.java
URL:
http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/ToMultiRepository.java?view=diff&rev=468051&r1=468050&r2=468051
==============================================================================
---
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/ToMultiRepository.java
(original)
+++
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/ToMultiRepository.java
Thu Oct 26 09:08:05 2006
@@ -28,11 +28,11 @@
import org.apache.james.Constants;
import org.apache.james.James;
import org.apache.james.core.MailImpl;
-import org.apache.james.services.MailRepository;
import org.apache.james.services.MailServer;
import org.apache.mailet.GenericMailet;
import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
+import org.apache.mailet.MailRepository;
import org.apache.mailet.RFC2822Headers;
import javax.mail.Header;
Modified:
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/ToRepository.java
URL:
http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/ToRepository.java?view=diff&rev=468051&r1=468050&r2=468051
==============================================================================
---
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/ToRepository.java
(original)
+++
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/mailets/ToRepository.java
Thu Oct 26 09:08:05 2006
@@ -26,9 +26,9 @@
import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.james.Constants;
-import org.apache.james.services.MailRepository;
import org.apache.mailet.GenericMailet;
import org.apache.mailet.Mail;
+import org.apache.mailet.MailRepository;
/**
* Stores incoming Mail in the specified Repository.
Modified:
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/matchers/AbstractStorageQuota.java
URL:
http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/matchers/AbstractStorageQuota.java?view=diff&rev=468051&r1=468050&r2=468051
==============================================================================
---
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/matchers/AbstractStorageQuota.java
(original)
+++
james/server/sandbox/mailet-refactorings/src/java/org/apache/james/transport/matchers/AbstractStorageQuota.java
Thu Oct 26 09:08:05 2006
@@ -26,11 +26,11 @@
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.james.Constants;
import org.apache.james.services.JamesUser;
-import org.apache.james.services.MailRepository;
import org.apache.james.services.MailServer;
import org.apache.james.services.UsersRepository;
import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
+import org.apache.mailet.MailRepository;
import org.apache.mailet.MailetContext;
import javax.mail.MessagingException;
Modified:
james/server/sandbox/mailet-refactorings/src/test/org/apache/james/imapserver/mock/MockMailServer.java
URL:
http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/test/org/apache/james/imapserver/mock/MockMailServer.java?view=diff&rev=468051&r1=468050&r2=468051
==============================================================================
---
james/server/sandbox/mailet-refactorings/src/test/org/apache/james/imapserver/mock/MockMailServer.java
(original)
+++
james/server/sandbox/mailet-refactorings/src/test/org/apache/james/imapserver/mock/MockMailServer.java
Thu Oct 26 09:08:05 2006
@@ -9,10 +9,10 @@
import javax.mail.internet.MimeMessage;
import org.apache.james.imapserver.TestConstants;
-import org.apache.james.services.MailRepository;
import org.apache.james.services.MailServer;
import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
+import org.apache.mailet.MailRepository;
public class MockMailServer implements MailServer, TestConstants
{
Modified:
james/server/sandbox/mailet-refactorings/src/test/org/apache/james/mailboxmanager/redundant/AbstractMailRepositoryTestCase.java
URL:
http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/test/org/apache/james/mailboxmanager/redundant/AbstractMailRepositoryTestCase.java?view=diff&rev=468051&r1=468050&r2=468051
==============================================================================
---
james/server/sandbox/mailet-refactorings/src/test/org/apache/james/mailboxmanager/redundant/AbstractMailRepositoryTestCase.java
(original)
+++
james/server/sandbox/mailet-refactorings/src/test/org/apache/james/mailboxmanager/redundant/AbstractMailRepositoryTestCase.java
Thu Oct 26 09:08:05 2006
@@ -37,8 +37,8 @@
import org.apache.james.core.MailImpl;
import
org.apache.james.mailrepository.javamail.HashJavamailStoreMailRepository;
-import org.apache.james.services.MailRepository;
import org.apache.mailet.Mail;
+import org.apache.mailet.MailRepository;
import com.sun.mail.util.CRLFOutputStream;
Modified:
james/server/sandbox/mailet-refactorings/src/test/org/apache/james/mailrepository/AbstractMailRepositoryTest.java
URL:
http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/test/org/apache/james/mailrepository/AbstractMailRepositoryTest.java?view=diff&rev=468051&r1=468050&r2=468051
==============================================================================
---
james/server/sandbox/mailet-refactorings/src/test/org/apache/james/mailrepository/AbstractMailRepositoryTest.java
(original)
+++
james/server/sandbox/mailet-refactorings/src/test/org/apache/james/mailrepository/AbstractMailRepositoryTest.java
Thu Oct 26 09:08:05 2006
@@ -23,9 +23,9 @@
import org.apache.james.core.MailImpl;
import org.apache.james.core.MimeMessageCopyOnWriteProxy;
import org.apache.james.core.MimeMessageInputStreamSource;
-import org.apache.james.services.MailRepository;
import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
+import org.apache.mailet.MailRepository;
import javax.mail.MessagingException;
import javax.mail.internet.MimeMessage;
Modified:
james/server/sandbox/mailet-refactorings/src/test/org/apache/james/mailrepository/AvalonMailRepositoryTest.java
URL:
http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/test/org/apache/james/mailrepository/AvalonMailRepositoryTest.java?view=diff&rev=468051&r1=468050&r2=468051
==============================================================================
---
james/server/sandbox/mailet-refactorings/src/test/org/apache/james/mailrepository/AvalonMailRepositoryTest.java
(original)
+++
james/server/sandbox/mailet-refactorings/src/test/org/apache/james/mailrepository/AvalonMailRepositoryTest.java
Thu Oct 26 09:08:05 2006
@@ -27,10 +27,10 @@
import
org.apache.james.mailrepository.filepair.File_Persistent_Object_Repository;
import
org.apache.james.mailrepository.filepair.File_Persistent_Stream_Repository;
import org.apache.james.services.FileSystem;
-import org.apache.james.services.MailRepository;
import org.apache.james.test.mock.avalon.MockLogger;
import org.apache.james.test.mock.avalon.MockStore;
import org.apache.james.test.mock.james.MockFileSystem;
+import org.apache.mailet.MailRepository;
public class AvalonMailRepositoryTest extends AbstractMailRepositoryTest {
Modified:
james/server/sandbox/mailet-refactorings/src/test/org/apache/james/mailrepository/JDBCMailRepositoryTest.java
URL:
http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/test/org/apache/james/mailrepository/JDBCMailRepositoryTest.java?view=diff&rev=468051&r1=468050&r2=468051
==============================================================================
---
james/server/sandbox/mailet-refactorings/src/test/org/apache/james/mailrepository/JDBCMailRepositoryTest.java
(original)
+++
james/server/sandbox/mailet-refactorings/src/test/org/apache/james/mailrepository/JDBCMailRepositoryTest.java
Thu Oct 26 09:08:05 2006
@@ -28,12 +28,12 @@
import org.apache.avalon.framework.service.ServiceException;
import
org.apache.james.mailrepository.filepair.File_Persistent_Stream_Repository;
import org.apache.james.services.FileSystem;
-import org.apache.james.services.MailRepository;
import org.apache.james.test.mock.avalon.MockLogger;
import org.apache.james.test.mock.avalon.MockStore;
import org.apache.james.test.mock.james.MockFileSystem;
import org.apache.james.test.mock.util.AttrValConfiguration;
import org.apache.james.test.util.Util;
+import org.apache.mailet.MailRepository;
public class JDBCMailRepositoryTest extends AbstractMailRepositoryTest {
Modified:
james/server/sandbox/mailet-refactorings/src/test/org/apache/james/mailrepository/MBoxMailRepositoryTest.java
URL:
http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/test/org/apache/james/mailrepository/MBoxMailRepositoryTest.java?view=diff&rev=468051&r1=468050&r2=468051
==============================================================================
---
james/server/sandbox/mailet-refactorings/src/test/org/apache/james/mailrepository/MBoxMailRepositoryTest.java
(original)
+++
james/server/sandbox/mailet-refactorings/src/test/org/apache/james/mailrepository/MBoxMailRepositoryTest.java
Thu Oct 26 09:08:05 2006
@@ -23,8 +23,8 @@
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.configuration.DefaultConfiguration;
import org.apache.avalon.framework.service.ServiceException;
-import org.apache.james.services.MailRepository;
import org.apache.james.test.mock.avalon.MockLogger;
+import org.apache.mailet.MailRepository;
/**
* NOTE NOTE NOTE: this test is disabled because MBoxMailRepository does not
Modified:
james/server/sandbox/mailet-refactorings/src/test/org/apache/james/pop3server/POP3ServerTest.java
URL:
http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/test/org/apache/james/pop3server/POP3ServerTest.java?view=diff&rev=468051&r1=468050&r2=468051
==============================================================================
---
james/server/sandbox/mailet-refactorings/src/test/org/apache/james/pop3server/POP3ServerTest.java
(original)
+++
james/server/sandbox/mailet-refactorings/src/test/org/apache/james/pop3server/POP3ServerTest.java
Thu Oct 26 09:08:05 2006
@@ -29,7 +29,6 @@
import org.apache.james.services.AbstractDNSServer;
import org.apache.james.services.DNSServer;
import org.apache.james.services.JamesConnectionManager;
-import org.apache.james.services.MailRepository;
import org.apache.james.services.MailServer;
import org.apache.james.services.UsersRepository;
import org.apache.james.test.mock.avalon.MockLogger;
@@ -43,6 +42,7 @@
import org.apache.james.util.POP3BeforeSMTPHelper;
import org.apache.james.util.connection.SimpleConnectionManager;
import org.apache.mailet.MailAddress;
+import org.apache.mailet.MailRepository;
import javax.mail.MessagingException;
import javax.mail.util.SharedByteArrayInputStream;
Modified:
james/server/sandbox/mailet-refactorings/src/test/org/apache/james/services/MailServerTestAllImplementations.java
URL:
http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/test/org/apache/james/services/MailServerTestAllImplementations.java?view=diff&rev=468051&r1=468050&r2=468051
==============================================================================
---
james/server/sandbox/mailet-refactorings/src/test/org/apache/james/services/MailServerTestAllImplementations.java
(original)
+++
james/server/sandbox/mailet-refactorings/src/test/org/apache/james/services/MailServerTestAllImplementations.java
Thu Oct 26 09:08:05 2006
@@ -22,6 +22,7 @@
package org.apache.james.services;
import org.apache.avalon.framework.service.ServiceException;
+import org.apache.mailet.MailRepository;
import junit.framework.TestCase;
Modified:
james/server/sandbox/mailet-refactorings/src/test/org/apache/james/test/mock/james/MockMailServer.java
URL:
http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/test/org/apache/james/test/mock/james/MockMailServer.java?view=diff&rev=468051&r1=468050&r2=468051
==============================================================================
---
james/server/sandbox/mailet-refactorings/src/test/org/apache/james/test/mock/james/MockMailServer.java
(original)
+++
james/server/sandbox/mailet-refactorings/src/test/org/apache/james/test/mock/james/MockMailServer.java
Thu Oct 26 09:08:05 2006
@@ -22,12 +22,12 @@
import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.container.ContainerUtil;
import org.apache.james.core.MailImpl;
-import org.apache.james.services.MailRepository;
import org.apache.james.services.MailServer;
import org.apache.james.smtpserver.MessageSizeException;
import org.apache.james.userrepository.MockUsersRepository;
import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
+import org.apache.mailet.MailRepository;
import javax.mail.Address;
import javax.mail.MessagingException;
Modified:
james/server/sandbox/mailet-refactorings/src/test/org/apache/james/transport/mailets/LocalDeliveryTest.java
URL:
http://svn.apache.org/viewvc/james/server/sandbox/mailet-refactorings/src/test/org/apache/james/transport/mailets/LocalDeliveryTest.java?view=diff&rev=468051&r1=468050&r2=468051
==============================================================================
---
james/server/sandbox/mailet-refactorings/src/test/org/apache/james/transport/mailets/LocalDeliveryTest.java
(original)
+++
james/server/sandbox/mailet-refactorings/src/test/org/apache/james/transport/mailets/LocalDeliveryTest.java
Thu Oct 26 09:08:05 2006
@@ -22,7 +22,6 @@
import org.apache.avalon.framework.container.ContainerUtil;
import org.apache.james.Constants;
import org.apache.james.core.MailImpl;
-import org.apache.james.services.MailRepository;
import org.apache.james.services.MailServer;
import org.apache.james.services.UsersRepository;
import org.apache.james.test.mock.avalon.MockServiceManager;
@@ -36,6 +35,7 @@
import org.apache.james.userrepository.MockUsersRepository;
import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
+import org.apache.mailet.MailRepository;
import org.apache.mailet.Mailet;
import javax.mail.MessagingException;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
