Author: matthieu
Date: Mon Nov 2 14:54:45 2015
New Revision: 1712032
URL: http://svn.apache.org/viewvc?rev=1712032&view=rev
Log:
JAMES-1587 Bind Cassandra DomainList module in spring configuration
Contributed by Raphael Ouazana
Added:
james/project/trunk/server/data/data-cassandra/src/main/java/org/apache/james/domainlist/cassandra/CassandraDomainListModule.java
- copied, changed from r1712031,
james/project/trunk/server/data/data-cassandra/src/main/java/org/apache/james/CassandraDataModule.java
Removed:
james/project/trunk/server/data/data-cassandra/src/main/java/org/apache/james/CassandraDataModule.java
Modified:
james/project/trunk/backends-common/cassandra/src/main/resources/META-INF/cassandra-session.xml
james/project/trunk/dockerfiles/destination/conf/domainlist.xml
james/project/trunk/server/data/data-cassandra/src/test/java/org/apache/james/domainlist/cassandra/CassandraDomainListTest.java
Modified:
james/project/trunk/backends-common/cassandra/src/main/resources/META-INF/cassandra-session.xml
URL:
http://svn.apache.org/viewvc/james/project/trunk/backends-common/cassandra/src/main/resources/META-INF/cassandra-session.xml?rev=1712032&r1=1712031&r2=1712032&view=diff
==============================================================================
---
james/project/trunk/backends-common/cassandra/src/main/resources/META-INF/cassandra-session.xml
(original)
+++
james/project/trunk/backends-common/cassandra/src/main/resources/META-INF/cassandra-session.xml
Mon Nov 2 14:54:45 2015
@@ -51,6 +51,10 @@
class="org.apache.james.user.cassandra.CassandraUsersRepositoryModule"
lazy-init="true"/>
+ <bean id="cassandra-domainlist-module"
+
class="org.apache.james.domainlist.cassandra.CassandraDomainListModule"
+ lazy-init="true"/>
+
<bean id="cassandra-module-composite"
class="org.apache.james.backends.cassandra.init.CassandraModuleComposite"
lazy-init="true">
@@ -59,6 +63,7 @@
<ref bean="cassandra-mailbox-module"/>
<ref bean="cassandra-rrt-module"/>
<ref bean="cassandra-usersrepository-module"/>
+ <ref bean="cassandra-domainlist-module"/>
</list>
</constructor-arg>
</bean>
Modified: james/project/trunk/dockerfiles/destination/conf/domainlist.xml
URL:
http://svn.apache.org/viewvc/james/project/trunk/dockerfiles/destination/conf/domainlist.xml?rev=1712032&r1=1712031&r2=1712032&view=diff
==============================================================================
--- james/project/trunk/dockerfiles/destination/conf/domainlist.xml (original)
+++ james/project/trunk/dockerfiles/destination/conf/domainlist.xml Mon Nov 2
14:54:45 2015
@@ -18,7 +18,7 @@
under the License.
-->
-<domainlist class="org.apache.james.domainlist.jpa.JPADomainList">
+<domainlist class="org.apache.james.domainlist.cassandra.CassandraDomainList">
<domainnames>
<domainname>james.linagora.com</domainname>
</domainnames>
Copied:
james/project/trunk/server/data/data-cassandra/src/main/java/org/apache/james/domainlist/cassandra/CassandraDomainListModule.java
(from r1712031,
james/project/trunk/server/data/data-cassandra/src/main/java/org/apache/james/CassandraDataModule.java)
URL:
http://svn.apache.org/viewvc/james/project/trunk/server/data/data-cassandra/src/main/java/org/apache/james/domainlist/cassandra/CassandraDomainListModule.java?p2=james/project/trunk/server/data/data-cassandra/src/main/java/org/apache/james/domainlist/cassandra/CassandraDomainListModule.java&p1=james/project/trunk/server/data/data-cassandra/src/main/java/org/apache/james/CassandraDataModule.java&r1=1712031&r2=1712032&rev=1712032&view=diff
==============================================================================
---
james/project/trunk/server/data/data-cassandra/src/main/java/org/apache/james/CassandraDataModule.java
(original)
+++
james/project/trunk/server/data/data-cassandra/src/main/java/org/apache/james/domainlist/cassandra/CassandraDomainListModule.java
Mon Nov 2 14:54:45 2015
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james;
+package org.apache.james.domainlist.cassandra;
import static com.datastax.driver.core.DataType.text;
@@ -32,12 +32,12 @@ import org.apache.james.tables.Cassandra
import com.datastax.driver.core.schemabuilder.SchemaBuilder;
import com.google.common.collect.ImmutableList;
-public class CassandraDataModule implements CassandraModule {
+public class CassandraDomainListModule implements CassandraModule {
private final List<CassandraTable> tables;
private final List<CassandraIndex> index;
private final List<CassandraType> types;
- public CassandraDataModule() {
+ public CassandraDomainListModule() {
tables = ImmutableList.of(
new CassandraTable(CassandraDomainsTable.TABLE_NAME,
SchemaBuilder.createTable(CassandraDomainsTable.TABLE_NAME)
Modified:
james/project/trunk/server/data/data-cassandra/src/test/java/org/apache/james/domainlist/cassandra/CassandraDomainListTest.java
URL:
http://svn.apache.org/viewvc/james/project/trunk/server/data/data-cassandra/src/test/java/org/apache/james/domainlist/cassandra/CassandraDomainListTest.java?rev=1712032&r1=1712031&r2=1712032&view=diff
==============================================================================
---
james/project/trunk/server/data/data-cassandra/src/test/java/org/apache/james/domainlist/cassandra/CassandraDomainListTest.java
(original)
+++
james/project/trunk/server/data/data-cassandra/src/test/java/org/apache/james/domainlist/cassandra/CassandraDomainListTest.java
Mon Nov 2 14:54:45 2015
@@ -19,7 +19,6 @@
package org.apache.james.domainlist.cassandra;
-import org.apache.james.CassandraDataModule;
import org.apache.james.backends.cassandra.CassandraCluster;
import org.apache.james.domainlist.api.DomainList;
import org.apache.james.domainlist.lib.AbstractDomainListTest;
@@ -32,7 +31,7 @@ public class CassandraDomainListTest ext
@Override
protected DomainList createDomainList() {
CassandraDomainList testee = new CassandraDomainList();
- cassandra = CassandraCluster.create(new CassandraDataModule());
+ cassandra = CassandraCluster.create(new CassandraDomainListModule());
testee.setSession(cassandra.getConf());
testee.setLog(LoggerFactory.getLogger(getClass()));
testee.setDNSService(getDNSServer("localhost"));
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
