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:56 UTC
[3/4] james-project git commit: JAMES-2003 Remove useless
configuration files and options
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