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/05/31 04:01:44 UTC

[james-project] branch master updated (9889ba2 -> 44783d4)

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 9889ba2  JAMES-2886 Test and fix ExtensionConfiguration loading
     new fc3c8b0  JAMES-3261 Documentation website: update example links
     new 3aa2009  JAMES-3261 Documentation website: install.xml was referencing 3.3.0 instad of 3.6.0
     new 44783d4  JAMES-3261 Antora documentation: update example links

The 3 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:
 .../pages/distributed/configure/batchsizes.adoc    |   2 +-
 .../pages/distributed/configure/blobstore.adoc     |   6 +-
 .../pages/distributed/configure/cassandra.adoc     |   2 +-
 .../servers/pages/distributed/configure/dns.adoc   |   2 +-
 .../pages/distributed/configure/domainlist.adoc    |   2 +-
 .../pages/distributed/configure/elasticsearch.adoc |   2 +-
 .../pages/distributed/configure/healthcheck.adoc   |   2 +-
 .../servers/pages/distributed/configure/imap.adoc  |   2 +-
 .../servers/pages/distributed/configure/index.adoc |  48 ++++----
 .../servers/pages/distributed/configure/jmap.adoc  |   2 +-
 .../servers/pages/distributed/configure/jmx.adoc   |   2 +-
 .../pages/distributed/configure/listeners.adoc     |   2 +-
 .../distributed/configure/mailetcontainer.adoc     |   2 +-
 .../distributed/configure/mailrepositorystore.adoc |   2 +-
 .../servers/pages/distributed/configure/pop3.adoc  |   2 +-
 .../pages/distributed/configure/rabbitmq.adoc      |  10 +-
 .../configure/recipientrewritetable.adoc           |   2 +-
 .../servers/pages/distributed/configure/smtp.adoc  |   4 +-
 .../distributed/configure/usersrepository.adoc     |   4 +-
 .../servers/pages/distributed/configure/vault.adoc |   2 +-
 .../pages/distributed/configure/webadmin.adoc      |   2 +-
 .../servers/pages/distributed/operate/guide.adoc   |   8 +-
 .../servers/pages/distributed/operate/metrics.adoc |   2 +-
 docs/modules/servers/pages/distributed/run.adoc    |   2 +-
 src/site/site.xml                                  |   1 -
 src/site/xdoc/server/config-blob-export.xml        |   4 +-
 src/site/xdoc/server/config-blobstore.xml          |   2 +-
 src/site/xdoc/server/config-cassandra.xml          |   2 +-
 src/site/xdoc/server/config-dnsservice.xml         |   2 +-
 src/site/xdoc/server/config-domainlist.xml         |   2 +-
 src/site/xdoc/server/config-elasticsearch.xml      |   4 +-
 src/site/xdoc/server/config-events.xml             | 131 ---------------------
 src/site/xdoc/server/config-guice.xml              |  27 ++---
 src/site/xdoc/server/config-healthcheck.xml        |   2 +-
 src/site/xdoc/server/config-imap4.xml              |   2 +-
 src/site/xdoc/server/config-jmap.xml               |   2 +-
 src/site/xdoc/server/config-listeners.xml          |   4 +-
 src/site/xdoc/server/config-rabbitmq.xml           |  10 +-
 src/site/xdoc/server/config-vault.xml              |   2 +-
 src/site/xdoc/server/config-webadmin.xml           |   2 +-
 src/site/xdoc/server/config.xml                    |   6 +-
 src/site/xdoc/server/dev-extend-mailet.xml         |   2 +-
 src/site/xdoc/server/dev-extend-matcher.xml        |   2 +-
 src/site/xdoc/server/dev-extend.xml                |   2 +-
 src/site/xdoc/server/install.xml                   |  10 +-
 45 files changed, 102 insertions(+), 235 deletions(-)
 delete mode 100644 src/site/xdoc/server/config-events.xml

---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org


[james-project] 03/03: JAMES-3261 Antora documentation: update example links

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 44783d4e6b0e0bbdd855d033a8a6151dbead1a9f
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Sat May 29 15:05:15 2021 +0700

    JAMES-3261 Antora documentation: update example links
---
 .../pages/distributed/configure/batchsizes.adoc    |  2 +-
 .../pages/distributed/configure/blobstore.adoc     |  6 +--
 .../pages/distributed/configure/cassandra.adoc     |  2 +-
 .../servers/pages/distributed/configure/dns.adoc   |  2 +-
 .../pages/distributed/configure/domainlist.adoc    |  2 +-
 .../pages/distributed/configure/elasticsearch.adoc |  2 +-
 .../pages/distributed/configure/healthcheck.adoc   |  2 +-
 .../servers/pages/distributed/configure/imap.adoc  |  2 +-
 .../servers/pages/distributed/configure/index.adoc | 48 +++++++++++-----------
 .../servers/pages/distributed/configure/jmap.adoc  |  2 +-
 .../servers/pages/distributed/configure/jmx.adoc   |  2 +-
 .../pages/distributed/configure/listeners.adoc     |  2 +-
 .../distributed/configure/mailetcontainer.adoc     |  2 +-
 .../distributed/configure/mailrepositorystore.adoc |  2 +-
 .../servers/pages/distributed/configure/pop3.adoc  |  2 +-
 .../pages/distributed/configure/rabbitmq.adoc      | 10 ++---
 .../configure/recipientrewritetable.adoc           |  2 +-
 .../servers/pages/distributed/configure/smtp.adoc  |  4 +-
 .../distributed/configure/usersrepository.adoc     |  4 +-
 .../servers/pages/distributed/configure/vault.adoc |  2 +-
 .../pages/distributed/configure/webadmin.adoc      |  2 +-
 .../servers/pages/distributed/operate/guide.adoc   |  8 ++--
 .../servers/pages/distributed/operate/metrics.adoc |  2 +-
 docs/modules/servers/pages/distributed/run.adoc    |  2 +-
 24 files changed, 58 insertions(+), 58 deletions(-)

diff --git a/docs/modules/servers/pages/distributed/configure/batchsizes.adoc b/docs/modules/servers/pages/distributed/configure/batchsizes.adoc
index 6ff843d..82e55bf 100644
--- a/docs/modules/servers/pages/distributed/configure/batchsizes.adoc
+++ b/docs/modules/servers/pages/distributed/configure/batchsizes.adoc
@@ -6,7 +6,7 @@ needed as IMAP can generate some potentially large requests.
 
 Increasing these values tend to fasten individual requests, at the cost of enabling potential higher load.
 
-Consult this link:https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/batchsizes.properties[example]
+Consult this link:https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/batchsizes.properties[example]
 to get some examples and hints.
 
 .batchsizes.properties content
diff --git a/docs/modules/servers/pages/distributed/configure/blobstore.adoc b/docs/modules/servers/pages/distributed/configure/blobstore.adoc
index 5611040..309d75c 100644
--- a/docs/modules/servers/pages/distributed/configure/blobstore.adoc
+++ b/docs/modules/servers/pages/distributed/configure/blobstore.adoc
@@ -12,7 +12,7 @@ You can choose the underlying implementation of BlobStore to fit with your James
 
 It could be the implementation on top of Cassandra or file storage service S3 compatible like Openstack Swift and AWS S3.
 
-Consult https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/blob.properties[blob.properties]
+Consult link:https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/blob.properties[blob.properties]
 in GIT to get some examples and hints.
 
 === Implementation choice
@@ -137,7 +137,7 @@ The deleted messages are transformed into a blob and James will export that blob
 
 This configuration helps you choose the blob exporting mechanism fit with your James setup and it is only applicable with Guice products.
 
-Consult https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/blob.properties[blob.properties]
+Consult https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/blob.properties[blob.properties]
 in GIT to get some examples and hints.
 
 Configuration for exporting blob content:
@@ -169,7 +169,7 @@ LinShare server and download them.
 
 This way helps you to share via whole network as long as they can access to LinShare server.
 
-To get an example or details explained, visit https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/blob.properties[blob.properties]
+To get an example or details explained, visit https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/blob.properties[blob.properties]
 
 *blob.export.linshare.url*: The URL to connect to LinShare
 
diff --git a/docs/modules/servers/pages/distributed/configure/cassandra.adoc b/docs/modules/servers/pages/distributed/configure/cassandra.adoc
index 813d838..e404b35 100644
--- a/docs/modules/servers/pages/distributed/configure/cassandra.adoc
+++ b/docs/modules/servers/pages/distributed/configure/cassandra.adoc
@@ -1,7 +1,7 @@
 = Distributed James Server &mdash; cassandra.properties
 :navtitle: cassandra.properties
 
