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/29 05:23:14 UTC

[james-project] 05/10: JAMES-3261 Drop LDAP containers for Cassandra-Guice and the distributed server

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 ee8769f9de6458db9769cb04c79de25c29944948
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Sat Apr 17 15:10:00 2021 +0700

    JAMES-3261 Drop LDAP containers for Cassandra-Guice and the distributed server
    
    The default packaging show how to set it up. As LDAP support is packaged
    within these binaries we don't need to support yet-another image set.
---
 dockerfiles/run/guice/cassandra-ldap/Dockerfile    |  45 ------
 .../destination/conf/batchsizes.properties         |  10 --
 .../destination/conf/blob.properties               |  62 --------
 .../destination/conf/cassandra.properties          |  39 ------
 .../conf/deletedMessageVault.properties            |   4 -
 .../cassandra-ldap/destination/conf/dnsservice.xml |  27 ----
 .../cassandra-ldap/destination/conf/domainlist.xml |  27 ----
 .../destination/conf/elasticsearch.properties      |  84 -----------
 .../destination/conf/extensions.properties         |  10 --
 .../destination/conf/healthcheck.properties        |  30 ----
 .../cassandra-ldap/destination/conf/imapserver.xml |  61 --------
 .../destination/conf/jmap.properties               |  18 ---
 .../cassandra-ldap/destination/conf/jmx.properties |  26 ----
 .../cassandra-ldap/destination/conf/jwt_publickey  |   9 --
 .../guice/cassandra-ldap/destination/conf/keystore | Bin 2224 -> 0 bytes
 .../cassandra-ldap/destination/conf/listeners.xml  |  42 ------
 .../cassandra-ldap/destination/conf/lmtpserver.xml |  43 ------
 .../cassandra-ldap/destination/conf/logback.xml    |  42 ------
 .../destination/conf/mailetcontainer.xml           | 156 ---------------------
 .../destination/conf/mailrepositorystore.xml       |  33 -----
 .../destination/conf/managesieveserver.xml         |  65 ---------
 .../cassandra-ldap/destination/conf/pop3server.xml |  43 ------
 .../destination/conf/recipientrewritetable.xml     |  28 ----
 .../cassandra-ldap/destination/conf/smime.p12      | Bin 4141 -> 0 bytes
 .../cassandra-ldap/destination/conf/smtpserver.xml | 107 --------------
 .../destination/conf/tika.properties               |  23 ---
 .../destination/conf/usersrepository.xml           |  29 ----
 .../destination/conf/webadmin.properties           |  54 -------
 .../destination/extensions-jars/README.md          |   5 -
 .../cassandra-ldap/destination/glowroot/admin.json |   5 -
 .../destination/glowroot/plugins/blobstore.json    |  26 ----
 .../destination/glowroot/plugins/imap.json         |  19 ---
 .../destination/glowroot/plugins/jmap.json         |  19 ---
 .../glowroot/plugins/mailboxListener.json          |  19 ---
 .../destination/glowroot/plugins/smtp.json         |  19 ---
 .../destination/glowroot/plugins/spooler.json      |  45 ------
 .../destination/glowroot/plugins/task.json         |  19 ---
 .../guice/cassandra-ldap/destination/run_james.sh  |   5 -
 .../run/guice/cassandra-rabbitmq-ldap/Dockerfile   |  43 ------
 .../destination/conf/batchsizes.properties         |  10 --
 .../destination/conf/blob.properties               | 100 -------------
 .../destination/conf/cassandra.properties          |  49 -------
 .../conf/deletedMessageVault.properties            |   4 -
 .../destination/conf/dnsservice.xml                |  27 ----
 .../destination/conf/domainlist.xml                |  27 ----
 .../destination/conf/elasticsearch.properties      |  83 -----------
 .../destination/conf/extensions.properties         |  10 --
 .../destination/conf/healthcheck.properties        |  30 ----
 .../destination/conf/imapserver.xml                |  61 --------
 .../destination/conf/jmap.properties               |  18 ---
 .../destination/conf/jmx.properties                |  26 ----
 .../destination/conf/jwt_publickey                 |   9 --
 .../destination/conf/listeners.xml                 |  43 ------
 .../destination/conf/lmtpserver.xml                |  43 ------
 .../destination/conf/logback.xml                   |  42 ------
 .../destination/conf/mailetcontainer.xml           | 156 ---------------------
 .../destination/conf/mailrepositorystore.xml       |  33 -----
 .../destination/conf/managesieveserver.xml         |  65 ---------
 .../destination/conf/pop3server.xml                |  43 ------
 .../destination/conf/rabbitmq.properties           |  63 ---------
 .../destination/conf/recipientrewritetable.xml     |  28 ----
 .../destination/conf/smtpserver.xml                | 107 --------------
 .../destination/conf/tika.properties               |  23 ---
 .../destination/conf/usersrepository.xml           |  29 ----
 .../destination/conf/webadmin.properties           |  54 -------
 .../destination/extensions-jars/README.md          |   5 -
 .../destination/glowroot/admin.json                |   5 -
 .../destination/glowroot/plugins/blobstore.json    |  26 ----
 .../destination/glowroot/plugins/imap.json         |  19 ---
 .../destination/glowroot/plugins/jmap.json         |  19 ---
 .../glowroot/plugins/mailboxListener.json          |  19 ---
 .../destination/glowroot/plugins/smtp.json         |  19 ---
 .../destination/glowroot/plugins/spooler.json      |  45 ------
 .../destination/glowroot/plugins/task.json         |  19 ---
 .../destination/run_james.sh                       |   5 -
 .../sample-configuration/usersrepository.xml       |  14 ++
 .../sample-configuration/usersrepository.xml       |  13 ++
 77 files changed, 27 insertions(+), 2705 deletions(-)

