You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by bt...@apache.org on 2017/04/19 02:40:54 UTC
[1/4] james-project git commit: JAMES-2003 Sanitize mailetContainer
configuration
Repository: james-project
Updated Branches:
refs/heads/master 77ee834cb -> 62466172d
JAMES-2003 Sanitize mailetContainer configuration
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/67e89cc4
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/67e89cc4
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/67e89cc4
Branch: refs/heads/master
Commit: 67e89cc43efa403627ff92b24014b69004b4beda
Parents: d9008f8
Author: benwa <bt...@linagora.com>
Authored: Tue Apr 18 07:40:29 2017 +0700
Committer: benwa <bt...@linagora.com>
Committed: Wed Apr 19 09:39:40 2017 +0700
----------------------------------------------------------------------
.../destination/conf/mailetcontainer.xml | 76 +++----------
.../destination/conf/managesieve.help.txt | 112 -------------------
.../destination/conf/mailetcontainer.xml | 76 +++----------
.../destination/conf/managesieve.help.txt | 112 -------------------
.../jpa/destination/conf/mailetcontainer.xml | 94 ++++++----------
.../spring/destination/conf/mailetcontainer.xml | 92 ++++++---------
.../destination/conf/managesieve.help.txt | 112 -------------------
.../src/test/resources/mailetcontainer.xml | 11 --
.../sample-configuration/mailetcontainer.xml | 26 -----
.../src/test/resources/mailetcontainer.xml | 3 -
.../src/test/resources/mailetcontainer.xml | 3 -
11 files changed, 102 insertions(+), 615 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/67e89cc4/dockerfiles/run/guice/cassandra-ldap/destination/conf/mailetcontainer.xml
----------------------------------------------------------------------
diff --git a/dockerfiles/run/guice/cassandra-ldap/destination/conf/mailetcontainer.xml b/dockerfiles/run/guice/cassandra-ldap/destination/conf/mailetcontainer.xml
index f3e466a..681b966 100644
--- a/dockerfiles/run/guice/cassandra-ldap/destination/conf/mailetcontainer.xml
+++ b/dockerfiles/run/guice/cassandra-ldap/destination/conf/mailetcontainer.xml
@@ -33,31 +33,6 @@
<processor state="root" enableJmx="true">
<mailet match="All" class="PostmasterAlias"/>
<mailet match="RelayLimit=30" class="Null"/>
- <!-- Hook on sievemanager@james.linagora.com
- Mail send to this address will get interpreted with SIEVE Manage -->
- <mailet match="RecipientIs=sievemanager@james.linagora.com" class="ToProcessor">
- <processor>sieve-manager-check</processor>
- </mailet>
- <mailet match="HasMailAttribute=spamChecked" class="ToProcessor">
- <processor>transport</processor>
- </mailet>
- <mailet match="All" class="SetMailAttribute">
- <spamChecked>true</spamChecked>
- </mailet>
- <mailet match="SMTPAuthSuccessful" class="ToProcessor">
- <processor>transport</processor>
- </mailet>
- <mailet match="InSpammerBlacklist=query.bondedsender.org." class="ToProcessor">
- <processor>transport</processor>
- </mailet>
- <!-- Check for delivery from a known spam server -->
- <!-- This set of matchers/mailets redirect all emails from known -->
- <!-- black holes, open relays, and spam servers to the spam processor -->
- <!-- For this set to function properly, the spam processor must be configured. -->
- <mailet match="InSpammerBlacklist=dnsbl.njabl.org." class="ToProcessor">
- <processor>spam</processor>
- <notice>550 Requested action not taken: rejected - see http://njabl.org/</notice>
- </mailet>
<mailet match="All" class="ToProcessor">
<processor>transport</processor>
</mailet>
@@ -73,7 +48,6 @@
</mailet>
</processor>
-
<processor state="transport" enableJmx="true">
<mailet match="SMTPAuthSuccessful" class="SetMimeHeader">
<name>X-UserIsAuth</name>
@@ -91,13 +65,25 @@
<mailet match="RecipientIsLocal" class="Sieve"/>
<mailet match="RecipientIsLocal" class="AddDeliveredToHeader"/>
<mailet match="RecipientIsLocal" class="LocalDelivery"/>
- <!--
<mailet match="HostIsLocal" class="ToProcessor">
<processor>local-address-error</processor>
<notice>550 - Requested action not taken: no such user here</notice>
</mailet>
- -->
- <mailet match="SMTPAuthSuccessful" class="RemoteDelivery">
+
+ <mailet match="SMTPAuthSuccessful" class="ToProcessor">
+ <processor>relay</processor>
+ </mailet>
+ <mailet match="HasMailAttribute=org.apache.james.jmap.send.MailMetaData.messageId" class="ToProcessor">
+ <processor>relay</processor>
+ </mailet>
+
+ <mailet match="All" class="ToProcessor">
+ <processor>relay-denied</processor>
+ </mailet>
+ </processor>
+
+ <processor state="relay" enableJmx="true">
+ <mailet match="All" class="RemoteDelivery">
<outgoingQueue>outgoing</outgoingQueue>
<delayTime>5000, 100000, 500000</delayTime>
<maxRetries>25</maxRetries>
@@ -106,9 +92,6 @@
<sendpartial>true</sendpartial>
<bounceProcessor>bounces</bounceProcessor>
</mailet>
- <mailet match="All" class="ToProcessor">
- <processor>relay-denied</processor>
- </mailet>
</processor>
<processor state="spam" enableJmx="true">
@@ -141,7 +124,7 @@
</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>
+ <notice>Warning: You are sending an e-mail to a remote server. You must be authenticated to perform such an operation</notice>
</mailet>
</processor>
@@ -154,33 +137,6 @@
</mailet>
</processor>
- <processor state="sieve-manager-check" enableJmx="true">
- <!-- Only local users can manage their scripts -->
- <mailet match="RecipientIsLocal" class="ToProcessor">
- <processor>sieve-manager</processor>
- </mailet>
- <!-- Notify other people about their failure -->
- <mailet match="All" class="Bounce">
- <inline>heads</inline>
- <attachment>none</attachment>
- <passThrough>false</passThrough>
- <prefix>[REJECTED]</prefix>
- <notice>
- You can't send messages to configure SIEVE on this serveur unless you are the official SIEVE manager.
- </notice>
- </mailet>
- <mailet match="All" class="Null"/>
- </processor>
-
- <processor state="sieve-manager">
- <mailet match="All" class="SetMailAttribute">
- <org.apache.james.SMTPAuthUser>true</org.apache.james.SMTPAuthUser>
- </mailet>
- <mailet match="All" class="org.apache.james.transport.mailets.managesieve.ManageSieveMailet">
- <helpURL>file:/root/james-server-app-3.0.0-beta5-SNAPSHOT/conf/managesieve.help.txt</helpURL>
- </mailet>
- <mailet match="All" class="Null"/>
- </processor>
</processors>
</mailetcontainer>
http://git-wip-us.apache.org/repos/asf/james-project/blob/67e89cc4/dockerfiles/run/guice/cassandra-ldap/destination/conf/managesieve.help.txt
----------------------------------------------------------------------
diff --git a/dockerfiles/run/guice/cassandra-ldap/destination/conf/managesieve.help.txt b/dockerfiles/run/guice/cassandra-ldap/destination/conf/managesieve.help.txt
deleted file mode 100644
index f45c78d..0000000
--- a/dockerfiles/run/guice/cassandra-ldap/destination/conf/managesieve.help.txt
+++ /dev/null
@@ -1,112 +0,0 @@
-managesieve implements the commands defined by RFC 5804 ((http://tools.ietf.org/html/rfc5804) to manage sieve scripts via mail messages. A mail is sent to the managesieve user with the command and parameters in the subject header. Sieve scripts are exchanged as mail attachments.
-
-Consult your mail administrator for the name of the managesieve user configured for your installation.
-
-Users MUST be SMTP authenticated to execute all except the CAPABILITY and HELP commands (see note (1) below).
-
-Commands are executed and answered within the namespace of the sending user as denoted by the sender header of the mail. Thus, a command such as LISTSCRIPTS lists the scripts within namespace of the user identified by the sender header.
-
-The supported commands are summarised in "Command Summary" below. Generally the responses are self describing. For full details see RFC 5804 - Commands (http://tools.ietf.org/html/rfc5804#section-2).
-
-In these descriptions the following keywords apply:
-
-- sieve-name
- The name of a sieve script enclosed in parentheses, eg: "my script". An empty name is not allowed.
-- active-sieve-name
- As sieve-name, except an empty name, eg: "", is allowed.
-- old-sieve-name
- As sieve-name
-- new-sieve-name
- As sieve-name
-- sieve-script
- A mail attachment recognised as a sieve script. This is the first attachment in a mail satisfying any of these characteristics:
- - A MIME type of "application/sieve"
- - A filename with the suffix ".sieve"
- - A filename with the suffix ".siv"
- Returned sieve-scripts always have the MIME type of "application/sieve"
-
-Command Summary
----------------
-
-CAPABILITY
- Subject:
- CAPABILITY
- Attachments:
- none
-Answers the capabilities of the underlying sieve inplementation.
-
-CHECKSCRIPT
- Subject:
- CHECKSCRIPT
- Attachments:
- sieve-script
-Verifies the attached sieve-script without storing it on the server.
-
-DELETESCRIPT
- Subject:
- DELETESCRIPT sieve-name
- Attachments:
- none
-Deletes the named sieve script.
-
-GETACTIVE
- Subject:
- GETACTIVE
- Attachments:
- none
-Answers the active sieve script as an attachment.
-
-GETSCRIPT
- Subject:
- GETSCRIPT sieve-name
- Attachments:
- none
-Answers the named sieve script as an attachment.
-
-HAVESPACE
- Subject:
- HAVESPACE sieve-name number
- Attachments:
- none
-Answers OK if there is available space to store a script with the given name of the given size, else NO.
-
-HELP
- Subject:
- HELP
- Attachments:
- none
-Answers this text.
-
-LISTSCRIPTS
- Subject:
- LISTSCRIPTS
- Attachments:
- none
-Answers a list of the sieve scripts stored on the server, indicating which, if any, is the active script.
-
-PUTSCRIPT
- Subject:
- PUTSCRIPT sieve-name
- Attachments:
- sieve-script
-Verifies the attached sieve-script and if there are no errors stores it on the server using the given name.
-
-RENAMESCRIPT
- Subject:
- RENAMESCRIPT old-sieve-name new-sieve-name
- Attachments:
- none
-Renames the script stored on the server named old-sieve-name to new-sieve-name.
-
-SETACTIVE
- Subject:
- SETACTIVE active-sieve-name
- Attachments:
- none
-Sets the active script on the server to the given name. Use an empty string, "", to deactivate all scripts.
-
-Notes
------
-1) Some mail servers optionally allow configurations that enable local clients to post without SMTP authentication, such configurations will fail as managesieve requires SMTP authentication in all circumstances. To repeat, users MUST be SMTP authenticated to execute all except the CAPABILITY and HELP commands.
-
-
http://git-wip-us.apache.org/repos/asf/james-project/blob/67e89cc4/dockerfiles/run/guice/cassandra/destination/conf/mailetcontainer.xml
----------------------------------------------------------------------
diff --git a/dockerfiles/run/guice/cassandra/destination/conf/mailetcontainer.xml b/dockerfiles/run/guice/cassandra/destination/conf/mailetcontainer.xml
index f3e466a..681b966 100644
--- a/dockerfiles/run/guice/cassandra/destination/conf/mailetcontainer.xml
+++ b/dockerfiles/run/guice/cassandra/destination/conf/mailetcontainer.xml
@@ -33,31 +33,6 @@
<processor state="root" enableJmx="true">
<mailet match="All" class="PostmasterAlias"/>
<mailet match="RelayLimit=30" class="Null"/>
- <!-- Hook on sievemanager@james.linagora.com
- Mail send to this address will get interpreted with SIEVE Manage -->
- <mailet match="RecipientIs=sievemanager@james.linagora.com" class="ToProcessor">
- <processor>sieve-manager-check</processor>
- </mailet>
- <mailet match="HasMailAttribute=spamChecked" class="ToProcessor">
- <processor>transport</processor>
- </mailet>
- <mailet match="All" class="SetMailAttribute">
- <spamChecked>true</spamChecked>
- </mailet>
- <mailet match="SMTPAuthSuccessful" class="ToProcessor">
- <processor>transport</processor>
- </mailet>
- <mailet match="InSpammerBlacklist=query.bondedsender.org." class="ToProcessor">
- <processor>transport</processor>
- </mailet>
- <!-- Check for delivery from a known spam server -->
- <!-- This set of matchers/mailets redirect all emails from known -->
- <!-- black holes, open relays, and spam servers to the spam processor -->
- <!-- For this set to function properly, the spam processor must be configured. -->
- <mailet match="InSpammerBlacklist=dnsbl.njabl.org." class="ToProcessor">
- <processor>spam</processor>
- <notice>550 Requested action not taken: rejected - see http://njabl.org/</notice>
- </mailet>
<mailet match="All" class="ToProcessor">
<processor>transport</processor>
</mailet>
@@ -73,7 +48,6 @@
</mailet>
</processor>
-
<processor state="transport" enableJmx="true">
<mailet match="SMTPAuthSuccessful" class="SetMimeHeader">
<name>X-UserIsAuth</name>
@@ -91,13 +65,25 @@
<mailet match="RecipientIsLocal" class="Sieve"/>
<mailet match="RecipientIsLocal" class="AddDeliveredToHeader"/>
<mailet match="RecipientIsLocal" class="LocalDelivery"/>
- <!--
<mailet match="HostIsLocal" class="ToProcessor">
<processor>local-address-error</processor>
<notice>550 - Requested action not taken: no such user here</notice>
</mailet>
- -->
- <mailet match="SMTPAuthSuccessful" class="RemoteDelivery">
+
+ <mailet match="SMTPAuthSuccessful" class="ToProcessor">
+ <processor>relay</processor>
+ </mailet>
+ <mailet match="HasMailAttribute=org.apache.james.jmap.send.MailMetaData.messageId" class="ToProcessor">
+ <processor>relay</processor>
+ </mailet>
+
+ <mailet match="All" class="ToProcessor">
+ <processor>relay-denied</processor>
+ </mailet>
+ </processor>
+
+ <processor state="relay" enableJmx="true">
+ <mailet match="All" class="RemoteDelivery">
<outgoingQueue>outgoing</outgoingQueue>
<delayTime>5000, 100000, 500000</delayTime>
<maxRetries>25</maxRetries>
@@ -106,9 +92,6 @@
<sendpartial>true</sendpartial>
<bounceProcessor>bounces</bounceProcessor>
</mailet>
- <mailet match="All" class="ToProcessor">
- <processor>relay-denied</processor>
- </mailet>
</processor>
<processor state="spam" enableJmx="true">
@@ -141,7 +124,7 @@
</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>
+ <notice>Warning: You are sending an e-mail to a remote server. You must be authenticated to perform such an operation</notice>
</mailet>
</processor>
@@ -154,33 +137,6 @@
</mailet>
</processor>
- <processor state="sieve-manager-check" enableJmx="true">
- <!-- Only local users can manage their scripts -->
- <mailet match="RecipientIsLocal" class="ToProcessor">
- <processor>sieve-manager</processor>
- </mailet>
- <!-- Notify other people about their failure -->
- <mailet match="All" class="Bounce">
- <inline>heads</inline>
- <attachment>none</attachment>
- <passThrough>false</passThrough>
- <prefix>[REJECTED]</prefix>
- <notice>
- You can't send messages to configure SIEVE on this serveur unless you are the official SIEVE manager.
- </notice>
- </mailet>
- <mailet match="All" class="Null"/>
- </processor>
-
- <processor state="sieve-manager">
- <mailet match="All" class="SetMailAttribute">
- <org.apache.james.SMTPAuthUser>true</org.apache.james.SMTPAuthUser>
- </mailet>
- <mailet match="All" class="org.apache.james.transport.mailets.managesieve.ManageSieveMailet">
- <helpURL>file:/root/james-server-app-3.0.0-beta5-SNAPSHOT/conf/managesieve.help.txt</helpURL>
- </mailet>
- <mailet match="All" class="Null"/>
- </processor>
</processors>
</mailetcontainer>
http://git-wip-us.apache.org/repos/asf/james-project/blob/67e89cc4/dockerfiles/run/guice/cassandra/destination/conf/managesieve.help.txt
----------------------------------------------------------------------
diff --git a/dockerfiles/run/guice/cassandra/destination/conf/managesieve.help.txt b/dockerfiles/run/guice/cassandra/destination/conf/managesieve.help.txt
deleted file mode 100644
index f45c78d..0000000
--- a/dockerfiles/run/guice/cassandra/destination/conf/managesieve.help.txt
+++ /dev/null
@@ -1,112 +0,0 @@
-managesieve implements the commands defined by RFC 5804 ((http://tools.ietf.org/html/rfc5804) to manage sieve scripts via mail messages. A mail is sent to the managesieve user with the command and parameters in the subject header. Sieve scripts are exchanged as mail attachments.
-
-Consult your mail administrator for the name of the managesieve user configured for your installation.
-
-Users MUST be SMTP authenticated to execute all except the CAPABILITY and HELP commands (see note (1) below).
-
-Commands are executed and answered within the namespace of the sending user as denoted by the sender header of the mail. Thus, a command such as LISTSCRIPTS lists the scripts within namespace of the user identified by the sender header.
-
-The supported commands are summarised in "Command Summary" below. Generally the responses are self describing. For full details see RFC 5804 - Commands (http://tools.ietf.org/html/rfc5804#section-2).
-
-In these descriptions the following keywords apply:
-
-- sieve-name
- The name of a sieve script enclosed in parentheses, eg: "my script". An empty name is not allowed.
-- active-sieve-name
- As sieve-name, except an empty name, eg: "", is allowed.
-- old-sieve-name
- As sieve-name
-- new-sieve-name
- As sieve-name
-- sieve-script
- A mail attachment recognised as a sieve script. This is the first attachment in a mail satisfying any of these characteristics:
- - A MIME type of "application/sieve"
- - A filename with the suffix ".sieve"
- - A filename with the suffix ".siv"
- Returned sieve-scripts always have the MIME type of "application/sieve"
-
-Command Summary
----------------
-
-CAPABILITY
- Subject:
- CAPABILITY
- Attachments:
- none
-Answers the capabilities of the underlying sieve inplementation.
-
-CHECKSCRIPT
- Subject:
- CHECKSCRIPT
- Attachments:
- sieve-script
-Verifies the attached sieve-script without storing it on the server.
-
-DELETESCRIPT
- Subject:
- DELETESCRIPT sieve-name
- Attachments:
- none
-Deletes the named sieve script.
-
-GETACTIVE
- Subject:
- GETACTIVE
- Attachments:
- none
-Answers the active sieve script as an attachment.
-
-GETSCRIPT
- Subject:
- GETSCRIPT sieve-name
- Attachments:
- none
-Answers the named sieve script as an attachment.
-
-HAVESPACE
- Subject:
- HAVESPACE sieve-name number
- Attachments:
- none
-Answers OK if there is available space to store a script with the given name of the given size, else NO.
-
-HELP
- Subject:
- HELP
- Attachments:
- none
-Answers this text.
-
-LISTSCRIPTS
- Subject:
- LISTSCRIPTS
- Attachments:
- none
-Answers a list of the sieve scripts stored on the server, indicating which, if any, is the active script.
-
-PUTSCRIPT
- Subject:
- PUTSCRIPT sieve-name
- Attachments:
- sieve-script
-Verifies the attached sieve-script and if there are no errors stores it on the server using the given name.
-
-RENAMESCRIPT
- Subject:
- RENAMESCRIPT old-sieve-name new-sieve-name
- Attachments:
- none
-Renames the script stored on the server named old-sieve-name to new-sieve-name.
-
-SETACTIVE
- Subject:
- SETACTIVE active-sieve-name
- Attachments:
- none
-Sets the active script on the server to the given name. Use an empty string, "", to deactivate all scripts.
-
-Notes
------
-1) Some mail servers optionally allow configurations that enable local clients to post without SMTP authentication, such configurations will fail as managesieve requires SMTP authentication in all circumstances. To repeat, users MUST be SMTP authenticated to execute all except the CAPABILITY and HELP commands.
-
-
http://git-wip-us.apache.org/repos/asf/james-project/blob/67e89cc4/dockerfiles/run/guice/jpa/destination/conf/mailetcontainer.xml
----------------------------------------------------------------------
diff --git a/dockerfiles/run/guice/jpa/destination/conf/mailetcontainer.xml b/dockerfiles/run/guice/jpa/destination/conf/mailetcontainer.xml
index 35fca6a..29248b8 100644
--- a/dockerfiles/run/guice/jpa/destination/conf/mailetcontainer.xml
+++ b/dockerfiles/run/guice/jpa/destination/conf/mailetcontainer.xml
@@ -33,44 +33,21 @@
<processor state="root" enableJmx="true">
<mailet match="All" class="PostmasterAlias"/>
<mailet match="RelayLimit=30" class="Null"/>
- <!-- Hook on sievemanager@james.linagora.com
- Mail send to this address will get interpreted with SIEVE Manage -->
- <mailet match="RecipientIs=sievemanager@james.linagora.com" class="ToProcessor">
- <processor>sieve-manager-check</processor>
- </mailet>
- <mailet match="HasMailAttribute=spamChecked" class="ToProcessor">
- <processor>transport</processor>
- </mailet>
- <mailet match="All" class="SetMailAttribute">
- <spamChecked>true</spamChecked>
- </mailet>
- <mailet match="SMTPAuthSuccessful" class="ToProcessor">
- <processor>transport</processor>
- </mailet>
- <mailet match="InSpammerBlacklist=query.bondedsender.org." class="ToProcessor">
- <processor>transport</processor>
- </mailet>
- <!-- Check for delivery from a known spam server -->
- <!-- This set of matchers/mailets redirect all emails from known -->
- <!-- black holes, open relays, and spam servers to the spam processor -->
- <!-- For this set to function properly, the spam processor must be configured. -->
- <mailet match="InSpammerBlacklist=dnsbl.njabl.org." class="ToProcessor">
- <processor>spam</processor>
- <notice>550 Requested action not taken: rejected - see http://njabl.org/</notice>
- </mailet>
<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"/>
<mailet match="All" class="ToRepository">
<repositoryPath>file://var/mail/error/</repositoryPath>
</mailet>
</processor>
-
<processor state="transport" enableJmx="true">
<mailet match="SMTPAuthSuccessful" class="SetMimeHeader">
<name>X-UserIsAuth</name>
@@ -84,9 +61,28 @@
<name>bcc</name>
</mailet>
<mailet match="All" class="RecipientRewriteTable" />
+ <mailet match="RecipientIsLocal" class="Sieve"/>
<mailet match="RecipientIsLocal" class="AddDeliveredToHeader"/>
<mailet match="RecipientIsLocal" class="LocalDelivery"/>
- <mailet match="SMTPAuthSuccessful" class="RemoteDelivery">
+ <mailet match="HostIsLocal" class="ToProcessor">
+ <processor>local-address-error</processor>
+ <notice>550 - Requested action not taken: no such user here</notice>
+ </mailet>
+
+ <mailet match="SMTPAuthSuccessful" class="ToProcessor">
+ <processor>relay</processor>
+ </mailet>
+ <mailet match="HasMailAttribute=org.apache.james.jmap.send.MailMetaData.messageId" class="ToProcessor">
+ <processor>relay</processor>
+ </mailet>
+
+ <mailet match="All" class="ToProcessor">
+ <processor>relay-denied</processor>
+ </mailet>
+ </processor>
+
+ <processor state="relay" enableJmx="true">
+ <mailet match="All" class="RemoteDelivery">
<outgoingQueue>outgoing</outgoingQueue>
<delayTime>5000, 100000, 500000</delayTime>
<maxRetries>25</maxRetries>
@@ -95,18 +91,21 @@
<sendpartial>true</sendpartial>
<bounceProcessor>bounces</bounceProcessor>
</mailet>
- <mailet match="All" class="ToProcessor">
- <processor>relay-denied</processor>
- </mailet>
</processor>
<processor state="spam" enableJmx="true">
+ <mailet match="All" class="MetricsMailet">
+ <metricName>mailetContainerSpam</metricName>
+ </mailet>
<mailet match="All" class="ToRepository">
<repositoryPath>file://var/mail/spam/</repositoryPath>
</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>
@@ -116,48 +115,27 @@
</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>
+ <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="DSNBounce">
- <passThrough>false</passThrough>
+ <mailet match="All" class="MetricsMailet">
+ <metricName>bounces</metricName>
</mailet>
- </processor>
-
- <processor state="sieve-manager-check" enableJmx="true">
- <!-- Only local users can manage their scripts -->
- <mailet match="RecipientIsLocal" class="ToProcessor">
- <processor>sieve-manager</processor>
- </mailet>
- <!-- Notify other people about their failure -->
- <mailet match="All" class="Bounce">
- <inline>heads</inline>
- <attachment>none</attachment>
+ <mailet match="All" class="DSNBounce">
<passThrough>false</passThrough>
- <prefix>[REJECTED]</prefix>
- <notice>
- You can't send messages to configure SIEVE on this serveur unless you are the official SIEVE manager.
- </notice>
</mailet>
- <mailet match="All" class="Null"/>
</processor>
- <processor state="sieve-manager">
- <mailet match="All" class="SetMailAttribute">
- <org.apache.james.SMTPAuthUser>true</org.apache.james.SMTPAuthUser>
- </mailet>
- <mailet match="All" class="org.apache.james.transport.mailets.managesieve.ManageSieveMailet">
- <helpURL>file:/root/james-server-app-3.0.0-beta5-SNAPSHOT/conf/managesieve.help.txt</helpURL>
- </mailet>
- <mailet match="All" class="Null"/>
- </processor>
</processors>
</mailetcontainer>
http://git-wip-us.apache.org/repos/asf/james-project/blob/67e89cc4/dockerfiles/run/spring/destination/conf/mailetcontainer.xml
----------------------------------------------------------------------
diff --git a/dockerfiles/run/spring/destination/conf/mailetcontainer.xml b/dockerfiles/run/spring/destination/conf/mailetcontainer.xml
index 498e1ac..29248b8 100644
--- a/dockerfiles/run/spring/destination/conf/mailetcontainer.xml
+++ b/dockerfiles/run/spring/destination/conf/mailetcontainer.xml
@@ -33,44 +33,21 @@
<processor state="root" enableJmx="true">
<mailet match="All" class="PostmasterAlias"/>
<mailet match="RelayLimit=30" class="Null"/>
- <!-- Hook on sievemanager@james.linagora.com
- Mail send to this address will get interpreted with SIEVE Manage -->
- <mailet match="RecipientIs=sievemanager@james.linagora.com" class="ToProcessor">
- <processor>sieve-manager-check</processor>
- </mailet>
- <mailet match="HasMailAttribute=spamChecked" class="ToProcessor">
- <processor>transport</processor>
- </mailet>
- <mailet match="All" class="SetMailAttribute">
- <spamChecked>true</spamChecked>
- </mailet>
- <mailet match="SMTPAuthSuccessful" class="ToProcessor">
- <processor>transport</processor>
- </mailet>
- <mailet match="InSpammerBlacklist=query.bondedsender.org." class="ToProcessor">
- <processor>transport</processor>
- </mailet>
- <!-- Check for delivery from a known spam server -->
- <!-- This set of matchers/mailets redirect all emails from known -->
- <!-- black holes, open relays, and spam servers to the spam processor -->
- <!-- For this set to function properly, the spam processor must be configured. -->
- <mailet match="InSpammerBlacklist=dnsbl.njabl.org." class="ToProcessor">
- <processor>spam</processor>
- <notice>550 Requested action not taken: rejected - see http://njabl.org/</notice>
- </mailet>
<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"/>
<mailet match="All" class="ToRepository">
<repositoryPath>file://var/mail/error/</repositoryPath>
</mailet>
</processor>
-
<processor state="transport" enableJmx="true">
<mailet match="SMTPAuthSuccessful" class="SetMimeHeader">
<name>X-UserIsAuth</name>
@@ -80,6 +57,9 @@
<name>X-WasSigned</name>
<value>true</value>
</mailet>
+ <mailet match="All" class="RemoveMimeHeader">
+ <name>bcc</name>
+ </mailet>
<mailet match="All" class="RecipientRewriteTable" />
<mailet match="RecipientIsLocal" class="Sieve"/>
<mailet match="RecipientIsLocal" class="AddDeliveredToHeader"/>
@@ -88,7 +68,21 @@
<processor>local-address-error</processor>
<notice>550 - Requested action not taken: no such user here</notice>
</mailet>
- <mailet match="SMTPAuthSuccessful" class="RemoteDelivery">
+
+ <mailet match="SMTPAuthSuccessful" class="ToProcessor">
+ <processor>relay</processor>
+ </mailet>
+ <mailet match="HasMailAttribute=org.apache.james.jmap.send.MailMetaData.messageId" class="ToProcessor">
+ <processor>relay</processor>
+ </mailet>
+
+ <mailet match="All" class="ToProcessor">
+ <processor>relay-denied</processor>
+ </mailet>
+ </processor>
+
+ <processor state="relay" enableJmx="true">
+ <mailet match="All" class="RemoteDelivery">
<outgoingQueue>outgoing</outgoingQueue>
<delayTime>5000, 100000, 500000</delayTime>
<maxRetries>25</maxRetries>
@@ -97,18 +91,21 @@
<sendpartial>true</sendpartial>
<bounceProcessor>bounces</bounceProcessor>
</mailet>
- <mailet match="All" class="ToProcessor">
- <processor>relay-denied</processor>
- </mailet>
</processor>
<processor state="spam" enableJmx="true">
+ <mailet match="All" class="MetricsMailet">
+ <metricName>mailetContainerSpam</metricName>
+ </mailet>
<mailet match="All" class="ToRepository">
<repositoryPath>file://var/mail/spam/</repositoryPath>
</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>
@@ -118,48 +115,27 @@
</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>
+ <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="DSNBounce">
- <passThrough>false</passThrough>
+ <mailet match="All" class="MetricsMailet">
+ <metricName>bounces</metricName>
</mailet>
- </processor>
-
- <processor state="sieve-manager-check" enableJmx="true">
- <!-- Only local users can manage their scripts -->
- <mailet match="RecipientIsLocal" class="ToProcessor">
- <processor>sieve-manager</processor>
- </mailet>
- <!-- Notify other people about their failure -->
- <mailet match="All" class="Bounce">
- <inline>heads</inline>
- <attachment>none</attachment>
+ <mailet match="All" class="DSNBounce">
<passThrough>false</passThrough>
- <prefix>[REJECTED]</prefix>
- <notice>
- You can't send messages to configure SIEVE on this serveur unless you are the official SIEVE manager.
- </notice>
</mailet>
- <mailet match="All" class="Null"/>
</processor>
- <processor state="sieve-manager">
- <mailet match="All" class="SetMailAttribute">
- <org.apache.james.SMTPAuthUser>true</org.apache.james.SMTPAuthUser>
- </mailet>
- <mailet match="All" class="org.apache.james.transport.mailets.managesieve.ManageSieveMailet">
- <helpURL>file:/root/james-server-app-3.0.0-beta5-SNAPSHOT/conf/managesieve.help.txt</helpURL>
- </mailet>
- <mailet match="All" class="Null"/>
- </processor>
</processors>
</mailetcontainer>
http://git-wip-us.apache.org/repos/asf/james-project/blob/67e89cc4/dockerfiles/run/spring/destination/conf/managesieve.help.txt
----------------------------------------------------------------------
diff --git a/dockerfiles/run/spring/destination/conf/managesieve.help.txt b/dockerfiles/run/spring/destination/conf/managesieve.help.txt
deleted file mode 100644
index f45c78d..0000000
--- a/dockerfiles/run/spring/destination/conf/managesieve.help.txt
+++ /dev/null
@@ -1,112 +0,0 @@
-managesieve implements the commands defined by RFC 5804 ((http://tools.ietf.org/html/rfc5804) to manage sieve scripts via mail messages. A mail is sent to the managesieve user with the command and parameters in the subject header. Sieve scripts are exchanged as mail attachments.
-
-Consult your mail administrator for the name of the managesieve user configured for your installation.
-
-Users MUST be SMTP authenticated to execute all except the CAPABILITY and HELP commands (see note (1) below).
-
-Commands are executed and answered within the namespace of the sending user as denoted by the sender header of the mail. Thus, a command such as LISTSCRIPTS lists the scripts within namespace of the user identified by the sender header.
-
-The supported commands are summarised in "Command Summary" below. Generally the responses are self describing. For full details see RFC 5804 - Commands (http://tools.ietf.org/html/rfc5804#section-2).
-
-In these descriptions the following keywords apply:
-
-- sieve-name
- The name of a sieve script enclosed in parentheses, eg: "my script". An empty name is not allowed.
-- active-sieve-name
- As sieve-name, except an empty name, eg: "", is allowed.
-- old-sieve-name
- As sieve-name
-- new-sieve-name
- As sieve-name
-- sieve-script
- A mail attachment recognised as a sieve script. This is the first attachment in a mail satisfying any of these characteristics:
- - A MIME type of "application/sieve"
- - A filename with the suffix ".sieve"
- - A filename with the suffix ".siv"
- Returned sieve-scripts always have the MIME type of "application/sieve"
-
-Command Summary
----------------
-
-CAPABILITY
- Subject:
- CAPABILITY
- Attachments:
- none
-Answers the capabilities of the underlying sieve inplementation.
-
-CHECKSCRIPT
- Subject:
- CHECKSCRIPT
- Attachments:
- sieve-script
-Verifies the attached sieve-script without storing it on the server.
-
-DELETESCRIPT
- Subject:
- DELETESCRIPT sieve-name
- Attachments:
- none
-Deletes the named sieve script.
-
-GETACTIVE
- Subject:
- GETACTIVE
- Attachments:
- none
-Answers the active sieve script as an attachment.
-
-GETSCRIPT
- Subject:
- GETSCRIPT sieve-name
- Attachments:
- none
-Answers the named sieve script as an attachment.
-
-HAVESPACE
- Subject:
- HAVESPACE sieve-name number
- Attachments:
- none
-Answers OK if there is available space to store a script with the given name of the given size, else NO.
-
-HELP
- Subject:
- HELP
- Attachments:
- none
-Answers this text.
-
-LISTSCRIPTS
- Subject:
- LISTSCRIPTS
- Attachments:
- none
-Answers a list of the sieve scripts stored on the server, indicating which, if any, is the active script.
-
-PUTSCRIPT
- Subject:
- PUTSCRIPT sieve-name
- Attachments:
- sieve-script
-Verifies the attached sieve-script and if there are no errors stores it on the server using the given name.
-
-RENAMESCRIPT
- Subject:
- RENAMESCRIPT old-sieve-name new-sieve-name
- Attachments:
- none
-Renames the script stored on the server named old-sieve-name to new-sieve-name.
-
-SETACTIVE
- Subject:
- SETACTIVE active-sieve-name
- Attachments:
- none
-Sets the active script on the server to the given name. Use an empty string, "", to deactivate all scripts.
-
-Notes
------
-1) Some mail servers optionally allow configurations that enable local clients to post without SMTP authentication, such configurations will fail as managesieve requires SMTP authentication in all circumstances. To repeat, users MUST be SMTP authenticated to execute all except the CAPABILITY and HELP commands.
-
-
http://git-wip-us.apache.org/repos/asf/james-project/blob/67e89cc4/mpt/impl/smtp/cassandra/src/test/resources/mailetcontainer.xml
----------------------------------------------------------------------
diff --git a/mpt/impl/smtp/cassandra/src/test/resources/mailetcontainer.xml b/mpt/impl/smtp/cassandra/src/test/resources/mailetcontainer.xml
index 699ca91..a1bfb08 100644
--- a/mpt/impl/smtp/cassandra/src/test/resources/mailetcontainer.xml
+++ b/mpt/impl/smtp/cassandra/src/test/resources/mailetcontainer.xml
@@ -34,10 +34,6 @@
<mailet match="All" class="PostmasterAlias"/>
<mailet match="RelayLimit=30" class="Null"/>
- <mailet match="SMTPAuthSuccessful" class="ToProcessor">
- <processor>transport</processor>
- </mailet>
-
<mailet match="All" class="ToProcessor">
<processor>transport</processor>
</mailet>
@@ -69,10 +65,6 @@
</mailet>
<mailet match="RecipientIsLocal" class="org.apache.james.jmap.mailet.VacationMailet"/>
<mailet match="All" class="RecipientRewriteTable" />
- <!-- <mailet match="HostIsLocal" class="ToProcessor">
- <processor>local-address-error</processor>
- <notice>550 - Requested action not taken: no such user here</notice>
- </mailet> -->
<mailet match="All" class="RemoteDelivery">
<outgoingQueue>outgoing</outgoingQueue>
<delayTime>5 minutes</delayTime>
@@ -87,9 +79,6 @@
<sendpartial>false</sendpartial>
<bounceProcessor>bounces</bounceProcessor>
</mailet>
- <!-- mailet match="All" class="ToProcessor">
- <processor>relay-denied</processor>
- </mailet-->
</processor>
<processor state="local-address-error" enableJmx="true">
http://git-wip-us.apache.org/repos/asf/james-project/blob/67e89cc4/server/container/guice/memory-guice/sample-configuration/mailetcontainer.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/memory-guice/sample-configuration/mailetcontainer.xml b/server/container/guice/memory-guice/sample-configuration/mailetcontainer.xml
index 40885cd..1a4343f 100644
--- a/server/container/guice/memory-guice/sample-configuration/mailetcontainer.xml
+++ b/server/container/guice/memory-guice/sample-configuration/mailetcontainer.xml
@@ -33,31 +33,6 @@
<processor state="root" enableJmx="true">
<mailet match="All" class="PostmasterAlias"/>
<mailet match="RelayLimit=30" class="Null"/>
- <!-- Hook on sievemanager@james.linagora.com
- Mail send to this address will get interpreted with SIEVE Manage -->
- <mailet match="RecipientIs=sievemanager@james.linagora.com" class="ToProcessor">
- <processor>sieve-manager-check</processor>
- </mailet>
- <mailet match="HasMailAttribute=spamChecked" class="ToProcessor">
- <processor>transport</processor>
- </mailet>
- <mailet match="All" class="SetMailAttribute">
- <spamChecked>true</spamChecked>
- </mailet>
- <mailet match="SMTPAuthSuccessful" class="ToProcessor">
- <processor>transport</processor>
- </mailet>
- <mailet match="InSpammerBlacklist=query.bondedsender.org." class="ToProcessor">
- <processor>transport</processor>
- </mailet>
- <!-- Check for delivery from a known spam server -->
- <!-- This set of matchers/mailets redirect all emails from known -->
- <!-- black holes, open relays, and spam servers to the spam processor -->
- <!-- For this set to function properly, the spam processor must be configured. -->
- <mailet match="InSpammerBlacklist=dnsbl.njabl.org." class="ToProcessor">
- <processor>spam</processor>
- <notice>550 Requested action not taken: rejected - see http://njabl.org/</notice>
- </mailet>
<mailet match="All" class="ToProcessor">
<processor>transport</processor>
</mailet>
@@ -70,7 +45,6 @@
</mailet>
</processor>
-
<processor state="transport" enableJmx="true">
<mailet match="SMTPAuthSuccessful" class="SetMimeHeader">
<name>X-UserIsAuth</name>
http://git-wip-us.apache.org/repos/asf/james-project/blob/67e89cc4/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/resources/mailetcontainer.xml
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/resources/mailetcontainer.xml b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/resources/mailetcontainer.xml
index 28bdcee..6a76330 100644
--- a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/resources/mailetcontainer.xml
+++ b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/resources/mailetcontainer.xml
@@ -33,8 +33,6 @@
<processor state="root" enableJmx="false">
<mailet match="All" class="PostmasterAlias"/>
<mailet match="RelayLimit=30" class="Null"/>
- <!-- Hook on sievemanager@james.linagora.com
- Mail send to this address will get interpreted with SIEVE Manage -->
<mailet match="All" class="ToProcessor">
<processor>transport</processor>
</mailet>
@@ -44,7 +42,6 @@
<mailet match="All" class="Bounce"/>
</processor>
-
<processor state="transport" enableJmx="false">
<mailet match="SMTPAuthSuccessful" class="SetMimeHeader">
<name>X-UserIsAuth</name>
http://git-wip-us.apache.org/repos/asf/james-project/blob/67e89cc4/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/resources/mailetcontainer.xml
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/resources/mailetcontainer.xml b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/resources/mailetcontainer.xml
index 28bdcee..6a76330 100644
--- a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/resources/mailetcontainer.xml
+++ b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/resources/mailetcontainer.xml
@@ -33,8 +33,6 @@
<processor state="root" enableJmx="false">
<mailet match="All" class="PostmasterAlias"/>
<mailet match="RelayLimit=30" class="Null"/>
- <!-- Hook on sievemanager@james.linagora.com
- Mail send to this address will get interpreted with SIEVE Manage -->
<mailet match="All" class="ToProcessor">
<processor>transport</processor>
</mailet>
@@ -44,7 +42,6 @@
<mailet match="All" class="Bounce"/>
</processor>
-
<processor state="transport" enableJmx="false">
<mailet match="SMTPAuthSuccessful" class="SetMimeHeader">
<name>X-UserIsAuth</name>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[4/4] james-project git commit: JAMES-1881 Remove unsupported mailet
from default configuration
Posted by bt...@apache.org.
JAMES-1881 Remove unsupported mailet from default configuration
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/62466172
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/62466172
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/62466172
Branch: refs/heads/master
Commit: 62466172d44064bdbf277c4fe30777c4764b4dc7
Parents: 67e89cc
Author: benwa <bt...@linagora.com>
Authored: Tue Apr 18 07:49:04 2017 +0700
Committer: benwa <bt...@linagora.com>
Committed: Wed Apr 19 09:40:06 2017 +0700
----------------------------------------------------------------------
.../main/resources/mailetcontainer-template.xml | 208 ++-----------------
1 file changed, 20 insertions(+), 188 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/62466172/server/app/src/main/resources/mailetcontainer-template.xml
----------------------------------------------------------------------
diff --git a/server/app/src/main/resources/mailetcontainer-template.xml b/server/app/src/main/resources/mailetcontainer-template.xml
index fd205d2..abb8282 100644
--- a/server/app/src/main/resources/mailetcontainer-template.xml
+++ b/server/app/src/main/resources/mailetcontainer-template.xml
@@ -53,61 +53,9 @@
<!-- this requirement through other means (e.g. a XML/JDBCRecipientRewriteTable defined in recipientrewritetable-store.xml) -->
<mailet match="All" class="PostmasterAlias"/>
- <!-- Checks that the email Sender is associated with a valid domain. -->
- <!-- Useful for detecting and eliminating spam. -->
- <!-- For this block to function, the spam processor must be configured. -->
- <!--
- <mailet match="SenderInFakeDomain=64.55.105.9,64.94.110.11,194.205.62.122,194.205.62.62,195.7.77.20,206.253.214.102,212.181.91.6,219.88.106.80,194.205.62.42,216.35.187.246,203.119.4.6" class="ToProcessor">
- <processor>spam</processor>
- </mailet>
- -->
-
<!-- Important check to avoid looping -->
<mailet match="RelayLimit=30" class="Null"/>
- <!-- Check for viruses -->
- <!-- -->
- <!-- Does an antivirus scan check using a ClamAV daemon (CLAMD). -->
- <!-- -->
- <!-- Interacts directly with the daemon using the "stream" method, -->
- <!-- which should have the lowest possible overhead. -->
- <!-- The CLAMD daemon will typically reside on localhost, but could reside on a -->
- <!-- different host. -->
- <!-- It may also consist on a set of multiple daemons, each residing on a different -->
- <!-- server and on different IP number. -->
- <!-- In such case a DNS host name with multiple IP addresses (round-robin load sharing) -->
- <!-- is supported by the mailet (but on the same port number). -->
- <!-- -->
- <!-- Handles the following init parameters: -->
- <!--<debug>-->
- <!--<host>: the host name of the server where CLAMD runs. It can either be -->
- <!-- a machine name, such as -->
- <!-- "java.sun.com", or a textual representation of its -->
- <!-- IP address. If a literal IP address is supplied, only the -->
- <!-- validity of the address format is checked. -->
- <!-- If the machine name resolves to multiple IP addresses, round-robin load sharing will -->
- <!-- be used. -->
- <!-- The default is "localhost". -->
- <!--<port>: the port on which CLAMD listens. The default is "3310". -->
- <!--<maxPings>: the maximum number of connection retries during startup. -->
- <!-- If the value is "0" no startup test will be done. -->
- <!-- The default is "6". -->
- <!--<pingIntervalMilli>: the interval (in milliseconds) -->
- <!-- between each connection retry during startup. -->
- <!-- The default is "30000" (30 seconds). -->
- <!--<streamBufferSize>: the BufferedOutputStream buffer size to use -->
- <!-- writing to the stream connection. The default is "8192". -->
- <!--
- <mailet match="All" class="ClamAVScan" onMailetException="ignore">
- <debug>true</debug>
- </mailet>
- -->
-
- <!-- If infected go to virus processor -->
- <mailet match="HasMailAttributeWithValue=org.apache.james.infected, true" class="ToProcessor">
- <processor>virus</processor>
- </mailet>
-
<!-- Check attachment extensions for possible viruses -->
<!-- The "-z" option requests the check to be non-recursively applied -->
<!-- to the contents of any attached '*.zip' file. -->
@@ -128,55 +76,6 @@ Regards, Postmaster XXX.YYY
</mailet>
-->
- <!-- Whitelist Management -->
- <!-- Manages for each local user a "white list" of remote addresses whose messages -->
- <!-- should never be blocked as spam. -->
- <!-- -->
- <!-- If<automaticInsert>is true, it will check, for a local sender, if a remote recipient -->
- <!-- is already in the list: if not, it will be automatically inserted. -->
- <!-- This is under the interpretation that if a local sender X sends a message to a -->
- <!-- remote recipient Y, then later on if a message is sent by Y to X it should be -->
- <!-- considered always valid and never blocked; hence Y should be in the white list -->
- <!-- of X. -->
- <!-- -->
- <!-- Another mode of operations is when a local sender sends a message to<whitelistManagerAddress>-->
- <!-- with one of three specific values in the subject, to -->
- <!-- (i) send back a message displaying a list of the addresses in his own list (<displayFlag>); -->
- <!-- (ii) insert some new addresses in his own list (<insertFlag>); -->
- <!-- (iii) remove some addresses from his own list (<removeFlag>). -->
- <!-- In all of the three above cases the message will be ghosted and the postmaster will reply -->
- <!-- to the sender. -->
- <!-- -->
- <!-- The sender name is always converted to its primary name (handling aliases). -->
- <!--
- <mailet match="SMTPAuthSuccessful" class="WhiteListManager" onMailetException="ignore">
- <repositoryPath>db://maildb</repositoryPath>
- <automaticInsert>true</automaticInsert>
- <whitelistManagerAddress>whitelist.manager@xxx.yyy</whitelistManagerAddress>
- <displayFlag>display</displayFlag>
- <insertFlag>insert</insertFlag>
- <removeFlag>remove</removeFlag>
- </mailet>
- -->
-
- <!-- "not spam" bayesian analysis feeder. -->
- <!--
- <mailet match="RecipientIs=not.spam@xxx.yyy" class="BayesianAnalysisFeeder">
- <repositoryPath>db://maildb</repositoryPath>
- <feedType>ham</feedType>
- <maxSize>200000</maxSize>
- </mailet>
- -->
-
- <!-- "spam" bayesian analysis feeder. -->
- <!--
- <mailet match="RecipientIs=spam@xxx.yyy" class="BayesianAnalysisFeeder">
- <repositoryPath>db://maildb</repositoryPath>
- <feedType>spam</feedType>
- <maxSize>200000</maxSize>
- </mailet>
- -->
-
<!-- sample SMIME mailets configuration -->
<!--
<mailet match="IsSMIMEEncrypted" class="SMIMEDecrypt">
@@ -196,28 +95,6 @@ Regards, Postmaster XXX.YYY
</mailet>
-->
- <!--
-
- XMLRecipientRewriteTable is deprecated - Use the definitions in recipientrewritetable-store.xml
-
- <mailet match="All" class="XMLRecipientRewriteTable">
- <!- 1:1 mapping ->
- <mapping>morgoth@middle-earth=sauron@mordor</mapping>
- <!- 1:n mapping ->
- <mapping>istari@middle-earth=saruman@isengard;radigast;gandalf</mapping>
- <!- DSN mapping ->
- <mapping>boromir@osgilliath=error:550 Requested action not taken: no such user here</mapping>
- <!- regex based mapping ->
- <mapping>*@osgilliath=regex:(.*)@osgilliath:${1}@minas-tirith</mapping>
- <!- both standard and regex mapping ->
- <mapping>ring@*=onering@mordor;regex:ring@(.*):ring@${1}</mapping>
- <!- conditional regex mapping example ->
- <mapping>*@listserver=regex:(.*)-on@listserver:${1}-subscribe@listserver;
- regex:(.*)-off@listserver:${1}-unsubscribe@listserver
- </mapping>
- </mailet>
-
- -->
<!-- Anti-spam processing -->
<!-- The following two entries avoid double anti-spam analysis -->
@@ -262,53 +139,13 @@ Regards, Postmaster XXX.YYY
</mailet>
-->
- <!-- People on this list agree to pay a penalty if they send spam -->
- <mailet match="InSpammerBlacklist=query.bondedsender.org."
- class="ToProcessor">
- <processor>transport</processor>
- </mailet>
-
- <!-- E-mail legally required not to be spam (see: http://www.habeas.com) -->
- <!--
- <mailet match="HasHabeasWarrantMark" class="ToProcessor">
- <processor>transport</processor>
- </mailet>
- -->
-
- <!-- If the sender is in a recipient's whitelist, it is a valid sender, -->
- <!-- and as such the message should not be considered spam for such recipient. -->
- <!--
- <mailet match="IsInWhiteList=db://maildb" class="ToProcessor" onMatchException="noMatch">
- <processor>transport</processor>
- </mailet>
- -->
-
<!-- End of White List -->
- <!-- Check for delivery from a known spam server -->
- <!-- This set of matchers/mailets redirect all emails from known -->
- <!-- black holes, open relays, and spam servers to the spam processor -->
- <!-- For this set to function properly, the spam processor must be configured. -->
- <mailet match="InSpammerBlacklist=dnsbl.njabl.org."
- class="ToProcessor">
- <processor>spam</processor>
- <notice>550 Requested action not taken: rejected - see http://njabl.org/</notice>
- </mailet>
-
<!-- Sample matching to kill a message (send to Null) -->
<!--
<mailet match="RecipientIs=badboy@badhost" class="Null"/>
-->
-
- <!-- Anti spam bayesian analysis -->
- <!--
- <mailet match="All" class="BayesianAnalysis" onMailetException="ignore">
- <repositoryPath>db://maildb</repositoryPath>
- <maxSize>200000</maxSize>
- <headerName>X-MessageIsSpamProbability</headerName>
- <ignoreLocalSender>true</ignoreLocalSender>
- </mailet>
-
+ <!--
<mailet match="CompareNumericHeaderValue=X-MessageIsSpamProbability >0.90" class="SetMailAttribute" onMatchException="noMatch">
<isSpam>true</isSpam>
</mailet>
@@ -323,11 +160,6 @@ Regards, Postmaster XXX.YYY
<notice>Spam not accepted</notice>
</mailet>
-->
-
- <mailet notmatch="SenderHostIsLocal" class="SpamAssassin">
- <spamdHost>localhost</spamdHost>
- <spamdPort>783</spamdPort>
- </mailet>
<!-- Send remaining mails to the transport processor for either local or remote delivery -->
<mailet match="All" class="ToProcessor">
@@ -398,26 +230,12 @@ Regards, Postmaster XXX.YYY
-->
<!-- Experimental quota Matcher -->
- <!-- This matcher need to calculate the mailbox size everytime it is called. This can slow down things if there are many mails in -->
- <!-- the mailbox. Some users also report big problems with the matcher if a JDBC based mailrepository is used. -->
<!-- Check if over quota -->
- <!--
- <mailet match="RecipientIsOverFixedQuota=20M" class="Resend">
- <sender>postmaster</sender>
- <replyTo>postmaster</replyTo>
- <reversePath>null</reversePath>
- <inline>none</inline>
- <attachment>message</attachment>
- <prefix>[OVER QUOTA WARNING]</prefix>
- <message>
-When receiving the attached message, your mailbox is larger than 20 MB, which is the maximum allowed quota. The mailbox will not be blocked, but we ask you to empty it ASAP.
-
-It is likely that you have set, in your mail client account, the option "leave a copy of messages on server". For any help ask your administrators.
+ <!--
-Regards, Postmaster XXX.YYY
-.....................................
- </message>
- </mailet>
+ <mailet match="IsOverQuota" class="ToProcessor">
+ <processor>over-quota</processor>
+ </mailet>
-->
<!-- The RecipientRewriteTable will use the definitions found in recipientrewritetablexml -->
@@ -536,7 +354,21 @@ Regards, Postmaster XXX.YYY
</processor>
- <!-- Processor CONFIGURATION SAMPLE: spam is a sample custom processor for handling -->
+ <processor state="over-quota" enableJmx="true">
+ <mailet match="All" class="MetricsMailet">
+ <metricName>mailet-over-quota-error</metricName>
+ </mailet>
+ <mailet match="All" class="Bounce">
+ <message>The following recipients do not have enough space for storing the email you sent them.</message>
+ <attachment>none</attachment>
+ </mailet>
+ <mailet match="All" class="ToRepository">
+ <repositoryPath>file://var/mail/over-quota-error/</repositoryPath>
+ </mailet>
+ </processor>
+
+
+ <!-- Processor CONFIGURATION SAMPLE: spam is a sample custom processor for handling -->
<!-- spam. -->
<!-- You can either log these, bounce these, or just ignore them. -->
<processor state="spam" enableJmx="true">
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[2/4] james-project git commit: JAMES-2003 Remove useless
configuration files and options
Posted by bt...@apache.org.
http://git-wip-us.apache.org/repos/asf/james-project/blob/d9008f8c/server/container/cassandra-guice/src/main/java/org/apache/james/modules/data/CassandraSieveRepositoryModule.java
----------------------------------------------------------------------
diff --git a/server/container/cassandra-guice/src/main/java/org/apache/james/modules/data/CassandraSieveRepositoryModule.java b/server/container/cassandra-guice/src/main/java/org/apache/james/modules/data/CassandraSieveRepositoryModule.java
deleted file mode 100644
index 4ea5aa7..0000000
--- a/server/container/cassandra-guice/src/main/java/org/apache/james/modules/data/CassandraSieveRepositoryModule.java
+++ /dev/null
@@ -1,38 +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. *
- ****************************************************************/
-package org.apache.james.modules.data;
-
-import com.google.inject.AbstractModule;
-import com.google.inject.Scopes;
-import com.google.inject.multibindings.Multibinder;
-import org.apache.james.backends.cassandra.components.CassandraModule;
-import org.apache.james.sieve.cassandra.CassandraSieveRepository;
-import org.apache.james.sieverepository.api.SieveRepository;
-
-public class CassandraSieveRepositoryModule extends AbstractModule {
-
- @Override
- public void configure() {
- bind(CassandraSieveRepository.class).in(Scopes.SINGLETON);
- bind(SieveRepository.class).to(CassandraSieveRepository.class);
- Multibinder<CassandraModule> cassandraDataDefinitions = Multibinder.newSetBinder(binder(), CassandraModule.class);
- cassandraDataDefinitions.addBinding().to(org.apache.james.sieve.cassandra.CassandraSieveRepositoryModule.class);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/james-project/blob/d9008f8c/server/container/cassandra-guice/src/test/resources/usersrepository.xml
----------------------------------------------------------------------
diff --git a/server/container/cassandra-guice/src/test/resources/usersrepository.xml b/server/container/cassandra-guice/src/test/resources/usersrepository.xml
deleted file mode 100644
index 85046b3..0000000
--- a/server/container/cassandra-guice/src/test/resources/usersrepository.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
- -->
-
-<usersrepository name="LocalUsers">
- <algorithm>MD5</algorithm>
- <enableVirtualHosting>true</enableVirtualHosting>
-</usersrepository>
-
http://git-wip-us.apache.org/repos/asf/james-project/blob/d9008f8c/server/container/guice/cassandra-ldap-guice/src/test/resources/usersrepository.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/cassandra-ldap-guice/src/test/resources/usersrepository.xml b/server/container/guice/cassandra-ldap-guice/src/test/resources/usersrepository.xml
index bdbc437..6b94f9a 100644
--- a/server/container/guice/cassandra-ldap-guice/src/test/resources/usersrepository.xml
+++ b/server/container/guice/cassandra-ldap-guice/src/test/resources/usersrepository.xml
@@ -20,7 +20,6 @@
<!-- Read-Only LDAP based UsersRepository -->
<usersrepository name="LocalUsers"
- class="org.apache.james.user.ldap.ReadOnlyUsersLDAPRepository"
ldapHost="ldap://myldapserver:389"
principal="cn=admin,dc=james,dc=org"
credentials="mysecretpassword"
http://git-wip-us.apache.org/repos/asf/james-project/blob/d9008f8c/server/container/guice/memory-guice/sample-configuration/domainlist.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/memory-guice/sample-configuration/domainlist.xml b/server/container/guice/memory-guice/sample-configuration/domainlist.xml
index 8d00118..3dc58d2 100644
--- a/server/container/guice/memory-guice/sample-configuration/domainlist.xml
+++ b/server/container/guice/memory-guice/sample-configuration/domainlist.xml
@@ -18,7 +18,7 @@
under the License.
-->
-<domainlist class="org.apache.james.domainlist.jpa.JPADomainList">
+<domainlist>
<domainnames>
<domainname>james.apache.org</domainname>
</domainnames>
http://git-wip-us.apache.org/repos/asf/james-project/blob/d9008f8c/server/container/guice/memory-guice/sample-configuration/quota.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/memory-guice/sample-configuration/quota.xml b/server/container/guice/memory-guice/sample-configuration/quota.xml
deleted file mode 100644
index 70162e0..0000000
--- a/server/container/guice/memory-guice/sample-configuration/quota.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
- -->
-
-<!--
- This template file can be used as example for James Server configuration
- DO NOT USE IT AS SUCH AND ADAPT IT TO YOUR NEEDS
--->
-
-<!-- See http://james.apache.org/server/3/config.html for usage -->
-
-<!--
- This configuration file allows you to customize the way quota are handled on this server.
- You need to rename it in quota.xml so that it gets interpreted by James on startup.
-
- The different configuration options are detailed here.
-
- Read RFC-2087 for full details.
--->
-
-<quota>
- <quotaRootResolver>
- <provider>default</provider>
- </quotaRootResolver>
- <currentQuotaManager>
- <provider>cassandra</provider>
- </currentQuotaManager>
- <maxQuotaManager>
- <provider>cassandra</provider>
- </maxQuotaManager>
- <quotaManager>
- <provider>store</provider>
- </quotaManager>
- <updates>
- <provider>event</provider>
- </updates>
-</quota>
http://git-wip-us.apache.org/repos/asf/james-project/blob/d9008f8c/server/container/guice/memory-guice/sample-configuration/recipientrewritetable.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/memory-guice/sample-configuration/recipientrewritetable.xml b/server/container/guice/memory-guice/sample-configuration/recipientrewritetable.xml
index 7e7f586..5553a40 100644
--- a/server/container/guice/memory-guice/sample-configuration/recipientrewritetable.xml
+++ b/server/container/guice/memory-guice/sample-configuration/recipientrewritetable.xml
@@ -19,7 +19,7 @@
-->
<!-- The default table for storing James' RecipientRewriteTable mappings. -->
-<recipientrewritetable class="org.apache.james.rrt.jpa.JPARecipientRewriteTable">
+<recipientrewritetable>
<recursiveMapping>true</recursiveMapping>
<mappingLimit>10</mappingLimit>
<mapping>some@domain=some</mapping>
http://git-wip-us.apache.org/repos/asf/james-project/blob/d9008f8c/server/container/guice/memory-guice/sample-configuration/usersrepository.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/memory-guice/sample-configuration/usersrepository.xml b/server/container/guice/memory-guice/sample-configuration/usersrepository.xml
index fc76107..cc55c5e 100644
--- a/server/container/guice/memory-guice/sample-configuration/usersrepository.xml
+++ b/server/container/guice/memory-guice/sample-configuration/usersrepository.xml
@@ -18,7 +18,7 @@
under the License.
-->
-<usersrepository name="LocalUsers" class="org.apache.james.user.jpa.JPAUsersRepository">
+<usersrepository name="LocalUsers">
<destination URL="file://users/"/>
<algorithm>MD5</algorithm>
<enableVirtualHosting>true</enableVirtualHosting>
http://git-wip-us.apache.org/repos/asf/james-project/blob/d9008f8c/server/mailet/integration-testing/src/test/resources/domainlist.xml
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/resources/domainlist.xml b/server/mailet/integration-testing/src/test/resources/domainlist.xml
index e2797bb..d9040c0 100644
--- a/server/mailet/integration-testing/src/test/resources/domainlist.xml
+++ b/server/mailet/integration-testing/src/test/resources/domainlist.xml
@@ -20,7 +20,7 @@
<!-- See http://james.apache.org/server/3/config.html for usage -->
-<domainlist class="org.apache.james.domainlist.jpa.JPADomainList">
+<domainlist>
<autodetect>true</autodetect>
<autodetectIP>true</autodetectIP>
<defaultDomain>localhost</defaultDomain>
http://git-wip-us.apache.org/repos/asf/james-project/blob/d9008f8c/server/protocols/webadmin-integration-test/src/test/resources/fakemailrepositorystore.xml
----------------------------------------------------------------------
diff --git a/server/protocols/webadmin-integration-test/src/test/resources/fakemailrepositorystore.xml b/server/protocols/webadmin-integration-test/src/test/resources/fakemailrepositorystore.xml
deleted file mode 100644
index 2d19a80..0000000
--- a/server/protocols/webadmin-integration-test/src/test/resources/fakemailrepositorystore.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.
- -->
-
-<mailrepositorystore>
- <mailrepositories>
- <mailrepository class="org.apache.james.mailrepository.None">
- <protocols>
- <protocol>file</protocol>
- </protocols>
- <config FIFO="false" CACHEKEYS="true"/>
- </mailrepository>
- </mailrepositories>
-</mailrepositorystore>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[3/4] james-project git commit: JAMES-2003 Remove useless
configuration files and options
Posted by bt...@apache.org.
JAMES-2003 Remove useless configuration files and options
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/d9008f8c
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/d9008f8c
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/d9008f8c
Branch: refs/heads/master
Commit: d9008f8c9db8362a54db02967a15b20fbe54602e
Parents: 77ee834
Author: benwa <bt...@linagora.com>
Authored: Tue Apr 18 07:26:55 2017 +0700
Committer: benwa <bt...@linagora.com>
Committed: Wed Apr 19 09:39:40 2017 +0700
----------------------------------------------------------------------
.../destination/conf/domainlist.xml | 2 +-
.../destination/conf/fetchmail.xml | 288 -------------------
.../cassandra-ldap/destination/conf/indexer.xml | 23 --
.../cassandra-ldap/destination/conf/quota.xml | 53 ----
.../destination/conf/recipientrewritetable.xml | 2 +-
.../destination/conf/usersrepository.xml | 3 +-
.../cassandra/destination/conf/domainlist.xml | 2 +-
.../cassandra/destination/conf/fetchmail.xml | 288 -------------------
.../cassandra/destination/conf/indexer.xml | 23 --
.../guice/cassandra/destination/conf/quota.xml | 53 ----
.../destination/conf/recipientrewritetable.xml | 2 +-
.../conf/META-INF/jpa-mappings-template.xml | 40 ---
.../conf/META-INF/persistence-template.xml | 80 ------
.../destination/conf/META-INF/persistence.xml | 47 ---
.../guice/jpa/destination/conf/domainlist.xml | 2 +-
.../guice/jpa/destination/conf/fetchmail.xml | 288 -------------------
.../run/guice/jpa/destination/conf/indexer.xml | 23 --
.../run/guice/jpa/destination/conf/quota.xml | 53 ----
.../destination/conf/recipientrewritetable.xml | 2 +-
.../cassandra/src/test/resources/domainlist.xml | 2 +-
.../test/resources/recipientrewritetable.xml | 2 +-
.../data/CassandraSieveRepositoryModule.java | 38 ---
.../src/test/resources/usersrepository.xml | 25 --
.../src/test/resources/usersrepository.xml | 1 -
.../sample-configuration/domainlist.xml | 2 +-
.../memory-guice/sample-configuration/quota.xml | 53 ----
.../recipientrewritetable.xml | 2 +-
.../sample-configuration/usersrepository.xml | 2 +-
.../src/test/resources/domainlist.xml | 2 +-
.../test/resources/fakemailrepositorystore.xml | 31 --
30 files changed, 13 insertions(+), 1421 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/d9008f8c/dockerfiles/run/guice/cassandra-ldap/destination/conf/domainlist.xml
----------------------------------------------------------------------
diff --git a/dockerfiles/run/guice/cassandra-ldap/destination/conf/domainlist.xml b/dockerfiles/run/guice/cassandra-ldap/destination/conf/domainlist.xml
index fc64fd2..ad37476 100644
--- a/dockerfiles/run/guice/cassandra-ldap/destination/conf/domainlist.xml
+++ b/dockerfiles/run/guice/cassandra-ldap/destination/conf/domainlist.xml
@@ -18,7 +18,7 @@
under the License.
-->
-<domainlist class="org.apache.james.domainlist.jpa.JPADomainList">
+<domainlist>
<domainnames>
<domainname>james.linagora.com</domainname>
</domainnames>
http://git-wip-us.apache.org/repos/asf/james-project/blob/d9008f8c/dockerfiles/run/guice/cassandra-ldap/destination/conf/fetchmail.xml
----------------------------------------------------------------------
diff --git a/dockerfiles/run/guice/cassandra-ldap/destination/conf/fetchmail.xml b/dockerfiles/run/guice/cassandra-ldap/destination/conf/fetchmail.xml
deleted file mode 100644
index 96aa946..0000000
--- a/dockerfiles/run/guice/cassandra-ldap/destination/conf/fetchmail.xml
+++ /dev/null
@@ -1,288 +0,0 @@
-<?xml version="1.0"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
- -->
-
-<!--
- This template file can be used as example for James Server configuration
- DO NOT USE IT AS SUCH AND ADAPT IT TO YOUR NEEDS
--->
-
-<!-- See http://james.apache.org/server/3/config.html for usage -->
-
-<!-- Fetch mail block, fetches mail from message servers and inserts it into the incoming spool -->
-<!-- Warning: It is important to prevent mail from looping by setting the -->
-<!-- fetched domains in the<servernames>section of the<James>block -->
-<!-- above. This block is disabled by default. -->
-
-<!-- See http://james.apache.org/server/2.3.0/fetchmail_configuration.html for detailed -->
-<!-- configuration instructions and examples. -->
-
-<!-- I M P O R T A N T -->
-<!-- Setting markseen="true" will have no effect on many POP3 servers as the POP3 -->
-<!-- protocol does not require the markSeen flag to be supported. When this is the -->
-<!-- case, the only way to ensure that messages are fetched just once is to delete -->
-<!-- fetched messages from the server with leaveonserver="false". -->
-
-<!-- If you want to perform mailet processing on messages fetched by fetchmail, -->
-<!-- use the HasMailAttribute matcher to detect messages with the MailAttribute -->
-<!-- org.apache.james.fetchmail.taskName. The attribute's value is that of the -->
-<!-- fetch task's name parameter described below. -->
-
-<fetchmail enabled="false">
-
- <!-- The number of threads to use for the scheduled execution -->
- <threads>5</threads>
-
- <!-- The JMX Name to use -->
- <jmxName>fetchmail</jmxName>
-
- <!-- You can have as many fetch tasks as you want, but each must have a -->
- <!-- unique name by which it is identified. -->
- <!-- Each task runs at the specified<interval>, tasks may run concurrently. -->
-
- <fetch name="mydomain.com">
- <!-- There must be one<accounts>entry per fetch task. An accounts entry can have 0 to many -->
- <!--<account>entries and 0 or 1<alllocal>entries.<alllocal>generates -->
- <!--<accounts>for every user defined to James.<accounts>run consecutively within the -->
- <!-- scope of their fetch task and inherit all the properties of the fetch task. -->
-
- <!-- The advantage of running consecutively is that we can avoid conflicting fetch tasks -->
- <!-- operating concurrently on the same mailboxes. -->
-
- <!-- Fetchmail attempts to deduce the correct recipient of each message, but sometimes there is -->
- <!-- insufficient information in the headers to do so. When the correct recipient cannot be deduced, -->
- <!-- fetchmail can be configured to leave the mail on the server or deliver it to a default recipient. -->
-
- <!-- When a message server delivers mail for a single user to a specific INBOX you can define -->
- <!-- each user to James (via the console) and use<alllocal>with ignorercpt-header="true" to deliver mail -->
- <!-- directly from each users INBOX onto James' spool. There is no need to update 'config.xml' -->
- <!-- each time you add or remove users, fetchmail checks the list of users at the start of each fetch. -->
-
- <!-- When a message server provides an account that gives access to all mail for a domain through a single -->
- <!-- INBOX, you can use an<account>to fetch all the mail for that domain, using the filter facilities -->
- <!-- described below to reject unwanted messages. -->
-
- <!-- When a message server supports BOTH delivery for a single user to a specific INBOX and access to all mail -->
- <!-- for a domain through a single INBOX, you can use<alllocal>and<account>together to guarantee that all -->
- <!-- local mail gets delivered to the correct user and all unwanted mail is deleted from the message -->
- <!-- server. See http://james.apache.org/server/2.3.0/fetchmail_configuration.html for details. -->
-
- <!-- Limitations and Future Directions -->
- <!-- 1)<alllocal>requires the password for all accounts for a domain on the message server be the same. True -->
- <!-- in many cases, but not all. A future version might work out a way of associating James users with a set -->
- <!-- of account properties. -->
- <!-- 2)<alllocal>will try to access an INBOX on the message server for all local users. The instance of James used -->
- <!-- for this purpose should not have extraneous users defined. This is inefficient, but not fatal. -->
- <!-- Again, a future version might work out a way of associating James users with message account properties. -->
- <!-- This would allow all local users with an account on a particular message server to be fetched. -->
-
- <accounts>
- <alllocal userprefix="" usersuffix="@myaccount" password="password" recipientprefix="" recipientsuffix="@mydomain.com" ignorercpt-header="true"/>
- <account user="myglobalaccount" password="password" recipient="postmaster@localhost" ignorercpt-header="false"/>
- <!-- Custom recipient header handling -->
- <!-- this example search an header named X-Envelope-To and use the recipient found in that header -->
- <!--
- <account customrcpt-header="X-Envelope-To" user="myglobalaccount" password="password" recipient="postmaster@localhost" ignorercpt-header="false"/>
- -->
- </accounts>
-
- <!-- The address of the server from which to fetch the mail -->
- <host>pop.server.com</host>
-
- <!-- How frequently this host is checked - in milliseconds. 600000 is every ten minutes -->
- <interval>600000</interval>
-
- <!-- name of the javamail provider you wish to use -->
- <!-- (pop3, imap, etc. -->
- <javaMailProviderName>pop3</javaMailProviderName>
-
- <!-- name of the folder to open -->
- <javaMailFolderName>INBOX</javaMailFolderName>
-
- <!-- Properties to be applied to the JavaMail Session. -->
- <!-- Properties are specific to the selected JavaMail provider. -->
- <!-- Any number may be specified. -->
- <javaMailProperties>
- <!-- Set the connection timeout to 3 minutes -->
- <property name="mail.pop3.connectiontimeout" value="180000"/>
- <!-- Set the I/O timeout to 3 minutes -->
- <property name="mail.pop3.timeout" value="180000"/>
- </javaMailProperties>
-
- <!-- Retrieve both old (seen) and new messages from mailserver. The default -->
- <!-- is to fetch only messages the server has not marked as seen -->
- <fetchall>false</fetchall>
-
- <!-- If the folder javaMailFolderName contains subfolders do you -->
- <!-- want to recurse into the subfolders as well? true = yes, false = no -->
- <recursesubfolders>false</recursesubfolders>
-
- <!-- If the From: header of a fetched message has a valid user part -->
- <!-- but no domain part the fetch task will correct this by appending -->
- <!-- a default domain. eg: 'james' becomes 'james@defaultdomain' -->
- <!-- The default behaviour is to append the canonical host name of the James server. -->
- <!-- You can override this behaviour here by specifying the name of the domain -->
- <!-- you wish to append. The name you choose must be a local server or you can -->
- <!-- use the name localhost -->
- <!-- Example using a locally served domain -->
- <!--
- <defaultdomain>mydomain.com</defaultdomain>
- -->
- <!-- Example using localhost -->
- <!--
- <defaultdomain>localhost</defaultdomain>
- -->
-
- <!-- Specify what happens to messages succesfully fetched from the mailserver -->
- <!-- leaveonserver -->
- <!-- if true, messages will be left on the server -->
- <!-- if false, messages will be deleted from the server -->
- <!-- markseen -->
- <!-- if true, messages left on the server will be marked as seen -->
- <!-- if false, messages left on the server will not be marked as seen -->
- <fetched leaveonserver="false" markseen="true"/>
-
- <!-- Specify the index of the RECEIVED Header used to compute the remote address and remote host name -->
- <!-- and what happens to messages that contain an invalid header at that index. -->
- <!-- Matchers such as InSpammerBlacklist use the remote address and/or remote host name to identify illegitimate -->
- <!-- remote MTAs. -->
- <!-- This tag is optional. If omitted, the remote address will be set to 127.0.0.1 and the remote domain -->
- <!-- will be set to 'localhost'. Both are almost always considered legitimate. -->
- <!-- index -->
- <!-- The zero based index of the RECEIVED Header used to compute the remote address and remote host name -->
- <!-- of the MTA that delivered a fetched message. -->
- <!-- Typically, the first (index = 0) RECEIVED Header is for the local MTA that delivers mail to the message store -->
- <!-- and the second RECEIVED Header (index = 1) is the remote domain delivering mail to the MTA, so the second -->
- <!-- RECEIVED Header is the one to use. -->
- <!-- Some configurations will differ. Look at the RECEIVED Headers and set the index to point to the first remote MTA. -->
- <!-- An index of -1 is is interpreted as use 127.0.0.1 for the remote address and use 'localhost' for the remote host name. -->
- <!-- reject -->
- <!-- if true, messages whose received header at the specified index is invalid will be rejected -->
- <!-- if false, messages whose received header at the specified index is invalid will be accepted -->
- <!-- and the Mail Attribute "org.apache.james.fetchmail.isInvalidReceivedHeader" -->
- <!-- will be added to the message. Use the HasMailAttribute matcher to detect them. -->
- <!-- The following apply if reject="true" and a message is rejected... -->
- <!-- leaveonserver -->
- <!-- if true, messages will be left on the server -->
- <!-- if false, messages will be deleted from the server -->
- <!-- markseen -->
- <!-- if true, messages left on the server will be marked as seen -->
- <!-- if false, messages left on the server will not be marked as seen -->
- <remotereceivedheader index="1" reject="true" leaveonserver="true" markseen="false"/>
-
- <!-- Specify what happens to messages whose size exceeds the specified limit. -->
- <!-- This tag is optional. If omitted, there is no limit. -->
- <!-- limit -->
- <!-- The maximum message size in Kilobytes of messages injected into James. -->
- <!-- A value of 0 means no limit. -->
- <!-- reject -->
- <!-- if true, messages whose size exceeds the limit will be rejected -->
- <!-- if false, messages whose size exceeds the limit will be stripped of their message bodies -->
- <!-- prior to injection into James and the MailAttribute "org.apache.james.fetchmail.isMaxMessageSizeExceeded" -->
- <!-- will be added to the message with the value set to the original message size in bytes. -->
- <!-- Use the HasMailAttribute matcher to detect them. -->
- <!-- The following apply if reject="true" and a message is rejected... -->
- <!-- leaveonserver -->
- <!-- if true, messages will be left on the server -->
- <!-- if false, messages will be deleted from the server -->
- <!-- markseen -->
- <!-- if true, messages left on the server will be marked as seen -->
- <!-- if false, messages left on the server will not be marked as seen -->
- <maxmessagesize limit="0" reject="false" leaveonserver="true" markseen="false"/>
-
- <!-- Specify what happens to undeliverable messages -->
- <!-- leaveonserver -->
- <!-- if true, messages will be left on the server -->
- <!-- if false, messages will be deleted from the server -->
- <!-- markseen -->
- <!-- if true, messages left on the server will be marked as seen -->
- <!-- if false, messages left on the server will not be marked as seen -->
- <undeliverable leaveonserver="true" markseen="false"/>
-
- <!-- Specify what happens to messages for which a recipient cannot be determined. -->
- <!-- defer -->
- <!-- if true, processing of messages for which a recipient cannot be determined will deferred -->
- <!-- until the next fetch of the Account. This gives an opportunity for other Accounts in the -->
- <!-- fetch task to determine the recipient and process the mail. -->
- <!-- if false, messages for which a recipient cannot be determined are processed immediately. -->
- <!-- reject -->
- <!-- if true, messages for which a recipient cannot be determined will be rejected -->
- <!-- if false, messages for which a recipient cannot be determined will be accepted, -->
- <!-- the account recipient will be used and the MailAttribute "org.apache.james.fetchmail.isRecipientNotFound" -->
- <!-- will be added to the message. Use the HasMailAttribute matcher to detect them. -->
- <!-- The following apply if reject="true" and a message is rejected... -->
- <!-- leaveonserver -->
- <!-- if true, messages will be left on the server -->
- <!-- if false, messages will be deleted from the server -->
- <!-- markseen -->
- <!-- if true, messages left on the server will be marked as seen -->
- <!-- if false, messages left on the server will not be marked as seen -->
- <recipientnotfound defer="true" reject="true" leaveonserver="true" markseen="false"/>
-
- <!-- Specify a list of recipients for whom messages will be rejected -->
- <!-- and what happens to rejected messages. -->
- <!-- The list can be comma, tab or space delimited. -->
- <!-- reject -->
- <!-- if true, messages for users on the blacklist will be rejected -->
- <!-- if false, messages for users on the blacklist will be accepted -->
- <!-- and the Mail Attribute "org.apache.james.fetchmail.isBlacklistedRecipient" -->
- <!-- will be added to the message. Use the HasMailAttribute matcher to detect them. -->
- <!-- The following apply if reject="true" and a message is rejected... -->
- <!-- leaveonserver -->
- <!-- if true, messages will be left on the server -->
- <!-- if false, messages will be deleted from the server -->
- <!-- markseen -->
- <!-- if true, messages left on the server will be marked as seen -->
- <!-- if false, messages left on the server will not be marked as seen -->
- <blacklist reject="true" leaveonserver="true" markseen="false">wibble@localhost, flobble@localhost</blacklist>
-
- <!-- Specify if messages for users who are not defined to James should -->
- <!-- be rejected and what happens to rejected messages. -->
- <!-- reject -->
- <!-- if true, messages for users who are not defined to James will be rejected -->
- <!-- if false, messages for users who are not defined to James will be accepted -->
- <!-- and the Mail Attribute "org.apache.james.fetchmail.isUserUndefined" -->
- <!-- will be added to the message. Use the HasMailAttribute matcher to detect them. -->
- <!-- The following apply if reject="true" and a message is rejected... -->
- <!-- leaveonserver -->
- <!-- if true, messages will be left on the server -->
- <!-- if false, messages will be deleted from the server -->
- <!-- markseen -->
- <!-- if true, messages left on the server will be marked as seen -->
- <!-- if false, messages left on the server will not be marked as seen -->
- <userundefined reject="true" leaveonserver="true" markseen="false" />
-
- <!-- Specify if messages for recipients on remote hosts should -->
- <!-- be rejected and what happens to rejected messages. -->
- <!-- reject -->
- <!-- if true, messages for remote recipients will be rejected -->
- <!-- if false, messages for remote recipients will be accepted -->
- <!-- and the Mail Attribute "org.apache.james.fetchmail.isRemoteRecipient" -->
- <!-- will be added to the message. Use the HasMailAttribute matcher to detect them. -->
- <!-- The following apply if reject="true" and a message is rejected... -->
- <!-- leaveonserver -->
- <!-- if true, messages will be left on the server -->
- <!-- if false, messages will be deleted from the server -->
- <!-- markseen -->
- <!-- if true, messages left on the server will be marked as seen -->
- <!-- if false, messages left on the server will not be marked as seen -->
- <remoterecipient reject="true" leaveonserver="true" markseen="false" />
- </fetch>
-
-</fetchmail>
http://git-wip-us.apache.org/repos/asf/james-project/blob/d9008f8c/dockerfiles/run/guice/cassandra-ldap/destination/conf/indexer.xml
----------------------------------------------------------------------
diff --git a/dockerfiles/run/guice/cassandra-ldap/destination/conf/indexer.xml b/dockerfiles/run/guice/cassandra-ldap/destination/conf/indexer.xml
deleted file mode 100644
index ced1a62..0000000
--- a/dockerfiles/run/guice/cassandra-ldap/destination/conf/indexer.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
- -->
-
-<indexer>
- <provider>elasticsearch</provider>
-</indexer>
http://git-wip-us.apache.org/repos/asf/james-project/blob/d9008f8c/dockerfiles/run/guice/cassandra-ldap/destination/conf/quota.xml
----------------------------------------------------------------------
diff --git a/dockerfiles/run/guice/cassandra-ldap/destination/conf/quota.xml b/dockerfiles/run/guice/cassandra-ldap/destination/conf/quota.xml
deleted file mode 100644
index 70162e0..0000000
--- a/dockerfiles/run/guice/cassandra-ldap/destination/conf/quota.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
- -->
-
-<!--
- This template file can be used as example for James Server configuration
- DO NOT USE IT AS SUCH AND ADAPT IT TO YOUR NEEDS
--->
-
-<!-- See http://james.apache.org/server/3/config.html for usage -->
-
-<!--
- This configuration file allows you to customize the way quota are handled on this server.
- You need to rename it in quota.xml so that it gets interpreted by James on startup.
-
- The different configuration options are detailed here.
-
- Read RFC-2087 for full details.
--->
-
-<quota>
- <quotaRootResolver>
- <provider>default</provider>
- </quotaRootResolver>
- <currentQuotaManager>
- <provider>cassandra</provider>
- </currentQuotaManager>
- <maxQuotaManager>
- <provider>cassandra</provider>
- </maxQuotaManager>
- <quotaManager>
- <provider>store</provider>
- </quotaManager>
- <updates>
- <provider>event</provider>
- </updates>
-</quota>
http://git-wip-us.apache.org/repos/asf/james-project/blob/d9008f8c/dockerfiles/run/guice/cassandra-ldap/destination/conf/recipientrewritetable.xml
----------------------------------------------------------------------
diff --git a/dockerfiles/run/guice/cassandra-ldap/destination/conf/recipientrewritetable.xml b/dockerfiles/run/guice/cassandra-ldap/destination/conf/recipientrewritetable.xml
index fde339b..3d44578 100644
--- a/dockerfiles/run/guice/cassandra-ldap/destination/conf/recipientrewritetable.xml
+++ b/dockerfiles/run/guice/cassandra-ldap/destination/conf/recipientrewritetable.xml
@@ -19,7 +19,7 @@
-->
<!-- The default table for storing James' RecipientRewriteTable mappings. -->
-<recipientrewritetable class="org.apache.james.rrt.jpa.JPARecipientRewriteTable">
+<recipientrewritetable>
<recursiveMapping>true</recursiveMapping>
<mappingLimit>10</mappingLimit>
</recipientrewritetable>
http://git-wip-us.apache.org/repos/asf/james-project/blob/d9008f8c/dockerfiles/run/guice/cassandra-ldap/destination/conf/usersrepository.xml
----------------------------------------------------------------------
diff --git a/dockerfiles/run/guice/cassandra-ldap/destination/conf/usersrepository.xml b/dockerfiles/run/guice/cassandra-ldap/destination/conf/usersrepository.xml
index d08625b..afb53f9 100644
--- a/dockerfiles/run/guice/cassandra-ldap/destination/conf/usersrepository.xml
+++ b/dockerfiles/run/guice/cassandra-ldap/destination/conf/usersrepository.xml
@@ -18,8 +18,7 @@
under the License.
-->
-<repository name="LocalUsers"
- class="org.apache.james.user.ldap.ReadOnlyUsersLDAPRepository"
+<repository name="LocalUsers"
ldapHost="ldap://myldapserver:389"
principal="uid=ldapUser,ou=system"
credentials="password"
http://git-wip-us.apache.org/repos/asf/james-project/blob/d9008f8c/dockerfiles/run/guice/cassandra/destination/conf/domainlist.xml
----------------------------------------------------------------------
diff --git a/dockerfiles/run/guice/cassandra/destination/conf/domainlist.xml b/dockerfiles/run/guice/cassandra/destination/conf/domainlist.xml
index fc64fd2..ad37476 100644
--- a/dockerfiles/run/guice/cassandra/destination/conf/domainlist.xml
+++ b/dockerfiles/run/guice/cassandra/destination/conf/domainlist.xml
@@ -18,7 +18,7 @@
under the License.
-->
-<domainlist class="org.apache.james.domainlist.jpa.JPADomainList">
+<domainlist>
<domainnames>
<domainname>james.linagora.com</domainname>
</domainnames>
http://git-wip-us.apache.org/repos/asf/james-project/blob/d9008f8c/dockerfiles/run/guice/cassandra/destination/conf/fetchmail.xml
----------------------------------------------------------------------
diff --git a/dockerfiles/run/guice/cassandra/destination/conf/fetchmail.xml b/dockerfiles/run/guice/cassandra/destination/conf/fetchmail.xml
deleted file mode 100644
index 96aa946..0000000
--- a/dockerfiles/run/guice/cassandra/destination/conf/fetchmail.xml
+++ /dev/null
@@ -1,288 +0,0 @@
-<?xml version="1.0"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
- -->
-
-<!--
- This template file can be used as example for James Server configuration
- DO NOT USE IT AS SUCH AND ADAPT IT TO YOUR NEEDS
--->
-
-<!-- See http://james.apache.org/server/3/config.html for usage -->
-
-<!-- Fetch mail block, fetches mail from message servers and inserts it into the incoming spool -->
-<!-- Warning: It is important to prevent mail from looping by setting the -->
-<!-- fetched domains in the<servernames>section of the<James>block -->
-<!-- above. This block is disabled by default. -->
-
-<!-- See http://james.apache.org/server/2.3.0/fetchmail_configuration.html for detailed -->
-<!-- configuration instructions and examples. -->
-
-<!-- I M P O R T A N T -->
-<!-- Setting markseen="true" will have no effect on many POP3 servers as the POP3 -->
-<!-- protocol does not require the markSeen flag to be supported. When this is the -->
-<!-- case, the only way to ensure that messages are fetched just once is to delete -->
-<!-- fetched messages from the server with leaveonserver="false". -->
-
-<!-- If you want to perform mailet processing on messages fetched by fetchmail, -->
-<!-- use the HasMailAttribute matcher to detect messages with the MailAttribute -->
-<!-- org.apache.james.fetchmail.taskName. The attribute's value is that of the -->
-<!-- fetch task's name parameter described below. -->
-
-<fetchmail enabled="false">
-
- <!-- The number of threads to use for the scheduled execution -->
- <threads>5</threads>
-
- <!-- The JMX Name to use -->
- <jmxName>fetchmail</jmxName>
-
- <!-- You can have as many fetch tasks as you want, but each must have a -->
- <!-- unique name by which it is identified. -->
- <!-- Each task runs at the specified<interval>, tasks may run concurrently. -->
-
- <fetch name="mydomain.com">
- <!-- There must be one<accounts>entry per fetch task. An accounts entry can have 0 to many -->
- <!--<account>entries and 0 or 1<alllocal>entries.<alllocal>generates -->
- <!--<accounts>for every user defined to James.<accounts>run consecutively within the -->
- <!-- scope of their fetch task and inherit all the properties of the fetch task. -->
-
- <!-- The advantage of running consecutively is that we can avoid conflicting fetch tasks -->
- <!-- operating concurrently on the same mailboxes. -->
-
- <!-- Fetchmail attempts to deduce the correct recipient of each message, but sometimes there is -->
- <!-- insufficient information in the headers to do so. When the correct recipient cannot be deduced, -->
- <!-- fetchmail can be configured to leave the mail on the server or deliver it to a default recipient. -->
-
- <!-- When a message server delivers mail for a single user to a specific INBOX you can define -->
- <!-- each user to James (via the console) and use<alllocal>with ignorercpt-header="true" to deliver mail -->
- <!-- directly from each users INBOX onto James' spool. There is no need to update 'config.xml' -->
- <!-- each time you add or remove users, fetchmail checks the list of users at the start of each fetch. -->
-
- <!-- When a message server provides an account that gives access to all mail for a domain through a single -->
- <!-- INBOX, you can use an<account>to fetch all the mail for that domain, using the filter facilities -->
- <!-- described below to reject unwanted messages. -->
-
- <!-- When a message server supports BOTH delivery for a single user to a specific INBOX and access to all mail -->
- <!-- for a domain through a single INBOX, you can use<alllocal>and<account>together to guarantee that all -->
- <!-- local mail gets delivered to the correct user and all unwanted mail is deleted from the message -->
- <!-- server. See http://james.apache.org/server/2.3.0/fetchmail_configuration.html for details. -->
-
- <!-- Limitations and Future Directions -->
- <!-- 1)<alllocal>requires the password for all accounts for a domain on the message server be the same. True -->
- <!-- in many cases, but not all. A future version might work out a way of associating James users with a set -->
- <!-- of account properties. -->
- <!-- 2)<alllocal>will try to access an INBOX on the message server for all local users. The instance of James used -->
- <!-- for this purpose should not have extraneous users defined. This is inefficient, but not fatal. -->
- <!-- Again, a future version might work out a way of associating James users with message account properties. -->
- <!-- This would allow all local users with an account on a particular message server to be fetched. -->
-
- <accounts>
- <alllocal userprefix="" usersuffix="@myaccount" password="password" recipientprefix="" recipientsuffix="@mydomain.com" ignorercpt-header="true"/>
- <account user="myglobalaccount" password="password" recipient="postmaster@localhost" ignorercpt-header="false"/>
- <!-- Custom recipient header handling -->
- <!-- this example search an header named X-Envelope-To and use the recipient found in that header -->
- <!--
- <account customrcpt-header="X-Envelope-To" user="myglobalaccount" password="password" recipient="postmaster@localhost" ignorercpt-header="false"/>
- -->
- </accounts>
-
- <!-- The address of the server from which to fetch the mail -->
- <host>pop.server.com</host>
-
- <!-- How frequently this host is checked - in milliseconds. 600000 is every ten minutes -->
- <interval>600000</interval>
-
- <!-- name of the javamail provider you wish to use -->
- <!-- (pop3, imap, etc. -->
- <javaMailProviderName>pop3</javaMailProviderName>
-
- <!-- name of the folder to open -->
- <javaMailFolderName>INBOX</javaMailFolderName>
-
- <!-- Properties to be applied to the JavaMail Session. -->
- <!-- Properties are specific to the selected JavaMail provider. -->
- <!-- Any number may be specified. -->
- <javaMailProperties>
- <!-- Set the connection timeout to 3 minutes -->
- <property name="mail.pop3.connectiontimeout" value="180000"/>
- <!-- Set the I/O timeout to 3 minutes -->
- <property name="mail.pop3.timeout" value="180000"/>
- </javaMailProperties>
-
- <!-- Retrieve both old (seen) and new messages from mailserver. The default -->
- <!-- is to fetch only messages the server has not marked as seen -->
- <fetchall>false</fetchall>
-
- <!-- If the folder javaMailFolderName contains subfolders do you -->
- <!-- want to recurse into the subfolders as well? true = yes, false = no -->
- <recursesubfolders>false</recursesubfolders>
-
- <!-- If the From: header of a fetched message has a valid user part -->
- <!-- but no domain part the fetch task will correct this by appending -->
- <!-- a default domain. eg: 'james' becomes 'james@defaultdomain' -->
- <!-- The default behaviour is to append the canonical host name of the James server. -->
- <!-- You can override this behaviour here by specifying the name of the domain -->
- <!-- you wish to append. The name you choose must be a local server or you can -->
- <!-- use the name localhost -->
- <!-- Example using a locally served domain -->
- <!--
- <defaultdomain>mydomain.com</defaultdomain>
- -->
- <!-- Example using localhost -->
- <!--
- <defaultdomain>localhost</defaultdomain>
- -->
-
- <!-- Specify what happens to messages succesfully fetched from the mailserver -->
- <!-- leaveonserver -->
- <!-- if true, messages will be left on the server -->
- <!-- if false, messages will be deleted from the server -->
- <!-- markseen -->
- <!-- if true, messages left on the server will be marked as seen -->
- <!-- if false, messages left on the server will not be marked as seen -->
- <fetched leaveonserver="false" markseen="true"/>
-
- <!-- Specify the index of the RECEIVED Header used to compute the remote address and remote host name -->
- <!-- and what happens to messages that contain an invalid header at that index. -->
- <!-- Matchers such as InSpammerBlacklist use the remote address and/or remote host name to identify illegitimate -->
- <!-- remote MTAs. -->
- <!-- This tag is optional. If omitted, the remote address will be set to 127.0.0.1 and the remote domain -->
- <!-- will be set to 'localhost'. Both are almost always considered legitimate. -->
- <!-- index -->
- <!-- The zero based index of the RECEIVED Header used to compute the remote address and remote host name -->
- <!-- of the MTA that delivered a fetched message. -->
- <!-- Typically, the first (index = 0) RECEIVED Header is for the local MTA that delivers mail to the message store -->
- <!-- and the second RECEIVED Header (index = 1) is the remote domain delivering mail to the MTA, so the second -->
- <!-- RECEIVED Header is the one to use. -->
- <!-- Some configurations will differ. Look at the RECEIVED Headers and set the index to point to the first remote MTA. -->
- <!-- An index of -1 is is interpreted as use 127.0.0.1 for the remote address and use 'localhost' for the remote host name. -->
- <!-- reject -->
- <!-- if true, messages whose received header at the specified index is invalid will be rejected -->
- <!-- if false, messages whose received header at the specified index is invalid will be accepted -->
- <!-- and the Mail Attribute "org.apache.james.fetchmail.isInvalidReceivedHeader" -->
- <!-- will be added to the message. Use the HasMailAttribute matcher to detect them. -->
- <!-- The following apply if reject="true" and a message is rejected... -->
- <!-- leaveonserver -->
- <!-- if true, messages will be left on the server -->
- <!-- if false, messages will be deleted from the server -->
- <!-- markseen -->
- <!-- if true, messages left on the server will be marked as seen -->
- <!-- if false, messages left on the server will not be marked as seen -->
- <remotereceivedheader index="1" reject="true" leaveonserver="true" markseen="false"/>
-
- <!-- Specify what happens to messages whose size exceeds the specified limit. -->
- <!-- This tag is optional. If omitted, there is no limit. -->
- <!-- limit -->
- <!-- The maximum message size in Kilobytes of messages injected into James. -->
- <!-- A value of 0 means no limit. -->
- <!-- reject -->
- <!-- if true, messages whose size exceeds the limit will be rejected -->
- <!-- if false, messages whose size exceeds the limit will be stripped of their message bodies -->
- <!-- prior to injection into James and the MailAttribute "org.apache.james.fetchmail.isMaxMessageSizeExceeded" -->
- <!-- will be added to the message with the value set to the original message size in bytes. -->
- <!-- Use the HasMailAttribute matcher to detect them. -->
- <!-- The following apply if reject="true" and a message is rejected... -->
- <!-- leaveonserver -->
- <!-- if true, messages will be left on the server -->
- <!-- if false, messages will be deleted from the server -->
- <!-- markseen -->
- <!-- if true, messages left on the server will be marked as seen -->
- <!-- if false, messages left on the server will not be marked as seen -->
- <maxmessagesize limit="0" reject="false" leaveonserver="true" markseen="false"/>
-
- <!-- Specify what happens to undeliverable messages -->
- <!-- leaveonserver -->
- <!-- if true, messages will be left on the server -->
- <!-- if false, messages will be deleted from the server -->
- <!-- markseen -->
- <!-- if true, messages left on the server will be marked as seen -->
- <!-- if false, messages left on the server will not be marked as seen -->
- <undeliverable leaveonserver="true" markseen="false"/>
-
- <!-- Specify what happens to messages for which a recipient cannot be determined. -->
- <!-- defer -->
- <!-- if true, processing of messages for which a recipient cannot be determined will deferred -->
- <!-- until the next fetch of the Account. This gives an opportunity for other Accounts in the -->
- <!-- fetch task to determine the recipient and process the mail. -->
- <!-- if false, messages for which a recipient cannot be determined are processed immediately. -->
- <!-- reject -->
- <!-- if true, messages for which a recipient cannot be determined will be rejected -->
- <!-- if false, messages for which a recipient cannot be determined will be accepted, -->
- <!-- the account recipient will be used and the MailAttribute "org.apache.james.fetchmail.isRecipientNotFound" -->
- <!-- will be added to the message. Use the HasMailAttribute matcher to detect them. -->
- <!-- The following apply if reject="true" and a message is rejected... -->
- <!-- leaveonserver -->
- <!-- if true, messages will be left on the server -->
- <!-- if false, messages will be deleted from the server -->
- <!-- markseen -->
- <!-- if true, messages left on the server will be marked as seen -->
- <!-- if false, messages left on the server will not be marked as seen -->
- <recipientnotfound defer="true" reject="true" leaveonserver="true" markseen="false"/>
-
- <!-- Specify a list of recipients for whom messages will be rejected -->
- <!-- and what happens to rejected messages. -->
- <!-- The list can be comma, tab or space delimited. -->
- <!-- reject -->
- <!-- if true, messages for users on the blacklist will be rejected -->
- <!-- if false, messages for users on the blacklist will be accepted -->
- <!-- and the Mail Attribute "org.apache.james.fetchmail.isBlacklistedRecipient" -->
- <!-- will be added to the message. Use the HasMailAttribute matcher to detect them. -->
- <!-- The following apply if reject="true" and a message is rejected... -->
- <!-- leaveonserver -->
- <!-- if true, messages will be left on the server -->
- <!-- if false, messages will be deleted from the server -->
- <!-- markseen -->
- <!-- if true, messages left on the server will be marked as seen -->
- <!-- if false, messages left on the server will not be marked as seen -->
- <blacklist reject="true" leaveonserver="true" markseen="false">wibble@localhost, flobble@localhost</blacklist>
-
- <!-- Specify if messages for users who are not defined to James should -->
- <!-- be rejected and what happens to rejected messages. -->
- <!-- reject -->
- <!-- if true, messages for users who are not defined to James will be rejected -->
- <!-- if false, messages for users who are not defined to James will be accepted -->
- <!-- and the Mail Attribute "org.apache.james.fetchmail.isUserUndefined" -->
- <!-- will be added to the message. Use the HasMailAttribute matcher to detect them. -->
- <!-- The following apply if reject="true" and a message is rejected... -->
- <!-- leaveonserver -->
- <!-- if true, messages will be left on the server -->
- <!-- if false, messages will be deleted from the server -->
- <!-- markseen -->
- <!-- if true, messages left on the server will be marked as seen -->
- <!-- if false, messages left on the server will not be marked as seen -->
- <userundefined reject="true" leaveonserver="true" markseen="false" />
-
- <!-- Specify if messages for recipients on remote hosts should -->
- <!-- be rejected and what happens to rejected messages. -->
- <!-- reject -->
- <!-- if true, messages for remote recipients will be rejected -->
- <!-- if false, messages for remote recipients will be accepted -->
- <!-- and the Mail Attribute "org.apache.james.fetchmail.isRemoteRecipient" -->
- <!-- will be added to the message. Use the HasMailAttribute matcher to detect them. -->
- <!-- The following apply if reject="true" and a message is rejected... -->
- <!-- leaveonserver -->
- <!-- if true, messages will be left on the server -->
- <!-- if false, messages will be deleted from the server -->
- <!-- markseen -->
- <!-- if true, messages left on the server will be marked as seen -->
- <!-- if false, messages left on the server will not be marked as seen -->
- <remoterecipient reject="true" leaveonserver="true" markseen="false" />
- </fetch>
-
-</fetchmail>
http://git-wip-us.apache.org/repos/asf/james-project/blob/d9008f8c/dockerfiles/run/guice/cassandra/destination/conf/indexer.xml
----------------------------------------------------------------------
diff --git a/dockerfiles/run/guice/cassandra/destination/conf/indexer.xml b/dockerfiles/run/guice/cassandra/destination/conf/indexer.xml
deleted file mode 100644
index ced1a62..0000000
--- a/dockerfiles/run/guice/cassandra/destination/conf/indexer.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
- -->
-
-<indexer>
- <provider>elasticsearch</provider>
-</indexer>
http://git-wip-us.apache.org/repos/asf/james-project/blob/d9008f8c/dockerfiles/run/guice/cassandra/destination/conf/quota.xml
----------------------------------------------------------------------
diff --git a/dockerfiles/run/guice/cassandra/destination/conf/quota.xml b/dockerfiles/run/guice/cassandra/destination/conf/quota.xml
deleted file mode 100644
index 70162e0..0000000
--- a/dockerfiles/run/guice/cassandra/destination/conf/quota.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
- -->
-
-<!--
- This template file can be used as example for James Server configuration
- DO NOT USE IT AS SUCH AND ADAPT IT TO YOUR NEEDS
--->
-
-<!-- See http://james.apache.org/server/3/config.html for usage -->
-
-<!--
- This configuration file allows you to customize the way quota are handled on this server.
- You need to rename it in quota.xml so that it gets interpreted by James on startup.
-
- The different configuration options are detailed here.
-
- Read RFC-2087 for full details.
--->
-
-<quota>
- <quotaRootResolver>
- <provider>default</provider>
- </quotaRootResolver>
- <currentQuotaManager>
- <provider>cassandra</provider>
- </currentQuotaManager>
- <maxQuotaManager>
- <provider>cassandra</provider>
- </maxQuotaManager>
- <quotaManager>
- <provider>store</provider>
- </quotaManager>
- <updates>
- <provider>event</provider>
- </updates>
-</quota>
http://git-wip-us.apache.org/repos/asf/james-project/blob/d9008f8c/dockerfiles/run/guice/cassandra/destination/conf/recipientrewritetable.xml
----------------------------------------------------------------------
diff --git a/dockerfiles/run/guice/cassandra/destination/conf/recipientrewritetable.xml b/dockerfiles/run/guice/cassandra/destination/conf/recipientrewritetable.xml
index fde339b..3d44578 100644
--- a/dockerfiles/run/guice/cassandra/destination/conf/recipientrewritetable.xml
+++ b/dockerfiles/run/guice/cassandra/destination/conf/recipientrewritetable.xml
@@ -19,7 +19,7 @@
-->
<!-- The default table for storing James' RecipientRewriteTable mappings. -->
-<recipientrewritetable class="org.apache.james.rrt.jpa.JPARecipientRewriteTable">
+<recipientrewritetable>
<recursiveMapping>true</recursiveMapping>
<mappingLimit>10</mappingLimit>
</recipientrewritetable>
http://git-wip-us.apache.org/repos/asf/james-project/blob/d9008f8c/dockerfiles/run/guice/jpa/destination/conf/META-INF/jpa-mappings-template.xml
----------------------------------------------------------------------
diff --git a/dockerfiles/run/guice/jpa/destination/conf/META-INF/jpa-mappings-template.xml b/dockerfiles/run/guice/jpa/destination/conf/META-INF/jpa-mappings-template.xml
deleted file mode 100644
index fe76d25..0000000
--- a/dockerfiles/run/guice/jpa/destination/conf/META-INF/jpa-mappings-template.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<!-- Use this file to overwriting the annotations defined in the JPA domain classes -->
-
-<entity-mappings xmlns="http://java.sun.com/xml/ns/persistence/orm"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_2_0.xsd"
- version="2.0">
-
- <entity class="org.apache.james.mailbox.jpa.mail.model.JPAHeader">
-
- <table name="JAMES_MAIL_HEADER"/>
-
- <attributes>
- <basic name="value">
- <column name="HEADER_VALUE" length="8000" />
- </basic>
- </attributes>
-
- </entity>
-
-</entity-mappings>
http://git-wip-us.apache.org/repos/asf/james-project/blob/d9008f8c/dockerfiles/run/guice/jpa/destination/conf/META-INF/persistence-template.xml
----------------------------------------------------------------------
diff --git a/dockerfiles/run/guice/jpa/destination/conf/META-INF/persistence-template.xml b/dockerfiles/run/guice/jpa/destination/conf/META-INF/persistence-template.xml
deleted file mode 100644
index cca9545..0000000
--- a/dockerfiles/run/guice/jpa/destination/conf/META-INF/persistence-template.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<persistence xmlns="http://java.sun.com/xml/ns/persistence"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd"
- version="2.0">
-
- <persistence-unit name="James" transaction-type="RESOURCE_LOCAL">
-
- <!-- Use the mappings to overwriting the annotations defined in the JPA domain classes -->
- <mapping-file>META-INF/jpa-mappings-template.xml</mapping-file>
-
- <!-- Mailbox stuff-->
- <class>org.apache.james.mailbox.jpa.mail.model.JPAMailbox</class>
- <class>org.apache.james.mailbox.jpa.mail.model.JPAUserFlag</class>
- <class>org.apache.james.mailbox.jpa.mail.model.openjpa.AbstractJPAMailboxMessage</class>
- <!--
- <class>org.apache.james.mailbox.jpa.mail.model.openjpa.JPAEncryptedMailboxMessage</class>
- -->
-
- <!-- This needs to get used when you want to use streaming. Remember to comment the following classes
- org.apache.james.mailbox.jpa.mail.model.JPAMessage
- If you don't do this the EntityManager will get confused!
- <class>org.apache.james.mailbox.jpa.mail.model.openjpa.JPAStreamingMailboxMessage</class>
- -->
- <!-- Comment if you want to use streaming -->
- <class>org.apache.james.mailbox.jpa.mail.model.openjpa.JPAMailboxMessage</class>
-
- <class>org.apache.james.mailbox.jpa.mail.model.JPAProperty</class>
- <class>org.apache.james.mailbox.jpa.user.model.JPASubscription</class>
-
- <!-- DomainList -->
- <class>org.apache.james.domainlist.jpa.model.JPADomain</class>
-
- <!-- User-->
- <class>org.apache.james.user.jpa.model.JPAUser</class>
-
- <!-- RecipientRewrite -->
- <class>org.apache.james.rrt.jpa.model.JPARecipientRewrite</class>
-
- <properties>
- <!-- Create tables on startup -->
- <property name="openjpa.jdbc.SynchronizeMappings" value="buildSchema(ForeignKeys=true)"/>
- <!-- Create foreign keys on startup -->
- <property name="openjpa.jdbc.MappingDefaults" value="ForeignKeyDeleteAction=cascade, JoinForeignKeyDeleteAction=cascade"/>
- <!-- Reorder SQL statements to satisfy database foreign key constraints -->
- <property name="openjpa.jdbc.SchemaFactory" value="native(ForeignKeys=true)"/>
- <!-- Disable query cache for now. It seems to be buggy. -->
- <!-- See http://www.mail-archive.com/server-dev@james.apache.org/msg28802.html -->
- <!-- See https://issues.apache.org/jira/browse/OPENJPA-1827 -->
- <property name="openjpa.jdbc.QuerySQLCache" value="false"/>
- <!-- Uncomment this if you want to see the generated SQL in the console.
- <property name="openjpa.Log" value="SQL=TRACE"/>
- -->
- <!-- Uncomment this if you want to get verbose OpenJPA log the console.
- <property name="openjpa.Log" value="DefaultLevel=TRACE"/>
- -->
- </properties>
-
- </persistence-unit>
-
-</persistence>
http://git-wip-us.apache.org/repos/asf/james-project/blob/d9008f8c/dockerfiles/run/guice/jpa/destination/conf/META-INF/persistence.xml
----------------------------------------------------------------------
diff --git a/dockerfiles/run/guice/jpa/destination/conf/META-INF/persistence.xml b/dockerfiles/run/guice/jpa/destination/conf/META-INF/persistence.xml
deleted file mode 100644
index 18ff105..0000000
--- a/dockerfiles/run/guice/jpa/destination/conf/META-INF/persistence.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<persistence xmlns="http://java.sun.com/xml/ns/persistence"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd"
- version="2.0">
-
- <persistence-unit name="James" transaction-type="RESOURCE_LOCAL">
- <!-- Mailbox stuff-->
- <class>org.apache.james.mailbox.jpa.mail.model.JPAMailbox</class>
- <class>org.apache.james.mailbox.jpa.mail.model.JPAUserFlag</class>
- <class>org.apache.james.mailbox.jpa.mail.model.openjpa.AbstractJPAMailboxMessage</class>
- <class>org.apache.james.mailbox.jpa.mail.model.openjpa.JPAMailboxMessage</class>
- <class>org.apache.james.mailbox.jpa.mail.model.JPAProperty</class>
- <class>org.apache.james.mailbox.jpa.user.model.JPASubscription</class>
- <class>org.apache.james.domainlist.jpa.model.JPADomain</class>
- <class>org.apache.james.user.jpa.model.JPAUser</class>
- <class>org.apache.james.rrt.jpa.model.JPARecipientRewrite</class>
-
- <properties>
- <property name="openjpa.jdbc.SynchronizeMappings" value="buildSchema(ForeignKeys=true)"/>
- <property name="openjpa.jdbc.MappingDefaults" value="ForeignKeyDeleteAction=cascade, JoinForeignKeyDeleteAction=cascade"/>
- <property name="openjpa.jdbc.SchemaFactory" value="native(ForeignKeys=true)"/>
- <property name="openjpa.jdbc.QuerySQLCache" value="false"/>
- </properties>
-
- </persistence-unit>
-
-</persistence>
http://git-wip-us.apache.org/repos/asf/james-project/blob/d9008f8c/dockerfiles/run/guice/jpa/destination/conf/domainlist.xml
----------------------------------------------------------------------
diff --git a/dockerfiles/run/guice/jpa/destination/conf/domainlist.xml b/dockerfiles/run/guice/jpa/destination/conf/domainlist.xml
index fc64fd2..ad37476 100644
--- a/dockerfiles/run/guice/jpa/destination/conf/domainlist.xml
+++ b/dockerfiles/run/guice/jpa/destination/conf/domainlist.xml
@@ -18,7 +18,7 @@
under the License.
-->
-<domainlist class="org.apache.james.domainlist.jpa.JPADomainList">
+<domainlist>
<domainnames>
<domainname>james.linagora.com</domainname>
</domainnames>
http://git-wip-us.apache.org/repos/asf/james-project/blob/d9008f8c/dockerfiles/run/guice/jpa/destination/conf/fetchmail.xml
----------------------------------------------------------------------
diff --git a/dockerfiles/run/guice/jpa/destination/conf/fetchmail.xml b/dockerfiles/run/guice/jpa/destination/conf/fetchmail.xml
deleted file mode 100644
index 96aa946..0000000
--- a/dockerfiles/run/guice/jpa/destination/conf/fetchmail.xml
+++ /dev/null
@@ -1,288 +0,0 @@
-<?xml version="1.0"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
- -->
-
-<!--
- This template file can be used as example for James Server configuration
- DO NOT USE IT AS SUCH AND ADAPT IT TO YOUR NEEDS
--->
-
-<!-- See http://james.apache.org/server/3/config.html for usage -->
-
-<!-- Fetch mail block, fetches mail from message servers and inserts it into the incoming spool -->
-<!-- Warning: It is important to prevent mail from looping by setting the -->
-<!-- fetched domains in the<servernames>section of the<James>block -->
-<!-- above. This block is disabled by default. -->
-
-<!-- See http://james.apache.org/server/2.3.0/fetchmail_configuration.html for detailed -->
-<!-- configuration instructions and examples. -->
-
-<!-- I M P O R T A N T -->
-<!-- Setting markseen="true" will have no effect on many POP3 servers as the POP3 -->
-<!-- protocol does not require the markSeen flag to be supported. When this is the -->
-<!-- case, the only way to ensure that messages are fetched just once is to delete -->
-<!-- fetched messages from the server with leaveonserver="false". -->
-
-<!-- If you want to perform mailet processing on messages fetched by fetchmail, -->
-<!-- use the HasMailAttribute matcher to detect messages with the MailAttribute -->
-<!-- org.apache.james.fetchmail.taskName. The attribute's value is that of the -->
-<!-- fetch task's name parameter described below. -->
-
-<fetchmail enabled="false">
-
- <!-- The number of threads to use for the scheduled execution -->
- <threads>5</threads>
-
- <!-- The JMX Name to use -->
- <jmxName>fetchmail</jmxName>
-
- <!-- You can have as many fetch tasks as you want, but each must have a -->
- <!-- unique name by which it is identified. -->
- <!-- Each task runs at the specified<interval>, tasks may run concurrently. -->
-
- <fetch name="mydomain.com">
- <!-- There must be one<accounts>entry per fetch task. An accounts entry can have 0 to many -->
- <!--<account>entries and 0 or 1<alllocal>entries.<alllocal>generates -->
- <!--<accounts>for every user defined to James.<accounts>run consecutively within the -->
- <!-- scope of their fetch task and inherit all the properties of the fetch task. -->
-
- <!-- The advantage of running consecutively is that we can avoid conflicting fetch tasks -->
- <!-- operating concurrently on the same mailboxes. -->
-
- <!-- Fetchmail attempts to deduce the correct recipient of each message, but sometimes there is -->
- <!-- insufficient information in the headers to do so. When the correct recipient cannot be deduced, -->
- <!-- fetchmail can be configured to leave the mail on the server or deliver it to a default recipient. -->
-
- <!-- When a message server delivers mail for a single user to a specific INBOX you can define -->
- <!-- each user to James (via the console) and use<alllocal>with ignorercpt-header="true" to deliver mail -->
- <!-- directly from each users INBOX onto James' spool. There is no need to update 'config.xml' -->
- <!-- each time you add or remove users, fetchmail checks the list of users at the start of each fetch. -->
-
- <!-- When a message server provides an account that gives access to all mail for a domain through a single -->
- <!-- INBOX, you can use an<account>to fetch all the mail for that domain, using the filter facilities -->
- <!-- described below to reject unwanted messages. -->
-
- <!-- When a message server supports BOTH delivery for a single user to a specific INBOX and access to all mail -->
- <!-- for a domain through a single INBOX, you can use<alllocal>and<account>together to guarantee that all -->
- <!-- local mail gets delivered to the correct user and all unwanted mail is deleted from the message -->
- <!-- server. See http://james.apache.org/server/2.3.0/fetchmail_configuration.html for details. -->
-
- <!-- Limitations and Future Directions -->
- <!-- 1)<alllocal>requires the password for all accounts for a domain on the message server be the same. True -->
- <!-- in many cases, but not all. A future version might work out a way of associating James users with a set -->
- <!-- of account properties. -->
- <!-- 2)<alllocal>will try to access an INBOX on the message server for all local users. The instance of James used -->
- <!-- for this purpose should not have extraneous users defined. This is inefficient, but not fatal. -->
- <!-- Again, a future version might work out a way of associating James users with message account properties. -->
- <!-- This would allow all local users with an account on a particular message server to be fetched. -->
-
- <accounts>
- <alllocal userprefix="" usersuffix="@myaccount" password="password" recipientprefix="" recipientsuffix="@mydomain.com" ignorercpt-header="true"/>
- <account user="myglobalaccount" password="password" recipient="postmaster@localhost" ignorercpt-header="false"/>
- <!-- Custom recipient header handling -->
- <!-- this example search an header named X-Envelope-To and use the recipient found in that header -->
- <!--
- <account customrcpt-header="X-Envelope-To" user="myglobalaccount" password="password" recipient="postmaster@localhost" ignorercpt-header="false"/>
- -->
- </accounts>
-
- <!-- The address of the server from which to fetch the mail -->
- <host>pop.server.com</host>
-
- <!-- How frequently this host is checked - in milliseconds. 600000 is every ten minutes -->
- <interval>600000</interval>
-
- <!-- name of the javamail provider you wish to use -->
- <!-- (pop3, imap, etc. -->
- <javaMailProviderName>pop3</javaMailProviderName>
-
- <!-- name of the folder to open -->
- <javaMailFolderName>INBOX</javaMailFolderName>
-
- <!-- Properties to be applied to the JavaMail Session. -->
- <!-- Properties are specific to the selected JavaMail provider. -->
- <!-- Any number may be specified. -->
- <javaMailProperties>
- <!-- Set the connection timeout to 3 minutes -->
- <property name="mail.pop3.connectiontimeout" value="180000"/>
- <!-- Set the I/O timeout to 3 minutes -->
- <property name="mail.pop3.timeout" value="180000"/>
- </javaMailProperties>
-
- <!-- Retrieve both old (seen) and new messages from mailserver. The default -->
- <!-- is to fetch only messages the server has not marked as seen -->
- <fetchall>false</fetchall>
-
- <!-- If the folder javaMailFolderName contains subfolders do you -->
- <!-- want to recurse into the subfolders as well? true = yes, false = no -->
- <recursesubfolders>false</recursesubfolders>
-
- <!-- If the From: header of a fetched message has a valid user part -->
- <!-- but no domain part the fetch task will correct this by appending -->
- <!-- a default domain. eg: 'james' becomes 'james@defaultdomain' -->
- <!-- The default behaviour is to append the canonical host name of the James server. -->
- <!-- You can override this behaviour here by specifying the name of the domain -->
- <!-- you wish to append. The name you choose must be a local server or you can -->
- <!-- use the name localhost -->
- <!-- Example using a locally served domain -->
- <!--
- <defaultdomain>mydomain.com</defaultdomain>
- -->
- <!-- Example using localhost -->
- <!--
- <defaultdomain>localhost</defaultdomain>
- -->
-
- <!-- Specify what happens to messages succesfully fetched from the mailserver -->
- <!-- leaveonserver -->
- <!-- if true, messages will be left on the server -->
- <!-- if false, messages will be deleted from the server -->
- <!-- markseen -->
- <!-- if true, messages left on the server will be marked as seen -->
- <!-- if false, messages left on the server will not be marked as seen -->
- <fetched leaveonserver="false" markseen="true"/>
-
- <!-- Specify the index of the RECEIVED Header used to compute the remote address and remote host name -->
- <!-- and what happens to messages that contain an invalid header at that index. -->
- <!-- Matchers such as InSpammerBlacklist use the remote address and/or remote host name to identify illegitimate -->
- <!-- remote MTAs. -->
- <!-- This tag is optional. If omitted, the remote address will be set to 127.0.0.1 and the remote domain -->
- <!-- will be set to 'localhost'. Both are almost always considered legitimate. -->
- <!-- index -->
- <!-- The zero based index of the RECEIVED Header used to compute the remote address and remote host name -->
- <!-- of the MTA that delivered a fetched message. -->
- <!-- Typically, the first (index = 0) RECEIVED Header is for the local MTA that delivers mail to the message store -->
- <!-- and the second RECEIVED Header (index = 1) is the remote domain delivering mail to the MTA, so the second -->
- <!-- RECEIVED Header is the one to use. -->
- <!-- Some configurations will differ. Look at the RECEIVED Headers and set the index to point to the first remote MTA. -->
- <!-- An index of -1 is is interpreted as use 127.0.0.1 for the remote address and use 'localhost' for the remote host name. -->
- <!-- reject -->
- <!-- if true, messages whose received header at the specified index is invalid will be rejected -->
- <!-- if false, messages whose received header at the specified index is invalid will be accepted -->
- <!-- and the Mail Attribute "org.apache.james.fetchmail.isInvalidReceivedHeader" -->
- <!-- will be added to the message. Use the HasMailAttribute matcher to detect them. -->
- <!-- The following apply if reject="true" and a message is rejected... -->
- <!-- leaveonserver -->
- <!-- if true, messages will be left on the server -->
- <!-- if false, messages will be deleted from the server -->
- <!-- markseen -->
- <!-- if true, messages left on the server will be marked as seen -->
- <!-- if false, messages left on the server will not be marked as seen -->
- <remotereceivedheader index="1" reject="true" leaveonserver="true" markseen="false"/>
-
- <!-- Specify what happens to messages whose size exceeds the specified limit. -->
- <!-- This tag is optional. If omitted, there is no limit. -->
- <!-- limit -->
- <!-- The maximum message size in Kilobytes of messages injected into James. -->
- <!-- A value of 0 means no limit. -->
- <!-- reject -->
- <!-- if true, messages whose size exceeds the limit will be rejected -->
- <!-- if false, messages whose size exceeds the limit will be stripped of their message bodies -->
- <!-- prior to injection into James and the MailAttribute "org.apache.james.fetchmail.isMaxMessageSizeExceeded" -->
- <!-- will be added to the message with the value set to the original message size in bytes. -->
- <!-- Use the HasMailAttribute matcher to detect them. -->
- <!-- The following apply if reject="true" and a message is rejected... -->
- <!-- leaveonserver -->
- <!-- if true, messages will be left on the server -->
- <!-- if false, messages will be deleted from the server -->
- <!-- markseen -->
- <!-- if true, messages left on the server will be marked as seen -->
- <!-- if false, messages left on the server will not be marked as seen -->
- <maxmessagesize limit="0" reject="false" leaveonserver="true" markseen="false"/>
-
- <!-- Specify what happens to undeliverable messages -->
- <!-- leaveonserver -->
- <!-- if true, messages will be left on the server -->
- <!-- if false, messages will be deleted from the server -->
- <!-- markseen -->
- <!-- if true, messages left on the server will be marked as seen -->
- <!-- if false, messages left on the server will not be marked as seen -->
- <undeliverable leaveonserver="true" markseen="false"/>
-
- <!-- Specify what happens to messages for which a recipient cannot be determined. -->
- <!-- defer -->
- <!-- if true, processing of messages for which a recipient cannot be determined will deferred -->
- <!-- until the next fetch of the Account. This gives an opportunity for other Accounts in the -->
- <!-- fetch task to determine the recipient and process the mail. -->
- <!-- if false, messages for which a recipient cannot be determined are processed immediately. -->
- <!-- reject -->
- <!-- if true, messages for which a recipient cannot be determined will be rejected -->
- <!-- if false, messages for which a recipient cannot be determined will be accepted, -->
- <!-- the account recipient will be used and the MailAttribute "org.apache.james.fetchmail.isRecipientNotFound" -->
- <!-- will be added to the message. Use the HasMailAttribute matcher to detect them. -->
- <!-- The following apply if reject="true" and a message is rejected... -->
- <!-- leaveonserver -->
- <!-- if true, messages will be left on the server -->
- <!-- if false, messages will be deleted from the server -->
- <!-- markseen -->
- <!-- if true, messages left on the server will be marked as seen -->
- <!-- if false, messages left on the server will not be marked as seen -->
- <recipientnotfound defer="true" reject="true" leaveonserver="true" markseen="false"/>
-
- <!-- Specify a list of recipients for whom messages will be rejected -->
- <!-- and what happens to rejected messages. -->
- <!-- The list can be comma, tab or space delimited. -->
- <!-- reject -->
- <!-- if true, messages for users on the blacklist will be rejected -->
- <!-- if false, messages for users on the blacklist will be accepted -->
- <!-- and the Mail Attribute "org.apache.james.fetchmail.isBlacklistedRecipient" -->
- <!-- will be added to the message. Use the HasMailAttribute matcher to detect them. -->
- <!-- The following apply if reject="true" and a message is rejected... -->
- <!-- leaveonserver -->
- <!-- if true, messages will be left on the server -->
- <!-- if false, messages will be deleted from the server -->
- <!-- markseen -->
- <!-- if true, messages left on the server will be marked as seen -->
- <!-- if false, messages left on the server will not be marked as seen -->
- <blacklist reject="true" leaveonserver="true" markseen="false">wibble@localhost, flobble@localhost</blacklist>
-
- <!-- Specify if messages for users who are not defined to James should -->
- <!-- be rejected and what happens to rejected messages. -->
- <!-- reject -->
- <!-- if true, messages for users who are not defined to James will be rejected -->
- <!-- if false, messages for users who are not defined to James will be accepted -->
- <!-- and the Mail Attribute "org.apache.james.fetchmail.isUserUndefined" -->
- <!-- will be added to the message. Use the HasMailAttribute matcher to detect them. -->
- <!-- The following apply if reject="true" and a message is rejected... -->
- <!-- leaveonserver -->
- <!-- if true, messages will be left on the server -->
- <!-- if false, messages will be deleted from the server -->
- <!-- markseen -->
- <!-- if true, messages left on the server will be marked as seen -->
- <!-- if false, messages left on the server will not be marked as seen -->
- <userundefined reject="true" leaveonserver="true" markseen="false" />
-
- <!-- Specify if messages for recipients on remote hosts should -->
- <!-- be rejected and what happens to rejected messages. -->
- <!-- reject -->
- <!-- if true, messages for remote recipients will be rejected -->
- <!-- if false, messages for remote recipients will be accepted -->
- <!-- and the Mail Attribute "org.apache.james.fetchmail.isRemoteRecipient" -->
- <!-- will be added to the message. Use the HasMailAttribute matcher to detect them. -->
- <!-- The following apply if reject="true" and a message is rejected... -->
- <!-- leaveonserver -->
- <!-- if true, messages will be left on the server -->
- <!-- if false, messages will be deleted from the server -->
- <!-- markseen -->
- <!-- if true, messages left on the server will be marked as seen -->
- <!-- if false, messages left on the server will not be marked as seen -->
- <remoterecipient reject="true" leaveonserver="true" markseen="false" />
- </fetch>
-
-</fetchmail>
http://git-wip-us.apache.org/repos/asf/james-project/blob/d9008f8c/dockerfiles/run/guice/jpa/destination/conf/indexer.xml
----------------------------------------------------------------------
diff --git a/dockerfiles/run/guice/jpa/destination/conf/indexer.xml b/dockerfiles/run/guice/jpa/destination/conf/indexer.xml
deleted file mode 100644
index 51591ab..0000000
--- a/dockerfiles/run/guice/jpa/destination/conf/indexer.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
- -->
-
-<indexer>
- <provider>luceneIndex</provider>
-</indexer>
http://git-wip-us.apache.org/repos/asf/james-project/blob/d9008f8c/dockerfiles/run/guice/jpa/destination/conf/quota.xml
----------------------------------------------------------------------
diff --git a/dockerfiles/run/guice/jpa/destination/conf/quota.xml b/dockerfiles/run/guice/jpa/destination/conf/quota.xml
deleted file mode 100644
index 70162e0..0000000
--- a/dockerfiles/run/guice/jpa/destination/conf/quota.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
- -->
-
-<!--
- This template file can be used as example for James Server configuration
- DO NOT USE IT AS SUCH AND ADAPT IT TO YOUR NEEDS
--->
-
-<!-- See http://james.apache.org/server/3/config.html for usage -->
-
-<!--
- This configuration file allows you to customize the way quota are handled on this server.
- You need to rename it in quota.xml so that it gets interpreted by James on startup.
-
- The different configuration options are detailed here.
-
- Read RFC-2087 for full details.
--->
-
-<quota>
- <quotaRootResolver>
- <provider>default</provider>
- </quotaRootResolver>
- <currentQuotaManager>
- <provider>cassandra</provider>
- </currentQuotaManager>
- <maxQuotaManager>
- <provider>cassandra</provider>
- </maxQuotaManager>
- <quotaManager>
- <provider>store</provider>
- </quotaManager>
- <updates>
- <provider>event</provider>
- </updates>
-</quota>
http://git-wip-us.apache.org/repos/asf/james-project/blob/d9008f8c/dockerfiles/run/guice/jpa/destination/conf/recipientrewritetable.xml
----------------------------------------------------------------------
diff --git a/dockerfiles/run/guice/jpa/destination/conf/recipientrewritetable.xml b/dockerfiles/run/guice/jpa/destination/conf/recipientrewritetable.xml
index fde339b..3d44578 100644
--- a/dockerfiles/run/guice/jpa/destination/conf/recipientrewritetable.xml
+++ b/dockerfiles/run/guice/jpa/destination/conf/recipientrewritetable.xml
@@ -19,7 +19,7 @@
-->
<!-- The default table for storing James' RecipientRewriteTable mappings. -->
-<recipientrewritetable class="org.apache.james.rrt.jpa.JPARecipientRewriteTable">
+<recipientrewritetable>
<recursiveMapping>true</recursiveMapping>
<mappingLimit>10</mappingLimit>
</recipientrewritetable>
http://git-wip-us.apache.org/repos/asf/james-project/blob/d9008f8c/mpt/impl/smtp/cassandra/src/test/resources/domainlist.xml
----------------------------------------------------------------------
diff --git a/mpt/impl/smtp/cassandra/src/test/resources/domainlist.xml b/mpt/impl/smtp/cassandra/src/test/resources/domainlist.xml
index 438494b..db021bb 100644
--- a/mpt/impl/smtp/cassandra/src/test/resources/domainlist.xml
+++ b/mpt/impl/smtp/cassandra/src/test/resources/domainlist.xml
@@ -18,7 +18,7 @@
under the License.
-->
-<domainlist class="org.apache.james.domainlist.cassandra.CassandraDomainList">
+<domainlist>
<domainnames>
<domainname>mydomain.tld</domainname>
</domainnames>
http://git-wip-us.apache.org/repos/asf/james-project/blob/d9008f8c/mpt/impl/smtp/cassandra/src/test/resources/recipientrewritetable.xml
----------------------------------------------------------------------
diff --git a/mpt/impl/smtp/cassandra/src/test/resources/recipientrewritetable.xml b/mpt/impl/smtp/cassandra/src/test/resources/recipientrewritetable.xml
index b8ab709..5553a40 100644
--- a/mpt/impl/smtp/cassandra/src/test/resources/recipientrewritetable.xml
+++ b/mpt/impl/smtp/cassandra/src/test/resources/recipientrewritetable.xml
@@ -19,7 +19,7 @@
-->
<!-- The default table for storing James' RecipientRewriteTable mappings. -->
-<recipientrewritetable class="org.apache.james.rrt.cassandra.CassandraRecipientRewriteTable">
+<recipientrewritetable>
<recursiveMapping>true</recursiveMapping>
<mappingLimit>10</mappingLimit>
<mapping>some@domain=some</mapping>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org