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/22 16:04:22 UTC
svn commit: r999953 - in /james/server/trunk:
mail-api/src/main/java/org/apache/james/mailrepository/
mail-api/src/main/java/org/apache/james/mailstore/
mail-file/src/main/java/org/apache/james/mailrepository/
mail-file/src/test/java/org/apache/james/m...
Author: eric
Date: Wed Sep 22 14:04:21 2010
New Revision: 999953
URL: http://svn.apache.org/viewvc?rev=999953&view=rev
Log:
MailStore are mailstores, not mailrepositories.., so mv them to mailstore packages...
Added:
james/server/trunk/mail-api/src/main/java/org/apache/james/mailstore/
james/server/trunk/mail-api/src/main/java/org/apache/james/mailstore/MailStore.java
- copied, changed from r999819, james/server/trunk/mail-api/src/main/java/org/apache/james/mailrepository/MailStore.java
james/server/trunk/mail-library/src/main/java/org/apache/james/mailstore/
james/server/trunk/mail-library/src/main/java/org/apache/james/mailstore/AbstractMailStore.java
- copied, changed from r999819, james/server/trunk/mail-library/src/main/java/org/apache/james/mailrepository/AbstractMailStore.java
james/server/trunk/mail-library/src/test/java/org/apache/james/mailstore/
james/server/trunk/mail-library/src/test/java/org/apache/james/mailstore/MockMailStore.java
- copied, changed from r999912, james/server/trunk/mail-library/src/test/java/org/apache/james/mailrepository/MockStore.java
Removed:
james/server/trunk/mail-api/src/main/java/org/apache/james/mailrepository/MailStore.java
james/server/trunk/mail-library/src/main/java/org/apache/james/mailrepository/AbstractMailStore.java
james/server/trunk/mail-library/src/test/java/org/apache/james/mailrepository/MockStore.java
james/server/trunk/mail-library/src/test/java/org/apache/james/test/
Modified:
james/server/trunk/mail-file/src/main/java/org/apache/james/mailrepository/FileMailRepository.java
james/server/trunk/mail-file/src/test/java/org/apache/james/mailrepository/FileMailRepositoryTest.java
james/server/trunk/mail-jdbc/src/test/java/org/apache/james/mailrepository/JDBCMailRepositoryTest.java
james/server/trunk/mail-library/src/main/java/org/apache/james/mailrepository/AbstractMailRepository.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/management/src/test/java/org/apache/james/management/impl/SpoolManagementTest.java
james/server/trunk/remotemanager/src/test/java/org/apache/james/remotemanager/AbstractRemoteManagerTest.java
james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/AbstractSMTPServerTest.java
james/server/trunk/spoolmanager/src/main/java/org/apache/james/transport/mailets/ToMultiRepository.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
james/server/trunk/user-function/src/test/java/org/apache/james/userrepository/UsersFileRepositoryTest.java
Copied: james/server/trunk/mail-api/src/main/java/org/apache/james/mailstore/MailStore.java (from r999819, james/server/trunk/mail-api/src/main/java/org/apache/james/mailrepository/MailStore.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/mail-api/src/main/java/org/apache/james/mailstore/MailStore.java?p2=james/server/trunk/mail-api/src/main/java/org/apache/james/mailstore/MailStore.java&p1=james/server/trunk/mail-api/src/main/java/org/apache/james/mailrepository/MailStore.java&r1=999819&r2=999953&rev=999953&view=diff
==============================================================================
--- james/server/trunk/mail-api/src/main/java/org/apache/james/mailrepository/MailStore.java (original)
+++ james/server/trunk/mail-api/src/main/java/org/apache/james/mailstore/MailStore.java Wed Sep 22 14:04:21 2010
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mailrepository;
+package org.apache.james.mailstore;
import org.apache.commons.configuration.HierarchicalConfiguration;
Modified: james/server/trunk/mail-file/src/main/java/org/apache/james/mailrepository/FileMailRepository.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mail-file/src/main/java/org/apache/james/mailrepository/FileMailRepository.java?rev=999953&r1=999952&r2=999953&view=diff
==============================================================================
--- james/server/trunk/mail-file/src/main/java/org/apache/james/mailrepository/FileMailRepository.java (original)
+++ james/server/trunk/mail-file/src/main/java/org/apache/james/mailrepository/FileMailRepository.java Wed Sep 22 14:04:21 2010
@@ -26,6 +26,7 @@ import org.apache.commons.configuration.
import org.apache.commons.configuration.HierarchicalConfiguration;
import org.apache.james.core.MimeMessageCopyOnWriteProxy;
import org.apache.james.core.MimeMessageWrapper;
+import org.apache.james.mailstore.MailStore;
import org.apache.james.repository.ObjectRepository;
import org.apache.james.repository.StreamRepository;
import org.apache.mailet.Mail;
Modified: james/server/trunk/mail-file/src/test/java/org/apache/james/mailrepository/FileMailRepositoryTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mail-file/src/test/java/org/apache/james/mailrepository/FileMailRepositoryTest.java?rev=999953&r1=999952&r2=999953&view=diff
==============================================================================
--- james/server/trunk/mail-file/src/test/java/org/apache/james/mailrepository/FileMailRepositoryTest.java (original)
+++ james/server/trunk/mail-file/src/test/java/org/apache/james/mailrepository/FileMailRepositoryTest.java Wed Sep 22 14:04:21 2010
@@ -24,6 +24,7 @@ import org.apache.commons.configuration.
import org.apache.commons.logging.impl.SimpleLog;
import org.apache.james.filepair.FilePersistentObjectRepository;
import org.apache.james.filepair.FilePersistentStreamRepository;
+import org.apache.james.mailstore.MockMailStore;
import org.apache.james.services.MockFileSystem;
public class FileMailRepositoryTest extends AbstractMailRepositoryTest {
@@ -37,7 +38,7 @@ public class FileMailRepositoryTest exte
protected MailRepository getMailRepository() throws Exception {
MockFileSystem fs = new MockFileSystem();
FileMailRepository mr = new FileMailRepository();
- MockStore mockStore = new MockStore();
+ MockMailStore mockStore = new MockMailStore();
FilePersistentStreamRepository file_Persistent_Stream_Repository = new FilePersistentStreamRepository();
file_Persistent_Stream_Repository.setFileSystem(fs);
file_Persistent_Stream_Repository.setLog(new SimpleLog("MockLog"));
Modified: james/server/trunk/mail-jdbc/src/test/java/org/apache/james/mailrepository/JDBCMailRepositoryTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mail-jdbc/src/test/java/org/apache/james/mailrepository/JDBCMailRepositoryTest.java?rev=999953&r1=999952&r2=999953&view=diff
==============================================================================
--- james/server/trunk/mail-jdbc/src/test/java/org/apache/james/mailrepository/JDBCMailRepositoryTest.java (original)
+++ james/server/trunk/mail-jdbc/src/test/java/org/apache/james/mailrepository/JDBCMailRepositoryTest.java Wed Sep 22 14:04:21 2010
@@ -23,6 +23,7 @@ package org.apache.james.mailrepository;
import org.apache.commons.configuration.DefaultConfigurationBuilder;
import org.apache.commons.logging.impl.SimpleLog;
import org.apache.james.filepair.FilePersistentStreamRepository;
+import org.apache.james.mailstore.MockMailStore;
import org.apache.james.services.DataSourceSelector;
import org.apache.james.services.MockFileSystem;
import org.apache.james.test.util.Util;
@@ -41,7 +42,7 @@ public class JDBCMailRepositoryTest exte
JDBCMailRepository mr = new JDBCMailRepository();
// only used for dbfile
- MockStore mockStore = new MockStore();
+ MockMailStore mockStore = new MockMailStore();
FilePersistentStreamRepository file_Persistent_Stream_Repository = new FilePersistentStreamRepository();
file_Persistent_Stream_Repository.setFileSystem(fs);
file_Persistent_Stream_Repository.setLog(new SimpleLog("MockLog"));
Modified: james/server/trunk/mail-library/src/main/java/org/apache/james/mailrepository/AbstractMailRepository.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mail-library/src/main/java/org/apache/james/mailrepository/AbstractMailRepository.java?rev=999953&r1=999952&r2=999953&view=diff
==============================================================================
--- james/server/trunk/mail-library/src/main/java/org/apache/james/mailrepository/AbstractMailRepository.java (original)
+++ james/server/trunk/mail-library/src/main/java/org/apache/james/mailrepository/AbstractMailRepository.java Wed Sep 22 14:04:21 2010
@@ -26,6 +26,7 @@ import org.apache.commons.configuration.
import org.apache.commons.logging.Log;
import org.apache.james.lifecycle.Configurable;
import org.apache.james.lifecycle.LogEnabled;
+import org.apache.james.mailstore.MailStore;
import org.apache.james.util.Lock;
import org.apache.mailet.Mail;
Copied: james/server/trunk/mail-library/src/main/java/org/apache/james/mailstore/AbstractMailStore.java (from r999819, james/server/trunk/mail-library/src/main/java/org/apache/james/mailrepository/AbstractMailStore.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/mail-library/src/main/java/org/apache/james/mailstore/AbstractMailStore.java?p2=james/server/trunk/mail-library/src/main/java/org/apache/james/mailstore/AbstractMailStore.java&p1=james/server/trunk/mail-library/src/main/java/org/apache/james/mailrepository/AbstractMailStore.java&r1=999819&r2=999953&rev=999953&view=diff
==============================================================================
--- james/server/trunk/mail-library/src/main/java/org/apache/james/mailrepository/AbstractMailStore.java (original)
+++ james/server/trunk/mail-library/src/main/java/org/apache/james/mailstore/AbstractMailStore.java Wed Sep 22 14:04:21 2010
@@ -19,7 +19,7 @@
-package org.apache.james.mailrepository;
+package org.apache.james.mailstore;
import java.util.HashMap;
import java.util.List;
@@ -34,7 +34,7 @@ import org.apache.commons.configuration.
import org.apache.commons.logging.Log;
import org.apache.james.lifecycle.Configurable;
import org.apache.james.lifecycle.LogEnabled;
-import org.apache.james.mailrepository.MailStore;
+import org.apache.james.mailstore.MailStore;
/**
* Provides a registry of mail repositories. A mail repository is uniquely
Copied: james/server/trunk/mail-library/src/test/java/org/apache/james/mailstore/MockMailStore.java (from r999912, james/server/trunk/mail-library/src/test/java/org/apache/james/mailrepository/MockStore.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/mail-library/src/test/java/org/apache/james/mailstore/MockMailStore.java?p2=james/server/trunk/mail-library/src/test/java/org/apache/james/mailstore/MockMailStore.java&p1=james/server/trunk/mail-library/src/test/java/org/apache/james/mailrepository/MockStore.java&r1=999912&r2=999953&rev=999953&view=diff
==============================================================================
--- james/server/trunk/mail-library/src/test/java/org/apache/james/mailrepository/MockStore.java (original)
+++ james/server/trunk/mail-library/src/test/java/org/apache/james/mailstore/MockMailStore.java Wed Sep 22 14:04:21 2010
@@ -19,17 +19,17 @@
-package org.apache.james.mailrepository;
+package org.apache.james.mailstore;
import org.apache.commons.configuration.Configuration;
import org.apache.commons.configuration.ConfigurationUtils;
import org.apache.commons.configuration.HierarchicalConfiguration;
-import org.apache.james.mailrepository.MailStore;
+import org.apache.james.mailstore.MailStore;
import java.util.HashMap;
import java.util.Map;
-public class MockStore implements MailStore {
+public class MockMailStore implements MailStore {
Map m_storedObjectMap = new HashMap();
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=999953&r1=999952&r2=999953&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 Wed Sep 22 14:04:21 2010
@@ -24,7 +24,7 @@ package org.apache.james.transport.maile
import org.apache.commons.configuration.DefaultConfigurationBuilder;
import org.apache.james.lifecycle.LifecycleUtil;
import org.apache.james.mailrepository.MailRepository;
-import org.apache.james.mailrepository.MailStore;
+import org.apache.james.mailstore.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=999953&r1=999952&r2=999953&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 Wed Sep 22 14:04:21 2010
@@ -20,7 +20,7 @@
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.mailstore.MailStore;
import org.apache.james.services.SpoolRepository;
import org.apache.mailet.base.GenericMailet;
import org.apache.mailet.Mail;
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=999953&r1=999952&r2=999953&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 Wed Sep 22 14:04:21 2010
@@ -25,7 +25,7 @@ import javax.annotation.Resource;
import org.apache.commons.configuration.DefaultConfigurationBuilder;
import org.apache.james.mailrepository.MailRepository;
-import org.apache.james.mailrepository.MailStore;
+import org.apache.james.mailstore.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=999953&r1=999952&r2=999953&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 Wed Sep 22 14:04:21 2010
@@ -24,7 +24,7 @@ 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.mailstore.MailStore;
import org.apache.james.management.SpoolFilter;
import org.apache.james.management.SpoolManagementException;
import org.apache.james.management.SpoolManagementMBean;
Modified: james/server/trunk/management/src/test/java/org/apache/james/management/impl/SpoolManagementTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/management/src/test/java/org/apache/james/management/impl/SpoolManagementTest.java?rev=999953&r1=999952&r2=999953&view=diff
==============================================================================
--- james/server/trunk/management/src/test/java/org/apache/james/management/impl/SpoolManagementTest.java (original)
+++ james/server/trunk/management/src/test/java/org/apache/james/management/impl/SpoolManagementTest.java Wed Sep 22 14:04:21 2010
@@ -28,7 +28,7 @@ import javax.mail.MessagingException;
import junit.framework.TestCase;
import org.apache.james.lifecycle.LifecycleUtil;
-import org.apache.james.mailrepository.MockStore;
+import org.apache.james.mailstore.MockMailStore;
import org.apache.james.management.SpoolFilter;
import org.apache.james.management.SpoolManagementException;
import org.apache.james.test.mock.james.InMemorySpoolRepository;
@@ -45,13 +45,13 @@ public class SpoolManagementTest extends
protected static final String OUTGOING_SPOOL = "file://target/var/mail/outgoing";
private SpoolManagement m_spoolManagement;
- private MockStore m_mockStore;
+ private MockMailStore m_mockStore;
private InMemorySpoolRepository m_mockSpoolRepository;
protected void setUp() throws Exception {
m_spoolManagement = new SpoolManagement();
m_mockSpoolRepository = new InMemorySpoolRepository();
- m_mockStore = new MockStore();
+ m_mockStore = new MockMailStore();
m_mockStore.add("outgoing", m_mockSpoolRepository);
m_spoolManagement.setStore(m_mockStore);
Modified: james/server/trunk/remotemanager/src/test/java/org/apache/james/remotemanager/AbstractRemoteManagerTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager/src/test/java/org/apache/james/remotemanager/AbstractRemoteManagerTest.java?rev=999953&r1=999952&r2=999953&view=diff
==============================================================================
--- james/server/trunk/remotemanager/src/test/java/org/apache/james/remotemanager/AbstractRemoteManagerTest.java (original)
+++ james/server/trunk/remotemanager/src/test/java/org/apache/james/remotemanager/AbstractRemoteManagerTest.java Wed Sep 22 14:04:21 2010
@@ -48,7 +48,7 @@ import org.apache.james.api.user.UsersSt
import org.apache.james.api.vut.management.MockVirtualUserTableManagementService;
import org.apache.james.api.vut.management.VirtualUserTableManagementService;
import org.apache.james.lifecycle.LifecycleUtil;
-import org.apache.james.mailrepository.MockStore;
+import org.apache.james.mailstore.MockMailStore;
import org.apache.james.management.BayesianAnalyzerManagementException;
import org.apache.james.management.BayesianAnalyzerManagementService;
import org.apache.james.management.DomainListManagementException;
@@ -315,7 +315,7 @@ public abstract class AbstractRemoteMana
return null;
}
});
- serviceManager.put("mailStore", new MockStore());
+ serviceManager.put("mailStore", new MockMailStore());
serviceManager.put(ProcessorManagementService.ROLE,
new ProcessorManagementService() {
Modified: james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/AbstractSMTPServerTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/AbstractSMTPServerTest.java?rev=999953&r1=999952&r2=999953&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/AbstractSMTPServerTest.java (original)
+++ james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/AbstractSMTPServerTest.java Wed Sep 22 14:04:21 2010
@@ -46,7 +46,7 @@ import org.apache.james.services.FakeJSR
import org.apache.james.api.user.UsersRepository;
import org.apache.james.api.vut.VirtualUserTableStore;
import org.apache.james.lifecycle.LifecycleUtil;
-import org.apache.james.mailrepository.MockStore;
+import org.apache.james.mailstore.MockMailStore;
import org.apache.james.services.FileSystem;
import org.apache.james.services.MailServer;
import org.apache.james.services.MockFileSystem;
@@ -147,7 +147,7 @@ public abstract class AbstractSMTPServer
protected MockUsersRepository m_usersRepository = new MockUsersRepository();
protected FakeJSR250Loader m_serviceManager;
protected AlterableDNSServer m_dnsServer;
- protected MockStore store;
+ protected MockMailStore store;
protected MockFileSystem fileSystem;
protected SMTPServerDNSServiceAdapter dnsAdapter;
protected ProtocolHandlerChainImpl chain;
@@ -219,7 +219,7 @@ public abstract class AbstractSMTPServer
m_dnsServer = new AlterableDNSServer();
m_serviceManager.put(DNSService.ROLE, m_dnsServer);
- store = new MockStore();
+ store = new MockMailStore();
m_serviceManager.put("mailStore", store);
fileSystem = new MockFileSystem();
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=999953&r1=999952&r2=999953&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 Wed Sep 22 14:04:21 2010
@@ -24,7 +24,7 @@ package org.apache.james.transport.maile
import org.apache.commons.configuration.DefaultConfigurationBuilder;
import org.apache.james.core.MailImpl;
import org.apache.james.mailrepository.MailRepository;
-import org.apache.james.mailrepository.MailStore;
+import org.apache.james.mailstore.MailStore;
import org.apache.mailet.base.GenericMailet;
import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
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=999953&r1=999952&r2=999953&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 Wed Sep 22 14:04:21 2010
@@ -23,9 +23,9 @@ import javax.annotation.Resource;
import org.apache.commons.configuration.HierarchicalConfiguration;
import org.apache.commons.logging.Log;
-import org.apache.james.mailrepository.AbstractMailStore;
import org.apache.james.mailrepository.MailRepository;
-import org.apache.james.mailrepository.MailStore;
+import org.apache.james.mailstore.AbstractMailStore;
+import org.apache.james.mailstore.MailStore;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.BeanFactory;
import org.springframework.beans.factory.BeanFactoryAware;
@@ -36,7 +36,7 @@ import org.springframework.beans.factory
*
*
*/
-public class SpringMailStore extends AbstractMailStore implements BeanFactoryAware{
+public class SpringMailStore extends AbstractMailStore implements BeanFactoryAware {
private Registry<HierarchicalConfiguration> confRegistry;
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=999953&r1=999952&r2=999953&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 Wed Sep 22 14:04:21 2010
@@ -27,7 +27,7 @@ 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.mailstore.MailStore;
import org.apache.james.repository.ObjectRepository;
Modified: james/server/trunk/user-function/src/test/java/org/apache/james/userrepository/UsersFileRepositoryTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-function/src/test/java/org/apache/james/userrepository/UsersFileRepositoryTest.java?rev=999953&r1=999952&r2=999953&view=diff
==============================================================================
--- james/server/trunk/user-function/src/test/java/org/apache/james/userrepository/UsersFileRepositoryTest.java (original)
+++ james/server/trunk/user-function/src/test/java/org/apache/james/userrepository/UsersFileRepositoryTest.java Wed Sep 22 14:04:21 2010
@@ -34,7 +34,7 @@ import org.apache.james.api.user.UsersRe
import org.apache.james.api.vut.VirtualUserTable;
import org.apache.james.filepair.FilePersistentObjectRepository;
import org.apache.james.lifecycle.LifecycleUtil;
-import org.apache.james.mailrepository.MockStore;
+import org.apache.james.mailstore.MockMailStore;
import org.apache.james.services.FileSystem;
import org.apache.mailet.MailAddress;
@@ -68,7 +68,7 @@ public class UsersFileRepositoryTest ext
}
};
- MockStore mockStore = new MockStore();
+ MockMailStore mockStore = new MockMailStore();
FilePersistentObjectRepository filePersistentObjectRepository = new FilePersistentObjectRepository();
filePersistentObjectRepository.setFileSystem(fs);
filePersistentObjectRepository.setLog(new SimpleLog("MockLog"));
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org