JAMES-1842: Introduce JmapJamesServer interface
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/f11fa614 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/f11fa614 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/f11fa614 Branch: refs/heads/master Commit: f11fa6140e2c01db4f2b1aaf76dc3ffe6a091a06 Parents: fdb400d Author: Antoine Duprat <adup...@apache.org> Authored: Wed Nov 16 10:05:38 2016 +0100 Committer: Quynh Nguyen <qngu...@linagora.com> Committed: Fri Nov 18 09:33:20 2016 +0700 ---------------------------------------------------------------------- .../org/apache/james/CassandraJamesServer.java | 2 +- .../james/AbstractJmapJamesServerTest.java | 2 +- .../java/org/apache/james/JmapJamesServer.java | 23 ++++++++++++++++++++ .../org/apache/james/MemoryJamesServer.java | 2 +- 4 files changed, 26 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/f11fa614/server/container/guice/cassandra-guice/src/main/java/org/apache/james/CassandraJamesServer.java ---------------------------------------------------------------------- diff --git a/server/container/guice/cassandra-guice/src/main/java/org/apache/james/CassandraJamesServer.java b/server/container/guice/cassandra-guice/src/main/java/org/apache/james/CassandraJamesServer.java index e4375d4..4ca7c76 100644 --- a/server/container/guice/cassandra-guice/src/main/java/org/apache/james/CassandraJamesServer.java +++ b/server/container/guice/cassandra-guice/src/main/java/org/apache/james/CassandraJamesServer.java @@ -27,7 +27,7 @@ import com.google.common.collect.Iterables; import com.google.inject.Module; import com.google.inject.util.Modules; -public class CassandraJamesServer extends GuiceJamesServerImpl implements JmapServer, WebAdminServer { +public class CassandraJamesServer extends GuiceJamesServerImpl implements JmapJamesServer { public CassandraJamesServer() { super(); http://git-wip-us.apache.org/repos/asf/james-project/blob/f11fa614/server/container/guice/guice-common/src/test/java/org/apache/james/AbstractJmapJamesServerTest.java ---------------------------------------------------------------------- diff --git a/server/container/guice/guice-common/src/test/java/org/apache/james/AbstractJmapJamesServerTest.java b/server/container/guice/guice-common/src/test/java/org/apache/james/AbstractJmapJamesServerTest.java index cdfd301..46d8917 100644 --- a/server/container/guice/guice-common/src/test/java/org/apache/james/AbstractJmapJamesServerTest.java +++ b/server/container/guice/guice-common/src/test/java/org/apache/james/AbstractJmapJamesServerTest.java @@ -39,7 +39,7 @@ import com.jayway.restassured.RestAssured; import com.jayway.restassured.builder.RequestSpecBuilder; import com.jayway.restassured.http.ContentType; -public abstract class AbstractJmapJamesServerTest<T extends GuiceJamesServerImpl & JmapServer & WebAdminServer> { +public abstract class AbstractJmapJamesServerTest<T extends JmapJamesServer> { private static final int IMAP_PORT = 1143; // You need to be root (superuser) to bind to ports under 1024. private static final int IMAP_PORT_SSL = 1993; http://git-wip-us.apache.org/repos/asf/james-project/blob/f11fa614/server/container/guice/guice-common/src/test/java/org/apache/james/JmapJamesServer.java ---------------------------------------------------------------------- diff --git a/server/container/guice/guice-common/src/test/java/org/apache/james/JmapJamesServer.java b/server/container/guice/guice-common/src/test/java/org/apache/james/JmapJamesServer.java new file mode 100644 index 0000000..cf374ba --- /dev/null +++ b/server/container/guice/guice-common/src/test/java/org/apache/james/JmapJamesServer.java @@ -0,0 +1,23 @@ +/**************************************************************** + * 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; + +public interface JmapJamesServer extends GuiceJamesServer, JmapServer, WebAdminServer { + +} http://git-wip-us.apache.org/repos/asf/james-project/blob/f11fa614/server/container/guice/memory-guice/src/main/java/org/apache/james/MemoryJamesServer.java ---------------------------------------------------------------------- diff --git a/server/container/guice/memory-guice/src/main/java/org/apache/james/MemoryJamesServer.java b/server/container/guice/memory-guice/src/main/java/org/apache/james/MemoryJamesServer.java index d65aaa0..ee927af 100644 --- a/server/container/guice/memory-guice/src/main/java/org/apache/james/MemoryJamesServer.java +++ b/server/container/guice/memory-guice/src/main/java/org/apache/james/MemoryJamesServer.java @@ -27,7 +27,7 @@ import com.google.common.collect.Iterables; import com.google.inject.Module; import com.google.inject.util.Modules; -public class MemoryJamesServer extends GuiceJamesServerImpl implements JmapServer, WebAdminServer { +public class MemoryJamesServer extends GuiceJamesServerImpl implements JmapJamesServer { public MemoryJamesServer() { super(); } --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
