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:09:10 UTC
svn commit: r999481 - in /james:
imap/trunk/file/src/main/java/org/apache/james/mailrepository/
imap/trunk/mailbox/src/main/java/org/apache/james/services/store/
imap/trunk/store/src/main/java/org/apache/james/container/spring/
imap/trunk/store/src/mai...
Author: eric
Date: Tue Sep 21 16:09:09 2010
New Revision: 999481
URL: http://svn.apache.org/viewvc?rev=999481&view=rev
Log:
Rename Store to MailStore because it goes on Mail after all, except the UsersFileRepository, to be resolved (IMAP-1048)
Added:
james/imap/trunk/mailbox/src/main/java/org/apache/james/services/store/MailStore.java
- copied, changed from r999478, james/imap/trunk/mailbox/src/main/java/org/apache/james/services/store/Store.java
Removed:
james/imap/trunk/mailbox/src/main/java/org/apache/james/services/store/Store.java
Modified:
james/imap/trunk/file/src/main/java/org/apache/james/mailrepository/FileMailRepository.java
james/imap/trunk/store/src/main/java/org/apache/james/container/spring/AbstractMailStore.java
james/imap/trunk/store/src/main/java/org/apache/james/mailrepository/AbstractMailRepository.java
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/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/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
Modified: james/imap/trunk/file/src/main/java/org/apache/james/mailrepository/FileMailRepository.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/file/src/main/java/org/apache/james/mailrepository/FileMailRepository.java?rev=999481&r1=999480&r2=999481&view=diff
==============================================================================
--- james/imap/trunk/file/src/main/java/org/apache/james/mailrepository/FileMailRepository.java (original)
+++ james/imap/trunk/file/src/main/java/org/apache/james/mailrepository/FileMailRepository.java Tue Sep 21 16:09:09 2010
@@ -28,7 +28,7 @@ import org.apache.james.core.MimeMessage
import org.apache.james.core.MimeMessageWrapper;
import org.apache.james.repository.ObjectRepository;
import org.apache.james.repository.StreamRepository;
-import org.apache.james.services.store.Store;
+import org.apache.james.services.store.MailStore;
import org.apache.mailet.Mail;
import javax.annotation.PostConstruct;
@@ -145,7 +145,7 @@ public class FileMailRepository
}
}
- private Object selectRepository(Store store, String type) throws Exception {
+ private Object selectRepository(MailStore store, String type) throws Exception {
DefaultConfigurationBuilder objectConfiguration
= new DefaultConfigurationBuilder();
Copied: james/imap/trunk/mailbox/src/main/java/org/apache/james/services/store/MailStore.java (from r999478, james/imap/trunk/mailbox/src/main/java/org/apache/james/services/store/Store.java)
URL: http://svn.apache.org/viewvc/james/imap/trunk/mailbox/src/main/java/org/apache/james/services/store/MailStore.java?p2=james/imap/trunk/mailbox/src/main/java/org/apache/james/services/store/MailStore.java&p1=james/imap/trunk/mailbox/src/main/java/org/apache/james/services/store/Store.java&r1=999478&r2=999481&rev=999481&view=diff
==============================================================================
--- james/imap/trunk/mailbox/src/main/java/org/apache/james/services/store/Store.java (original)
+++ james/imap/trunk/mailbox/src/main/java/org/apache/james/services/store/MailStore.java Tue Sep 21 16:09:09 2010
@@ -21,7 +21,7 @@ package org.apache.james.services.store;
import org.apache.commons.configuration.HierarchicalConfiguration;
-public interface Store {
+public interface MailStore {
public Object select(HierarchicalConfiguration config) throws StoreException;
Modified: james/imap/trunk/store/src/main/java/org/apache/james/container/spring/AbstractMailStore.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/store/src/main/java/org/apache/james/container/spring/AbstractMailStore.java?rev=999481&r1=999480&r2=999481&view=diff
==============================================================================
--- james/imap/trunk/store/src/main/java/org/apache/james/container/spring/AbstractMailStore.java (original)
+++ james/imap/trunk/store/src/main/java/org/apache/james/container/spring/AbstractMailStore.java Tue Sep 21 16:09:09 2010
@@ -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.services.store.Store;
+import org.apache.james.services.store.MailStore;
/**
* Provides a registry of mail repositories. A mail repository is uniquely
@@ -42,7 +42,7 @@ import org.apache.james.services.store.S
*
*/
public abstract class AbstractMailStore
- implements Store, LogEnabled, Configurable {
+ implements MailStore, LogEnabled, Configurable {
// Prefix for repository names
private static final String REPOSITORY_NAME = "Repository";
Modified: james/imap/trunk/store/src/main/java/org/apache/james/mailrepository/AbstractMailRepository.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/store/src/main/java/org/apache/james/mailrepository/AbstractMailRepository.java?rev=999481&r1=999480&r2=999481&view=diff
==============================================================================
--- james/imap/trunk/store/src/main/java/org/apache/james/mailrepository/AbstractMailRepository.java (original)
+++ james/imap/trunk/store/src/main/java/org/apache/james/mailrepository/AbstractMailRepository.java Tue Sep 21 16:09:09 2010
@@ -27,7 +27,7 @@ import org.apache.commons.logging.Log;
import org.apache.james.lifecycle.Configurable;
import org.apache.james.lifecycle.LogEnabled;
import org.apache.james.services.MailRepository;
-import org.apache.james.services.store.Store;
+import org.apache.james.services.store.MailStore;
import org.apache.james.util.Lock;
import org.apache.mailet.Mail;
@@ -54,7 +54,7 @@ public abstract class AbstractMailReposi
*/
private final Lock lock = new Lock();;
- protected Store store; // variable is not used beyond initialization
+ protected MailStore store; // variable is not used beyond initialization
private Log logger;
@@ -77,7 +77,7 @@ public abstract class AbstractMailReposi
* @param store the Store
*/
@Resource(name="mailstore")
- public void setStore(Store store) {
+ public void setStore(MailStore store) {
this.store = store;
}
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=999481&r1=999480&r2=999481&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:09:09 2010
@@ -27,7 +27,7 @@ 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.Store;
+import org.apache.james.services.store.MailStore;
import org.apache.mailet.Mail;
import javax.annotation.PostConstruct;
@@ -59,7 +59,7 @@ public class MailStoreSpoolRepository im
/**
* The providing mailStore
*/
- private Store mailStore;
+ private MailStore mailStore;
/**
* The repository configuration
@@ -78,7 +78,7 @@ public class MailStoreSpoolRepository im
}
@Resource(name="mailstore")
- public void setStore(Store store) {
+ public void setStore(MailStore store) {
mailStore = store;
}
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=999481&r1=999480&r2=999481&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:09:09 2010
@@ -24,12 +24,12 @@ 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.Store;
+import org.apache.james.services.store.MailStore;
import java.util.HashMap;
import java.util.Map;
-public class MockStore implements Store {
+public class MockStore 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=999481&r1=999480&r2=999481&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:09:09 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.services.MailRepository;
-import org.apache.james.services.store.Store;
+import org.apache.james.services.store.MailStore;
import org.apache.mailet.base.GenericMailet;
import org.apache.mailet.Mail;
@@ -66,10 +66,10 @@ public class FromRepository extends Gene
*/
private String processor;
- private Store mailStore;
+ private MailStore mailStore;
@Resource(name="mailstore")
- public void setStore(Store mailStore) {
+ public void setStore(MailStore mailStore) {
this.mailStore = mailStore;
}
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=999481&r1=999480&r2=999481&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:09:09 2010
@@ -21,7 +21,7 @@ package org.apache.james.transport.maile
import org.apache.commons.configuration.DefaultConfigurationBuilder;
import org.apache.james.lifecycle.LifecycleUtil;
import org.apache.james.services.SpoolRepository;
-import org.apache.james.services.store.Store;
+import org.apache.james.services.store.MailStore;
import org.apache.mailet.base.GenericMailet;
import org.apache.mailet.Mail;
import org.apache.mailet.MailetContext;
@@ -230,11 +230,11 @@ public class Retry extends GenericMailet
// Path of the retry repository
private String workRepositoryPath = null;
- private Store mailStore;
+ private MailStore mailStore;
@Resource(name="mailstore")
- public void setStore(Store mailStore) {
+ public void setStore(MailStore mailStore) {
this.mailStore = mailStore;
}
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=999481&r1=999480&r2=999481&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:09:09 2010
@@ -25,7 +25,7 @@ import javax.annotation.Resource;
import org.apache.commons.configuration.DefaultConfigurationBuilder;
import org.apache.james.services.MailRepository;
-import org.apache.james.services.store.Store;
+import org.apache.james.services.store.MailStore;
import org.apache.mailet.base.GenericMailet;
import org.apache.mailet.Mail;
@@ -55,11 +55,11 @@ public class ToRepository extends Generi
*/
private String repositoryPath;
- private Store mailStore;
+ private MailStore mailStore;
@Resource(name="mailstore")
- public void setStore(Store mailStore) {
+ public void setStore(MailStore mailStore) {
this.mailStore = mailStore;
}
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=999481&r1=999480&r2=999481&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:09:09 2010
@@ -29,7 +29,7 @@ import org.apache.james.management.Spool
import org.apache.james.management.SpoolManagementMBean;
import org.apache.james.management.SpoolManagementService;
import org.apache.james.services.SpoolRepository;
-import org.apache.james.services.store.Store;
+import org.apache.james.services.store.MailStore;
import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
import org.apache.oro.text.regex.Pattern;
@@ -50,7 +50,7 @@ import java.util.List;
*/
public class SpoolManagement implements SpoolManagementService, SpoolManagementMBean {
- private Store mailStore;
+ private MailStore mailStore;
/**
* Set the Store
@@ -58,7 +58,7 @@ public class SpoolManagement implements
* @param mailStore the store
*/
@Resource(name="mailstore")
- public void setStore(Store mailStore) {
+ public void setStore(MailStore mailStore) {
this.mailStore = mailStore;
}
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=999481&r1=999480&r2=999481&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:09:09 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.services.MailRepository;
-import org.apache.james.services.store.Store;
+import org.apache.james.services.store.MailStore;
import org.apache.mailet.base.GenericMailet;
import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
@@ -76,7 +76,7 @@ public class ToMultiRepository extends G
/**
* The mailstore
*/
- private Store store;
+ private MailStore store;
/**
* The optional repositoryUrl
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=999481&r1=999480&r2=999481&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:09:09 2010
@@ -24,14 +24,14 @@ 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.Store;
+import org.apache.james.services.store.MailStore;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.BeanFactory;
import org.springframework.beans.factory.BeanFactoryAware;
import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
/**
- * {@link Store} implementation which load {@link MailRepository} implementation on demand
+ * {@link MailStore} implementation which load {@link MailRepository} implementation on demand
*
*
*/
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=999481&r1=999480&r2=999481&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:09:09 2010
@@ -28,7 +28,7 @@ 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.repository.ObjectRepository;
-import org.apache.james.services.store.Store;
+import org.apache.james.services.store.MailStore;
import java.util.Iterator;
@@ -57,7 +57,7 @@ public class UsersFileRepository
*/
protected static boolean DEEP_DEBUG = false;
- private Store store;
+ private MailStore store;
private ObjectRepository objectRepository;
private static String urlSeparator = "/";
@@ -72,7 +72,7 @@ public class UsersFileRepository
* @param store the Store
*/
@Resource(name="mailstore")
- public void setStore(Store store) {
+ public void setStore(MailStore store) {
this.store = store;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org