You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@james.apache.org by bt...@apache.org on 2021/04/21 02:06:58 UTC
[james-project] branch master updated (6c221a7 -> 54a8d22)
This is an automated email from the ASF dual-hosted git repository.
btellier pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git.
from 6c221a7 JAMES-3255 ConsistencyTasksIntegrationTest::shouldRecomputeMailboxCounters
new 8c6d5e8 JAMES-3565 Documentation: remove swift mentions
new 54a8d22 JAMES-3565 Documentation: fix packaging support matrix
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
...tmq-swift.md => guice-cassandra-rabbitmq-s3.md} | 14 +--------
src/site/site.xml | 2 +-
src/site/xdoc/server/packaging.xml | 34 +++++++++++++---------
3 files changed, 23 insertions(+), 27 deletions(-)
rename src/site/markdown/server/install/{guice-cassandra-rabbitmq-swift.md => guice-cassandra-rabbitmq-s3.md} (71%)
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org
[james-project] 02/02: JAMES-3565 Documentation: fix packaging
support matrix
Posted by bt...@apache.org.
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 54a8d229138a17540fd0e055e6bafcebac6ee094
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Fri Apr 16 13:56:51 2021 +0700
JAMES-3565 Documentation: fix packaging support matrix
---
src/site/xdoc/server/packaging.xml | 34 +++++++++++++++++++++-------------
1 file changed, 21 insertions(+), 13 deletions(-)
diff --git a/src/site/xdoc/server/packaging.xml b/src/site/xdoc/server/packaging.xml
index c25ae8a..d857618 100644
--- a/src/site/xdoc/server/packaging.xml
+++ b/src/site/xdoc/server/packaging.xml
@@ -40,11 +40,11 @@
<li><a href="https://github.com/apache/james-project/tree/master/server/app">Spring</a>: Allows you to
choose across various available implementations for each component. Requires more configuration effort.</li>
<li><a href="https://github.com/apache/james-project/tree/master/server/container/guice/cassandra-guice">
- Cassandra-guice</a>: Ships a James server storing emails in Cassandra and index them in ElasticSearch.</li>
- <li><a href="https://github.com/apache/james-project/tree/master/server/container/guice/cassandra-ldap-guice">
- Cassandra-guice-ldap</a>: Ships a James server storing emails in Cassandra and index them in ElasticSearch. User are authenticated against a LDAP server.</li>
+ Cassandra-guice</a>: Ships a James server storing emails in Cassandra and index them in ElasticSearch targeting single server deployment. Optional support for LDAP authentication.</li>
+ <li><a href="https://github.com/apache/james-project/tree/master/server/container/guice/cassandra-rabbitmq-guice">
+ Distributed: cassandra-rabbitmq-guice</a>: Ships a James server storing emails in Cassandra and index them in ElasticSearch targeting multi node deployments. S3 is used to store blobs. RabbitMQ is used for inter-node messaging. Optional support for LDAP authentication.</li>
<li><a href="https://github.com/apache/james-project/tree/master/server/container/guice/jpa-guice">
- Jpa-Guice</a>: Ships a James server storing emails in a SQL database (derby by default) accessed with JPA and Lucene to index emails.</li>
+ Jpa-Guice</a>: Ships a James server storing emails in a SQL database (derby by default) accessed with JPA and Lucene to index emails and targets single node deployment.</li>
<li><a href="https://github.com/apache/james-project/tree/master/server/container/guice/jpa-smtp">
Jpa-Smtp</a>: A tiny SMTP server shiped without mailbox, using SQL database to store data, accessed by JPA.</li>
</ul>
@@ -61,7 +61,7 @@
<th>Packaging</th>
<th>Spring</th>
<th>Cassandra-guice</th>
- <th>Cassandra-ldap-guice</th>
+ <th>Distributed Cassandra-rabbitMQ-guice</th>
<th>Jpa-guice</th>
<th>Jpa-smtp</th>
</tr>
@@ -76,9 +76,9 @@
<tr>
<td>Docker image</td>
<td><a href="https://github.com/apache/james-project/tree/master/dockerfiles/run/spring">Available</a></td>
- <td><a href="https://github.com/apache/james-project/tree/master/dockerfiles/run/guice/cassandra">Available</a></td>
- <td><a href="https://github.com/apache/james-project/tree/master/dockerfilehttps://github.com/apache/james-project/tree/master/dockerfiles/run/guice/jpas/run/guice/cassandra-ldap">Available</a></td>
- <td><a href="https://github.com/apache/james-project/tree/master/dockerfiles/run/guice/jpa">Available</a></td>
+ <td>apache/james:cassandra-3.6.0</td>
+ <td>apache/james:distributed-3.6.0</td>
+ <td>apache/james:jpa-3.6.0</td>
<td>None</td>
</tr>
<tr>
@@ -90,6 +90,14 @@
<td>Yes</td>
</tr>
<tr>
+ <td>Deployment model</td>
+ <td>Single node</td>
+ <td>Single node</td>
+ <td>Multi node</td>
+ <td>Single node</td>
+ <td>Single node</td>
+ </tr>
+ <tr>
<td>Supports IMAP</td>
<td>Yes</td>
<td>Yes</td>
@@ -138,12 +146,12 @@
<td>Yes</td>
</tr>
<tr>
- <td>Supports Grafana metrics</td>
+ <td>Supports Grafana metrics (Prometheus)</td>
<td>No</td>
<td>Yes</td>
<td>Yes</td>
- <td>No</td>
- <td>No</td>
+ <td>Yes</td>
+ <td>Yes</td>
</tr>
<tr>
<td>Mailbox implementation</td>
@@ -174,7 +182,7 @@
<td>Mail queue implementation</td>
<td>ActiveMQ</td>
<td>ActiveMQ</td>
- <td>ActiveMQ</td>
+ <td>RabbitMQ</td>
<td>ActiveMQ</td>
<td>ActiveMQ</td>
</tr>
@@ -198,7 +206,7 @@
<td>Installation instructions</td>
<td><a href="install.html">Here</a></td>
<td><a href="install/guice-cassandra.html">Here</a></td>
- <td><a href="install/guice-cassandra.html">Here</a></td>
+ <td><a href="install/guice-cassandra-rabbitmq-s3.html">Here</a></td>
<td><a href="install/guice-jpa.html">Here</a></td>
<td><a href="install/guice-jpa-smtp.html">Here</a></td>
</tr>
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org
[james-project] 01/02: JAMES-3565 Documentation: remove swift
mentions
Posted by bt...@apache.org.
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 8c6d5e841631f315fc9d7d358bfab41b948b4b04
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Fri Apr 16 13:56:31 2021 +0700
JAMES-3565 Documentation: remove swift mentions
---
...ra-rabbitmq-swift.md => guice-cassandra-rabbitmq-s3.md} | 14 +-------------
src/site/site.xml | 2 +-
2 files changed, 2 insertions(+), 14 deletions(-)
diff --git a/src/site/markdown/server/install/guice-cassandra-rabbitmq-swift.md b/src/site/markdown/server/install/guice-cassandra-rabbitmq-s3.md
similarity index 71%
rename from src/site/markdown/server/install/guice-cassandra-rabbitmq-swift.md
rename to src/site/markdown/server/install/guice-cassandra-rabbitmq-s3.md
index 14966e6..1ef4210 100644
--- a/src/site/markdown/server/install/guice-cassandra-rabbitmq-swift.md
+++ b/src/site/markdown/server/install/guice-cassandra-rabbitmq-s3.md
@@ -28,7 +28,7 @@ mvn clean install
* Cassandra 3.11.10
* ElasticSearch 7.10.2
* RabbitMQ-Management 3.8.1
- * Swift ObjectStorage 2.15.1 or Zenko Cloudserver or AWS S3
+ * Zenko Cloudserver or AWS S3 compatible API
### James Launch
@@ -70,15 +70,3 @@ objectstorage.s3.region=eu-west-1
objectstorage.s3.accessKeyId=accessKey1
objectstorage.s3.secretKey=secretKey1
```
-
-## Guice-cassandra-rabbitmq-ldap
-
-You can follow the same guide to build and run guice-cassandra-rabbitmq-swift-ldap artifact, except that:
- - The **jar** and **libs** needs to be retrieve from server/container/guice/cassandra-rabbitmq-ldap-guice/target after compilation
- - The sample configuration can be found in [dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/conf](https://github.com/apache/james-project/tree/master/dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/conf)
- - You need to configure James to be connecting to a running LDAP server. The configuration file is located in [dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/conf/usersrepository.xml](https://github.com/apache/james-project/tree/master/dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/conf/usersrepository.xml)
- - You can then launch James via this command:
-
-```bash
-$ java -Dworking.directory=. -jar target/james-server-cassandra-rabbitmq-ldap-guice.jar
-```
diff --git a/src/site/site.xml b/src/site/site.xml
index 3f85fae..c85e693 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -106,7 +106,7 @@
</item>
<item name="2. Packaging" href="/server/packaging.html" />
<item name="3. Install James" href="/server/install.html" collapse="true">
- <item name="Cassandra-RabbitMQ-Swift-guice" href="/server/install/guice-cassandra-rabbitmq.html" />
+ <item name="Cassandra-RabbitMQ-S3-guice" href="/server/install/guice-cassandra-rabbitmq-s3.html" />
<item name="Cassandra-guice" href="/server/install/guice-cassandra.html" />
<item name="JPA-guice" href="/server/install/guice-jpa.html" />
<item name="JPA-SMTP-guice" href="/server/install/guice-jpa-smtp.html" />
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org