-Consult this link:https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/cassandra.properties[example]
+Consult this link:https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/cassandra.properties[example]
 to get some examples and hints.
 
 == Configuration
diff --git a/docs/modules/servers/pages/distributed/configure/dns.adoc b/docs/modules/servers/pages/distributed/configure/dns.adoc
index 239c427..e213444 100644
--- a/docs/modules/servers/pages/distributed/configure/dns.adoc
+++ b/docs/modules/servers/pages/distributed/configure/dns.adoc
@@ -1,7 +1,7 @@
 = Distributed James Server &mdash; dnsservice.xml
 :navtitle: dnsservice.xml
 
-Consult this link:https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/dnsservice.xml[example]
+Consult this link:https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/dnsservice.xml[example]
 to get some examples and hints.
 
 Specifies DNS Server information for use by various components inside Apache James Server.
diff --git a/docs/modules/servers/pages/distributed/configure/domainlist.adoc b/docs/modules/servers/pages/distributed/configure/domainlist.adoc
index 84353b7..a48d60e 100644
--- a/docs/modules/servers/pages/distributed/configure/domainlist.adoc
+++ b/docs/modules/servers/pages/distributed/configure/domainlist.adoc
@@ -1,7 +1,7 @@
 = Distributed James Server &mdash; domainlist.xml
 :navtitle: domainlist.xml
 
-Consult this link:https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/domainlist.xml[example]
+Consult this link:https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/domainlist.xml[example]
 to get some examples and hints.
 
 This configuration block is defined by the *domainlist* tag.
diff --git a/docs/modules/servers/pages/distributed/configure/elasticsearch.adoc b/docs/modules/servers/pages/distributed/configure/elasticsearch.adoc
index 0b3fef1..bb4156e 100644
--- a/docs/modules/servers/pages/distributed/configure/elasticsearch.adoc
+++ b/docs/modules/servers/pages/distributed/configure/elasticsearch.adoc
@@ -1,7 +1,7 @@
 = Distributed James Server &mdash; elasticsearch.properties
 :navtitle: elasticsearch.properties
 
-Consult this link:https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/cassandra.properties[example]
+Consult this link:https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/cassandra.properties[example]
 to get some examples and hints.
 
 If you want more explanation about ElasticSearch configuration, you should visit the dedicated https://www.elastic.co/guide/en/elasticsearch/reference/current/index.html[documentation].
diff --git a/docs/modules/servers/pages/distributed/configure/healthcheck.adoc b/docs/modules/servers/pages/distributed/configure/healthcheck.adoc
index 331231b..dc39ee3 100644
--- a/docs/modules/servers/pages/distributed/configure/healthcheck.adoc
+++ b/docs/modules/servers/pages/distributed/configure/healthcheck.adoc
@@ -1,7 +1,7 @@
 = Distributed James Server &mdash; healthcheck.properties
 :navtitle: healthcheck.properties
 
-Consult this link:https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/healthcheck.properties[example]
+Consult this link:https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/healthcheck.properties[example]
 to get some examples and hints.
 
 Use this configuration to define the initial delay and period for the PeriodicalHealthChecks. It is only applicable with Guice products.
diff --git a/docs/modules/servers/pages/distributed/configure/imap.adoc b/docs/modules/servers/pages/distributed/configure/imap.adoc
index d68e444..28a26c5 100644
--- a/docs/modules/servers/pages/distributed/configure/imap.adoc
+++ b/docs/modules/servers/pages/distributed/configure/imap.adoc
@@ -1,7 +1,7 @@
 = Distributed James Server &mdash; imapserver.xml
 :navtitle: imapserver.xml
 
-Consult this link:https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/imapserver.xml[example]
+Consult this link:https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/imapserver.xml[example]
 to get some examples and hints.
 
 The IMAP4 service is controlled by a configuration block in the imap4server.xml.
diff --git a/docs/modules/servers/pages/distributed/configure/index.adoc b/docs/modules/servers/pages/distributed/configure/index.adoc
index 86fd97b..dff9afc 100644
--- a/docs/modules/servers/pages/distributed/configure/index.adoc
+++ b/docs/modules/servers/pages/distributed/configure/index.adoc
@@ -13,49 +13,49 @@ The following configuration files are exposed:
 
 By omitting these files, the underlying protocols will be disabled.
 
-** xref:distributed/configure/imap.adoc[*imapserver.xml*] allows configuration for the IMAP protocol link:https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/imapserver.xml[example]
-** xref:distributed/configure/jmap.adoc[*jmap.properties*] allows to configure the JMAP protocol link:https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/jmap.properties[example]
-** xref:distributed/configure/jmx.adoc[*jmx.properties*] allows configuration of JMX being used by the Command Line Interface link:https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/jmx.properties[example]
-** xref:distributed/configure/smtp.adoc#_lmtp_configuration[*lmtpserver.xml*] allows configuring the LMTP protocol link:https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/lmtpserver.xml[example]
-** *managesieveserver.xml* allows configuration for ManagedSieve (unsupported) link:https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/managesieveserver.xml[example]
-** xref:distributed/configure/pop3.adoc[*pop3server.xml*] allows configuration for the POP3 protocol (experimental) link:https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/pop3server.xml[example]
-** xref:distributed/configure/smtp.adoc[*smtpserver.xml*] allows configuration for the SMTP protocol link:https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/smtpserver.xml[example]
+** xref:distributed/configure/imap.adoc[*imapserver.xml*] allows configuration for the IMAP protocol link:https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/imapserver.xml[example]
+** xref:distributed/configure/jmap.adoc[*jmap.properties*] allows to configure the JMAP protocol link:https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/jmap.properties[example]
+** xref:distributed/configure/jmx.adoc[*jmx.properties*] allows configuration of JMX being used by the Command Line Interface link:https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/jmx.properties[example]
+** xref:distributed/configure/smtp.adoc#_lmtp_configuration[*lmtpserver.xml*] allows configuring the LMTP protocol link:https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/lmtpserver.xml[example]
+** *managesieveserver.xml* allows configuration for ManagedSieve (unsupported) link:https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/managesieveserver.xml[example]
+** xref:distributed/configure/pop3.adoc[*pop3server.xml*] allows configuration for the POP3 protocol (experimental) link:https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/pop3server.xml[example]
+** xref:distributed/configure/smtp.adoc[*smtpserver.xml*] allows configuration for the SMTP protocol link:https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/smtpserver.xml[example]
 *** xref:distributed/configure/smtp-hooks.adoc[This page] list SMTP hooks that can be used out of the box with the Distributed Server.
-** xref:distributed/configure/webadmin.adoc[*webadmin.properties*] enables configuration for the WebAdmin protocol link:https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/webadmin.properties[example]
+** xref:distributed/configure/webadmin.adoc[*webadmin.properties*] enables configuration for the WebAdmin protocol link:https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/webadmin.properties[example]
 ** xref:distributed/configure/ssl.adoc[This page] details SSL & TLS configuration.
 
 == For storage dependencies
 
 Except specific documented cases, these files are required, at least to establish a connection with the storage components.
 
-** xref:distributed/configure/blobstore.adoc[*blobstore.properties*] allows to configure the BlobStore link:https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/blob.properties[example]
-** xref:distributed/configure/cassandra.adoc[*cassandra.properties*] allows to configure the Cassandra driver link:https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/cassandra.properties[example]
-** xref:distributed/configure/elasticsearch.adoc[*elasticsearch.properties*] allows to configure ElasticSearch driver link:https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/elasticsearch.properties[example]
-** xref:distributed/configure/rabbitmq.adoc[*rabbitmq.properties*] allows configuration for the RabbitMQ driver link:https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/rabbitmq.properties[example]
-** xref:distributed/configure/tika.adoc[*tika.properties*] allows configuring Tika as a backend for text extraction link:https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/tika.properties[example]
+** xref:distributed/configure/blobstore.adoc[*blobstore.properties*] allows to configure the BlobStore link:https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/blob.properties[example]
+** xref:distributed/configure/cassandra.adoc[*cassandra.properties*] allows to configure the Cassandra driver link:https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/cassandra.properties[example]
+** xref:distributed/configure/elasticsearch.adoc[*elasticsearch.properties*] allows to configure ElasticSearch driver link:https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/elasticsearch.properties[example]
+** xref:distributed/configure/rabbitmq.adoc[*rabbitmq.properties*] allows configuration for the RabbitMQ driver link:https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/rabbitmq.properties[example]
+** xref:distributed/configure/tika.adoc[*tika.properties*] allows configuring Tika as a backend for text extraction link:https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/tika.properties[example]
 
 == For core components
 
 By omitting these files, sane default values are used.
 
