You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@james.apache.org by bt...@apache.org on 2021/04/17 00:59:19 UTC

[james-project] branch 3.6.x updated (dc43544 -> 5bdee08)

This is an automated email from the ASF dual-hosted git repository.

btellier pushed a change to branch 3.6.x
in repository https://gitbox.apache.org/repos/asf/james-project.git.


    from dc43544  JAMES-3558 JMAP Email/changes: moves should be considered as updates
     new 67d653d  JAMES-3261 Copy sample configuration from the docker one
     new 8a92ecd  JAMES-3261 Build a ZIP distribution for Guice memory
     new 5bdee08  JAMES-3261 Guice memory docker should reuse guice memory ZIP app

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 dockerfiles/compilation/java-11/compile.sh         |   4 +-
 dockerfiles/run/guice/memory/Dockerfile            |   6 +-
 .../conf/deletedMessageVault.properties            |   4 -
 .../guice/memory/destination/conf/dnsservice.xml   |  26 ----
 .../guice/memory/destination/conf/domainlist.xml   |  27 ----
 .../guice/memory/destination/conf/imapserver.xml   |  62 --------
 .../guice/memory/destination/conf/jmap.properties  |  18 ---
 .../guice/memory/destination/conf/jmx.properties   |  26 ----
 .../guice/memory/destination/conf/jwt_publickey    |   9 --
 .../run/guice/memory/destination/conf/logback.xml  |  59 --------
 .../memory/destination/conf/mailetcontainer.xml    | 156 ---------------------
 .../destination/conf/mailrepositorystore.xml       |  33 -----
 .../memory/destination/conf/managesieveserver.xml  |  65 ---------
 .../guice/memory/destination/conf/pop3server.xml   |  43 ------
 .../destination/conf/recipientrewritetable.xml     |  28 ----
 .../guice/memory/destination/conf/smtpserver.xml   | 107 --------------
 .../memory/destination/conf/usersrepository.xml    |  28 ----
 .../memory/destination/conf/webadmin.properties    |  55 --------
 .../run/guice/memory/destination/run_james.sh      |   2 +-
 server/container/guice/memory-guice/README.adoc    |  31 ++--
 server/container/guice/memory-guice/pom.xml        |  18 +++
 .../deletedMessageVault.properties                 |   5 +-
 .../sample-configuration/dnsservice.xml            |   1 +
 .../sample-configuration/domainlist.xml            |   2 +
 .../sample-configuration}/elasticsearch.properties |   0
 .../sample-configuration}/extensions.properties    |   0
 .../sample-configuration}/healthcheck.properties   |   0
 .../sample-configuration/imapserver.xml            |  12 +-
 .../sample-configuration/jmap.properties           |   7 +-
 .../sample-configuration/jmx.properties            |   5 +-
 .../sample-configuration}/listeners.xml            |   0
 .../sample-configuration/lmtpserver.xml            |  41 ------
 .../memory-guice/sample-configuration/logback.xml  |  42 ++++++
 .../sample-configuration/mailetcontainer.xml       |  77 ++++++++--
 .../sample-configuration/mailrepositorystore.xml   |  12 +-
 .../sample-configuration/pop3server.xml            |   3 +-
 .../sample-configuration/recipientrewritetable.xml |   3 +-
 .../sample-configuration/smtpserver.xml            |  14 +-
 .../sample-configuration/usersrepository.xml       |   7 +-
 .../sample-configuration/webadmin.properties       |  34 ++++-
 .../guice/memory-guice/src/assemble/app.xml        |  86 ++++++++++++
 .../memory-guice/src/assemble/extensions-jars.txt  |   0
 .../src/assemble}/license-for-binary.txt           |   0
 43 files changed, 301 insertions(+), 857 deletions(-)
 delete mode 100644 dockerfiles/run/guice/memory/destination/conf/deletedMessageVault.properties
 delete mode 100644 dockerfiles/run/guice/memory/destination/conf/dnsservice.xml
 delete mode 100644 dockerfiles/run/guice/memory/destination/conf/domainlist.xml
 delete mode 100644 dockerfiles/run/guice/memory/destination/conf/imapserver.xml
 delete mode 100644 dockerfiles/run/guice/memory/destination/conf/jmap.properties
 delete mode 100644 dockerfiles/run/guice/memory/destination/conf/jmx.properties
 delete mode 100644 dockerfiles/run/guice/memory/destination/conf/jwt_publickey
 delete mode 100644 dockerfiles/run/guice/memory/destination/conf/logback.xml
 delete mode 100644 dockerfiles/run/guice/memory/destination/conf/mailetcontainer.xml
 delete mode 100644 dockerfiles/run/guice/memory/destination/conf/mailrepositorystore.xml
 delete mode 100644 dockerfiles/run/guice/memory/destination/conf/managesieveserver.xml
 delete mode 100644 dockerfiles/run/guice/memory/destination/conf/pop3server.xml
 delete mode 100644 dockerfiles/run/guice/memory/destination/conf/recipientrewritetable.xml
 delete mode 100644 dockerfiles/run/guice/memory/destination/conf/smtpserver.xml
 delete mode 100644 dockerfiles/run/guice/memory/destination/conf/usersrepository.xml
 delete mode 100644 dockerfiles/run/guice/memory/destination/conf/webadmin.properties
 rename {dockerfiles/run/guice/memory/destination/conf => server/container/guice/memory-guice/sample-configuration}/elasticsearch.properties (100%)
 rename {dockerfiles/run/guice/memory/destination/conf => server/container/guice/memory-guice/sample-configuration}/extensions.properties (100%)
 rename {dockerfiles/run/guice/memory/destination/conf => server/container/guice/memory-guice/sample-configuration}/healthcheck.properties (100%)
 rename {dockerfiles/run/guice/memory/destination/conf => server/container/guice/memory-guice/sample-configuration}/listeners.xml (100%)
 delete mode 100644 server/container/guice/memory-guice/sample-configuration/lmtpserver.xml
 create mode 100644 server/container/guice/memory-guice/src/assemble/app.xml
 rename dockerfiles/run/guice/memory/destination/extensions-jars/README.md => server/container/guice/memory-guice/src/assemble/extensions-jars.txt (100%)
 copy server/{app/src/main/licensing/app => container/guice/memory-guice/src/assemble}/license-for-binary.txt (100%)

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


[james-project] 03/03: JAMES-3261 Guice memory docker should reuse guice memory ZIP app

Posted by bt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

btellier pushed a commit to branch 3.6.x
in repository https://gitbox.apache.org/repos/asf/james-project.git

commit 5bdee08e288ca11b1e38700ff98fcd171ea9867f
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Sun Jun 21 21:46:53 2020 +0700

    JAMES-3261 Guice memory docker should reuse guice memory ZIP app
---
 dockerfiles/compilation/java-11/compile.sh         |   4 +-
 dockerfiles/run/guice/memory/Dockerfile            |   6 +-
 .../conf/deletedMessageVault.properties            |   4 -
 .../guice/memory/destination/conf/dnsservice.xml   |  26 ----
 .../guice/memory/destination/conf/domainlist.xml   |  27 ----
 .../destination/conf/elasticsearch.properties      |  31 ----
 .../memory/destination/conf/extensions.properties  |  10 --
 .../memory/destination/conf/healthcheck.properties |  30 ----
 .../guice/memory/destination/conf/imapserver.xml   |  62 --------
 .../guice/memory/destination/conf/jmap.properties  |  18 ---
 .../guice/memory/destination/conf/jmx.properties   |  26 ----
 .../guice/memory/destination/conf/jwt_publickey    |   9 --
 .../guice/memory/destination/conf/listeners.xml    |  31 ----
 .../run/guice/memory/destination/conf/logback.xml  |  59 --------
 .../memory/destination/conf/mailetcontainer.xml    | 156 ---------------------
 .../destination/conf/mailrepositorystore.xml       |  33 -----
 .../memory/destination/conf/managesieveserver.xml  |  65 ---------
 .../guice/memory/destination/conf/pop3server.xml   |  43 ------
 .../destination/conf/recipientrewritetable.xml     |  28 ----
 .../guice/memory/destination/conf/smtpserver.xml   | 107 --------------
 .../memory/destination/conf/usersrepository.xml    |  28 ----
 .../memory/destination/conf/webadmin.properties    |  55 --------
 .../memory/destination/extensions-jars/README.md   |   5 -
 .../run/guice/memory/destination/run_james.sh      |   2 +-
 .../sample-configuration/imapserver.xml            |   2 -
 .../sample-configuration/jmap.properties           |   4 +
 .../sample-configuration/mailetcontainer.xml       |  25 ++--
 .../sample-configuration/usersrepository.xml       |   2 +-
 .../sample-configuration/webadmin.properties       |   6 +
 29 files changed, 34 insertions(+), 870 deletions(-)

diff --git a/dockerfiles/compilation/java-11/compile.sh b/dockerfiles/compilation/java-11/compile.sh
index d82722b..dfb6ddf 100755
--- a/dockerfiles/compilation/java-11/compile.sh
+++ b/dockerfiles/compilation/java-11/compile.sh
@@ -126,12 +126,12 @@ if [ $? -eq 0 ]; then
 
    if [ -d "$MEMORY_DESTINATION" ]; then
       echo "Copying memory JARs"
