JAMES-1842 Refactor JPA Guice
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/fd3c4396 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/fd3c4396 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/fd3c4396 Branch: refs/heads/master Commit: fd3c4396fe444d2770e8d4a2d5d1b49883c15f73 Parents: e849d6e Author: Quynh Nguyen <[email protected]> Authored: Wed Nov 16 17:46:43 2016 +0700 Committer: Quynh Nguyen <[email protected]> Committed: Fri Nov 18 09:33:20 2016 +0700 ---------------------------------------------------------------------- .../java/org/apache/james/JmapJamesServer.java | 23 ++++++++++++++++++++ .../java/org/apache/james/JmapJamesServer.java | 23 -------------------- .../org/apache/james/JPAJamesServerMain.java | 2 +- .../org/apache/james/JPAJamesServerTest.java | 4 ++-- .../james/JamesCapabilitiesServerTest.java | 2 +- 5 files changed, 27 insertions(+), 27 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/fd3c4396/server/container/guice/guice-common/src/main/java/org/apache/james/JmapJamesServer.java ---------------------------------------------------------------------- diff --git a/server/container/guice/guice-common/src/main/java/org/apache/james/JmapJamesServer.java b/server/container/guice/guice-common/src/main/java/org/apache/james/JmapJamesServer.java new file mode 100644 index 0000000..cf374ba --- /dev/null +++ b/server/container/guice/guice-common/src/main/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/fd3c4396/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 deleted file mode 100644 index cf374ba..0000000 --- a/server/container/guice/guice-common/src/test/java/org/apache/james/JmapJamesServer.java +++ /dev/null @@ -1,23 +0,0 @@ -/**************************************************************** - * 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/fd3c4396/server/container/guice/jpa-guice/src/main/java/org/apache/james/JPAJamesServerMain.java ---------------------------------------------------------------------- diff --git a/server/container/guice/jpa-guice/src/main/java/org/apache/james/JPAJamesServerMain.java b/server/container/guice/jpa-guice/src/main/java/org/apache/james/JPAJamesServerMain.java index 97aeaa3..5ae97a3 100644 --- a/server/container/guice/jpa-guice/src/main/java/org/apache/james/JPAJamesServerMain.java +++ b/server/container/guice/jpa-guice/src/main/java/org/apache/james/JPAJamesServerMain.java @@ -40,7 +40,7 @@ public class JPAJamesServerMain { new ActiveMQQueueModule()); public static void main(String[] args) throws Exception { - GuiceJamesServer server = new GuiceJamesServer() + GuiceJamesServerImpl server = new GuiceJamesServerImpl() .combineWith(jpaServerModule, new JMXServerModule(), new LuceneSearchMailboxModule()); http://git-wip-us.apache.org/repos/asf/james-project/blob/fd3c4396/server/container/guice/jpa-guice/src/test/java/org/apache/james/JPAJamesServerTest.java ---------------------------------------------------------------------- diff --git a/server/container/guice/jpa-guice/src/test/java/org/apache/james/JPAJamesServerTest.java b/server/container/guice/jpa-guice/src/test/java/org/apache/james/JPAJamesServerTest.java index 0684be1..8ab4ad6 100644 --- a/server/container/guice/jpa-guice/src/test/java/org/apache/james/JPAJamesServerTest.java +++ b/server/container/guice/jpa-guice/src/test/java/org/apache/james/JPAJamesServerTest.java @@ -29,8 +29,8 @@ public class JPAJamesServerTest extends AbstractJamesServerTest { public TemporaryFolder temporaryFolder = new TemporaryFolder(); @Override - protected GuiceJamesServer createJamesServer() { - return new GuiceJamesServer() + protected GuiceJamesServerImpl createJamesServer() { + return new GuiceJamesServerImpl() .combineWith(JPAJamesServerMain.jpaServerModule) .overrideWith(new TestFilesystemModule(temporaryFolder), new TestJPAConfigurationModule()); http://git-wip-us.apache.org/repos/asf/james-project/blob/fd3c4396/server/container/guice/jpa-guice/src/test/java/org/apache/james/JamesCapabilitiesServerTest.java ---------------------------------------------------------------------- diff --git a/server/container/guice/jpa-guice/src/test/java/org/apache/james/JamesCapabilitiesServerTest.java b/server/container/guice/jpa-guice/src/test/java/org/apache/james/JamesCapabilitiesServerTest.java index 82e728a..ad2a17c 100644 --- a/server/container/guice/jpa-guice/src/test/java/org/apache/james/JamesCapabilitiesServerTest.java +++ b/server/container/guice/jpa-guice/src/test/java/org/apache/james/JamesCapabilitiesServerTest.java @@ -49,7 +49,7 @@ public class JamesCapabilitiesServerTest { private GuiceJamesServer createJPAJamesServer(final MailboxManager mailboxManager) { Module mockMailboxManager = (binder) -> binder.bind(MailboxManager.class).toInstance(mailboxManager); - return new GuiceJamesServer() + return new GuiceJamesServerImpl() .combineWith(JPAJamesServerMain.jpaServerModule) .overrideWith( new TestFilesystemModule(temporaryFolder), --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