-** xref:distributed/configure/batchsizes.adoc[*batchsizes.properties*] allows to configure mailbox read batch sizes link:https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/batchsizes.properties[example]
-** xref:distributed/configure/dns.adoc[*dnsservice.xml*] allows to configure DNS resolution link:https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/dnsservice.xml[example]
-** xref:distributed/configure/domainlist.adoc[*domainlist.xml*] allows to configure Domain storage link:https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/domainlist.xml[example]
-** xref:distributed/configure/healthcheck.adoc[*healthcheck.properties*] allows to configure periodical healthchecks link:https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/healthcheck.properties[example]
-** xref:distributed/configure/mailetcontainer.adoc[*mailetcontainer.xml*] allows configuring mail processing link:https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/mailetcontainer.xml[example]
+** xref:distributed/configure/batchsizes.adoc[*batchsizes.properties*] allows to configure mailbox read batch sizes link:https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/batchsizes.properties[example]
+** xref:distributed/configure/dns.adoc[*dnsservice.xml*] allows to configure DNS resolution link:https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/dnsservice.xml[example]
+** xref:distributed/configure/domainlist.adoc[*domainlist.xml*] allows to configure Domain storage link:https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/domainlist.xml[example]
+** xref:distributed/configure/healthcheck.adoc[*healthcheck.properties*] allows to configure periodical healthchecks link:https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/healthcheck.properties[example]
+** xref:distributed/configure/mailetcontainer.adoc[*mailetcontainer.xml*] allows configuring mail processing link:https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/mailetcontainer.xml[example]
 *** xref:distributed/configure/mailets.adoc[This page] list matchers that can be used out of the box with the Distributed Server.
 *** xref:distributed/configure/matchers.adoc[This page] list matchers that can be used out of the box with the Distributed Server.
-** xref:distributed/configure/mailrepositorystore.adoc[*mailrepositorystore.xml*] enables registration of allowed MailRepository protcols and link them to MailRepository implementations link:https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/mailrepositorystore.xml[example]
-** xref:distributed/configure/recipientrewritetable.adoc[*recipientrewritetable.xml*] enables advanced configuration for the Recipient Rewrite Table component link:https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/recipientrewritetable.xml[example]
-** xref:distributed/configure/usersrepository.adoc[*usersrepository.xml*] allows configuration of user storage link:https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/usersrepository.xml[example]
+** xref:distributed/configure/mailrepositorystore.adoc[*mailrepositorystore.xml*] enables registration of allowed MailRepository protcols and link them to MailRepository implementations link:https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/mailrepositorystore.xml[example]
+** xref:distributed/configure/recipientrewritetable.adoc[*recipientrewritetable.xml*] enables advanced configuration for the Recipient Rewrite Table component link:https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/recipientrewritetable.xml[example]
+** xref:distributed/configure/usersrepository.adoc[*usersrepository.xml*] allows configuration of user storage link:https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/usersrepository.xml[example]
 
 == For extensions
 
 By omitting these files, no extra behaviour is added.
 
-** xref:distributed/configure/vault.adoc[*deletedMessageVault.properties*] allows to configure the DeletedMessageVault link:https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/deletedMessageVault.properties[example]
-** xref:distributed/configure/listeners.adoc[*listeners.xml*] enables configuration of Mailbox Listeners link:https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/listeners.xml[example]
-** xref:distributed/configure/extensions.adoc[*extensions.properties*] allows to extend James behaviour by loading your extensions in it link:https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/extensions.properties[example]
+** xref:distributed/configure/vault.adoc[*deletedMessageVault.properties*] allows to configure the DeletedMessageVault link:https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/deletedMessageVault.properties[example]
+** xref:distributed/configure/listeners.adoc[*listeners.xml*] enables configuration of Mailbox Listeners link:https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/listeners.xml[example]
+** xref:distributed/configure/extensions.adoc[*extensions.properties*] allows to extend James behaviour by loading your extensions in it link:https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/extensions.properties[example]
 ** xref:distributed/configure/spam.adoc[This page] documents Anti-Spam setup with SpamAssassin.
 ** xref:distributed/configure/remote-delivery-error-handling.adoc[This page] proposes a simple strategy for RemoteDelivery error handling.
 ** xref:distributed/configure/collecting-contacts.adoc[This page] documents contact collection
diff --git a/docs/modules/servers/pages/distributed/configure/jmap.adoc b/docs/modules/servers/pages/distributed/configure/jmap.adoc
index 8084600..c9210cb 100644
--- a/docs/modules/servers/pages/distributed/configure/jmap.adoc
+++ b/docs/modules/servers/pages/distributed/configure/jmap.adoc
@@ -5,7 +5,7 @@ https://jmap.io/[JMAP]  is intended to be a new standard for email clients to co
 stores. It therefore intends to primarily replace IMAP + SMTP submission. It is also designed to be more
 generic. It does not replace MTA-to-MTA SMTP transmission.
 
-Consult this link:https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/jmap.properties[example]
+Consult this link:https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/jmap.properties[example]
 to get some examples and hints.
 
 .jmap.properties content
diff --git a/docs/modules/servers/pages/distributed/configure/jmx.adoc b/docs/modules/servers/pages/distributed/configure/jmx.adoc
index fd7fa12..656d61e 100644
--- a/docs/modules/servers/pages/distributed/configure/jmx.adoc
+++ b/docs/modules/servers/pages/distributed/configure/jmx.adoc
@@ -3,7 +3,7 @@
 
 This is used to configure the JMX MBean server via which all management is achieved.
 
-Consult this link:https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/jmx.properties[example]
+Consult this link:https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/jmx.properties[example]
 in GIT to get some examples and hints.
 
 .jmx.properties content
diff --git a/docs/modules/servers/pages/distributed/configure/listeners.adoc b/docs/modules/servers/pages/distributed/configure/listeners.adoc
index 04bd9f9..404e3e3 100644
--- a/docs/modules/servers/pages/distributed/configure/listeners.adoc
+++ b/docs/modules/servers/pages/distributed/configure/listeners.adoc
@@ -12,7 +12,7 @@ operations on the system.
 
 Distributed James allows the user to register potentially user defined additional mailbox listeners.
 
-Consult this link:https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/listener.xml[example]
+Consult this link:https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/listener.xml[example]
 to get some examples and hints.
 
 == Configuration
diff --git a/docs/modules/servers/pages/distributed/configure/mailetcontainer.adoc b/docs/modules/servers/pages/distributed/configure/mailetcontainer.adoc
index fe7c715..3730dfa 100644
--- a/docs/modules/servers/pages/distributed/configure/mailetcontainer.adoc
+++ b/docs/modules/servers/pages/distributed/configure/mailetcontainer.adoc
@@ -12,7 +12,7 @@ xref:distributed/configure/matchers.adoc[Packaged Matchers].
 
 Futhermore, you can write and use with James xref:distributed/extending/mail-processing.adoc[your own mailet and matchers].
 
-Consult this link:https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/mailetcontainer.xml[example]
+Consult this link:https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/mailetcontainer.xml[example]
 to get some examples and hints.
 
 .mailetcontainer.xml content
diff --git a/docs/modules/servers/pages/distributed/configure/mailrepositorystore.adoc b/docs/modules/servers/pages/distributed/configure/mailrepositorystore.adoc
index dec55b5..e2d45fc 100644
--- a/docs/modules/servers/pages/distributed/configure/mailrepositorystore.adoc
+++ b/docs/modules/servers/pages/distributed/configure/mailrepositorystore.adoc
@@ -15,7 +15,7 @@ associated to a protocol in *mailrepositorystore.xml* for a usage in *mailetcont
 
 == Configuration
 
-Consult this link:https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/mailrepositorystore.xml[example]
+Consult this link:https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/mailrepositorystore.xml[example]
 to get some examples and hints.
 
 ....
