JAMES-1842: Introduce SieveFile repository module
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/f824e277 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/f824e277 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/f824e277 Branch: refs/heads/master Commit: f824e277aebb8f6acd69b081e1788853a5acb7e9 Parents: ebbf1e6 Author: Quynh Nguyen <qngu...@linagora.com> Authored: Thu Nov 10 14:04:47 2016 +0700 Committer: Quynh Nguyen <qngu...@linagora.com> Committed: Fri Nov 18 09:25:34 2016 +0700 ---------------------------------------------------------------------- .../modules/data/SieveFileRepositoryModule.java | 36 ++++++++++++++++++++ .../org/apache/james/JPAJamesServerMain.java | 4 +-- .../modules/data/JPASieveRepositoryModule.java | 36 -------------------- .../james/modules/data/MemoryDataModule.java | 5 ++- 4 files changed, 40 insertions(+), 41 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/f824e277/server/container/guice/guice-common/src/main/java/org/apache/james/modules/data/SieveFileRepositoryModule.java ---------------------------------------------------------------------- diff --git a/server/container/guice/guice-common/src/main/java/org/apache/james/modules/data/SieveFileRepositoryModule.java b/server/container/guice/guice-common/src/main/java/org/apache/james/modules/data/SieveFileRepositoryModule.java new file mode 100644 index 0000000..c6b36fd --- /dev/null +++ b/server/container/guice/guice-common/src/main/java/org/apache/james/modules/data/SieveFileRepositoryModule.java @@ -0,0 +1,36 @@ +/**************************************************************** + * 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.modules.data; + +import org.apache.james.sieverepository.api.SieveRepository; +import org.apache.james.sieverepository.file.SieveFileRepository; + +import com.google.inject.AbstractModule; +import com.google.inject.Scopes; + +public class SieveFileRepositoryModule extends AbstractModule { + + @Override + protected void configure() { + bind(SieveFileRepository.class).in(Scopes.SINGLETON); + + bind(SieveRepository.class).to(SieveFileRepository.class); + } + +} http://git-wip-us.apache.org/repos/asf/james-project/blob/f824e277/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 ae623ce..97aeaa3 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 @@ -20,7 +20,7 @@ package org.apache.james; import org.apache.james.modules.data.JPADataModule; -import org.apache.james.modules.data.JPASieveRepositoryModule; +import org.apache.james.modules.data.SieveFileRepositoryModule; import org.apache.james.modules.mailbox.JPAMailboxModule; import org.apache.james.modules.mailbox.LuceneSearchMailboxModule; import org.apache.james.modules.server.ActiveMQQueueModule; @@ -35,7 +35,7 @@ public class JPAJamesServerMain { public static final Module jpaServerModule = Modules.combine( new JPAMailboxModule(), new JPADataModule(), - new JPASieveRepositoryModule(), + new SieveFileRepositoryModule(), new QuotaModule(), new ActiveMQQueueModule()); http://git-wip-us.apache.org/repos/asf/james-project/blob/f824e277/server/container/guice/jpa-guice/src/main/java/org/apache/james/modules/data/JPASieveRepositoryModule.java ---------------------------------------------------------------------- diff --git a/server/container/guice/jpa-guice/src/main/java/org/apache/james/modules/data/JPASieveRepositoryModule.java b/server/container/guice/jpa-guice/src/main/java/org/apache/james/modules/data/JPASieveRepositoryModule.java deleted file mode 100644 index d5dac1c..0000000 --- a/server/container/guice/jpa-guice/src/main/java/org/apache/james/modules/data/JPASieveRepositoryModule.java +++ /dev/null @@ -1,36 +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.modules.data; - -import org.apache.james.sieverepository.api.SieveRepository; -import org.apache.james.sieverepository.file.SieveFileRepository; - -import com.google.inject.AbstractModule; -import com.google.inject.Scopes; - -public class JPASieveRepositoryModule extends AbstractModule { - - @Override - protected void configure() { - bind(SieveFileRepository.class).in(Scopes.SINGLETON); - - bind(SieveRepository.class).to(SieveFileRepository.class); - } - -} http://git-wip-us.apache.org/repos/asf/james-project/blob/f824e277/server/container/guice/memory-guice/src/main/java/org/apache/james/modules/data/MemoryDataModule.java ---------------------------------------------------------------------- diff --git a/server/container/guice/memory-guice/src/main/java/org/apache/james/modules/data/MemoryDataModule.java b/server/container/guice/memory-guice/src/main/java/org/apache/james/modules/data/MemoryDataModule.java index 320e24f..b809df8 100644 --- a/server/container/guice/memory-guice/src/main/java/org/apache/james/modules/data/MemoryDataModule.java +++ b/server/container/guice/memory-guice/src/main/java/org/apache/james/modules/data/MemoryDataModule.java @@ -50,6 +50,8 @@ public class MemoryDataModule extends AbstractModule { @Override protected void configure() { + install(new SieveFileRepositoryModule()); + bind(MemoryDomainList.class).in(Scopes.SINGLETON); bind(DomainList.class).to(MemoryDomainList.class); @@ -59,9 +61,6 @@ public class MemoryDataModule extends AbstractModule { bind(MemoryUsersRepository.class).toInstance(MemoryUsersRepository.withVirtualHosting()); bind(UsersRepository.class).to(MemoryUsersRepository.class); - bind(SieveFileRepository.class).in(Scopes.SINGLETON); - bind(SieveRepository.class).to(SieveFileRepository.class); - Multibinder.newSetBinder(binder(), ConfigurationPerformer.class).addBinding().to(MemoryDataConfigurationPerformer.class); } --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org