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 er...@apache.org on 2010/09/21 18:25:36 UTC
svn commit: r999486 - in /james:
imap/trunk/mailbox/src/main/java/org/apache/james/services/
server/trunk/core-function/src/main/java/org/apache/james/mailrepository/
server/trunk/core-library/src/test/java/org/apache/james/test/mock/avalon/
server/tru...
Author: eric
Date: Tue Sep 21 16:25:35 2010
New Revision: 999486
URL: http://svn.apache.org/viewvc?rev=999486&view=rev
Log:
Normalize 2.3 mail store classes to mailrepository package, could be renamed or merge to mailbox package after (IMAP-1048)
Removed:
james/imap/trunk/mailbox/src/main/java/org/apache/james/services/
Modified:
james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/MailStoreSpoolRepository.java
james/server/trunk/core-library/src/test/java/org/apache/james/test/mock/avalon/MockStore.java
james/server/trunk/core-library/src/test/java/org/apache/james/test/mock/james/MockMailServer.java
james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/FromRepository.java
james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/Retry.java
james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/ToRepository.java
james/server/trunk/management/src/main/java/org/apache/james/management/impl/SpoolManagement.java
james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java
james/server/trunk/spool-api/src/main/java/org/apache/james/services/SpoolRepository.java
james/server/trunk/spoolmanager/src/main/java/org/apache/james/transport/mailets/ToMultiRepository.java
james/server/trunk/spoolmanager/src/test/java/org/apache/james/transport/remotedeliverytester/Tester.java
james/server/trunk/spring-common/src/main/java/org/apache/james/container/spring/SpringMailStore.java
james/server/trunk/user-function/src/main/java/org/apache/james/userrepository/UsersFileRepository.java
Modified: james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/MailStoreSpoolRepository.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/MailStoreSpoolRepository.java?rev=999486&r1=999485&r2=999486&view=diff
==============================================================================
--- james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/MailStoreSpoolRepository.java (original)
+++ james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/MailStoreSpoolRepository.java Tue Sep 21 16:25:35 2010
@@ -27,7 +27,6 @@ import org.apache.commons.logging.Log;
import org.apache.james.lifecycle.Configurable;
import org.apache.james.lifecycle.LogEnabled;
import org.apache.james.services.SpoolRepository;
-import org.apache.james.services.store.MailStore;
import org.apache.mailet.Mail;
import javax.annotation.PostConstruct;
@@ -123,56 +122,56 @@ public class MailStoreSpoolRepository im
}
/**
- * @see org.apache.james.services.MailRepository#store(org.apache.mailet.Mail)
+ * @see org.apache.james.mailrepository.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.james.mailrepository.MailRepository#list()
*/
public Iterator<String> list() throws MessagingException {
return spoolRep.list();
}
/**
- * @see org.apache.james.services.MailRepository#retrieve(java.lang.String)
+ * @see org.apache.james.mailrepository.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.james.mailrepository.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.james.mailrepository.MailRepository#remove(java.util.Collection)
*/
public void remove(Collection<Mail> mails) throws MessagingException {
spoolRep.remove(mails);
}
/**
- * @see org.apache.james.services.MailRepository#remove(java.lang.String)
+ * @see org.apache.james.mailrepository.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.james.mailrepository.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.james.mailrepository.MailRepository#unlock(java.lang.String)
*/
public boolean unlock(String key) throws MessagingException {
return spoolRep.unlock(key);
Modified: james/server/trunk/core-library/src/test/java/org/apache/james/test/mock/avalon/MockStore.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-library/src/test/java/org/apache/james/test/mock/avalon/MockStore.java?rev=999486&r1=999485&r2=999486&view=diff
==============================================================================
--- james/server/trunk/core-library/src/test/java/org/apache/james/test/mock/avalon/MockStore.java (original)
+++ james/server/trunk/core-library/src/test/java/org/apache/james/test/mock/avalon/MockStore.java Tue Sep 21 16:25:35 2010
@@ -24,7 +24,7 @@ package org.apache.james.test.mock.avalo
import org.apache.commons.configuration.Configuration;
import org.apache.commons.configuration.ConfigurationUtils;
import org.apache.commons.configuration.HierarchicalConfiguration;
-import org.apache.james.services.store.MailStore;
+import org.apache.james.mailrepository.MailStore;
import java.util.HashMap;
import java.util.Map;
Modified: james/server/trunk/core-library/src/test/java/org/apache/james/test/mock/james/MockMailServer.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-library/src/test/java/org/apache/james/test/mock/james/MockMailServer.java?rev=999486&r1=999485&r2=999486&view=diff
==============================================================================
--- james/server/trunk/core-library/src/test/java/org/apache/james/test/mock/james/MockMailServer.java (original)
+++ james/server/trunk/core-library/src/test/java/org/apache/james/test/mock/james/MockMailServer.java Tue Sep 21 16:25:35 2010
@@ -23,7 +23,7 @@ import org.apache.james.api.user.UsersRe
import org.apache.james.core.MailImpl;
import org.apache.james.lifecycle.Disposable;
import org.apache.james.lifecycle.LifecycleUtil;
-import org.apache.james.services.MailRepository;
+import org.apache.james.mailrepository.MailRepository;
import org.apache.james.services.MailServer;
import org.apache.mailet.base.test.MailUtil;
import org.apache.mailet.Mail;
Modified: james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/FromRepository.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/FromRepository.java?rev=999486&r1=999485&r2=999486&view=diff
==============================================================================
--- james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/FromRepository.java (original)
+++ james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/FromRepository.java Tue Sep 21 16:25:35 2010
@@ -23,8 +23,8 @@ package org.apache.james.transport.maile
import org.apache.commons.configuration.DefaultConfigurationBuilder;
import org.apache.james.lifecycle.LifecycleUtil;
-import org.apache.james.services.MailRepository;
-import org.apache.james.services.store.MailStore;
+import org.apache.james.mailrepository.MailRepository;
+import org.apache.james.mailrepository.MailStore;
import org.apache.mailet.base.GenericMailet;
import org.apache.mailet.Mail;
Modified: james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/Retry.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/Retry.java?rev=999486&r1=999485&r2=999486&view=diff
==============================================================================
--- james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/Retry.java (original)
+++ james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/Retry.java Tue Sep 21 16:25:35 2010
@@ -20,8 +20,8 @@
package org.apache.james.transport.mailets;
import org.apache.commons.configuration.DefaultConfigurationBuilder;
import org.apache.james.lifecycle.LifecycleUtil;
+import org.apache.james.mailrepository.MailStore;
import org.apache.james.services.SpoolRepository;
-import org.apache.james.services.store.MailStore;
import org.apache.mailet.base.GenericMailet;
import org.apache.mailet.Mail;
import org.apache.mailet.MailetContext;
Modified: james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/ToRepository.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/ToRepository.java?rev=999486&r1=999485&r2=999486&view=diff
==============================================================================
--- james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/ToRepository.java (original)
+++ james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/ToRepository.java Tue Sep 21 16:25:35 2010
@@ -24,8 +24,8 @@ package org.apache.james.transport.maile
import javax.annotation.Resource;
import org.apache.commons.configuration.DefaultConfigurationBuilder;
-import org.apache.james.services.MailRepository;
-import org.apache.james.services.store.MailStore;
+import org.apache.james.mailrepository.MailRepository;
+import org.apache.james.mailrepository.MailStore;
import org.apache.mailet.base.GenericMailet;
import org.apache.mailet.Mail;
Modified: james/server/trunk/management/src/main/java/org/apache/james/management/impl/SpoolManagement.java
URL: http://svn.apache.org/viewvc/james/server/trunk/management/src/main/java/org/apache/james/management/impl/SpoolManagement.java?rev=999486&r1=999485&r2=999486&view=diff
==============================================================================
--- james/server/trunk/management/src/main/java/org/apache/james/management/impl/SpoolManagement.java (original)
+++ james/server/trunk/management/src/main/java/org/apache/james/management/impl/SpoolManagement.java Tue Sep 21 16:25:35 2010
@@ -24,12 +24,12 @@ package org.apache.james.management.impl
import org.apache.commons.configuration.DefaultConfigurationBuilder;
import org.apache.james.lifecycle.LifecycleUtil;
+import org.apache.james.mailrepository.MailStore;
import org.apache.james.management.SpoolFilter;
import org.apache.james.management.SpoolManagementException;
import org.apache.james.management.SpoolManagementMBean;
import org.apache.james.management.SpoolManagementService;
import org.apache.james.services.SpoolRepository;
-import org.apache.james.services.store.MailStore;
import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
import org.apache.oro.text.regex.Pattern;
Modified: james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java?rev=999486&r1=999485&r2=999486&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java (original)
+++ james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java Tue Sep 21 16:25:35 2010
@@ -37,11 +37,11 @@ import org.apache.james.api.user.UsersRe
import org.apache.james.api.vut.ErrorMappingException;
import org.apache.james.api.vut.VirtualUserTable;
import org.apache.james.api.vut.VirtualUserTableStore;
+import org.apache.james.mailrepository.MailRepository;
import org.apache.james.protocols.smtp.BaseFakeSMTPSession;
import org.apache.james.protocols.smtp.SMTPConfiguration;
import org.apache.james.protocols.smtp.SMTPSession;
import org.apache.james.protocols.smtp.hook.HookReturnCode;
-import org.apache.james.services.MailRepository;
import org.apache.james.services.MailServer;
import org.apache.james.smtpserver.fastfail.ValidRcptHandler;
import org.apache.james.test.mock.james.MockVirtualUserTableStore;
Modified: james/server/trunk/spool-api/src/main/java/org/apache/james/services/SpoolRepository.java
URL: http://svn.apache.org/viewvc/james/server/trunk/spool-api/src/main/java/org/apache/james/services/SpoolRepository.java?rev=999486&r1=999485&r2=999486&view=diff
==============================================================================
--- james/server/trunk/spool-api/src/main/java/org/apache/james/services/SpoolRepository.java (original)
+++ james/server/trunk/spool-api/src/main/java/org/apache/james/services/SpoolRepository.java Tue Sep 21 16:25:35 2010
@@ -21,6 +21,7 @@
package org.apache.james.services;
+import org.apache.james.mailrepository.MailRepository;
import org.apache.mailet.Mail;
/**
Modified: james/server/trunk/spoolmanager/src/main/java/org/apache/james/transport/mailets/ToMultiRepository.java
URL: http://svn.apache.org/viewvc/james/server/trunk/spoolmanager/src/main/java/org/apache/james/transport/mailets/ToMultiRepository.java?rev=999486&r1=999485&r2=999486&view=diff
==============================================================================
--- james/server/trunk/spoolmanager/src/main/java/org/apache/james/transport/mailets/ToMultiRepository.java (original)
+++ james/server/trunk/spoolmanager/src/main/java/org/apache/james/transport/mailets/ToMultiRepository.java Tue Sep 21 16:25:35 2010
@@ -23,8 +23,8 @@ package org.apache.james.transport.maile
import org.apache.commons.configuration.DefaultConfigurationBuilder;
import org.apache.james.core.MailImpl;
-import org.apache.james.services.MailRepository;
-import org.apache.james.services.store.MailStore;
+import org.apache.james.mailrepository.MailRepository;
+import org.apache.james.mailrepository.MailStore;
import org.apache.mailet.base.GenericMailet;
import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
Modified: james/server/trunk/spoolmanager/src/test/java/org/apache/james/transport/remotedeliverytester/Tester.java
URL: http://svn.apache.org/viewvc/james/server/trunk/spoolmanager/src/test/java/org/apache/james/transport/remotedeliverytester/Tester.java?rev=999486&r1=999485&r2=999486&view=diff
==============================================================================
--- james/server/trunk/spoolmanager/src/test/java/org/apache/james/transport/remotedeliverytester/Tester.java (original)
+++ james/server/trunk/spoolmanager/src/test/java/org/apache/james/transport/remotedeliverytester/Tester.java Tue Sep 21 16:25:35 2010
@@ -22,7 +22,7 @@ package org.apache.james.transport.remot
import org.apache.james.api.dnsservice.DNSService;
import org.apache.james.api.dnsservice.TemporaryResolutionException;
import org.apache.james.core.MailImpl;
-import org.apache.james.services.MailRepository;
+import org.apache.james.mailrepository.MailRepository;
import org.apache.james.services.MailServer;
import org.apache.mailet.HostAddress;
import org.apache.mailet.Mail;
Modified: james/server/trunk/spring-common/src/main/java/org/apache/james/container/spring/SpringMailStore.java
URL: http://svn.apache.org/viewvc/james/server/trunk/spring-common/src/main/java/org/apache/james/container/spring/SpringMailStore.java?rev=999486&r1=999485&r2=999486&view=diff
==============================================================================
--- james/server/trunk/spring-common/src/main/java/org/apache/james/container/spring/SpringMailStore.java (original)
+++ james/server/trunk/spring-common/src/main/java/org/apache/james/container/spring/SpringMailStore.java Tue Sep 21 16:25:35 2010
@@ -23,8 +23,9 @@ import javax.annotation.Resource;
import org.apache.commons.configuration.HierarchicalConfiguration;
import org.apache.commons.logging.Log;
-import org.apache.james.services.MailRepository;
-import org.apache.james.services.store.MailStore;
+import org.apache.james.mailrepository.AbstractMailStore;
+import org.apache.james.mailrepository.MailRepository;
+import org.apache.james.mailrepository.MailStore;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.BeanFactory;
import org.springframework.beans.factory.BeanFactoryAware;
Modified: james/server/trunk/user-function/src/main/java/org/apache/james/userrepository/UsersFileRepository.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-function/src/main/java/org/apache/james/userrepository/UsersFileRepository.java?rev=999486&r1=999485&r2=999486&view=diff
==============================================================================
--- james/server/trunk/user-function/src/main/java/org/apache/james/userrepository/UsersFileRepository.java (original)
+++ james/server/trunk/user-function/src/main/java/org/apache/james/userrepository/UsersFileRepository.java Tue Sep 21 16:25:35 2010
@@ -27,8 +27,8 @@ import org.apache.commons.configuration.
import org.apache.james.api.user.User;
import org.apache.james.impl.jamesuser.AbstractUsersRepository;
import org.apache.james.impl.user.DefaultJamesUser;
+import org.apache.james.mailrepository.MailStore;
import org.apache.james.repository.ObjectRepository;
-import org.apache.james.services.store.MailStore;
import java.util.Iterator;
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org