diff --git a/docs/modules/servers/pages/distributed/configure/pop3.adoc b/docs/modules/servers/pages/distributed/configure/pop3.adoc
index 39da60a..fe383b6 100644
--- a/docs/modules/servers/pages/distributed/configure/pop3.adoc
+++ b/docs/modules/servers/pages/distributed/configure/pop3.adoc
@@ -1,7 +1,7 @@
 = Distributed James Server &mdash; pop3server.xml
 :navtitle: pop3server.xml
 
-Consult this link:https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/pop3server.xml[example]
+Consult this link:https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/pop3server.xml[example]
 to get some examples and hints.
 
 The POP3 service is controlled by a configuration block in the pop3server.xml.
diff --git a/docs/modules/servers/pages/distributed/configure/rabbitmq.adoc b/docs/modules/servers/pages/distributed/configure/rabbitmq.adoc
index c064398..a4f0705 100644
--- a/docs/modules/servers/pages/distributed/configure/rabbitmq.adoc
+++ b/docs/modules/servers/pages/distributed/configure/rabbitmq.adoc
@@ -3,7 +3,7 @@
 
 This configuration helps you configure components using RabbitMQ.
 
-Consult this link:https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/rabbitmq.properties[example]
+Consult this link:https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/rabbitmq.properties[example]
 to get some examples and hints.
 
 == RabbitMQ Configuration
@@ -94,19 +94,19 @@ this implementation relies on Cassandra.
 | mailqueue.view.sliceWindow
 | James divides the view into slices, each slice contains data for a given period, sliceWindow parameter controls this period.
 This dividing of periods allows faster browsing of the mail queue. Tips for choosing sliceWindow are explained in
-https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/rabbitmq.properties[rabbitmq.properties]
+https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/rabbitmq.properties[rabbitmq.properties]
 
 | mailqueue.view.bucketCount
 | Mails in a mail queue are distributed across the underlying storage service.
 BucketCount describes how to be distributing mails to fit with your James setup
 Tips for choosing bucketCount are explained in
-https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/rabbitmq.properties[rabbitmq.properties]
+https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/rabbitmq.properties[rabbitmq.properties]
 
 | mailqueue.view.updateBrowseStartPace
 | To browse, James needs a starting point and to continuously update that point in runtime.
 UpdateBrowseStartPace describes the probability to update the starting point.
 Tips for choosing updateBrowseStartPace are explained in
-https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/rabbitmq.properties[rabbitmq.properties]
+https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/rabbitmq.properties[rabbitmq.properties]
 
 | mailqueue.size.metricsEnabled
 |  By default, the metrics are disabled for the mail queue size.
@@ -114,7 +114,7 @@ As computing the size of the mail queue is currently implemented on top of brows
 sometimes it can get too big, making it impossible for the ES reporter to handle it correctly without crashing.
 It can be useful then to disable it.
 Tips for choosing metricsEnabled are explained in
-https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/rabbitmq.properties[rabbitmq.properties]
+https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/rabbitmq.properties[rabbitmq.properties]
 
 |===
 
diff --git a/docs/modules/servers/pages/distributed/configure/recipientrewritetable.adoc b/docs/modules/servers/pages/distributed/configure/recipientrewritetable.adoc
index 7d73b8b..76ffc93 100644
--- a/docs/modules/servers/pages/distributed/configure/recipientrewritetable.adoc
+++ b/docs/modules/servers/pages/distributed/configure/recipientrewritetable.adoc
@@ -3,7 +3,7 @@
 
 Here are explanations on the different kinds about xref:distributed/architecture/index.adoc#_recipient_rewrite_tables[recipient rewritting].
 
-Consult this link:https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/recipientrewritetable.xml[example]
+Consult this link:https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/recipientrewritetable.xml[example]
 to get some examples and hints.
 
 .recipientrewritetable.xml
diff --git a/docs/modules/servers/pages/distributed/configure/smtp.adoc b/docs/modules/servers/pages/distributed/configure/smtp.adoc
index 37303c8..3beb158 100644
--- a/docs/modules/servers/pages/distributed/configure/smtp.adoc
+++ b/docs/modules/servers/pages/distributed/configure/smtp.adoc
@@ -3,7 +3,7 @@
 
 == Incoming SMTP
 
-Consult this link:https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/smtpserver.xml[example]
+Consult this link:https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/smtpserver.xml[example]
 to get some examples and hints.
 
 The SMTP service is controlled by a configuration block in the smptserver.xml.
@@ -165,7 +165,7 @@ Eudora, Evolution).
 
 == LMTP Configuration
 
-Consult this link:https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/lmtpserver.xml[example]
+Consult this link:https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/lmtpserver.xml[example]
 to get some examples and hints.
 
 The configuration is the same of for SMTP.
diff --git a/docs/modules/servers/pages/distributed/configure/usersrepository.adoc b/docs/modules/servers/pages/distributed/configure/usersrepository.adoc
index f321f42..5cc769e 100644
--- a/docs/modules/servers/pages/distributed/configure/usersrepository.adoc
+++ b/docs/modules/servers/pages/distributed/configure/usersrepository.adoc
@@ -3,7 +3,7 @@
 
 User repositories are required to store James user information and authentication data.
 
-Consult this link:https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/usersrepository.xml[example]
+Consult this link:https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/usersrepository.xml[example]
 to get some examples and hints.
 
 == The user data model
@@ -43,7 +43,7 @@ acting on the behalf of any user.
 Alternatively you can authenticate your users against a LDAP server. You need to configure
 the properties for accessing your LDAP server in this file.
 
-Consult this link:https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/conf/usersrepository.xml[example]
+Consult this link:https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/usersrepository.xml[example]
 to get some examples and hints.
 
 Example:
diff --git a/docs/modules/servers/pages/distributed/configure/vault.adoc b/docs/modules/servers/pages/distributed/configure/vault.adoc
index 502fad0..8418a3b 100644
--- a/docs/modules/servers/pages/distributed/configure/vault.adoc
+++ b/docs/modules/servers/pages/distributed/configure/vault.adoc
@@ -20,7 +20,7 @@ xref:distributed/configure/blobstore.adoc[*blobstore.properties*] BlobStore Conf
 
 == deletedMessageVault.properties
 
-Consult this link:https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/deletedMessageVault.properties[example]
+Consult this link:https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/deletedMessageVault.properties[example]
 to get some examples and hints.
 
 .deletedMessageVault.properties content
diff --git a/docs/modules/servers/pages/distributed/configure/webadmin.adoc b/docs/modules/servers/pages/distributed/configure/webadmin.adoc
index a215cb3..3ff2e74 100644
--- a/docs/modules/servers/pages/distributed/configure/webadmin.adoc
+++ b/docs/modules/servers/pages/distributed/configure/webadmin.adoc
@@ -13,7 +13,7 @@ for example: Swagger documentation & James health checks.
 
 == Configuration
 
-Consult this link:https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/webadmin.properties[example]
+Consult this link:https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/webadmin.properties[example]
 to get some examples and hints.
 
 .webadmin.properties content
diff --git a/docs/modules/servers/pages/distributed/operate/guide.adoc b/docs/modules/servers/pages/distributed/operate/guide.adoc
index db0cc9e..d5d7364 100644
--- a/docs/modules/servers/pages/distributed/operate/guide.adoc
+++ b/docs/modules/servers/pages/distributed/operate/guide.adoc
@@ -77,7 +77,7 @@ the root cause has been addressed, the mail can be reprocessed.
 
 It is possible for the administrator of James to define the mailbox
 listeners he wants to use, by adding them in the
-https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/listeners.xml[listeners.xml]
+https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/listeners.xml[listeners.xml]
 configuration file. It’s possible also to add your own custom mailbox
 listeners. This enables to enhance capabilities of James as a Mail
 Delivery Agent. You can get more information about those
@@ -182,7 +182,7 @@ field being present)
 https://www.elastic.co/guide/en/elasticsearch/reference/7.10/indices-delete-index.html[drop
 the old index]
 * You might want as well modify the James configuration file
-https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/elasticsearch.properties[elasticsearch.properties]
+https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/elasticsearch.properties[elasticsearch.properties]
 by setting the parameter `elasticsearch.index.mailbox.name` to the name
 of your new index. This is to avoid that James re-creates index upon
 restart
@@ -577,7 +577,7 @@ steps:
 ==== Enable Deleted Messages Vault by configuring Pre Deletion Hooks
 
 You need to configure this hook in
-https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/listeners.xml[listeners.xml]
+https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/listeners.xml[listeners.xml]
 configuration file. More details about configuration & example can be
 found at http://james.apache.org/server/config-listeners.html[Pre
 Deletion Hook Configuration]
