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/06/26 01:08:41 UTC

[james-project] 03/23: JAMES-3603 Remove Dockerfile for Spring

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 b50750a9d16407a63449094e42a9991b1ccbaf1c
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Wed Jun 23 10:59:26 2021 +0700

    JAMES-3603 Remove Dockerfile for Spring
    
     - We likely do not want as a project to promote Spring artifacts
     - Not integrated to the project build (JIB)
---
 dockerfiles/run/spring/Dockerfile                  |  53 --
 dockerfiles/run/spring/destination/.gitignore      |   2 -
 dockerfiles/run/spring/destination/admin.json      |   5 -
 .../conf/META-INF/jpa-mappings-template.xml        |  40 --
 .../conf/META-INF/persistence-template.xml         |  80 ---
 .../destination/conf/META-INF/persistence.xml      |  53 --
 .../run/spring/destination/conf/dnsservice.xml     |  25 -
 .../run/spring/destination/conf/domainlist.xml     |  25 -
 dockerfiles/run/spring/destination/conf/events.xml |  44 --
 .../run/spring/destination/conf/fetchmail.xml      | 288 --------
 .../run/spring/destination/conf/imapserver.xml     |  60 --
 .../run/spring/destination/conf/indexer.xml        |  23 -
 .../destination/conf/james-database.properties     |  46 --
 .../run/spring/destination/conf/jmx.properties     |  28 -
 .../run/spring/destination/conf/lib/README.txt     |   1 -
 .../run/spring/destination/conf/lmtpserver.xml     |  41 --
 dockerfiles/run/spring/destination/conf/log4j2.xml | 485 -------------
 .../run/spring/destination/conf/mailbox.xml        |  23 -
 .../spring/destination/conf/mailetcontainer.xml    | 147 ----
 .../destination/conf/mailrepositorystore.xml       |  34 -
 .../spring/destination/conf/managesieveserver.xml  |  65 --
 .../run/spring/destination/conf/pop3server.xml     |  42 --
 dockerfiles/run/spring/destination/conf/quota.xml  |  53 --
 .../destination/conf/recipientrewritetable.xml     |  26 -
 .../spring/destination/conf/sieverepository.xml    |  23 -
 .../run/spring/destination/conf/smtpserver.xml     | 105 ---
 .../run/spring/destination/conf/sqlResources.xml   | 795 ---------------------
 .../spring/destination/conf/usersrepository.xml    |  25 -
 .../run/spring/destination/glowroot/admin.json     |   5 -
 .../spring/destination/glowroot/plugins/imap.json  |  19 -
 dockerfiles/run/spring/destination/run_james.sh    |   5 -
 dockerfiles/run/spring/destination/var/.gitignore  |   2 -
 src/site/xdoc/server/packaging.xml                 |   2 +-
 33 files changed, 1 insertion(+), 2669 deletions(-)

