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 bt...@apache.org on 2018/02/01 02:41:27 UTC
james-project git commit: JAMES-2291 Use CassandraRepository in
default docker configuration
Repository: james-project
Updated Branches:
refs/heads/master 6aa2607e8 -> 4ecc84d89
JAMES-2291 Use CassandraRepository in default docker configuration
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/4ecc84d8
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/4ecc84d8
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/4ecc84d8
Branch: refs/heads/master
Commit: 4ecc84d8919ad4963391838a6fcf18917f6c59e5
Parents: 6aa2607
Author: Antoine Duprat <ad...@linagora.com>
Authored: Fri Jan 26 14:39:06 2018 +0100
Committer: benwa <bt...@linagora.com>
Committed: Thu Feb 1 09:40:36 2018 +0700
----------------------------------------------------------------------
.../cassandra-ldap/destination/conf/mailetcontainer.xml | 8 ++++----
.../cassandra-ldap/destination/conf/mailrepositorystore.xml | 9 ---------
.../guice/cassandra/destination/conf/mailetcontainer.xml | 8 ++++----
.../cassandra/destination/conf/mailrepositorystore.xml | 9 ---------
4 files changed, 8 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/4ecc84d8/dockerfiles/run/guice/cassandra-ldap/destination/conf/mailetcontainer.xml
----------------------------------------------------------------------
diff --git a/dockerfiles/run/guice/cassandra-ldap/destination/conf/mailetcontainer.xml b/dockerfiles/run/guice/cassandra-ldap/destination/conf/mailetcontainer.xml
index 9d56af4..0827807 100644
--- a/dockerfiles/run/guice/cassandra-ldap/destination/conf/mailetcontainer.xml
+++ b/dockerfiles/run/guice/cassandra-ldap/destination/conf/mailetcontainer.xml
@@ -44,7 +44,7 @@
</mailet>
<mailet match="All" class="Bounce"/>
<mailet match="All" class="ToRepository">
- <repositoryPath>file://var/mail/error/</repositoryPath>
+ <repositoryPath>cassandra://var/mail/error/</repositoryPath>
</mailet>
</processor>
@@ -108,7 +108,7 @@
<metricName>mailetContainerSpam</metricName>
</mailet>
<mailet match="All" class="ToRepository">
- <repositoryPath>file://var/mail/spam/</repositoryPath>
+ <repositoryPath>cassandra://var/mail/spam/</repositoryPath>
</mailet>
</processor>
@@ -120,7 +120,7 @@
<attachment>none</attachment>
</mailet>
<mailet match="All" class="ToRepository">
- <repositoryPath>file://var/mail/address-error/</repositoryPath>
+ <repositoryPath>cassandra://var/mail/address-error/</repositoryPath>
</mailet>
</processor>
@@ -132,7 +132,7 @@
<attachment>none</attachment>
</mailet>
<mailet match="All" class="ToRepository">
- <repositoryPath>file://var/mail/relay-denied/</repositoryPath>
+ <repositoryPath>cassandra://var/mail/relay-denied/</repositoryPath>
<notice>Warning: You are sending an e-mail to a remote server. You must be authenticated to perform such an operation</notice>
</mailet>
</processor>
http://git-wip-us.apache.org/repos/asf/james-project/blob/4ecc84d8/dockerfiles/run/guice/cassandra-ldap/destination/conf/mailrepositorystore.xml
----------------------------------------------------------------------
diff --git a/dockerfiles/run/guice/cassandra-ldap/destination/conf/mailrepositorystore.xml b/dockerfiles/run/guice/cassandra-ldap/destination/conf/mailrepositorystore.xml
index 299bd53..626e0a2 100644
--- a/dockerfiles/run/guice/cassandra-ldap/destination/conf/mailrepositorystore.xml
+++ b/dockerfiles/run/guice/cassandra-ldap/destination/conf/mailrepositorystore.xml
@@ -21,15 +21,6 @@
<mailrepositorystore>
<mailrepositories>
- <!-- File based repositories. These repositories store all message data -->
- <!-- in the file system. -->
- <mailrepository class="org.apache.james.mailrepository.file.FileMailRepository">
- <protocols>
- <protocol>file</protocol>
- </protocols>
- <!-- Set if the messages should be listed sorted. False by default -->
- <config FIFO="false" CACHEKEYS="true"/>
- </mailrepository>
<mailrepository class="org.apache.james.mailrepository.cassandra.CassandraMailRepository">
<protocols>
<protocol>cassandra</protocol>
http://git-wip-us.apache.org/repos/asf/james-project/blob/4ecc84d8/dockerfiles/run/guice/cassandra/destination/conf/mailetcontainer.xml
----------------------------------------------------------------------
diff --git a/dockerfiles/run/guice/cassandra/destination/conf/mailetcontainer.xml b/dockerfiles/run/guice/cassandra/destination/conf/mailetcontainer.xml
index 2a3d9b0..f0b6a79 100644
--- a/dockerfiles/run/guice/cassandra/destination/conf/mailetcontainer.xml
+++ b/dockerfiles/run/guice/cassandra/destination/conf/mailetcontainer.xml
@@ -44,7 +44,7 @@
</mailet>
<mailet match="All" class="Bounce"/>
<mailet match="All" class="ToRepository">
- <repositoryPath>file://var/mail/error/</repositoryPath>
+ <repositoryPath>cassandra://var/mail/error/</repositoryPath>
</mailet>
</processor>
@@ -111,7 +111,7 @@
<metricName>mailetContainerSpam</metricName>
</mailet>
<mailet match="All" class="ToRepository">
- <repositoryPath>file://var/mail/spam/</repositoryPath>
+ <repositoryPath>cassandra://var/mail/spam/</repositoryPath>
</mailet>
</processor>
@@ -123,7 +123,7 @@
<attachment>none</attachment>
</mailet>
<mailet match="All" class="ToRepository">
- <repositoryPath>file://var/mail/address-error/</repositoryPath>
+ <repositoryPath>cassandra://var/mail/address-error/</repositoryPath>
</mailet>
</processor>
@@ -135,7 +135,7 @@
<attachment>none</attachment>
</mailet>
<mailet match="All" class="ToRepository">
- <repositoryPath>file://var/mail/relay-denied/</repositoryPath>
+ <repositoryPath>cassandra://var/mail/relay-denied/</repositoryPath>
<notice>Warning: You are sending an e-mail to a remote server. You must be authenticated to perform such an operation</notice>
</mailet>
</processor>
http://git-wip-us.apache.org/repos/asf/james-project/blob/4ecc84d8/dockerfiles/run/guice/cassandra/destination/conf/mailrepositorystore.xml
----------------------------------------------------------------------
diff --git a/dockerfiles/run/guice/cassandra/destination/conf/mailrepositorystore.xml b/dockerfiles/run/guice/cassandra/destination/conf/mailrepositorystore.xml
index 299bd53..626e0a2 100644
--- a/dockerfiles/run/guice/cassandra/destination/conf/mailrepositorystore.xml
+++ b/dockerfiles/run/guice/cassandra/destination/conf/mailrepositorystore.xml
@@ -21,15 +21,6 @@
<mailrepositorystore>
<mailrepositories>
- <!-- File based repositories. These repositories store all message data -->
- <!-- in the file system. -->
- <mailrepository class="org.apache.james.mailrepository.file.FileMailRepository">
- <protocols>
- <protocol>file</protocol>
- </protocols>
- <!-- Set if the messages should be listed sorted. False by default -->
- <config FIFO="false" CACHEKEYS="true"/>
- </mailrepository>
<mailrepository class="org.apache.james.mailrepository.cassandra.CassandraMailRepository">
<protocols>
<protocol>cassandra</protocol>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org