This is an automated email from the ASF dual-hosted git repository.
btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit fd1104a525b7729e5f4086c2003b713de08645ea
Author: Benoit Tellier <btell...@linagora.com>
AuthorDate: Wed Sep 25 10:49:42 2019 +0700
JAMES-2703 Default Spring configuration should not reference deleted items
---
server/app/src/main/resources/mailetcontainer.xml | 2 +-
.../app/src/main/resources/recipientrewritetable.xml | 11 -----------
server/app/src/main/resources/usersrepository.xml | 18 ------------------
3 files changed, 1 insertion(+), 30 deletions(-)
diff --git a/server/app/src/main/resources/mailetcontainer.xml
b/server/app/src/main/resources/mailetcontainer.xml
index b193bfc..5f08bab 100644
--- a/server/app/src/main/resources/mailetcontainer.xml
+++ b/server/app/src/main/resources/mailetcontainer.xml
@@ -50,7 +50,7 @@
<!-- This mailet redirects mail for the user 'postmaster' at any local
domain to -->
<!-- the postmaster address specified for the server. The postmaster
address -->
<!-- is required by rfc822. Do not remove this mailet unless you are
meeting -->
- <!-- this requirement through other means (e.g. a
XML/JDBCRecipientRewriteTable defined in recipientrewritetable-store.xml) -->
+ <!-- this requirement through other means -->
<mailet match="All" class="PostmasterAlias"/>
<!-- Important check to avoid looping -->
diff --git a/server/app/src/main/resources/recipientrewritetable.xml
b/server/app/src/main/resources/recipientrewritetable.xml
index e723434..6d86b1b 100644
--- a/server/app/src/main/resources/recipientrewritetable.xml
+++ b/server/app/src/main/resources/recipientrewritetable.xml
@@ -37,17 +37,6 @@
<mapping>some@domain=someuser</mapping>
</recipientrewritetable>
-->
-
-<!-- Database backed RecipientRewritetable -->
-<!-- -->
-<!-- Use these configurations to store the RecipientRewriteTable in a
database. -->
-<!--
-<recipientrewritetable
class="org.apache.james.rrt.jdbc.JDBCRecipientRewriteTable"
destinationURL="db://maildb/RecipientRewriteTable">
- <recursiveMapping>true</recursiveMapping>
- <mappingLimit>10</mappingLimit>
- <sqlFile>file://conf/sqlResources.xml</sqlFile>
-</recipientrewritetable>
--->
<!-- The default table for storing James' RecipientRewriteTable mappings. -->
<recipientrewritetable
class="org.apache.james.rrt.jpa.JPARecipientRewriteTable">
diff --git a/server/app/src/main/resources/usersrepository.xml
b/server/app/src/main/resources/usersrepository.xml
index 0a64c7c..11864fe 100644
--- a/server/app/src/main/resources/usersrepository.xml
+++ b/server/app/src/main/resources/usersrepository.xml
@@ -66,21 +66,3 @@
<enableVirtualHosting>false</enableVirtualHosting>
</usersrepository>
-->
-
-<!-- Database backed user repositories -->
-<!-- -->
-<!-- Use these configurations to store user info in a database. -->
-<!-- Note: The<data-source>element must refer to a connection configured -->
-<!-- in the<database-connections>configuration section. -->
-<!-- The LocalUsers repository, for storing James' User info. -->
-<!-- DEPRECATED: This implementation will get removed in the next release -->
-<!-- Use JPAUsersRepository if you want to store the Users in a
database -->
-<!--
-<usersrepository name="LocalUsers"
class="org.apache.james.user.jdbc.JamesUsersJdbcRepository"
destinationURL="db://maildb/users">
- <sqlFile>file://conf/sqlResources.xml</sqlFile>
- <ignoreCase>true</ignoreCase>
- <enableAliases>true</enableAliases>
- <enableForwarding>true</enableForwarding>
- <enableVirtualHosting>false</enableVirtualHosting>
-</usersrepository>
--->
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