@@ -587,7 +587,7 @@ Deletion Hook Configuration]
 In order to configure the retention time for the Deleted Messages Vault,
 an administrator needs to perform fine configuration tunning as
 explained in
-https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra/destination/conf/deletedMessageVault.properties[deletedMessageVault.properties].
+https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/deletedMessageVault.properties[deletedMessageVault.properties].
 Mails are not retained forever as you have to configure a retention
 period (by `retentionPeriod`) before using it (with one-year retention
 by default if not defined).
diff --git a/docs/modules/servers/pages/distributed/operate/metrics.adoc b/docs/modules/servers/pages/distributed/operate/metrics.adoc
index 04d76d2..ee36d31 100644
--- a/docs/modules/servers/pages/distributed/operate/metrics.adoc
+++ b/docs/modules/servers/pages/distributed/operate/metrics.adoc
@@ -227,7 +227,7 @@ Import the different dashboards you want.
 You then need to enable reporting through ElasticSearch. Modify your
 James ElasticSearch configuration file accordingly. To help you doing
 this, you can take a look to
-https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra/destination/conf/elasticsearch.properties[elasticsearch.properties].
+link:https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/elasticsearch.properties[elasticsearch.properties].
 
 If some metrics seem abnormally slow despite in depth database
 performance tuning, feedback is appreciated as well on the bug tracker,
diff --git a/docs/modules/servers/pages/distributed/run.adoc b/docs/modules/servers/pages/distributed/run.adoc
index 16afdb8..2f68b99 100644
--- a/docs/modules/servers/pages/distributed/run.adoc
+++ b/docs/modules/servers/pages/distributed/run.adoc
@@ -42,7 +42,7 @@ configuration files.
 James requires the configuration to be in a subfolder of working
 directory that is called *conf*. You can get a sample directory for
 configuration from
-https://github.com/apache/james-project/tree/master/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf[dockerfiles/run/guice/cassandra-rabbitmq/destination/conf].
+https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/[server/container/guice/cassandra-rabbitmq-guice/sample-configuration/].
 You might need to adapt it to your needs.
 
 You also need to generate a keystore in your conf folder with the

---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org


[james-project] 01/03: JAMES-3261 Documentation website: update example links

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 fc3c8b03d330e3aa2762c9cf0dcd6f78324f278b
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Sat May 29 14:54:12 2021 +0700

    JAMES-3261 Documentation website: update example links
---
 src/site/site.xml                             |   1 -
 src/site/xdoc/server/config-blob-export.xml   |   4 +-
 src/site/xdoc/server/config-blobstore.xml     |   2 +-
 src/site/xdoc/server/config-cassandra.xml     |   2 +-
 src/site/xdoc/server/config-dnsservice.xml    |   2 +-
 src/site/xdoc/server/config-domainlist.xml    |   2 +-
 src/site/xdoc/server/config-elasticsearch.xml |   4 +-
 src/site/xdoc/server/config-events.xml        | 131 --------------------------
 src/site/xdoc/server/config-guice.xml         |  27 +++---
 src/site/xdoc/server/config-healthcheck.xml   |   2 +-
 src/site/xdoc/server/config-imap4.xml         |   2 +-
 src/site/xdoc/server/config-jmap.xml          |   2 +-
 src/site/xdoc/server/config-listeners.xml     |   4 +-
 src/site/xdoc/server/config-rabbitmq.xml      |  10 +-
 src/site/xdoc/server/config-vault.xml         |   2 +-
 src/site/xdoc/server/config-webadmin.xml      |   2 +-
 src/site/xdoc/server/config.xml               |   6 +-
 src/site/xdoc/server/dev-extend-mailet.xml    |   2 +-
 src/site/xdoc/server/dev-extend-matcher.xml   |   2 +-
 src/site/xdoc/server/dev-extend.xml           |   2 +-
 20 files changed, 39 insertions(+), 172 deletions(-)

diff --git a/src/site/site.xml b/src/site/site.xml
index c85e693..3da1bab 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -122,7 +122,6 @@
                         <item name="Deleted Messages Vault" href="/server/config-vault.html" />
                         <item name="DNS Service" href="/server/config-dnsservice.html" />
                         <item name="Domain List" href="/server/config-domainlist.html" />
-                        <item name="Events" href="/server/config-events.html" />
                         <item name="FetchMail" href="/server/config-fetchmail.html" />
                         <item name="Guice" href="/server/config-guice.html" />
                         <item name="IMAP4" href="/server/config-imap4.html" />
diff --git a/src/site/xdoc/server/config-blob-export.xml b/src/site/xdoc/server/config-blob-export.xml
index 9a86d7e..22349f6 100644
--- a/src/site/xdoc/server/config-blob-export.xml
+++ b/src/site/xdoc/server/config-blob-export.xml
@@ -35,7 +35,7 @@
           This configuration helps you choose the blob exporting mechanism fit with your James setup and it is only applicable with Guice products.
       </p>
 
-      <p>Consult <a href="https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/blob.properties">blob.properties</a> in GIT to get some examples and hints.</p>
+      <p>Consult <a href="https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/blob.properties">blob.properties</a> in GIT to get some examples and hints.</p>
 
       <p>
           Configuration for exporting blob content
@@ -68,7 +68,7 @@
               This way helps you to share via whole network as long as they can access to LinShare server.
           </p>
           <p>
-              To get an example or details explained, visit <a href="https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/blob.properties">blob.properties</a>
+              To get an example or details explained, visit <a href="https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/blob.properties">blob.properties</a>
           </p>
           <dl>
               <dt><strong>blob.export.linshare.url</strong></dt>
diff --git a/src/site/xdoc/server/config-blobstore.xml b/src/site/xdoc/server/config-blobstore.xml
index 513f8ca..a6f6686 100644
--- a/src/site/xdoc/server/config-blobstore.xml
+++ b/src/site/xdoc/server/config-blobstore.xml
@@ -35,7 +35,7 @@
                 This configuration is only applicable with Guice products.
             </p>
             <p>
-                Consult <a href="https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/blob.properties">blob.properties</a>
+                Consult <a href="https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/blob.properties">blob.properties</a>
                 in GIT to get some examples and hints.
             </p>
 
diff --git a/src/site/xdoc/server/config-cassandra.xml b/src/site/xdoc/server/config-cassandra.xml
index e05d687..965d206 100644
--- a/src/site/xdoc/server/config-cassandra.xml
+++ b/src/site/xdoc/server/config-cassandra.xml
@@ -29,7 +29,7 @@
 
     Note: Cassandra is only available with Guice wiring (cassandra-guice and cassandra-guice-ldap).
 
-    <p>Consult <a href="https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra/destination/conf/cassandra.properties">cassandra.properties</a> to get some examples and hints.</p>
+    <p>Consult <a href="https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/cassandra.properties">cassandra.properties</a> to get some examples and hints.</p>
 
       <dl>
         <dt><strong>cassandra.nodes</strong></dt>
diff --git a/src/site/xdoc/server/config-dnsservice.xml b/src/site/xdoc/server/config-dnsservice.xml
index 3ddd2a6..c9e2a28 100755
--- a/src/site/xdoc/server/config-dnsservice.xml
+++ b/src/site/xdoc/server/config-dnsservice.xml
@@ -29,7 +29,7 @@
 
     <subsection name="dnsservice.xml">
 
-      <p>Consult <a href="https://github.com/apache/james-project/tree/master/server/app/src/main/resources/dnsservice.xml">dnsservice.xml</a> in GIT to get some examples and hints.</p>
+      <p>Consult <a href="https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/dnsservice.xml">dnsservice.xml</a> in GIT to get some examples and hints.</p>
 
       <p>Specifies DNS Server information for use by various components inside Apache James Server.</p>
 
diff --git a/src/site/xdoc/server/config-domainlist.xml b/src/site/xdoc/server/config-domainlist.xml
index 6b95597..da81c48 100644
--- a/src/site/xdoc/server/config-domainlist.xml
+++ b/src/site/xdoc/server/config-domainlist.xml
@@ -27,7 +27,7 @@
 
   <section name="DomainList Configuration">
 