diff --git a/dockerfiles/run/spring/Dockerfile b/dockerfiles/run/spring/Dockerfile
deleted file mode 100644
index 8d688c7..0000000
--- a/dockerfiles/run/spring/Dockerfile
+++ /dev/null
@@ -1,53 +0,0 @@
-# Run James
-#
-# VERSION	1.0
-
-FROM adoptopenjdk:11-jre-hotspot
-
-# Install unzip
-RUN apt-get update
-RUN apt-get install -y unzip
-
-# 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
-
-EXPOSE 25 110 143 465 587 993 4000
-
-WORKDIR /root
-
-ARG VERSION=3.6.0-SNAPSHOT
-
-# Get data we need to run James : build results and configuration
-ADD "destination/james-server-app-$VERSION-app.zip" "/root/james-server-app-$VERSION-app.zip"
-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
-
-# Unzip build result
-RUN unzip "james-server-app-$VERSION-app.zip"
-
-# Copy configuration.
-# Warning : we want to use the wrapper.conf file we just compiled.
-RUN cp "james-server-app-$VERSION/conf/wrapper.conf" .
-RUN rm -r "james-server-app-$VERSION/conf" && mkdir "james-server-app-$VERSION/conf"
-RUN cp -r conf/* "james-server-app-$VERSION/conf"
-RUN cp wrapper.conf "james-server-app-$VERSION/conf"
-
-ENV PATH "$PATH:/root/glowroot/lib"
-
-WORKDIR "/root/james-server-app-$VERSION/bin"
-ENTRYPOINT /root/run_james.sh
\ No newline at end of file
diff --git a/dockerfiles/run/spring/destination/.gitignore b/dockerfiles/run/spring/destination/.gitignore
deleted file mode 100644
index 2706772..0000000
--- a/dockerfiles/run/spring/destination/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.zip
-keystore
\ No newline at end of file
diff --git a/dockerfiles/run/spring/destination/admin.json b/dockerfiles/run/spring/destination/admin.json
deleted file mode 100644
index c75c59d..0000000
--- a/dockerfiles/run/spring/destination/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/spring/destination/conf/META-INF/jpa-mappings-template.xml b/dockerfiles/run/spring/destination/conf/META-INF/jpa-mappings-template.xml
deleted file mode 100644
index fe76d25..0000000
--- a/dockerfiles/run/spring/destination/conf/META-INF/jpa-mappings-template.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-  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.    
--->
-
-<!-- Use this file to overwriting the annotations defined in the JPA domain classes -->
-
-<entity-mappings xmlns="http://java.sun.com/xml/ns/persistence/orm"
-                 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                 xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_2_0.xsd"
-                 version="2.0">
-
-    <entity class="org.apache.james.mailbox.jpa.mail.model.JPAHeader">
-
-        <table name="JAMES_MAIL_HEADER"/>
-
-        <attributes>
-            <basic name="value">
-                <column name="HEADER_VALUE" length="8000" />
-            </basic>
-        </attributes>
-
-    </entity>
-
-</entity-mappings>
diff --git a/dockerfiles/run/spring/destination/conf/META-INF/persistence-template.xml b/dockerfiles/run/spring/destination/conf/META-INF/persistence-template.xml
deleted file mode 100644
index cca9545..0000000
--- a/dockerfiles/run/spring/destination/conf/META-INF/persistence-template.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  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.    
--->
-
-<persistence xmlns="http://java.sun.com/xml/ns/persistence"
-             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-             xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd"
-             version="2.0">
-
-    <persistence-unit name="James" transaction-type="RESOURCE_LOCAL">
-
-        <!-- Use the mappings to overwriting the annotations defined in the JPA domain classes -->
-        <mapping-file>META-INF/jpa-mappings-template.xml</mapping-file>
-
-        <!-- Mailbox stuff-->
-        <class>org.apache.james.mailbox.jpa.mail.model.JPAMailbox</class>
-        <class>org.apache.james.mailbox.jpa.mail.model.JPAUserFlag</class>
-        <class>org.apache.james.mailbox.jpa.mail.model.openjpa.AbstractJPAMailboxMessage</class>
-        <!--
-                <class>org.apache.james.mailbox.jpa.mail.model.openjpa.JPAEncryptedMailboxMessage</class>
-        -->
-
-        <!-- This needs to get used when you want to use streaming. Remember to comment the following classes
-             org.apache.james.mailbox.jpa.mail.model.JPAMessage
-             If you don't do this the EntityManager will get confused!
-        <class>org.apache.james.mailbox.jpa.mail.model.openjpa.JPAStreamingMailboxMessage</class>
-        -->
-        <!-- Comment if you want to use streaming -->
-        <class>org.apache.james.mailbox.jpa.mail.model.openjpa.JPAMailboxMessage</class>
-
-        <class>org.apache.james.mailbox.jpa.mail.model.JPAProperty</class>
-        <class>org.apache.james.mailbox.jpa.user.model.JPASubscription</class>
-
-        <!-- DomainList -->
-        <class>org.apache.james.domainlist.jpa.model.JPADomain</class>
-
-        <!-- User-->
-        <class>org.apache.james.user.jpa.model.JPAUser</class>
-
-        <!-- RecipientRewrite -->
-        <class>org.apache.james.rrt.jpa.model.JPARecipientRewrite</class>
-
-        <properties>
-            <!--  Create tables on startup -->
-            <property name="openjpa.jdbc.SynchronizeMappings" value="buildSchema(ForeignKeys=true)"/>
-            <!--  Create foreign keys on startup -->
-            <property name="openjpa.jdbc.MappingDefaults" value="ForeignKeyDeleteAction=cascade, JoinForeignKeyDeleteAction=cascade"/>
-            <!--  Reorder SQL statements to satisfy database foreign key constraints -->
-            <property name="openjpa.jdbc.SchemaFactory" value="native(ForeignKeys=true)"/>
-            <!--  Disable query cache for now. It seems to be buggy. -->
-            <!--  See http://www.mail-archive.com/server-dev@james.apache.org/msg28802.html -->
-            <!--  See https://issues.apache.org/jira/browse/OPENJPA-1827 -->
-            <property name="openjpa.jdbc.QuerySQLCache" value="false"/>
-            <!--  Uncomment this if you want to see the generated SQL in the console.
-            <property name="openjpa.Log" value="SQL=TRACE"/>
-            -->
-            <!--  Uncomment this if you want to get verbose OpenJPA log the console.
-            <property name="openjpa.Log" value="DefaultLevel=TRACE"/>
-            -->
-        </properties>
-
-    </persistence-unit>
-
-</persistence>
diff --git a/dockerfiles/run/spring/destination/conf/META-INF/persistence.xml b/dockerfiles/run/spring/destination/conf/META-INF/persistence.xml
deleted file mode 100644
index 4518416..0000000
--- a/dockerfiles/run/spring/destination/conf/META-INF/persistence.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  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.    
--->
-
-<persistence xmlns="http://java.sun.com/xml/ns/persistence"
-             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-             xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd"
-             version="2.0">
-
-    <persistence-unit name="James" transaction-type="RESOURCE_LOCAL">
-        <!-- Mailbox stuff-->
-        <class>org.apache.james.mailbox.jpa.mail.model.JPAMailbox</class>
-        <class>org.apache.james.mailbox.jpa.mail.model.JPAUserFlag</class>
-        <class>org.apache.james.mailbox.jpa.mail.model.openjpa.AbstractJPAMailboxMessage</class>
-        <class>org.apache.james.mailbox.jpa.mail.model.openjpa.JPAMailboxMessage</class>
-        <class>org.apache.james.mailbox.jpa.mail.model.JPAProperty</class>
-        <class>org.apache.james.mailbox.jpa.mail.model.JPAMailboxAnnotation</class>
-        <class>org.apache.james.mailbox.jpa.user.model.JPASubscription</class>
-        <class>org.apache.james.domainlist.jpa.model.JPADomain</class>
-        <class>org.apache.james.user.jpa.model.JPAUser</class>
-        <class>org.apache.james.rrt.jpa.model.JPARecipientRewrite</class>
-        <class>org.apache.james.mailbox.jpa.quota.model.MaxDefaultMessageCount</class>
-        <class>org.apache.james.mailbox.jpa.quota.model.MaxDefaultStorage</class>
-        <class>org.apache.james.mailbox.jpa.quota.model.MaxUserMessageCount</class>
-        <class>org.apache.james.mailbox.jpa.quota.model.MaxUserStorage</class>
-        <class>org.apache.james.mailbox.jpa.quota.model.JpaCurrentQuota</class>
-
-        <properties>
-            <property name="openjpa.jdbc.SynchronizeMappings" value="buildSchema(ForeignKeys=true)"/>
-            <property name="openjpa.jdbc.MappingDefaults" value="ForeignKeyDeleteAction=cascade, JoinForeignKeyDeleteAction=cascade"/>
-            <property name="openjpa.jdbc.SchemaFactory" value="native(ForeignKeys=true)"/>
-            <property name="openjpa.jdbc.QuerySQLCache" value="false"/>
-        </properties>
-
-    </persistence-unit>
-
-</persistence>
diff --git a/dockerfiles/run/spring/destination/conf/dnsservice.xml b/dockerfiles/run/spring/destination/conf/dnsservice.xml
deleted file mode 100644
index 6e4fbd2..0000000
--- a/dockerfiles/run/spring/destination/conf/dnsservice.xml
+++ /dev/null
@@ -1,25 +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.                                           
- -->
-
-<dnsservice>
-  <autodiscover>true</autodiscover>
-  <authoritative>false</authoritative>
-  <maxcachesize>50000</maxcachesize>
-</dnsservice>
diff --git a/dockerfiles/run/spring/destination/conf/domainlist.xml b/dockerfiles/run/spring/destination/conf/domainlist.xml
deleted file mode 100644
index 89b01d1..0000000
--- a/dockerfiles/run/spring/destination/conf/domainlist.xml
+++ /dev/null
@@ -1,25 +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.                                           
- -->
-
-<domainlist class="org.apache.james.domainlist.jpa.JPADomainList">
-    <autodetect>false</autodetect>
-    <autodetectIP>false</autodetectIP>
-    <defaultDomain>localhost</defaultDomain>
-</domainlist>
diff --git a/dockerfiles/run/spring/destination/conf/events.xml b/dockerfiles/run/spring/destination/conf/events.xml
deleted file mode 100644
index 5555280..0000000
--- a/dockerfiles/run/spring/destination/conf/events.xml
+++ /dev/null
@@ -1,44 +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
--->
-
-<events>
-    <!-- By default the event system is in memory based, providing better performances but is not
-    distributed and won't do the work with multiples servers -->
-    <type>default</type>
-
-    <!-- Do you want to wait for MailboxListeners to be executed before returning result to the user ?
-
-     If yes set this to synchronous
-     If no set this to asynchronous
-     If you want to use default supported behaviour exposed by listeners set this to mixed
-     -->
-    <delivery>synchronous</delivery>
-
-    <!--
-    The only registration system available is Cassandra, used in an available fashion. This means there is no warranties,
-    either at least one delivery nor at most one delivery. But you get the certitude that the system will always be available.
-    -->
-
-</events>
diff --git a/dockerfiles/run/spring/destination/conf/fetchmail.xml b/dockerfiles/run/spring/destination/conf/fetchmail.xml
deleted file mode 100644
index 96aa946..0000000
--- a/dockerfiles/run/spring/destination/conf/fetchmail.xml
+++ /dev/null
@@ -1,288 +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 -->
-
-<!-- Fetch mail block, fetches mail from message servers and inserts it into the incoming spool -->
-<!-- Warning: It is important to prevent mail from looping by setting the  -->
-<!-- fetched domains in the<servernames>section of the<James>block      -->
-<!-- above. This block is disabled by default.                              -->
-
-<!-- See http://james.apache.org/server/2.3.0/fetchmail_configuration.html for detailed -->
-<!-- configuration instructions and examples.                                  -->
-
-<!-- I M P O R T A N T -->
-<!-- Setting markseen="true" will have no effect on many POP3 servers as the POP3 -->
-<!-- protocol does not require the markSeen flag to be supported. When this is the -->
-<!-- case, the only way to ensure that messages are fetched just once is to delete -->
-<!-- fetched messages from the server with leaveonserver="false". -->
-
-<!-- If you want to perform mailet processing on messages fetched by fetchmail, -->
-<!-- use the HasMailAttribute matcher to detect messages with the MailAttribute -->
-<!-- org.apache.james.fetchmail.taskName. The attribute's value is that of the -->
-<!-- fetch task's name parameter described below. -->
-
-<fetchmail enabled="false">
-
-    <!-- The number of threads to use for the scheduled execution -->
-    <threads>5</threads>
-
-    <!-- The JMX Name to use -->
-    <jmxName>fetchmail</jmxName>
-
-    <!-- You can have as many fetch tasks as you want, but each must have a -->
-    <!-- unique name by which it is identified. -->
-    <!-- Each task runs at the specified<interval>, tasks may run concurrently. -->
-
-    <fetch name="mydomain.com">
-        <!-- There must be one<accounts>entry per fetch task. An accounts entry can have 0 to many -->
-        <!--<account>entries and 0 or 1<alllocal>entries.<alllocal>generates -->
-        <!--<accounts>for every user defined to James.<accounts>run consecutively within the -->
-        <!-- scope of their fetch task and inherit all the properties of the fetch task. -->
-
-        <!-- The advantage of running consecutively is that we can avoid conflicting fetch tasks -->
-        <!-- operating concurrently on the same mailboxes. -->
-
-        <!-- Fetchmail attempts to deduce the correct recipient of each message, but sometimes there is -->
-        <!-- insufficient information in the headers to do so. When the correct recipient cannot be deduced, -->
-        <!-- fetchmail can be configured to leave the mail on the server or deliver it to a default recipient. -->
-
-        <!-- When a message server delivers mail for a single user to a specific INBOX you can define -->
-        <!-- each user to James (via the console) and use<alllocal>with ignorercpt-header="true" to deliver mail -->
-        <!-- directly from each users INBOX onto James' spool. There is no need to update 'config.xml' -->
-        <!-- each time you add or remove users, fetchmail checks the list of users at the start of each fetch. -->
-
-        <!-- When a message server provides an account that gives access to all mail for a domain through a single -->
-        <!-- INBOX, you can use an<account>to fetch all the mail for that domain, using the filter facilities -->
-        <!-- described below to reject unwanted messages. -->
-
-        <!-- When a message server supports BOTH delivery for a single user to a specific INBOX and access to all mail -->
-        <!-- for a domain through a single INBOX, you can use<alllocal>and<account>together to guarantee that all -->
-        <!-- local mail gets delivered to the correct user and all unwanted mail is deleted from the message -->
-        <!-- server. See http://james.apache.org/server/2.3.0/fetchmail_configuration.html for details. -->
-
-        <!-- Limitations and Future Directions -->
-        <!-- 1)<alllocal>requires the password for all accounts for a domain on the message server be the same. True -->
-        <!-- in many cases, but not all. A future version might work out a way of associating James users with a set -->
-        <!-- of account properties. -->
-        <!-- 2)<alllocal>will try to access an INBOX on the message server for all local users. The instance of James used -->
-        <!-- for this purpose should not have extraneous users defined. This is inefficient, but not fatal. -->
-        <!-- Again, a future version might work out a way of associating James users with message account properties. -->
-        <!-- This would allow all local users with an account on a particular message server to be fetched. -->
-
-        <accounts>
-            <alllocal userprefix="" usersuffix="@myaccount" password="password" recipientprefix="" recipientsuffix="@mydomain.com" ignorercpt-header="true"/>
-            <account user="myglobalaccount" password="password" recipient="postmaster@localhost" ignorercpt-header="false"/>
-            <!-- Custom recipient header handling -->
-            <!-- this example search an header named X-Envelope-To and use the recipient found in that header -->
-            <!--
-            <account customrcpt-header="X-Envelope-To" user="myglobalaccount" password="password" recipient="postmaster@localhost" ignorercpt-header="false"/>
-             -->
-        </accounts>
-
-        <!-- The address of the server from which to fetch the mail -->
-        <host>pop.server.com</host>
-
-        <!-- How frequently this host is checked - in milliseconds. 600000 is every ten minutes -->
-        <interval>600000</interval>
-
-        <!-- name of the javamail provider you wish to use -->
-        <!-- (pop3, imap, etc. -->
-        <javaMailProviderName>pop3</javaMailProviderName>
-
-        <!-- name of the folder to open -->
-        <javaMailFolderName>INBOX</javaMailFolderName>
-
-        <!-- Properties to be applied to the JavaMail Session. -->
-        <!-- Properties are specific to the selected JavaMail provider. -->
-        <!-- Any number may be specified. -->
-        <javaMailProperties>
-            <!-- Set the connection timeout to 3 minutes -->
-            <property name="mail.pop3.connectiontimeout" value="180000"/>
-            <!-- Set the I/O timeout to 3 minutes -->
-            <property name="mail.pop3.timeout" value="180000"/>
-        </javaMailProperties>
-
-        <!-- Retrieve both old (seen) and new messages from mailserver.  The default -->
-        <!-- is to fetch only messages the server has not marked as seen -->
-        <fetchall>false</fetchall>
-
-        <!-- If the folder javaMailFolderName contains subfolders do you -->
-        <!-- want to recurse into the subfolders as well? true = yes, false = no -->
-        <recursesubfolders>false</recursesubfolders>
-
-        <!-- If the From: header of a fetched message has a valid user part -->
-        <!-- but no domain part the fetch task will correct this by appending -->
-        <!-- a default domain. eg: 'james' becomes 'james@defaultdomain' -->
-        <!-- The default behaviour is to append the canonical host name of the James server.  -->
-        <!-- You can override this behaviour here by specifying the name of the domain -->
-        <!-- you wish to append. The name you choose must be a local server or you can -->
-        <!-- use the name localhost -->
-        <!-- Example using a locally served domain -->
-        <!--
-        <defaultdomain>mydomain.com</defaultdomain>
-         -->
-        <!-- Example using localhost -->
-        <!--
-        <defaultdomain>localhost</defaultdomain>
-         -->
-
-        <!-- Specify what happens to messages succesfully fetched from the mailserver -->
-        <!-- leaveonserver -->
-        <!--     if true, messages will be left on the server -->
-        <!--     if false, messages will be deleted from the server -->
-        <!-- markseen -->
-        <!--     if true, messages left on the server will be marked as seen -->
-        <!--     if false, messages left on the server will not be marked as seen -->
-        <fetched leaveonserver="false" markseen="true"/>
-
-        <!-- Specify the index of the RECEIVED Header used to compute the remote address and remote host name -->
-        <!-- and what happens to messages that contain an invalid header at that index. -->
-        <!-- Matchers such as InSpammerBlacklist use the remote address and/or remote host name to identify illegitimate -->
-        <!-- remote MTAs. -->
-        <!-- This tag is optional. If omitted, the remote address will be set to 127.0.0.1 and the remote domain -->
-        <!-- will be set to 'localhost'. Both are almost always considered legitimate. -->
-        <!-- index -->
-        <!--     The zero based index of the RECEIVED Header used to compute the remote address and remote host name -->
-        <!--     of the MTA that delivered a fetched message. -->
-        <!--     Typically, the first (index = 0) RECEIVED Header is for the local MTA that delivers mail to the message store -->
-        <!--     and the second RECEIVED Header (index = 1) is the remote domain delivering mail to the MTA, so the second -->
-        <!--     RECEIVED Header is the one to use. -->
-        <!--     Some configurations will differ. Look at the RECEIVED Headers and set the index to point to the first remote MTA. -->
-        <!--     An index of -1 is is interpreted as use 127.0.0.1 for the remote address and use 'localhost' for the remote host name. -->
-        <!-- reject -->
-        <!--     if true, messages whose received header at the specified index is invalid will be rejected -->
-        <!--     if false, messages whose received header at the specified index is invalid will be accepted -->
-        <!--     and the Mail Attribute "org.apache.james.fetchmail.isInvalidReceivedHeader" -->
-        <!--     will be added to the message. Use the HasMailAttribute matcher to detect them. -->
-        <!-- The following apply if reject="true" and a message is rejected... -->
-        <!--     leaveonserver -->
-        <!--         if true, messages will be left on the server -->
-        <!--         if false, messages will be deleted from the server -->
-        <!--     markseen -->
-        <!--         if true, messages left on the server will be marked as seen -->
-        <!--         if false, messages left on the server will not be marked as seen -->
-        <remotereceivedheader index="1" reject="true" leaveonserver="true" markseen="false"/>
-
-        <!-- Specify what happens to messages whose size exceeds the specified limit. -->
-        <!-- This tag is optional. If omitted, there is no limit. -->
-        <!-- limit -->
-        <!--     The maximum message size in Kilobytes of messages injected into James. -->
-        <!--     A value of 0 means no limit. -->
-        <!-- reject -->
-        <!--     if true, messages whose size exceeds the limit will be rejected -->
-        <!--     if false, messages whose size exceeds the limit will be stripped of their message bodies -->
-        <!--     prior to injection into James and the MailAttribute "org.apache.james.fetchmail.isMaxMessageSizeExceeded" -->
-        <!--     will be added to the message with the value set to the original message size in bytes. -->
-        <!--     Use the HasMailAttribute matcher to detect them. -->
-        <!-- The following apply if reject="true" and a message is rejected... -->
-        <!--     leaveonserver -->
-        <!--         if true, messages will be left on the server -->
-        <!--         if false, messages will be deleted from the server -->
-        <!--     markseen -->
-        <!--         if true, messages left on the server will be marked as seen -->
-        <!--         if false, messages left on the server will not be marked as seen -->
-        <maxmessagesize limit="0" reject="false" leaveonserver="true" markseen="false"/>
-
-        <!-- Specify what happens to undeliverable messages -->
-        <!-- leaveonserver -->
-        <!--     if true, messages will be left on the server -->
-        <!--     if false, messages will be deleted from the server -->
-        <!-- markseen -->
-        <!--     if true, messages left on the server will be marked as seen -->
-        <!--     if false, messages left on the server will not be marked as seen -->
-        <undeliverable leaveonserver="true" markseen="false"/>
-
-        <!-- Specify what happens to messages for which a recipient cannot be determined. -->
-        <!-- defer -->
-        <!--     if true, processing of messages for which a recipient cannot be determined will deferred -->
-        <!--     until the next fetch of the Account. This gives an opportunity for other Accounts in the -->
-        <!--     fetch task to determine the recipient and process the mail. -->
-        <!--     if false, messages for which a recipient cannot be determined are processed immediately. -->
-        <!-- reject -->
-        <!--     if true, messages for which a recipient cannot be determined will be rejected -->
-        <!--     if false, messages for which a recipient cannot be determined will be accepted, -->
-        <!--     the account recipient will be used and the MailAttribute "org.apache.james.fetchmail.isRecipientNotFound" -->
-        <!--     will be added to the message. Use the HasMailAttribute matcher to detect them. -->
-        <!-- The following apply if reject="true" and a message is rejected... -->
-        <!--     leaveonserver -->
-        <!--         if true, messages will be left on the server -->
-        <!--         if false, messages will be deleted from the server -->
-        <!--     markseen -->
-        <!--         if true, messages left on the server will be marked as seen -->
-        <!--         if false, messages left on the server will not be marked as seen -->
-        <recipientnotfound defer="true" reject="true" leaveonserver="true" markseen="false"/>
-
-        <!-- Specify a list of recipients for whom messages will be rejected -->
-        <!-- and what happens to rejected messages. -->
-        <!-- The list can be comma, tab or space delimited. -->
-        <!-- reject -->
-        <!--     if true, messages for users on the blacklist will be rejected -->
-        <!--     if false, messages for users on the blacklist will be accepted -->
-        <!--     and the Mail Attribute "org.apache.james.fetchmail.isBlacklistedRecipient" -->
-        <!--     will be added to the message. Use the HasMailAttribute matcher to detect them. -->
-        <!-- The following apply if reject="true" and a message is rejected... -->
-        <!--     leaveonserver -->
-        <!--         if true, messages will be left on the server -->
-        <!--         if false, messages will be deleted from the server -->
-        <!--     markseen -->
-        <!--         if true, messages left on the server will be marked as seen -->
-        <!--         if false, messages left on the server will not be marked as seen -->
-        <blacklist reject="true" leaveonserver="true" markseen="false">wibble@localhost, flobble@localhost</blacklist>
-
-        <!-- Specify if messages for users who are not defined to James should -->
-        <!-- be rejected and what happens to rejected messages. -->
-        <!-- reject -->
-        <!--     if true, messages for users who are not defined to James will be rejected -->
-        <!--     if false, messages for users who are not defined to James will be accepted -->
-        <!--     and the Mail Attribute "org.apache.james.fetchmail.isUserUndefined" -->
-        <!--     will be added to the message. Use the HasMailAttribute matcher to detect them. -->
-        <!-- The following apply if reject="true" and a message is rejected... -->
-        <!--     leaveonserver -->
-        <!--         if true, messages will be left on the server -->
-        <!--         if false, messages will be deleted from the server -->
-        <!--     markseen -->
-        <!--         if true, messages left on the server will be marked as seen -->
-        <!--         if false, messages left on the server will not be marked as seen -->
-        <userundefined reject="true" leaveonserver="true" markseen="false" />
-
-        <!-- Specify if messages for recipients on remote hosts should -->
-        <!-- be rejected and what happens to rejected messages. -->
-        <!-- reject -->
-        <!--     if true, messages for remote recipients will be rejected -->
-        <!--     if false, messages for remote recipients will be accepted -->
-        <!--     and the Mail Attribute "org.apache.james.fetchmail.isRemoteRecipient" -->
-        <!--     will be added to the message. Use the HasMailAttribute matcher to detect them. -->
-        <!-- The following apply if reject="true" and a message is rejected... -->
-        <!--     leaveonserver -->
-        <!--         if true, messages will be left on the server -->
-        <!--         if false, messages will be deleted from the server -->
-        <!--     markseen -->
-        <!--         if true, messages left on the server will be marked as seen -->
-        <!--         if false, messages left on the server will not be marked as seen -->
-        <remoterecipient reject="true" leaveonserver="true" markseen="false" />
-    </fetch>
-
-</fetchmail>       
diff --git a/dockerfiles/run/spring/destination/conf/imapserver.xml b/dockerfiles/run/spring/destination/conf/imapserver.xml
deleted file mode 100644
index 310625d..0000000
--- a/dockerfiles/run/spring/destination/conf/imapserver.xml
+++ /dev/null
@@ -1,60 +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.
--->
-
-
-<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/spring/destination/conf/indexer.xml b/dockerfiles/run/spring/destination/conf/indexer.xml
deleted file mode 100644
index 51591ab..0000000
--- a/dockerfiles/run/spring/destination/conf/indexer.xml
+++ /dev/null
@@ -1,23 +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.                                           
- -->
-
-<indexer>
-  <provider>luceneIndex</provider>
-</indexer>
diff --git a/dockerfiles/run/spring/destination/conf/james-database.properties b/dockerfiles/run/spring/destination/conf/james-database.properties
deleted file mode 100644
index 22770d0..0000000
--- a/dockerfiles/run/spring/destination/conf/james-database.properties
+++ /dev/null
@@ -1,46 +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
-
-# See http://james.apache.org/server/3/config.html for usage
-
-# Use derby as default
-database.driverClassName=org.apache.derby.jdbc.EmbeddedDriver
-database.url=jdbc:derby:../var/store/derby;create=true
-database.username=app
-database.password=app
-
-# Supported adapters are:
-# DB2, DERBY, H2, HSQL, INFORMIX, MYSQL, ORACLE, POSTGRESQL, SQL_SERVER, SYBASE 
-vendorAdapter.database=DERBY
-
-# Use streaming for Blobs
-# This is only supported on a limited set of databases atm. You should check if its supported by your DB before enable
-# it. 
-# 
-# See:
-# http://openjpa.apache.org/builds/latest/docs/manual/ref_guide_mapping_jpa.html  #7.11.  LOB Streaming 
-# 
-openjpa.streaming=false
-
-# Validate the data source before using it
-# datasource.testOnBorrow=true
-# datasource.validationQueryTimeoutSec=2
-# This is different per database. See https://stackoverflow.com/questions/10684244/dbcp-validationquery-for-different-databases#10684260
-# datasource.validationQuery=select 1
diff --git a/dockerfiles/run/spring/destination/conf/jmx.properties b/dockerfiles/run/spring/destination/conf/jmx.properties
deleted file mode 100644
index a1dbdf8..0000000
--- a/dockerfiles/run/spring/destination/conf/jmx.properties
+++ /dev/null
@@ -1,28 +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
-
-#  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
-
-jmx.address=127.0.0.1
-jmx.port=9999
diff --git a/dockerfiles/run/spring/destination/conf/lib/README.txt b/dockerfiles/run/spring/destination/conf/lib/README.txt
deleted file mode 100644
index d536d44..0000000
--- a/dockerfiles/run/spring/destination/conf/lib/README.txt
+++ /dev/null
@@ -1 +0,0 @@
-# Put every jar you want to have included in the classpath in here
\ No newline at end of file
diff --git a/dockerfiles/run/spring/destination/conf/lmtpserver.xml b/dockerfiles/run/spring/destination/conf/lmtpserver.xml
deleted file mode 100644
index ce079b0..0000000
--- a/dockerfiles/run/spring/destination/conf/lmtpserver.xml
+++ /dev/null
@@ -1,41 +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.                                           
- -->
-
-<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/spring/destination/conf/log4j2.xml b/dockerfiles/run/spring/destination/conf/log4j2.xml
deleted file mode 100644
index f8c9fad..0000000
--- a/dockerfiles/run/spring/destination/conf/log4j2.xml
+++ /dev/null
@@ -1,485 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Configuration status="INFO" monitorInterval="30">
-    <Properties>
-        <Property name="logDir">${sys:app.home}/log</Property>
-        <Property name="logLayoutTomcat">%d{dd-MMM-yyyy HH:mm:ss.SSS} %level [%t] %C.%M:%L - %msg%n</Property>
-        <Property name="logLayout1">%d %-7level %logger{36} - %msg%n</Property>
-        <Property name="logLayout2">%d %-7level [%t] %C.%M:%L - %msg%n</Property>
-    </Properties>
-
-    <Appenders>
-        <Console name="Console" target="SYSTEM_OUT">
-            <PatternLayout pattern="${logLayoutTomcat}" />
-        </Console>
-        <RollingFile name="SpringFramework" fileName="${logDir}/springframework.log"
-                     filePattern="${logDir}/springframework.%d{yyyy-MM-dd}-%i.log.gz"
-                     ignoreExceptions="false">
-            <PatternLayout pattern="${logLayoutTomcat}"
-                           charset="UTF-8" />
-            <Policies>
-                <!-- <OnStartupTriggeringPolicy /> -->
-                <!-- <SizeBasedTriggeringPolicy size="20 MB" /> -->
-                <!-- <TimeBasedTriggeringPolicy /> -->
-            </Policies>
-            <!-- 			<DefaultRolloverStrategy> -->
-            <!-- 				<Delete basePath="${logDir}" maxDepth="2"> -->
-            <!-- 					<IfFileName -->
-            <!-- 						glob="target/log4j2/roll-by-time-and-size/app.*.log.gz" /> -->
-            <!-- 					<IfLastModified age="20d" /> -->
-            <!-- 				</Delete> -->
-            <!-- 			</DefaultRolloverStrategy> -->
-        </RollingFile>
-        <RollingFile name="openjpa" fileName="${logDir}/openjpa.log"
-                     filePattern="${logDir}/openjpa.%d{yyyy-MM-dd}-%i.log.gz"
-                     ignoreExceptions="false">
-            <PatternLayout pattern="${logLayoutTomcat}"
-                           charset="UTF-8" />
-            <Policies>
-                <!-- <OnStartupTriggeringPolicy /> -->
-                <!-- <SizeBasedTriggeringPolicy size="20 MB" /> -->
-                <!-- <TimeBasedTriggeringPolicy /> -->
-            </Policies>
-            <!-- 			<DefaultRolloverStrategy> -->
-            <!-- 				<Delete basePath="${logDir}" maxDepth="2"> -->
-            <!-- 					<IfFileName -->
-            <!-- 						glob="target/log4j2/roll-by-time-and-size/app.*.log.gz" /> -->
-            <!-- 					<IfLastModified age="20d" /> -->
-            <!-- 				</Delete> -->
-            <!-- 			</DefaultRolloverStrategy> -->
-        </RollingFile>
-        <RollingFile name="James" fileName="${logDir}/james.log"
-                     filePattern="${logDir}/james.%d{yyyy-MM-dd}-%i.log.gz"
-                     ignoreExceptions="false">
-            <PatternLayout pattern="${logLayoutTomcat}"
-                           charset="UTF-8" />
-            <Policies>
-                <!-- <OnStartupTriggeringPolicy /> -->
-                <!-- <SizeBasedTriggeringPolicy size="20 MB" /> -->
-                <!-- <TimeBasedTriggeringPolicy /> -->
-            </Policies>
-            <!-- 			<DefaultRolloverStrategy> -->
-            <!-- 				<Delete basePath="${logDir}" maxDepth="2"> -->
-            <!-- 					<IfFileName -->
-            <!-- 						glob="target/log4j2/roll-by-time-and-size/app.*.log.gz" /> -->
-            <!-- 					<IfLastModified age="20d" /> -->
-            <!-- 				</Delete> -->
-            <!-- 			</DefaultRolloverStrategy> -->
-        </RollingFile>
-        <RollingFile name="TransportProtocols" fileName="${logDir}/james_transport-protocols.log"
-                     filePattern="${logDir}/james_transport-protocols.%d{yyyy-MM-dd}-%i.log.gz"
-                     ignoreExceptions="false">
-            <PatternLayout pattern="${logLayoutTomcat}"
-                           charset="UTF-8" />
-            <Policies>
-                <!-- <OnStartupTriggeringPolicy /> -->
-                <!-- <SizeBasedTriggeringPolicy size="20 MB" /> -->
-                <!-- <TimeBasedTriggeringPolicy /> -->
-            </Policies>
-            <!-- 			<DefaultRolloverStrategy> -->
-            <!-- 				<Delete basePath="${logDir}" maxDepth="2"> -->
-            <!-- 					<IfFileName -->
-            <!-- 						glob="target/log4j2/roll-by-time-and-size/app.*.log.gz" /> -->
-            <!-- 					<IfLastModified age="20d" /> -->
-            <!-- 				</Delete> -->
-            <!-- 			</DefaultRolloverStrategy> -->
-        </RollingFile>
-        <RollingFile name="MAILBOXMANAGER" fileName="${logDir}/james_mailboxmanager.log"
-                     filePattern="${logDir}/james_mailboxmanager.%d{yyyy-MM-dd}-%i.log.gz"
-                     ignoreExceptions="false">
-            <PatternLayout pattern="${logLayoutTomcat}"
-                           charset="UTF-8" />
-            <Policies>
-                <!-- 				<OnStartupTriggeringPolicy /> -->
-                <!-- 				<SizeBasedTriggeringPolicy size="20 MB" /> -->
-                <!-- 				<TimeBasedTriggeringPolicy /> -->
-            </Policies>
-            <!-- 			<DefaultRolloverStrategy> -->
-            <!-- 				<Delete basePath="${logDir}" maxDepth="2"> -->
-            <!-- 					<IfFileName -->
-            <!-- 						glob="target/log4j2/roll-by-time-and-size/app.*.log.gz" /> -->
-            <!-- 					<IfLastModified age="20d" /> -->
-            <!-- 				</Delete> -->
-            <!-- 			</DefaultRolloverStrategy> -->
-        </RollingFile>
-        <RollingFile name="IMAPSERVER" fileName="${logDir}/james_imapserver.log"
-                     filePattern="${logDir}/james_imapserver.%d{yyyy-MM-dd}-%i.log.gz"
-                     ignoreExceptions="false">
-            <PatternLayout pattern="${logLayoutTomcat}"
-                           charset="UTF-8" />
-            <Policies>
-                <!-- 				<OnStartupTriggeringPolicy /> -->
-                <!-- 				<SizeBasedTriggeringPolicy size="20 MB" /> -->
-                <!-- 				<TimeBasedTriggeringPolicy /> -->
-            </Policies>
-            <!-- 			<DefaultRolloverStrategy> -->
-            <!-- 				<Delete basePath="${logDir}" maxDepth="2"> -->
-            <!-- 					<IfFileName -->
-            <!-- 						glob="target/log4j2/roll-by-time-and-size/app.*.log.gz" /> -->
-            <!-- 					<IfLastModified age="20d" /> -->
-            <!-- 				</Delete> -->
-            <!-- 			</DefaultRolloverStrategy> -->
-        </RollingFile>
-        <RollingFile name="MAILETCONTAINER" fileName="${logDir}/james_mailetcontainer.log"
-                     filePattern="${logDir}/james_mailetcontainer.%d{yyyy-MM-dd}-%i.log.gz"
-                     ignoreExceptions="false">
-            <PatternLayout pattern="${logLayoutTomcat}"
-                           charset="UTF-8" />
-            <Policies>
-                <!-- 				<OnStartupTriggeringPolicy /> -->
-                <!-- 				<SizeBasedTriggeringPolicy size="20 MB" /> -->
-                <!-- 				<TimeBasedTriggeringPolicy /> -->
-            </Policies>
-            <!-- 			<DefaultRolloverStrategy> -->
-            <!-- 				<Delete basePath="${logDir}" maxDepth="2"> -->
-            <!-- 					<IfFileName -->
-            <!-- 						glob="target/log4j2/roll-by-time-and-size/app.*.log.gz" /> -->
-            <!-- 					<IfLastModified age="20d" /> -->
-            <!-- 				</Delete> -->
-            <!-- 			</DefaultRolloverStrategy> -->
-        </RollingFile>
-        <RollingFile name="MAILETCONTAINER" fileName="${logDir}/james_mailetcontainer.log"
-                     filePattern="${logDir}/james_mailetcontainer.%d{yyyy-MM-dd}-%i.log.gz"
-                     ignoreExceptions="false">
-            <PatternLayout pattern="${logLayoutTomcat}"
-                           charset="UTF-8" />
-            <Policies>
-                <!-- 				<OnStartupTriggeringPolicy /> -->
-                <!-- 				<SizeBasedTriggeringPolicy size="20 MB" /> -->
-                <!-- 				<TimeBasedTriggeringPolicy /> -->
-            </Policies>
-            <!-- 			<DefaultRolloverStrategy> -->
-            <!-- 				<Delete basePath="${logDir}" maxDepth="2"> -->
-            <!-- 					<IfFileName -->
-            <!-- 						glob="target/log4j2/roll-by-time-and-size/app.*.log.gz" /> -->
-            <!-- 					<IfLastModified age="20d" /> -->
-            <!-- 				</Delete> -->
-            <!-- 			</DefaultRolloverStrategy> -->
-        </RollingFile>
-        <RollingFile name="MAILETCONTAINER" fileName="${logDir}/james_mailetcontainer.log"
-                     filePattern="${logDir}/james_mailetcontainer.%d{yyyy-MM-dd}-%i.log.gz"
-                     ignoreExceptions="false">
-            <PatternLayout pattern="${logLayoutTomcat}"
-                           charset="UTF-8" />
-            <Policies>
-                <!-- 				<OnStartupTriggeringPolicy /> -->
-                <!-- 				<SizeBasedTriggeringPolicy size="20 MB" /> -->
-                <!-- 				<TimeBasedTriggeringPolicy /> -->
-            </Policies>
-            <!-- 			<DefaultRolloverStrategy> -->
-            <!-- 				<Delete basePath="${logDir}" maxDepth="2"> -->
-            <!-- 					<IfFileName -->
-            <!-- 						glob="target/log4j2/roll-by-time-and-size/app.*.log.gz" /> -->
-            <!-- 					<IfLastModified age="20d" /> -->
-            <!-- 				</Delete> -->
-            <!-- 			</DefaultRolloverStrategy> -->
-        </RollingFile>
-        <RollingFile name="MAILETCONTAINER" fileName="${logDir}/james_mailetcontainer.log"
-                     filePattern="${logDir}/james_mailetcontainer.%d{yyyy-MM-dd}-%i.log.gz"
-                     ignoreExceptions="false">
-            <PatternLayout pattern="${logLayoutTomcat}"
-                           charset="UTF-8" />
-            <Policies>
-                <!-- 				<OnStartupTriggeringPolicy /> -->
-                <!-- 				<SizeBasedTriggeringPolicy size="20 MB" /> -->
-                <!-- 				<TimeBasedTriggeringPolicy /> -->
-            </Policies>
-            <!-- 			<DefaultRolloverStrategy> -->
-            <!-- 				<Delete basePath="${logDir}" maxDepth="2"> -->
-            <!-- 					<IfFileName -->
-            <!-- 						glob="target/log4j2/roll-by-time-and-size/app.*.log.gz" /> -->
-            <!-- 					<IfLastModified age="20d" /> -->
-            <!-- 				</Delete> -->
-            <!-- 			</DefaultRolloverStrategy> -->
-        </RollingFile>
-        <RollingFile name="DNSSERVICE" fileName="${logDir}/james_dnsservice.log"
-                     filePattern="${logDir}/james_dnsservice.%d{yyyy-MM-dd}-%i.log.gz"
-                     ignoreExceptions="false">
-            <PatternLayout pattern="${logLayoutTomcat}"
-                           charset="UTF-8" />
-            <Policies>
-                <!-- 				<OnStartupTriggeringPolicy /> -->
-                <!-- 				<SizeBasedTriggeringPolicy size="20 MB" /> -->
-                <!-- 				<TimeBasedTriggeringPolicy /> -->
-            </Policies>
-            <!-- 			<DefaultRolloverStrategy> -->
-            <!-- 				<Delete basePath="${logDir}" maxDepth="2"> -->
-            <!-- 					<IfFileName -->
-            <!-- 						glob="target/log4j2/roll-by-time-and-size/app.*.log.gz" /> -->
-            <!-- 					<IfLastModified age="20d" /> -->
-            <!-- 				</Delete> -->
-            <!-- 			</DefaultRolloverStrategy> -->
-        </RollingFile>
-        <RollingFile name="POP3SERVER" fileName="${logDir}/james_pop3server.log"
-                     filePattern="${logDir}/james_pop3server.%d{yyyy-MM-dd}-%i.log.gz"
-                     ignoreExceptions="false">
-            <PatternLayout pattern="${logLayoutTomcat}"
-                           charset="UTF-8" />
-            <Policies>
-                <!-- 				<OnStartupTriggeringPolicy /> -->
-                <!-- 				<SizeBasedTriggeringPolicy size="20 MB" /> -->
-                <!-- 				<TimeBasedTriggeringPolicy /> -->
-            </Policies>
-            <!-- 			<DefaultRolloverStrategy> -->
-            <!-- 				<Delete basePath="${logDir}" maxDepth="2"> -->
-            <!-- 					<IfFileName -->
-            <!-- 						glob="target/log4j2/roll-by-time-and-size/app.*.log.gz" /> -->
-            <!-- 					<IfLastModified age="20d" /> -->
-            <!-- 				</Delete> -->
-            <!-- 			</DefaultRolloverStrategy> -->
-        </RollingFile>
-        <RollingFile name="SMTPSERVER" fileName="${logDir}/james_smtpserver.log"
-                     filePattern="${logDir}/james_smtpserver.%d{yyyy-MM-dd}-%i.log.gz"
-                     ignoreExceptions="false">
-            <PatternLayout pattern="${logLayoutTomcat}"
-                           charset="UTF-8" />
-            <Policies>
-                <!-- 				<OnStartupTriggeringPolicy /> -->
-                <!-- 				<SizeBasedTriggeringPolicy size="20 MB" /> -->
-                <!-- 				<TimeBasedTriggeringPolicy /> -->
-            </Policies>
-            <!-- 			<DefaultRolloverStrategy> -->
-            <!-- 				<Delete basePath="${logDir}" maxDepth="2"> -->
-            <!-- 					<IfFileName -->
-            <!-- 						glob="target/log4j2/roll-by-time-and-size/app.*.log.gz" /> -->
-            <!-- 					<IfLastModified age="20d" /> -->
-            <!-- 				</Delete> -->
-            <!-- 			</DefaultRolloverStrategy> -->
-        </RollingFile>
-        <RollingFile name="LMTPSERVER" fileName="${logDir}/james_lmtpserver.log"
-                     filePattern="${logDir}/james_lmtpserver.%d{yyyy-MM-dd}-%i.log.gz"
-                     ignoreExceptions="false">
-            <PatternLayout pattern="${logLayoutTomcat}"
-                           charset="UTF-8" />
-            <Policies>
-                <!-- 				<OnStartupTriggeringPolicy /> -->
-                <!-- 				<SizeBasedTriggeringPolicy size="20 MB" /> -->
-                <!-- 				<TimeBasedTriggeringPolicy /> -->
-            </Policies>
-            <!-- 			<DefaultRolloverStrategy> -->
-            <!-- 				<Delete basePath="${logDir}" maxDepth="2"> -->
-            <!-- 					<IfFileName -->
-            <!-- 						glob="target/log4j2/roll-by-time-and-size/app.*.log.gz" /> -->
-            <!-- 					<IfLastModified age="20d" /> -->
-            <!-- 				</Delete> -->
-            <!-- 			</DefaultRolloverStrategy> -->
-        </RollingFile>
-        <RollingFile name="MAILREPOSITORYSTORE" fileName="${logDir}/james_mailrepositorystore.log"
-                     filePattern="${logDir}/james_mailrepositorystore.%d{yyyy-MM-dd}-%i.log.gz"
-                     ignoreExceptions="false">
-            <PatternLayout pattern="${logLayoutTomcat}"
-                           charset="UTF-8" />
-            <Policies>
-                <!-- 				<OnStartupTriggeringPolicy /> -->
-                <!-- 				<SizeBasedTriggeringPolicy size="20 MB" /> -->
-                <!-- 				<TimeBasedTriggeringPolicy /> -->
-            </Policies>
-            <!-- 			<DefaultRolloverStrategy> -->
-            <!-- 				<Delete basePath="${logDir}" maxDepth="2"> -->
-            <!-- 					<IfFileName -->
-            <!-- 						glob="target/log4j2/roll-by-time-and-size/app.*.log.gz" /> -->
-            <!-- 					<IfLastModified age="20d" /> -->
-            <!-- 				</Delete> -->
-            <!-- 			</DefaultRolloverStrategy> -->
-        </RollingFile>
-        <RollingFile name="USERSREPOSITORY" fileName="${logDir}/james_usersrepository.log"
-                     filePattern="${logDir}/james_usersrepository.%d{yyyy-MM-dd}-%i.log.gz"
-                     ignoreExceptions="false">
-            <PatternLayout pattern="${logLayoutTomcat}"
-                           charset="UTF-8" />
-            <Policies>
-                <!-- 				<OnStartupTriggeringPolicy /> -->
-                <!-- 				<SizeBasedTriggeringPolicy size="20 MB" /> -->
-                <!-- 				<TimeBasedTriggeringPolicy /> -->
-            </Policies>
-            <!-- 			<DefaultRolloverStrategy> -->
-            <!-- 				<Delete basePath="${logDir}" maxDepth="2"> -->
-            <!-- 					<IfFileName -->
-            <!-- 						glob="target/log4j2/roll-by-time-and-size/app.*.log.gz" /> -->
-            <!-- 					<IfLastModified age="20d" /> -->
-            <!-- 				</Delete> -->
-            <!-- 			</DefaultRolloverStrategy> -->
-        </RollingFile>
-        <RollingFile name="FETCHMAIL" fileName="${logDir}/james_fetchmail.log"
-                     filePattern="${logDir}/james_fetchmail.%d{yyyy-MM-dd}-%i.log.gz"
-                     ignoreExceptions="false">
-            <PatternLayout pattern="${logLayoutTomcat}"
-                           charset="UTF-8" />
-            <Policies>
-                <!-- 				<OnStartupTriggeringPolicy /> -->
-                <!-- 				<SizeBasedTriggeringPolicy size="20 MB" /> -->
-                <!-- 				<TimeBasedTriggeringPolicy /> -->
-            </Policies>
-            <!-- 			<DefaultRolloverStrategy> -->
-            <!-- 				<Delete basePath="${logDir}" maxDepth="2"> -->
-            <!-- 					<IfFileName -->
-            <!-- 						glob="target/log4j2/roll-by-time-and-size/app.*.log.gz" /> -->
-            <!-- 					<IfLastModified age="20d" /> -->
-            <!-- 				</Delete> -->
-            <!-- 			</DefaultRolloverStrategy> -->
-        </RollingFile>
-        <RollingFile name="DOMAINLIST" fileName="${logDir}/james_domainlist.log"
-                     filePattern="${logDir}/james_domainlist.%d{yyyy-MM-dd}-%i.log.gz"
-                     ignoreExceptions="false">
-            <PatternLayout pattern="${logLayoutTomcat}"
-                           charset="UTF-8" />
-            <Policies>
-                <!-- 				<OnStartupTriggeringPolicy /> -->
-                <!-- 				<SizeBasedTriggeringPolicy size="20 MB" /> -->
-                <!-- 				<TimeBasedTriggeringPolicy /> -->
-            </Policies>
-            <!-- 			<DefaultRolloverStrategy> -->
-            <!-- 				<Delete basePath="${logDir}" maxDepth="2"> -->
-            <!-- 					<IfFileName -->
-            <!-- 						glob="target/log4j2/roll-by-time-and-size/app.*.log.gz" /> -->
-            <!-- 					<IfLastModified age="20d" /> -->
-            <!-- 				</Delete> -->
-            <!-- 			</DefaultRolloverStrategy> -->
-        </RollingFile>
-        <RollingFile name="VIRTUALUSERTABLE" fileName="${logDir}/james_virtualusertable.log"
-                     filePattern="${logDir}/james_virtualusertable.%d{yyyy-MM-dd}-%i.log.gz"
-                     ignoreExceptions="false">
-            <PatternLayout pattern="${logLayoutTomcat}"
-                           charset="UTF-8" />
-            <Policies>
-                <!-- 				<OnStartupTriggeringPolicy /> -->
-                <!-- 				<SizeBasedTriggeringPolicy size="20 MB" /> -->
-                <!-- 				<TimeBasedTriggeringPolicy /> -->
-            </Policies>
-            <!-- 			<DefaultRolloverStrategy> -->
-            <!-- 				<Delete basePath="${logDir}" maxDepth="2"> -->
-            <!-- 					<IfFileName -->
-            <!-- 						glob="target/log4j2/roll-by-time-and-size/app.*.log.gz" /> -->
-            <!-- 					<IfLastModified age="20d" /> -->
-            <!-- 				</Delete> -->
-            <!-- 			</DefaultRolloverStrategy> -->
-        </RollingFile>
-        <RollingFile name="MAILQUEUEFACTORY" fileName="${logDir}/james_mailqueuefactory.log"
-                     filePattern="${logDir}/james_mailqueuefactory.%d{yyyy-MM-dd}-%i.log.gz"
-                     ignoreExceptions="false">
-            <PatternLayout pattern="${logLayoutTomcat}"
-                           charset="UTF-8" />
-            <Policies>
-                <!-- 				<OnStartupTriggeringPolicy /> -->
-                <!-- 				<SizeBasedTriggeringPolicy size="20 MB" /> -->
-                <!-- 				<TimeBasedTriggeringPolicy /> -->
-            </Policies>
-            <!-- 			<DefaultRolloverStrategy> -->
-            <!-- 				<Delete basePath="${logDir}" maxDepth="2"> -->
-            <!-- 					<IfFileName -->
-            <!-- 						glob="target/log4j2/roll-by-time-and-size/app.*.log.gz" /> -->
-            <!-- 					<IfLastModified age="20d" /> -->
-            <!-- 				</Delete> -->
-            <!-- 			</DefaultRolloverStrategy> -->
-        </RollingFile>
-    </Appenders>
-    <Loggers>
-        <Logger name="org.springframework" additivity="false">
-            <AppenderRef ref="Console" level="info" />
-            <AppenderRef ref="SpringFramework" level="info" />
-        </Logger>
-        <Logger name="etm.core.monitor.EtmMonitor" additivity="false">
-            <AppenderRef ref="Console" level="info" />
-            <AppenderRef ref="James" level="info" />
-        </Logger>
-        <Logger name="org.apache" additivity="false">
-            <AppenderRef ref="Console" level="info" />
-            <AppenderRef ref="James" level="info" />
-        </Logger>
-
-        <Logger name="openjpa" additivity="false">
-            <AppenderRef ref="Console" level="info" />
-            <AppenderRef ref="openjpa" level="trace" />
-        </Logger>
-        <Logger name="org.apache.openjpa" additivity="false">
-            <AppenderRef ref="Console" level="info" />
-            <AppenderRef ref="openjpa" level="trace" />
-        </Logger>
-
-        <Logger name="org.apache.james" additivity="false">
-            <AppenderRef ref="Console" level="info" />
-            <AppenderRef ref="James" level="trace" />
-        </Logger>
-
-        <Logger name="org.apache.james.transport" additivity="false">
-            <AppenderRef ref="Console" level="info" />
-            <AppenderRef ref="TransportProtocols" level="trace" />
-        </Logger>
-        <Logger name="org.apache.james.protocols" additivity="false">
-            <AppenderRef ref="Console" level="info" />
-            <AppenderRef ref="TransportProtocols" level="trace" />
-        </Logger>
-
-        <Logger name="org.apache.james.mailboxmanager" additivity="false">
-            <AppenderRef ref="Console" level="info" />
-            <AppenderRef ref="MAILBOXMANAGER" level="trace" />
-        </Logger>
-        <Logger name="org.apache.james.imapserver" additivity="false">
-            <AppenderRef ref="Console" level="info" />
-            <AppenderRef ref="IMAPSERVER" level="trace" />
-        </Logger>
-        <Logger name="org.apache.james.mailetcontainer" additivity="false">
-            <AppenderRef ref="Console" level="info" />
-            <AppenderRef ref="MAILETCONTAINER" level="trace" />
-        </Logger>
-        <Logger name="org.apache.james.mailetcontainer" additivity="false">
-            <AppenderRef ref="Console" level="info" />
-            <AppenderRef ref="MAILETCONTAINER" level="trace" />
-        </Logger>
-        <Logger name="org.apache.james.mailetcontainer" additivity="false">
-            <AppenderRef ref="Console" level="info" />
-            <AppenderRef ref="MAILETCONTAINER" level="trace" />
-        </Logger>
-        <Logger name="org.apache.james.mailetcontainer" additivity="false">
-            <AppenderRef ref="Console" level="info" />
-            <AppenderRef ref="MAILETCONTAINER" level="trace" />
-        </Logger>
-        <Logger name="org.apache.james.dnsservice" additivity="false">
-            <AppenderRef ref="Console" level="info" />
-            <AppenderRef ref="DNSSERVICE" level="trace" />
-        </Logger>
-        <Logger name="org.apache.james.pop3server" additivity="false">
-            <AppenderRef ref="Console" level="info" />
-            <AppenderRef ref="POP3SERVER" level="trace" />
-        </Logger>
-        <Logger name="org.apache.james.smtpserver" additivity="false">
-            <AppenderRef ref="Console" level="info" />
-            <AppenderRef ref="SMTPSERVER" level="trace" />
-        </Logger>
-        <Logger name="org.apache.james.lmtpserver" additivity="false">
-            <AppenderRef ref="Console" level="info" />
-            <AppenderRef ref="LMTPSERVER" level="trace" />
-        </Logger>
-        <Logger name="org.apache.james.mailrepositorystore" additivity="false">
-            <AppenderRef ref="Console" level="info" />
-            <AppenderRef ref="MAILREPOSITORYSTORE" level="trace" />
-        </Logger>
-        <Logger name="org.apache.james.usersrepository" additivity="false">
-            <AppenderRef ref="Console" level="info" />
-            <AppenderRef ref="USERSREPOSITORY" level="trace" />
-        </Logger>
-        <Logger name="org.apache.james.fetchmail" additivity="false">
-            <AppenderRef ref="Console" level="info" />
-            <AppenderRef ref="FETCHMAIL" level="trace" />
-        </Logger>
-        <Logger name="org.apache.james.domainlist" additivity="false">
-            <AppenderRef ref="Console" level="info" />
-            <AppenderRef ref="DOMAINLIST" level="trace" />
-        </Logger>
-        <Logger name="org.apache.james.virtualusertable" additivity="false">
-            <AppenderRef ref="Console" level="info" />
-            <AppenderRef ref="VIRTUALUSERTABLE" level="trace" />
-        </Logger>
-        <Logger name="org.apache.james.mailqueuefactory" additivity="false">
-            <AppenderRef ref="Console" level="info" />
-            <AppenderRef ref="MAILQUEUEFACTORY" level="trace" />
-        </Logger>
-
-        <Root level="info">
-            <AppenderRef ref="Console" level="info" />
-            <!-- Only events at DIAG level or more specific are sent to the console. -->
-            <!-- <AppenderRef ref="Console" level="diag" /> -->
-            <AppenderRef ref="James" level="trace" />
-            <AppenderRef ref="openjpa" level="trace" />
-        </Root>
-    </Loggers>
-</Configuration>
\ No newline at end of file
diff --git a/dockerfiles/run/spring/destination/conf/mailbox.xml b/dockerfiles/run/spring/destination/conf/mailbox.xml
deleted file mode 100644
index 6fd224d..0000000
--- a/dockerfiles/run/spring/destination/conf/mailbox.xml
+++ /dev/null
@@ -1,23 +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.                                           
- -->
-
-<mailbox>
-  <provider>jpa</provider>
-</mailbox>
diff --git a/dockerfiles/run/spring/destination/conf/mailetcontainer.xml b/dockerfiles/run/spring/destination/conf/mailetcontainer.xml
deleted file mode 100644
index fc84f86..0000000
--- a/dockerfiles/run/spring/destination/conf/mailetcontainer.xml
+++ /dev/null
@@ -1,147 +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.
- -->
-
-<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>file://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>file://var/mail/error/</repositoryPath>
-                <onMailetException>propagate</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>
-
-            <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="Sieve"/>
-            <mailet match="RecipientIsLocal" class="AddDeliveredToHeader"/>
-            <mailet match="RecipientIsLocal" class="LocalDelivery"/>
-            <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="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>file://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>file://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>file://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/spring/destination/conf/mailrepositorystore.xml b/dockerfiles/run/spring/destination/conf/mailrepositorystore.xml
deleted file mode 100644
index acca810..0000000
--- a/dockerfiles/run/spring/destination/conf/mailrepositorystore.xml
+++ /dev/null
@@ -1,34 +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.
- -->
-
-<mailrepositorystore>
-    <mailrepositories>
-        <!-- File based repositories.  These repositories store all message data -->
-        <!-- in the file system. -->
-        <mailrepository class="org.apache.james.mailrepository.file.FileMailRepository">
-            <protocols>
-                <protocol>file</protocol>
-            </protocols>
-            <!-- Set if the messages should be listed sorted. False by default -->
-            <config FIFO="false" CACHEKEYS="true"/>
-        </mailrepository>
-    </mailrepositories>
-</mailrepositorystore>
diff --git a/dockerfiles/run/spring/destination/conf/managesieveserver.xml b/dockerfiles/run/spring/destination/conf/managesieveserver.xml
deleted file mode 100644
index ec57e09..0000000
--- a/dockerfiles/run/spring/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="true">
-
-     <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/spring/destination/conf/pop3server.xml b/dockerfiles/run/spring/destination/conf/pop3server.xml
deleted file mode 100644
index df8fbef..0000000
--- a/dockerfiles/run/spring/destination/conf/pop3server.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.                                           
- -->
-
-
-<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/spring/destination/conf/quota.xml b/dockerfiles/run/spring/destination/conf/quota.xml
deleted file mode 100644
index 91d4e6a..0000000
--- a/dockerfiles/run/spring/destination/conf/quota.xml
+++ /dev/null
@@ -1,53 +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 -->
-
-<!--
-        This configuration file allows you to customize the way quota are handled on this server.
-        You need to rename it in quota.xml so that it gets interpreted by James on startup.
-
-        The different configuration options are detailed here.
-
-        Read RFC-2087 for full details.
--->
-
-<quota>
-    <quotaRootResolver>
-        <provider>default</provider>
-    </quotaRootResolver>
-    <currentQuotaManager>
-        <provider>inmemory</provider>
-    </currentQuotaManager>
-    <maxQuotaManager>
-        <provider>inmemory</provider>
-    </maxQuotaManager>
-    <quotaManager>
-        <provider>store</provider>
-    </quotaManager>
-    <updates>
-        <provider>event</provider>
-    </updates>
-</quota>
diff --git a/dockerfiles/run/spring/destination/conf/recipientrewritetable.xml b/dockerfiles/run/spring/destination/conf/recipientrewritetable.xml
deleted file mode 100644
index fde339b..0000000
--- a/dockerfiles/run/spring/destination/conf/recipientrewritetable.xml
+++ /dev/null
@@ -1,26 +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.                                           
- -->
-
-<!-- The default table for storing James' RecipientRewriteTable mappings. -->
-<recipientrewritetable class="org.apache.james.rrt.jpa.JPARecipientRewriteTable">
-  <recursiveMapping>true</recursiveMapping>
-  <mappingLimit>10</mappingLimit>
-</recipientrewritetable>
-
diff --git a/dockerfiles/run/spring/destination/conf/sieverepository.xml b/dockerfiles/run/spring/destination/conf/sieverepository.xml
deleted file mode 100644
index 58b0537..0000000
--- a/dockerfiles/run/spring/destination/conf/sieverepository.xml
+++ /dev/null
@@ -1,23 +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.                                           
- -->
-
-<!-- See http://james.apache.org/server/3/config.html for usage -->
-<sieverepository class="org.apache.james.sieverepository.file.SieveFileRepository">
-</sieverepository>
diff --git a/dockerfiles/run/spring/destination/conf/smtpserver.xml b/dockerfiles/run/spring/destination/conf/smtpserver.xml
deleted file mode 100644
index cd08571..0000000
--- a/dockerfiles/run/spring/destination/conf/smtpserver.xml
+++ /dev/null
@@ -1,105 +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.
- -->
-
-<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>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-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/spring/destination/conf/sqlResources.xml b/dockerfiles/run/spring/destination/conf/sqlResources.xml
deleted file mode 100644
index 286a994..0000000
--- a/dockerfiles/run/spring/destination/conf/sqlResources.xml
+++ /dev/null
@@ -1,795 +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
--->
-
-<!-- See http://james.apache.org/server/3/config.html for usage -->
-
-<sqlResources>
-
-<!--
-     This section provided configuration to determine the
-     database product which is being used for storage. Different database
-     products may require different SQL syntax.
-
-     The jdbc database connection is examined to see if it matches with the
-     regular expressions specified in any of the defined matchers. The matchers
-     are processed in the over provided here, with the first successful match
-     defining the "db" value for this connection.
-
-     This value is then used to choose between different definitions for various
-     named sql statements, defined below. If no match is found,
-     the default sql statements are used.
--->
-    <dbMatchers>
-        <dbMatcher db="mssql" databaseProductName="microsoft sql server"/>
-        <dbMatcher db="oracle" databaseProductName="oracle.*"/>
-        <dbMatcher db="mysql" databaseProductName="my.*"/>
-        <dbMatcher db="derby" databaseProductName="derby.*"/>
-        <dbMatcher db="postgresql" databaseProductName="postgres.*"/>
-        <dbMatcher db="hsqldb" databaseProductName="hsql.*"/>
-        <dbMatcher db="sapdb" databaseProductName="sap.*"/>
-        <dbMatcher db="hypersonic" databaseProductName="HypersonicSQL"/>
-        <dbMatcher db="db2" databaseProductName="db2.*"/>
-        <dbMatcher db="ingres" databaseProductName="ingres.*"/>
-    </dbMatchers>
-
-<!--
-    With the following section it is possible to associate several name/value pairs
-        of options to a database product, identified by the "db" XML attribute name.
-
-    An element without a "db" attribute, if used for an option name, will become a default value for such option.
-    Each option may have a "default default", i.e. a default that applies if no element with an empty
-        "db" attribute (default element) exists as said above;
-        such default default must be documented for such option below.
-
-    The order of the XML elements is meaningless.
-
-    Here only "getBody" and "getAttributes" option names are set, but others could be used in the future.
-    Option names:
-        "getBody" - a string (case insensitive) telling which JDBC ResultSet method will be used to
-            get the message body field for a database product.
-            The default default value is "useBytes"..
-            Values (case insensitive):
-                "useBytes"  - use getBytes(int).
-                "useBlob"   - use getBlob(int).
-        "getAttributes" - a string (case insensitive) telling which JDBC ResultSet method will be used to
-            get the message attributes field for a database product.
-           The default default value is "useBytes"..
-            Values (case insensitive):
-                "useBytes"  - use getBytes(int).
-                "useBlob"   - use getBlob(int).
--->
-    <dbOptions>
-        <dbOption name="getBody" value="useBytes"/>
-        <dbOption name="getAttributes" value="useBytes"/>
-        <dbOption db="mssql" name="getBody" value="useBytes"/>
-        <dbOption db="mssql" name="getAttributes" value="useBytes"/>
-        <dbOption db="oracle" name="getBody" value="useBlob"/>
-        <dbOption db="oracle" name="getAttributes" value="useBlob"/>
-        <dbOption db="mysql" name="getBody" value="useBytes"/>
-        <dbOption db="mysql" name="getAttributes" value="useBytes"/>
-        <dbOption db="derby" name="getBody" value="useBytes"/>
-        <dbOption db="derby" name="getAttributes" value="useBytes"/>
-        <dbOption db="postgresql" name="getBody" value="useBytes"/>
-        <dbOption db="postgresql" name="getAttributes" value="useBytes"/>
-        <dbOption db="sapdb" name="getBody" value="useBytes"/>
-        <dbOption db="sapdb" name="getAttributes" value="useBytes"/>
-        <dbOption db="hypersonic" name="getBody" value="useBytes"/>
-        <dbOption db="hypersonic" name="getAttributes" value="useBytes"/>
-        <dbOption db="hsqldb" name="getBody" value="useBytes"/>
-        <dbOption db="hsqldb" name="getAttributes" value="useBytes"/>
-        <dbOption db="db2" name="getBody" value="useBlob"/>
-        <dbOption db="db2" name="getAttributes" value="useBlob"/>
-        <dbOption db="ingres" name="getBody" value="useBytes"/>
-        <dbOption db="ingres" name="getAttributes" value="useBytes"/>
-    </dbOptions>
-
-<!-- SQL statements to use for various components. -->
-<!-- -->
-<!-- Parameter definitions ${param} are replaced with parameter values -->
-<!-- read from the configuration file. -->
-<!-- -->
-<!-- If a named statement has a definition defined for the current database product, -->
-<!-- then that statement is used. Otherwise the default statement is used. -->
-
-<!-- SQL statements for the JdbcMailRepository  -->
-    <sqlDefs name="org.apache.james.mailrepository.jdbc.JDBCMailRepository">
-
-        <!-- Statements used to check whether a particular message exists in this repository. -->
-        <sql name="checkMessageExistsSQL">SELECT count(*) FROM ${table} WHERE message_name = ? AND repository_name = ?</sql>
-
-        <!-- Statements used to update a message stored in this repository. -->
-        <sql name="updateMessageSQL">UPDATE ${table} SET message_state = ?, error_message = ?, sender = ?, recipients = ?, remote_host = ?, remote_addr = ?, last_updated = ? WHERE message_name = ? AND repository_name = ?</sql>
-
-        <!-- Statements used to update the body of a message stored in this repository. -->
-        <sql name="updateMessageBodySQL">UPDATE ${table} SET message_body = ? WHERE message_name = ? AND repository_name = ?</sql>
-
-        <!-- Statements used to update the attributes of a message stored in this repository. -->
-        <sql name="updateMessageAttributesSQL">UPDATE ${table} SET message_attributes = ? WHERE message_name = ? AND repository_name = ?</sql>
-
-        <!-- Statements used to insert a message into this repository. -->
-        <sql name="insertMessageSQL">INSERT INTO ${table} (message_name,
-            repository_name, message_state, error_message, sender, recipients,
-    remote_host, remote_addr, per_recipient_headers, last_updated, message_body,
-    message_attributes) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)</sql>
-
-        <!-- Statements used to retrieve a message stored in this repository. -->
-    <sql name="retrieveMessageSQL">SELECT message_state, error_message, sender, recipients, remote_host, remote_addr, per_recipient_headers, last_updated FROM ${table} WHERE message_name = ? AND repository_name = ?</sql>
-
-        <!-- Statements used to retrieve the body of a message stored in this repository. -->
-        <sql name="retrieveMessageBodySQL">SELECT message_body FROM ${table} WHERE message_name = ? AND repository_name = ?</sql>
-
-        <!-- Statements used to retrieve the attributes of a message stored in this repository. -->
-        <sql name="retrieveMessageAttributesSQL">SELECT message_attributes FROM ${table} WHERE message_name = ? AND repository_name = ?</sql>
-
-        <!-- Statements used to retrieve the size of the body of a message stored in this repository. -->
-        <!-- NOTE: This statement is optional and need not be implemented for a particular database to be supported. -->
-        <sql name="retrieveMessageBodySizeSQL" db="mssql">SELECT datalength(message_body) FROM ${table} WHERE message_name = ? AND repository_name = ?</sql>
-        <sql name="retrieveMessageBodySizeSQL" db="mysql">SELECT length(message_body) FROM ${table} WHERE message_name = ? AND repository_name = ?</sql>
-        <sql name="retrieveMessageBodySizeSQL" db="hypersonic">SELECT length(message_body) FROM ${table} WHERE message_name = ? AND repository_name = ?</sql>
-        <sql name="retrieveMessageBodySizeSQL" db="hsqldb">SELECT length(message_body) FROM ${table} WHERE message_name = ? AND repository_name = ?</sql>
-        <sql name="retrieveMessageBodySizeSQL" db="postgresql">SELECT length(message_body) FROM ${table} WHERE message_name = ? AND repository_name = ?</sql>
-        <sql name="retrieveMessageBodySizeSQL" db="oracle">SELECT dbms_lob.getlength(message_body) FROM ${table} WHERE message_name = ? AND repository_name = ?</sql>
-        <sql name="retrieveMessageBodySizeSQL" db="db2">SELECT length(message_body) FROM ${table} WHERE message_name = ? AND repository_name = ?</sql>
-        <sql name="retrieveMessageBodySizeSQL" db="ingres">SELECT length(message_body) FROM ${table} WHERE message_name = ? AND repository_name = ?</sql>
-        <sql name="retrieveMessageBodySizeSQL" db="derby">SELECT length(message_body) FROM ${table} WHERE message_name = ? AND repository_name = ?</sql>
-
-        <!-- Statements used to delete a message stored in this repository. -->
-        <sql name="removeMessageSQL">DELETE FROM ${table} WHERE message_name = ? AND repository_name = ?</sql>
-
-        <!-- Statements used to list all messages stored in this repository. -->
-        <sql name="listMessagesSQL">SELECT message_name, message_state, last_updated FROM ${table} WHERE repository_name = ? ORDER BY last_updated ASC</sql>
-
-    <!-- Statements used to count messages stored in this repository. -->
-    <sql name="countMessagesSQL">SELECT COUNT(*) FROM ${table}</sql>
-
-        <!-- Statements used to create the table associated with this class. -->
-        <sql name="createTable" db="mysql">
-            CREATE TABLE ${table} (
-            message_name varchar (200) NOT NULL,
-            repository_name varchar (100) NOT NULL,
-            message_state varchar (30) NOT NULL ,
-            error_message varchar (200) NULL ,
-            sender varchar (255) NULL ,
-            recipients text NOT NULL ,
-            remote_host varchar (255) NOT NULL ,
-            remote_addr varchar (20) NOT NULL ,
-            per_recipient_headers longblob NULL ,
-            last_updated datetime NOT NULL,
-            message_body longblob NOT NULL ,
-            message_attributes longblob NULL ,
-            PRIMARY KEY (repository_name, message_name)
-            )
-        </sql>
-        <sql name="createTable" db="hypersonic">
-            CREATE CACHED TABLE ${table} (
-            message_name varchar (200) NOT NULL,
-            repository_name varchar (255) NOT NULL,
-            message_state varchar (30) NOT NULL ,
-            error_message varchar (200) NULL ,
-            sender varchar (255) NULL ,
-            recipients varchar NOT NULL ,
-            remote_host varchar (255) NOT NULL ,
-            remote_addr varchar (20) NOT NULL ,
-            per_recipient_headers varchar NULL ,
-            last_updated timestamp NOT NULL,
-            message_body varchar NOT NULL ,
-            message_attributes varchar NULL ,
-            PRIMARY KEY (repository_name, message_name)
-            )
-        </sql>
-        <sql name="createTable" db="hsqldb">
-            CREATE CACHED TABLE ${table} (
-            message_name varchar (200) NOT NULL,
-            repository_name varchar (255) NOT NULL,
-            message_state varchar (30) NOT NULL ,
-            error_message varchar (200) NULL ,
-            sender varchar (255) NULL ,
-            recipients varchar NOT NULL ,
-            remote_host varchar (255) NOT NULL ,
-            remote_addr varchar (20) NOT NULL ,
-            per_recipient_headers varchar NULL ,
-            last_updated timestamp NOT NULL,
-            message_body varchar NOT NULL ,
-            message_attributes varchar NULL ,
-            PRIMARY KEY (repository_name, message_name)
-            )
-        </sql>
-        <sql name="createTable" db="mssql">
-            CREATE TABLE [${table}] (
-            [message_name] [varchar] (200) NOT NULL,
-            [repository_name] [varchar] (255) NOT NULL,
-            [message_state] [varchar] (30) NOT NULL ,
-            [error_message] [varchar] (1000) NULL ,
-            [sender] [varchar] (255) NULL ,
-            [recipients] [text] NOT NULL ,
-            [remote_host] [varchar] (255) NOT NULL ,
-            [remote_addr] [varchar] (20) NOT NULL ,
-            [per_recipient_headers] [image] NULL ,
-            [last_updated] [datetime] NOT NULL,
-            [message_body] [image] NOT NULL ,
-            [message_attributes] [image] NULL ,
-            PRIMARY KEY (repository_name, message_name)
-            )
-        </sql>
-        <sql name="createTable" db="oracle">
-            CREATE TABLE ${table} (
-            message_name varchar2(200) NOT NULL ,
-            repository_name varchar2(255) NOT NULL ,
-            message_state varchar2(30) NOT NULL ,
-            error_message varchar2(200) NULL ,
-            sender varchar2(255) ,
-            recipients varchar2(1000) NOT NULL ,
-            remote_host varchar2(100) NOT NULL ,
-            remote_addr varchar2(20) NOT NULL ,
-            per_recipient_headers blob NULL ,
-            last_updated date NOT NULL ,
-            message_body blob NOT NULL ,
-            message_attributes blob NULL ,
-            PRIMARY KEY (repository_name, message_name)
-            )
-        </sql>
-        <sql name="createTable" db="postgresql">
-            CREATE TABLE ${table} (
-            message_name varchar (200) NOT NULL,
-            repository_name varchar (255) NOT NULL,
-            message_state varchar (30) NOT NULL ,
-            error_message varchar (200) NULL ,
-            sender varchar (255) NULL ,
-            recipients text NOT NULL ,
-            remote_host varchar (255) NOT NULL ,
-            remote_addr varchar (20) NOT NULL ,
-            per_recipient_headers bytea NULL ,
-            last_updated timestamp NOT NULL,
-            message_body bytea NOT NULL ,
-            message_attributes bytea NULL ,
-            PRIMARY KEY (repository_name, message_name)
-            )
-        </sql>
-        <sql name="createTable" db="sapdb">
-            CREATE TABLE ${table} (
-            message_name varchar (200) NOT NULL,
-            repository_name varchar (200) NOT NULL,
-            message_state varchar (30) NOT NULL ,
-            error_message varchar (200) NULL ,
-            sender varchar (200) NULL ,
-            recipients long NOT NULL ,
-            remote_host varchar (100) NOT NULL ,
-            remote_addr varchar (20) NOT NULL ,
-            per_recipient_headers long byte NULL ,
-            last_updated date NOT NULL,
-            message_body long byte NOT NULL ,
-            message_attributes long byte NULL ,
-            PRIMARY KEY (repository_name, message_name)
-            )
-        </sql>
-        <sql name="createTable" db="db2">
-            CREATE TABLE ${table} (
-            message_name varchar(200) NOT NULL ,
-            repository_name varchar(255) NOT NULL ,
-            message_state varchar(30) NOT NULL ,
-            error_message varchar(200) ,
-            sender varchar(255) ,
-            recipients varchar(1000) NOT NULL ,
-            remote_host varchar(100) NOT NULL ,
-            remote_addr varchar(20) NOT NULL ,
-            per_recipient_headers blob ,
-            last_updated timestamp NOT NULL ,
-            message_body blob NOT NULL ,
-            message_attributes blob ,
-            PRIMARY KEY (repository_name, message_name)
-            )
-        </sql>
-        <sql name="createTable" db="ingres">
-            CREATE TABLE ${table} (
-            message_name varchar (200) NOT NULL,
-            repository_name varchar (255) NOT NULL,
-            message_state varchar (30) NOT NULL ,
-            error_message varchar (200) ,
-            sender varchar (255) ,
-            recipients LONG VARCHAR NOT NULL ,
-            remote_host varchar (255) NOT NULL ,
-            remote_addr varchar (20) NOT NULL ,
-            per_recipient_headers LONG BYTE ,
-            last_updated DATE NOT NULL
-            message_body LONG BYTE NOT NULL ,
-            message_attributes LONG BYTE ,
-            )
-        </sql>
-        <sql name="createTable" db="derby">
-            CREATE TABLE ${table} (
-            message_name varchar (200) NOT NULL,
-            repository_name varchar (255) NOT NULL,
-            message_state varchar (30) NOT NULL ,
-            error_message varchar (200) ,
-            sender varchar (255) ,
-            recipients long varchar NOT NULL ,
-            remote_host varchar (255) NOT NULL ,
-            remote_addr varchar (20) NOT NULL ,
-            per_recipient_headers blob ,
-            last_updated timestamp NOT NULL,
-            message_body blob NOT NULL ,
-            message_attributes blob ,
-            PRIMARY KEY (repository_name, message_name)
-            )
-        </sql>
-    </sqlDefs>
-
-
-<!-- SQL statements to support the BayesianAnalysis and the BayesianAnalysisFeeder mailets -->
-<!-- -->
-    <sqlDefs name="org.apache.james.util.bayesian.JDBCBayesianAnalyzer">
-
-        <sql name="hamTableName">bayesiananalysis_ham</sql>
-        <sql name="spamTableName">bayesiananalysis_spam</sql>
-        <sql name="messageCountsTableName">bayesiananalysis_messagecounts</sql>
-
-        <!-- Statements used to retrieve the message counts. -->
-        <sql name="selectMessageCounts">SELECT HAMCOUNT, SPAMCOUNT FROM bayesiananalysis_messagecounts</sql>
-
-        <!-- Statements used to initialize the message counts. -->
-        <sql name="initializeMessageCounts">INSERT INTO bayesiananalysis_messagecounts (HAMCOUNT, SPAMCOUNT) VALUES (0,0)</sql>
-
-        <!-- Statements used to update the ham message counts. -->
-        <sql name="updateHamMessageCounts">UPDATE bayesiananalysis_messagecounts SET HAMCOUNT=(HAMCOUNT + ?)</sql>
-
-        <!-- Statements used to update the spam message counts. -->
-        <sql name="updateSpamMessageCounts">UPDATE bayesiananalysis_messagecounts SET SPAMCOUNT=(SPAMCOUNT + ?)</sql>
-
-        <!-- Statements used to retrieve the ham token counts. -->
-        <sql name="selectHamTokens">SELECT TOKEN, OCCURRENCES FROM bayesiananalysis_ham</sql>
-
-        <!-- Statements used to retrieve the spam token counts. -->
-        <sql name="selectSpamTokens">SELECT TOKEN, OCCURRENCES FROM bayesiananalysis_spam</sql>
-
-        <!-- Statements used to insert the ham token counts. -->
-        <sql name="insertHamToken">INSERT INTO bayesiananalysis_ham (TOKEN, OCCURRENCES) VALUES (?,?)</sql>
-
-        <!-- Statements used to insert the spam token counts. -->
-        <sql name="insertSpamToken">INSERT INTO bayesiananalysis_spam (TOKEN, OCCURRENCES) VALUES (?,?)</sql>
-
-        <!-- Statements used to update the ham token counts. -->
-        <sql name="updateHamToken">UPDATE bayesiananalysis_ham SET OCCURRENCES=(OCCURRENCES + ?) WHERE (TOKEN=?)</sql>
-
-        <!-- Statements used to update the spam token counts. -->
-        <sql name="updateSpamToken">UPDATE bayesiananalysis_spam SET OCCURRENCES=(OCCURRENCES + ?) WHERE (TOKEN=?)</sql>
-
-        <!-- Statements used to delete ham tokens. -->
-        <sql name="deleteHamTokens">DELETE FROM bayesiananalysis_ham</sql>
-
-        <!-- Statements used to delete spam tokens. -->
-        <sql name="deleteSpamTokens">DELETE FROM bayesiananalysis_spam</sql>
-
-        <!-- Statements used to delete message counts. -->
-        <sql name="deleteMessageCounts">DELETE FROM bayesiananalysis_messagecounts</sql>
-
-
-        <!-- Statements used to create the "ham" table (the 'token' field must be case sensitive). -->
-        <sql name="createHamTable" db="mysql">
-            CREATE TABLE bayesiananalysis_ham (
-            token varchar(128) binary NOT NULL default '',
-            occurrences int(11) NOT NULL default '0',
-            PRIMARY KEY (token)
-            ) TYPE=InnoDB
-        </sql>
-        <sql name="createHamTable" db="mssql">
-            CREATE TABLE [bayesiananalysis_ham] (
-            [token] [varchar] (128) COLLATE Latin1_General_CS_AS NOT NULL,
-            [occurrences] [int] NOT NULL default (0),
-            PRIMARY KEY (token)
-            )
-        </sql>
-        <sql name="createHamTable" db="derby">
-            CREATE TABLE bayesiananalysis_ham (
-            token varchar(128) NOT NULL,
-            occurrences INTEGER NOT NULL default 0,
-            PRIMARY KEY (token)
-            )
-        </sql>
-        <sql name="createHamTable" db="postgresql">
-            CREATE TABLE bayesiananalysis_ham (
-            token varchar(128) NOT NULL,
-            occurrences int NOT NULL default 0,
-            PRIMARY KEY (token)
-            )
-        </sql>
-
-        <!-- Statements used to create the "spam" table (the 'token' field must be case sensitive). -->
-        <sql name="createSpamTable" db="mysql">
-            CREATE TABLE bayesiananalysis_spam (
-            token varchar(128) binary NOT NULL default '',
-            occurrences int(11) NOT NULL default '0',
-            PRIMARY KEY (token)
-            ) TYPE=InnoDB
-        </sql>
-        <sql name="createSpamTable" db="mssql">
-            CREATE TABLE [bayesiananalysis_spam] (
-            [token] [varchar] (128) COLLATE Latin1_General_CS_AS NOT NULL,
-            [occurrences] [int] NOT NULL default (0),
-            PRIMARY KEY (token)
-            )
-        </sql>
-        <sql name="createSpamTable" db="derby">
-            CREATE TABLE bayesiananalysis_spam (
-            token varchar (128) NOT NULL,
-            occurrences INTEGER  NOT NULL default 0,
-            PRIMARY KEY (token)
-            )
-        </sql>
-        <sql name="createSpamTable" db="postgresql">
-            CREATE TABLE bayesiananalysis_spam (
-            token varchar (128) NOT NULL,
-            occurrences int  NOT NULL default 0,
-            PRIMARY KEY (token)
-            )
-        </sql>
-
-        <!-- Statements used to create the "message counts" table. -->
-        <sql name="createMessageCountsTable" db="mysql">
-            CREATE TABLE bayesiananalysis_messagecounts (
-            hamcount int(11) NOT NULL default '0',
-            spamcount int(11) NOT NULL default '0'
-            ) TYPE=InnoDB
-        </sql>
-        <sql name="createMessageCountsTable" db="mssql">
-            CREATE TABLE [bayesiananalysis_messagecounts] (
-            [hamcount] [int] NOT NULL default (0),
-            [spamcount] [int] NOT NULL default (0)
-            )
-        </sql>
-        <sql name="createMessageCountsTable" db="derby">
-            CREATE TABLE bayesiananalysis_messagecounts (
-            hamcount INTEGER NOT NULL default 0,
-            spamcount INTEGER  NOT NULL default 0
-            )
-        </sql>
-        <sql name="createMessageCountsTable" db="postgresql">
-            CREATE TABLE bayesiananalysis_messagecounts (
-            hamcount int NOT NULL default 0,
-            spamcount int  NOT NULL default 0
-            )
-        </sql>
-    </sqlDefs>
-
-<!-- SQL statements to support the WhiteListManager mailet and the IsInWhiteList matcher -->
-<!-- -->
-    <sqlDefs name="WhiteList">
-
-        <sql name="whiteListTableName">whitelist</sql>
-
-        <!-- Statements used to retrieve a single entry. -->
-        <sql name="selectByPK">SELECT localUser, localHost FROM whitelist where (localUser=? AND localHost=? AND remoteUser=? AND remoteHost=?)</sql>
-
-        <!-- Statements used to all entries by sender address. -->
-        <sql name="selectBySender">SELECT remoteUser, remoteHost FROM whitelist where (localUser=? AND localHost=?) ORDER BY remoteUser, remoteHost</sql>
-
-        <!-- Statements used to insert an entry. -->
-        <sql name="insert">INSERT INTO whitelist (localUser, localHost, remoteUser, remoteHost) VALUES (?,?,?,?)</sql>
-
-        <!-- Statements used to delete an entry. -->
-        <sql name="deleteByPK">DELETE FROM whitelist where (localUser=? AND localHost=? AND remoteUser=? AND remoteHost=?)</sql>
-
-        <!-- Statements used to create the "whitelist" table. -->
-        <sql name="createWhiteListTable" db="hypersonic">
-            CREATE TABLE whitelist (
-            localUser varchar (64) NOT NULL,
-            localHost varchar (255) NOT NULL,
-            remoteUser varchar (64) NOT NULL,
-            remoteHost varchar (255) NOT NULL,
-            PRIMARY KEY (localUser, localHost, remoteUser, remoteHost)
-            )
-        </sql>
-        <sql name="createWhiteListTable" db="hsqldb">
-            CREATE CACHED TABLE ${table} (
-            CREATE TABLE whitelist (
-            localUser varchar (64) NOT NULL,
-            localHost varchar (255) NOT NULL,
-            remoteUser varchar (64) NOT NULL,
-            remoteHost varchar (255) NOT NULL,
-            PRIMARY KEY (localUser, localHost, remoteUser, remoteHost)
-            )
-        </sql>
-        <sql name="createWhiteListTable" db="mysql">
-            CREATE TABLE whitelist (
-            localUser varchar (64) NOT NULL,
-            localHost varchar (255) character set latin1 NOT NULL,
-            remoteUser varchar (64) NOT NULL,
-            remoteHost varchar (255) character set latin1 NOT NULL,
-            PRIMARY KEY (localUser, localHost, remoteUser, remoteHost)
-            ) TYPE=InnoDB
-        </sql>
-        <sql name="createWhiteListTable" db="mssql">
-            CREATE TABLE [whitelist] (
-            [localUser] [varchar] (64) NOT NULL,
-            [localHost] [varchar] (255) NOT NULL,
-            [remoteUser] [varchar] (64) NOT NULL,
-            [remoteHost] [varchar] (255) NOT NULL,
-            PRIMARY KEY (localUser, localHost, remoteUser, remoteHost)
-            )
-        </sql>
-        <sql name="createWhiteListTable" db="oracle">
-            CREATE TABLE whitelist (
-            localUser varchar (64) NOT NULL,
-            localHost varchar (255) NOT NULL,
-            remoteUser varchar (64) NOT NULL,
-            remoteHost varchar (255) NOT NULL,
-            PRIMARY KEY (localUser, localHost, remoteUser, remoteHost)
-            )
-        </sql>
-        <sql name="createWhiteListTable" db="postgresql">
-            CREATE TABLE whitelist (
-            localUser varchar (64) NOT NULL,
-            localHost varchar (255) NOT NULL,
-            remoteUser varchar (64) NOT NULL,
-            remoteHost varchar (255) NOT NULL,
-            PRIMARY KEY (localUser, localHost, remoteUser, remoteHost)
-            )
-        </sql>
-        <sql name="createWhiteListTable" db="sapdb">
-            CREATE TABLE whitelist (
-            localUser varchar (64) NOT NULL,
-            localHost varchar (255) NOT NULL,
-            remoteUser varchar (64) NOT NULL,
-            remoteHost varchar (255) NOT NULL,
-            PRIMARY KEY (localUser, localHost, remoteUser, remoteHost)
-            )
-        </sql>
-        <sql name="createWhiteListTable" db="db2">
-            CREATE TABLE whitelist (
-            localUser varchar (64) NOT NULL,
-            localHost varchar (255) NOT NULL,
-            remoteUser varchar (64) NOT NULL,
-            remoteHost varchar (255) NOT NULL,
-            PRIMARY KEY (localUser, localHost, remoteUser, remoteHost)
-            )
-        </sql>
-        <sql name="createWhiteListTable" db="ingres">
-            CREATE TABLE whitelist (
-            localUser varchar (64) NOT NULL,
-            localHost varchar (255) NOT NULL,
-            remoteUser varchar (64) NOT NULL,
-            remoteHost varchar (255) NOT NULL,
-            PRIMARY KEY (localUser, localHost, remoteUser, remoteHost)
-            )
-        </sql>
-        <sql name="createWhiteListTable" db="derby">
-            CREATE TABLE whitelist (
-            localUser varchar (64) NOT NULL,
-            localHost varchar (255) NOT NULL,
-            remoteUser varchar (64) NOT NULL,
-            remoteHost varchar (255) NOT NULL,
-            PRIMARY KEY (localUser, localHost, remoteUser, remoteHost)
-            )
-        </sql>
-
-    </sqlDefs>
-
-    <sqlDefs name="NetworkWhiteList">
-
-        <sql name="networkWhiteListTableName">networkWhitelist</sql>
-
-        <!-- Statements used to retrieve a single entry. -->
-        <sql name="selectNetwork">SELECT network FROM networkWhitelist where (localUser=? AND localHost=?)</sql>
-
-        <!-- Statements used to create the "whitelist" table. -->
-        <sql name="createNetworkWhiteListTable" db="hypersonic">
-            CREATE TABLE networkWhitelist (
-            localUser varchar (64) NOT NULL,
-            localHost varchar (255) NOT NULL,
-            network varchar (255) NOT NULL,
-            PRIMARY KEY (localUser, localHost)
-            )
-        </sql>
-        <sql name="createNetworkWhiteListTable" db="hsqldb">
-            CREATE CACHED TABLE ${table} (
-            CREATE TABLE networkWhitelist (
-            localUser varchar (64) NOT NULL,
-            localHost varchar (255) NOT NULL,
-            network varchar (255) NOT NULL
-            )
-        </sql>
-        <sql name="createNetworkWhiteListTable" db="mysql">
-            CREATE TABLE networkWhitelist (
-            localUser varchar (64) NOT NULL,
-            localHost varchar (255) character set latin1 NOT NULL,
-            network varchar (255) NOT NULL
-            ) TYPE=InnoDB
-        </sql>
-        <sql name="createNetworkWhiteListTable" db="mssql">
-            CREATE TABLE [networkWhitelist] (
-            [localUser] [varchar] (64) NOT NULL,
-            [localHost] [varchar] (255) NOT NULL,
-            [network] [varchar] (255) NOT NULL
-            )
-        </sql>
-        <sql name="createNetworkWhiteListTable" db="oracle">
-            CREATE TABLE networkWhitelist (
-            localUser varchar (64) NOT NULL,
-            localHost varchar (255) NOT NULL,
-            network varchar (255) NOT NULL
-            )
-        </sql>
-        <sql name="createNetworkWhiteListTable" db="postgresql">
-            CREATE TABLE networkWhitelist (
-            localUser varchar (64) NOT NULL,
-            localHost varchar (255) NOT NULL,
-            network varchar (255) NOT NULL
-            )
-        </sql>
-        <sql name="createNetworkWhiteListTable" db="sapdb">
-            CREATE TABLE networkWhitelist (
-            localUser varchar (64) NOT NULL,
-            localHost varchar (255) NOT NULL,
-            network varchar (255) NOT NULL
-            )
-        </sql>
-        <sql name="createNetworkWhiteListTable" db="db2">
-            CREATE TABLE networkWhitelist (
-            localUser varchar (64) NOT NULL,
-            localHost varchar (255) NOT NULL,
-            network varchar (255) NOT NULL
-            )
-        </sql>
-        <sql name="createNetworkWhiteListTable" db="ingres">
-            CREATE TABLE networkWhitelist (
-            localUser varchar (64) NOT NULL,
-            localHost varchar (255) NOT NULL,
-            network varchar (255) NOT NULL
-            )
-        </sql>
-        <sql name="createNetworkWhiteListTable" db="derby">
-            CREATE TABLE networkWhitelist (
-            localUser varchar (64) NOT NULL,
-            localHost varchar (255) NOT NULL,
-            network varchar (255) NOT NULL
-            )
-        </sql>
-
-    </sqlDefs>
-
-<!-- SQL statements to support the GreyList Handler-->
-<!-- -->
-    <sqlDefs name="GreyList">
-
-        <sql name="greyListTableName">greylist</sql>
-
-        <!-- Statements used to retrieve a single entry. -->
-        <sql name="selectQuery">SELECT create_time,count FROM greylist WHERE ipaddress = ? AND sender = ? AND recip = ?</sql>
-
-        <!-- Statements used to insert an entry. -->
-        <sql name="insertQuery">INSERT INTO greylist (ipaddress,sender,recip,count,create_time) values (?,?,?,?,?)</sql>
-
-        <!-- Statements used to delete an entry. -->
-        <sql name="deleteQuery">DELETE FROM greylist WHERE create_time &lt; ? AND count = 0</sql>
-
-        <!-- Statements used to delete an entry. -->
-        <sql name="deleteAutoWhitelistQuery">DELETE FROM greylist WHERE create_time &lt; ?</sql>
-
-        <!-- Statements used to delete an entry. -->
-        <sql name="updateQuery">UPDATE greylist SET create_time = ? , count = ? WHERE ipaddress = ? AND sender = ? AND recip = ?</sql>
-
-        <!-- Statements used to create the "whitelist" table. -->
-        <sql name="createGreyListTable" db="hypersonic">
-            CREATE TABLE greylist (
-            ipaddress varchar (20) NOT NULL,
-            sender varchar (255) NOT NULL,
-            recip varchar (255) NOT NULL,
-            count int NOT NULL,
-            create_time datetime NOT NULL,
-            PRIMARY KEY (ipaddress,sender,recip)
-            )
-        </sql>
-        <sql name="createGreyListTable" db="hsqldb">
-            CREATE CACHED TABLE ${table} (
-            CREATE TABLE greylist (
-            ipaddress varchar (20) NOT NULL,
-            sender varchar (255) NOT NULL,
-            recip varchar (255) NOT NULL,
-            count int NOT NULL,
-            create_time timestamo NOT NULL,
-            PRIMARY KEY (ipaddress,sender,recip)
-            )
-        </sql>
-        <sql name="createGreyListTable" db="mysql">
-            CREATE TABLE greylist (
-            ipaddress varchar (20) NOT NULL,
-            sender varchar (255) NOT NULL,
-            recip varchar (255) NOT NULL,
-            count int NOT NULL,
-            create_time datetime NOT NULL,
-            PRIMARY KEY (ipaddress,sender,recip)
-            ) TYPE=InnoDB
-        </sql>
-        <sql name="createGreyListTable" db="mssql">
-            CREATE TABLE [greylist] (
-            [ipaddress] [varchar] (20) NOT NULL,
-            [sender] [varchar] (255) NOT NULL,
-            [recip] [varchar] (255) NOT NULL,
-            [count] [int] NOT NULL,
-            [create_time] [datetime] NOT NULL,
-            PRIMARY KEY (ipaddress,sender,recip)
-            )
-        </sql>
-        <sql name="createGreyListTable" db="oracle">
-            CREATE TABLE greylist (
-            ipaddress varchar2(20) NOT NULL,
-            sender varchar2(255) NOT NULL,
-            recip varchar2(255) NOT NULL,
-            count int NOT NULL,
-            create_time datetime NOT NULL,
-            PRIMARY KEY (ipaddress,sender,recip)
-            )
-        </sql>
-        <sql name="createGreyListTable" db="postgresql">
-            CREATE TABLE greylist (
-            ipaddress varchar (20) NOT NULL,
-            sender varchar (255) NOT NULL,
-            recip varchar (255) NOT NULL,
-            count int NOT NULL,
-            create_time timestamp NOT NULL,
-            PRIMARY KEY (ipaddress,sender,recip)
-            )
-        </sql>
-        <sql name="createGreyListTable" db="sapdb">
-            CREATE TABLE greylist (
-            ipaddress varchar (20) NOT NULL,
-            sender varchar (255) NOT NULL,
-            recip varchar (255) NOT NULL,
-            count int NOT NULL,
-            create_time date NOT NULL,
-            PRIMARY KEY (ipaddress,sender,recip)
-            )
-        </sql>
-        <sql name="createGreyListTable" db="db2">
-            CREATE TABLE greylist (
-            ipaddress varchar (20) NOT NULL,
-            sender varchar (255) NOT NULL,
-            recip varchar (255) NOT NULL,
-            count int NOT NULL,
-            create_time timestamp NOT NULL,
-            PRIMARY KEY (ipaddress,sender,recip)
-            )
-        </sql>
-        <sql name="createGreyListTable" db="ingres">
-            CREATE TABLE greylist (
-            ipaddress varchar (20) NOT NULL,
-            sender varchar (255) NOT NULL,
-            recip varchar (255) NOT NULL,
-            count int NOT NULL,
-            create_time date NOT NULL,
-            PRIMARY KEY (ipaddress,sender,recip)
-            )
-        </sql>
-        <sql name="createGreyListTable" db="derby">
-            CREATE TABLE greylist (
-            ipaddress varchar (20) NOT NULL,
-            sender varchar (255) NOT NULL,
-            recip varchar (255) NOT NULL,
-            count int NOT NULL,
-            create_time timestamp NOT NULL,
-            PRIMARY KEY (ipaddress,sender,recip)
-            )
-        </sql>
-    </sqlDefs>
-
-</sqlResources>
diff --git a/dockerfiles/run/spring/destination/conf/usersrepository.xml b/dockerfiles/run/spring/destination/conf/usersrepository.xml
deleted file mode 100644
index a32265b..0000000
--- a/dockerfiles/run/spring/destination/conf/usersrepository.xml
+++ /dev/null
@@ -1,25 +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.                                           
- -->
-
-<usersrepository name="LocalUsers" class="org.apache.james.user.jpa.JPAUsersRepository">
-    <algorithm>SHA-512</algorithm>
-    <enableVirtualHosting>true</enableVirtualHosting>    
-</usersrepository>
-
diff --git a/dockerfiles/run/spring/destination/glowroot/admin.json b/dockerfiles/run/spring/destination/glowroot/admin.json
deleted file mode 100644
index c75c59d..0000000
--- a/dockerfiles/run/spring/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/spring/destination/glowroot/plugins/imap.json b/dockerfiles/run/spring/destination/glowroot/plugins/imap.json
deleted file mode 100644
index d27904f..0000000
--- a/dockerfiles/run/spring/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/spring/destination/run_james.sh b/dockerfiles/run/spring/destination/run_james.sh
deleted file mode 100755
index 6697c5b..0000000
--- a/dockerfiles/run/spring/destination/run_james.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-if [ "$GLOWROOT_ACTIVATED" == "true" ]; then
-    GLOWROOT_OPTIONS=wrapper.java.additional.15=-javaagent:/root/glowroot/glowroot.jar
-fi
-./wrapper-linux-x86-64 ../conf/wrapper.conf wrapper.syslog.ident=james wrapper.pidfile=../var/james.pid wrapper.daemonize=FALSE $GLOWROOT_OPTIONS
diff --git a/dockerfiles/run/spring/destination/var/.gitignore b/dockerfiles/run/spring/destination/var/.gitignore
deleted file mode 100644
index c96a04f..0000000
--- a/dockerfiles/run/spring/destination/var/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*
-!.gitignore
\ No newline at end of file
diff --git a/src/site/xdoc/server/packaging.xml b/src/site/xdoc/server/packaging.xml
index 77ff816..092dc81 100644
--- a/src/site/xdoc/server/packaging.xml
+++ b/src/site/xdoc/server/packaging.xml
@@ -75,7 +75,7 @@
                     </tr>
                     <tr>
                         <td>Docker image</td>
-                        <td><a href="https://github.com/apache/james-project/tree/master/dockerfiles/run/spring">Available</a></td>
+                        <td>Not available. Contributions welcomed for JIB support.</td>
                         <td>apache/james:cassandra-3.6.0</td>
                         <td>apache/james:distributed-3.6.0</td>
                         <td>apache/james:jpa-3.6.0</td>

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