This is an automated email from the ASF dual-hosted git repository.
btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 5ab9e9157118e2fbcd29a1e5d2fa7f7a8b79975d
Author: Rémi Kowalski <rkowal...@linagora.com>
AuthorDate: Tue Jul 2 10:35:27 2019 +0200
JAMES-2726 remove file mail repositories from cassandra projects
---
.../cassandra-ldap-guice/src/test/resources/mailetcontainer.xml | 6 +++---
.../cassandra-ldap-guice/src/test/resources/mailrepositorystore.xml | 5 ++---
.../cassandra-rabbitmq-guice/src/test/resources/mailetcontainer.xml | 6 +++---
.../src/test/resources/mailrepositorystore.xml | 6 ------
.../src/test/resources/mailetcontainer.xml | 6 +++---
.../src/test/resources/mailrepositorystore.xml | 5 ++---
.../src/test/resources/mailrepositorystore.xml | 6 ------
7 files changed, 13 insertions(+), 27 deletions(-)
diff --git
a/server/container/guice/cassandra-ldap-guice/src/test/resources/mailetcontainer.xml
b/server/container/guice/cassandra-ldap-guice/src/test/resources/mailetcontainer.xml
index 69d03e2..8e253fd 100644
---
a/server/container/guice/cassandra-ldap-guice/src/test/resources/mailetcontainer.xml
+++
b/server/container/guice/cassandra-ldap-guice/src/test/resources/mailetcontainer.xml
@@ -41,7 +41,7 @@
<processor state="error" enableJmx="false">
<mailet match="All" class="Bounce"/>
<mailet match="All" class="ToRepository">
- <repositoryPath>file://var/mail/error/</repositoryPath>
+ <repositoryPath>cassandra://var/mail/error/</repositoryPath>
</mailet>
</processor>
@@ -84,7 +84,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>
@@ -93,7 +93,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 authentified to perform such an operation</notice>
</mailet>
</processor>
diff --git
a/server/container/guice/cassandra-ldap-guice/src/test/resources/mailrepositorystore.xml
b/server/container/guice/cassandra-ldap-guice/src/test/resources/mailrepositorystore.xml
index 3ca4a1d..626e0a2 100644
---
a/server/container/guice/cassandra-ldap-guice/src/test/resources/mailrepositorystore.xml
+++
b/server/container/guice/cassandra-ldap-guice/src/test/resources/mailrepositorystore.xml
@@ -21,11 +21,10 @@
<mailrepositorystore>
<mailrepositories>
- <mailrepository
class="org.apache.james.mailrepository.file.FileMailRepository">
+ <mailrepository
class="org.apache.james.mailrepository.cassandra.CassandraMailRepository">
<protocols>
- <protocol>file</protocol>
+ <protocol>cassandra</protocol>
</protocols>
- <config FIFO="false" CACHEKEYS="true"/>
</mailrepository>
</mailrepositories>
</mailrepositorystore>
diff --git
a/server/container/guice/cassandra-rabbitmq-guice/src/test/resources/mailetcontainer.xml
b/server/container/guice/cassandra-rabbitmq-guice/src/test/resources/mailetcontainer.xml
index d75ebb1..dcff654 100644
---
a/server/container/guice/cassandra-rabbitmq-guice/src/test/resources/mailetcontainer.xml
+++
b/server/container/guice/cassandra-rabbitmq-guice/src/test/resources/mailetcontainer.xml
@@ -41,7 +41,7 @@
<processor state="error" enableJmx="false">
<mailet match="All" class="Bounce"/>
<mailet match="All" class="ToRepository">
- <repositoryPath>file://var/mail/error/</repositoryPath>
+ <repositoryPath>cassandra://var/mail/error/</repositoryPath>
</mailet>
</processor>
@@ -92,7 +92,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>
@@ -101,7 +101,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 authentified to perform such an operation</notice>
</mailet>
</processor>
diff --git
a/server/container/guice/cassandra-rabbitmq-guice/src/test/resources/mailrepositorystore.xml
b/server/container/guice/cassandra-rabbitmq-guice/src/test/resources/mailrepositorystore.xml
index 3386c33..626e0a2 100644
---
a/server/container/guice/cassandra-rabbitmq-guice/src/test/resources/mailrepositorystore.xml
+++
b/server/container/guice/cassandra-rabbitmq-guice/src/test/resources/mailrepositorystore.xml
@@ -21,12 +21,6 @@
<mailrepositorystore>
<mailrepositories>
- <mailrepository
class="org.apache.james.mailrepository.file.FileMailRepository">
- <protocols>
- <protocol>file</protocol>
- </protocols>
- <config FIFO="false" CACHEKEYS="true"/>
- </mailrepository>
<mailrepository
class="org.apache.james.mailrepository.cassandra.CassandraMailRepository">
<protocols>
<protocol>cassandra</protocol>
diff --git
a/server/container/guice/cassandra-rabbitmq-ldap-guice/src/test/resources/mailetcontainer.xml
b/server/container/guice/cassandra-rabbitmq-ldap-guice/src/test/resources/mailetcontainer.xml
index 69d03e2..8e253fd 100644
---
a/server/container/guice/cassandra-rabbitmq-ldap-guice/src/test/resources/mailetcontainer.xml
+++
b/server/container/guice/cassandra-rabbitmq-ldap-guice/src/test/resources/mailetcontainer.xml
@@ -41,7 +41,7 @@
<processor state="error" enableJmx="false">
<mailet match="All" class="Bounce"/>
<mailet match="All" class="ToRepository">
- <repositoryPath>file://var/mail/error/</repositoryPath>
+ <repositoryPath>cassandra://var/mail/error/</repositoryPath>
</mailet>
</processor>
@@ -84,7 +84,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>
@@ -93,7 +93,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 authentified to perform such an operation</notice>
</mailet>
</processor>
diff --git
a/server/container/guice/cassandra-rabbitmq-ldap-guice/src/test/resources/mailrepositorystore.xml
b/server/container/guice/cassandra-rabbitmq-ldap-guice/src/test/resources/mailrepositorystore.xml
index 3ca4a1d..626e0a2 100644
---
a/server/container/guice/cassandra-rabbitmq-ldap-guice/src/test/resources/mailrepositorystore.xml
+++
b/server/container/guice/cassandra-rabbitmq-ldap-guice/src/test/resources/mailrepositorystore.xml
@@ -21,11 +21,10 @@
<mailrepositorystore>
<mailrepositories>
- <mailrepository
class="org.apache.james.mailrepository.file.FileMailRepository">
+ <mailrepository
class="org.apache.james.mailrepository.cassandra.CassandraMailRepository">
<protocols>
- <protocol>file</protocol>
+ <protocol>cassandra</protocol>
</protocols>
- <config FIFO="false" CACHEKEYS="true"/>
</mailrepository>
</mailrepositories>
</mailrepositorystore>
diff --git
a/server/protocols/jmap-draft-integration-testing/cassandra-jmap-draft-integration-testing/src/test/resources/mailrepositorystore.xml
b/server/protocols/jmap-draft-integration-testing/cassandra-jmap-draft-integration-testing/src/test/resources/mailrepositorystore.xml
index 3386c33..626e0a2 100644
---
a/server/protocols/jmap-draft-integration-testing/cassandra-jmap-draft-integration-testing/src/test/resources/mailrepositorystore.xml
+++
b/server/protocols/jmap-draft-integration-testing/cassandra-jmap-draft-integration-testing/src/test/resources/mailrepositorystore.xml
@@ -21,12 +21,6 @@
<mailrepositorystore>
<mailrepositories>
- <mailrepository
class="org.apache.james.mailrepository.file.FileMailRepository">
- <protocols>
- <protocol>file</protocol>
- </protocols>
- <config FIFO="false" CACHEKEYS="true"/>
- </mailrepository>
<mailrepository
class="org.apache.james.mailrepository.cassandra.CassandraMailRepository">
<protocols>
<protocol>cassandra</protocol>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
