Author: aduprat
Date: Tue Jan 26 16:17:47 2016
New Revision: 1726837
URL: http://svn.apache.org/viewvc?rev=1726837&view=rev
Log:
JAMES-1663 Spring configuration in docker should use JPA. Contributed by Duprat
<[email protected]>
Removed:
james/project/trunk/dockerfiles/run/spring/destination/conf/cassandra.properties
james/project/trunk/dockerfiles/run/spring/destination/conf/elasticsearch.properties
Modified:
james/project/trunk/dockerfiles/run/spring/destination/conf/domainlist.xml
james/project/trunk/dockerfiles/run/spring/destination/conf/mailbox.xml
james/project/trunk/dockerfiles/run/spring/destination/conf/quota.xml
james/project/trunk/dockerfiles/run/spring/destination/conf/recipientrewritetable.xml
james/project/trunk/dockerfiles/run/spring/destination/conf/usersrepository.xml
Modified:
james/project/trunk/dockerfiles/run/spring/destination/conf/domainlist.xml
URL:
http://svn.apache.org/viewvc/james/project/trunk/dockerfiles/run/spring/destination/conf/domainlist.xml?rev=1726837&r1=1726836&r2=1726837&view=diff
==============================================================================
--- james/project/trunk/dockerfiles/run/spring/destination/conf/domainlist.xml
(original)
+++ james/project/trunk/dockerfiles/run/spring/destination/conf/domainlist.xml
Tue Jan 26 16:17:47 2016
@@ -18,7 +18,7 @@
under the License.
-->
-<domainlist class="org.apache.james.domainlist.cassandra.CassandraDomainList">
+<domainlist class="org.apache.james.domainlist.jpa.JPADomainList">
<domainnames>
<domainname>james.linagora.com</domainname>
</domainnames>
Modified:
james/project/trunk/dockerfiles/run/spring/destination/conf/mailbox.xml
URL:
http://svn.apache.org/viewvc/james/project/trunk/dockerfiles/run/spring/destination/conf/mailbox.xml?rev=1726837&r1=1726836&r2=1726837&view=diff
==============================================================================
--- james/project/trunk/dockerfiles/run/spring/destination/conf/mailbox.xml
(original)
+++ james/project/trunk/dockerfiles/run/spring/destination/conf/mailbox.xml Tue
Jan 26 16:17:47 2016
@@ -19,5 +19,5 @@
-->
<mailbox>
- <provider>cassandra</provider>
+ <provider>jpa</provider>
</mailbox>
Modified: james/project/trunk/dockerfiles/run/spring/destination/conf/quota.xml
URL:
http://svn.apache.org/viewvc/james/project/trunk/dockerfiles/run/spring/destination/conf/quota.xml?rev=1726837&r1=1726836&r2=1726837&view=diff
==============================================================================
--- james/project/trunk/dockerfiles/run/spring/destination/conf/quota.xml
(original)
+++ james/project/trunk/dockerfiles/run/spring/destination/conf/quota.xml Tue
Jan 26 16:17:47 2016
@@ -39,10 +39,10 @@
<provider>default</provider>
</quotaRootResolver>
<currentQuotaManager>
- <provider>cassandra</provider>
+ <provider>inmemory</provider>
</currentQuotaManager>
<maxQuotaManager>
- <provider>cassandra</provider>
+ <provider>inmemory</provider>
</maxQuotaManager>
<quotaManager>
<provider>store</provider>
Modified:
james/project/trunk/dockerfiles/run/spring/destination/conf/recipientrewritetable.xml
URL:
http://svn.apache.org/viewvc/james/project/trunk/dockerfiles/run/spring/destination/conf/recipientrewritetable.xml?rev=1726837&r1=1726836&r2=1726837&view=diff
==============================================================================
---
james/project/trunk/dockerfiles/run/spring/destination/conf/recipientrewritetable.xml
(original)
+++
james/project/trunk/dockerfiles/run/spring/destination/conf/recipientrewritetable.xml
Tue Jan 26 16:17:47 2016
@@ -19,7 +19,7 @@
-->
<!-- The default table for storing James' RecipientRewriteTable mappings. -->
-<recipientrewritetable
class="org.apache.james.rrt.cassandra.CassandraRecipientRewriteTable">
+<recipientrewritetable
class="org.apache.james.rrt.jpa.JPARecipientRewriteTable">
<recursiveMapping>true</recursiveMapping>
<mappingLimit>10</mappingLimit>
</recipientrewritetable>
Modified:
james/project/trunk/dockerfiles/run/spring/destination/conf/usersrepository.xml
URL:
http://svn.apache.org/viewvc/james/project/trunk/dockerfiles/run/spring/destination/conf/usersrepository.xml?rev=1726837&r1=1726836&r2=1726837&view=diff
==============================================================================
---
james/project/trunk/dockerfiles/run/spring/destination/conf/usersrepository.xml
(original)
+++
james/project/trunk/dockerfiles/run/spring/destination/conf/usersrepository.xml
Tue Jan 26 16:17:47 2016
@@ -18,7 +18,7 @@
under the License.
-->
-<usersrepository name="LocalUsers"
class="org.apache.james.user.cassandra.CassandraUsersRepository">
+<usersrepository name="LocalUsers"
class="org.apache.james.user.jpa.JPAUsersRepository">
<algorithm>MD5</algorithm>
<enableVirtualHosting>true</enableVirtualHosting>
</usersrepository>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]