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/16 06:20:32 UTC
[james-project] 03/03: JAMES-3261 Guice memory docker should reuse
guice memory ZIP app
This is an automated email from the ASF dual-hosted git repository.
btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 61ce101ff384955c50b22f99ee6b750a5f663f1b
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