Author: norman
Date: Sat Dec 18 10:33:37 2010
New Revision: 1050609
URL: http://svn.apache.org/viewvc?rev=1050609&view=rev
Log:
rename mailstore to mailrepositorystore
Added:
james/server/trunk/container-spring/src/main/config/examples/mailrepositorystore.xml
- copied, changed from r1050464,
james/server/trunk/container-spring/src/main/config/examples/mailstore.xml
james/server/trunk/container-spring/src/main/config/james/mailrepositorystore.xml
- copied, changed from r1050601,
james/server/trunk/container-spring/src/main/config/james/mailstore.xml
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/BeanFactoryMailRepositoryStore.java
- copied, changed from r1050608,
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/BeanFactoryMailStore.java
james/server/trunk/mail-api/src/main/java/org/apache/james/mailrepository/api/MailRepositoryStore.java
- copied, changed from r1050608,
james/server/trunk/mail-api/src/main/java/org/apache/james/mailstore/api/MailStore.java
james/server/trunk/mail-library/src/test/java/org/apache/james/mailrepository/mock/
james/server/trunk/mail-library/src/test/java/org/apache/james/mailrepository/mock/MockMailRepositoryStore.java
- copied, changed from r1050608,
james/server/trunk/mail-library/src/test/java/org/apache/james/mailstore/mock/MockMailStore.java
Removed:
james/server/trunk/container-spring/src/main/config/examples/mailstore.xml
james/server/trunk/container-spring/src/main/config/james/mailstore.xml
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/BeanFactoryMailStore.java
james/server/trunk/mail-api/src/main/java/org/apache/james/mailstore/api/MailStore.java
james/server/trunk/mail-library/src/test/java/org/apache/james/mailstore/mock/MockMailStore.java
Modified:
james/server/trunk/container-spring/src/main/config/james/context/james-server-context.xml
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/ToRepository.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
Copied:
james/server/trunk/container-spring/src/main/config/examples/mailrepositorystore.xml
(from r1050464,
james/server/trunk/container-spring/src/main/config/examples/mailstore.xml)
URL:
http://svn.apache.org/viewvc/james/server/trunk/container-spring/src/main/config/examples/mailrepositorystore.xml?p2=james/server/trunk/container-spring/src/main/config/examples/mailrepositorystore.xml&p1=james/server/trunk/container-spring/src/main/config/examples/mailstore.xml&r1=1050464&r2=1050609&rev=1050609&view=diff
==============================================================================
--- james/server/trunk/container-spring/src/main/config/examples/mailstore.xml
(original)
+++
james/server/trunk/container-spring/src/main/config/examples/mailrepositorystore.xml
Sat Dec 18 10:33:37 2010
@@ -18,7 +18,7 @@
under the License.
-->
<!-- The Mailstore block -->
-<mailstore>
+<<mailrepositorystore>
<repositories>
<!-- File based repositories. These repositories store all message data
-->
<!-- in the file system. -->
@@ -26,9 +26,6 @@
<protocols>
<protocol>file</protocol>
</protocols>
-<types>
-<type>MAIL</type>
-</types>
<!-- Set if the messages should be listed sorted. False by default
-->
<config FIFO="false" CACHEKEYS="true"/>
</repository>
@@ -39,9 +36,6 @@
<protocols>
<protocol>db</protocol>
</protocols>
-<types>
-<type>MAIL</type>
-</types>
<config>
<sqlFile>file://conf/sqlResources.xml</sqlFile>
<!-- Set the size threshold for in memory handling of storing
operations -->
@@ -59,9 +53,6 @@
<protocols>
<protocol>dbfile</protocol>
</protocols>
-<types>
-<type>MAIL</type>
-</types>
<config>
<sqlFile>file://conf/sqlResources.xml</sqlFile>
<filestore>file://var/dbmail</filestore>
@@ -73,9 +64,6 @@
<protocols>
<protocol>mbox</protocol>
</protocols>
-<types>
-<type>MAIL</type>
-</types>
<!-- Set if the messages should be listed sorted. False by default
-->
<config FIFO="false"/>
</repository>
@@ -87,9 +75,6 @@
<protocols>
<protocol>jcr</protocol>
</protocols>
-<types>
-<type>MAIL</type>
-</types>
<config>
<repository>//localhost/jackrabbit.repository</repository>
<username>admin</username>
@@ -99,4 +84,4 @@
</repository>
-->
</repositories>
-</mailstore>
\ No newline at end of file
+</mailrepositorystore>
\ No newline at end of file
Modified:
james/server/trunk/container-spring/src/main/config/james/context/james-server-context.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/container-spring/src/main/config/james/context/james-server-context.xml?rev=1050609&r1=1050608&r2=1050609&view=diff
==============================================================================
---
james/server/trunk/container-spring/src/main/config/james/context/james-server-context.xml
(original)
+++
james/server/trunk/container-spring/src/main/config/james/context/james-server-context.xml
Sat Dec 18 10:33:37 2010
@@ -242,7 +242,7 @@
<!--
MailStore
-->
-<bean id="mailstore"
class="org.apache.james.container.spring.BeanFactoryMailStore" />
+<bean id="mailrepositorystore"
class="org.apache.james.container.spring.BeanFactoryMailRepositoryStore" />
<!--
Mailbox
Copied:
james/server/trunk/container-spring/src/main/config/james/mailrepositorystore.xml
(from r1050601,
james/server/trunk/container-spring/src/main/config/james/mailstore.xml)
URL:
http://svn.apache.org/viewvc/james/server/trunk/container-spring/src/main/config/james/mailrepositorystore.xml?p2=james/server/trunk/container-spring/src/main/config/james/mailrepositorystore.xml&p1=james/server/trunk/container-spring/src/main/config/james/mailstore.xml&r1=1050601&r2=1050609&rev=1050609&view=diff
==============================================================================
--- james/server/trunk/container-spring/src/main/config/james/mailstore.xml
(original)
+++
james/server/trunk/container-spring/src/main/config/james/mailrepositorystore.xml
Sat Dec 18 10:33:37 2010
@@ -20,7 +20,7 @@
<!-- See http://james.apache.org/server/3/config.html for usage -->
-<mailstore>
+<mailrepositorystore>
<repositories>
<repository
class="org.apache.james.mailrepository.file.FileMailRepository">
<config FIFO="false" CACHEKEYS="true"/>
@@ -53,4 +53,4 @@
<config FIFO="false"/>
</repository>
</repositories>
-</mailstore>
+</mailrepositorystore>
Copied:
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/BeanFactoryMailRepositoryStore.java
(from r1050608,
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/BeanFactoryMailStore.java)
URL:
http://svn.apache.org/viewvc/james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/BeanFactoryMailRepositoryStore.java?p2=james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/BeanFactoryMailRepositoryStore.java&p1=james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/BeanFactoryMailStore.java&r1=1050608&r2=1050609&rev=1050609&view=diff
==============================================================================
---
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/BeanFactoryMailStore.java
(original)
+++
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/BeanFactoryMailRepositoryStore.java
Sat Dec 18 10:33:37 2010
@@ -37,7 +37,7 @@ import org.apache.commons.logging.Log;
import org.apache.james.lifecycle.api.Configurable;
import org.apache.james.lifecycle.api.LogEnabled;
import org.apache.james.mailrepository.api.MailRepository;
-import org.apache.james.mailstore.api.MailStore;
+import org.apache.james.mailrepository.api.MailRepositoryStore;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.BeanFactory;
import org.springframework.beans.factory.BeanFactoryAware;
@@ -48,7 +48,7 @@ import org.springframework.beans.factory
* identified by its destinationURL, type and model.
*
*/
-public class BeanFactoryMailStore implements MailStore, LogEnabled,
Configurable, BeanFactoryAware {
+public class BeanFactoryMailRepositoryStore implements MailRepositoryStore,
LogEnabled, Configurable, BeanFactoryAware {
// map of [destinationURL + type]->Repository
Copied:
james/server/trunk/mail-api/src/main/java/org/apache/james/mailrepository/api/MailRepositoryStore.java
(from r1050608,
james/server/trunk/mail-api/src/main/java/org/apache/james/mailstore/api/MailStore.java)
URL:
http://svn.apache.org/viewvc/james/server/trunk/mail-api/src/main/java/org/apache/james/mailrepository/api/MailRepositoryStore.java?p2=james/server/trunk/mail-api/src/main/java/org/apache/james/mailrepository/api/MailRepositoryStore.java&p1=james/server/trunk/mail-api/src/main/java/org/apache/james/mailstore/api/MailStore.java&r1=1050608&r2=1050609&rev=1050609&view=diff
==============================================================================
---
james/server/trunk/mail-api/src/main/java/org/apache/james/mailstore/api/MailStore.java
(original)
+++
james/server/trunk/mail-api/src/main/java/org/apache/james/mailrepository/api/MailRepositoryStore.java
Sat Dec 18 10:33:37 2010
@@ -17,13 +17,12 @@
* under the License. *
****************************************************************/
-package org.apache.james.mailstore.api;
+package org.apache.james.mailrepository.api;
import java.util.List;
-import org.apache.james.mailrepository.api.MailRepository;
-public interface MailStore {
+public interface MailRepositoryStore {
public MailRepository select(String url) throws StoreException;
Copied:
james/server/trunk/mail-library/src/test/java/org/apache/james/mailrepository/mock/MockMailRepositoryStore.java
(from r1050608,
james/server/trunk/mail-library/src/test/java/org/apache/james/mailstore/mock/MockMailStore.java)
URL:
http://svn.apache.org/viewvc/james/server/trunk/mail-library/src/test/java/org/apache/james/mailrepository/mock/MockMailRepositoryStore.java?p2=james/server/trunk/mail-library/src/test/java/org/apache/james/mailrepository/mock/MockMailRepositoryStore.java&p1=james/server/trunk/mail-library/src/test/java/org/apache/james/mailstore/mock/MockMailStore.java&r1=1050608&r2=1050609&rev=1050609&view=diff
==============================================================================
---
james/server/trunk/mail-library/src/test/java/org/apache/james/mailstore/mock/MockMailStore.java
(original)
+++
james/server/trunk/mail-library/src/test/java/org/apache/james/mailrepository/mock/MockMailRepositoryStore.java
Sat Dec 18 10:33:37 2010
@@ -19,7 +19,7 @@
-package org.apache.james.mailstore.mock;
+package org.apache.james.mailrepository.mock;
import java.util.ArrayList;
import java.util.HashMap;
@@ -27,9 +27,9 @@ import java.util.List;
import java.util.Map;
import org.apache.james.mailrepository.api.MailRepository;
-import org.apache.james.mailstore.api.MailStore;
+import org.apache.james.mailrepository.api.MailRepositoryStore;
-public class MockMailStore implements MailStore {
+public class MockMailRepositoryStore implements MailRepositoryStore {
Map<String,MailRepository> m_storedObjectMap = new
HashMap<String,MailRepository>();
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=1050609&r1=1050608&r2=1050609&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
Sat Dec 18 10:33:37 2010
@@ -23,7 +23,7 @@ package org.apache.james.transport.maile
import org.apache.james.lifecycle.api.LifecycleUtil;
import org.apache.james.mailrepository.api.MailRepository;
-import org.apache.james.mailstore.api.MailStore;
+import org.apache.james.mailrepository.api.MailRepositoryStore;
import org.apache.mailet.base.GenericMailet;
import org.apache.mailet.Mail;
@@ -65,10 +65,10 @@ public class FromRepository extends Gene
*/
private String processor;
- private MailStore mailStore;
+ private MailRepositoryStore mailStore;
- @Resource(name="mailstore")
- public void setStore(MailStore mailStore) {
+ @Resource(name="mailrepositorystore")
+ public void setStore(MailRepositoryStore 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=1050609&r1=1050608&r2=1050609&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
Sat Dec 18 10:33:37 2010
@@ -25,7 +25,7 @@ import javax.annotation.Resource;
import javax.mail.MessagingException;
import org.apache.james.mailrepository.api.MailRepository;
-import org.apache.james.mailstore.api.MailStore;
+import org.apache.james.mailrepository.api.MailRepositoryStore;
import org.apache.mailet.base.GenericMailet;
import org.apache.mailet.Mail;
@@ -55,11 +55,11 @@ public class ToRepository extends Generi
*/
private String repositoryPath;
- private MailStore mailStore;
+ private MailRepositoryStore mailStore;
- @Resource(name="mailstore")
- public void setStore(MailStore mailStore) {
+ @Resource(name="mailrepositorystore")
+ public void setStore(MailRepositoryStore mailStore) {
this.mailStore = mailStore;
}
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=1050609&r1=1050608&r2=1050609&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
Sat Dec 18 10:33:37 2010
@@ -42,7 +42,7 @@ import org.apache.james.dnsservice.api.D
import org.apache.james.dnsservice.api.mock.MockDNSService;
import org.apache.james.domainlist.api.DomainList;
import org.apache.james.domainlist.api.mock.SimpleDomainList;
-import org.apache.james.mailstore.mock.MockMailStore;
+import org.apache.james.mailrepository.mock.MockMailRepositoryStore;
import org.apache.james.user.lib.mock.MockUsersRepository;
import org.apache.james.util.InternetPrintWriter;
import org.apache.james.util.TestUtil;
@@ -177,7 +177,7 @@ public abstract class AbstractRemoteMana
serviceManager.put("domainlist", xml);
- serviceManager.put("mailStore", new MockMailStore());
+ serviceManager.put("mailStore", new MockMailRepositoryStore());
}
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=1050609&r1=1050608&r2=1050609&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
Sat Dec 18 10:33:37 2010
@@ -49,7 +49,7 @@ import org.apache.james.server.mock.Mock
import org.apache.james.server.mock.MockProtocolHandlerChain;
import org.apache.james.dnsservice.api.DNSService;
import org.apache.james.domainlist.api.mock.SimpleDomainList;
-import org.apache.james.mailstore.mock.MockMailStore;
+import org.apache.james.mailrepository.mock.MockMailRepositoryStore;
import org.apache.james.user.lib.mock.MockUsersRepository;
import org.apache.james.util.codec.Base64;
import org.apache.james.vut.api.VirtualUserTable;
@@ -143,7 +143,7 @@ public abstract class AbstractSMTPServer
protected MockUsersRepository m_usersRepository = new
MockUsersRepository();
protected MockJSR250Loader m_serviceManager;
protected AlterableDNSServer m_dnsServer;
- protected MockMailStore store;
+ protected MockMailRepositoryStore store;
protected MockFileSystem fileSystem;
protected SMTPServerDNSServiceAdapter dnsAdapter;
protected MockProtocolHandlerChain chain;
@@ -216,7 +216,7 @@ public abstract class AbstractSMTPServer
m_dnsServer = new AlterableDNSServer();
m_serviceManager.put("dnsservice", m_dnsServer);
- store = new MockMailStore();
+ store = new MockMailRepositoryStore();
m_serviceManager.put("mailStore", store);
fileSystem = new MockFileSystem();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