-    <p>Consult <a href="https://github.com/apache/james-project/tree/master/server/app/src/main/resources/domainlist.xml">domainlist.xml</a> in GIT to get some examples and hints.</p>
+    <p>Consult <a href="https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/domainlist.xml">domainlist.xml</a> in GIT to get some examples and hints.</p>
     
       <p>This configuration block is defined by the <strong>domainlist</strong> tag.</p>
       
diff --git a/src/site/xdoc/server/config-elasticsearch.xml b/src/site/xdoc/server/config-elasticsearch.xml
index bf52fc43..2f1ce57 100644
--- a/src/site/xdoc/server/config-elasticsearch.xml
+++ b/src/site/xdoc/server/config-elasticsearch.xml
@@ -29,7 +29,7 @@
 
       This configuration applies only to Guice wiring.
 
-    <p>Consult <a href="https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra/destination/conf/elasticsearch.properties">elasticsearch.properties</a> to get some examples and hints.</p>
+    <p>Consult <a href="https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/elasticsearch.properties">elasticsearch.properties</a> to get some examples and hints.</p>
 
       Connection to a cluster :
 
@@ -160,7 +160,7 @@
 
         <p>Note that to use this feature you need Guice, built with ElasticSearch</p>
 
-        <p>Consult <a href="https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra/destination/conf/tika.properties">tika.properties</a> to get some examples and hints.</p>
+        <p>Consult <a href="https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/tika.properties">tika.properties</a> to get some examples and hints.</p>
 
         Here are the different properties:
 
diff --git a/src/site/xdoc/server/config-events.xml b/src/site/xdoc/server/config-events.xml
deleted file mode 100644
index 1ad0222..0000000
--- a/src/site/xdoc/server/config-events.xml
+++ /dev/null
@@ -1,131 +0,0 @@
-<?xml version="1.0"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.    
--->
-<document>
-
-    <properties>
-        <title>Apache James Server 3 - Quota Configuration</title>
-    </properties>
-
-    <body>
-
-        <section name="Events System Configuration">
-
-            This configuration applies only to Spring wiring.
-
-            <p>Consult <a href="https://github.com/apache/james-project/tree/master/server/app/src/main/resources/events.xml">events.xml</a> in GIT to get some examples and hints.</p>
-
-            <p>Use this configuration to define the type of Event System you want.</p>
-
-            <p>
-                James relies on an event system. Each operations performed on the mailbox will trigger related events. Some software
-                components (MailboxListeners) can register themselves on this event system to be called when an event is fired.
-            </p>
-
-            <p>
-                Here are typical use cases for Mailbox Listeners (non exhaustive list) :
-                <ul>
-                    <li>Message search indexation, for instance in Lucene or ElasticSearch</li>
-                    <li>Local cache invalidation (caching mailbox project)</li>
-                    <li>Quota calculation</li>
-                    <li>IMAP IDLE feature : live notification of actions performed on a mailbox, allowing publish subscribe on mailboxes events</li>
-                    <li>Message Sequence Number consistence</li>
-                </ul>
-                The Mailbox Listeners can be classified in two categories :
-                <ul>
-                    <li>Mailbox registered : The mailbox listener is only notified on events affecting this mailbox. IDLE is a good example of this.</li>
-                    <li>Global Listeners : This event listener is triggered upon each events.</li>
-                </ul>
-                Note that Global Listeners can also be classified in two categories :
-                <ul>
-                    <li>Those which needs to be triggered only once in your cluster. For instance ElasticSearch indexing is an example of this.</li>
-                    <li>Those which needs to be triggered on each servers. For instance, each Lucene indexer needs to be triggered on each server
-                        for the search feature to stay consistent.</li>
-                </ul>
-            </p>
-
-            <p>
-                The default implementation is a synchronous in memory event system. The performance are really good, as their is no need to serialize
-                events, and no network overhead. However, this event system is limited to one computer and you might want a distributed systems.
-            </p>
-
-            <p>
-                Other implementations, distributed environment friendly are available.
-            </p>
-
-            <p>
-                The simplest one is broadcast based. Each James servers listen the same message queue, and each James server will be notified upon events.
-                Here are the pros and cons of this implementations :
-                <ul>
-                    Pros:
-                    <li>It supports every type of listener described above</li>
-                    <li>It allows you to scale your James infrastructure without changing your middlewares. You just need a message queue</li>
-                    Cons :
-                    <li>Your scalability is limited as each servers is notified on all events</li>
-                    <li>Network overhead on event transmissions</li>
-                    <li>Event serialization and deserialization</li>
-                </ul>
-                To use this implementation, you need two other components (that will be discussed) : a publishing system and an event serializer
-            </p>
-
-            <p>
-                The other mode is based on registrations.
-                Each server reads messages from a dedicated message queue, and other servers send messages addressed to this sever on this message queue.
-                Registrations are performed on an eternal data-store supporting document deletion after a fixed amount of time.
-                These registrations are periodically refreshed. This data-store is then triggered on event generation, that, if needed are serialized and
-                send to the given queues.
-                The pros and cons of this implementations are :
-                <ul>
-                    Pros :
-                    <li>Linear scalability</li>
-                    <li>A server receives only events concerning him</li>
-                    Cons :
-                    <li>Possible event serialization costs</li>
-                    <li>Registration and registration refresh costs</li>
-                    <li>Need to find interested servers on event delivery</li>
-                    <li>Network overhead on event transmissions</li>
-                </ul>
-            </p>
-
-            <h2>Failure modes</h2>
-
-            <ul>
-                Default implementation :
-                <li>The default implementation might not deliver some events on server stop.</li>
-            </ul>
-
-            <h2>Event serializer</h2>
-
-            <p>Json is the only serialization system currently supported.</p>
-
-            <h2>Registration systems</h2>
-
-            <p>
-                Available implementation is based on Cassandra. It is used on an AP fashion, enforcing availability instead of consistency. Some
-                messages might get delivered to no more registered servers. This is just extra work. Worst, messages might not be delivered to
-                recently registered servers. But we make sure that we have the more up to date version of the registrations we can, and will not time out in
-                the face of network partitions, nor enforce some default behaviour.
-            </p>
-
-        </section>
-
-    </body>
-
-</document>
-
diff --git a/src/site/xdoc/server/config-guice.xml b/src/site/xdoc/server/config-guice.xml
index 8ee5ca9..89217ae 100644
--- a/src/site/xdoc/server/config-guice.xml
+++ b/src/site/xdoc/server/config-guice.xml
@@ -34,8 +34,7 @@
       as a third party application.
     </p>
 
-    <p>We provide a tested configuration for docker environment, for each Guice artifact, which can be a good base for your own configuration.
-       Have a look on <a href="https://github.com/apache/james-project/tree/master/dockerfiles/run/guice">GitHub</a>. </p>
+    <p>We provide a tested configuration for docker environment, for each Guice artifact, which can be a good base for your own configuration.</p>
 
     <p>You can/must configure James for the following:</p>
 
@@ -48,62 +47,62 @@
       </tr>
 
       <tr>
-        <td><a href="https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/blob.properties">blob.properties</a></td>
+        <td><a href="https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/blob.properties">blob.properties</a></td>
         <td><a href="config-blob-export.html">Blob Export Configuration</a></td>
         <td></td>
       </tr>
       <tr>
-        <td><a href="https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/blob.properties">blob.properties</a></td>
+        <td><a href="https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration//blob.properties">blob.properties</a></td>
         <td><a href="config-blobstore.html">BlobStore Configuration</a></td>
         <td></td>
       </tr>
       <tr>
-        <td><a href="https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra/destination/conf/cassandra.properties">cassandra.properties</a></td>
+        <td><a href="https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/cassandra.properties">cassandra.properties</a></td>
         <td><a href="config-cassandra.html">Cassandra Configuration</a></td>
         <td></td>
       </tr>
       <tr>
-        <td><a href="https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra/destination/conf/deletedMessageVault.properties">deletedMessageVault.properties</a></td>
+        <td><a href="https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/deletedMessageVault.properties">deletedMessageVault.properties</a></td>
         <td><a href="config-vault.html">Deleted Messages Vault Configuration</a></td>
         <td></td>
       </tr>
       <tr>
-        <td><a href="https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra/destination/conf/dnsservice.xml">dnsservice.xml</a></td>
+        <td><a href="https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/dnsservice.xml">dnsservice.xml</a></td>
         <td><a href="config-dnsservice.html">DNS Service Configuration</a></td>
         <td></td>
       </tr>
       <tr>
