This is an automated email from the ASF dual-hosted git repository. rcordier pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/james-project.git
commit dccd616fe4f3b1e8f0d169936d1f493fff4ad8ef Author: duc91 <duc91....@gmail.com> AuthorDate: Mon May 11 17:08:44 2020 +0700 JAMES-3168: Guice binding for JMAP-RFC8621, use jmap project everywhere to support both -draft and -rfc8621 implementations --- .../smtp/cassandra-rabbitmq-object-storage/pom.xml | 2 +- mpt/impl/smtp/cassandra/pom.xml | 2 +- pom.xml | 4 +- server/container/cli-integration/pom.xml | 2 +- server/container/guice/cassandra-guice/pom.xml | 4 +- .../org/apache/james/CassandraJamesServerMain.java | 4 +- .../container/guice/cassandra-ldap-guice/pom.xml | 2 +- .../guice/cassandra-rabbitmq-guice/pom.xml | 2 +- .../guice/cassandra-rabbitmq-ldap-guice/pom.xml | 2 +- server/container/guice/memory-guice/pom.xml | 4 +- .../org/apache/james/MemoryJamesServerMain.java | 4 +- server/container/guice/pom.xml | 8 ++-- .../guice/protocols/{jmap-draft => jmap}/pom.xml | 10 +++-- .../james/jmap/draft/DraftMethodsModule.java} | 2 +- .../apache/james/jmap/draft/JMAPCommonModule.java | 0 .../jmap/draft/JMAPConfigurationStartUpCheck.java | 0 .../org/apache/james/jmap/draft/JMAPModule.java | 5 ++- .../apache/james/jmap/draft/JmapGuiceProbe.java | 0 .../apache/james/jmap/draft/MessageIdProbe.java | 0 .../james/jmap/rfc8621/RFC8621MethodsModule.java | 45 ++++++++++++++++++++++ .../james/modules/protocols/JMAPServerModule.java} | 2 +- .../main/resources/defaultJmapMailetContainer.xml | 0 .../apache/james/jmap/draft/JMAPModuleTest.java | 0 .../james/jmap/draft/JmapJamesServerContract.java | 1 - .../james/jmap/draft/MailetPreconditionTest.java | 1 - .../apache/james/modules/TestJMAPServerModule.java | 0 server/mailet/integration-testing/pom.xml | 2 +- .../pom.xml | 2 +- .../jmap-draft-integration-testing-common/pom.xml | 2 +- .../memory-jmap-draft-integration-testing/pom.xml | 2 +- .../pom.xml | 2 +- .../webadmin-integration-test-common/pom.xml | 4 +- 32 files changed, 85 insertions(+), 35 deletions(-) diff --git a/mpt/impl/smtp/cassandra-rabbitmq-object-storage/pom.xml b/mpt/impl/smtp/cassandra-rabbitmq-object-storage/pom.xml index 267cc92..d4ce24f 100644 --- a/mpt/impl/smtp/cassandra-rabbitmq-object-storage/pom.xml +++ b/mpt/impl/smtp/cassandra-rabbitmq-object-storage/pom.xml @@ -95,7 +95,7 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-guice-jmap-draft</artifactId> + <artifactId>james-server-guice-jmap</artifactId> <type>test-jar</type> <scope>test</scope> </dependency> diff --git a/mpt/impl/smtp/cassandra/pom.xml b/mpt/impl/smtp/cassandra/pom.xml index 8414055..0fefef4 100644 --- a/mpt/impl/smtp/cassandra/pom.xml +++ b/mpt/impl/smtp/cassandra/pom.xml @@ -59,7 +59,7 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-guice-jmap-draft</artifactId> + <artifactId>james-server-guice-jmap</artifactId> <type>test-jar</type> <scope>test</scope> </dependency> diff --git a/pom.xml b/pom.xml index 413a1ad..94adf21 100644 --- a/pom.xml +++ b/pom.xml @@ -1479,12 +1479,12 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-guice-jmap-draft</artifactId> + <artifactId>james-server-guice-jmap</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-guice-jmap-draft</artifactId> + <artifactId>james-server-guice-jmap</artifactId> <version>${project.version}</version> <type>test-jar</type> </dependency> diff --git a/server/container/cli-integration/pom.xml b/server/container/cli-integration/pom.xml index dafe9c2..8084fda 100644 --- a/server/container/cli-integration/pom.xml +++ b/server/container/cli-integration/pom.xml @@ -50,7 +50,7 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-guice-jmap-draft</artifactId> + <artifactId>james-server-guice-jmap</artifactId> <type>test-jar</type> <scope>test</scope> </dependency> diff --git a/server/container/guice/cassandra-guice/pom.xml b/server/container/guice/cassandra-guice/pom.xml index 4c277fa..8526e09 100644 --- a/server/container/guice/cassandra-guice/pom.xml +++ b/server/container/guice/cassandra-guice/pom.xml @@ -174,11 +174,11 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-guice-jmap-draft</artifactId> + <artifactId>james-server-guice-jmap</artifactId> </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-guice-jmap-draft</artifactId> + <artifactId>james-server-guice-jmap</artifactId> <type>test-jar</type> <scope>test</scope> </dependency> diff --git a/server/container/guice/cassandra-guice/src/main/java/org/apache/james/CassandraJamesServerMain.java b/server/container/guice/cassandra-guice/src/main/java/org/apache/james/CassandraJamesServerMain.java index a7fcc7d..bc01ba1 100644 --- a/server/container/guice/cassandra-guice/src/main/java/org/apache/james/CassandraJamesServerMain.java +++ b/server/container/guice/cassandra-guice/src/main/java/org/apache/james/CassandraJamesServerMain.java @@ -45,7 +45,7 @@ import org.apache.james.modules.mailbox.ElasticSearchMailboxModule; import org.apache.james.modules.mailbox.TikaMailboxModule; import org.apache.james.modules.metrics.CassandraMetricsModule; import org.apache.james.modules.protocols.IMAPServerModule; -import org.apache.james.modules.protocols.JMAPDraftServerModule; +import org.apache.james.modules.protocols.JMAPServerModule; import org.apache.james.modules.protocols.LMTPServerModule; import org.apache.james.modules.protocols.ManageSieveServerModule; import org.apache.james.modules.protocols.POP3ServerModule; @@ -107,7 +107,7 @@ public class CassandraJamesServerMain implements JamesServerMain { new POP3ServerModule(), new ProtocolHandlerModule(), new SMTPServerModule(), - new JMAPDraftServerModule(), + new JMAPServerModule(), WEBADMIN); public static final Module PLUGINS = Modules.combine( diff --git a/server/container/guice/cassandra-ldap-guice/pom.xml b/server/container/guice/cassandra-ldap-guice/pom.xml index f88e0e0..8887655 100644 --- a/server/container/guice/cassandra-ldap-guice/pom.xml +++ b/server/container/guice/cassandra-ldap-guice/pom.xml @@ -88,7 +88,7 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-guice-jmap-draft</artifactId> + <artifactId>james-server-guice-jmap</artifactId> <type>test-jar</type> <scope>test</scope> </dependency> diff --git a/server/container/guice/cassandra-rabbitmq-guice/pom.xml b/server/container/guice/cassandra-rabbitmq-guice/pom.xml index ade5311..1b02418 100644 --- a/server/container/guice/cassandra-rabbitmq-guice/pom.xml +++ b/server/container/guice/cassandra-rabbitmq-guice/pom.xml @@ -148,7 +148,7 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-guice-jmap-draft</artifactId> + <artifactId>james-server-guice-jmap</artifactId> <type>test-jar</type> <scope>test</scope> </dependency> diff --git a/server/container/guice/cassandra-rabbitmq-ldap-guice/pom.xml b/server/container/guice/cassandra-rabbitmq-ldap-guice/pom.xml index c37bc10..9767973 100644 --- a/server/container/guice/cassandra-rabbitmq-ldap-guice/pom.xml +++ b/server/container/guice/cassandra-rabbitmq-ldap-guice/pom.xml @@ -116,7 +116,7 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-guice-jmap-draft</artifactId> + <artifactId>james-server-guice-jmap</artifactId> <type>test-jar</type> <scope>test</scope> </dependency> diff --git a/server/container/guice/memory-guice/pom.xml b/server/container/guice/memory-guice/pom.xml index 59311ee..ebca896 100644 --- a/server/container/guice/memory-guice/pom.xml +++ b/server/container/guice/memory-guice/pom.xml @@ -102,11 +102,11 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-guice-jmap-draft</artifactId> + <artifactId>james-server-guice-jmap</artifactId> </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-guice-jmap-draft</artifactId> + <artifactId>james-server-guice-jmap</artifactId> <type>test-jar</type> <scope>test</scope> </dependency> diff --git a/server/container/guice/memory-guice/src/main/java/org/apache/james/MemoryJamesServerMain.java b/server/container/guice/memory-guice/src/main/java/org/apache/james/MemoryJamesServerMain.java index be8595a..9a19fae 100644 --- a/server/container/guice/memory-guice/src/main/java/org/apache/james/MemoryJamesServerMain.java +++ b/server/container/guice/memory-guice/src/main/java/org/apache/james/MemoryJamesServerMain.java @@ -31,7 +31,7 @@ import org.apache.james.modules.data.MemoryDataModule; import org.apache.james.modules.eventstore.MemoryEventStoreModule; import org.apache.james.modules.mailbox.MemoryMailboxModule; import org.apache.james.modules.protocols.IMAPServerModule; -import org.apache.james.modules.protocols.JMAPDraftServerModule; +import org.apache.james.modules.protocols.JMAPServerModule; import org.apache.james.modules.protocols.LMTPServerModule; import org.apache.james.modules.protocols.ManageSieveServerModule; import org.apache.james.modules.protocols.POP3ServerModule; @@ -99,7 +99,7 @@ public class MemoryJamesServerMain implements JamesServerMain { public static final Module JMAP = Modules.combine( new JmapTasksModule(), new MemoryDataJmapModule(), - new JMAPDraftServerModule()); + new JMAPServerModule()); public static final Module IN_MEMORY_SERVER_MODULE = Modules.combine( new BlobMemoryModule(), diff --git a/server/container/guice/pom.xml b/server/container/guice/pom.xml index 6586449..bf8fe7f 100644 --- a/server/container/guice/pom.xml +++ b/server/container/guice/pom.xml @@ -59,7 +59,7 @@ <module>memory-guice</module> <module>onami</module> <module>protocols/imap</module> - <module>protocols/jmap-draft</module> + <module>protocols/jmap</module> <module>protocols/lmtp</module> <module>protocols/managedsieve</module> <module>protocols/netty</module> @@ -99,17 +99,17 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-guice-imap</artifactId> + <artifactId>james-server-jmap-rfc-8621</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-guice-jmap-draft</artifactId> + <artifactId>james-server-guice-jmap</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-guice-jmap-draft</artifactId> + <artifactId>james-server-guice-jmap</artifactId> <version>${project.version}</version> <type>test-jar</type> </dependency> diff --git a/server/container/guice/protocols/jmap-draft/pom.xml b/server/container/guice/protocols/jmap/pom.xml similarity index 89% rename from server/container/guice/protocols/jmap-draft/pom.xml rename to server/container/guice/protocols/jmap/pom.xml index 74637a4..c0de05a 100644 --- a/server/container/guice/protocols/jmap-draft/pom.xml +++ b/server/container/guice/protocols/jmap/pom.xml @@ -26,10 +26,10 @@ <relativePath>../../pom.xml</relativePath> </parent> - <artifactId>james-server-guice-jmap-draft</artifactId> + <artifactId>james-server-guice-jmap</artifactId> - <name>Apache James :: Server :: Guice :: JMAP (draft)</name> - <description>JMAP (draft) modules for Guice implementation of James server</description> + <name>Apache James :: Server :: Guice :: JMAP</name> + <description>JMAP (draft and RFC8621) modules for Guice implementation of James server</description> <dependencies> <dependency> @@ -63,6 +63,10 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> + <artifactId>james-server-jmap-rfc-8621</artifactId> + </dependency> + <dependency> + <groupId>${james.groupId}</groupId> <artifactId>testing-base</artifactId> <scope>test</scope> </dependency> diff --git a/server/container/guice/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/MethodsModule.java b/server/container/guice/protocols/jmap/src/main/java/org/apache/james/jmap/draft/DraftMethodsModule.java similarity index 98% rename from server/container/guice/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/MethodsModule.java rename to server/container/guice/protocols/jmap/src/main/java/org/apache/james/jmap/draft/DraftMethodsModule.java index b0fd789..f63684c 100644 --- a/server/container/guice/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/MethodsModule.java +++ b/server/container/guice/protocols/jmap/src/main/java/org/apache/james/jmap/draft/DraftMethodsModule.java @@ -49,7 +49,7 @@ import com.google.inject.Scopes; import com.google.inject.multibindings.Multibinder; import com.google.inject.name.Names; -public class MethodsModule extends AbstractModule { +public class DraftMethodsModule extends AbstractModule { @Override protected void configure() { diff --git a/server/container/guice/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/JMAPCommonModule.java b/server/container/guice/protocols/jmap/src/main/java/org/apache/james/jmap/draft/JMAPCommonModule.java similarity index 100% rename from server/container/guice/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/JMAPCommonModule.java rename to server/container/guice/protocols/jmap/src/main/java/org/apache/james/jmap/draft/JMAPCommonModule.java diff --git a/server/container/guice/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/JMAPConfigurationStartUpCheck.java b/server/container/guice/protocols/jmap/src/main/java/org/apache/james/jmap/draft/JMAPConfigurationStartUpCheck.java similarity index 100% rename from server/container/guice/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/JMAPConfigurationStartUpCheck.java rename to server/container/guice/protocols/jmap/src/main/java/org/apache/james/jmap/draft/JMAPConfigurationStartUpCheck.java diff --git a/server/container/guice/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/JMAPModule.java b/server/container/guice/protocols/jmap/src/main/java/org/apache/james/jmap/draft/JMAPModule.java similarity index 98% rename from server/container/guice/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/JMAPModule.java rename to server/container/guice/protocols/jmap/src/main/java/org/apache/james/jmap/draft/JMAPModule.java index 850f24e..f842c2a 100644 --- a/server/container/guice/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/JMAPModule.java +++ b/server/container/guice/protocols/jmap/src/main/java/org/apache/james/jmap/draft/JMAPModule.java @@ -38,6 +38,7 @@ import org.apache.james.jmap.draft.utils.JsoupHtmlTextExtractor; import org.apache.james.jmap.event.PropagateLookupRightListener; import org.apache.james.jmap.mailet.VacationMailet; import org.apache.james.jmap.mailet.filter.JMAPFiltering; +import org.apache.james.jmap.rfc8621.RFC8621MethodsModule; import org.apache.james.jwt.JwtConfiguration; import org.apache.james.lifecycle.api.StartUpCheck; import org.apache.james.mailbox.MailboxManager; @@ -87,7 +88,8 @@ public class JMAPModule extends AbstractModule { @Override protected void configure() { install(new JMAPCommonModule()); - install(new MethodsModule()); + install(new DraftMethodsModule()); + install(new RFC8621MethodsModule()); install(binder -> binder .bind(CamelMailetContainerModule.DefaultProcessorsConfigurationSupplier.class) .toInstance(DEFAULT_JMAP_PROCESSORS_CONFIGURATION_SUPPLIER)); @@ -109,6 +111,7 @@ public class JMAPModule extends AbstractModule { Multibinder<Version> supportedVersions = Multibinder.newSetBinder(binder(), Version.class); supportedVersions.addBinding().toInstance(Version.DRAFT); + supportedVersions.addBinding().toInstance(Version.RFC8621); } @Provides diff --git a/server/container/guice/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/JmapGuiceProbe.java b/server/container/guice/protocols/jmap/src/main/java/org/apache/james/jmap/draft/JmapGuiceProbe.java similarity index 100% rename from server/container/guice/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/JmapGuiceProbe.java rename to server/container/guice/protocols/jmap/src/main/java/org/apache/james/jmap/draft/JmapGuiceProbe.java diff --git a/server/container/guice/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/MessageIdProbe.java b/server/container/guice/protocols/jmap/src/main/java/org/apache/james/jmap/draft/MessageIdProbe.java similarity index 100% rename from server/container/guice/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/MessageIdProbe.java rename to server/container/guice/protocols/jmap/src/main/java/org/apache/james/jmap/draft/MessageIdProbe.java diff --git a/server/container/guice/protocols/jmap/src/main/java/org/apache/james/jmap/rfc8621/RFC8621MethodsModule.java b/server/container/guice/protocols/jmap/src/main/java/org/apache/james/jmap/rfc8621/RFC8621MethodsModule.java new file mode 100644 index 0000000..19fdbe4 --- /dev/null +++ b/server/container/guice/protocols/jmap/src/main/java/org/apache/james/jmap/rfc8621/RFC8621MethodsModule.java @@ -0,0 +1,45 @@ +/**************************************************************** + * 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. * + ****************************************************************/ + +package org.apache.james.jmap.rfc8621; + + +import org.apache.james.jmap.JMAPRoutesHandler; +import org.apache.james.jmap.Version; +import org.apache.james.jmap.method.CoreEcho; +import org.apache.james.jmap.method.Method; +import org.apache.james.jmap.routes.JMAPApiRoutes; + +import com.google.inject.AbstractModule; +import com.google.inject.multibindings.Multibinder; +import com.google.inject.multibindings.ProvidesIntoSet; + +public class RFC8621MethodsModule extends AbstractModule { + + @Override + protected void configure() { + Multibinder<Method> methods = Multibinder.newSetBinder(binder(), Method.class); + methods.addBinding().to(CoreEcho.class); + } + + @ProvidesIntoSet + JMAPRoutesHandler routesHandler(JMAPApiRoutes jmapApiRoutes) { + return new JMAPRoutesHandler(Version.RFC8621, jmapApiRoutes); + } +} diff --git a/server/container/guice/protocols/jmap-draft/src/main/java/org/apache/james/modules/protocols/JMAPDraftServerModule.java b/server/container/guice/protocols/jmap/src/main/java/org/apache/james/modules/protocols/JMAPServerModule.java similarity index 98% rename from server/container/guice/protocols/jmap-draft/src/main/java/org/apache/james/modules/protocols/JMAPDraftServerModule.java rename to server/container/guice/protocols/jmap/src/main/java/org/apache/james/modules/protocols/JMAPServerModule.java index 2ab7049..afd1357 100644 --- a/server/container/guice/protocols/jmap-draft/src/main/java/org/apache/james/modules/protocols/JMAPDraftServerModule.java +++ b/server/container/guice/protocols/jmap/src/main/java/org/apache/james/modules/protocols/JMAPServerModule.java @@ -42,7 +42,7 @@ import com.google.inject.AbstractModule; import com.google.inject.multibindings.Multibinder; import com.google.inject.multibindings.ProvidesIntoSet; -public class JMAPDraftServerModule extends AbstractModule { +public class JMAPServerModule extends AbstractModule { @Override protected void configure() { diff --git a/server/container/guice/protocols/jmap-draft/src/main/resources/defaultJmapMailetContainer.xml b/server/container/guice/protocols/jmap/src/main/resources/defaultJmapMailetContainer.xml similarity index 100% rename from server/container/guice/protocols/jmap-draft/src/main/resources/defaultJmapMailetContainer.xml rename to server/container/guice/protocols/jmap/src/main/resources/defaultJmapMailetContainer.xml diff --git a/server/container/guice/protocols/jmap-draft/src/test/java/org/apache/james/jmap/draft/JMAPModuleTest.java b/server/container/guice/protocols/jmap/src/test/java/org/apache/james/jmap/draft/JMAPModuleTest.java similarity index 100% rename from server/container/guice/protocols/jmap-draft/src/test/java/org/apache/james/jmap/draft/JMAPModuleTest.java rename to server/container/guice/protocols/jmap/src/test/java/org/apache/james/jmap/draft/JMAPModuleTest.java diff --git a/server/container/guice/protocols/jmap-draft/src/test/java/org/apache/james/jmap/draft/JmapJamesServerContract.java b/server/container/guice/protocols/jmap/src/test/java/org/apache/james/jmap/draft/JmapJamesServerContract.java similarity index 98% rename from server/container/guice/protocols/jmap-draft/src/test/java/org/apache/james/jmap/draft/JmapJamesServerContract.java rename to server/container/guice/protocols/jmap/src/test/java/org/apache/james/jmap/draft/JmapJamesServerContract.java index 6f965f7..461b0af 100644 --- a/server/container/guice/protocols/jmap-draft/src/test/java/org/apache/james/jmap/draft/JmapJamesServerContract.java +++ b/server/container/guice/protocols/jmap/src/test/java/org/apache/james/jmap/draft/JmapJamesServerContract.java @@ -26,7 +26,6 @@ import java.nio.charset.StandardCharsets; import org.apache.james.GuiceJamesServer; import org.apache.james.domainlist.lib.DomainListConfiguration; -import org.apache.james.jmap.draft.JmapGuiceProbe; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/server/container/guice/protocols/jmap-draft/src/test/java/org/apache/james/jmap/draft/MailetPreconditionTest.java b/server/container/guice/protocols/jmap/src/test/java/org/apache/james/jmap/draft/MailetPreconditionTest.java similarity index 99% rename from server/container/guice/protocols/jmap-draft/src/test/java/org/apache/james/jmap/draft/MailetPreconditionTest.java rename to server/container/guice/protocols/jmap/src/test/java/org/apache/james/jmap/draft/MailetPreconditionTest.java index 62887bc..228538c 100644 --- a/server/container/guice/protocols/jmap-draft/src/test/java/org/apache/james/jmap/draft/MailetPreconditionTest.java +++ b/server/container/guice/protocols/jmap/src/test/java/org/apache/james/jmap/draft/MailetPreconditionTest.java @@ -25,7 +25,6 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import java.util.List; import org.apache.commons.configuration2.ex.ConfigurationException; -import org.apache.james.jmap.draft.JMAPModule; import org.apache.james.jmap.mailet.VacationMailet; import org.apache.james.jmap.mailet.filter.JMAPFiltering; import org.apache.james.mailetcontainer.impl.MatcherMailetPair; diff --git a/server/container/guice/protocols/jmap-draft/src/test/java/org/apache/james/modules/TestJMAPServerModule.java b/server/container/guice/protocols/jmap/src/test/java/org/apache/james/modules/TestJMAPServerModule.java similarity index 100% rename from server/container/guice/protocols/jmap-draft/src/test/java/org/apache/james/modules/TestJMAPServerModule.java rename to server/container/guice/protocols/jmap/src/test/java/org/apache/james/modules/TestJMAPServerModule.java diff --git a/server/mailet/integration-testing/pom.xml b/server/mailet/integration-testing/pom.xml index 5996524..4766cb7 100644 --- a/server/mailet/integration-testing/pom.xml +++ b/server/mailet/integration-testing/pom.xml @@ -66,7 +66,7 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-guice-jmap-draft</artifactId> + <artifactId>james-server-guice-jmap</artifactId> <type>test-jar</type> <scope>test</scope> </dependency> diff --git a/server/protocols/jmap-draft-integration-testing/cassandra-jmap-draft-integration-testing/pom.xml b/server/protocols/jmap-draft-integration-testing/cassandra-jmap-draft-integration-testing/pom.xml index 0767503..ae3d02d 100644 --- a/server/protocols/jmap-draft-integration-testing/cassandra-jmap-draft-integration-testing/pom.xml +++ b/server/protocols/jmap-draft-integration-testing/cassandra-jmap-draft-integration-testing/pom.xml @@ -140,7 +140,7 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-guice-jmap-draft</artifactId> + <artifactId>james-server-guice-jmap</artifactId> <type>test-jar</type> <scope>test</scope> </dependency> diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/pom.xml b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/pom.xml index 249a54d..46e212e 100644 --- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/pom.xml +++ b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/pom.xml @@ -73,7 +73,7 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-guice-jmap-draft</artifactId> + <artifactId>james-server-guice-jmap</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/pom.xml b/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/pom.xml index ef9d639..f452e7f 100644 --- a/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/pom.xml +++ b/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/pom.xml @@ -74,7 +74,7 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-guice-jmap-draft</artifactId> + <artifactId>james-server-guice-jmap</artifactId> <type>test-jar</type> <scope>test</scope> </dependency> diff --git a/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/pom.xml b/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/pom.xml index e05b983..4260711 100644 --- a/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/pom.xml +++ b/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/pom.xml @@ -113,7 +113,7 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-guice-jmap-draft</artifactId> + <artifactId>james-server-guice-jmap</artifactId> <type>test-jar</type> <scope>test</scope> </dependency> diff --git a/server/protocols/webadmin-integration-test/webadmin-integration-test-common/pom.xml b/server/protocols/webadmin-integration-test/webadmin-integration-test-common/pom.xml index 235c24e..43f31ca 100644 --- a/server/protocols/webadmin-integration-test/webadmin-integration-test-common/pom.xml +++ b/server/protocols/webadmin-integration-test/webadmin-integration-test-common/pom.xml @@ -74,7 +74,7 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-guice-jmap-draft</artifactId> + <artifactId>james-server-guice-jmap</artifactId> <type>test-jar</type> </dependency> <dependency> @@ -83,7 +83,7 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-guice-jmap-draft</artifactId> + <artifactId>james-server-guice-jmap</artifactId> </dependency> <dependency> <groupId>${james.groupId}</groupId> --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org