JAMES-2521 Sieve probe belong in data API
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/31a2fbf3 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/31a2fbf3 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/31a2fbf3 Branch: refs/heads/master Commit: 31a2fbf34c0a830ebeba684ff2b841b6b0a9c1f2 Parents: cc8988f Author: Benoit Tellier <[email protected]> Authored: Tue Aug 14 11:47:50 2018 +0700 Committer: Benoit Tellier <[email protected]> Committed: Wed Aug 29 10:11:46 2018 +0700 ---------------------------------------------------------------------- .../james/mailbox/store/probe/SieveProbe.java | 38 -------------------- .../java/org/apache/james/cli/ServerCmd.java | 2 +- .../james/cli/probe/impl/JmxSieveProbe.java | 2 +- .../org/apache/james/cli/ServerCmdTest.java | 2 +- .../james/modules/protocols/SieveProbeImpl.java | 2 +- .../java/org/apache/james/probe/SieveProbe.java | 38 ++++++++++++++++++++ 6 files changed, 42 insertions(+), 42 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/31a2fbf3/mailbox/store/src/main/java/org/apache/james/mailbox/store/probe/SieveProbe.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/probe/SieveProbe.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/probe/SieveProbe.java deleted file mode 100644 index 9f3e18e..0000000 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/probe/SieveProbe.java +++ /dev/null @@ -1,38 +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.mailbox.store.probe; - -public interface SieveProbe { - - long getSieveQuota() throws Exception; - - void setSieveQuota(long quota) throws Exception; - - void removeSieveQuota() throws Exception; - - long getSieveQuota(String user) throws Exception; - - void setSieveQuota(String user, long quota) throws Exception; - - void removeSieveQuota(String user) throws Exception; - - void addActiveSieveScript(String user, String name, String script) throws Exception; - -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/james-project/blob/31a2fbf3/server/container/cli/src/main/java/org/apache/james/cli/ServerCmd.java ---------------------------------------------------------------------- diff --git a/server/container/cli/src/main/java/org/apache/james/cli/ServerCmd.java b/server/container/cli/src/main/java/org/apache/james/cli/ServerCmd.java index 60e9c04..bd9526a 100644 --- a/server/container/cli/src/main/java/org/apache/james/cli/ServerCmd.java +++ b/server/container/cli/src/main/java/org/apache/james/cli/ServerCmd.java @@ -51,8 +51,8 @@ import org.apache.james.mailbox.store.mail.model.SerializableQuota; import org.apache.james.mailbox.store.mail.model.SerializableQuotaValue; import org.apache.james.mailbox.store.probe.MailboxProbe; import org.apache.james.mailbox.store.probe.QuotaProbe; -import org.apache.james.mailbox.store.probe.SieveProbe; import org.apache.james.probe.DataProbe; +import org.apache.james.probe.SieveProbe; import org.apache.james.rrt.lib.Mappings; import org.apache.james.util.Port; import org.apache.james.util.Size; http://git-wip-us.apache.org/repos/asf/james-project/blob/31a2fbf3/server/container/cli/src/main/java/org/apache/james/cli/probe/impl/JmxSieveProbe.java ---------------------------------------------------------------------- diff --git a/server/container/cli/src/main/java/org/apache/james/cli/probe/impl/JmxSieveProbe.java b/server/container/cli/src/main/java/org/apache/james/cli/probe/impl/JmxSieveProbe.java index 07a98c3..4532cf5 100644 --- a/server/container/cli/src/main/java/org/apache/james/cli/probe/impl/JmxSieveProbe.java +++ b/server/container/cli/src/main/java/org/apache/james/cli/probe/impl/JmxSieveProbe.java @@ -23,7 +23,7 @@ import java.io.IOException; import javax.management.MalformedObjectNameException; -import org.apache.james.mailbox.store.probe.SieveProbe; +import org.apache.james.probe.SieveProbe; import org.apache.james.sieverepository.api.SieveRepositoryManagementMBean; public class JmxSieveProbe implements SieveProbe, JmxProbe { http://git-wip-us.apache.org/repos/asf/james-project/blob/31a2fbf3/server/container/cli/src/test/java/org/apache/james/cli/ServerCmdTest.java ---------------------------------------------------------------------- diff --git a/server/container/cli/src/test/java/org/apache/james/cli/ServerCmdTest.java b/server/container/cli/src/test/java/org/apache/james/cli/ServerCmdTest.java index c46c771..49119a0 100644 --- a/server/container/cli/src/test/java/org/apache/james/cli/ServerCmdTest.java +++ b/server/container/cli/src/test/java/org/apache/james/cli/ServerCmdTest.java @@ -41,8 +41,8 @@ import org.apache.james.mailbox.store.mail.model.SerializableQuota; import org.apache.james.mailbox.store.mail.model.SerializableQuotaValue; import org.apache.james.mailbox.store.probe.MailboxProbe; import org.apache.james.mailbox.store.probe.QuotaProbe; -import org.apache.james.mailbox.store.probe.SieveProbe; import org.apache.james.probe.DataProbe; +import org.apache.james.probe.SieveProbe; import org.apache.james.rrt.lib.MappingsImpl; import org.junit.Before; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/james-project/blob/31a2fbf3/server/container/guice/protocols/managedsieve/src/main/java/org/apache/james/modules/protocols/SieveProbeImpl.java ---------------------------------------------------------------------- diff --git a/server/container/guice/protocols/managedsieve/src/main/java/org/apache/james/modules/protocols/SieveProbeImpl.java b/server/container/guice/protocols/managedsieve/src/main/java/org/apache/james/modules/protocols/SieveProbeImpl.java index 9e09e44..aa255f6 100644 --- a/server/container/guice/protocols/managedsieve/src/main/java/org/apache/james/modules/protocols/SieveProbeImpl.java +++ b/server/container/guice/protocols/managedsieve/src/main/java/org/apache/james/modules/protocols/SieveProbeImpl.java @@ -22,7 +22,7 @@ import javax.inject.Inject; import org.apache.james.core.User; import org.apache.james.core.quota.QuotaSize; -import org.apache.james.mailbox.store.probe.SieveProbe; +import org.apache.james.probe.SieveProbe; import org.apache.james.sieverepository.api.ScriptContent; import org.apache.james.sieverepository.api.ScriptName; import org.apache.james.sieverepository.api.SieveRepository; http://git-wip-us.apache.org/repos/asf/james-project/blob/31a2fbf3/server/data/data-api/src/main/java/org/apache/james/probe/SieveProbe.java ---------------------------------------------------------------------- diff --git a/server/data/data-api/src/main/java/org/apache/james/probe/SieveProbe.java b/server/data/data-api/src/main/java/org/apache/james/probe/SieveProbe.java new file mode 100644 index 0000000..b884733 --- /dev/null +++ b/server/data/data-api/src/main/java/org/apache/james/probe/SieveProbe.java @@ -0,0 +1,38 @@ +/**************************************************************** + * 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.probe; + +public interface SieveProbe { + + long getSieveQuota() throws Exception; + + void setSieveQuota(long quota) throws Exception; + + void removeSieveQuota() throws Exception; + + long getSieveQuota(String user) throws Exception; + + void setSieveQuota(String user, long quota) throws Exception; + + void removeSieveQuota(String user) throws Exception; + + void addActiveSieveScript(String user, String name, String script) throws Exception; + +} \ No newline at end of file --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