-        <td><a href="https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra/destination/conf/elasticsearch.properties">elasticsearch.properties</a></td>
+        <td><a href="https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/elasticsearch.properties">elasticsearch.properties</a></td>
         <td><a href="config-elasticsearch.html">ElasticSearch Configuration</a></td>
         <td></td>
       </tr>
       <tr>
-        <td><a href="https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra/destination/conf/imapserver.xml">imapserver.xml</a></td>
+        <td><a href="https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/imapserver.xml">imapserver.xml</a></td>
         <td><a href="config-imap4.html">IMAP4 Configuration</a></td>
         <td></td>
       </tr>
       <tr>
-        <td><a href="https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra/destination/conf/lmtpserver.xml">lmtpserver.xml</a></td>
+        <td><a href="https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/lmtpserver.xml">lmtpserver.xml</a></td>
         <td><a href="config-smtp-lmtp.html">LMTP Configuration</a></td>
         <td></td>
       </tr>
       <tr>
-        <td><a href="https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra/destination/conf/mailetcontainer.xml">mailetcontainer.xml</a></td>
+        <td><a href="https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/mailetcontainer.xml">mailetcontainer.xml</a></td>
         <td><a href="config-mailetcontainer.html">Mailet Container Configuration</a></td>
         <td></td>
       </tr>
       <tr>
-        <td><a href="https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra/destination/conf/pop3server.xml">pop3server.xml</a></td>
+        <td><a href="https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/pop3server.xml">pop3server.xml</a></td>
         <td><a href="config-pop3.html">POP3 Configuration</a></td>
         <td></td>
       </tr>
       <tr>
-        <td><a href="https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/rabbitmq.properties">rabbitmq.properties</a></td>
+        <td><a href="https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/rabbitmq.properties">rabbitmq.properties</a></td>
         <td><a href="config-rabbitmq.html">RabbitMQ Configuration</a></td>
         <td></td>
       </tr>
       <tr>
-        <td><a href="https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra/destination/conf/smtpserver.xml">smtpserver.xml</a></td>
+        <td><a href="https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/smtpserver.xml">smtpserver.xml</a></td>
         <td><a href="config-smtp-lmtp.html">SMTP Configuration</a></td>
         <td></td>
       </tr>
diff --git a/src/site/xdoc/server/config-healthcheck.xml b/src/site/xdoc/server/config-healthcheck.xml
index c53635a..6e0e527 100644
--- a/src/site/xdoc/server/config-healthcheck.xml
+++ b/src/site/xdoc/server/config-healthcheck.xml
@@ -26,7 +26,7 @@
     <body>
         <section name="PeriodicalHealthChecks Configuration">
 
-            <p>Consult <a href="https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra/destination/conf/healthcheck.properties">healthcheck.properties</a> in GIT to get some examples and hints.</p>
+            <p>Consult <a href="https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/healthcheck.properties">healthcheck.properties</a> in GIT to get some examples and hints.</p>
 
             <p>
                 Use this configuration to define the initial delay and period for the PeriodicalHealthChecks. It is only applicable with Guice products.
diff --git a/src/site/xdoc/server/config-imap4.xml b/src/site/xdoc/server/config-imap4.xml
index d997723..24810e0 100644
--- a/src/site/xdoc/server/config-imap4.xml
+++ b/src/site/xdoc/server/config-imap4.xml
@@ -27,7 +27,7 @@
 
 <section name="IMAP4 Configuration">
 
-      <p>Consult <a href="https://github.com/apache/james-project/tree/master/server/app/src/main/resources/imapserver.xml">imapserver.xml</a> in GIT to get some examples and hints.</p>
+      <p>Consult <a href="https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/imapserver.xml">imapserver.xml</a> in GIT to get some examples and hints.</p>
 
     <p>The IMAP4 service is controlled by a configuration block in the imap4server.xml.
        The imap4server tag defines the boundaries of the configuration block.  It encloses 
diff --git a/src/site/xdoc/server/config-jmap.xml b/src/site/xdoc/server/config-jmap.xml
index c90cfed..5cc88f1 100644
--- a/src/site/xdoc/server/config-jmap.xml
+++ b/src/site/xdoc/server/config-jmap.xml
@@ -35,7 +35,7 @@
 
             <subsection name="jmap.properties">
 
-                <p>Consult <a href="https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra/destination/conf/jmap.properties">jmap.properties</a> in GIT to get some examples and hints.</p>
+                <p>Consult <a href="https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/jmap.properties">jmap.properties</a> in GIT to get some examples and hints.</p>
 
                 <br/>
 
diff --git a/src/site/xdoc/server/config-listeners.xml b/src/site/xdoc/server/config-listeners.xml
index d9c6c18..4132553 100644
--- a/src/site/xdoc/server/config-listeners.xml
+++ b/src/site/xdoc/server/config-listeners.xml
@@ -33,7 +33,7 @@
               mailbox listeners configuration.
             </p>
 
-            <p>Consult <a href="https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra/destination/conf/listeners.xml">listeners.xml</a>
+            <p>Consult <a href="https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/listeners.xml">listeners.xml</a>
                 to get some examples and hints.</p>
 
             <p>James Guice wiring allow the user to register potentially user defined additional mailbox listeners.</p>
@@ -94,7 +94,7 @@
             <p>Upon injections, the user can reference additional guice modules, that are going to be used only upon extensions instantiation.
                 In order to do that:</p>
             <p> 1. Place the jar containing the guice module that should be used to instantiate your extensions within the /extensions-jars folder</p>
-            <p> 2. Register your module fully qualified class name within <a href="https://github.com/apache/james-projectdockerfiles/run/guice/memory/destination/conf/extensions.properties">
+            <p> 2. Register your module fully qualified class name within <a href="https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/extensions.properties">
                 extensions.properties</a> under the <code>guice.extension.module</code> key.</p>
         </section>
     </body>
diff --git a/src/site/xdoc/server/config-rabbitmq.xml b/src/site/xdoc/server/config-rabbitmq.xml
index f53eb76..2add3fa 100644
--- a/src/site/xdoc/server/config-rabbitmq.xml
+++ b/src/site/xdoc/server/config-rabbitmq.xml
@@ -33,7 +33,7 @@
           And it is only applicable with Guice products.
       </p>
       <p>
-          Consult <a href="https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/rabbitmq.properties">rabbitmq.properties</a>
+          Consult <a href="https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/rabbitmq.properties">rabbitmq.properties</a>
           in GIT to get some examples and hints.
       </p>
 
@@ -129,7 +129,7 @@
           <dd>
               James divide the view into slices, each slice contains data for a given period, sliceWindow parameter controls this period.
               This dividing of periods allows faster browsing of the mail queue. Tips for choosing sliceWindow are explained in
-              <a href="https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/rabbitmq.properties">rabbitmq.properties</a>
+              <a href="https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/rabbitmq.properties">rabbitmq.properties</a>
           </dd>
 
           <dt><strong>mailqueue.view.bucketCount</strong></dt>
@@ -137,7 +137,7 @@
               Mails in a mail queue are distributed across the underlying storage service.
               BucketCount describes how to be distributing mails to fit with your James setup
               Tips for choosing bucketCount are explained in
-              <a href="https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/rabbitmq.properties">rabbitmq.properties</a>
+              <a href="https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/rabbitmq.properties">rabbitmq.properties</a>
           </dd>
 
           <dt><strong>mailqueue.view.updateBrowseStartPace</strong></dt>
@@ -145,7 +145,7 @@
               To browse, James needs a starting point and to continuously update that point in runtime.
               UpdateBrowseStartPace describes the probability to update the starting point.
               Tips for choosing updateBrowseStartPace are explained in
-              <a href="https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/rabbitmq.properties">rabbitmq.properties</a>
+              <a href="https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/rabbitmq.properties">rabbitmq.properties</a>
           </dd>
 
           <dt><strong>mailqueue.size.metricsEnabled</strong></dt>
@@ -155,7 +155,7 @@
               sometimes it can get too big, making it impossible for the ES reporter to handle it correctly without crashing.
               It can be useful then to disable it.
               Tips for choosing metricsEnabled are explained in
-              <a href="https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/rabbitmq.properties">rabbitmq.properties</a>
+              <a href="https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/rabbitmq.properties">rabbitmq.properties</a>
           </dd>
       </dl>
   </section>