diff --git a/dockerfiles/run/guice/cassandra-ldap/Dockerfile b/dockerfiles/run/guice/cassandra-ldap/Dockerfile
deleted file mode 100644
index ed582ef..0000000
--- a/dockerfiles/run/guice/cassandra-ldap/Dockerfile
+++ /dev/null
@@ -1,45 +0,0 @@
-# Run James
-#
-# VERSION	1.0
-
-FROM adoptopenjdk:11-jre-hotspot
-
-# Ports that are used
-#
-# 25   SMTP without authentication
-# 110  POP3
-# 143  IMAP with startTLS enabled
-# 465  SMTP with authentication and socketTLS enabled
-# 587  SMTP with authentication and startTLS enabled
-# 993  IMAP with socketTLS enabled
-# 8000 Web Admin interface (unsecured: expose at your own risks)
-
-EXPOSE 25 110 143 465 587 993 4000 8000
-
-WORKDIR /root
-
-# Get data we need to run James : build results and configuration
-ADD destination/james-server-cassandra-guice.jar /root/james-server.jar
-ADD destination/james-server-cassandra-guice.lib /root/james-server-cassandra-guice.lib
-ADD destination/james-server-cli.jar /root/james-cli.jar
-ADD destination/james-server-cli.lib /root/james-server-cli.lib
-ADD destination/conf /root/conf
-ADD destination/glowroot/plugins /root/glowroot/plugins
-ADD destination/glowroot/glowroot.jar /root/glowroot/glowroot.jar
-ADD destination/glowroot/lib/glowroot-embedded-collector.jar /root/glowroot/lib/glowroot-embedded-collector.jar
-ADD destination/glowroot/lib/glowroot-logging-logstash.jar /root/glowroot/lib/glowroot-logging-logstash.jar
-ADD destination/glowroot/admin.json /root/glowroot/admin.json
-ADD destination/run_james.sh /root/run_james.sh
-
-# Data for ActiveMQ mailQueue
-VOLUME /root/var
-VOLUME /logs
-VOLUME /root/conf
-VOLUME /root/glowroot/plugins
-VOLUME /root/glowroot/data
-
-ENV PATH="$PATH:/root/glowroot/lib" \
-    JVM_OPTIONS="" \
-    GLOWROOT_ACTIVATED="false"
-
-ENTRYPOINT ./run_james.sh
diff --git a/dockerfiles/run/guice/cassandra-ldap/destination/conf/batchsizes.properties b/dockerfiles/run/guice/cassandra-ldap/destination/conf/batchsizes.properties
deleted file mode 100644
index 47da2c5..0000000
--- a/dockerfiles/run/guice/cassandra-ldap/destination/conf/batchsizes.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-# Those properties let you configure the number of messages queried at the same time.
-# IMAP FETCH command
-fetch.metadata=200
-fetch.headers=200
-fetch.body=100
-fetch.full=50
-# IMAP COPY command
-copy=100
-# IMAP MOVE command
-move=100
diff --git a/dockerfiles/run/guice/cassandra-ldap/destination/conf/blob.properties b/dockerfiles/run/guice/cassandra-ldap/destination/conf/blob.properties
deleted file mode 100644
index c999f80..0000000
--- a/dockerfiles/run/guice/cassandra-ldap/destination/conf/blob.properties
+++ /dev/null
@@ -1,62 +0,0 @@
-# ============================================= BlobStore Implementation ==================================
-# Read https://james.apache.org/server/config-blobstore.html for further details
-
-# Choose your BlobStore implementation
-# Mandatory, allowed values are: cassandra, s3
-implementation=cassandra
-
-# ========================================= ObjectStorage deduplication ========================================
-# If you choose to enable deduplication, the mails with the same content will be stored only once.
-# Warning: Once this feature is enabled, there is no turning back as turning it off will lead to the deletion of all
-# the mails sharing the same content once one is deleted.
-# Mandatory, Allowed values are: true, false
-deduplication.enable=false
-
-# ========================================= Cassandra BlobStore Cache ======================================
-# A cassandra cache can be enabled to reduce latency when reading small blobs frequently
-# A dedicated keyspace with a replication factor of one is then used
-# Cache eviction policy is TTL based
-# Only blobs below a given threshold will be stored.
-# To be noted that blobs are stored within a single Cassandra row, hence a low threshold should be used.
-
-# Enable the cache? Optional and default to false. Must be a boolean.
-cache.enable=false
-
-# Cache eviction policy is TTL based. Optional and defaults to 7 days. Must be a duration.
-# Valid units: ms, sec, min, hour, day, week, month, year
-# cache.cassandra.ttl=7days
-
-# Timeout after which this cache should be bypassed. Optional and defaults to 100ms. Can not exceed 1 hour.
-# Must be a duration Valid units: ms, sec, min, hour, day, week, month, year
-# cache.cassandra.timeout=100ms
-
-# Maximum size of stored objects expressed in bytes. Must be strictly positive. Defaults to 8192.
-# Units: bytes, Kib, MiB, GiB, TiB
-# cache.sizeThresholdInBytes=8 KiB
-
-# ============================================ Blobs Exporting ==============================================
-# Read https://james.apache.org/server/config-blob-export.html for further details
-
-# Choosing blob exporting mechanism, allowed mechanism are: localFile, linshare
-# LinShare is a file sharing service, will be explained in the below section
-# Optional, default is localFile
-blob.export.implementation=localFile
-
-# ======================================= Local File Blobs Exporting ========================================
-# Optional, directory to store exported blob, directory path follows James file system format
-# default is file://var/blobExporting
-blob.export.localFile.directory=file://var/blobExporting
-
-# ======================================= LinShare File Blobs Exporting ========================================
-# LinShare is a sharing service where you can use james, connects to an existing LinShare server and shares files to
-# other mail addresses as long as those addresses available in LinShare. For example you can deploy James and LinShare
-# sharing the same LDAP repository
-# Mandatory if you choose LinShare, url to connect to LinShare service
-# blob.export.linshare.url=http://linshare:8080
-
-# ======================================= LinShare Configuration BasicAuthentication ===================================
-# Authentication is mandatory if you choose LinShare, TechnicalAccount is need to connect to LinShare specific service.
-# For Example: It will be formalized to 'Authorization: Basic {Credential of UUID/password}'
-
-# blob.export.linshare.technical.account.uuid=Technical_Account_UUID
-# blob.export.linshare.technical.account.password=password
diff --git a/dockerfiles/run/guice/cassandra-ldap/destination/conf/cassandra.properties b/dockerfiles/run/guice/cassandra-ldap/destination/conf/cassandra.properties
deleted file mode 100644
index 59421ee..0000000
--- a/dockerfiles/run/guice/cassandra-ldap/destination/conf/cassandra.properties
+++ /dev/null
@@ -1,39 +0,0 @@
-# Configuration file for cassandra mailbox
-# Read https://james.apache.org/server/config-cassandra.html for further details
-
-cassandra.nodes=cassandra
-cassandra.keyspace.create=true
-cassandra.keyspace=apache_james
-#cassandra.user=cassandra
-#cassandra.password=cassandra
-#cassandra.ssl=false
-cassandra.replication.factor=1
-cassandra.retryConnection.maxRetries=200
-cassandra.retryConnection.minDelay=5000
-
-
-## These low level tuning options controls performance related options in Cassandra related code
-## The default values are documented here. Understand the effects before editing.
-# mailbox.read.repair.chance=0.1
-## Maximum probability of running a read repair for the mailbox counters
-# mailbox.counters.read.repair.chance.max=0.1
-## Probability of running a mailbox counters read repair for 100 messages.
-## Inversely proportional to the count of messages
-## Formula: read_repair_chance = min(mailbox.counters.read.repair.chance.max, (100/unseens)*mailbox.counters.read.repair.chance.one.hundred)
-# mailbox.counters.read.repair.chance.one.hundred=0.01
-# mailbox.max.retry.acl=1000
-# mailbox.max.retry.modseq=100000
-# mailbox.max.retry.uid=100000
-# mailbox.max.retry.message.flags.update=1000
-# mailbox.max.retry.message.id.flags.update=1000
-# fetch.advance.row.count=1000
-# chunk.size.message.read=100
-# chunk.size.expunge=100
-# mailbox.blob.part.size=102400
-
-## Consistency levels used for common queries
-## Read https://docs.datastax.com/en/cassandra-oss/3.x/cassandra/dml/dmlConfigConsistency.html
-# QUORUM, LOCAL_QUORUM, or EACH_QUORUM
-# cassandra.consistency_level.regular=QUORUM
-# SERIAL or LOCAL_SERIAL
-# cassandra.consistency_level.lightweight_transaction=SERIAL
diff --git a/dockerfiles/run/guice/cassandra-ldap/destination/conf/deletedMessageVault.properties b/dockerfiles/run/guice/cassandra-ldap/destination/conf/deletedMessageVault.properties
deleted file mode 100644
index ab1e3ee..0000000
--- a/dockerfiles/run/guice/cassandra-ldap/destination/conf/deletedMessageVault.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-# ============================================= Deleted Messages Vault Configuration ==================================
-# Retention period for your deleted messages into the vault, after which they expire and can be potentially cleaned up
-# Optional, default 1y
-# retentionPeriod=1y
\ No newline at end of file
diff --git a/dockerfiles/run/guice/cassandra-ldap/destination/conf/dnsservice.xml b/dockerfiles/run/guice/cassandra-ldap/destination/conf/dnsservice.xml
deleted file mode 100644
index 1c4fb9e..0000000
--- a/dockerfiles/run/guice/cassandra-ldap/destination/conf/dnsservice.xml
+++ /dev/null
@@ -1,27 +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.                                           
- -->
-
-<!-- Read https://james.apache.org/server/config-dnsservice.html for further details -->
-
-<dnsservice>
-  <autodiscover>true</autodiscover>
-  <authoritative>false</authoritative>
-  <maxcachesize>50000</maxcachesize>
-</dnsservice>
diff --git a/dockerfiles/run/guice/cassandra-ldap/destination/conf/domainlist.xml b/dockerfiles/run/guice/cassandra-ldap/destination/conf/domainlist.xml
deleted file mode 100644
index 605439f..0000000
--- a/dockerfiles/run/guice/cassandra-ldap/destination/conf/domainlist.xml
+++ /dev/null
@@ -1,27 +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.                                           
- -->
-
-<!-- Read https://james.apache.org/server/config-domainlist.html for further details -->
-
-<domainlist>
-    <autodetect>false</autodetect>
-    <autodetectIP>false</autodetectIP>
-    <defaultDomain>localhost</defaultDomain>
-</domainlist>
diff --git a/dockerfiles/run/guice/cassandra-ldap/destination/conf/elasticsearch.properties b/dockerfiles/run/guice/cassandra-ldap/destination/conf/elasticsearch.properties
deleted file mode 100644
index 74e5a3d..0000000
--- a/dockerfiles/run/guice/cassandra-ldap/destination/conf/elasticsearch.properties
+++ /dev/null
@@ -1,84 +0,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.
-
-#  This template file can be used as example for James Server configuration
-#  DO NOT USE IT AS SUCH AND ADAPT IT TO YOUR NEEDS
-
-# Configuration file for ElasticSearch
-
-# Read https://james.apache.org/server/config-elasticsearch.html for further details
-
-elasticsearch.masterHost=elasticsearch
-elasticsearch.port=9200
-
-# Optional. Only http or https are accepted, default is http
-# elasticsearch.hostScheme=http
-
-# Optional, default is `default`
-# Choosing the SSL check strategy when using https scheme
-# default: Use the default SSL TrustStore of the system.
-# ignore: Ignore SSL Validation check (not recommended).
-# override: Override the SSL Context to use a custom TrustStore containing ES server's certificate.
-# elasticsearch.hostScheme.https.sslValidationStrategy=default
-
-# Optional. Required when using 'https' scheme and 'override' sslValidationStrategy
-# Configure Elasticsearch rest client to use this trustStore file to recognize nginx's ssl certificate.
-# You need to specify both trustStorePath and trustStorePassword
-# elasticsearch.hostScheme.https.trustStorePath=/file/to/trust/keystore.jks
-
-# Optional. Required when using 'https' scheme and 'override' sslValidationStrategy
-# Configure Elasticsearch rest client to use this trustStore file with the specified password.
-# You need to specify both trustStorePath and trustStorePassword
-# elasticsearch.hostScheme.https.trustStorePassword=myJKSPassword
-
-# Optional. default is `default`
-# Configure Elasticsearch rest client to use host name verifier during SSL handshake
-# default: using the default hostname verifier provided by apache http client.
-# accept_any_hostname: accept any hostname (not recommended).
-# elasticsearch.hostScheme.https.hostNameVerifier=default
-
-# Optional.
-# Basic auth username to access elasticsearch.
-# Ignore elasticsearch.user and elasticsearch.password to not be using authentication (default behaviour).
-# Otherwise, you need to specify both properties.
-# elasticsearch.user=elasticsearch
-
-# Optional.
-# Basic auth password to access elasticsearch.
-# Ignore elasticsearch.user and elasticsearch.password to not be using authentication (default behaviour).
-# Otherwise, you need to specify both properties.
-# elasticsearch.password=secret
-
-# You can alternatively provide a list of hosts following this format :
-# elasticsearch.hosts=host1:9200,host2:9200
-# elasticsearch.clusterName=cluster
-
-elasticsearch.nb.shards=5
-elasticsearch.nb.replica=1
-elasticsearch.index.waitForActiveShards=1
-elasticsearch.retryConnection.maxRetries=7
-elasticsearch.retryConnection.minDelay=3000
-# Index or not attachments (default value: true)
-elasticsearch.indexAttachments=true
-
-# Reports for metrics into ElasticSearch
-# Defaults to elasticsearch.masterHost : on which server to publish metrics
-elasticsearch.http.host=elasticsearch
-elasticsearch.http.port=9200
-elasticsearch.metrics.reports.enabled=true
-elasticsearch.metrics.reports.period=30
-elasticsearch.metrics.reports.index=james-metrics
diff --git a/dockerfiles/run/guice/cassandra-ldap/destination/conf/extensions.properties b/dockerfiles/run/guice/cassandra-ldap/destination/conf/extensions.properties
deleted file mode 100644
index 2a2c23e..0000000
--- a/dockerfiles/run/guice/cassandra-ldap/destination/conf/extensions.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-# This files enables customization of users extensions injections with guice.
-# A user can drop some jar-with-dependencies within the ./extensions-jars folder and
-# reference classes of these jars in some of James extension mechanisms.
-
-# This includes mailets, matchers, mailboxListeners, preDeletionHooks, protocolHandlers, webAdmin routes
-
-# Upon injections, the user can reference additional guice modules, that are going to be used only upon extensions instantiation.
-
-#List of coma separated (',') fully qualified class names of additional guice modules to be used to instantiate extensions
-#guice.extension.module=
\ No newline at end of file
diff --git a/dockerfiles/run/guice/cassandra-ldap/destination/conf/healthcheck.properties b/dockerfiles/run/guice/cassandra-ldap/destination/conf/healthcheck.properties
deleted file mode 100644
index 9f3bad1..0000000
--- a/dockerfiles/run/guice/cassandra-ldap/destination/conf/healthcheck.properties
+++ /dev/null
@@ -1,30 +0,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.
-
-#  This template file can be used as example for James Server configuration
-#  DO NOT USE IT AS SUCH AND ADAPT IT TO YOUR NEEDS
-
-# Configuration file for Periodical Health Checks
-
-# Read https://james.apache.org/server/config-healthcheck.html for further details
-
-# Optional. Period between two PeriodicalHealthChecks.
-# Units supported are (ms - millisecond, s - second, m - minute, h - hour, d - day). Default unit is millisecond.
-# Default duration is 60 seconds.
-# Duration must be greater or at least equals to 10 seconds.
-# healthcheck.period=60s
-
diff --git a/dockerfiles/run/guice/cassandra-ldap/destination/conf/imapserver.xml b/dockerfiles/run/guice/cassandra-ldap/destination/conf/imapserver.xml
deleted file mode 100644
index 12aa52d..0000000
--- a/dockerfiles/run/guice/cassandra-ldap/destination/conf/imapserver.xml
+++ /dev/null
@@ -1,61 +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.
--->
-
-<!-- Read https://james.apache.org/server/config-imap4.html for further details -->
-
-<imapservers>
-    <imapserver enabled="true">
-        <jmxName>imapserver</jmxName>
-        <bind>0.0.0.0:143</bind>
-        <connectionBacklog>200</connectionBacklog>
-        <tls socketTLS="false" startTLS="true">
-            <!-- To create a new keystore execute:
-            keytool -genkey -alias james -keyalg RSA -keystore /path/to/james/conf/keystore
-              -->
-            <keystore>file://conf/keystore</keystore>
-            <secret>james72laBalle</secret>
-            <provider>org.bouncycastle.jce.provider.BouncyCastleProvider</provider>
-        </tls>
-        <connectionLimit>0</connectionLimit>
-        <connectionLimitPerIP>0</connectionLimitPerIP>
-        <idleTimeInterval>120</idleTimeInterval>
-        <idleTimeIntervalUnit>SECONDS</idleTimeIntervalUnit>
-        <enableIdle>true</enableIdle>
-    </imapserver>
-    <imapserver enabled="true">
-        <jmxName>imapserver-ssl</jmxName>
-        <bind>0.0.0.0:993</bind>
-        <connectionBacklog>200</connectionBacklog>
-        <tls socketTLS="true" startTLS="false">
-            <!-- To create a new keystore execute:
-              keytool -genkey -alias james -keyalg RSA -keystore /path/to/james/conf/keystore
-             -->
-            <keystore>file://conf/keystore</keystore>
-            <secret>james72laBalle</secret>
-            <provider>org.bouncycastle.jce.provider.BouncyCastleProvider</provider>
-        </tls>
-        <connectionLimit>0</connectionLimit>
-        <connectionLimitPerIP>0</connectionLimitPerIP>
-        <idleTimeInterval>120</idleTimeInterval>
-        <idleTimeIntervalUnit>SECONDS</idleTimeIntervalUnit>
-        <enableIdle>true</enableIdle>
-    </imapserver>
-</imapservers>
diff --git a/dockerfiles/run/guice/cassandra-ldap/destination/conf/jmap.properties b/dockerfiles/run/guice/cassandra-ldap/destination/conf/jmap.properties
deleted file mode 100644
index 1980cfa..0000000
--- a/dockerfiles/run/guice/cassandra-ldap/destination/conf/jmap.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Configuration file for JMAP
-# Read https://james.apache.org/server/config-jmap.html for further details
-
-enabled=true
-
-tls.keystoreURL=file://conf/keystore
-tls.secret=james72laBalle
-
-#
-# If you wish to use OAuth authentication, you should provide a valid JWT public key.
-# The following entry specify the link to the URL of the public key file,
-# which should be a PEM format file.
-#
-jwt.publickeypem.url=file://conf/jwt_publickey
-
-# Should simple Email/query be resolved against a Cassandra projection, or should we resolve them against ElasticSearch?
-# This enables a higher resilience, but the projection needs to be correctly populated. False by default.
-# view.email.query.enabled=true
diff --git a/dockerfiles/run/guice/cassandra-ldap/destination/conf/jmx.properties b/dockerfiles/run/guice/cassandra-ldap/destination/conf/jmx.properties
deleted file mode 100644
index e56235f..0000000
--- a/dockerfiles/run/guice/cassandra-ldap/destination/conf/jmx.properties
+++ /dev/null
@@ -1,26 +0,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.
-#
-
-#  This template file can be used as example for James Server configuration
-#  DO NOT USE IT AS SUCH AND ADAPT IT TO YOUR NEEDS
-
-# Read https://james.apache.org/server/config-system.html#jmx.properties for further details
-
-jmx.enabled=true
-jmx.address=127.0.0.1
-jmx.port=9999
diff --git a/dockerfiles/run/guice/cassandra-ldap/destination/conf/jwt_publickey b/dockerfiles/run/guice/cassandra-ldap/destination/conf/jwt_publickey
deleted file mode 100644
index 53914e0..0000000
--- a/dockerfiles/run/guice/cassandra-ldap/destination/conf/jwt_publickey
+++ /dev/null
@@ -1,9 +0,0 @@
------BEGIN PUBLIC KEY-----
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtlChO/nlVP27MpdkG0Bh
-16XrMRf6M4NeyGa7j5+1UKm42IKUf3lM28oe82MqIIRyvskPc11NuzSor8HmvH8H
-lhDs5DyJtx2qp35AT0zCqfwlaDnlDc/QDlZv1CoRZGpQk1Inyh6SbZwYpxxwh0fi
-+d/4RpE3LBVo8wgOaXPylOlHxsDizfkL8QwXItyakBfMO6jWQRrj7/9WDhGf4Hi+
-GQur1tPGZDl9mvCoRHjFrD5M/yypIPlfMGWFVEvV5jClNMLAQ9bYFuOc7H1fEWw6
-U1LZUUbJW9/CH45YXz82CYqkrfbnQxqRb2iVbVjs/sHopHd1NTiCfUtwvcYJiBVj
-kwIDAQAB
------END PUBLIC KEY-----
diff --git a/dockerfiles/run/guice/cassandra-ldap/destination/conf/keystore b/dockerfiles/run/guice/cassandra-ldap/destination/conf/keystore
deleted file mode 100644
index 54528cd..0000000
Binary files a/dockerfiles/run/guice/cassandra-ldap/destination/conf/keystore and /dev/null differ
diff --git a/dockerfiles/run/guice/cassandra-ldap/destination/conf/listeners.xml b/dockerfiles/run/guice/cassandra-ldap/destination/conf/listeners.xml
deleted file mode 100644
index 948cb92..0000000
--- a/dockerfiles/run/guice/cassandra-ldap/destination/conf/listeners.xml
+++ /dev/null
@@ -1,42 +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.                                           
- -->
-
-<!-- Read https://james.apache.org/server/config-listeners.html for further details -->
-
-<listeners>
-  <listener>
-    <class>org.apache.james.mailbox.spamassassin.SpamAssassinListener</class>
-    <async>true</async>
-  </listener>
-  <listener>
-    <class>org.apache.james.mailbox.cassandra.MailboxOperationLoggingListener</class>
-  </listener>
-  <preDeletionHook>
-    <class>org.apache.james.vault.DeletedMessageVaultHook</class>
-  </preDeletionHook>
-
-  <!-- Enable to populate JMAP EmailQueryView -->
-  <!--
-  <listener>
-    <class>org.apache.james.jmap.event.PopulateEmailQueryViewListener</class>
-    <async>true</async>
-  </listener>
-  -->
-</listeners>
\ No newline at end of file
diff --git a/dockerfiles/run/guice/cassandra-ldap/destination/conf/lmtpserver.xml b/dockerfiles/run/guice/cassandra-ldap/destination/conf/lmtpserver.xml
deleted file mode 100644
index 723da3f..0000000
--- a/dockerfiles/run/guice/cassandra-ldap/destination/conf/lmtpserver.xml
+++ /dev/null
@@ -1,43 +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.                                           
- -->
-
-<!-- Read https://james.apache.org/server/config-smtp-lmtp.html#LMTP_Configuration for further details -->
-
-<lmtpservers>
-
-    <lmtpserver enabled="false">
-        <jmxName>lmtpserver</jmxName>
-        <!-- LMTP should not be reachable from outside your network so bind it to loopback-->
-        <bind>127.0.0.1:24</bind>
-        <connectionBacklog>200</connectionBacklog>
-        <connectiontimeout>1200</connectiontimeout>
-        <!-- Set the maximum simultaneous incoming connections for this service -->
-        <connectionLimit>0</connectionLimit>
-        <!-- Set the maximum simultaneous incoming connections per IP for this service -->
-        <connectionLimitPerIP>0</connectionLimitPerIP>
-        <!--  This sets the maximum allowed message size (in kilobytes) for this -->
-        <!--  LMTP service. If unspecified, the value defaults to 0, which means no limit. -->
-        <maxmessagesize>0</maxmessagesize>
-        <handlerchain>
-            <handler class="org.apache.james.lmtpserver.CoreCmdHandlerLoader"/>
-        </handlerchain>
-    </lmtpserver>
-
-</lmtpservers>
diff --git a/dockerfiles/run/guice/cassandra-ldap/destination/conf/logback.xml b/dockerfiles/run/guice/cassandra-ldap/destination/conf/logback.xml
deleted file mode 100644
index 6f38617..0000000
--- a/dockerfiles/run/guice/cassandra-ldap/destination/conf/logback.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration>
-
-        <contextListener class="ch.qos.logback.classic.jul.LevelChangePropagator">
-                <resetJUL>true</resetJUL>
-        </contextListener>
-
-        <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
-                <encoder>
-                        <pattern>%d{HH:mm:ss.SSS} %highlight([%-5level]) %logger{15} - %msg%n%rEx</pattern>
-                        <immediateFlush>false</immediateFlush>
-                </encoder>
-        </appender>
-
-        <appender name="LOG_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-                <file>/logs/james.log</file>
-                <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-                    <fileNamePattern>/logs/james.%i.log.tar.gz</fileNamePattern>
-                    <minIndex>1</minIndex>
-                    <maxIndex>3</maxIndex>
-                </rollingPolicy>
-
-                <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
-                    <maxFileSize>100MB</maxFileSize>
-                </triggeringPolicy>
-
-                <encoder>
-                        <pattern>%d{HH:mm:ss.SSS} [%-5level] %logger{15} - %msg%n%rEx</pattern>
-                        <immediateFlush>false</immediateFlush>
-                </encoder>
-        </appender>
-
-        <root level="WARN">
-                <appender-ref ref="CONSOLE" />
-                <appender-ref ref="LOG_FILE" />
-        </root>
-
-        <logger name="org.apache.james" level="INFO" />
-        <logger name="com.datastax.driver.core.QueryLogger.SLOW" level="DEBUG" />
-
-
-</configuration>
diff --git a/dockerfiles/run/guice/cassandra-ldap/destination/conf/mailetcontainer.xml b/dockerfiles/run/guice/cassandra-ldap/destination/conf/mailetcontainer.xml
deleted file mode 100644
index 4b2abf4..0000000
--- a/dockerfiles/run/guice/cassandra-ldap/destination/conf/mailetcontainer.xml
+++ /dev/null
@@ -1,156 +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.
- -->
-
-<!-- Read https://james.apache.org/server/config-mailetcontainer.html for further details -->
-
-<mailetcontainer enableJmx="true">
-
-    <context>
-        <!-- When the domain part of the postmaster mailAddress is missing, the default domain is appended.
-        You can configure it to (for example) <postmaster>postmaster@myDomain.com</postmaster> -->
-        <postmaster>postmaster</postmaster>
-    </context>
-
-    <spooler>
-        <threads>20</threads>
-        <errorRepository>cassandra://var/mail/error/</errorRepository>
-    </spooler>
-
-    <processors>
-        <processor state="root" enableJmx="true">
-            <mailet match="All" class="PostmasterAlias"/>
-            <mailet match="RelayLimit=30" class="Null"/>
-            <mailet match="All" class="ToProcessor">
-                <processor>transport</processor>
-            </mailet>
-        </processor>
-
-        <processor state="error" enableJmx="true">
-            <mailet match="All" class="MetricsMailet">
-                <metricName>mailetContainerErrors</metricName>
-            </mailet>
-            <mailet match="All" class="Bounce">
-                <onMailetException>ignore</onMailetException>
-            </mailet>
-            <mailet match="All" class="ToRepository">
-                <repositoryPath>cassandra://var/mail/error/</repositoryPath>
-                <onMailetException>ignore</onMailetException>
-            </mailet>
-        </processor>
-
-        <processor state="transport" enableJmx="true">
-            <matcher name="relay-allowed" match="org.apache.james.mailetcontainer.impl.matchers.Or">
-                <matcher match="SMTPAuthSuccessful"/>
-                <matcher match="SMTPIsAuthNetwork"/>
-                <matcher match="SentByMailet"/>
-                <matcher match="org.apache.james.jmap.mailet.SentByJmap"/>
-            </matcher>
-
-            <mailet match="All" class="RemoveMimeHeader">
-                <name>bcc</name>
-                <onMailetException>ignore</onMailetException>
-            </mailet>
-            <mailet match="All" class="RecipientRewriteTable">
-                <errorProcessor>rrt-error</errorProcessor>
-            </mailet>
-            <mailet match="RecipientIsLocal" class="ToProcessor">
-                <processor>local-delivery</processor>
-            </mailet>
-            <mailet match="HostIsLocal" class="ToProcessor">
-                <processor>local-address-error</processor>
-                <notice>550 - Requested action not taken: no such user here</notice>
-            </mailet>
-            <mailet match="relay-allowed" class="ToProcessor">
-                <processor>relay</processor>
-            </mailet>
-            <mailet match="All" class="ToProcessor">
-                <processor>relay-denied</processor>
-            </mailet>
-        </processor>
-
-        <processor state="local-delivery" enableJmx="true">
-            <mailet match="All" class="org.apache.james.jmap.mailet.VacationMailet"/>
-            <mailet match="All" class="Sieve"/>
-            <mailet match="All" class="AddDeliveredToHeader"/>
-            <mailet match="All" class="org.apache.james.jmap.mailet.filter.JMAPFiltering"/>
-            <mailet match="All" class="LocalDelivery"/>
-        </processor>
-
-        <processor state="relay" enableJmx="true">
-            <mailet match="All" class="RemoteDelivery">
-                <outgoingQueue>outgoing</outgoingQueue>
-                <delayTime>5000, 100000, 500000</delayTime>
-                <maxRetries>3</maxRetries>
-                <maxDnsProblemRetries>0</maxDnsProblemRetries>
-                <deliveryThreads>10</deliveryThreads>
-                <sendpartial>true</sendpartial>
-                <bounceProcessor>bounces</bounceProcessor>
-            </mailet>
-        </processor>
-
-        <processor state="local-address-error" enableJmx="true">
-            <mailet match="All" class="MetricsMailet">
-                <metricName>mailetContainerLocalAddressError</metricName>
-            </mailet>
-            <mailet match="All" class="Bounce">
-                <attachment>none</attachment>
-            </mailet>
-            <mailet match="All" class="ToRepository">
-                <repositoryPath>cassandra://var/mail/address-error/</repositoryPath>
-            </mailet>
-        </processor>
-
-        <processor state="relay-denied" enableJmx="true">
-            <mailet match="All" class="MetricsMailet">
-                <metricName>mailetContainerRelayDenied</metricName>
-            </mailet>
-            <mailet match="All" class="Bounce">
-                <attachment>none</attachment>
-            </mailet>
-            <mailet match="All" class="ToRepository">
-                <repositoryPath>cassandra://var/mail/relay-denied/</repositoryPath>
-                <notice>Warning: You are sending an e-mail to a remote server. You must be authenticated to perform such an operation</notice>
-            </mailet>
-        </processor>
-
-        <processor state="bounces" enableJmx="true">
-            <mailet match="All" class="MetricsMailet">
-                <metricName>bounces</metricName>
-            </mailet>
-            <mailet match="All" class="DSNBounce">
-                <passThrough>false</passThrough>
-            </mailet>
-        </processor>
-
-        <processor state="rrt-error" enableJmx="false">
-            <mailet match="All" class="ToRepository">
-                <repositoryPath>cassandra://var/mail/rrt-error/</repositoryPath>
-                <passThrough>true</passThrough>
-            </mailet>
-            <mailet match="IsSenderInRRTLoop" class="Null"/>
-            <mailet match="All" class="Bounce"/>
-        </processor>
-
-    </processors>
-
-</mailetcontainer>
-
-
diff --git a/dockerfiles/run/guice/cassandra-ldap/destination/conf/mailrepositorystore.xml b/dockerfiles/run/guice/cassandra-ldap/destination/conf/mailrepositorystore.xml
deleted file mode 100644
index 00ed3f7..0000000
--- a/dockerfiles/run/guice/cassandra-ldap/destination/conf/mailrepositorystore.xml
+++ /dev/null
@@ -1,33 +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.
- -->
-
-<!-- Read https://james.apache.org/server/config-mailrepositorystore.html for further details -->
-
-<mailrepositorystore>
-    <defaultProtocol>cassandra</defaultProtocol>
-    <mailrepositories>
-        <mailrepository class="org.apache.james.mailrepository.cassandra.CassandraMailRepository">
-            <protocols>
-                <protocol>cassandra</protocol>
-            </protocols>
-        </mailrepository>
-    </mailrepositories>
-</mailrepositorystore>
diff --git a/dockerfiles/run/guice/cassandra-ldap/destination/conf/managesieveserver.xml b/dockerfiles/run/guice/cassandra-ldap/destination/conf/managesieveserver.xml
deleted file mode 100644
index 7b0b85a..0000000
--- a/dockerfiles/run/guice/cassandra-ldap/destination/conf/managesieveserver.xml
+++ /dev/null
@@ -1,65 +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.                                           
- -->
- 
-<!--
-   This template file can be used as example for James Server configuration
-   DO NOT USE IT AS SUCH AND ADAPT IT TO YOUR NEEDS
--->
- 
-<!-- See http://james.apache.org/server/3/config.html for usage -->
-
-<managesieveservers>
-
-   <managesieveserver enabled="false">
-
-     <jmxName>managesieveserver</jmxName>
-
-     <bind>0.0.0.0:4190</bind>
-
-     <connectionBacklog>200</connectionBacklog>
-
-     <tls socketTLS="false" startTLS="false">
-       <!-- To create a new keystore execute:
-        keytool -genkey -alias james -keyalg RSA -keystore /path/to/james/conf/keystore
-         -->
-       <keystore>file://conf/keystore</keystore>
-       <secret>james72laBalle</secret>
-       <provider>org.bouncycastle.jce.provider.BouncyCastleProvider</provider>
-       <!-- The algorithm is optional and only needs to be specified when using something other
-        than the Sun JCE provider - You could use IbmX509 with IBM Java runtime. -->
-       <algorithm>SunX509</algorithm>
-     </tls>
-         
-        <!-- connection timeout in secconds -->
-        <connectiontimeout>360</connectiontimeout>
-
-        <!-- Set the maximum simultaneous incoming connections for this service -->
-        <connectionLimit>0</connectionLimit>
-         
-        <!-- Set the maximum simultaneous incoming connections per IP for this service -->
-        <connectionLimitPerIP>0</connectionLimitPerIP>
-        <maxmessagesize>0</maxmessagesize>
-        <addressBracketsEnforcement>true</addressBracketsEnforcement>
-  
-   </managesieveserver>
-
-</managesieveservers>
-
-
diff --git a/dockerfiles/run/guice/cassandra-ldap/destination/conf/pop3server.xml b/dockerfiles/run/guice/cassandra-ldap/destination/conf/pop3server.xml
deleted file mode 100644
index 10a2e08..0000000
--- a/dockerfiles/run/guice/cassandra-ldap/destination/conf/pop3server.xml
+++ /dev/null
@@ -1,43 +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.                                           
- -->
-
-<!-- Read https://james.apache.org/server/config-pop3.html for further details -->
-
-<pop3servers>
-    <pop3server enabled="false">
-        <jmxName>pop3server</jmxName>
-        <bind>0.0.0.0:110</bind>
-        <connectionBacklog>200</connectionBacklog>
-        <tls socketTLS="false" startTLS="false">
-            <!-- To create a new keystore execute:
-                  keytool -genkey -alias james -keyalg RSA -keystore /path/to/james/conf/keystore
-             -->
-            <keystore>file://conf/keystore</keystore>
-            <secret>james72laBalle</secret>
-            <provider>org.bouncycastle.jce.provider.BouncyCastleProvider</provider>
-        </tls>
-        <connectiontimeout>1200</connectiontimeout>
-        <connectionLimit>0</connectionLimit>
-        <connectionLimitPerIP>0</connectionLimitPerIP>
-        <handlerchain>
-            <handler class="org.apache.james.pop3server.core.CoreCmdHandlerLoader"/>
-        </handlerchain>
-    </pop3server>
-</pop3servers>
diff --git a/dockerfiles/run/guice/cassandra-ldap/destination/conf/recipientrewritetable.xml b/dockerfiles/run/guice/cassandra-ldap/destination/conf/recipientrewritetable.xml
deleted file mode 100644
index 1a512c6..0000000
--- a/dockerfiles/run/guice/cassandra-ldap/destination/conf/recipientrewritetable.xml
+++ /dev/null
@@ -1,28 +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.                                           
- -->
-
-<!-- Read https://james.apache.org/server/config-recipientrewritetable.html for further details -->
-
-<!-- The default table for storing James' RecipientRewriteTable mappings. -->
-<recipientrewritetable>
-  <recursiveMapping>true</recursiveMapping>
-  <mappingLimit>10</mappingLimit>
-</recipientrewritetable>
-
diff --git a/dockerfiles/run/guice/cassandra-ldap/destination/conf/smime.p12 b/dockerfiles/run/guice/cassandra-ldap/destination/conf/smime.p12
deleted file mode 100644
index 9b066d3..0000000
Binary files a/dockerfiles/run/guice/cassandra-ldap/destination/conf/smime.p12 and /dev/null differ
diff --git a/dockerfiles/run/guice/cassandra-ldap/destination/conf/smtpserver.xml b/dockerfiles/run/guice/cassandra-ldap/destination/conf/smtpserver.xml
deleted file mode 100644
index 722b0c2..0000000
--- a/dockerfiles/run/guice/cassandra-ldap/destination/conf/smtpserver.xml
+++ /dev/null
@@ -1,107 +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.
- -->
-
-<!-- Read https://james.apache.org/server/config-smtp-lmtp.html#SMTP_Configuration for further details -->
-
-<smtpservers>
-    <smtpserver enabled="true">
-        <jmxName>smtpserver-global</jmxName>
-        <bind>0.0.0.0:25</bind>
-        <connectionBacklog>200</connectionBacklog>
-        <tls socketTLS="false" startTLS="false">
-            <keystore>file://conf/keystore</keystore>
-            <secret>james72laBalle</secret>
-            <provider>org.bouncycastle.jce.provider.BouncyCastleProvider</provider>
-            <algorithm>SunX509</algorithm>
-        </tls>
-        <connectiontimeout>360</connectiontimeout>
-        <connectionLimit>0</connectionLimit>
-        <connectionLimitPerIP>0</connectionLimitPerIP>
-        <authRequired>false</authRequired>
-        <authorizedAddresses>127.0.0.0/8</authorizedAddresses>
-        <verifyIdentity>true</verifyIdentity>
-        <maxmessagesize>0</maxmessagesize>
-        <addressBracketsEnforcement>true</addressBracketsEnforcement>
-        <smtpGreeting>Apache JAMES awesome SMTP Server</smtpGreeting>
-        <handlerchain>
-            <handler class="org.apache.james.smtpserver.fastfail.ValidRcptHandler"/>
-            <handler class="org.apache.james.smtpserver.CoreCmdHandlerLoader"/>
-        </handlerchain>
-    </smtpserver>
-    <smtpserver enabled="true">
-        <jmxName>smtpserver-TLS</jmxName>
-        <bind>0.0.0.0:465</bind>
-        <connectionBacklog>200</connectionBacklog>
-        <tls socketTLS="true" startTLS="false">
-            <keystore>file://conf/keystore</keystore>
-            <secret>james72laBalle</secret>
-            <provider>org.bouncycastle.jce.provider.BouncyCastleProvider</provider>
-            <algorithm>SunX509</algorithm>
-        </tls>
-        <connectiontimeout>360</connectiontimeout>
-        <connectionLimit>0</connectionLimit>
-        <connectionLimitPerIP>0</connectionLimitPerIP>
-        <!--
-           Authorize only local users
-        -->
-        <authRequired>true</authRequired>
-        <authorizedAddresses>127.0.0.0/8</authorizedAddresses>
-        <!-- Trust authenticated users -->
-        <verifyIdentity>false</verifyIdentity>
-        <maxmessagesize>0</maxmessagesize>
-        <addressBracketsEnforcement>true</addressBracketsEnforcement>
-        <smtpGreeting>Apache JAMES awesome SMTP Server</smtpGreeting>
-        <handlerchain>
-            <handler class="org.apache.james.smtpserver.fastfail.ValidRcptHandler"/>
-            <handler class="org.apache.james.smtpserver.CoreCmdHandlerLoader"/>
-        </handlerchain>
-    </smtpserver>
-    <smtpserver enabled="true">
-        <jmxName>smtpserver-authenticated</jmxName>
-        <bind>0.0.0.0:587</bind>
-        <connectionBacklog>200</connectionBacklog>
-        <tls socketTLS="false" startTLS="true">
-            <keystore>file://conf/keystore</keystore>
-            <secret>james72laBalle</secret>
-            <provider>org.bouncycastle.jce.provider.BouncyCastleProvider</provider>
-            <algorithm>SunX509</algorithm>
-        </tls>
-        <connectiontimeout>360</connectiontimeout>
-        <connectionLimit>0</connectionLimit>
-        <connectionLimitPerIP>0</connectionLimitPerIP>
-        <!--
-           Authorize only local users
-        -->
-        <authRequired>true</authRequired>
-        <authorizedAddresses>127.0.0.0/8</authorizedAddresses>
-        <!-- Trust authenticated users -->
-        <verifyIdentity>false</verifyIdentity>
-        <maxmessagesize>0</maxmessagesize>
-        <addressBracketsEnforcement>true</addressBracketsEnforcement>
-        <smtpGreeting>Apache JAMES awesome SMTP Server</smtpGreeting>
-        <handlerchain>
-            <handler class="org.apache.james.smtpserver.fastfail.ValidRcptHandler"/>
-            <handler class="org.apache.james.smtpserver.CoreCmdHandlerLoader"/>
-        </handlerchain>
-    </smtpserver>
-</smtpservers>
-
-
diff --git a/dockerfiles/run/guice/cassandra-ldap/destination/conf/tika.properties b/dockerfiles/run/guice/cassandra-ldap/destination/conf/tika.properties
deleted file mode 100644
index 1fb9956..0000000
--- a/dockerfiles/run/guice/cassandra-ldap/destination/conf/tika.properties
+++ /dev/null
@@ -1,23 +0,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.
-
-# Read https://james.apache.org/server/config-elasticsearch.html#Tika_Configuration for further details
-
-tika.enabled=true
-tika.host=tika
-tika.port=9998
-tika.timeoutInMillis=3000
diff --git a/dockerfiles/run/guice/cassandra-ldap/destination/conf/usersrepository.xml b/dockerfiles/run/guice/cassandra-ldap/destination/conf/usersrepository.xml
deleted file mode 100644
index 0f90679..0000000
--- a/dockerfiles/run/guice/cassandra-ldap/destination/conf/usersrepository.xml
+++ /dev/null
@@ -1,29 +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.                                           
- -->
-
-<!-- Read https://james.apache.org/server/config-users.html for further details -->
-
-<repository name="LocalUsers"
-    ldapHost="ldap://myldapserver:389" 
-    principal="uid=ldapUser,ou=system" 
-    credentials="password" 
-    userBase="ou=People,o=myorg.com,ou=system" 
-    userIdAttribute="uid"
-    userObjectClass="person"/>
diff --git a/dockerfiles/run/guice/cassandra-ldap/destination/conf/webadmin.properties b/dockerfiles/run/guice/cassandra-ldap/destination/conf/webadmin.properties
deleted file mode 100644
index ab7b2e4..0000000
--- a/dockerfiles/run/guice/cassandra-ldap/destination/conf/webadmin.properties
+++ /dev/null
@@ -1,54 +0,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.
-
-#  This template file can be used as example for James Server configuration
-#  DO NOT USE IT AS SUCH AND ADAPT IT TO YOUR NEEDS
-
-# Read https://james.apache.org/server/config-webadmin.html for further details
-
-enabled=true
-port=8000
-host=localhost
-
-# Defaults to false
-https.enabled=false
-
-# Compulsory when enabling HTTPS
-#https.keystore=/path/to/keystore
-#https.password=password
-
-# Optional when enabling HTTPS (self signed)
-#https.trust.keystore
-#https.trust.password
-
-# Defaults to false
-#jwt.enabled=true
-#
-## If you wish to use OAuth authentication, you should provide a valid JWT public key.
-## The following entry specify the link to the URL of the public key file,
-## which should be a PEM format file.
-##
-#jwt.publickeypem.url=file://conf/jwt_publickey
-
-# Defaults to false
-#cors.enable=true
-#cors.origin
-
-# List of fully qualified class names that should be exposed over webadmin
-# in addition to your product default routes. Routes needs to be located
-# within the classpath or in the ./extensions-jars folder.
-#extensions.routes=
\ No newline at end of file
diff --git a/dockerfiles/run/guice/cassandra-ldap/destination/extensions-jars/README.md b/dockerfiles/run/guice/cassandra-ldap/destination/extensions-jars/README.md
deleted file mode 100644
index 2cea759..0000000
--- a/dockerfiles/run/guice/cassandra-ldap/destination/extensions-jars/README.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# Adding Jars to JAMES
-
-The jar in this folder will be added to JAMES classpath when mounted under /root/extensions-jars inside the running container.
-
-You can use it to add you customs Mailets/Matchers.
diff --git a/dockerfiles/run/guice/cassandra-ldap/destination/glowroot/admin.json b/dockerfiles/run/guice/cassandra-ldap/destination/glowroot/admin.json
deleted file mode 100644
index c75c59d..0000000
--- a/dockerfiles/run/guice/cassandra-ldap/destination/glowroot/admin.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "web": {
-    "bindAddress": "0.0.0.0"
-  }
-}
\ No newline at end of file
diff --git a/dockerfiles/run/guice/cassandra-ldap/destination/glowroot/plugins/blobstore.json b/dockerfiles/run/guice/cassandra-ldap/destination/glowroot/plugins/blobstore.json
deleted file mode 100644
index 84291c6..0000000
--- a/dockerfiles/run/guice/cassandra-ldap/destination/glowroot/plugins/blobstore.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "name": "BlobStore Plugin",
-  "id": "blob_store",
-  "instrumentation": [
-    {
-      "captureKind": "trace-entry",
-      "traceEntryMessageTemplate": "{{this.class.name}}.{{methodName}}",
-      "timerName": "blobstore",
-      "className": "org.apache.james.blob.objectstorage.BlobPutter",
-      "methodName": "putDirectly",
-      "methodParameterTypes": [
-        ".."
-      ]
-    },
-    {
-      "captureKind": "trace-entry",
-      "traceEntryMessageTemplate": "{{this.class.name}}.{{methodName}}",
-      "timerName": "blobstore",
-      "className": "org.apache.james.blob.objectstorage.BlobPutter",
-      "methodName": "putAndComputeId",
-      "methodParameterTypes": [
-        ".."
-      ]
-    }
-  ]
-}
\ No newline at end of file
diff --git a/dockerfiles/run/guice/cassandra-ldap/destination/glowroot/plugins/imap.json b/dockerfiles/run/guice/cassandra-ldap/destination/glowroot/plugins/imap.json
deleted file mode 100644
index d27904f..0000000
--- a/dockerfiles/run/guice/cassandra-ldap/destination/glowroot/plugins/imap.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "name": "IMAP Plugin",
-  "id": "imap",
-  "instrumentation": [
-    {
-      "className": "org.apache.james.imap.processor.base.AbstractChainedProcessor",
-      "methodName": "doProcess",
-      "methodParameterTypes": [
-        ".."
-      ],
-      "captureKind": "transaction",
-      "transactionType": "IMAP",
-      "transactionNameTemplate": "IMAP processor : {{this.class.name}}",
-      "alreadyInTransactionBehavior": "capture-trace-entry",
-      "traceEntryMessageTemplate": "{{this.class.name}}.{{methodName}}",
-      "timerName": "imapProcessor"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/dockerfiles/run/guice/cassandra-ldap/destination/glowroot/plugins/jmap.json b/dockerfiles/run/guice/cassandra-ldap/destination/glowroot/plugins/jmap.json
deleted file mode 100644
index 9afce4b..0000000
--- a/dockerfiles/run/guice/cassandra-ldap/destination/glowroot/plugins/jmap.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "name": "JMAP Plugin",
-  "id": "jmap",
-  "instrumentation": [
-    {
-      "className": "org.apache.james.jmap.draft.methods.Method",
-      "methodName": "processToStream",
-      "methodParameterTypes": [
-        ".."
-      ],
-      "captureKind": "transaction",
-      "transactionType": "JMAP",
-      "transactionNameTemplate": "JMAP method : {{this.class.name}}",
-      "alreadyInTransactionBehavior": "capture-trace-entry",
-      "traceEntryMessageTemplate": "{{this.class.name}}.{{methodName}}",
-      "timerName": "jmapMethod"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/dockerfiles/run/guice/cassandra-ldap/destination/glowroot/plugins/mailboxListener.json b/dockerfiles/run/guice/cassandra-ldap/destination/glowroot/plugins/mailboxListener.json
deleted file mode 100644
index 54a55ac..0000000
--- a/dockerfiles/run/guice/cassandra-ldap/destination/glowroot/plugins/mailboxListener.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "name": "MailboxListener Plugin",
-  "id": "mailboxListener",
-  "instrumentation": [
-    {
-      "className": "org.apache.james.mailbox.events.MailboxListener",
-      "methodName": "event",
-      "methodParameterTypes": [
-        ".."
-      ],
-      "captureKind": "transaction",
-      "transactionType": "MailboxListener",
-      "transactionNameTemplate": "MailboxListener : {{this.class.name}}",
-      "alreadyInTransactionBehavior": "capture-trace-entry",
-      "traceEntryMessageTemplate": "{{this.class.name}}.{{methodName}}",
-      "timerName": "mailboxListener"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/dockerfiles/run/guice/cassandra-ldap/destination/glowroot/plugins/smtp.json b/dockerfiles/run/guice/cassandra-ldap/destination/glowroot/plugins/smtp.json
deleted file mode 100644
index 393bac9..0000000
--- a/dockerfiles/run/guice/cassandra-ldap/destination/glowroot/plugins/smtp.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "name": "SMTP Plugin",
-  "id": "smtp",
-  "instrumentation": [
-    {
-      "className": "org.apache.james.protocols.smtp.core.AbstractHookableCmdHandler",
-      "methodName": "onCommand",
-      "methodParameterTypes": [
-        ".."
-      ],
-      "captureKind": "transaction",
-      "transactionType": "SMTP",
-      "transactionNameTemplate": "SMTP command : {{this.class.name}}",
-      "alreadyInTransactionBehavior": "capture-trace-entry",
-      "traceEntryMessageTemplate": "{{this.class.name}}.{{methodName}}",
-      "timerName": "smtpProcessor"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/dockerfiles/run/guice/cassandra-ldap/destination/glowroot/plugins/spooler.json b/dockerfiles/run/guice/cassandra-ldap/destination/glowroot/plugins/spooler.json
deleted file mode 100644
index fd7732d..0000000
--- a/dockerfiles/run/guice/cassandra-ldap/destination/glowroot/plugins/spooler.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-  "name": "Spooler Plugin",
-  "id": "spooler",
-  "instrumentation": [
-    {
-      "className": "org.apache.james.mailetcontainer.api.MailProcessor",
-      "methodName": "service",
-      "methodParameterTypes": [
-        ".."
-      ],
-      "captureKind": "transaction",
-      "transactionType": "Spooler",
-      "transactionNameTemplate": "Mailet processor : {{this.class.name}}",
-      "alreadyInTransactionBehavior": "capture-trace-entry",
-      "traceEntryMessageTemplate": "{{this.class.name}}.{{methodName}}",
-      "timerName": "mailetProcessor"
-    },
-    {
-      "className": "org.apache.mailet.Mailet",
-      "methodName": "service",
-      "methodParameterTypes": [
-        ".."
-      ],
-      "captureKind": "transaction",
-      "transactionType": "Mailet",
-      "transactionNameTemplate": "Mailet : {{this.class.name}}",
-      "alreadyInTransactionBehavior": "capture-trace-entry",
-      "traceEntryMessageTemplate": "{{this.class.name}}.{{methodName}}",
-      "timerName": "mailet"
-    },
-    {
-      "className": "org.apache.mailet.Matcher",
-      "methodName": "match",
-      "methodParameterTypes": [
-        ".."
-      ],
-      "captureKind": "transaction",
-      "transactionType": "Matcher",
-      "transactionNameTemplate": "Mailet processor : {{this.class.name}}",
-      "alreadyInTransactionBehavior": "capture-trace-entry",
-      "traceEntryMessageTemplate": "{{this.class.name}}.{{methodName}}",
-      "timerName": "matcher"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/dockerfiles/run/guice/cassandra-ldap/destination/glowroot/plugins/task.json b/dockerfiles/run/guice/cassandra-ldap/destination/glowroot/plugins/task.json
deleted file mode 100644
index 8f04c69..0000000
--- a/dockerfiles/run/guice/cassandra-ldap/destination/glowroot/plugins/task.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "name": "Task Plugin",
-  "id": "task",
-  "instrumentation": [
-    {
-      "className": "org.apache.james.task.Task",
-      "methodName": "run",
-      "methodParameterTypes": [
-        ".."
-      ],
-      "captureKind": "transaction",
-      "transactionType": "TASK",
-      "transactionNameTemplate": "TASK : {{this.class.name}}",
-      "alreadyInTransactionBehavior": "capture-trace-entry",
-      "traceEntryMessageTemplate": "{{this.class.name}}.{{methodName}}",
-      "timerName": "task"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/dockerfiles/run/guice/cassandra-ldap/destination/run_james.sh b/dockerfiles/run/guice/cassandra-ldap/destination/run_james.sh
deleted file mode 100755
index 02f2bf6..0000000
--- a/dockerfiles/run/guice/cassandra-ldap/destination/run_james.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-if [ "$GLOWROOT_ACTIVATED" == "true" ]; then
-    GLOWROOT_OPTIONS=-javaagent:/root/glowroot/glowroot.jar
-fi
-java -Dlogback.configurationFile=/root/conf/logback.xml -Dworking.directory=/root/ $JVM_OPTIONS $GLOWROOT_OPTIONS -jar james-server.jar
\ No newline at end of file
diff --git a/dockerfiles/run/guice/cassandra-rabbitmq-ldap/Dockerfile b/dockerfiles/run/guice/cassandra-rabbitmq-ldap/Dockerfile
deleted file mode 100644
index 9c1f5cf..0000000
--- a/dockerfiles/run/guice/cassandra-rabbitmq-ldap/Dockerfile
+++ /dev/null
@@ -1,43 +0,0 @@
-# Run James
-#
-# VERSION	1.0
-
-FROM adoptopenjdk:11-jre-hotspot
-
-# Ports that are used
-#
-# 25   SMTP without authentication
-# 110  POP3
-# 143  IMAP with startTLS enabled
-# 465  SMTP with authentication and socketTLS enabled
-# 587  SMTP with authentication and startTLS enabled
-# 993  IMAP with socketTLS enabled
-# 8000 Web Admin interface (unsecured: expose at your own risks)
-
-EXPOSE 25 110 143 465 587 993 4000 8000
-
-WORKDIR /root
-
-# Get data we need to run James : build results and configuration
-ADD destination/james-server-cassandra-rabbitmq-guice.jar /root/james-server.jar
-ADD destination/james-server-cassandra-rabbitmq-guice.lib /root/james-server-cassandra-rabbitmq-guice.lib
-ADD destination/james-server-cli.jar /root/james-cli.jar
-ADD destination/james-server-cli.lib /root/james-server-cli.lib
-ADD destination/conf /root/conf
-ADD destination/glowroot/plugins /root/glowroot/plugins
-ADD destination/glowroot/glowroot.jar /root/glowroot/glowroot.jar
-ADD destination/glowroot/lib/glowroot-embedded-collector.jar /root/glowroot/lib/glowroot-embedded-collector.jar
-ADD destination/glowroot/lib/glowroot-logging-logstash.jar /root/glowroot/lib/glowroot-logging-logstash.jar
-ADD destination/glowroot/admin.json /root/glowroot/admin.json
-ADD destination/run_james.sh /root/run_james.sh
-
-VOLUME /logs
-VOLUME /root/conf
-VOLUME /root/glowroot/plugins
-VOLUME /root/glowroot/data
-
-ENV PATH="$PATH:/root/glowroot/lib" \
-    JVM_OPTIONS="" \
-    GLOWROOT_ACTIVATED="false"
-
-ENTRYPOINT ./run_james.sh
diff --git a/dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/conf/batchsizes.properties b/dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/conf/batchsizes.properties
deleted file mode 100644
index 47da2c5..0000000
--- a/dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/conf/batchsizes.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-# Those properties let you configure the number of messages queried at the same time.
-# IMAP FETCH command
-fetch.metadata=200
-fetch.headers=200
-fetch.body=100
-fetch.full=50
-# IMAP COPY command
-copy=100
-# IMAP MOVE command
-move=100
diff --git a/dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/conf/blob.properties b/dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/conf/blob.properties
deleted file mode 100644
index 2e06135..0000000
--- a/dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/conf/blob.properties
+++ /dev/null
@@ -1,100 +0,0 @@
-# ============================================= BlobStore Implementation ==================================
-# Read https://james.apache.org/server/config-blobstore.html for further details
-
-# Choose your BlobStore implementation
-# Mandatory, allowed values are: cassandra, s3
-implementation=s3
-
-# ========================================= Deduplication ========================================
-# If you choose to enable deduplication, the mails with the same content will be stored only once.
-# Warning: Once this feature is enabled, there is no turning back as turning it off will lead to the deletion of all
-# the mails sharing the same content once one is deleted.
-# Mandatory, Allowed values are: true, false
-deduplication.enable=false
-
-# ========================================= Encryption ========================================
-# If you choose to enable encryption, the blob content will be encrypted before storing them in the BlobStore.
-# Warning: Once this feature is enabled, there is no turning back as turning it off will lead to all content being
-# encrypted. This comes at a performance impact but presents you from leaking data if, for instance the third party
-# offering you a S3 service is compromised.
-# Optional, Allowed values are: true, false, defaults to false
-encryption.aes.enable=false
-
-# Mandatory (if AES encryption is enabled) salt and password. Salt needs to be an hexadecimal encoded string
-#encryption.aes.password=xxx
-#encryption.aes.salt=73616c7479
-
-# ========================================= Cassandra BlobStore Cache ======================================
-# A cassandra cache can be enabled to reduce latency when reading small blobs frequently
-# A dedicated keyspace with a replication factor of one is then used
-# Cache eviction policy is TTL based
-# Only blobs below a given threshold will be stored.
-# To be noted that blobs are stored within a single Cassandra row, hence a low threshold should be used.
-
-# Enable the cache? Optional and default to false. Must be a boolean.
-cache.enable=false
-
-# Cache eviction policy is TTL based. Optional and defaults to 7 days. Must be a duration.
-# Valid units: ms, sec, min, hour, day, week, month, year
-# cache.cassandra.ttl=7days
-
-# Timeout after which this cache should be bypassed. Optional and defaults to 100ms. Can not exceed 1 hour.
-# Must be a duration Valid units: ms, sec, min, hour, day, week, month, year
-# cache.cassandra.timeout=100ms
-
-# Maximum size of stored objects expressed in bytes. Must be strictly positive. Defaults to 8192.
-# Units: bytes, Kib, MiB, GiB, TiB
-# cache.sizeThresholdInBytes=8 KiB
-
-
-# ============================================== ObjectStorage ============================================
-
-# ========================================= ObjectStorage Buckets ==========================================
-# bucket names prefix
-# Optional, default no prefix
-# objectstorage.bucketPrefix=prod-
-
-# Default bucket name
-# Optional, default is bucketPrefix + `default`
-# objectstorage.namespace=james
-
-# ========================================= ObjectStorage on S3 =============================================
-# Mandatory if you choose s3 storage service, S3 authentication endpoint
-objectstorage.s3.endPoint=http://s3.docker.test:8000/
-
-# Mandatory if you choose s3 storage service, S3 region
-#objectstorage.s3.region=eu-west-1
-objectstorage.s3.region=us-east-1
-
-# Mandatory if you choose aws-s3 storage service, access key id configured in S3
-objectstorage.s3.accessKeyId=accessKey1
-
-# Mandatory if you choose s3 storage service, secret key configured in S3
-objectstorage.s3.secretKey=secretKey1
-
-# ============================================ Blobs Exporting ==============================================
-# Read https://james.apache.org/server/config-blob-export.html for further details
-
-# Choosing blob exporting mechanism, allowed mechanism are: localFile, linshare
-# LinShare is a file sharing service, will be explained in the below section
-# Optional, default is localFile
-blob.export.implementation=localFile
-
-# ======================================= Local File Blobs Exporting ========================================
-# Optional, directory to store exported blob, directory path follows James file system format
-# default is file://var/blobExporting
-blob.export.localFile.directory=file://var/blobExporting
-
-# ======================================= LinShare File Blobs Exporting ========================================
-# LinShare is a sharing service where you can use james, connects to an existing LinShare server and shares files to
-# other mail addresses as long as those addresses available in LinShare. For example you can deploy James and LinShare
-# sharing the same LDAP repository
-# Mandatory if you choose LinShare, url to connect to LinShare service
-# blob.export.linshare.url=http://linshare:8080
-
-# ======================================= LinShare Configuration BasicAuthentication ===================================
-# Authentication is mandatory if you choose LinShare, TechnicalAccount is need to connect to LinShare specific service.
-# For Example: It will be formalized to 'Authorization: Basic {Credential of UUID/password}'
-
-# blob.export.linshare.technical.account.uuid=Technical_Account_UUID
-# blob.export.linshare.technical.account.password=password
diff --git a/dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/conf/cassandra.properties b/dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/conf/cassandra.properties
deleted file mode 100644
index 6b17425..0000000
--- a/dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/conf/cassandra.properties
+++ /dev/null
@@ -1,49 +0,0 @@
-# Configuration file for cassandra mailbox
-# Read https://james.apache.org/server/config-cassandra.html for further details
-
-cassandra.nodes=cassandra
-cassandra.keyspace.create=true
-cassandra.keyspace=apache_james
-#cassandra.user=cassandra
-#cassandra.password=cassandra
-#cassandra.ssl=false
-cassandra.replication.factor=1
-cassandra.retryConnection.maxRetries=200
-cassandra.retryConnection.minDelay=5000
-
-# Read com.datastax.driver.core.PoolingOptions for knowing defaults value
-# No value here will default to driver's default value
-
-# cassandra.pooling.local.max.connections=8
-# cassandra.pooling.local.max.requests=128
-## In ms. Should be higher than socket read timeout
-# cassandra.pooling.timeout=5000
-## In seconds.
-# cassandra.pooling.heartbeat.timeout=30
-# cassandra.pooling.max.queue.size=256
-
-## These low level tuning options controls performance related options in Cassandra related code
-## The default values are documented here. Understand the effects before editing.
-# mailbox.read.repair.chance=0.1
-## Maximum probability of running a read repair for the mailbox counters
-# mailbox.counters.read.repair.chance.max=0.1
-## Probability of running a mailbox counters read repair for 100 messages.
-## Inversely proportional to the count of messages
-## Formula: read_repair_chance = min(mailbox.counters.read.repair.chance.max, (100/unseens)*mailbox.counters.read.repair.chance.one.hundred)
-# mailbox.counters.read.repair.chance.one.hundred=0.01
-# mailbox.max.retry.acl=1000
-# mailbox.max.retry.modseq=100000
-# mailbox.max.retry.uid=100000
-# mailbox.max.retry.message.flags.update=1000
-# mailbox.max.retry.message.id.flags.update=1000
-# fetch.advance.row.count=1000
-# chunk.size.message.read=100
-# chunk.size.expunge=100
-# mailbox.blob.part.size=102400
-
-## Consistency levels used for common queries
-## Read https://docs.datastax.com/en/cassandra-oss/3.x/cassandra/dml/dmlConfigConsistency.html
-# QUORUM, LOCAL_QUORUM, or EACH_QUORUM
-# cassandra.consistency_level.regular=QUORUM
-# SERIAL or LOCAL_SERIAL
-# cassandra.consistency_level.lightweight_transaction=SERIAL
diff --git a/dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/conf/deletedMessageVault.properties b/dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/conf/deletedMessageVault.properties
deleted file mode 100644
index ab1e3ee..0000000
--- a/dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/conf/deletedMessageVault.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-# ============================================= Deleted Messages Vault Configuration ==================================
-# Retention period for your deleted messages into the vault, after which they expire and can be potentially cleaned up
-# Optional, default 1y
-# retentionPeriod=1y
\ No newline at end of file
diff --git a/dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/conf/dnsservice.xml b/dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/conf/dnsservice.xml
deleted file mode 100644
index 1c4fb9e..0000000
--- a/dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/conf/dnsservice.xml
+++ /dev/null
@@ -1,27 +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.                                           
- -->
-
-<!-- Read https://james.apache.org/server/config-dnsservice.html for further details -->
-
-<dnsservice>
-  <autodiscover>true</autodiscover>
-  <authoritative>false</authoritative>
-  <maxcachesize>50000</maxcachesize>
-</dnsservice>
diff --git a/dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/conf/domainlist.xml b/dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/conf/domainlist.xml
deleted file mode 100644
index 605439f..0000000
--- a/dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/conf/domainlist.xml
+++ /dev/null
@@ -1,27 +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.                                           
- -->
-
-<!-- Read https://james.apache.org/server/config-domainlist.html for further details -->
-
-<domainlist>
-    <autodetect>false</autodetect>
-    <autodetectIP>false</autodetectIP>
-    <defaultDomain>localhost</defaultDomain>
-</domainlist>
diff --git a/dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/conf/elasticsearch.properties b/dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/conf/elasticsearch.properties
deleted file mode 100644
index 0ea86db..0000000
--- a/dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/conf/elasticsearch.properties
+++ /dev/null
@@ -1,83 +0,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.
-
-#  This template file can be used as example for James Server configuration
-#  DO NOT USE IT AS SUCH AND ADAPT IT TO YOUR NEEDS
-
-# Configuration file for ElasticSearch
-# Read https://james.apache.org/server/config-elasticsearch.html for further details
-
-elasticsearch.masterHost=elasticsearch
-elasticsearch.port=9200
-
-# Optional. Only http or https are accepted, default is http
-# elasticsearch.hostScheme=http
-
-# Optional, default is `default`
-# Choosing the SSL check strategy when using https scheme
-# default: Use the default SSL TrustStore of the system.
-# ignore: Ignore SSL Validation check (not recommended).
-# override: Override the SSL Context to use a custom TrustStore containing ES server's certificate.
-# elasticsearch.hostScheme.https.sslValidationStrategy=default
-
-# Optional. Required when using 'https' scheme and 'override' sslValidationStrategy
-# Configure Elasticsearch rest client to use this trustStore file to recognize nginx's ssl certificate.
-# You need to specify both trustStorePath and trustStorePassword
-# elasticsearch.hostScheme.https.trustStorePath=/file/to/trust/keystore.jks
-
-# Optional. Required when using 'https' scheme and 'override' sslValidationStrategy
-# Configure Elasticsearch rest client to use this trustStore file with the specified password.
-# You need to specify both trustStorePath and trustStorePassword
-# elasticsearch.hostScheme.https.trustStorePassword=myJKSPassword
-
-# Optional. default is `default`
-# Configure Elasticsearch rest client to use host name verifier during SSL handshake
-# default: using the default hostname verifier provided by apache http client.
-# accept_any_hostname: accept any hostname (not recommended).
-# elasticsearch.hostScheme.https.hostNameVerifier=default
-
-# Optional.
-# Basic auth username to access elasticsearch.
-# Ignore elasticsearch.user and elasticsearch.password to not be using authentication (default behaviour).
-# Otherwise, you need to specify both properties.
-# elasticsearch.user=elasticsearch
-
-# Optional.
-# Basic auth password to access elasticsearch.
-# Ignore elasticsearch.user and elasticsearch.password to not be using authentication (default behaviour).
-# Otherwise, you need to specify both properties.
-# elasticsearch.password=secret
-
-# You can alternatively provide a list of hosts following this format :
-# elasticsearch.hosts=host1:9200,host2:9200
-# elasticsearch.clusterName=cluster
-
-elasticsearch.nb.shards=5
-elasticsearch.nb.replica=1
-elasticsearch.index.waitForActiveShards=1
-elasticsearch.retryConnection.maxRetries=7
-elasticsearch.retryConnection.minDelay=3000
-# Index or not attachments (default value: true)
-elasticsearch.indexAttachments=true
-
-# Reports for metrics into ElasticSearch
-# Defaults to elasticsearch.masterHost : on which server to publish metrics
-elasticsearch.http.host=elasticsearch
-elasticsearch.http.port=9200
-elasticsearch.metrics.reports.enabled=true
-elasticsearch.metrics.reports.period=30
-elasticsearch.metrics.reports.index=james-metrics
diff --git a/dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/conf/extensions.properties b/dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/conf/extensions.properties
deleted file mode 100644
index 2a2c23e..0000000
--- a/dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/conf/extensions.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-# This files enables customization of users extensions injections with guice.
-# A user can drop some jar-with-dependencies within the ./extensions-jars folder and
-# reference classes of these jars in some of James extension mechanisms.
-
-# This includes mailets, matchers, mailboxListeners, preDeletionHooks, protocolHandlers, webAdmin routes
-
-# Upon injections, the user can reference additional guice modules, that are going to be used only upon extensions instantiation.
-
-#List of coma separated (',') fully qualified class names of additional guice modules to be used to instantiate extensions
-#guice.extension.module=
\ No newline at end of file
diff --git a/dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/conf/healthcheck.properties b/dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/conf/healthcheck.properties
deleted file mode 100644
index 9f3bad1..0000000
--- a/dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/conf/healthcheck.properties
+++ /dev/null
@@ -1,30 +0,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.
-
-#  This template file can be used as example for James Server configuration
-#  DO NOT USE IT AS SUCH AND ADAPT IT TO YOUR NEEDS
-
-# Configuration file for Periodical Health Checks
-
-# Read https://james.apache.org/server/config-healthcheck.html for further details
-
-# Optional. Period between two PeriodicalHealthChecks.
-# Units supported are (ms - millisecond, s - second, m - minute, h - hour, d - day). Default unit is millisecond.
-# Default duration is 60 seconds.
-# Duration must be greater or at least equals to 10 seconds.
-# healthcheck.period=60s
-
diff --git a/dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/conf/imapserver.xml b/dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/conf/imapserver.xml
deleted file mode 100644
index 12aa52d..0000000
--- a/dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/conf/imapserver.xml
+++ /dev/null
@@ -1,61 +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.
--->
-
-<!-- Read https://james.apache.org/server/config-imap4.html for further details -->
-
-<imapservers>
-    <imapserver enabled="true">
-        <jmxName>imapserver</jmxName>
-        <bind>0.0.0.0:143</bind>
-        <connectionBacklog>200</connectionBacklog>
-        <tls socketTLS="false" startTLS="true">
-            <!-- To create a new keystore execute:
-            keytool -genkey -alias james -keyalg RSA -keystore /path/to/james/conf/keystore
-              -->
-            <keystore>file://conf/keystore</keystore>
-            <secret>james72laBalle</secret>
-            <provider>org.bouncycastle.jce.provider.BouncyCastleProvider</provider>
-        </tls>
-        <connectionLimit>0</connectionLimit>
-        <connectionLimitPerIP>0</connectionLimitPerIP>
-        <idleTimeInterval>120</idleTimeInterval>
-        <idleTimeIntervalUnit>SECONDS</idleTimeIntervalUnit>
-        <enableIdle>true</enableIdle>
-    </imapserver>
-    <imapserver enabled="true">
-        <jmxName>imapserver-ssl</jmxName>
-        <bind>0.0.0.0:993</bind>
-        <connectionBacklog>200</connectionBacklog>
-        <tls socketTLS="true" startTLS="false">
-            <!-- To create a new keystore execute:
-              keytool -genkey -alias james -keyalg RSA -keystore /path/to/james/conf/keystore
-             -->
-            <keystore>file://conf/keystore</keystore>
-            <secret>james72laBalle</secret>
-            <provider>org.bouncycastle.jce.provider.BouncyCastleProvider</provider>
-        </tls>
-        <connectionLimit>0</connectionLimit>
-        <connectionLimitPerIP>0</connectionLimitPerIP>
-        <idleTimeInterval>120</idleTimeInterval>
-        <idleTimeIntervalUnit>SECONDS</idleTimeIntervalUnit>
-        <enableIdle>true</enableIdle>
-    </imapserver>
-</imapservers>
diff --git a/dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/conf/jmap.properties b/dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/conf/jmap.properties
deleted file mode 100644
index 1980cfa..0000000
--- a/dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/conf/jmap.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Configuration file for JMAP
-# Read https://james.apache.org/server/config-jmap.html for further details
-
-enabled=true
-
-tls.keystoreURL=file://conf/keystore
-tls.secret=james72laBalle
-
-#
-# If you wish to use OAuth authentication, you should provide a valid JWT public key.
-# The following entry specify the link to the URL of the public key file,
-# which should be a PEM format file.
-#
-jwt.publickeypem.url=file://conf/jwt_publickey
-
-# Should simple Email/query be resolved against a Cassandra projection, or should we resolve them against ElasticSearch?
-# This enables a higher resilience, but the projection needs to be correctly populated. False by default.
-# view.email.query.enabled=true
diff --git a/dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/conf/jmx.properties b/dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/conf/jmx.properties
deleted file mode 100644
index e56235f..0000000
--- a/dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/conf/jmx.properties
+++ /dev/null
@@ -1,26 +0,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.
-#
-
-#  This template file can be used as example for James Server configuration
-#  DO NOT USE IT AS SUCH AND ADAPT IT TO YOUR NEEDS
-
-# Read https://james.apache.org/server/config-system.html#jmx.properties for further details
-
-jmx.enabled=true
-jmx.address=127.0.0.1
-jmx.port=9999
diff --git a/dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/conf/jwt_publickey b/dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/conf/jwt_publickey
deleted file mode 100644
index 53914e0..0000000
--- a/dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/conf/jwt_publickey
+++ /dev/null
@@ -1,9 +0,0 @@
------BEGIN PUBLIC KEY-----
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtlChO/nlVP27MpdkG0Bh
-16XrMRf6M4NeyGa7j5+1UKm42IKUf3lM28oe82MqIIRyvskPc11NuzSor8HmvH8H
-lhDs5DyJtx2qp35AT0zCqfwlaDnlDc/QDlZv1CoRZGpQk1Inyh6SbZwYpxxwh0fi
-+d/4RpE3LBVo8wgOaXPylOlHxsDizfkL8QwXItyakBfMO6jWQRrj7/9WDhGf4Hi+
-GQur1tPGZDl9mvCoRHjFrD5M/yypIPlfMGWFVEvV5jClNMLAQ9bYFuOc7H1fEWw6
-U1LZUUbJW9/CH45YXz82CYqkrfbnQxqRb2iVbVjs/sHopHd1NTiCfUtwvcYJiBVj
-kwIDAQAB
------END PUBLIC KEY-----
diff --git a/dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/conf/listeners.xml b/dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/conf/listeners.xml
deleted file mode 100644
index 758c823..0000000
--- a/dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/conf/listeners.xml
+++ /dev/null
@@ -1,43 +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.                                           
- -->
-
-<!-- Read https://james.apache.org/server/config-listeners.html for further details -->
-
-<listeners>
-  <executeGroupListeners>true</executeGroupListeners>
-  <listener>
-    <class>org.apache.james.mailbox.spamassassin.SpamAssassinListener</class>
-    <async>true</async>
-  </listener>
-  <listener>
-    <class>org.apache.james.mailbox.cassandra.MailboxOperationLoggingListener</class>
-  </listener>
-  <preDeletionHook>
-    <class>org.apache.james.vault.DeletedMessageVaultHook</class>
-  </preDeletionHook>
-
-  <!-- Enable to populate JMAP EmailQueryView -->
-  <!--
-  <listener>
-    <class>org.apache.james.jmap.event.PopulateEmailQueryViewListener</class>
-    <async>true</async>
-  </listener>
-  -->
-</listeners>
\ No newline at end of file
diff --git a/dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/conf/lmtpserver.xml b/dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/conf/lmtpserver.xml
deleted file mode 100644
index 723da3f..0000000
--- a/dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/conf/lmtpserver.xml
+++ /dev/null
@@ -1,43 +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.                                           
- -->
-
-<!-- Read https://james.apache.org/server/config-smtp-lmtp.html#LMTP_Configuration for further details -->
-
-<lmtpservers>
-
-    <lmtpserver enabled="false">
-        <jmxName>lmtpserver</jmxName>
-        <!-- LMTP should not be reachable from outside your network so bind it to loopback-->
-        <bind>127.0.0.1:24</bind>
-        <connectionBacklog>200</connectionBacklog>
-        <connectiontimeout>1200</connectiontimeout>
-        <!-- Set the maximum simultaneous incoming connections for this service -->
-        <connectionLimit>0</connectionLimit>
-        <!-- Set the maximum simultaneous incoming connections per IP for this service -->
-        <connectionLimitPerIP>0</connectionLimitPerIP>
-        <!--  This sets the maximum allowed message size (in kilobytes) for this -->
-        <!--  LMTP service. If unspecified, the value defaults to 0, which means no limit. -->
-        <maxmessagesize>0</maxmessagesize>
-        <handlerchain>
-            <handler class="org.apache.james.lmtpserver.CoreCmdHandlerLoader"/>
-        </handlerchain>
-    </lmtpserver>
-
-</lmtpservers>
diff --git a/dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/conf/logback.xml b/dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/conf/logback.xml
deleted file mode 100644
index 6f38617..0000000
--- a/dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/conf/logback.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration>
-
-        <contextListener class="ch.qos.logback.classic.jul.LevelChangePropagator">
-                <resetJUL>true</resetJUL>
-        </contextListener>
-
-        <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
-                <encoder>
-                        <pattern>%d{HH:mm:ss.SSS} %highlight([%-5level]) %logger{15} - %msg%n%rEx</pattern>
-                        <immediateFlush>false</immediateFlush>
-                </encoder>
-        </appender>
-
-        <appender name="LOG_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-                <file>/logs/james.log</file>
-                <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-                    <fileNamePattern>/logs/james.%i.log.tar.gz</fileNamePattern>
-                    <minIndex>1</minIndex>
-                    <maxIndex>3</maxIndex>
-                </rollingPolicy>
-
-                <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
-                    <maxFileSize>100MB</maxFileSize>
-                </triggeringPolicy>
-
-                <encoder>
-                        <pattern>%d{HH:mm:ss.SSS} [%-5level] %logger{15} - %msg%n%rEx</pattern>
-                        <immediateFlush>false</immediateFlush>
-                </encoder>
-        </appender>
-
-        <root level="WARN">
-                <appender-ref ref="CONSOLE" />
-                <appender-ref ref="LOG_FILE" />
-        </root>
-
-        <logger name="org.apache.james" level="INFO" />
-        <logger name="com.datastax.driver.core.QueryLogger.SLOW" level="DEBUG" />
-
-
-</configuration>
diff --git a/dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/conf/mailetcontainer.xml b/dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/conf/mailetcontainer.xml
deleted file mode 100644
index 4b2abf4..0000000
--- a/dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/conf/mailetcontainer.xml
+++ /dev/null
@@ -1,156 +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.
- -->
-
-<!-- Read https://james.apache.org/server/config-mailetcontainer.html for further details -->
-
-<mailetcontainer enableJmx="true">
-
-    <context>
-        <!-- When the domain part of the postmaster mailAddress is missing, the default domain is appended.
-        You can configure it to (for example) <postmaster>postmaster@myDomain.com</postmaster> -->
-        <postmaster>postmaster</postmaster>
-    </context>
-
-    <spooler>
-        <threads>20</threads>
-        <errorRepository>cassandra://var/mail/error/</errorRepository>
-    </spooler>
-
-    <processors>
-        <processor state="root" enableJmx="true">
-            <mailet match="All" class="PostmasterAlias"/>
-            <mailet match="RelayLimit=30" class="Null"/>
-            <mailet match="All" class="ToProcessor">
-                <processor>transport</processor>
-            </mailet>
-        </processor>
-
-        <processor state="error" enableJmx="true">
-            <mailet match="All" class="MetricsMailet">
-                <metricName>mailetContainerErrors</metricName>
-            </mailet>
-            <mailet match="All" class="Bounce">
-                <onMailetException>ignore</onMailetException>
-            </mailet>
-            <mailet match="All" class="ToRepository">
-                <repositoryPath>cassandra://var/mail/error/</repositoryPath>
-                <onMailetException>ignore</onMailetException>
-            </mailet>
-        </processor>
-
-        <processor state="transport" enableJmx="true">
-            <matcher name="relay-allowed" match="org.apache.james.mailetcontainer.impl.matchers.Or">
-                <matcher match="SMTPAuthSuccessful"/>
-                <matcher match="SMTPIsAuthNetwork"/>
-                <matcher match="SentByMailet"/>
-                <matcher match="org.apache.james.jmap.mailet.SentByJmap"/>
-            </matcher>
-
-            <mailet match="All" class="RemoveMimeHeader">
-                <name>bcc</name>
-                <onMailetException>ignore</onMailetException>
-            </mailet>
-            <mailet match="All" class="RecipientRewriteTable">
-                <errorProcessor>rrt-error</errorProcessor>
-            </mailet>
-            <mailet match="RecipientIsLocal" class="ToProcessor">
-                <processor>local-delivery</processor>
-            </mailet>
-            <mailet match="HostIsLocal" class="ToProcessor">
-                <processor>local-address-error</processor>
-                <notice>550 - Requested action not taken: no such user here</notice>
-            </mailet>
-            <mailet match="relay-allowed" class="ToProcessor">
-                <processor>relay</processor>
-            </mailet>
-            <mailet match="All" class="ToProcessor">
-                <processor>relay-denied</processor>
-            </mailet>
-        </processor>
-
-        <processor state="local-delivery" enableJmx="true">
-            <mailet match="All" class="org.apache.james.jmap.mailet.VacationMailet"/>
-            <mailet match="All" class="Sieve"/>
-            <mailet match="All" class="AddDeliveredToHeader"/>
-            <mailet match="All" class="org.apache.james.jmap.mailet.filter.JMAPFiltering"/>
-            <mailet match="All" class="LocalDelivery"/>
-        </processor>
-
-        <processor state="relay" enableJmx="true">
-            <mailet match="All" class="RemoteDelivery">
-                <outgoingQueue>outgoing</outgoingQueue>
-                <delayTime>5000, 100000, 500000</delayTime>
-                <maxRetries>3</maxRetries>
-                <maxDnsProblemRetries>0</maxDnsProblemRetries>
-                <deliveryThreads>10</deliveryThreads>
-                <sendpartial>true</sendpartial>
-                <bounceProcessor>bounces</bounceProcessor>
-            </mailet>
-        </processor>
-
-        <processor state="local-address-error" enableJmx="true">
-            <mailet match="All" class="MetricsMailet">
-                <metricName>mailetContainerLocalAddressError</metricName>
-            </mailet>
-            <mailet match="All" class="Bounce">
-                <attachment>none</attachment>
-            </mailet>
-            <mailet match="All" class="ToRepository">
-                <repositoryPath>cassandra://var/mail/address-error/</repositoryPath>
-            </mailet>
-        </processor>
-
-        <processor state="relay-denied" enableJmx="true">
-            <mailet match="All" class="MetricsMailet">
-                <metricName>mailetContainerRelayDenied</metricName>
-            </mailet>
-            <mailet match="All" class="Bounce">
-                <attachment>none</attachment>
-            </mailet>
-            <mailet match="All" class="ToRepository">
-                <repositoryPath>cassandra://var/mail/relay-denied/</repositoryPath>
-                <notice>Warning: You are sending an e-mail to a remote server. You must be authenticated to perform such an operation</notice>
-            </mailet>
-        </processor>
-
-        <processor state="bounces" enableJmx="true">
-            <mailet match="All" class="MetricsMailet">
-                <metricName>bounces</metricName>
-            </mailet>
-            <mailet match="All" class="DSNBounce">
-                <passThrough>false</passThrough>
-            </mailet>
-        </processor>
-
-        <processor state="rrt-error" enableJmx="false">
-            <mailet match="All" class="ToRepository">
-                <repositoryPath>cassandra://var/mail/rrt-error/</repositoryPath>
-                <passThrough>true</passThrough>
-            </mailet>
-            <mailet match="IsSenderInRRTLoop" class="Null"/>
-            <mailet match="All" class="Bounce"/>
-        </processor>
-
-    </processors>
-
-</mailetcontainer>
-
-
diff --git a/dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/conf/mailrepositorystore.xml b/dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/conf/mailrepositorystore.xml
deleted file mode 100644
index 00ed3f7..0000000
--- a/dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/conf/mailrepositorystore.xml
+++ /dev/null
@@ -1,33 +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.
- -->
-
-<!-- Read https://james.apache.org/server/config-mailrepositorystore.html for further details -->
-
-<mailrepositorystore>
-    <defaultProtocol>cassandra</defaultProtocol>
-    <mailrepositories>
-        <mailrepository class="org.apache.james.mailrepository.cassandra.CassandraMailRepository">
-            <protocols>
-                <protocol>cassandra</protocol>
-            </protocols>
-        </mailrepository>
-    </mailrepositories>
-</mailrepositorystore>
diff --git a/dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/conf/managesieveserver.xml b/dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/conf/managesieveserver.xml
deleted file mode 100644
index 7b0b85a..0000000
--- a/dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/conf/managesieveserver.xml
+++ /dev/null
@@ -1,65 +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.                                           
- -->
- 
-<!--
-   This template file can be used as example for James Server configuration
-   DO NOT USE IT AS SUCH AND ADAPT IT TO YOUR NEEDS
--->
- 
-<!-- See http://james.apache.org/server/3/config.html for usage -->
-
-<managesieveservers>
-
-   <managesieveserver enabled="false">
-
-     <jmxName>managesieveserver</jmxName>
-
-     <bind>0.0.0.0:4190</bind>
-
-     <connectionBacklog>200</connectionBacklog>
-
-     <tls socketTLS="false" startTLS="false">
-       <!-- To create a new keystore execute:
-        keytool -genkey -alias james -keyalg RSA -keystore /path/to/james/conf/keystore
-         -->
-       <keystore>file://conf/keystore</keystore>
-       <secret>james72laBalle</secret>
-       <provider>org.bouncycastle.jce.provider.BouncyCastleProvider</provider>
-       <!-- The algorithm is optional and only needs to be specified when using something other
-        than the Sun JCE provider - You could use IbmX509 with IBM Java runtime. -->
-       <algorithm>SunX509</algorithm>
-     </tls>
-         
-        <!-- connection timeout in secconds -->
-        <connectiontimeout>360</connectiontimeout>
-
-        <!-- Set the maximum simultaneous incoming connections for this service -->
-        <connectionLimit>0</connectionLimit>
-         
-        <!-- Set the maximum simultaneous incoming connections per IP for this service -->
-        <connectionLimitPerIP>0</connectionLimitPerIP>
-        <maxmessagesize>0</maxmessagesize>
-        <addressBracketsEnforcement>true</addressBracketsEnforcement>
-  
-   </managesieveserver>
-
-</managesieveservers>
-
-
diff --git a/dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/conf/pop3server.xml b/dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/conf/pop3server.xml
deleted file mode 100644
index 10a2e08..0000000
--- a/dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/conf/pop3server.xml
+++ /dev/null
@@ -1,43 +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.                                           
- -->
-
-<!-- Read https://james.apache.org/server/config-pop3.html for further details -->
-
-<pop3servers>
-    <pop3server enabled="false">
-        <jmxName>pop3server</jmxName>
-        <bind>0.0.0.0:110</bind>
-        <connectionBacklog>200</connectionBacklog>
-        <tls socketTLS="false" startTLS="false">
-            <!-- To create a new keystore execute:
-                  keytool -genkey -alias james -keyalg RSA -keystore /path/to/james/conf/keystore
-             -->
-            <keystore>file://conf/keystore</keystore>
-            <secret>james72laBalle</secret>
-            <provider>org.bouncycastle.jce.provider.BouncyCastleProvider</provider>
-        </tls>
-        <connectiontimeout>1200</connectiontimeout>
-        <connectionLimit>0</connectionLimit>
-        <connectionLimitPerIP>0</connectionLimitPerIP>
-        <handlerchain>
-            <handler class="org.apache.james.pop3server.core.CoreCmdHandlerLoader"/>
-        </handlerchain>
-    </pop3server>
-</pop3servers>
diff --git a/dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/conf/rabbitmq.properties b/dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/conf/rabbitmq.properties
deleted file mode 100644
index f8b443d..0000000
--- a/dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/conf/rabbitmq.properties
+++ /dev/null
@@ -1,63 +0,0 @@
-# RabbitMQ configuration
-
-# Read https://james.apache.org/server/config-rabbitmq.html for further details
-
-# Mandatory
-uri=amqp://rabbitmq:5672
-
-# RabbitMQ Administration Management
-# Mandatory
-management.uri=http://rabbitmq:15672
-# Mandatory
-management.user=guest
-# Mandatory
-management.password=guest
-
-# Configure retries count to retrieve a connection. Exponential backoff is performed between each retries.
-# Optional integer, defaults to 10
-#connection.pool.retries=10
-# Configure initial duration (in ms) between two connection retries. Exponential backoff is performed between each retries.
-# Optional integer, defaults to 100
-#connection.pool.min.delay.ms=100
-# Configure retries count to retrieve a channel. Exponential backoff is performed between each retries.
-# Optional integer, defaults to 3
-#channel.pool.retries=3
-# Configure initial duration (in ms) between two channel retries. Exponential backoff is performed between each retries.
-# Optional integer, defaults to 50
-#channel.pool.min.delay.ms=50
-# Configure the size of the channel pool.
-# Optional integer, defaults to 3
-#channel.pool.size=3
-
-# Parameters for the Cassandra administrative view
-
-# Period of the window. Too large values will lead to wide rows while too little values might lead to many queries.
-# Use the number of mail per Cassandra row, along with your expected traffic, to determine this value
-# This value can only be decreased to a value dividing the current value
-# Optional, default 1h
-mailqueue.view.sliceWindow=1h
-
-# Use to distribute the emails of a given slice within your cassandra cluster
-# A good value is 2*cassandraNodeCount
-# This parameter can only be increased.
-# Optional, default 1
-mailqueue.view.bucketCount=1
-
-# Determine the probability to update the browse start pointer
-# Too little value will lead to unnecessary reads. Too big value will lead to more expensive browse.
-# Choose this parameter so that it get's update one time every one-two sliceWindow
-# Optional, default 1000
-mailqueue.view.updateBrowseStartPace=1000
-
-# Enables or disables the gauge metric on the mail queue size
-# Computing the size of the mail queue is currently implemented on top of browse operation and thus have a linear complexity
-# Metrics get exported periodically as configured in elasticsearch.properties, thus getSize is also called periodically
-# Choose to disable it when the mail queue size is getting too big
-# Note that this is as well a temporary workaround until we get 'getSize' method better optimized
-# Optional, default false
-mailqueue.size.metricsEnabled=false
-
-# Whether to enable task consumption on this node. Tasks are WebAdmin triggered long running jobs.
-# Disable with caution (this only makes sense in a distributed setup where other nodes consume tasks).
-# Defaults to true.
-task.consumption.enabled=true
\ No newline at end of file
diff --git a/dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/conf/recipientrewritetable.xml b/dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/conf/recipientrewritetable.xml
deleted file mode 100644
index 1a512c6..0000000
--- a/dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/conf/recipientrewritetable.xml
+++ /dev/null
@@ -1,28 +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.                                           
- -->
-
-<!-- Read https://james.apache.org/server/config-recipientrewritetable.html for further details -->
-
-<!-- The default table for storing James' RecipientRewriteTable mappings. -->
-<recipientrewritetable>
-  <recursiveMapping>true</recursiveMapping>
-  <mappingLimit>10</mappingLimit>
-</recipientrewritetable>
-
diff --git a/dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/conf/smtpserver.xml b/dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/conf/smtpserver.xml
deleted file mode 100644
index 722b0c2..0000000
--- a/dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/conf/smtpserver.xml
+++ /dev/null
@@ -1,107 +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.
- -->
-
-<!-- Read https://james.apache.org/server/config-smtp-lmtp.html#SMTP_Configuration for further details -->
-
-<smtpservers>
-    <smtpserver enabled="true">
-        <jmxName>smtpserver-global</jmxName>
-        <bind>0.0.0.0:25</bind>
-        <connectionBacklog>200</connectionBacklog>
-        <tls socketTLS="false" startTLS="false">
-            <keystore>file://conf/keystore</keystore>
-            <secret>james72laBalle</secret>
-            <provider>org.bouncycastle.jce.provider.BouncyCastleProvider</provider>
-            <algorithm>SunX509</algorithm>
-        </tls>
-        <connectiontimeout>360</connectiontimeout>
-        <connectionLimit>0</connectionLimit>
-        <connectionLimitPerIP>0</connectionLimitPerIP>
-        <authRequired>false</authRequired>
-        <authorizedAddresses>127.0.0.0/8</authorizedAddresses>
-        <verifyIdentity>true</verifyIdentity>
-        <maxmessagesize>0</maxmessagesize>
-        <addressBracketsEnforcement>true</addressBracketsEnforcement>
-        <smtpGreeting>Apache JAMES awesome SMTP Server</smtpGreeting>
-        <handlerchain>
-            <handler class="org.apache.james.smtpserver.fastfail.ValidRcptHandler"/>
-            <handler class="org.apache.james.smtpserver.CoreCmdHandlerLoader"/>
-        </handlerchain>
-    </smtpserver>
-    <smtpserver enabled="true">
-        <jmxName>smtpserver-TLS</jmxName>
-        <bind>0.0.0.0:465</bind>
-        <connectionBacklog>200</connectionBacklog>
-        <tls socketTLS="true" startTLS="false">
-            <keystore>file://conf/keystore</keystore>
-            <secret>james72laBalle</secret>
-            <provider>org.bouncycastle.jce.provider.BouncyCastleProvider</provider>
-            <algorithm>SunX509</algorithm>
-        </tls>
-        <connectiontimeout>360</connectiontimeout>
-        <connectionLimit>0</connectionLimit>
-        <connectionLimitPerIP>0</connectionLimitPerIP>
-        <!--
-           Authorize only local users
-        -->
-        <authRequired>true</authRequired>
-        <authorizedAddresses>127.0.0.0/8</authorizedAddresses>
-        <!-- Trust authenticated users -->
-        <verifyIdentity>false</verifyIdentity>
-        <maxmessagesize>0</maxmessagesize>
-        <addressBracketsEnforcement>true</addressBracketsEnforcement>
-        <smtpGreeting>Apache JAMES awesome SMTP Server</smtpGreeting>
-        <handlerchain>
-            <handler class="org.apache.james.smtpserver.fastfail.ValidRcptHandler"/>
-            <handler class="org.apache.james.smtpserver.CoreCmdHandlerLoader"/>
-        </handlerchain>
-    </smtpserver>
-    <smtpserver enabled="true">
-        <jmxName>smtpserver-authenticated</jmxName>
-        <bind>0.0.0.0:587</bind>
-        <connectionBacklog>200</connectionBacklog>
-        <tls socketTLS="false" startTLS="true">
-            <keystore>file://conf/keystore</keystore>
-            <secret>james72laBalle</secret>
-            <provider>org.bouncycastle.jce.provider.BouncyCastleProvider</provider>
-            <algorithm>SunX509</algorithm>
-        </tls>
-        <connectiontimeout>360</connectiontimeout>
-        <connectionLimit>0</connectionLimit>
-        <connectionLimitPerIP>0</connectionLimitPerIP>
-        <!--
-           Authorize only local users
-        -->
-        <authRequired>true</authRequired>
-        <authorizedAddresses>127.0.0.0/8</authorizedAddresses>
-        <!-- Trust authenticated users -->
-        <verifyIdentity>false</verifyIdentity>
-        <maxmessagesize>0</maxmessagesize>
-        <addressBracketsEnforcement>true</addressBracketsEnforcement>
-        <smtpGreeting>Apache JAMES awesome SMTP Server</smtpGreeting>
-        <handlerchain>
-            <handler class="org.apache.james.smtpserver.fastfail.ValidRcptHandler"/>
-            <handler class="org.apache.james.smtpserver.CoreCmdHandlerLoader"/>
-        </handlerchain>
-    </smtpserver>
-</smtpservers>
-
-
diff --git a/dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/conf/tika.properties b/dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/conf/tika.properties
deleted file mode 100644
index 1fb9956..0000000
--- a/dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/conf/tika.properties
+++ /dev/null
@@ -1,23 +0,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.
-
-# Read https://james.apache.org/server/config-elasticsearch.html#Tika_Configuration for further details
-
-tika.enabled=true
-tika.host=tika
-tika.port=9998
-tika.timeoutInMillis=3000
diff --git a/dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/conf/usersrepository.xml b/dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/conf/usersrepository.xml
deleted file mode 100644
index e907fb5..0000000
--- a/dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/conf/usersrepository.xml
+++ /dev/null
@@ -1,29 +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.                                           
- -->
-
-<!-- Read https://james.apache.org/server/config-users.html for further details -->
-
-<repository name="LocalUsers"
-    ldapHost="ldap://myldapserver:389"
-    principal="uid=ldapUser,ou=system"
-    credentials="password"
-    userBase="ou=People,o=myorg.com,ou=system"
-    userIdAttribute="uid"
-    userObjectClass="person"/>
diff --git a/dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/conf/webadmin.properties b/dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/conf/webadmin.properties
deleted file mode 100644
index ab7b2e4..0000000
--- a/dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/conf/webadmin.properties
+++ /dev/null
@@ -1,54 +0,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.
-
-#  This template file can be used as example for James Server configuration
-#  DO NOT USE IT AS SUCH AND ADAPT IT TO YOUR NEEDS
-
-# Read https://james.apache.org/server/config-webadmin.html for further details
-
-enabled=true
-port=8000
-host=localhost
-
-# Defaults to false
-https.enabled=false
-
-# Compulsory when enabling HTTPS
-#https.keystore=/path/to/keystore
-#https.password=password
-
-# Optional when enabling HTTPS (self signed)
-#https.trust.keystore
-#https.trust.password
-
-# Defaults to false
-#jwt.enabled=true
-#
-## If you wish to use OAuth authentication, you should provide a valid JWT public key.
-## The following entry specify the link to the URL of the public key file,
-## which should be a PEM format file.
-##
-#jwt.publickeypem.url=file://conf/jwt_publickey
-
-# Defaults to false
-#cors.enable=true
-#cors.origin
-
-# List of fully qualified class names that should be exposed over webadmin
-# in addition to your product default routes. Routes needs to be located
-# within the classpath or in the ./extensions-jars folder.
-#extensions.routes=
\ No newline at end of file
diff --git a/dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/extensions-jars/README.md b/dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/extensions-jars/README.md
deleted file mode 100644
index 2cea759..0000000
--- a/dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/extensions-jars/README.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# Adding Jars to JAMES
-
-The jar in this folder will be added to JAMES classpath when mounted under /root/extensions-jars inside the running container.
-
-You can use it to add you customs Mailets/Matchers.
diff --git a/dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/glowroot/admin.json b/dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/glowroot/admin.json
deleted file mode 100644
index c75c59d..0000000
--- a/dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/glowroot/admin.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "web": {
-    "bindAddress": "0.0.0.0"
-  }
-}
\ No newline at end of file
diff --git a/dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/glowroot/plugins/blobstore.json b/dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/glowroot/plugins/blobstore.json
deleted file mode 100644
index 84291c6..0000000
--- a/dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/glowroot/plugins/blobstore.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "name": "BlobStore Plugin",
-  "id": "blob_store",
-  "instrumentation": [
-    {
-      "captureKind": "trace-entry",
-      "traceEntryMessageTemplate": "{{this.class.name}}.{{methodName}}",
-      "timerName": "blobstore",
-      "className": "org.apache.james.blob.objectstorage.BlobPutter",
-      "methodName": "putDirectly",
-      "methodParameterTypes": [
-        ".."
-      ]
-    },
-    {
-      "captureKind": "trace-entry",
-      "traceEntryMessageTemplate": "{{this.class.name}}.{{methodName}}",
-      "timerName": "blobstore",
-      "className": "org.apache.james.blob.objectstorage.BlobPutter",
-      "methodName": "putAndComputeId",
-      "methodParameterTypes": [
-        ".."
-      ]
-    }
-  ]
-}
\ No newline at end of file
diff --git a/dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/glowroot/plugins/imap.json b/dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/glowroot/plugins/imap.json
deleted file mode 100644
index d27904f..0000000
--- a/dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/glowroot/plugins/imap.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "name": "IMAP Plugin",
-  "id": "imap",
-  "instrumentation": [
-    {
-      "className": "org.apache.james.imap.processor.base.AbstractChainedProcessor",
-      "methodName": "doProcess",
-      "methodParameterTypes": [
-        ".."
-      ],
-      "captureKind": "transaction",
-      "transactionType": "IMAP",
-      "transactionNameTemplate": "IMAP processor : {{this.class.name}}",
-      "alreadyInTransactionBehavior": "capture-trace-entry",
-      "traceEntryMessageTemplate": "{{this.class.name}}.{{methodName}}",
-      "timerName": "imapProcessor"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/glowroot/plugins/jmap.json b/dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/glowroot/plugins/jmap.json
deleted file mode 100644
index 9afce4b..0000000
--- a/dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/glowroot/plugins/jmap.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "name": "JMAP Plugin",
-  "id": "jmap",
-  "instrumentation": [
-    {
-      "className": "org.apache.james.jmap.draft.methods.Method",
-      "methodName": "processToStream",
-      "methodParameterTypes": [
-        ".."
-      ],
-      "captureKind": "transaction",
-      "transactionType": "JMAP",
-      "transactionNameTemplate": "JMAP method : {{this.class.name}}",
-      "alreadyInTransactionBehavior": "capture-trace-entry",
-      "traceEntryMessageTemplate": "{{this.class.name}}.{{methodName}}",
-      "timerName": "jmapMethod"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/glowroot/plugins/mailboxListener.json b/dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/glowroot/plugins/mailboxListener.json
deleted file mode 100644
index 54a55ac..0000000
--- a/dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/glowroot/plugins/mailboxListener.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "name": "MailboxListener Plugin",
-  "id": "mailboxListener",
-  "instrumentation": [
-    {
-      "className": "org.apache.james.mailbox.events.MailboxListener",
-      "methodName": "event",
-      "methodParameterTypes": [
-        ".."
-      ],
-      "captureKind": "transaction",
-      "transactionType": "MailboxListener",
-      "transactionNameTemplate": "MailboxListener : {{this.class.name}}",
-      "alreadyInTransactionBehavior": "capture-trace-entry",
-      "traceEntryMessageTemplate": "{{this.class.name}}.{{methodName}}",
-      "timerName": "mailboxListener"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/glowroot/plugins/smtp.json b/dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/glowroot/plugins/smtp.json
deleted file mode 100644
index 393bac9..0000000
--- a/dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/glowroot/plugins/smtp.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "name": "SMTP Plugin",
-  "id": "smtp",
-  "instrumentation": [
-    {
-      "className": "org.apache.james.protocols.smtp.core.AbstractHookableCmdHandler",
-      "methodName": "onCommand",
-      "methodParameterTypes": [
-        ".."
-      ],
-      "captureKind": "transaction",
-      "transactionType": "SMTP",
-      "transactionNameTemplate": "SMTP command : {{this.class.name}}",
-      "alreadyInTransactionBehavior": "capture-trace-entry",
-      "traceEntryMessageTemplate": "{{this.class.name}}.{{methodName}}",
-      "timerName": "smtpProcessor"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/glowroot/plugins/spooler.json b/dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/glowroot/plugins/spooler.json
deleted file mode 100644
index fd7732d..0000000
--- a/dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/glowroot/plugins/spooler.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-  "name": "Spooler Plugin",
-  "id": "spooler",
-  "instrumentation": [
-    {
-      "className": "org.apache.james.mailetcontainer.api.MailProcessor",
-      "methodName": "service",
-      "methodParameterTypes": [
-        ".."
-      ],
-      "captureKind": "transaction",
-      "transactionType": "Spooler",
-      "transactionNameTemplate": "Mailet processor : {{this.class.name}}",
-      "alreadyInTransactionBehavior": "capture-trace-entry",
-      "traceEntryMessageTemplate": "{{this.class.name}}.{{methodName}}",
-      "timerName": "mailetProcessor"
-    },
-    {
-      "className": "org.apache.mailet.Mailet",
-      "methodName": "service",
-      "methodParameterTypes": [
-        ".."
-      ],
-      "captureKind": "transaction",
-      "transactionType": "Mailet",
-      "transactionNameTemplate": "Mailet : {{this.class.name}}",
-      "alreadyInTransactionBehavior": "capture-trace-entry",
-      "traceEntryMessageTemplate": "{{this.class.name}}.{{methodName}}",
-      "timerName": "mailet"
-    },
-    {
-      "className": "org.apache.mailet.Matcher",
-      "methodName": "match",
-      "methodParameterTypes": [
-        ".."
-      ],
-      "captureKind": "transaction",
-      "transactionType": "Matcher",
-      "transactionNameTemplate": "Mailet processor : {{this.class.name}}",
-      "alreadyInTransactionBehavior": "capture-trace-entry",
-      "traceEntryMessageTemplate": "{{this.class.name}}.{{methodName}}",
-      "timerName": "matcher"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/glowroot/plugins/task.json b/dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/glowroot/plugins/task.json
deleted file mode 100644
index 8f04c69..0000000
--- a/dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/glowroot/plugins/task.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "name": "Task Plugin",
-  "id": "task",
-  "instrumentation": [
-    {
-      "className": "org.apache.james.task.Task",
-      "methodName": "run",
-      "methodParameterTypes": [
-        ".."
-      ],
-      "captureKind": "transaction",
-      "transactionType": "TASK",
-      "transactionNameTemplate": "TASK : {{this.class.name}}",
-      "alreadyInTransactionBehavior": "capture-trace-entry",
-      "traceEntryMessageTemplate": "{{this.class.name}}.{{methodName}}",
-      "timerName": "task"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/run_james.sh b/dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/run_james.sh
deleted file mode 100755
index 02f2bf6..0000000
--- a/dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/run_james.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-if [ "$GLOWROOT_ACTIVATED" == "true" ]; then
-    GLOWROOT_OPTIONS=-javaagent:/root/glowroot/glowroot.jar
-fi
-java -Dlogback.configurationFile=/root/conf/logback.xml -Dworking.directory=/root/ $JVM_OPTIONS $GLOWROOT_OPTIONS -jar james-server.jar
\ No newline at end of file
diff --git a/server/container/guice/cassandra-guice/sample-configuration/usersrepository.xml b/server/container/guice/cassandra-guice/sample-configuration/usersrepository.xml
index 3a540c4..4a0a9a1 100644
--- a/server/container/guice/cassandra-guice/sample-configuration/usersrepository.xml
+++ b/server/container/guice/cassandra-guice/sample-configuration/usersrepository.xml
@@ -26,3 +26,17 @@
     <enableForwarding>true</enableForwarding>
 </usersrepository>
 
+
+        <!-- LDAP support example-->
+        <!--
+        <usersrepository name="LocalUsers"
+            ldapHost="ldap://myldapserver:389"
+            principal="uid=ldapUser,ou=system"
+            credentials="password"
+            userBase="ou=People,o=myorg.com,ou=system"
+            userIdAttribute="uid"
+            userObjectClass="person">
+          <enableVirtualHosting>true</enableVirtualHosting>
+          <enableForwarding>true</enableForwarding>
+        </usersrepository>
+        -->
\ No newline at end of file
diff --git a/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/usersrepository.xml b/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/usersrepository.xml
index 3a540c4..0f4a805 100644
--- a/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/usersrepository.xml
+++ b/server/container/guice/cassandra-rabbitmq-guice/sample-configuration/usersrepository.xml
@@ -26,3 +26,16 @@
     <enableForwarding>true</enableForwarding>
 </usersrepository>
 
+        <!-- LDAP support example-->
+        <!--
+        <usersrepository name="LocalUsers"
+            ldapHost="ldap://myldapserver:389"
+            principal="uid=ldapUser,ou=system"
+            credentials="password"
+            userBase="ou=People,o=myorg.com,ou=system"
+            userIdAttribute="uid"
+            userObjectClass="person">
+          <enableVirtualHosting>true</enableVirtualHosting>
+          <enableForwarding>true</enableForwarding>
+        </usersrepository>
+        -->
\ No newline at end of file

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