http://git-wip-us.apache.org/repos/asf/james-project/blob/1688bc6f/server/container/guice/cassandra-guice/src/test/java/org/apache/james/EmbeddedElasticSearchRule.java ---------------------------------------------------------------------- diff --git a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/EmbeddedElasticSearchRule.java b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/EmbeddedElasticSearchRule.java index efb5508..3568efb 100644 --- a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/EmbeddedElasticSearchRule.java +++ b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/EmbeddedElasticSearchRule.java @@ -18,7 +18,9 @@ ****************************************************************/ package org.apache.james; -import org.apache.james.mailbox.elasticsearch.EmbeddedElasticSearch; + +import org.apache.james.backends.es.EmbeddedElasticSearch; +import org.apache.james.mailbox.elasticsearch.MailboxElasticsearchConstants; import org.apache.james.modules.TestElasticSearchModule; import org.junit.rules.RuleChain; import org.junit.rules.TemporaryFolder; @@ -31,7 +33,7 @@ import com.google.inject.Module; public class EmbeddedElasticSearchRule implements GuiceModuleTestRule { private final TemporaryFolder temporaryFolder = new TemporaryFolder(); - private final EmbeddedElasticSearch embeddedElasticSearch = new EmbeddedElasticSearch(temporaryFolder); + private final EmbeddedElasticSearch embeddedElasticSearch = new EmbeddedElasticSearch(temporaryFolder, MailboxElasticsearchConstants.MAILBOX_INDEX); private final RuleChain chain = RuleChain .outerRule(temporaryFolder)
http://git-wip-us.apache.org/repos/asf/james-project/blob/1688bc6f/server/container/guice/cassandra-guice/src/test/java/org/apache/james/JamesCapabilitiesServerTest.java ---------------------------------------------------------------------- diff --git a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/JamesCapabilitiesServerTest.java b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/JamesCapabilitiesServerTest.java index 3642f6e..150308d 100644 --- a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/JamesCapabilitiesServerTest.java +++ b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/JamesCapabilitiesServerTest.java @@ -26,9 +26,10 @@ import java.util.EnumSet; import org.apache.james.backends.cassandra.CassandraCluster; import org.apache.james.backends.cassandra.components.CassandraModule; +import org.apache.james.backends.es.EmbeddedElasticSearch; import org.apache.james.jmap.methods.GetMessageListMethod; import org.apache.james.mailbox.MailboxManager; -import org.apache.james.mailbox.elasticsearch.EmbeddedElasticSearch; +import org.apache.james.mailbox.elasticsearch.MailboxElasticsearchConstants; import org.apache.james.modules.TestElasticSearchModule; import org.apache.james.modules.TestFilesystemModule; import org.apache.james.modules.TestJMAPServerModule; @@ -48,7 +49,7 @@ public class JamesCapabilitiesServerTest { private GuiceJamesServerImpl server; private TemporaryFolder temporaryFolder = new TemporaryFolder(); - private EmbeddedElasticSearch embeddedElasticSearch = new EmbeddedElasticSearch(temporaryFolder); + private EmbeddedElasticSearch embeddedElasticSearch = new EmbeddedElasticSearch(temporaryFolder, MailboxElasticsearchConstants.MAILBOX_INDEX); @Rule public RuleChain chain = RuleChain.outerRule(temporaryFolder).around(embeddedElasticSearch); http://git-wip-us.apache.org/repos/asf/james-project/blob/1688bc6f/server/container/guice/cassandra-guice/src/test/java/org/apache/james/modules/CassandraJmapServerModule.java ---------------------------------------------------------------------- diff --git a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/modules/CassandraJmapServerModule.java b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/modules/CassandraJmapServerModule.java index 69de08a..140f0a7 100644 --- a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/modules/CassandraJmapServerModule.java +++ b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/modules/CassandraJmapServerModule.java @@ -26,7 +26,7 @@ import javax.inject.Singleton; import org.apache.james.backends.cassandra.CassandraCluster; import org.apache.james.backends.cassandra.EmbeddedCassandra; -import org.apache.james.mailbox.elasticsearch.EmbeddedElasticSearch; +import org.apache.james.backends.es.EmbeddedElasticSearch; import org.junit.rules.TemporaryFolder; import com.datastax.driver.core.Session; http://git-wip-us.apache.org/repos/asf/james-project/blob/1688bc6f/server/container/guice/cassandra-guice/src/test/java/org/apache/james/modules/TestElasticSearchModule.java ---------------------------------------------------------------------- diff --git a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/modules/TestElasticSearchModule.java b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/modules/TestElasticSearchModule.java index 2254476..e9a89cd 100644 --- a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/modules/TestElasticSearchModule.java +++ b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/modules/TestElasticSearchModule.java @@ -21,10 +21,13 @@ package org.apache.james.modules; import com.google.inject.AbstractModule; import com.google.inject.Provides; -import org.apache.james.mailbox.elasticsearch.EmbeddedElasticSearch; -import org.apache.james.mailbox.elasticsearch.IndexCreationFactory; -import org.apache.james.mailbox.elasticsearch.NodeMappingFactory; -import org.apache.james.mailbox.elasticsearch.utils.TestingClientProvider; + +import org.apache.james.backends.es.EmbeddedElasticSearch; +import org.apache.james.backends.es.IndexCreationFactory; +import org.apache.james.backends.es.NodeMappingFactory; +import org.apache.james.backends.es.utils.TestingClientProvider; +import org.apache.james.mailbox.elasticsearch.MailboxElasticsearchConstants; +import org.apache.james.mailbox.elasticsearch.MailboxMappingFactory; import org.elasticsearch.client.Client; import javax.inject.Singleton; @@ -45,8 +48,11 @@ public class TestElasticSearchModule extends AbstractModule{ @Provides @Singleton protected Client provideClientProvider() { - return NodeMappingFactory.applyMapping( - IndexCreationFactory.createIndex(new TestingClientProvider(embeddedElasticSearch.getNode()).get()) - ); + Client client = new TestingClientProvider(embeddedElasticSearch.getNode()).get(); + IndexCreationFactory.createIndex(client, MailboxElasticsearchConstants.MAILBOX_INDEX); + return NodeMappingFactory.applyMapping(client, + MailboxElasticsearchConstants.MAILBOX_INDEX, + MailboxElasticsearchConstants.MESSAGE_TYPE, + MailboxMappingFactory.getMappingContent()); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/1688bc6f/server/pom.xml ---------------------------------------------------------------------- diff --git a/server/pom.xml b/server/pom.xml index 3569df4..46687c4 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -350,6 +350,17 @@ </dependency> <dependency> <groupId>org.apache.james</groupId> + <artifactId>apache-james-backends-es</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.james</groupId> + <artifactId>apache-james-backends-es</artifactId> + <type>test-jar</type> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.james</groupId> <artifactId>apache-james-backends-jpa</artifactId> <version>${project.version}</version> </dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/1688bc6f/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/pom.xml ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/pom.xml b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/pom.xml index 60f3d42..13c1463 100644 --- a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/pom.xml +++ b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/pom.xml @@ -149,6 +149,12 @@ </activation> <dependencies> <dependency> + <groupId>org.apache.james</groupId> + <artifactId>apache-james-backends-es</artifactId> + <type>test-jar</type> + <scope>test</scope> + </dependency> + <dependency> <groupId>${project.groupId}</groupId> <artifactId>apache-james-mailbox-api</artifactId> <type>test-jar</type> http://git-wip-us.apache.org/repos/asf/james-project/blob/1688bc6f/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/cucumber/CassandraStepdefs.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/cucumber/CassandraStepdefs.java b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/cucumber/CassandraStepdefs.java index a024d86..79f5cfd 100644 --- a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/cucumber/CassandraStepdefs.java +++ b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/cucumber/CassandraStepdefs.java @@ -26,9 +26,10 @@ import javax.inject.Inject; import org.apache.james.CassandraJamesServerMain; import org.apache.james.JmapJamesServer; import org.apache.james.backends.cassandra.EmbeddedCassandra; +import org.apache.james.backends.es.EmbeddedElasticSearch; import org.apache.james.jmap.methods.integration.cucumber.MainStepdefs; import org.apache.james.mailbox.cassandra.CassandraMessageId; -import org.apache.james.mailbox.elasticsearch.EmbeddedElasticSearch; +import org.apache.james.mailbox.elasticsearch.MailboxElasticsearchConstants; import org.apache.james.modules.CassandraJmapServerModule; import org.junit.rules.TemporaryFolder; @@ -43,7 +44,7 @@ public class CassandraStepdefs { private final MainStepdefs mainStepdefs; private TemporaryFolder temporaryFolder = new TemporaryFolder(); - private EmbeddedElasticSearch embeddedElasticSearch = new EmbeddedElasticSearch(temporaryFolder); + private EmbeddedElasticSearch embeddedElasticSearch = new EmbeddedElasticSearch(temporaryFolder, MailboxElasticsearchConstants.MAILBOX_INDEX); private EmbeddedCassandra cassandra = EmbeddedCassandra.createStartServer(); @Inject http://git-wip-us.apache.org/repos/asf/james-project/blob/1688bc6f/server/protocols/jmap-integration-testing/pom.xml ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/pom.xml b/server/protocols/jmap-integration-testing/pom.xml index a9df9da..7a76231 100644 --- a/server/protocols/jmap-integration-testing/pom.xml +++ b/server/protocols/jmap-integration-testing/pom.xml @@ -33,6 +33,7 @@ <packaging>pom</packaging> <modules> + <module>cassandra-jmap-integration-testing</module> <module>jmap-integration-testing-common</module> </modules> http://git-wip-us.apache.org/repos/asf/james-project/blob/1688bc6f/server/protocols/webadmin-integration-test/pom.xml ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin-integration-test/pom.xml b/server/protocols/webadmin-integration-test/pom.xml index eaf7ce6..5f3d9db 100644 --- a/server/protocols/webadmin-integration-test/pom.xml +++ b/server/protocols/webadmin-integration-test/pom.xml @@ -149,6 +149,12 @@ <dependencies> <dependency> <groupId>org.apache.james</groupId> + <artifactId>apache-james-backends-es</artifactId> + <type>test-jar</type> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.james</groupId> <artifactId>apache-james-mailbox-elasticsearch</artifactId> <type>test-jar</type> <scope>test</scope> --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org