diff --git a/src/site/xdoc/server/config-vault.xml b/src/site/xdoc/server/config-vault.xml
index 6eab331..ca2d4bc 100644
--- a/src/site/xdoc/server/config-vault.xml
+++ b/src/site/xdoc/server/config-vault.xml
@@ -47,7 +47,7 @@
 
             <subsection name="deletedMessageVault.properties">
 
-                <p>Consult <a href="https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra/destination/conf/deletedMessageVault.properties">deletedMessageVault.properties</a>
+                <p>Consult <a href="https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/deletedMessageVault.properties">deletedMessageVault.properties</a>
                     to get some examples and hints.</p>
                 <br/>
                 <dl>
diff --git a/src/site/xdoc/server/config-webadmin.xml b/src/site/xdoc/server/config-webadmin.xml
index 1523e82..8f9aa0e 100644
--- a/src/site/xdoc/server/config-webadmin.xml
+++ b/src/site/xdoc/server/config-webadmin.xml
@@ -27,7 +27,7 @@
 
   <section name="WebAdmin Configuration">
 
-    <p>Consult <a href="https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra/destination/conf/webadmin.properties">webadmin.properties</a> in GIT to get some examples and hints.</p>
+    <p>Consult <a href="https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/webadmin.properties">webadmin.properties</a> in GIT to get some examples and hints.</p>
 
     <p>Use this configuration to define the WebAdmin's responding host and port.</p>
 
diff --git a/src/site/xdoc/server/config.xml b/src/site/xdoc/server/config.xml
index d2e17c3..28aec46 100644
--- a/src/site/xdoc/server/config.xml
+++ b/src/site/xdoc/server/config.xml
@@ -33,7 +33,7 @@
       Of course, you can change the files *.xml the settings to match your needs.</p>
 
     <p> For Guice based wiring, you are encouraged to take a look at default configuration of the
-      <a href="https://github.com/apache/james-project/tree/master/dockerfiles/run/guice">James docker images</a>.</p>
+      <a href="https://hub.docker.com/r/apache/james">James docker images</a>.</p>
 
     <p>Please note that the configuration is dependent of the wiring you have chosen. Some configuration files are specific to
     some back-ends, to some protocols. Please also note that some configuration files are not required for Guice. In this
@@ -79,7 +79,7 @@
         <td></td>
       </tr>
       <tr>
-        <td><a href="https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra/destination/conf/jmap.properties">jmap.properties</a></td>
+        <td><a href="https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/jmap.properties">jmap.properties</a></td>
         <td><a href="config-jmap.html">JMAP Configuration (Guice only)</a></td>
         <td></td>
       </tr>
@@ -129,7 +129,7 @@
         <td></td>
       </tr>
       <tr>
-        <td><a href="https://github.com/apache/james-project/blob/master/dockerfiles/run/guice/cassandra-ldap/destination/conf/webadmin.properties">webadmin.properties</a></td>
+        <td><a href="https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/webadmin.properties">webadmin.properties</a></td>
         <td><a href="config-webadmin.html">WebAdmin Configuration</a></td>
         <td></td>
       </tr>
diff --git a/src/site/xdoc/server/dev-extend-mailet.xml b/src/site/xdoc/server/dev-extend-mailet.xml
index d143b3c..766e465 100644
--- a/src/site/xdoc/server/dev-extend-mailet.xml
+++ b/src/site/xdoc/server/dev-extend-mailet.xml
@@ -179,7 +179,7 @@ public class MyMailet extends GenericMailet{
     <p>Upon injections, the user can reference additional guice modules, that are going to be used only upon extensions instantiation.
     In order to do that:</p>
     <p> 1. Place the jar containing the guice module that should be used to instantiate your extensions within the /extensions-jars folder</p>
-    <p> 2. Register your module fully qualified class name within <a href="https://github.com/apache/james-projectdockerfiles/run/guice/memory/destination/conf/extensions.properties">
+    <p> 2. Register your module fully qualified class name within <a href="https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/extensions.properties">
       extensions.properties</a> under the <code>guice.extension.module</code> key.</p>
   </subsection>
 
diff --git a/src/site/xdoc/server/dev-extend-matcher.xml b/src/site/xdoc/server/dev-extend-matcher.xml
index 274d90d..553d7f1 100644
--- a/src/site/xdoc/server/dev-extend-matcher.xml
+++ b/src/site/xdoc/server/dev-extend-matcher.xml
@@ -149,7 +149,7 @@ After that restart james.
         <p>Upon injections, the user can reference additional guice modules, that are going to be used only upon extensions instantiation.
             In order to do that:</p>
         <p> 1. Place the jar containing the guice module that should be used to instantiate your extensions within the /extensions-jars folder</p>
-        <p> 2. Register your module fully qualified class name within <a href="https://github.com/apache/james-projectdockerfiles/run/guice/memory/destination/conf/extensions.properties">
+        <p> 2. Register your module fully qualified class name within <a href="https://github.com/apache/james-project/blob/master/server/container/guice/memory-guice/sample-configuration/extensions.properties">
             extensions.properties</a> under the <code>guice.extension.module</code> key.</p>
     </subsection>
 
diff --git a/src/site/xdoc/server/dev-extend.xml b/src/site/xdoc/server/dev-extend.xml
index 9132c2d..23a6d60 100644
--- a/src/site/xdoc/server/dev-extend.xml
+++ b/src/site/xdoc/server/dev-extend.xml
@@ -118,7 +118,7 @@
         jar-with-dependencies within the <b>extensions-jars</b> folder of your James installation, as you will do for any other extension.</p>
 
         <p>Then register your additional Guice modules for extensions within the
-        <a href="https://github.com/apache/james-project/tree/master/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/extensions.properties">extensions.properties</a>
+        <a href="https://github.com/apache/james-project/blob/master/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/extensions.properties">extensions.properties</a>
         configuration file.</p>
 
         <p>Note: No Guice extensions will be applied upon Guice extension module invocation.</p>

---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org


[james-project] 02/03: JAMES-3261 Documentation website: install.xml was referencing 3.3.0 instad of 3.6.0

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 3aa2009f9a6ee325f608080f2e22b54cd8868301
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Sat May 29 14:55:19 2021 +0700

    JAMES-3261 Documentation website: install.xml was referencing 3.3.0 instad of 3.6.0
---
 src/site/xdoc/server/install.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/site/xdoc/server/install.xml b/src/site/xdoc/server/install.xml
index 8198a81..79e751e 100644
--- a/src/site/xdoc/server/install.xml
+++ b/src/site/xdoc/server/install.xml
@@ -29,11 +29,11 @@
 
   <subsection name="Java Virtual Machine">
   
-    <p>James 3.3.0 requires a Java Runtime Environment. Java version 1.8 is required to run the
+    <p>James 3.6.0 requires a Java Runtime Environment. Java version 1.8 is required to run the
        James application. The exact JREs available depends on the platform. In addition, the environment variable JAVA_HOME should be set to
        the JRE home directory before running James.</p>
     
-    <p>James 3.3.0 has been successfully tested on OpenJDK 1.8.0_181</p>
+    <p>James 3.6.0 has been successfully tested on OpenJDK 1.8.0_181</p>
   
   </subsection>
   
@@ -72,8 +72,8 @@
   </section>
 
   <section name="Build instructions">
-      <p>Checkout code from the chosen version on <a href="https://github.com/apache/james-project/tree/james-project-3.3.0">
-          GitHub</a>. Follow <a href="https://github.com/apache/james-project/blob/james-project-3.3.0/README.adoc">README instructions</a> about compilation.</p>
+      <p>Checkout code from the chosen version on <a href="https://github.com/apache/james-project/tree/james-project-3.6.0">
+          GitHub</a>. Follow <a href="https://github.com/apache/james-project/blob/james-project-3.6.0/README.adoc">README instructions</a> about compilation.</p>
 
       <ul>Using these instructions, you can build the following images:
           <li>Guice + JPA + Lucene</li>
@@ -89,7 +89,7 @@
           <a href="install/jpa-guice.html">JPA-Guice</a> and <a href="install/jpa-smtp-guice.html">JPA-SMTP-Guice</a>.
       </p>
 
-      <p>A <a href="https://github.com/apache/james-project/blob/james-project-3.3.0/dockerfiles/run/docker-compose.yml">
+      <p>A <a href="https://github.com/apache/james-project/blob/james-project-3.6.0/dockerfiles/run/docker-compose.yml">
           docker-compose</a> is available for Guice + Cassandra + ElasticSearch + RabbitMQ</p>
   </section>
 

---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org