-      cp server/container/guice/memory-guice/target/james-server-memory-guice.jar $MEMORY_DESTINATION || true
-      cp -r server/container/guice/memory-guice/target/james-server-memory-guice.lib $MEMORY_DESTINATION || true
+      cp server/container/guice/memory-guice/target/james-server-memory-guice.zip $MEMORY_DESTINATION || true
       cp server/container/cli/target/james-server-cli.jar $MEMORY_DESTINATION || true
       cp -r server/container/cli/target/james-server-cli.lib $MEMORY_DESTINATION || true
       mkdir -p ${MEMORY_DESTINATION}/glowroot
       cp -r ${GLOW_ROOT_DIR}/* ${MEMORY_DESTINATION}/glowroot || true
+      unzip $MEMORY_DESTINATION/james-server-memory-guice.zip
    fi
 
    if [ -d "$SPRING_DESTINATION" ]; then
diff --git a/dockerfiles/run/guice/memory/Dockerfile b/dockerfiles/run/guice/memory/Dockerfile
index c4185d3..1dc717c 100644
--- a/dockerfiles/run/guice/memory/Dockerfile
+++ b/dockerfiles/run/guice/memory/Dockerfile
@@ -18,9 +18,11 @@ EXPOSE 25 110 143 465 587 993 4000 8000
 
 WORKDIR /root
 
+RUN apt-get update && apt-get install -y unzip
+
 # Get data we need to run James : build results and configuration
-ADD destination/james-server-memory-guice.jar /root/james-server.jar
-ADD destination/james-server-memory-guice.lib /root/james-server-memory-guice.lib
+ADD destination/james-server-memory-guice.zip /root
+RUN unzip james-server-memory-guice.zip && cp -r /root/james-server-memory-guice/* /root
 ADD destination/james-server-cli.jar /root/james-cli.jar
 ADD destination/james-server-cli.lib /root/james-server-cli.lib
 ADD destination/conf /root/conf
diff --git a/dockerfiles/run/guice/memory/destination/conf/deletedMessageVault.properties b/dockerfiles/run/guice/memory/destination/conf/deletedMessageVault.properties
deleted file mode 100644
index 7ac88e8..0000000
--- a/dockerfiles/run/guice/memory/destination/conf/deletedMessageVault.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-# ============================================= Deleted Messages Vault Configuration ==================================
-# Retention period for your deleted messages into the vault, after which they expire and can be potentially cleaned up
-# Optional, default 1y
-# retentionPeriod=1y
diff --git a/dockerfiles/run/guice/memory/destination/conf/dnsservice.xml b/dockerfiles/run/guice/memory/destination/conf/dnsservice.xml
deleted file mode 100644
index b44a502..0000000
--- a/dockerfiles/run/guice/memory/destination/conf/dnsservice.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.                                           
- -->
-<!-- Read https://james.apache.org/server/config-dnsservice.html for further details -->
-
-<dnsservice>
-  <autodiscover>true</autodiscover>
-  <authoritative>false</authoritative>
-  <maxcachesize>50000</maxcachesize>
-</dnsservice>
diff --git a/dockerfiles/run/guice/memory/destination/conf/domainlist.xml b/dockerfiles/run/guice/memory/destination/conf/domainlist.xml
deleted file mode 100644
index 605439f..0000000
--- a/dockerfiles/run/guice/memory/destination/conf/domainlist.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one   
-  or more contributor license agreements.  See the NOTICE file 
-  distributed with this work for additional information        
-  regarding copyright ownership.  The ASF licenses this file   
-  to you under the Apache License, Version 2.0 (the            
-  "License"); you may not use this file except in compliance   
-  with the License.  You may obtain a copy of the License at   
-                                                               
-    http://www.apache.org/licenses/LICENSE-2.0                 
-                                                               
-  Unless required by applicable law or agreed to in writing,   
-  software distributed under the License is distributed on an  
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       
-  KIND, either express or implied.  See the License for the    
-  specific language governing permissions and limitations      
-  under the License.                                           
- -->
-
-<!-- Read https://james.apache.org/server/config-domainlist.html for further details -->
-
-<domainlist>
-    <autodetect>false</autodetect>
-    <autodetectIP>false</autodetectIP>
-    <defaultDomain>localhost</defaultDomain>
-</domainlist>
diff --git a/dockerfiles/run/guice/memory/destination/conf/elasticsearch.properties b/dockerfiles/run/guice/memory/destination/conf/elasticsearch.properties
deleted file mode 100644
index 6ec2428..0000000
--- a/dockerfiles/run/guice/memory/destination/conf/elasticsearch.properties
+++ /dev/null
@@ -1,31 +0,0 @@
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-
-#  This template file can be used as example for James Server configuration
-#  DO NOT USE IT AS SUCH AND ADAPT IT TO YOUR NEEDS
-# Read https://james.apache.org/server/config-elasticsearch.html for further details (metrics only)
-
-
-# Configuration file for ElasticSearch
-
-# Reports for metrics into ElasticSearch
-# Defaults to elasticsearch.masterHost : on which server to publish metrics
-elasticsearch.http.host=elasticsearch
-elasticsearch.http.port=9200
-elasticsearch.metrics.reports.enabled=true
-elasticsearch.metrics.reports.period=30
-elasticsearch.metrics.reports.index=james-metrics
diff --git a/dockerfiles/run/guice/memory/destination/conf/extensions.properties b/dockerfiles/run/guice/memory/destination/conf/extensions.properties
deleted file mode 100644
index 2a2c23e..0000000
--- a/dockerfiles/run/guice/memory/destination/conf/extensions.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-# This files enables customization of users extensions injections with guice.
-# A user can drop some jar-with-dependencies within the ./extensions-jars folder and
-# reference classes of these jars in some of James extension mechanisms.
-
-# This includes mailets, matchers, mailboxListeners, preDeletionHooks, protocolHandlers, webAdmin routes
-
-# Upon injections, the user can reference additional guice modules, that are going to be used only upon extensions instantiation.
-
-#List of coma separated (',') fully qualified class names of additional guice modules to be used to instantiate extensions
-#guice.extension.module=
\ No newline at end of file
diff --git a/dockerfiles/run/guice/memory/destination/conf/healthcheck.properties b/dockerfiles/run/guice/memory/destination/conf/healthcheck.properties
deleted file mode 100644
index 9f3bad1..0000000
--- a/dockerfiles/run/guice/memory/destination/conf/healthcheck.properties
+++ /dev/null
@@ -1,30 +0,0 @@
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-
-#  This template file can be used as example for James Server configuration
-#  DO NOT USE IT AS SUCH AND ADAPT IT TO YOUR NEEDS
-
-# Configuration file for Periodical Health Checks
-
-# Read https://james.apache.org/server/config-healthcheck.html for further details
-
-# Optional. Period between two PeriodicalHealthChecks.
-# Units supported are (ms - millisecond, s - second, m - minute, h - hour, d - day). Default unit is millisecond.
-# Default duration is 60 seconds.
-# Duration must be greater or at least equals to 10 seconds.
-# healthcheck.period=60s
-
diff --git a/dockerfiles/run/guice/memory/destination/conf/imapserver.xml b/dockerfiles/run/guice/memory/destination/conf/imapserver.xml
deleted file mode 100644
index 72f1906..0000000
--- a/dockerfiles/run/guice/memory/destination/conf/imapserver.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<!-- Read https://james.apache.org/server/config-imap4.html for further details -->
-
-
-<imapservers>
-    <imapserver enabled="true">
-        <jmxName>imapserver</jmxName>
-        <bind>0.0.0.0:143</bind>
-        <connectionBacklog>200</connectionBacklog>
-        <tls socketTLS="false" startTLS="true">
-            <!-- To create a new keystore execute:
-            keytool -genkey -alias james -keyalg RSA -keystore /path/to/james/conf/keystore
-              -->
-            <keystore>file://conf/keystore</keystore>
-            <secret>james72laBalle</secret>
-            <provider>org.bouncycastle.jce.provider.BouncyCastleProvider</provider>
-        </tls>
-        <connectionLimit>0</connectionLimit>
-        <connectionLimitPerIP>0</connectionLimitPerIP>
-        <idleTimeInterval>120</idleTimeInterval>
-        <idleTimeIntervalUnit>SECONDS</idleTimeIntervalUnit>
-        <enableIdle>true</enableIdle>
-    </imapserver>
-    <imapserver enabled="true">
-        <jmxName>imapserver-ssl</jmxName>
-        <bind>0.0.0.0:993</bind>
-        <connectionBacklog>200</connectionBacklog>
-        <tls socketTLS="true" startTLS="false">
-            <!-- To create a new keystore execute:
-              keytool -genkey -alias james -keyalg RSA -keystore /path/to/james/conf/keystore
-             -->
-            <keystore>file://conf/keystore</keystore>
-            <secret>james72laBalle</secret>
-            <provider>org.bouncycastle.jce.provider.BouncyCastleProvider</provider>
-        </tls>
-        <connectionLimit>0</connectionLimit>
-        <connectionLimitPerIP>0</connectionLimitPerIP>
-        <idleTimeInterval>120</idleTimeInterval>
-        <idleTimeIntervalUnit>SECONDS</idleTimeIntervalUnit>
-        <enableIdle>true</enableIdle>
-    </imapserver>
-</imapservers>
diff --git a/dockerfiles/run/guice/memory/destination/conf/jmap.properties b/dockerfiles/run/guice/memory/destination/conf/jmap.properties
deleted file mode 100644
index 1980cfa..0000000
--- a/dockerfiles/run/guice/memory/destination/conf/jmap.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Configuration file for JMAP
-# Read https://james.apache.org/server/config-jmap.html for further details
-
-enabled=true
-
-tls.keystoreURL=file://conf/keystore
-tls.secret=james72laBalle
-
-#
-# If you wish to use OAuth authentication, you should provide a valid JWT public key.
-# The following entry specify the link to the URL of the public key file,
-# which should be a PEM format file.
-#
-jwt.publickeypem.url=file://conf/jwt_publickey
-
-# Should simple Email/query be resolved against a Cassandra projection, or should we resolve them against ElasticSearch?
-# This enables a higher resilience, but the projection needs to be correctly populated. False by default.
-# view.email.query.enabled=true
diff --git a/dockerfiles/run/guice/memory/destination/conf/jmx.properties b/dockerfiles/run/guice/memory/destination/conf/jmx.properties
deleted file mode 100644
index e56235f..0000000
--- a/dockerfiles/run/guice/memory/destination/conf/jmx.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#
-
-#  This template file can be used as example for James Server configuration
-#  DO NOT USE IT AS SUCH AND ADAPT IT TO YOUR NEEDS
-
-# Read https://james.apache.org/server/config-system.html#jmx.properties for further details
-
-jmx.enabled=true
-jmx.address=127.0.0.1
-jmx.port=9999
diff --git a/dockerfiles/run/guice/memory/destination/conf/jwt_publickey b/dockerfiles/run/guice/memory/destination/conf/jwt_publickey
deleted file mode 100644
index 53914e0..0000000
--- a/dockerfiles/run/guice/memory/destination/conf/jwt_publickey
+++ /dev/null
@@ -1,9 +0,0 @@
------BEGIN PUBLIC KEY-----
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtlChO/nlVP27MpdkG0Bh
-16XrMRf6M4NeyGa7j5+1UKm42IKUf3lM28oe82MqIIRyvskPc11NuzSor8HmvH8H
-lhDs5DyJtx2qp35AT0zCqfwlaDnlDc/QDlZv1CoRZGpQk1Inyh6SbZwYpxxwh0fi
-+d/4RpE3LBVo8wgOaXPylOlHxsDizfkL8QwXItyakBfMO6jWQRrj7/9WDhGf4Hi+
-GQur1tPGZDl9mvCoRHjFrD5M/yypIPlfMGWFVEvV5jClNMLAQ9bYFuOc7H1fEWw6
-U1LZUUbJW9/CH45YXz82CYqkrfbnQxqRb2iVbVjs/sHopHd1NTiCfUtwvcYJiBVj
-kwIDAQAB
------END PUBLIC KEY-----
diff --git a/dockerfiles/run/guice/memory/destination/conf/listeners.xml b/dockerfiles/run/guice/memory/destination/conf/listeners.xml
deleted file mode 100644
index 2eed880..0000000
--- a/dockerfiles/run/guice/memory/destination/conf/listeners.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one   
-  or more contributor license agreements.  See the NOTICE file 
-  distributed with this work for additional information        
-  regarding copyright ownership.  The ASF licenses this file   
-  to you under the Apache License, Version 2.0 (the            
-  "License"); you may not use this file except in compliance   
-  with the License.  You may obtain a copy of the License at   
-                                                               
-    http://www.apache.org/licenses/LICENSE-2.0                 
-                                                               
-  Unless required by applicable law or agreed to in writing,   
-  software distributed under the License is distributed on an  
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       
-  KIND, either express or implied.  See the License for the    
-  specific language governing permissions and limitations      
-  under the License.                                           
- -->
-
-<!-- Read https://james.apache.org/server/config-listeners.html for further details -->
-
-<listeners>
-  <listener>
-    <class>org.apache.james.mailbox.spamassassin.SpamAssassinListener</class>
-    <async>true</async>
-  </listener>
-  <preDeletionHook>
-    <class>org.apache.james.vault.DeletedMessageVaultHook</class>
-  </preDeletionHook>
-</listeners>
diff --git a/dockerfiles/run/guice/memory/destination/conf/logback.xml b/dockerfiles/run/guice/memory/destination/conf/logback.xml
deleted file mode 100644
index 65d59de..0000000
--- a/dockerfiles/run/guice/memory/destination/conf/logback.xml
+++ /dev/null
@@ -1,59 +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.                                           
- -->
-
-<configuration>
-
-        <contextListener class="ch.qos.logback.classic.jul.LevelChangePropagator">
-                <resetJUL>true</resetJUL>
-        </contextListener>
-
-        <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
-                <encoder>
-                        <pattern>%d{HH:mm:ss.SSS} %highlight([%-5level]) %logger{15} - %msg%n%rEx</pattern>
-                        <immediateFlush>false</immediateFlush>
-                </encoder>
-        </appender>
-
-        <appender name="LOG_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-                <file>/logs/james.log</file>
-                <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-                    <fileNamePattern>/logs/james.%i.log.tar.gz</fileNamePattern>
-                    <minIndex>1</minIndex>
-                    <maxIndex>3</maxIndex>
-                </rollingPolicy>
-
-                <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
-                    <maxFileSize>100MB</maxFileSize>
-                </triggeringPolicy>
-
-                <encoder>
-                        <pattern>%d{HH:mm:ss.SSS} [%-5level] %logger{15} - %msg%n%rEx</pattern>
-                        <immediateFlush>false</immediateFlush>
-                </encoder>
-        </appender>
-
-        <root level="WARN">
-                <appender-ref ref="CONSOLE" />
-                <appender-ref ref="LOG_FILE" />
-        </root>
-
-        <logger name="org.apache.james" level="INFO" />
-
-</configuration>
diff --git a/dockerfiles/run/guice/memory/destination/conf/mailetcontainer.xml b/dockerfiles/run/guice/memory/destination/conf/mailetcontainer.xml
deleted file mode 100644
index 2fb83fb..0000000
--- a/dockerfiles/run/guice/memory/destination/conf/mailetcontainer.xml
+++ /dev/null
@@ -1,156 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
- -->
-
-<!-- Read https://james.apache.org/server/config-mailetcontainer.html for further details -->
-
-<mailetcontainer enableJmx="true">
-
-    <context>
-        <!-- When the domain part of the postmaster mailAddress is missing, the default domain is appended.
-        You can configure it to (for example) <postmaster>postmaster@myDomain.com</postmaster> -->
-        <postmaster>postmaster</postmaster>
-    </context>
-
-    <spooler>
-        <threads>20</threads>
-        <errorRepository>memory://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>memory://var/mail/error/</repositoryPath>
-                <onMailetException>ignore</onMailetException>
-            </mailet>
-        </processor>
-
-        <processor state="transport" enableJmx="true">
-            <matcher name="relay-allowed" match="org.apache.james.mailetcontainer.impl.matchers.Or">
-                <matcher match="SMTPAuthSuccessful"/>
-                <matcher match="SMTPIsAuthNetwork"/>
-                <matcher match="SentByMailet"/>
-                <matcher match="org.apache.james.jmap.mailet.SentByJmap"/>
-            </matcher>
-
-            <mailet match="All" class="RemoveMimeHeader">
-                <name>bcc</name>
-                <onMailetException>ignore</onMailetException>
-            </mailet>
-            <mailet match="All" class="RecipientRewriteTable">
-                <errorProcessor>rrt-error</errorProcessor>
-            </mailet>
-            <mailet match="RecipientIsLocal" class="ToProcessor">
-                <processor>local-delivery</processor>
-            </mailet>
-            <mailet match="HostIsLocal" class="ToProcessor">
-                <processor>local-address-error</processor>
-                <notice>550 - Requested action not taken: no such user here</notice>
-            </mailet>
-            <mailet match="relay-allowed" class="ToProcessor">
-                <processor>relay</processor>
-            </mailet>
-            <mailet match="All" class="ToProcessor">
-                <processor>relay-denied</processor>
-            </mailet>
-        </processor>
-
-        <processor state="local-delivery" enableJmx="true">
-            <mailet match="All" class="org.apache.james.jmap.mailet.VacationMailet"/>
-            <mailet match="All" class="Sieve"/>
-            <mailet match="All" class="AddDeliveredToHeader"/>
-            <mailet match="All" class="org.apache.james.jmap.mailet.filter.JMAPFiltering"/>
-            <mailet match="All" class="LocalDelivery"/>
-        </processor>
-
-        <processor state="relay" enableJmx="true">
-            <mailet match="All" class="RemoteDelivery">
-                <outgoingQueue>outgoing</outgoingQueue>
-                <delayTime>5000, 100000, 500000</delayTime>
-                <maxRetries>3</maxRetries>
-                <maxDnsProblemRetries>0</maxDnsProblemRetries>
-                <deliveryThreads>10</deliveryThreads>
-                <sendpartial>true</sendpartial>
-                <bounceProcessor>bounces</bounceProcessor>
-            </mailet>
-        </processor>
-
-        <processor state="local-address-error" enableJmx="true">
-            <mailet match="All" class="MetricsMailet">
-                <metricName>mailetContainerLocalAddressError</metricName>
-            </mailet>
-            <mailet match="All" class="Bounce">
-                <attachment>none</attachment>
-            </mailet>
-            <mailet match="All" class="ToRepository">
-                <repositoryPath>memory://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>memory://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>memory://var/mail/rrt-error/</repositoryPath>
-                <passThrough>true</passThrough>
-            </mailet>
-            <mailet match="IsSenderInRRTLoop" class="Null"/>
-            <mailet match="All" class="Bounce"/>
-        </processor>
-
-    </processors>
-
-</mailetcontainer>
-
-
diff --git a/dockerfiles/run/guice/memory/destination/conf/mailrepositorystore.xml b/dockerfiles/run/guice/memory/destination/conf/mailrepositorystore.xml
deleted file mode 100644
index c7f22b9..0000000
--- a/dockerfiles/run/guice/memory/destination/conf/mailrepositorystore.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
- -->
-
-<!-- Read https://james.apache.org/server/config-mailrepositorystore.html for further details -->
-
-<mailrepositorystore>
-    <defaultProtocol>memory</defaultProtocol>
-    <mailrepositories>
-        <mailrepository class="org.apache.james.mailrepository.memory.MemoryMailRepository">
-            <protocols>
-                <protocol>memory</protocol>
-            </protocols>
-        </mailrepository>
-    </mailrepositories>
-</mailrepositorystore>
diff --git a/dockerfiles/run/guice/memory/destination/conf/managesieveserver.xml b/dockerfiles/run/guice/memory/destination/conf/managesieveserver.xml
deleted file mode 100644
index 7b0b85a..0000000
--- a/dockerfiles/run/guice/memory/destination/conf/managesieveserver.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one   
-  or more contributor license agreements.  See the NOTICE file 
-  distributed with this work for additional information        
-  regarding copyright ownership.  The ASF licenses this file   
-  to you under the Apache License, Version 2.0 (the            
-  "License"); you may not use this file except in compliance   
-  with the License.  You may obtain a copy of the License at   
-                                                               
-    http://www.apache.org/licenses/LICENSE-2.0                 
-                                                               
-  Unless required by applicable law or agreed to in writing,   
-  software distributed under the License is distributed on an  
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       
-  KIND, either express or implied.  See the License for the    
-  specific language governing permissions and limitations      
-  under the License.                                           
- -->
- 
-<!--
-   This template file can be used as example for James Server configuration
-   DO NOT USE IT AS SUCH AND ADAPT IT TO YOUR NEEDS
--->
- 
-<!-- See http://james.apache.org/server/3/config.html for usage -->
-
-<managesieveservers>
-
-   <managesieveserver enabled="false">
-
-     <jmxName>managesieveserver</jmxName>
-
-     <bind>0.0.0.0:4190</bind>
-
-     <connectionBacklog>200</connectionBacklog>
-
-     <tls socketTLS="false" startTLS="false">
-       <!-- To create a new keystore execute:
-        keytool -genkey -alias james -keyalg RSA -keystore /path/to/james/conf/keystore
-         -->
-       <keystore>file://conf/keystore</keystore>
-       <secret>james72laBalle</secret>
-       <provider>org.bouncycastle.jce.provider.BouncyCastleProvider</provider>
-       <!-- The algorithm is optional and only needs to be specified when using something other
-        than the Sun JCE provider - You could use IbmX509 with IBM Java runtime. -->
-       <algorithm>SunX509</algorithm>
-     </tls>
-         
-        <!-- connection timeout in secconds -->
-        <connectiontimeout>360</connectiontimeout>
-
-        <!-- Set the maximum simultaneous incoming connections for this service -->
-        <connectionLimit>0</connectionLimit>
-         
-        <!-- Set the maximum simultaneous incoming connections per IP for this service -->
-        <connectionLimitPerIP>0</connectionLimitPerIP>
-        <maxmessagesize>0</maxmessagesize>
-        <addressBracketsEnforcement>true</addressBracketsEnforcement>
-  
-   </managesieveserver>
-
-</managesieveservers>
-
-
diff --git a/dockerfiles/run/guice/memory/destination/conf/pop3server.xml b/dockerfiles/run/guice/memory/destination/conf/pop3server.xml
deleted file mode 100644
index 10a2e08..0000000
--- a/dockerfiles/run/guice/memory/destination/conf/pop3server.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one   
-  or more contributor license agreements.  See the NOTICE file 
-  distributed with this work for additional information        
-  regarding copyright ownership.  The ASF licenses this file   
-  to you under the Apache License, Version 2.0 (the            
-  "License"); you may not use this file except in compliance   
-  with the License.  You may obtain a copy of the License at   
-                                                               
-    http://www.apache.org/licenses/LICENSE-2.0                 
-                                                               
-  Unless required by applicable law or agreed to in writing,   
-  software distributed under the License is distributed on an  
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       
-  KIND, either express or implied.  See the License for the    
-  specific language governing permissions and limitations      
-  under the License.                                           
- -->
-
-<!-- Read https://james.apache.org/server/config-pop3.html for further details -->
-
-<pop3servers>
-    <pop3server enabled="false">
-        <jmxName>pop3server</jmxName>
-        <bind>0.0.0.0:110</bind>
-        <connectionBacklog>200</connectionBacklog>
-        <tls socketTLS="false" startTLS="false">
-            <!-- To create a new keystore execute:
-                  keytool -genkey -alias james -keyalg RSA -keystore /path/to/james/conf/keystore
-             -->
-            <keystore>file://conf/keystore</keystore>
-            <secret>james72laBalle</secret>
-            <provider>org.bouncycastle.jce.provider.BouncyCastleProvider</provider>
-        </tls>
-        <connectiontimeout>1200</connectiontimeout>
-        <connectionLimit>0</connectionLimit>
-        <connectionLimitPerIP>0</connectionLimitPerIP>
-        <handlerchain>
-            <handler class="org.apache.james.pop3server.core.CoreCmdHandlerLoader"/>
-        </handlerchain>
-    </pop3server>
-</pop3servers>
diff --git a/dockerfiles/run/guice/memory/destination/conf/recipientrewritetable.xml b/dockerfiles/run/guice/memory/destination/conf/recipientrewritetable.xml
deleted file mode 100644
index 1a512c6..0000000
--- a/dockerfiles/run/guice/memory/destination/conf/recipientrewritetable.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one   
-  or more contributor license agreements.  See the NOTICE file 
-  distributed with this work for additional information        
-  regarding copyright ownership.  The ASF licenses this file   
-  to you under the Apache License, Version 2.0 (the            
-  "License"); you may not use this file except in compliance   
-  with the License.  You may obtain a copy of the License at   
-                                                               
-    http://www.apache.org/licenses/LICENSE-2.0                 
-                                                               
-  Unless required by applicable law or agreed to in writing,   
-  software distributed under the License is distributed on an  
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       
-  KIND, either express or implied.  See the License for the    
-  specific language governing permissions and limitations      
-  under the License.                                           
- -->
-
-<!-- Read https://james.apache.org/server/config-recipientrewritetable.html for further details -->
-
-<!-- The default table for storing James' RecipientRewriteTable mappings. -->
-<recipientrewritetable>
-  <recursiveMapping>true</recursiveMapping>
-  <mappingLimit>10</mappingLimit>
-</recipientrewritetable>
-
diff --git a/dockerfiles/run/guice/memory/destination/conf/smtpserver.xml b/dockerfiles/run/guice/memory/destination/conf/smtpserver.xml
deleted file mode 100644
index 722b0c2..0000000
--- a/dockerfiles/run/guice/memory/destination/conf/smtpserver.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
- -->
-
-<!-- Read https://james.apache.org/server/config-smtp-lmtp.html#SMTP_Configuration for further details -->
-
-<smtpservers>
-    <smtpserver enabled="true">
-        <jmxName>smtpserver-global</jmxName>
-        <bind>0.0.0.0:25</bind>
-        <connectionBacklog>200</connectionBacklog>
-        <tls socketTLS="false" startTLS="false">
-            <keystore>file://conf/keystore</keystore>
-            <secret>james72laBalle</secret>
-            <provider>org.bouncycastle.jce.provider.BouncyCastleProvider</provider>
-            <algorithm>SunX509</algorithm>
-        </tls>
-        <connectiontimeout>360</connectiontimeout>
-        <connectionLimit>0</connectionLimit>
-        <connectionLimitPerIP>0</connectionLimitPerIP>
-        <authRequired>false</authRequired>
-        <authorizedAddresses>127.0.0.0/8</authorizedAddresses>
-        <verifyIdentity>true</verifyIdentity>
-        <maxmessagesize>0</maxmessagesize>
-        <addressBracketsEnforcement>true</addressBracketsEnforcement>
-        <smtpGreeting>Apache JAMES awesome SMTP Server</smtpGreeting>
-        <handlerchain>
-            <handler class="org.apache.james.smtpserver.fastfail.ValidRcptHandler"/>
-            <handler class="org.apache.james.smtpserver.CoreCmdHandlerLoader"/>
-        </handlerchain>
-    </smtpserver>
-    <smtpserver enabled="true">
-        <jmxName>smtpserver-TLS</jmxName>
-        <bind>0.0.0.0:465</bind>
-        <connectionBacklog>200</connectionBacklog>
-        <tls socketTLS="true" startTLS="false">
-            <keystore>file://conf/keystore</keystore>
-            <secret>james72laBalle</secret>
-            <provider>org.bouncycastle.jce.provider.BouncyCastleProvider</provider>
-            <algorithm>SunX509</algorithm>
-        </tls>
-        <connectiontimeout>360</connectiontimeout>
-        <connectionLimit>0</connectionLimit>
-        <connectionLimitPerIP>0</connectionLimitPerIP>
-        <!--
-           Authorize only local users
-        -->
-        <authRequired>true</authRequired>
-        <authorizedAddresses>127.0.0.0/8</authorizedAddresses>
-        <!-- Trust authenticated users -->
-        <verifyIdentity>false</verifyIdentity>
-        <maxmessagesize>0</maxmessagesize>
-        <addressBracketsEnforcement>true</addressBracketsEnforcement>
-        <smtpGreeting>Apache JAMES awesome SMTP Server</smtpGreeting>
-        <handlerchain>
-            <handler class="org.apache.james.smtpserver.fastfail.ValidRcptHandler"/>
-            <handler class="org.apache.james.smtpserver.CoreCmdHandlerLoader"/>
-        </handlerchain>
-    </smtpserver>
-    <smtpserver enabled="true">
-        <jmxName>smtpserver-authenticated</jmxName>
-        <bind>0.0.0.0:587</bind>
-        <connectionBacklog>200</connectionBacklog>
-        <tls socketTLS="false" startTLS="true">
-            <keystore>file://conf/keystore</keystore>
-            <secret>james72laBalle</secret>
-            <provider>org.bouncycastle.jce.provider.BouncyCastleProvider</provider>
-            <algorithm>SunX509</algorithm>
-        </tls>
-        <connectiontimeout>360</connectiontimeout>
-        <connectionLimit>0</connectionLimit>
-        <connectionLimitPerIP>0</connectionLimitPerIP>
-        <!--
-           Authorize only local users
-        -->
-        <authRequired>true</authRequired>
-        <authorizedAddresses>127.0.0.0/8</authorizedAddresses>
-        <!-- Trust authenticated users -->
-        <verifyIdentity>false</verifyIdentity>
-        <maxmessagesize>0</maxmessagesize>
-        <addressBracketsEnforcement>true</addressBracketsEnforcement>
-        <smtpGreeting>Apache JAMES awesome SMTP Server</smtpGreeting>
-        <handlerchain>
-            <handler class="org.apache.james.smtpserver.fastfail.ValidRcptHandler"/>
-            <handler class="org.apache.james.smtpserver.CoreCmdHandlerLoader"/>
-        </handlerchain>
-    </smtpserver>
-</smtpservers>
-
-
diff --git a/dockerfiles/run/guice/memory/destination/conf/usersrepository.xml b/dockerfiles/run/guice/memory/destination/conf/usersrepository.xml
deleted file mode 100644
index 3a540c4..0000000
--- a/dockerfiles/run/guice/memory/destination/conf/usersrepository.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one   
-  or more contributor license agreements.  See the NOTICE file 
-  distributed with this work for additional information        
-  regarding copyright ownership.  The ASF licenses this file   
-  to you under the Apache License, Version 2.0 (the            
-  "License"); you may not use this file except in compliance   
-  with the License.  You may obtain a copy of the License at   
-                                                               
-    http://www.apache.org/licenses/LICENSE-2.0                 
-                                                               
-  Unless required by applicable law or agreed to in writing,   
-  software distributed under the License is distributed on an  
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       
-  KIND, either express or implied.  See the License for the    
-  specific language governing permissions and limitations      
-  under the License.                                           
- -->
-
-<!-- Read https://james.apache.org/server/config-users.html for further details -->
-
-<usersrepository name="LocalUsers">
-    <algorithm>SHA-512</algorithm>
-    <enableVirtualHosting>true</enableVirtualHosting>    
-    <enableForwarding>true</enableForwarding>
-</usersrepository>
-
diff --git a/dockerfiles/run/guice/memory/destination/conf/webadmin.properties b/dockerfiles/run/guice/memory/destination/conf/webadmin.properties
deleted file mode 100644
index 340315e..0000000
--- a/dockerfiles/run/guice/memory/destination/conf/webadmin.properties
+++ /dev/null
@@ -1,55 +0,0 @@
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-
-#  This template file can be used as example for James Server configuration
-#  DO NOT USE IT AS SUCH AND ADAPT IT TO YOUR NEEDS
-
-# Read https://james.apache.org/server/config-webadmin.html for further details
-
-enabled=true
-port=8000
-host=localhost
-
-# Defaults to false
-https.enabled=false
-
-# Compulsory when enabling HTTPS
-#https.keystore=/path/to/keystore
-#https.password=password
-
-# Optional when enabling HTTPS (self signed)
-#https.trust.keystore
-#https.trust.password
-
-# Defaults to false
-#jwt.enabled=true
-#
-## If you wish to use OAuth authentication, you should provide a valid JWT public key.
-## The following entry specify the link to the URL of the public key file,
-## which should be a PEM format file.
-##
-#jwt.publickeypem.url=file://conf/jwt_publickey
-
-# Defaults to false
-#cors.enable=true
-#cors.origin
-
-
-# List of fully qualified class names that should be exposed over webadmin
-# in addition to your product default routes. Routes needs to be located
-# within the classpath or in the ./extensions-jars folder.
-#extensions.routes=
\ No newline at end of file
diff --git a/dockerfiles/run/guice/memory/destination/extensions-jars/README.md b/dockerfiles/run/guice/memory/destination/extensions-jars/README.md
deleted file mode 100644
index 2cea759..0000000
--- a/dockerfiles/run/guice/memory/destination/extensions-jars/README.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# Adding Jars to JAMES
-
-The jar in this folder will be added to JAMES classpath when mounted under /root/extensions-jars inside the running container.
-
-You can use it to add you customs Mailets/Matchers.
diff --git a/dockerfiles/run/guice/memory/destination/run_james.sh b/dockerfiles/run/guice/memory/destination/run_james.sh
index 02f2bf6..8038c57 100755
--- a/dockerfiles/run/guice/memory/destination/run_james.sh
+++ b/dockerfiles/run/guice/memory/destination/run_james.sh
@@ -2,4 +2,4 @@
 if [ "$GLOWROOT_ACTIVATED" == "true" ]; then
     GLOWROOT_OPTIONS=-javaagent:/root/glowroot/glowroot.jar
 fi
-java -Dlogback.configurationFile=/root/conf/logback.xml -Dworking.directory=/root/ $JVM_OPTIONS $GLOWROOT_OPTIONS -jar james-server.jar
\ No newline at end of file
+java -Dlogback.configurationFile=/root/conf/logback.xml -Dworking.directory=/root/ $JVM_OPTIONS $GLOWROOT_OPTIONS -jar james-server-memory-guice.jar
\ No newline at end of file
diff --git a/server/container/guice/memory-guice/sample-configuration/imapserver.xml b/server/container/guice/memory-guice/sample-configuration/imapserver.xml
index a1306fa..72f1906 100644
--- a/server/container/guice/memory-guice/sample-configuration/imapserver.xml
+++ b/server/container/guice/memory-guice/sample-configuration/imapserver.xml
@@ -39,7 +39,6 @@ under the License.
         <connectionLimitPerIP>0</connectionLimitPerIP>
         <idleTimeInterval>120</idleTimeInterval>
         <idleTimeIntervalUnit>SECONDS</idleTimeIntervalUnit>
-        <disabledCaps>ACL|MOVE</disabledCaps>
         <enableIdle>true</enableIdle>
     </imapserver>
     <imapserver enabled="true">
@@ -58,7 +57,6 @@ under the License.
         <connectionLimitPerIP>0</connectionLimitPerIP>
         <idleTimeInterval>120</idleTimeInterval>
         <idleTimeIntervalUnit>SECONDS</idleTimeIntervalUnit>
-        <disabledCaps>ACL|MOVE</disabledCaps>
         <enableIdle>true</enableIdle>
     </imapserver>
 </imapservers>
diff --git a/server/container/guice/memory-guice/sample-configuration/jmap.properties b/server/container/guice/memory-guice/sample-configuration/jmap.properties
index 53bc403..1980cfa 100644
--- a/server/container/guice/memory-guice/sample-configuration/jmap.properties
+++ b/server/container/guice/memory-guice/sample-configuration/jmap.properties
@@ -12,3 +12,7 @@ tls.secret=james72laBalle
 # which should be a PEM format file.
 #
 jwt.publickeypem.url=file://conf/jwt_publickey
+
+# Should simple Email/query be resolved against a Cassandra projection, or should we resolve them against ElasticSearch?
+# This enables a higher resilience, but the projection needs to be correctly populated. False by default.
+# view.email.query.enabled=true
diff --git a/server/container/guice/memory-guice/sample-configuration/mailetcontainer.xml b/server/container/guice/memory-guice/sample-configuration/mailetcontainer.xml
index 918e70c..2fb83fb 100644
--- a/server/container/guice/memory-guice/sample-configuration/mailetcontainer.xml
+++ b/server/container/guice/memory-guice/sample-configuration/mailetcontainer.xml
@@ -26,7 +26,7 @@
     <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@localhost</postmaster>
+        <postmaster>postmaster</postmaster>
     </context>
 
     <spooler>
@@ -47,9 +47,12 @@
             <mailet match="All" class="MetricsMailet">
                 <metricName>mailetContainerErrors</metricName>
             </mailet>
-            <mailet match="All" class="Bounce"/>
+            <mailet match="All" class="Bounce">
+                <onMailetException>ignore</onMailetException>
+            </mailet>
             <mailet match="All" class="ToRepository">
                 <repositoryPath>memory://var/mail/error/</repositoryPath>
+                <onMailetException>ignore</onMailetException>
             </mailet>
         </processor>
 
@@ -68,25 +71,29 @@
             <mailet match="All" class="RecipientRewriteTable">
                 <errorProcessor>rrt-error</errorProcessor>
             </mailet>
-            <mailet match="RecipientIsLocal" class="org.apache.james.jmap.mailet.VacationMailet"/>
-            <mailet match="RecipientIsLocal" class="Sieve"/>
-            <mailet match="RecipientIsLocal" class="AddDeliveredToHeader"/>
-            <mailet match="RecipientIsLocal" class="org.apache.james.jmap.mailet.filter.JMAPFiltering"/>
-            <mailet match="RecipientIsLocal" class="LocalDelivery"/>
+            <mailet match="RecipientIsLocal" class="ToProcessor">
+                <processor>local-delivery</processor>
+            </mailet>
             <mailet match="HostIsLocal" class="ToProcessor">
                 <processor>local-address-error</processor>
                 <notice>550 - Requested action not taken: no such user here</notice>
             </mailet>
-
             <mailet match="relay-allowed" class="ToProcessor">
                 <processor>relay</processor>
             </mailet>
-
             <mailet match="All" class="ToProcessor">
                 <processor>relay-denied</processor>
             </mailet>
         </processor>
 
+        <processor state="local-delivery" enableJmx="true">
+            <mailet match="All" class="org.apache.james.jmap.mailet.VacationMailet"/>
+            <mailet match="All" class="Sieve"/>
+            <mailet match="All" class="AddDeliveredToHeader"/>
+            <mailet match="All" class="org.apache.james.jmap.mailet.filter.JMAPFiltering"/>
+            <mailet match="All" class="LocalDelivery"/>
+        </processor>
+
         <processor state="relay" enableJmx="true">
             <mailet match="All" class="RemoteDelivery">
                 <outgoingQueue>outgoing</outgoingQueue>
diff --git a/server/container/guice/memory-guice/sample-configuration/usersrepository.xml b/server/container/guice/memory-guice/sample-configuration/usersrepository.xml
index 8b3e8e1..3a540c4 100644
--- a/server/container/guice/memory-guice/sample-configuration/usersrepository.xml
+++ b/server/container/guice/memory-guice/sample-configuration/usersrepository.xml
@@ -21,7 +21,7 @@
 <!-- Read https://james.apache.org/server/config-users.html for further details -->
 
 <usersrepository name="LocalUsers">
-    <algorithm>MD5</algorithm>
+    <algorithm>SHA-512</algorithm>
     <enableVirtualHosting>true</enableVirtualHosting>    
     <enableForwarding>true</enableForwarding>
 </usersrepository>
diff --git a/server/container/guice/memory-guice/sample-configuration/webadmin.properties b/server/container/guice/memory-guice/sample-configuration/webadmin.properties
index 52cfffd..340315e 100644
--- a/server/container/guice/memory-guice/sample-configuration/webadmin.properties
+++ b/server/container/guice/memory-guice/sample-configuration/webadmin.properties
@@ -37,6 +37,12 @@ https.enabled=false
 
 # Defaults to false
 #jwt.enabled=true
+#
+## If you wish to use OAuth authentication, you should provide a valid JWT public key.
+## The following entry specify the link to the URL of the public key file,
+## which should be a PEM format file.
+##
+#jwt.publickeypem.url=file://conf/jwt_publickey
 
 # Defaults to false
 #cors.enable=true

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


[james-project] 02/03: JAMES-3261 Build a ZIP distribution for Guice memory

Posted by bt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

btellier pushed a commit to branch 3.6.x
in repository https://gitbox.apache.org/repos/asf/james-project.git

commit 8a92ecd90131a763305971bbef054563bc443cb7
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Sun Jun 21 21:33:01 2020 +0700

    JAMES-3261 Build a ZIP distribution for Guice memory
---
 server/container/guice/memory-guice/README.adoc    |   31 +-
 server/container/guice/memory-guice/pom.xml        |   18 +
 .../guice/memory-guice/src/assemble/app.xml        |   86 ++
 .../memory-guice/src/assemble/extensions-jars.txt  |    5 +
 .../src/assemble/license-for-binary.txt            | 1139 ++++++++++++++++++++
 5 files changed, 1256 insertions(+), 23 deletions(-)

diff --git a/server/container/guice/memory-guice/README.adoc b/server/container/guice/memory-guice/README.adoc
index 61dbfc4..16a6c12 100644
--- a/server/container/guice/memory-guice/README.adoc
+++ b/server/container/guice/memory-guice/README.adoc
@@ -1,37 +1,20 @@
 = Guice-Memory Module How-to
 
-== Building
-
-=== Requirements
+== Requirements
 
  * Java 11 SDK
- * Docker
  * Maven 3
 
-=== Building the artifacts
-
-An usual compilation using maven will produce two artifacts into target directory:
-
- * james-server-memory-guice-${version}.jar
- * james-server-memory-guice-${version}.lib
-
- You can for example run in the base of this git repository:
-
- ```
- mvn clean install
- ```
-
 == Running
 
-=== James Launch
-
 To run james, you have to create a directory containing required configuration files.
 
-James requires the configuration to be in a subfolder of working directory that is called **conf**. A sample directory
-(appropriately named sample-directory) is provided with some default values you may need to replace. You will need to
-rename it into **conf** if you intend to use it.
+James requires the configuration to be in a subfolder of working directory that is called
+**conf**. A sample directory is provided with some default values you may need to replace.
+You will need to update its content to match your needs.
 
 You also need to generate a keystore with the following command:
+
 [source]
 ----
 $ keytool -genkey -alias james -keyalg RSA -keystore conf/keystore
@@ -41,5 +24,7 @@ Once everything is set up, you just have to run the jar with:
 
 [source]
 ----
-$ java -Dworking.directory=. -jar target/james-server-memory-guice-${version}.jar
+$ java -Dworking.directory=. -jar james-server-memory-guice.jar
 ----
+
+Note that binding ports below 1024 requires administrative rights.
\ No newline at end of file
diff --git a/server/container/guice/memory-guice/pom.xml b/server/container/guice/memory-guice/pom.xml
index bcd9e55..04623ee 100644
--- a/server/container/guice/memory-guice/pom.xml
+++ b/server/container/guice/memory-guice/pom.xml
@@ -288,6 +288,24 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <configuration>
+                    <descriptorSourceDirectory>src/assemble/</descriptorSourceDirectory>
+                    <tarLongFileMode>gnu</tarLongFileMode>
+                    <appendAssemblyId>false</appendAssemblyId>
+                    <finalName>james-server-memory-guice</finalName>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>make-assembly</id>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                        <phase>package</phase>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 
diff --git a/server/container/guice/memory-guice/src/assemble/app.xml b/server/container/guice/memory-guice/src/assemble/app.xml
new file mode 100644
index 0000000..2efbfdf
--- /dev/null
+++ b/server/container/guice/memory-guice/src/assemble/app.xml
@@ -0,0 +1,86 @@
+<?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.
+-->
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+    <id>app</id>
+
+    <formats>
+        <format>zip</format>
+    </formats>
+
+    <fileSets>
+        <!-- include README -->
+        <fileSet>
+            <directory>.</directory>
+            <directoryMode>0755</directoryMode>
+            <outputDirectory>/</outputDirectory>
+            <includes>
+                <include>README*</include>
+            </includes>
+        </fileSet>
+        <!-- include configs -->
+        <fileSet>
+            <directory>sample-configuration</directory>
+            <directoryMode>0755</directoryMode>
+            <outputDirectory>conf</outputDirectory>
+            <!-- set some sane security defaults for config files -->
+            <fileMode>0600</fileMode>
+        </fileSet>
+        <!-- include stuff from jar plugin -->
+        <fileSet>
+            <directory>target/james-server-memory-guice.lib</directory>
+            <outputDirectory>/james-server-memory-guice.lib</outputDirectory>
+            <directoryMode>0755</directoryMode>
+            <fileMode>0600</fileMode>
+            <includes>
+                <include>*.jar</include>
+            </includes>
+        </fileSet>
+    </fileSets>
+    <files>
+        <file>
+            <source>src/assemble/license-for-binary.txt</source>
+            <outputDirectory>/</outputDirectory>
+            <fileMode>0644</fileMode>
+            <destName>LICENSE</destName>
+            <lineEnding>crlf</lineEnding>
+        </file>
+        <file>
+            <source>README.adoc</source>
+            <outputDirectory>/</outputDirectory>
+            <fileMode>0644</fileMode>
+            <lineEnding>crlf</lineEnding>
+        </file>
+        <file>
+            <source>src/assemble/extensions-jars.txt</source>
+            <outputDirectory>/extensions-jars</outputDirectory>
+            <fileMode>0644</fileMode>
+            <lineEnding>crlf</lineEnding>
+            <destName>README.md</destName>
+        </file>
+        <file>
+            <source>target/james-server-memory-guice.jar</source>
+            <outputDirectory>/</outputDirectory>
+            <fileMode>0755</fileMode>
+            <destName>james-server-memory-guice.jar</destName>
+        </file>
+    </files>
+</assembly>
diff --git a/server/container/guice/memory-guice/src/assemble/extensions-jars.txt b/server/container/guice/memory-guice/src/assemble/extensions-jars.txt
new file mode 100644
index 0000000..2cea759
--- /dev/null
+++ b/server/container/guice/memory-guice/src/assemble/extensions-jars.txt
@@ -0,0 +1,5 @@
+# Adding Jars to JAMES
+
+The jar in this folder will be added to JAMES classpath when mounted under /root/extensions-jars inside the running container.
+
+You can use it to add you customs Mailets/Matchers.
diff --git a/server/container/guice/memory-guice/src/assemble/license-for-binary.txt b/server/container/guice/memory-guice/src/assemble/license-for-binary.txt
new file mode 100644
index 0000000..682a01f
--- /dev/null
+++ b/server/container/guice/memory-guice/src/assemble/license-for-binary.txt
@@ -0,0 +1,1139 @@
+
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+
+This distribution contains third party resources.
+Within the bin directory
+    licensed under the Tanuki Software License (as follows)
+ 
+            
+              Copyright (c) 1999, 2006 Tanuki Software, Inc.
+            
+              Permission is hereby granted, free of charge, to any person
+              obtaining a copy of the Java Service Wrapper and associated
+              documentation files (the "Software"), to deal in the Software
+              without  restriction, including without limitation the rights
+              to use, copy, modify, merge, publish, distribute, sub-license,
+              and/or sell copies of the Software, and to permit persons to
+              whom the Software is furnished to do so, subject to the
+              following conditions:
+            
+              The above copyright notice and this permission notice shall be
+              included in all copies or substantial portions of the Software.
+            
+              THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 
+              EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES 
+              OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 
+              NON-INFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT 
+              HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, 
+              WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
+              FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+              OTHER DEALINGS IN THE SOFTWARE.
+            
+            
+              Portions of the Software have been derived from source code
+              developed by Silver Egg Technology under the following license:
+                
+                Copyright (c) 2001 Silver Egg Technology
+                
+                Permission is hereby granted, free of charge, to any person
+                obtaining a copy of this software and associated documentation
+                files (the "Software"), to deal in the Software without 
+                restriction, including without limitation the rights to use, 
+                copy, modify, merge, publish, distribute, sub-license, and/or 
+                sell copies of the Software, and to permit persons to whom the
+                Software is furnished to do so, subject to the following 
+                conditions:
+                
+                The above copyright notice and this permission notice shall be
+                included in all copies or substantial portions of the Software.
+                
+                THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 
+                EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES 
+                OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 
+                NON-INFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT 
+                HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, 
+                WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
+                FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+                OTHER DEALINGS IN THE SOFTWARE.
+                        
+        from Tanuki Software  http://www.tanukisoftware.com/ 
+            james
+            james.bat
+            wrapper
+            wrapper-linux-ppc-64
+            wrapper-linux-x86-32
+            wrapper-linux-x86-64
+            wrapper-macosx-ppc-32
+            wrapper-macosx-universal-32
+            wrapper-solaris-sparc-32
+            wrapper-solaris-sparc-64
+            wrapper-solaris-x86-32
+            wrapper-windows-x86-32.exe
+
+Within the conf directory
+    licensed under the Tanuki Software License (as follows)
+ 
+            
+              Copyright (c) 1999, 2006 Tanuki Software, Inc.
+            
+              Permission is hereby granted, free of charge, to any person
+              obtaining a copy of the Java Service Wrapper and associated
+              documentation files (the "Software"), to deal in the Software
+              without  restriction, including without limitation the rights
+              to use, copy, modify, merge, publish, distribute, sub-license,
+              and/or sell copies of the Software, and to permit persons to
+              whom the Software is furnished to do so, subject to the
+              following conditions:
+            
+              The above copyright notice and this permission notice shall be
+              included in all copies or substantial portions of the Software.
+            
+              THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 
+              EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES 
+              OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 
+              NON-INFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT 
+              HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, 
+              WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
+              FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+              OTHER DEALINGS IN THE SOFTWARE.
+            
+            
+              Portions of the Software have been derived from source code
+              developed by Silver Egg Technology under the following license:
+                
+                Copyright (c) 2001 Silver Egg Technology
+                
+                Permission is hereby granted, free of charge, to any person
+                obtaining a copy of this software and associated documentation
+                files (the "Software"), to deal in the Software without 
+                restriction, including without limitation the rights to use, 
+                copy, modify, merge, publish, distribute, sub-license, and/or 
+                sell copies of the Software, and to permit persons to whom the
+                Software is furnished to do so, subject to the following 
+                conditions:
+                
+                The above copyright notice and this permission notice shall be
+                included in all copies or substantial portions of the Software.
+                
+                THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 
+                EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES 
+                OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 
+                NON-INFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT 
+                HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, 
+                WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
+                FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+                OTHER DEALINGS IN THE SOFTWARE.
+                        
+        from Tanuki Software  http://www.tanukisoftware.com/ 
+            wrapper.conf
+
+Within the lib directory
+    placed in the public domain
+        by Doug Lea 
+            concurrent-1.3.4.jar
+        by Drew Noakes 
+            metadata-extractor-2.4.0-beta-1.jar
+        by The AOP Alliance  http://aopalliance.sourceforge.net/ 
+            aopalliance-1.0.jar
+
+    licensed under the Apache License, Version 2 http://www.apache.org/licenses/LICENSE-2.0.txt  (as above)
+        from Boilerpipe  http://code.google.com/p/boilerpipe/ 
+            boilerpipe-1.1.0.jar
+        from FuseSource  http://www.fusesource.org 
+            commons-management-1.0.jar
+        from JBoss, a division of Red Hat, Inc.  http://www.jboss.org 
+            netty-3.2.4.Final.jar
+        from John Cowan  http://home.ccil.org/~cowan/XML/tagsoup/ 
+            tagsoup-1.2.jar
+        from Oracle  http://www.oracle.com 
+            rome-0.9.jar
+        from The JASYPT team  http://www.jasypt.org 
+            jasypt-1.6.jar
+        from The Spring Framework Project  http://www.springframework.org 
+            spring-aop-3.1.RELEASE.jar
+            spring-asm-3.1.RELEASE.jar
+            spring-beans-3.1.RELEASE.jar
+            spring-context-3.1.RELEASE.jar
+            spring-core-3.1.RELEASE.jar
+            spring-expression-3.1.RELEASE.jar
+            spring-jdbc-3.1.RELEASE.jar
+            spring-jms-3.1.RELEASE.jar
+            spring-orm-3.1.RELEASE.jar
+            spring-tx-3.1.RELEASE.jar
+            spring-web-3.1.RELEASE.jar
+
+    licensed under the BSD (3-clause) http://www.opensource.org/licenses/BSD-3-Clause  (as follows)
+
+            ASM: a very small and fast Java bytecode manipulation framework
+            Copyright (c) 2000-2007 INRIA, France Telecom
+            All rights reserved. 
+            
+              Redistribution and use in source and binary forms, with or without
+              modification, are permitted provided that the following conditions
+              are met:
+              1. Redistributions of source code must retain the above copyright
+                 notice, this list of conditions and the following disclaimer.
+              2. Redistributions in binary form must reproduce the above copyright
+                 notice, this list of conditions and the following disclaimer in the
+                 documentation and/or other materials provided with the distribution.
+              3. Neither the name of the copyright holders nor the names of its
+                 contributors may be used to endorse or promote products derived from
+                 this software without specific prior written permission.
+             
+              THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+              AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+              IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+              ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+              LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+              CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+              SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+              INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+              CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+              ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+              THE POSSIBILITY OF SUCH DAMAGE.
+                            
+        from OW2  http://www.ow2.org/ 
+            asm-3.1.jar
+
+    licensed under the BSD (2-clause) http://www.opensource.org/licenses/BSD-2-Clause  (as follows)
+
+            dnsjava is placed under the BSD license.  Several files are also under
+            additional licenses; see the individual files for details.
+            
+            Copyright (c) 1998-2011, Brian Wellington.
+            All rights reserved.
+
+            Redistribution and use in source and binary forms, with or without
+            modification, are permitted provided that the following conditions are met:
+
+              * Redistributions of source code must retain the above copyright notice,
+                this list of conditions and the following disclaimer.
+
+              * Redistributions in binary form must reproduce the above copyright notice,
+                this list of conditions and the following disclaimer in the documentation
+                and/or other materials provided with the distribution.
+
+            THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+            AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+            IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+            ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+            LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+            CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+            SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+            INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+            CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+            ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+            POSSIBILITY OF SUCH DAMAGE.
+                            
+        from Brian Wellington 
+            dnsjava-2.1.8.jar
+
+    licensed under the BSD (3-clause) http://www.opensource.org/licenses/BSD-3-Clause  (as follows)
+
+            Copyright (c) 2002-2007, A. Abram White
+            All rights reserved. 
+            
+            Redistribution and use in source and binary forms, with or without
+            modification, are permitted provided that the following conditions are met:
+            
+               * Redistributions of source code must retain the above copyright notice,
+                 this list of conditions and the following disclaimer.
+               * Redistributions in binary form must reproduce the above copyright notice,
+                 this list of conditions and the following disclaimer in the documentation
+                 and/or other materials provided with the distribution.
+               * Neither the name of 'serp' nor the names of its contributors
+                 may be used to endorse or promote products derived from this software
+                 without specific prior written permission.
+            
+            THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+            ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+            WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+            DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+            ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+            (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+            LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+            ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+            (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+            SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+                            
+        from The Serp Project  http://serp.sourceforge.net/ 
+            serp-1.13.1.jar
+
+    licensed under the Bouncy Castle Licence http://www.bouncycastle.org/licence.html  (as follows)
+
+            Copyright (c) 2000 - 2011 The Legion Of The Bouncy Castle (http://www.bouncycastle.org) 
+            
+            Permission is hereby granted, free of charge, to any person obtaining a copy of this software 
+            and associated documentation files (the "Software"), to deal in the Software without restriction, 
+            including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, 
+            and/or sell copies of the Software, and to permit persons to whom the Software is furnished to 
+            do so, subject to the following conditions:
+            
+            The above copyright notice and this permission notice shall be included in all copies or substantial 
+            portions of the Software.
+            
+            THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
+            IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS 
+            FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS 
+            OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER 
+            IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION 
+            WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+                            
+        from The Legion of the Bouncy Castle  http://www.bouncycastle.org/ 
+            bcmail-jdk15-1.45.jar
+            bcprov-jdk15-1.45.jar
+
+    licensed under the COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 http://www.opensource.org/licenses/CDDL-1.0  (as follows)
+ 
+            
+            COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
+            
+            1. Definitions.
+            
+            1.1. "Contributor" means each individual or entity that
+            creates or contributes to the creation of Modifications.
+            
+            1.2. "Contributor Version" means the combination of the
+            Original Software, prior Modifications used by a
+            Contributor (if any), and the Modifications made by that
+            particular Contributor.
+            
+            1.3. "Covered Software" means (a) the Original Software, or
+            (b) Modifications, or (c) the combination of files
+            containing Original Software with files containing
+            Modifications, in each case including portions thereof.
+            
+            1.4. "Executable" means the Covered Software in any form
+            other than Source Code.
+            
+            1.5. "Initial Developer" means the individual or entity
+            that first makes Original Software available under this
+            License.
+            
+            1.6. "Larger Work" means a work which combines Covered
+            Software or portions thereof with code not governed by the
+            terms of this License.
+            
+            1.7. "License" means this document.
+            
+            1.8. "Licensable" means having the right to grant, to the
+            maximum extent possible, whether at the time of the initial
+            grant or subsequently acquired, any and all of the rights
+            conveyed herein.
+            
+            1.9. "Modifications" means the Source Code and Executable
+            form of any of the following:
+            
+            A. Any file that results from an addition to,
+            deletion from or modification of the contents of a
+            file containing Original Software or previous
+            Modifications;
+            
+            B. Any new file that contains any part of the
+            Original Software or previous Modification; or
+            
+            C. Any new file that is contributed or otherwise made
+            available under the terms of this License.
+            
+            1.10. "Original Software" means the Source Code and
+            Executable form of computer software code that is
+            originally released under this License.
+            
+            1.11. "Patent Claims" means any patent claim(s), now owned
+            or hereafter acquired, including without limitation,
+            method, process, and apparatus claims, in any patent
+            Licensable by grantor.
+            
+            1.12. "Source Code" means (a) the common form of computer
+            software code in which modifications are made and (b)
+            associated documentation included in or with such code.
+            
+            1.13. "You" (or "Your") means an individual or a legal
+            entity exercising rights under, and complying with all of
+            the terms of, this License. For legal entities, "You"
+            includes any entity which controls, is controlled by, or is
+            under common control with You. For purposes of this
+            definition, "control" means (a) the power, direct or
+            indirect, to cause the direction or management of such
+            entity, whether by contract or otherwise, or (b) ownership
+            of more than fifty percent (50%) of the outstanding shares
+            or beneficial ownership of such entity.
+            
+            2. License Grants.
+            
+            2.1. The Initial Developer Grant.
+            
+            Conditioned upon Your compliance with Section 3.1 below and
+            subject to third party intellectual property claims, the
+            Initial Developer hereby grants You a world-wide,
+            royalty-free, non-exclusive license:
+            
+            (a) under intellectual property rights (other than
+            patent or trademark) Licensable by Initial Developer,
+            to use, reproduce, modify, display, perform,
+            sublicense and distribute the Original Software (or
+            portions thereof), with or without Modifications,
+            and/or as part of a Larger Work; and
+            
+            (b) under Patent Claims infringed by the making,
+            using or selling of Original Software, to make, have
+            made, use, practice, sell, and offer for sale, and/or
+            otherwise dispose of the Original Software (or
+            portions thereof).
+            
+            (c) The licenses granted in Sections 2.1(a) and (b)
+            are effective on the date Initial Developer first
+            distributes or otherwise makes the Original Software
+            available to a third party under the terms of this
+            License.
+            
+            (d) Notwithstanding Section 2.1(b) above, no patent
+            license is granted: (1) for code that You delete from
+            the Original Software, or (2) for infringements
+            caused by: (i) the modification of the Original
+            Software, or (ii) the combination of the Original
+            Software with other software or devices.
+            
+            2.2. Contributor Grant.
+            
+            Conditioned upon Your compliance with Section 3.1 below and
+            subject to third party intellectual property claims, each
+            Contributor hereby grants You a world-wide, royalty-free,
+            non-exclusive license:
+            
+            (a) under intellectual property rights (other than
+            patent or trademark) Licensable by Contributor to
+            use, reproduce, modify, display, perform, sublicense
+            and distribute the Modifications created by such
+            Contributor (or portions thereof), either on an
+            unmodified basis, with other Modifications, as
+            Covered Software and/or as part of a Larger Work; and
+            
+            (b) under Patent Claims infringed by the making,
+            using, or selling of Modifications made by that
+            Contributor either alone and/or in combination with
+            its Contributor Version (or portions of such
+            combination), to make, use, sell, offer for sale,
+            have made, and/or otherwise dispose of: (1)
+            Modifications made by that Contributor (or portions
+            thereof); and (2) the combination of Modifications
+            made by that Contributor with its Contributor Version
+            (or portions of such combination).
+            
+            (c) The licenses granted in Sections 2.2(a) and
+            2.2(b) are effective on the date Contributor first
+            distributes or otherwise makes the Modifications
+            available to a third party.
+            
+            (d) Notwithstanding Section 2.2(b) above, no patent
+            license is granted: (1) for any code that Contributor
+            has deleted from the Contributor Version; (2) for
+            infringements caused by: (i) third party
+            modifications of Contributor Version, or (ii) the
+            combination of Modifications made by that Contributor
+            with other software (except as part of the
+            Contributor Version) or other devices; or (3) under
+            Patent Claims infringed by Covered Software in the
+            absence of Modifications made by that Contributor.
+            
+            3. Distribution Obligations.
+            
+            3.1. Availability of Source Code.
+            
+            Any Covered Software that You distribute or otherwise make
+            available in Executable form must also be made available in
+            Source Code form and that Source Code form must be
+            distributed only under the terms of this License. You must
+            include a copy of this License with every copy of the
+            Source Code form of the Covered Software You distribute or
+            otherwise make available. You must inform recipients of any
+            such Covered Software in Executable form as to how they can
+            obtain such Covered Software in Source Code form in a
+            reasonable manner on or through a medium customarily used
+            for software exchange.
+            
+            3.2. Modifications.
+            
+            The Modifications that You create or to which You
+            contribute are governed by the terms of this License. You
+            represent that You believe Your Modifications are Your
+            original creation(s) and/or You have sufficient rights to
+            grant the rights conveyed by this License.
+            
+            3.3. Required Notices.
+            
+            You must include a notice in each of Your Modifications
+            that identifies You as the Contributor of the Modification.
+            You may not remove or alter any copyright, patent or
+            trademark notices contained within the Covered Software, or
+            any notices of licensing or any descriptive text giving
+            attribution to any Contributor or the Initial Developer.
+            
+            3.4. Application of Additional Terms.
+            
+            You may not offer or impose any terms on any Covered
+            Software in Source Code form that alters or restricts the
+            applicable version of this License or the recipients'
+            rights hereunder. You may choose to offer, and to charge a
+            fee for, warranty, support, indemnity or liability
+            obligations to one or more recipients of Covered Software.
+            However, you may do so only on Your own behalf, and not on
+            behalf of the Initial Developer or any Contributor. You
+            must make it absolutely clear that any such warranty,
+            support, indemnity or liability obligation is offered by
+            You alone, and You hereby agree to indemnify the Initial
+            Developer and every Contributor for any liability incurred
+            by the Initial Developer or such Contributor as a result of
+            warranty, support, indemnity or liability terms You offer.
+            
+            3.5. Distribution of Executable Versions.
+            
+            You may distribute the Executable form of the Covered
+            Software under the terms of this License or under the terms
+            of a license of Your choice, which may contain terms
+            different from this License, provided that You are in
+            compliance with the terms of this License and that the
+            license for the Executable form does not attempt to limit
+            or alter the recipient's rights in the Source Code form
+            from the rights set forth in this License. If You
+            distribute the Covered Software in Executable form under a
+            different license, You must make it absolutely clear that
+            any terms which differ from this License are offered by You
+            alone, not by the Initial Developer or Contributor. You
+            hereby agree to indemnify the Initial Developer and every
+            Contributor for any liability incurred by the Initial
+            Developer or such Contributor as a result of any such terms
+            You offer.
+            
+            3.6. Larger Works.
+            
+            You may create a Larger Work by combining Covered Software
+            with other code not governed by the terms of this License
+            and distribute the Larger Work as a single product. In such
+            a case, You must make sure the requirements of this License
+            are fulfilled for the Covered Software.
+            
+            4. Versions of the License.
+            
+            4.1. New Versions.
+            
+            Sun Microsystems, Inc. is the initial license steward and
+            may publish revised and/or new versions of this License
+            from time to time. Each version will be given a
+            distinguishing version number. Except as provided in
+            Section 4.3, no one other than the license steward has the
+            right to modify this License.
+            
+            4.2. Effect of New Versions.
+            
+            You may always continue to use, distribute or otherwise
+            make the Covered Software available under the terms of the
+            version of the License under which You originally received
+            the Covered Software. If the Initial Developer includes a
+            notice in the Original Software prohibiting it from being
+            distributed or otherwise made available under any
+            subsequent version of the License, You must distribute and
+            make the Covered Software available under the terms of the
+            version of the License under which You originally received
+            the Covered Software. Otherwise, You may also choose to
+            use, distribute or otherwise make the Covered Software
+            available under the terms of any subsequent version of the
+            License published by the license steward.
+            
+            4.3. Modified Versions.
+            
+            When You are an Initial Developer and You want to create a
+            new license for Your Original Software, You may create and
+            use a modified version of this License if You: (a) rename
+            the license and remove any references to the name of the
+            license steward (except to note that the license differs
+            from this License); and (b) otherwise make it clear that
+            the license contains terms which differ from this License.
+            
+            5. DISCLAIMER OF WARRANTY.
+            
+            COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS"
+            BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED,
+            INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED
+            SOFTWARE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR
+            PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND
+            PERFORMANCE OF THE COVERED SOFTWARE IS WITH YOU. SHOULD ANY
+            COVERED SOFTWARE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE
+            INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF
+            ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF
+            WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF
+            ANY COVERED SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS
+            DISCLAIMER.
+            
+            6. TERMINATION.
+            
+            6.1. This License and the rights granted hereunder will
+            terminate automatically if You fail to comply with terms
+            herein and fail to cure such breach within 30 days of
+            becoming aware of the breach. Provisions which, by their
+            nature, must remain in effect beyond the termination of
+            this License shall survive.
+            
+            6.2. If You assert a patent infringement claim (excluding
+            declaratory judgment actions) against Initial Developer or
+            a Contributor (the Initial Developer or Contributor against
+            whom You assert such claim is referred to as "Participant")
+            alleging that the Participant Software (meaning the
+            Contributor Version where the Participant is a Contributor
+            or the Original Software where the Participant is the
+            Initial Developer) directly or indirectly infringes any
+            patent, then any and all rights granted directly or
+            indirectly to You by such Participant, the Initial
+            Developer (if the Initial Developer is not the Participant)
+            and all Contributors under Sections 2.1 and/or 2.2 of this
+            License shall, upon 60 days notice from Participant
+            terminate prospectively and automatically at the expiration
+            of such 60 day notice period, unless if within such 60 day
+            period You withdraw Your claim with respect to the
+            Participant Software against such Participant either
+            unilaterally or pursuant to a written agreement with
+            Participant.
+            
+            6.3. In the event of termination under Sections 6.1 or 6.2
+            above, all end user licenses that have been validly granted
+            by You or any distributor hereunder prior to termination
+            (excluding licenses granted to You by any distributor)
+            shall survive termination.
+            
+            7. LIMITATION OF LIABILITY.
+            
+            UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT
+            (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE
+            INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF
+            COVERED SOFTWARE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE
+            LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR
+            CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT
+            LIMITATION, DAMAGES FOR LOST PROFITS, LOSS OF GOODWILL, WORK
+            STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER
+            COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN
+            INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF
+            LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL
+            INJURY RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT
+            APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO
+            NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR
+            CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT
+            APPLY TO YOU.
+            
+            8. U.S. GOVERNMENT END USERS.
+            
+            The Covered Software is a "commercial item," as that term is
+            defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial
+            computer software" (as that term is defined at 48 C.F.R. ?
+            252.227-7014(a)(1)) and "commercial computer software
+            documentation" as such terms are used in 48 C.F.R. 12.212 (Sept.
+            1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1
+            through 227.7202-4 (June 1995), all U.S. Government End Users
+            acquire Covered Software with only those rights set forth herein.
+            This U.S. Government Rights clause is in lieu of, and supersedes,
+            any other FAR, DFAR, or other clause or provision that addresses
+            Government rights in computer software under this License.
+            
+            9. MISCELLANEOUS.
+            
+            This License represents the complete agreement concerning subject
+            matter hereof. If any provision of this License is held to be
+            unenforceable, such provision shall be reformed only to the
+            extent necessary to make it enforceable. This License shall be
+            governed by the law of the jurisdiction specified in a notice
+            contained within the Original Software (except to the extent
+            applicable law, if any, provides otherwise), excluding such
+            jurisdiction's conflict-of-law provisions. Any litigation
+            relating to this License shall be subject to the jurisdiction of
+            the courts located in the jurisdiction and venue specified in a
+            notice contained within the Original Software, with the losing
+            party responsible for costs, including, without limitation, court
+            costs and reasonable attorneys' fees and expenses. The
+            application of the United Nations Convention on Contracts for the
+            International Sale of Goods is expressly excluded. Any law or
+            regulation which provides that the language of a contract shall
+            be construed against the drafter shall not apply to this License.
+            You agree that You alone are responsible for compliance with the
+            United States export administration regulations (and the export
+            control laws and regulation of any other countries) when You use,
+            distribute or otherwise make available any Covered Software.
+            
+            10. RESPONSIBILITY FOR CLAIMS.
+            
+            As between Initial Developer and the Contributors, each party is
+            responsible for claims and damages arising, directly or
+            indirectly, out of its utilization of rights under this License
+            and You agree to work with Initial Developer and Contributors to
+            distribute such responsibility on an equitable basis. Nothing
+            herein is intended or shall be deemed to constitute any admission
+            of liability.
+                        
+        from Oracle  http://www.oracle.com 
+            mail-1.4.4.jar
+
+    licensed under the Day Specification License with Addendum http://www.day.com/content/dam/day/downloads/jsr283/LICENSE.txt  (as follows)
+ 
+            
+            Day Management AG ("Licensor") is willing to license this specification to you ONLY UPON 
+            THE CONDITION THAT YOU ACCEPT ALL OF THE TERMS CONTAINED IN THIS LICENSE AGREEMENT 
+            ("Agreement"). Please read the terms and conditions of this Agreement carefully.
+            
+            Content Repository for JavaTM Technology API Specification ("Specification")
+            Version: 2.0
+            Status: FCS
+            Release: 10 August 2009
+            
+            Copyright 2009 Day Management AG
+            Barf?sserplatz 6, 4001 Basel, Switzerland.
+            All rights reserved.
+            
+            NOTICE; LIMITED LICENSE GRANTS
+            
+            1. License for Purposes of Evaluation and Developing Applications. Licensor hereby grants 
+               you a fully-paid, non-exclusive, non-transferable, worldwide, limited license (without the 
+               right to sublicense), under Licensor's applicable intellectual property rights to view, 
+               download, use and reproduce the Specification only for the purpose of internal evaluation. 
+               This includes developing applications intended to run on an implementation of the 
+               Specification provided that such applications do not themselves implement any portion(s) 
+               of the Specification.
+            
+            2. License for the Distribution of Compliant Implementations. Licensor also grants you a 
+               perpetual, non-exclusive, non-transferable, worldwide, fully paid-up, royalty free, limited 
+               license (without the right to sublicense) under any applicable copyrights or, subject to 
+               the provisions of subsection 4 below, patent rights it may have covering the Specification 
+               to create and/or distribute an Independent Implementation of the Specification that:
+                
+                  (a) fully implements the Specification including all its required interfaces and 
+                      functionality; 
+                  (b) does not modify, subset, superset or otherwise extend the Licensor Name Space, 
+                      or include any public or protected packages, classes, Java interfaces, fields 
+                      or methods within the Licensor Name Space other than those required/authorized 
+                      by the Specification or Specifications being implemented; and 
+                  (c) passes the Technology Compatibility Kit (including satisfying the requirements 
+                      of the applicable TCK Users Guide) for such Specification ("Compliant Implementation"). 
+                      In addition, the foregoing license is expressly conditioned on your not acting 
+                      outside its scope. No license is granted hereunder for any other purpose (including, 
+                      for example, modifying the Specification, other than to the extent of your fair use 
+                      rights, or distributing the Specification to third parties).
+            
+            3. Pass-through Conditions. You need not include limitations (a)-(c) from the previous paragraph
+               or any other particular "pass through" requirements in any license You grant concerning the 
+               use of your Independent Implementation or products derived from it. However, except with 
+               respect to Independent Implementations (and products derived from them) that satisfy 
+               limitations (a)-(c) from the previous paragraph, You may neither: 
+               
+                   (a) grant or otherwise pass through to your licensees any licenses under Licensor's 
+                       applicable intellectual property rights; nor 
+                   (b) authorize your licensees to make any claims concerning their implementation's 
+                       compliance with the Specification.
+            
+            4. Reciprocity Concerning Patent Licenses. With respect to any patent claims covered by the 
+               license granted under subparagraph 2 above that would be infringed by all technically 
+               feasible implementations of the Specification, such license is conditioned upon your 
+               offering on fair, reasonable and non-discriminatory terms, to any party seeking it from 
+               You, a perpetual, non-exclusive, non-transferable, worldwide license under Your patent 
+               rights that are or would be infringed by all technically feasible implementations of the 
+               Specification to develop, distribute and use a Compliant Implementation.
+            
+            5. Definitions. For the purposes of this Agreement: "Independent Implementation" shall mean an 
+               implementation of the Specification that neither derives from any of Licensor's source code 
+               or binary code materials nor, except with an appropriate and separate license from Licensor, 
+               includes any of Licensor's source code or binary code materials; "Licensor Name Space" shall 
+               mean the public class or interface declarations whose names begin with "java", "javax", 
+               "javax.jcr" or their equivalents in any subsequent naming convention adopted by Licensor 
+               through the Java Community Process, or any recognized successors or replacements thereof; 
+               and "Technology Compatibility Kit" or "TCK" shall mean the test suite and accompanying TCK 
+               User's Guide provided by Licensor which corresponds to the particular version of the 
+               Specification being tested.
+            
+            6. Termination. This Agreement will terminate immediately without notice from Licensor if 
+               you fail to comply with any material provision of or act outside the scope of the licenses 
+               granted above.
+            
+            7. Trademarks. No right, title, or interest in or to any trademarks, service marks, or trade 
+               names of Licensor is granted hereunder. Java is a registered trademark of Sun Microsystems, 
+               Inc. in the United States and other countries.
+            
+            8. Disclaimer of Warranties. The Specification is provided "AS IS". LICENSOR MAKES NO 
+               REPRESENTATIONS OR WARRANTIES, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, 
+               WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT 
+               (INCLUDING AS A CONSEQUENCE OF ANY PRACTICE OR IMPLEMENTATION OF THE SPECIFICATION), 
+               OR THAT THE CONTENTS OF THE SPECIFICATION ARE SUITABLE FOR ANY PURPOSE. This document 
+               does not represent any commitment to release or implement any portion of the Specification 
+               in any product.
+            
+               The Specification could include technical inaccuracies or typographical errors. Changes are 
+               periodically added to the information therein; these changes will be incorporated into new 
+               versions of the Specification, if any. Licensor may make improvements and/or changes to the 
+               product(s) and/or the program(s) described in the Specification at any time. Any use of such 
+               changes in the Specification will be governed by the then-current license for the applicable 
+               version of the Specification.
+            
+            9. Limitation of Liability. TO THE EXTENT NOT PROHIBITED BY LAW, IN NO EVENT WILL LICENSOR 
+               BE LIABLE FOR ANY DAMAGES, INCLUDING WITHOUT LIMITATION, LOST REVENUE, PROFITS OR DATA, OR 
+               FOR SPECIAL, INDIRECT, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER CAUSED AND 
+               REGARDLESS OF THE THEORY OF LIABILITY, ARISING OUT OF OR RELATED TO ANY FURNISHING, 
+               PRACTICING, MODIFYING OR ANY USE OF THE SPECIFICATION, EVEN IF LICENSOR HAS BEEN ADVISED 
+               OF THE POSSIBILITY OF SUCH DAMAGES.
+            
+            10. Report. If you provide Licensor with any comments or suggestions in connection with your 
+                use of the Specification ("Feedback"), you hereby: (i) agree that such Feedback is provided 
+                on a non-proprietary and non-confidential basis, and (ii) grant Licensor a perpetual, 
+                non-exclusive, worldwide, fully paid-up, irrevocable license, with the right to sublicense 
+                through multiple levels of sublicensees, to incorporate, disclose, and use without 
+                limitation the Feedback for any purpose related to the Specification and future versions, 
+                implementations, and test suites thereof.
+            
+            Day Specification License Addendum
+            
+            In addition to the permissions granted under the Specification
+            License, Day Management AG hereby grants to You a perpetual,
+            worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+            license to reproduce, publicly display, publicly perform,
+            sublicense, and distribute unmodified copies of the Content
+            Repository for Java Technology API (JCR 2.0) Java Archive (JAR)
+            file ("jcr-2.0.jar") and to make, have made, use, offer to sell,
+            sell, import, and otherwise transfer said file on its own or
+            as part of a larger work that makes use of the JCR API.
+            
+            With respect to any patent claims covered by this license
+            that would be infringed by all technically feasible implementations
+            of the Specification, such license is conditioned upon your
+            offering on fair, reasonable and non-discriminatory terms,
+            to any party seeking it from You, a perpetual, non-exclusive,
+            non-transferable, worldwide license under Your patent rights
+            that are or would be infringed by all technically feasible
+            implementations of the Specification to develop, distribute
+            and use a Compliant Implementation.
+            
+                            
+        from Day Software  http://www.day.com 
+            jcr-2.0.jar
+
+    licensed under the MIT License http://www.opensource.org/licenses/mit-license.php  (as follows)
+
+            Copyright (c) 2004-2008 QOS.ch
+            All rights reserved. 
+            
+            Permission is hereby granted, free  of charge, to any person obtaining
+            a  copy  of this  software  and  associated  documentation files  (the
+            "Software"), to  deal in  the Software without  restriction, including
+            without limitation  the rights to  use, copy, modify,  merge, publish,
+            distribute,  sublicense, and/or sell  copies of  the Software,  and to
+            permit persons to whom the Software  is furnished to do so, subject to
+            the following conditions:
+            
+            The  above  copyright  notice  and  this permission  notice  shall  be
+            included in all copies or substantial portions of the Software.
+            
+            THE  SOFTWARE IS  PROVIDED  "AS  IS", WITHOUT  WARRANTY  OF ANY  KIND,
+            EXPRESS OR  IMPLIED, INCLUDING  BUT NOT LIMITED  TO THE  WARRANTIES OF
+            MERCHANTABILITY,    FITNESS    FOR    A   PARTICULAR    PURPOSE    AND
+            NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+            LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+            OF CONTRACT, TORT OR OTHERWISE,  ARISING FROM, OUT OF OR IN CONNECTION
+            WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+                            
+        from QOS.ch  http://www.qos.ch 
+            jcl-over-slf4j-1.6.1.jar
+            slf4j-api-1.6.1.jar
+            slf4j-log4j12-1.6.1.jar
+
+    licensed under the Tanuki Software License (as follows)
+ 
+            
+              Copyright (c) 1999, 2006 Tanuki Software, Inc.
+            
+              Permission is hereby granted, free of charge, to any person
+              obtaining a copy of the Java Service Wrapper and associated
+              documentation files (the "Software"), to deal in the Software
+              without  restriction, including without limitation the rights
+              to use, copy, modify, merge, publish, distribute, sub-license,
+              and/or sell copies of the Software, and to permit persons to
+              whom the Software is furnished to do so, subject to the
+              following conditions:
+            
+              The above copyright notice and this permission notice shall be
+              included in all copies or substantial portions of the Software.
+            
+              THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 
+              EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES 
+              OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 
+              NON-INFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT 
+              HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, 
+              WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
+              FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+              OTHER DEALINGS IN THE SOFTWARE.
+            
+            
+              Portions of the Software have been derived from source code
+              developed by Silver Egg Technology under the following license:
+                
+                Copyright (c) 2001 Silver Egg Technology
+                
+                Permission is hereby granted, free of charge, to any person
+                obtaining a copy of this software and associated documentation
+                files (the "Software"), to deal in the Software without 
+                restriction, including without limitation the rights to use, 
+                copy, modify, merge, publish, distribute, sub-license, and/or 
+                sell copies of the Software, and to permit persons to whom the
+                Software is furnished to do so, subject to the following 
+                conditions:
+                
+                The above copyright notice and this permission notice shall be
+                included in all copies or substantial portions of the Software.
+                
+                THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 
+                EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES 
+                OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 
+                NON-INFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT 
+                HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, 
+                WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
+                FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+                OTHER DEALINGS IN THE SOFTWARE.
+                        
+        from Tanuki Software  http://www.tanukisoftware.com/ 
+            libwrapper-linux-ppc-64.so
+            libwrapper-linux-x86-32.so
+            libwrapper-linux-x86-64.so
+            libwrapper-macosx-ppc-32.jnilib
+            libwrapper-macosx-universal-32.jnilib
+            libwrapper-solaris-sparc-32.so
+            libwrapper-solaris-sparc-64.so
+            libwrapper-solaris-x86-32.so
+            wrapper-windows-x86-32.dll
+            wrapper.jar
+
+
+    licensed under the Day Specification License http://www.day.com/content/dam/day/downloads/jsr283/LICENSE.txt  (as follows)
+
+            In addition to the permissions granted under the Specification
+            License, Day Management AG hereby grants to You a perpetual,
+            worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+            license to reproduce, publicly display, publicly perform,
+            sublicense, and distribute unmodified copies of the Content
+            Repository for Java Technology API (JCR 2.0) Java Archive (JAR)
+            file ("jcr-2.0.jar") and to make, have made, use, offer to sell,
+            sell, import, and otherwise transfer said file on its own or
+            as part of a larger work that makes use of the JCR API.
+            
+            With respect to any patent claims covered by this license
+            that would be infringed by all technically feasible implementations
+            of the Specification, such license is conditioned upon your
+            offering on fair, reasonable and non-discriminatory terms,
+            to any party seeking it from You, a perpetual, non-exclusive,
+            non-transferable, worldwide license under Your patent rights
+            that are or would be infringed by all technically feasible
+            implementations of the Specification to develop, distribute
+            and use a Compliant Implementation.
+            
+
+    licensed under the BSD (3-clause style) http://jetm.void.fm/license.html  (as follows)
+
+            Copyright (c) 2004, 2005, 2006, 2007 void.fm
+            All rights reserved.
+
+            Redistribution and use in source and binary forms, with or without modification,
+            are permitted provided that the following conditions are met:
+
+            * Redistributions of source code must retain the above copyright notice, this list
+              of conditions and the following disclaimer.
+
+            * Redistributions in binary form must reproduce the above copyright notice, this
+              list of conditions and the following disclaimer in the documentation and/or
+              other materials provided with the distribution.
+
+            * Neither the name void.fm nor the names of its contributors may be
+              used to endorse or promote products derived from this software without specific
+              prior written permission.
+
+            THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+            ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+            WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+            IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+            INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+            BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+            DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+            LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+            OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+            OF THE POSSIBILITY OF SUCH DAMAGE.
+
+        from JETM  http://jetm.void.fm
+            jetm-1.2.3.jar
+            jetm-optional-1.2.3.jar

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


[james-project] 01/03: JAMES-3261 Copy sample configuration from the docker one

Posted by bt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

btellier pushed a commit to branch 3.6.x
in repository https://gitbox.apache.org/repos/asf/james-project.git

commit 67d653db78a0e8c837ce66bbed1bdc556e22a36d
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Sun Jun 21 21:31:44 2020 +0700

    JAMES-3261 Copy sample configuration from the docker one
---
 .../deletedMessageVault.properties                 |  5 +-
 .../sample-configuration/dnsservice.xml            |  1 +
 .../sample-configuration/domainlist.xml            |  2 +
 .../{jmx.properties => elasticsearch.properties}   | 16 +++---
 .../sample-configuration/extensions.properties     | 10 ++++
 .../{jmx.properties => healthcheck.properties}     | 15 +++---
 .../sample-configuration/imapserver.xml            | 14 +++++-
 .../sample-configuration/jmap.properties           |  3 +-
 .../sample-configuration/jmx.properties            |  5 +-
 .../{recipientrewritetable.xml => listeners.xml}   | 16 +++---
 .../sample-configuration/lmtpserver.xml            | 41 ---------------
 .../memory-guice/sample-configuration/logback.xml  | 42 ++++++++++++++++
 .../sample-configuration/mailetcontainer.xml       | 58 ++++++++++++++++++----
 .../sample-configuration/mailrepositorystore.xml   | 12 ++---
 .../sample-configuration/pop3server.xml            |  3 +-
 .../sample-configuration/recipientrewritetable.xml |  3 +-
 .../sample-configuration/smtpserver.xml            | 14 +++---
 .../sample-configuration/usersrepository.xml       |  5 +-
 .../sample-configuration/webadmin.properties       | 28 ++++++++++-
 19 files changed, 197 insertions(+), 96 deletions(-)

diff --git a/server/container/guice/memory-guice/sample-configuration/deletedMessageVault.properties b/server/container/guice/memory-guice/sample-configuration/deletedMessageVault.properties
index 8c14c8e..7ac88e8 100644
--- a/server/container/guice/memory-guice/sample-configuration/deletedMessageVault.properties
+++ b/server/container/guice/memory-guice/sample-configuration/deletedMessageVault.properties
@@ -1 +1,4 @@
-urlPrefix=cassandra://var/deletedMessages/vault
\ No newline at end of file
+# ============================================= Deleted Messages Vault Configuration ==================================
+# Retention period for your deleted messages into the vault, after which they expire and can be potentially cleaned up
+# Optional, default 1y
+# retentionPeriod=1y
diff --git a/server/container/guice/memory-guice/sample-configuration/dnsservice.xml b/server/container/guice/memory-guice/sample-configuration/dnsservice.xml
index 6e4fbd2..b44a502 100644
--- a/server/container/guice/memory-guice/sample-configuration/dnsservice.xml
+++ b/server/container/guice/memory-guice/sample-configuration/dnsservice.xml
@@ -17,6 +17,7 @@
   specific language governing permissions and limitations      
   under the License.                                           
  -->
+<!-- Read https://james.apache.org/server/config-dnsservice.html for further details -->
 
 <dnsservice>
   <autodiscover>true</autodiscover>
diff --git a/server/container/guice/memory-guice/sample-configuration/domainlist.xml b/server/container/guice/memory-guice/sample-configuration/domainlist.xml
index 10d8981..605439f 100644
--- a/server/container/guice/memory-guice/sample-configuration/domainlist.xml
+++ b/server/container/guice/memory-guice/sample-configuration/domainlist.xml
@@ -18,6 +18,8 @@
   under the License.                                           
  -->
 
+<!-- Read https://james.apache.org/server/config-domainlist.html for further details -->
+
 <domainlist>
     <autodetect>false</autodetect>
     <autodetectIP>false</autodetectIP>
diff --git a/server/container/guice/memory-guice/sample-configuration/jmx.properties b/server/container/guice/memory-guice/sample-configuration/elasticsearch.properties
similarity index 67%
copy from server/container/guice/memory-guice/sample-configuration/jmx.properties
copy to server/container/guice/memory-guice/sample-configuration/elasticsearch.properties
index 1c39a17..6ec2428 100644
--- a/server/container/guice/memory-guice/sample-configuration/jmx.properties
+++ b/server/container/guice/memory-guice/sample-configuration/elasticsearch.properties
@@ -14,16 +14,18 @@
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#
 
 #  This template file can be used as example for James Server configuration
 #  DO NOT USE IT AS SUCH AND ADAPT IT TO YOUR NEEDS
+# Read https://james.apache.org/server/config-elasticsearch.html for further details (metrics only)
 
-#  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
+# Configuration file for ElasticSearch
 
-jmx.enabled=true
-jmx.address=127.0.0.1
-jmx.port=9999
+# Reports for metrics into ElasticSearch
+# Defaults to elasticsearch.masterHost : on which server to publish metrics
+elasticsearch.http.host=elasticsearch
+elasticsearch.http.port=9200
+elasticsearch.metrics.reports.enabled=true
+elasticsearch.metrics.reports.period=30
+elasticsearch.metrics.reports.index=james-metrics
diff --git a/server/container/guice/memory-guice/sample-configuration/extensions.properties b/server/container/guice/memory-guice/sample-configuration/extensions.properties
new file mode 100644
index 0000000..2a2c23e
--- /dev/null
+++ b/server/container/guice/memory-guice/sample-configuration/extensions.properties
@@ -0,0 +1,10 @@
+# This files enables customization of users extensions injections with guice.
+# A user can drop some jar-with-dependencies within the ./extensions-jars folder and
+# reference classes of these jars in some of James extension mechanisms.
+
+# This includes mailets, matchers, mailboxListeners, preDeletionHooks, protocolHandlers, webAdmin routes
+
+# Upon injections, the user can reference additional guice modules, that are going to be used only upon extensions instantiation.
+
+#List of coma separated (',') fully qualified class names of additional guice modules to be used to instantiate extensions
+#guice.extension.module=
\ No newline at end of file
diff --git a/server/container/guice/memory-guice/sample-configuration/jmx.properties b/server/container/guice/memory-guice/sample-configuration/healthcheck.properties
similarity index 68%
copy from server/container/guice/memory-guice/sample-configuration/jmx.properties
copy to server/container/guice/memory-guice/sample-configuration/healthcheck.properties
index 1c39a17..9f3bad1 100644
--- a/server/container/guice/memory-guice/sample-configuration/jmx.properties
+++ b/server/container/guice/memory-guice/sample-configuration/healthcheck.properties
@@ -14,16 +14,17 @@
 #  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
+# Configuration file for Periodical Health Checks
+
+# Read https://james.apache.org/server/config-healthcheck.html for further details
 
-# See http://james.apache.org/server/3/config.html for usage
+# Optional. Period between two PeriodicalHealthChecks.
+# Units supported are (ms - millisecond, s - second, m - minute, h - hour, d - day). Default unit is millisecond.
+# Default duration is 60 seconds.
+# Duration must be greater or at least equals to 10 seconds.
+# healthcheck.period=60s
 
-jmx.enabled=true
-jmx.address=127.0.0.1
-jmx.port=9999
diff --git a/server/container/guice/memory-guice/sample-configuration/imapserver.xml b/server/container/guice/memory-guice/sample-configuration/imapserver.xml
index 96387f5..a1306fa 100644
--- a/server/container/guice/memory-guice/sample-configuration/imapserver.xml
+++ b/server/container/guice/memory-guice/sample-configuration/imapserver.xml
@@ -19,11 +19,13 @@ specific language governing permissions and limitations
 under the License.
 -->
 
+<!-- Read https://james.apache.org/server/config-imap4.html for further details -->
+
 
 <imapservers>
     <imapserver enabled="true">
         <jmxName>imapserver</jmxName>
-        <bind>0.0.0.0:1143</bind>
+        <bind>0.0.0.0:143</bind>
         <connectionBacklog>200</connectionBacklog>
         <tls socketTLS="false" startTLS="true">
             <!-- To create a new keystore execute:
@@ -35,10 +37,14 @@ under the License.
         </tls>
         <connectionLimit>0</connectionLimit>
         <connectionLimitPerIP>0</connectionLimitPerIP>
+        <idleTimeInterval>120</idleTimeInterval>
+        <idleTimeIntervalUnit>SECONDS</idleTimeIntervalUnit>
+        <disabledCaps>ACL|MOVE</disabledCaps>
+        <enableIdle>true</enableIdle>
     </imapserver>
     <imapserver enabled="true">
         <jmxName>imapserver-ssl</jmxName>
-        <bind>0.0.0.0:1993</bind>
+        <bind>0.0.0.0:993</bind>
         <connectionBacklog>200</connectionBacklog>
         <tls socketTLS="true" startTLS="false">
             <!-- To create a new keystore execute:
@@ -50,5 +56,9 @@ under the License.
         </tls>
         <connectionLimit>0</connectionLimit>
         <connectionLimitPerIP>0</connectionLimitPerIP>
+        <idleTimeInterval>120</idleTimeInterval>
+        <idleTimeIntervalUnit>SECONDS</idleTimeIntervalUnit>
+        <disabledCaps>ACL|MOVE</disabledCaps>
+        <enableIdle>true</enableIdle>
     </imapserver>
 </imapservers>
diff --git a/server/container/guice/memory-guice/sample-configuration/jmap.properties b/server/container/guice/memory-guice/sample-configuration/jmap.properties
index 709ed8e..53bc403 100644
--- a/server/container/guice/memory-guice/sample-configuration/jmap.properties
+++ b/server/container/guice/memory-guice/sample-configuration/jmap.properties
@@ -1,4 +1,5 @@
 # Configuration file for JMAP
+# Read https://james.apache.org/server/config-jmap.html for further details
 
 enabled=true
 
@@ -10,4 +11,4 @@ tls.secret=james72laBalle
 # The following entry specify the link to the URL of the public key file,
 # which should be a PEM format file.
 #
-jwt.publickeypem.url=file://conf/jwt_publickey
\ No newline at end of file
+jwt.publickeypem.url=file://conf/jwt_publickey
diff --git a/server/container/guice/memory-guice/sample-configuration/jmx.properties b/server/container/guice/memory-guice/sample-configuration/jmx.properties
index 1c39a17..e56235f 100644
--- a/server/container/guice/memory-guice/sample-configuration/jmx.properties
+++ b/server/container/guice/memory-guice/sample-configuration/jmx.properties
@@ -19,10 +19,7 @@
 #  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
+# Read https://james.apache.org/server/config-system.html#jmx.properties for further details
 
 jmx.enabled=true
 jmx.address=127.0.0.1
diff --git a/server/container/guice/memory-guice/sample-configuration/recipientrewritetable.xml b/server/container/guice/memory-guice/sample-configuration/listeners.xml
similarity index 75%
copy from server/container/guice/memory-guice/sample-configuration/recipientrewritetable.xml
copy to server/container/guice/memory-guice/sample-configuration/listeners.xml
index 5553a40..2eed880 100644
--- a/server/container/guice/memory-guice/sample-configuration/recipientrewritetable.xml
+++ b/server/container/guice/memory-guice/sample-configuration/listeners.xml
@@ -18,10 +18,14 @@
   under the License.                                           
  -->
 
-<!-- The default table for storing James' RecipientRewriteTable mappings. -->
-<recipientrewritetable>
-  <recursiveMapping>true</recursiveMapping>
-  <mappingLimit>10</mappingLimit>
-  <mapping>some@domain=some</mapping>
-</recipientrewritetable>
+<!-- Read https://james.apache.org/server/config-listeners.html for further details -->
 
+<listeners>
+  <listener>
+    <class>org.apache.james.mailbox.spamassassin.SpamAssassinListener</class>
+    <async>true</async>
+  </listener>
+  <preDeletionHook>
+    <class>org.apache.james.vault.DeletedMessageVaultHook</class>
+  </preDeletionHook>
+</listeners>
diff --git a/server/container/guice/memory-guice/sample-configuration/lmtpserver.xml b/server/container/guice/memory-guice/sample-configuration/lmtpserver.xml
deleted file mode 100644
index 87a0caa..0000000
--- a/server/container/guice/memory-guice/sample-configuration/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:1024</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/server/container/guice/memory-guice/sample-configuration/logback.xml b/server/container/guice/memory-guice/sample-configuration/logback.xml
index 677451f..5af37af 100644
--- a/server/container/guice/memory-guice/sample-configuration/logback.xml
+++ b/server/container/guice/memory-guice/sample-configuration/logback.xml
@@ -1,8 +1,49 @@
 <?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.                                           
+ -->
+
 <configuration>
 
+        <contextListener class="ch.qos.logback.classic.jul.LevelChangePropagator">
+                <resetJUL>true</resetJUL>
+        </contextListener>
+
         <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
                 <encoder>
+                        <pattern>%d{HH:mm:ss.SSS} %highlight([%-5level]) %logger{15} - %msg%n%rEx</pattern>
+                        <immediateFlush>false</immediateFlush>
+                </encoder>
+        </appender>
+
+        <appender name="LOG_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+                <file>/logs/james.log</file>
+                <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
+                    <fileNamePattern>/logs/james.%i.log.tar.gz</fileNamePattern>
+                    <minIndex>1</minIndex>
+                    <maxIndex>3</maxIndex>
+                </rollingPolicy>
+
+                <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
+                    <maxFileSize>100MB</maxFileSize>
+                </triggeringPolicy>
+
+                <encoder>
                         <pattern>%d{HH:mm:ss.SSS} [%-5level] %logger{15} - %msg%n%rEx</pattern>
                         <immediateFlush>false</immediateFlush>
                 </encoder>
@@ -10,6 +51,7 @@
 
         <root level="WARN">
                 <appender-ref ref="CONSOLE" />
+                <appender-ref ref="LOG_FILE" />
         </root>
 
         <logger name="org.apache.james" level="INFO" />
diff --git a/server/container/guice/memory-guice/sample-configuration/mailetcontainer.xml b/server/container/guice/memory-guice/sample-configuration/mailetcontainer.xml
index 9d81841..918e70c 100644
--- a/server/container/guice/memory-guice/sample-configuration/mailetcontainer.xml
+++ b/server/container/guice/memory-guice/sample-configuration/mailetcontainer.xml
@@ -19,6 +19,8 @@
   under the License.
  -->
 
+<!-- Read https://james.apache.org/server/config-mailetcontainer.html for further details -->
+
 <mailetcontainer enableJmx="true">
 
     <context>
@@ -29,6 +31,7 @@
 
     <spooler>
         <threads>20</threads>
+        <errorRepository>memory://var/mail/error/</errorRepository>
     </spooler>
 
     <processors>
@@ -41,9 +44,12 @@
         </processor>
 
         <processor state="error" enableJmx="true">
+            <mailet match="All" class="MetricsMailet">
+                <metricName>mailetContainerErrors</metricName>
+            </mailet>
             <mailet match="All" class="Bounce"/>
             <mailet match="All" class="ToRepository">
-                <repositoryPath>file://var/mail/error/</repositoryPath>
+                <repositoryPath>memory://var/mail/error/</repositoryPath>
             </mailet>
         </processor>
 
@@ -57,14 +63,32 @@
 
             <mailet match="All" class="RemoveMimeHeader">
                 <name>bcc</name>
+                <onMailetException>ignore</onMailetException>
+            </mailet>
+            <mailet match="All" class="RecipientRewriteTable">
+                <errorProcessor>rrt-error</errorProcessor>
             </mailet>
-            <mailet match="All" class="RecipientRewriteTable" />
             <mailet match="RecipientIsLocal" class="org.apache.james.jmap.mailet.VacationMailet"/>
             <mailet match="RecipientIsLocal" class="Sieve"/>
+            <mailet match="RecipientIsLocal" class="AddDeliveredToHeader"/>
             <mailet match="RecipientIsLocal" class="org.apache.james.jmap.mailet.filter.JMAPFiltering"/>
             <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="relay-allowed" class="RemoteDelivery">
+            <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>
@@ -73,35 +97,51 @@
                 <sendpartial>true</sendpartial>
                 <bounceProcessor>bounces</bounceProcessor>
             </mailet>
-            <mailet match="All" class="ToProcessor">
-                <processor>relay-denied</processor>
-            </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>
+                <repositoryPath>memory://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 authentified to perform such an operation</notice>
+                <repositoryPath>memory://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>memory://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/server/container/guice/memory-guice/sample-configuration/mailrepositorystore.xml b/server/container/guice/memory-guice/sample-configuration/mailrepositorystore.xml
index 099710e..c7f22b9 100644
--- a/server/container/guice/memory-guice/sample-configuration/mailrepositorystore.xml
+++ b/server/container/guice/memory-guice/sample-configuration/mailrepositorystore.xml
@@ -19,17 +19,15 @@
   under the License.
  -->
 
+<!-- Read https://james.apache.org/server/config-mailrepositorystore.html for further details -->
+
 <mailrepositorystore>
-    <defaultProtocol>file</defaultProtocol>
+    <defaultProtocol>memory</defaultProtocol>
     <mailrepositories>
-        <!-- File based repositories.  These repositories store all message data -->
-        <!-- in the file system. -->
-        <mailrepository class="org.apache.james.mailrepository.file.FileMailRepository">
+        <mailrepository class="org.apache.james.mailrepository.memory.MemoryMailRepository">
             <protocols>
-                <protocol>file</protocol>
+                <protocol>memory</protocol>
             </protocols>
-            <!-- Set if the messages should be listed sorted. False by default -->
-            <config FIFO="false" CACHEKEYS="true"/>
         </mailrepository>
     </mailrepositories>
 </mailrepositorystore>
diff --git a/server/container/guice/memory-guice/sample-configuration/pop3server.xml b/server/container/guice/memory-guice/sample-configuration/pop3server.xml
index c57c832..10a2e08 100644
--- a/server/container/guice/memory-guice/sample-configuration/pop3server.xml
+++ b/server/container/guice/memory-guice/sample-configuration/pop3server.xml
@@ -18,11 +18,12 @@
   under the License.                                           
  -->
 
+<!-- Read https://james.apache.org/server/config-pop3.html for further details -->
 
 <pop3servers>
     <pop3server enabled="false">
         <jmxName>pop3server</jmxName>
-        <bind>0.0.0.0:1110</bind>
+        <bind>0.0.0.0:110</bind>
         <connectionBacklog>200</connectionBacklog>
         <tls socketTLS="false" startTLS="false">
             <!-- To create a new keystore execute:
diff --git a/server/container/guice/memory-guice/sample-configuration/recipientrewritetable.xml b/server/container/guice/memory-guice/sample-configuration/recipientrewritetable.xml
index 5553a40..1a512c6 100644
--- a/server/container/guice/memory-guice/sample-configuration/recipientrewritetable.xml
+++ b/server/container/guice/memory-guice/sample-configuration/recipientrewritetable.xml
@@ -18,10 +18,11 @@
   under the License.                                           
  -->
 
+<!-- Read https://james.apache.org/server/config-recipientrewritetable.html for further details -->
+
 <!-- The default table for storing James' RecipientRewriteTable mappings. -->
 <recipientrewritetable>
   <recursiveMapping>true</recursiveMapping>
   <mappingLimit>10</mappingLimit>
-  <mapping>some@domain=some</mapping>
 </recipientrewritetable>
 
diff --git a/server/container/guice/memory-guice/sample-configuration/smtpserver.xml b/server/container/guice/memory-guice/sample-configuration/smtpserver.xml
index 814575a..722b0c2 100644
--- a/server/container/guice/memory-guice/sample-configuration/smtpserver.xml
+++ b/server/container/guice/memory-guice/sample-configuration/smtpserver.xml
@@ -19,10 +19,12 @@
   under the License.
  -->
 
+<!-- Read https://james.apache.org/server/config-smtp-lmtp.html#SMTP_Configuration for further details -->
+
 <smtpservers>
     <smtpserver enabled="true">
         <jmxName>smtpserver-global</jmxName>
-        <bind>0.0.0.0:1025</bind>
+        <bind>0.0.0.0:25</bind>
         <connectionBacklog>200</connectionBacklog>
         <tls socketTLS="false" startTLS="false">
             <keystore>file://conf/keystore</keystore>
@@ -34,7 +36,7 @@
         <connectionLimit>0</connectionLimit>
         <connectionLimitPerIP>0</connectionLimitPerIP>
         <authRequired>false</authRequired>
-        <authorizedAddresses>0.0.0.0/0</authorizedAddresses>
+        <authorizedAddresses>127.0.0.0/8</authorizedAddresses>
         <verifyIdentity>true</verifyIdentity>
         <maxmessagesize>0</maxmessagesize>
         <addressBracketsEnforcement>true</addressBracketsEnforcement>
@@ -46,7 +48,7 @@
     </smtpserver>
     <smtpserver enabled="true">
         <jmxName>smtpserver-TLS</jmxName>
-        <bind>0.0.0.0:1465</bind>
+        <bind>0.0.0.0:465</bind>
         <connectionBacklog>200</connectionBacklog>
         <tls socketTLS="true" startTLS="false">
             <keystore>file://conf/keystore</keystore>
@@ -61,7 +63,7 @@
            Authorize only local users
         -->
         <authRequired>true</authRequired>
-        <authorizedAddresses>0.0.0.0/0</authorizedAddresses>
+        <authorizedAddresses>127.0.0.0/8</authorizedAddresses>
         <!-- Trust authenticated users -->
         <verifyIdentity>false</verifyIdentity>
         <maxmessagesize>0</maxmessagesize>
@@ -74,7 +76,7 @@
     </smtpserver>
     <smtpserver enabled="true">
         <jmxName>smtpserver-authenticated</jmxName>
-        <bind>0.0.0.0:1587</bind>
+        <bind>0.0.0.0:587</bind>
         <connectionBacklog>200</connectionBacklog>
         <tls socketTLS="false" startTLS="true">
             <keystore>file://conf/keystore</keystore>
@@ -89,7 +91,7 @@
            Authorize only local users
         -->
         <authRequired>true</authRequired>
-        <authorizedAddresses>0.0.0.0/0</authorizedAddresses>
+        <authorizedAddresses>127.0.0.0/8</authorizedAddresses>
         <!-- Trust authenticated users -->
         <verifyIdentity>false</verifyIdentity>
         <maxmessagesize>0</maxmessagesize>
diff --git a/server/container/guice/memory-guice/sample-configuration/usersrepository.xml b/server/container/guice/memory-guice/sample-configuration/usersrepository.xml
index cc55c5e..8b3e8e1 100644
--- a/server/container/guice/memory-guice/sample-configuration/usersrepository.xml
+++ b/server/container/guice/memory-guice/sample-configuration/usersrepository.xml
@@ -18,10 +18,11 @@
   under the License.                                           
  -->
 
+<!-- Read https://james.apache.org/server/config-users.html for further details -->
+
 <usersrepository name="LocalUsers">
-    <destination URL="file://users/"/>
     <algorithm>MD5</algorithm>
-    <enableVirtualHosting>true</enableVirtualHosting>
+    <enableVirtualHosting>true</enableVirtualHosting>    
     <enableForwarding>true</enableForwarding>
 </usersrepository>
 
diff --git a/server/container/guice/memory-guice/sample-configuration/webadmin.properties b/server/container/guice/memory-guice/sample-configuration/webadmin.properties
index a9b5cc2..52cfffd 100644
--- a/server/container/guice/memory-guice/sample-configuration/webadmin.properties
+++ b/server/container/guice/memory-guice/sample-configuration/webadmin.properties
@@ -18,6 +18,32 @@
 #  This template file can be used as example for James Server configuration
 #  DO NOT USE IT AS SUCH AND ADAPT IT TO YOUR NEEDS
 
+# Read https://james.apache.org/server/config-webadmin.html for further details
+
 enabled=true
 port=8000
-host=localhost
\ No newline at end of file
+host=localhost
+
+# Defaults to false
+https.enabled=false
+
+# Compulsory when enabling HTTPS
+#https.keystore=/path/to/keystore
+#https.password=password
+
+# Optional when enabling HTTPS (self signed)
+#https.trust.keystore
+#https.trust.password
+
+# Defaults to false
+#jwt.enabled=true
+
+# Defaults to false
+#cors.enable=true
+#cors.origin
+
+
+# List of fully qualified class names that should be exposed over webadmin
+# in addition to your product default routes. Routes needs to be located
+# within the classpath or in the ./extensions-jars folder.
+#extensions.routes=
\ No newline at end of file

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