JAMES-2521 Move mailbox probes definitions to API This makes store dependency no more required by CLI
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/0e2482e3 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/0e2482e3 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/0e2482e3 Branch: refs/heads/master Commit: 0e2482e3bf4ed7064d6643525405f6b17b3aa76e Parents: bf6254d Author: Benoit Tellier <[email protected]> Authored: Tue Aug 14 12:05:35 2018 +0700 Committer: Benoit Tellier <[email protected]> Committed: Wed Aug 29 10:11:46 2018 +0700 ---------------------------------------------------------------------- .../apache/james/mailbox/probe/ACLProbe.java | 33 ++++++++++++ .../james/mailbox/probe/MailboxProbe.java | 57 ++++++++++++++++++++ .../apache/james/mailbox/probe/QuotaProbe.java | 52 ++++++++++++++++++ .../james/mailbox/store/probe/ACLProbe.java | 33 ------------ .../james/mailbox/store/probe/MailboxProbe.java | 57 -------------------- .../james/mailbox/store/probe/QuotaProbe.java | 52 ------------------ server/container/cli/pom.xml | 4 -- .../java/org/apache/james/cli/ServerCmd.java | 4 +- .../james/cli/probe/impl/JmxMailboxProbe.java | 2 +- .../james/cli/probe/impl/JmxQuotaProbe.java | 2 +- .../org/apache/james/cli/ServerCmdTest.java | 4 +- .../apache/james/FixingGhostMailboxTest.java | 2 +- .../org/apache/james/modules/ACLProbeImpl.java | 2 +- .../apache/james/modules/MailboxProbeImpl.java | 2 +- .../apache/james/modules/QuotaProbesImpl.java | 2 +- .../org/apache/james/jmap/MessageAppender.java | 2 +- .../james/jmap/VacationIntegrationTest.java | 2 +- .../jmap/VacationRelayIntegrationTest.java | 2 +- .../integration/GetMailboxesMethodTest.java | 4 +- .../methods/integration/QuotaMailingTest.java | 2 +- .../methods/integration/SendMDNMethodTest.java | 4 +- .../integration/SetMailboxesMethodTest.java | 2 +- .../integration/SetMessagesMethodTest.java | 6 +-- .../SetMessagesOutboxFlagUpdateTest.java | 2 +- .../integration/cucumber/MainStepdefs.java | 2 +- 25 files changed, 166 insertions(+), 170 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/0e2482e3/mailbox/api/src/main/java/org/apache/james/mailbox/probe/ACLProbe.java ---------------------------------------------------------------------- diff --git a/mailbox/api/src/main/java/org/apache/james/mailbox/probe/ACLProbe.java b/mailbox/api/src/main/java/org/apache/james/mailbox/probe/ACLProbe.java new file mode 100644 index 0000000..b7b8b6f --- /dev/null +++ b/mailbox/api/src/main/java/org/apache/james/mailbox/probe/ACLProbe.java @@ -0,0 +1,33 @@ +/**************************************************************** + * 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.probe; + +import org.apache.james.mailbox.exception.MailboxException; +import org.apache.james.mailbox.model.MailboxACL; +import org.apache.james.mailbox.model.MailboxACL.Rfc4314Rights; +import org.apache.james.mailbox.model.MailboxPath; + +public interface ACLProbe { + void replaceRights(MailboxPath mailboxPath, String targetUser, Rfc4314Rights rights) throws MailboxException; + + void addRights(MailboxPath mailboxPath, String targetUser, Rfc4314Rights rights) throws MailboxException; + + MailboxACL retrieveRights(MailboxPath mailboxPath) throws MailboxException; +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/james-project/blob/0e2482e3/mailbox/api/src/main/java/org/apache/james/mailbox/probe/MailboxProbe.java ---------------------------------------------------------------------- diff --git a/mailbox/api/src/main/java/org/apache/james/mailbox/probe/MailboxProbe.java b/mailbox/api/src/main/java/org/apache/james/mailbox/probe/MailboxProbe.java new file mode 100644 index 0000000..fb57c4e --- /dev/null +++ b/mailbox/api/src/main/java/org/apache/james/mailbox/probe/MailboxProbe.java @@ -0,0 +1,57 @@ +/**************************************************************** + * 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.probe; + +import java.io.InputStream; +import java.util.Collection; +import java.util.Date; + +import javax.mail.Flags; + +import org.apache.james.mailbox.exception.MailboxException; +import org.apache.james.mailbox.model.ComposedMessageId; +import org.apache.james.mailbox.model.MailboxId; +import org.apache.james.mailbox.model.MailboxPath; + +public interface MailboxProbe { + + MailboxId createMailbox(String namespace, String user, String name); + + MailboxId getMailboxId(String namespace, String user, String name); + + Collection<String> listUserMailboxes(String user); + + void deleteMailbox(String namespace, String user, String name); + + void importEmlFileToMailbox(String namespace, String user, String name, String emlpath) throws Exception; + + ComposedMessageId appendMessage(String username, MailboxPath mailboxPath, InputStream message, Date internalDate, + boolean isRecent, Flags flags) throws MailboxException; + + void copyMailbox(String srcBean, String dstBean) throws Exception; + + void deleteUserMailboxesNames(String user) throws Exception; + + void reIndexMailbox(String namespace, String user, String name) throws Exception; + + void reIndexAll() throws Exception; + + Collection<String> listSubscriptions(String user) throws Exception; +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/james-project/blob/0e2482e3/mailbox/api/src/main/java/org/apache/james/mailbox/probe/QuotaProbe.java ---------------------------------------------------------------------- diff --git a/mailbox/api/src/main/java/org/apache/james/mailbox/probe/QuotaProbe.java b/mailbox/api/src/main/java/org/apache/james/mailbox/probe/QuotaProbe.java new file mode 100644 index 0000000..40f89ac --- /dev/null +++ b/mailbox/api/src/main/java/org/apache/james/mailbox/probe/QuotaProbe.java @@ -0,0 +1,52 @@ +/**************************************************************** + * 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.probe; + +import org.apache.james.core.quota.QuotaCount; +import org.apache.james.core.quota.QuotaSize; +import org.apache.james.mailbox.exception.MailboxException; +import org.apache.james.mailbox.model.SerializableQuota; +import org.apache.james.mailbox.model.SerializableQuotaValue; + +public interface QuotaProbe { + + String getQuotaRoot(String namespace, String user, String name) throws MailboxException; + + SerializableQuota<QuotaCount> getMessageCountQuota(String quotaRoot) throws MailboxException; + + SerializableQuota<QuotaSize> getStorageQuota(String quotaRoot) throws MailboxException; + + SerializableQuotaValue<QuotaCount> getMaxMessageCount(String quotaRoot) throws MailboxException; + + SerializableQuotaValue<QuotaSize> getMaxStorage(String quotaRoot) throws MailboxException; + + SerializableQuotaValue<QuotaCount> getGlobalMaxMessageCount() throws MailboxException; + + SerializableQuotaValue<QuotaSize> getGlobalMaxStorage() throws MailboxException; + + void setMaxMessageCount(String quotaRoot, SerializableQuotaValue<QuotaCount> maxMessageCount) throws MailboxException; + + void setMaxStorage(String quotaRoot, SerializableQuotaValue<QuotaSize> maxSize) throws MailboxException; + + void setGlobalMaxMessageCount(SerializableQuotaValue<QuotaCount> maxGlobalMessageCount) throws MailboxException; + + void setGlobalMaxStorage(SerializableQuotaValue<QuotaSize> maxGlobalSize) throws MailboxException; + +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/james-project/blob/0e2482e3/mailbox/store/src/main/java/org/apache/james/mailbox/store/probe/ACLProbe.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/probe/ACLProbe.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/probe/ACLProbe.java deleted file mode 100644 index 600dd9b..0000000 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/probe/ACLProbe.java +++ /dev/null @@ -1,33 +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; - -import org.apache.james.mailbox.exception.MailboxException; -import org.apache.james.mailbox.model.MailboxACL; -import org.apache.james.mailbox.model.MailboxACL.Rfc4314Rights; -import org.apache.james.mailbox.model.MailboxPath; - -public interface ACLProbe { - void replaceRights(MailboxPath mailboxPath, String targetUser, Rfc4314Rights rights) throws MailboxException; - - void addRights(MailboxPath mailboxPath, String targetUser, Rfc4314Rights rights) throws MailboxException; - - MailboxACL retrieveRights(MailboxPath mailboxPath) throws MailboxException; -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/james-project/blob/0e2482e3/mailbox/store/src/main/java/org/apache/james/mailbox/store/probe/MailboxProbe.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/probe/MailboxProbe.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/probe/MailboxProbe.java deleted file mode 100644 index 739a96e..0000000 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/probe/MailboxProbe.java +++ /dev/null @@ -1,57 +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; - -import java.io.InputStream; -import java.util.Collection; -import java.util.Date; - -import javax.mail.Flags; - -import org.apache.james.mailbox.exception.MailboxException; -import org.apache.james.mailbox.model.ComposedMessageId; -import org.apache.james.mailbox.model.MailboxId; -import org.apache.james.mailbox.model.MailboxPath; - -public interface MailboxProbe { - - MailboxId createMailbox(String namespace, String user, String name); - - MailboxId getMailboxId(String namespace, String user, String name); - - Collection<String> listUserMailboxes(String user); - - void deleteMailbox(String namespace, String user, String name); - - void importEmlFileToMailbox(String namespace, String user, String name, String emlpath) throws Exception; - - ComposedMessageId appendMessage(String username, MailboxPath mailboxPath, InputStream message, Date internalDate, - boolean isRecent, Flags flags) throws MailboxException; - - void copyMailbox(String srcBean, String dstBean) throws Exception; - - void deleteUserMailboxesNames(String user) throws Exception; - - void reIndexMailbox(String namespace, String user, String name) throws Exception; - - void reIndexAll() throws Exception; - - Collection<String> listSubscriptions(String user) throws Exception; -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/james-project/blob/0e2482e3/mailbox/store/src/main/java/org/apache/james/mailbox/store/probe/QuotaProbe.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/probe/QuotaProbe.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/probe/QuotaProbe.java deleted file mode 100644 index 36cdcf2..0000000 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/probe/QuotaProbe.java +++ /dev/null @@ -1,52 +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; - -import org.apache.james.core.quota.QuotaCount; -import org.apache.james.core.quota.QuotaSize; -import org.apache.james.mailbox.exception.MailboxException; -import org.apache.james.mailbox.model.SerializableQuota; -import org.apache.james.mailbox.model.SerializableQuotaValue; - -public interface QuotaProbe { - - String getQuotaRoot(String namespace, String user, String name) throws MailboxException; - - SerializableQuota<QuotaCount> getMessageCountQuota(String quotaRoot) throws MailboxException; - - SerializableQuota<QuotaSize> getStorageQuota(String quotaRoot) throws MailboxException; - - SerializableQuotaValue<QuotaCount> getMaxMessageCount(String quotaRoot) throws MailboxException; - - SerializableQuotaValue<QuotaSize> getMaxStorage(String quotaRoot) throws MailboxException; - - SerializableQuotaValue<QuotaCount> getGlobalMaxMessageCount() throws MailboxException; - - SerializableQuotaValue<QuotaSize> getGlobalMaxStorage() throws MailboxException; - - void setMaxMessageCount(String quotaRoot, SerializableQuotaValue<QuotaCount> maxMessageCount) throws MailboxException; - - void setMaxStorage(String quotaRoot, SerializableQuotaValue<QuotaSize> maxSize) throws MailboxException; - - void setGlobalMaxMessageCount(SerializableQuotaValue<QuotaCount> maxGlobalMessageCount) throws MailboxException; - - void setGlobalMaxStorage(SerializableQuotaValue<QuotaSize> maxGlobalSize) throws MailboxException; - -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/james-project/blob/0e2482e3/server/container/cli/pom.xml ---------------------------------------------------------------------- diff --git a/server/container/cli/pom.xml b/server/container/cli/pom.xml index 2b18274..1131416 100644 --- a/server/container/cli/pom.xml +++ b/server/container/cli/pom.xml @@ -43,10 +43,6 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>apache-james-mailbox-store</artifactId> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> <artifactId>james-server-util</artifactId> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/0e2482e3/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 d757ea6..cecb719 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 @@ -49,8 +49,8 @@ import org.apache.james.core.quota.QuotaSize; import org.apache.james.core.quota.QuotaValue; import org.apache.james.mailbox.model.SerializableQuota; import org.apache.james.mailbox.model.SerializableQuotaValue; -import org.apache.james.mailbox.store.probe.MailboxProbe; -import org.apache.james.mailbox.store.probe.QuotaProbe; +import org.apache.james.mailbox.probe.MailboxProbe; +import org.apache.james.mailbox.probe.QuotaProbe; import org.apache.james.probe.DataProbe; import org.apache.james.probe.SieveProbe; import org.apache.james.rrt.lib.Mappings; http://git-wip-us.apache.org/repos/asf/james-project/blob/0e2482e3/server/container/cli/src/main/java/org/apache/james/cli/probe/impl/JmxMailboxProbe.java ---------------------------------------------------------------------- diff --git a/server/container/cli/src/main/java/org/apache/james/cli/probe/impl/JmxMailboxProbe.java b/server/container/cli/src/main/java/org/apache/james/cli/probe/impl/JmxMailboxProbe.java index 385f74f..4edee8c 100644 --- a/server/container/cli/src/main/java/org/apache/james/cli/probe/impl/JmxMailboxProbe.java +++ b/server/container/cli/src/main/java/org/apache/james/cli/probe/impl/JmxMailboxProbe.java @@ -35,7 +35,7 @@ import org.apache.james.mailbox.exception.MailboxException; import org.apache.james.mailbox.model.ComposedMessageId; import org.apache.james.mailbox.model.MailboxId; import org.apache.james.mailbox.model.MailboxPath; -import org.apache.james.mailbox.store.probe.MailboxProbe; +import org.apache.james.mailbox.probe.MailboxProbe; public class JmxMailboxProbe implements MailboxProbe, JmxProbe { http://git-wip-us.apache.org/repos/asf/james-project/blob/0e2482e3/server/container/cli/src/main/java/org/apache/james/cli/probe/impl/JmxQuotaProbe.java ---------------------------------------------------------------------- diff --git a/server/container/cli/src/main/java/org/apache/james/cli/probe/impl/JmxQuotaProbe.java b/server/container/cli/src/main/java/org/apache/james/cli/probe/impl/JmxQuotaProbe.java index 5bcb8e9..53c11c5 100644 --- a/server/container/cli/src/main/java/org/apache/james/cli/probe/impl/JmxQuotaProbe.java +++ b/server/container/cli/src/main/java/org/apache/james/cli/probe/impl/JmxQuotaProbe.java @@ -29,7 +29,7 @@ import org.apache.james.core.quota.QuotaSize; import org.apache.james.mailbox.exception.MailboxException; import org.apache.james.mailbox.model.SerializableQuota; import org.apache.james.mailbox.model.SerializableQuotaValue; -import org.apache.james.mailbox.store.probe.QuotaProbe; +import org.apache.james.mailbox.probe.QuotaProbe; public class JmxQuotaProbe implements QuotaProbe, JmxProbe { private static final String QUOTAMANAGER_OBJECT_NAME = "org.apache.james:type=component,name=quotamanagerbean"; http://git-wip-us.apache.org/repos/asf/james-project/blob/0e2482e3/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 b806e3b..0b3aacd 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 @@ -39,8 +39,8 @@ import org.apache.james.core.quota.QuotaSize; import org.apache.james.mailbox.model.MailboxId; import org.apache.james.mailbox.model.SerializableQuota; import org.apache.james.mailbox.model.SerializableQuotaValue; -import org.apache.james.mailbox.store.probe.MailboxProbe; -import org.apache.james.mailbox.store.probe.QuotaProbe; +import org.apache.james.mailbox.probe.MailboxProbe; +import org.apache.james.mailbox.probe.QuotaProbe; import org.apache.james.probe.DataProbe; import org.apache.james.probe.SieveProbe; import org.apache.james.rrt.lib.MappingsImpl; http://git-wip-us.apache.org/repos/asf/james-project/blob/0e2482e3/server/container/guice/cassandra-guice/src/test/java/org/apache/james/FixingGhostMailboxTest.java ---------------------------------------------------------------------- diff --git a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/FixingGhostMailboxTest.java b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/FixingGhostMailboxTest.java index 7bb7c58..e5f5f42 100644 --- a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/FixingGhostMailboxTest.java +++ b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/FixingGhostMailboxTest.java @@ -50,7 +50,7 @@ import org.apache.james.mailbox.model.MailboxACL; import org.apache.james.mailbox.model.MailboxConstants; import org.apache.james.mailbox.model.MailboxId; import org.apache.james.mailbox.model.MailboxPath; -import org.apache.james.mailbox.store.probe.ACLProbe; +import org.apache.james.mailbox.probe.ACLProbe; import org.apache.james.mime4j.dom.Message; import org.apache.james.modules.ACLProbeImpl; import org.apache.james.modules.MailboxProbeImpl; http://git-wip-us.apache.org/repos/asf/james-project/blob/0e2482e3/server/container/guice/mailbox/src/main/java/org/apache/james/modules/ACLProbeImpl.java ---------------------------------------------------------------------- diff --git a/server/container/guice/mailbox/src/main/java/org/apache/james/modules/ACLProbeImpl.java b/server/container/guice/mailbox/src/main/java/org/apache/james/modules/ACLProbeImpl.java index 61b8ddf..3182b8e 100644 --- a/server/container/guice/mailbox/src/main/java/org/apache/james/modules/ACLProbeImpl.java +++ b/server/container/guice/mailbox/src/main/java/org/apache/james/modules/ACLProbeImpl.java @@ -29,7 +29,7 @@ import org.apache.james.mailbox.model.MailboxACL; import org.apache.james.mailbox.model.MailboxACL.ACLCommand; import org.apache.james.mailbox.model.MailboxACL.Rfc4314Rights; import org.apache.james.mailbox.model.MailboxPath; -import org.apache.james.mailbox.store.probe.ACLProbe; +import org.apache.james.mailbox.probe.ACLProbe; import org.apache.james.utils.GuiceProbe; public class ACLProbeImpl implements GuiceProbe, ACLProbe { http://git-wip-us.apache.org/repos/asf/james-project/blob/0e2482e3/server/container/guice/mailbox/src/main/java/org/apache/james/modules/MailboxProbeImpl.java ---------------------------------------------------------------------- diff --git a/server/container/guice/mailbox/src/main/java/org/apache/james/modules/MailboxProbeImpl.java b/server/container/guice/mailbox/src/main/java/org/apache/james/modules/MailboxProbeImpl.java index 961e17c..aa6b68d 100644 --- a/server/container/guice/mailbox/src/main/java/org/apache/james/modules/MailboxProbeImpl.java +++ b/server/container/guice/mailbox/src/main/java/org/apache/james/modules/MailboxProbeImpl.java @@ -41,9 +41,9 @@ import org.apache.james.mailbox.model.MailboxMetaData; import org.apache.james.mailbox.model.MailboxPath; import org.apache.james.mailbox.model.search.MailboxQuery; import org.apache.james.mailbox.model.search.Wildcard; +import org.apache.james.mailbox.probe.MailboxProbe; import org.apache.james.mailbox.store.mail.MailboxMapper; import org.apache.james.mailbox.store.mail.MailboxMapperFactory; -import org.apache.james.mailbox.store.probe.MailboxProbe; import org.apache.james.utils.GuiceProbe; public class MailboxProbeImpl implements GuiceProbe, MailboxProbe { http://git-wip-us.apache.org/repos/asf/james-project/blob/0e2482e3/server/container/guice/mailbox/src/main/java/org/apache/james/modules/QuotaProbesImpl.java ---------------------------------------------------------------------- diff --git a/server/container/guice/mailbox/src/main/java/org/apache/james/modules/QuotaProbesImpl.java b/server/container/guice/mailbox/src/main/java/org/apache/james/modules/QuotaProbesImpl.java index 0ac0d9e..1a88992 100644 --- a/server/container/guice/mailbox/src/main/java/org/apache/james/modules/QuotaProbesImpl.java +++ b/server/container/guice/mailbox/src/main/java/org/apache/james/modules/QuotaProbesImpl.java @@ -27,10 +27,10 @@ import org.apache.james.mailbox.exception.MailboxException; import org.apache.james.mailbox.model.MailboxPath; import org.apache.james.mailbox.model.SerializableQuota; import org.apache.james.mailbox.model.SerializableQuotaValue; +import org.apache.james.mailbox.probe.QuotaProbe; import org.apache.james.mailbox.quota.MaxQuotaManager; import org.apache.james.mailbox.quota.QuotaManager; import org.apache.james.mailbox.quota.QuotaRootResolver; -import org.apache.james.mailbox.store.probe.QuotaProbe; import org.apache.james.utils.GuiceProbe; import com.github.fge.lambdas.Throwing; http://git-wip-us.apache.org/repos/asf/james-project/blob/0e2482e3/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/MessageAppender.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/MessageAppender.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/MessageAppender.java index a1f3d13..906848f 100644 --- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/MessageAppender.java +++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/MessageAppender.java @@ -29,7 +29,7 @@ import javax.mail.Flags; import org.apache.james.mailbox.exception.MailboxException; import org.apache.james.mailbox.model.ComposedMessageId; import org.apache.james.mailbox.model.MailboxPath; -import org.apache.james.mailbox.store.probe.MailboxProbe; +import org.apache.james.mailbox.probe.MailboxProbe; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/james-project/blob/0e2482e3/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/VacationIntegrationTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/VacationIntegrationTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/VacationIntegrationTest.java index 36d1e02..6402152 100644 --- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/VacationIntegrationTest.java +++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/VacationIntegrationTest.java @@ -44,7 +44,7 @@ import org.apache.james.jmap.api.vacation.AccountId; import org.apache.james.jmap.api.vacation.VacationPatch; import org.apache.james.mailbox.DefaultMailboxes; import org.apache.james.mailbox.model.MailboxConstants; -import org.apache.james.mailbox.store.probe.MailboxProbe; +import org.apache.james.mailbox.probe.MailboxProbe; import org.apache.james.modules.MailboxProbeImpl; import org.apache.james.probe.DataProbe; import org.apache.james.utils.DataProbeImpl; http://git-wip-us.apache.org/repos/asf/james-project/blob/0e2482e3/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/VacationRelayIntegrationTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/VacationRelayIntegrationTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/VacationRelayIntegrationTest.java index c9e6b04..14e78b9 100644 --- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/VacationRelayIntegrationTest.java +++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/VacationRelayIntegrationTest.java @@ -35,7 +35,7 @@ import org.apache.james.jmap.api.vacation.AccountId; import org.apache.james.jmap.api.vacation.VacationPatch; import org.apache.james.mailbox.DefaultMailboxes; import org.apache.james.mailbox.model.MailboxConstants; -import org.apache.james.mailbox.store.probe.MailboxProbe; +import org.apache.james.mailbox.probe.MailboxProbe; import org.apache.james.modules.MailboxProbeImpl; import org.apache.james.modules.protocols.SmtpGuiceProbe; import org.apache.james.probe.DataProbe; http://git-wip-us.apache.org/repos/asf/james-project/blob/0e2482e3/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMailboxesMethodTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMailboxesMethodTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMailboxesMethodTest.java index da41588..5fcd373 100644 --- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMailboxesMethodTest.java +++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMailboxesMethodTest.java @@ -67,8 +67,8 @@ import org.apache.james.mailbox.model.MailboxConstants; import org.apache.james.mailbox.model.MailboxId; import org.apache.james.mailbox.model.MailboxPath; import org.apache.james.mailbox.model.SerializableQuotaValue; -import org.apache.james.mailbox.store.probe.ACLProbe; -import org.apache.james.mailbox.store.probe.QuotaProbe; +import org.apache.james.mailbox.probe.ACLProbe; +import org.apache.james.mailbox.probe.QuotaProbe; import org.apache.james.mime4j.dom.Message; import org.apache.james.modules.ACLProbeImpl; import org.apache.james.modules.MailboxProbeImpl; http://git-wip-us.apache.org/repos/asf/james-project/blob/0e2482e3/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/QuotaMailingTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/QuotaMailingTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/QuotaMailingTest.java index 5895a75..0769ea4 100644 --- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/QuotaMailingTest.java +++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/QuotaMailingTest.java @@ -43,7 +43,7 @@ import org.apache.james.jmap.api.access.AccessToken; import org.apache.james.mailbox.DefaultMailboxes; import org.apache.james.mailbox.model.MailboxConstants; import org.apache.james.mailbox.model.SerializableQuotaValue; -import org.apache.james.mailbox.store.probe.MailboxProbe; +import org.apache.james.mailbox.probe.MailboxProbe; import org.apache.james.modules.MailboxProbeImpl; import org.apache.james.modules.QuotaProbesImpl; import org.apache.james.probe.DataProbe; http://git-wip-us.apache.org/repos/asf/james-project/blob/0e2482e3/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SendMDNMethodTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SendMDNMethodTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SendMDNMethodTest.java index c7c3e4f..52a4d42 100644 --- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SendMDNMethodTest.java +++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SendMDNMethodTest.java @@ -53,8 +53,8 @@ import org.apache.james.mailbox.exception.MailboxException; import org.apache.james.mailbox.model.MailboxConstants; import org.apache.james.mailbox.model.MessageId; import org.apache.james.mailbox.model.SerializableQuotaValue; -import org.apache.james.mailbox.store.probe.MailboxProbe; -import org.apache.james.mailbox.store.probe.QuotaProbe; +import org.apache.james.mailbox.probe.MailboxProbe; +import org.apache.james.mailbox.probe.QuotaProbe; import org.apache.james.modules.MailboxProbeImpl; import org.apache.james.modules.QuotaProbesImpl; import org.apache.james.probe.DataProbe; http://git-wip-us.apache.org/repos/asf/james-project/blob/0e2482e3/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMailboxesMethodTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMailboxesMethodTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMailboxesMethodTest.java index cfb5c75..ee25989 100644 --- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMailboxesMethodTest.java +++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMailboxesMethodTest.java @@ -55,7 +55,7 @@ import org.apache.james.mailbox.model.MailboxACL.Right; import org.apache.james.mailbox.model.MailboxConstants; import org.apache.james.mailbox.model.MailboxId; import org.apache.james.mailbox.model.MailboxPath; -import org.apache.james.mailbox.store.probe.MailboxProbe; +import org.apache.james.mailbox.probe.MailboxProbe; import org.apache.james.modules.ACLProbeImpl; import org.apache.james.modules.MailboxProbeImpl; import org.apache.james.probe.DataProbe; http://git-wip-us.apache.org/repos/asf/james-project/blob/0e2482e3/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesMethodTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesMethodTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesMethodTest.java index 9a5d1c2..58635d5 100644 --- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesMethodTest.java +++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesMethodTest.java @@ -92,10 +92,10 @@ import org.apache.james.mailbox.model.MailboxPath; import org.apache.james.mailbox.model.MessageId; import org.apache.james.mailbox.model.MessageResult; import org.apache.james.mailbox.model.SerializableQuotaValue; +import org.apache.james.mailbox.probe.ACLProbe; +import org.apache.james.mailbox.probe.MailboxProbe; +import org.apache.james.mailbox.probe.QuotaProbe; import org.apache.james.mailbox.store.event.EventFactory; -import org.apache.james.mailbox.store.probe.ACLProbe; -import org.apache.james.mailbox.store.probe.MailboxProbe; -import org.apache.james.mailbox.store.probe.QuotaProbe; import org.apache.james.modules.ACLProbeImpl; import org.apache.james.modules.MailboxProbeImpl; import org.apache.james.modules.QuotaProbesImpl; http://git-wip-us.apache.org/repos/asf/james-project/blob/0e2482e3/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesOutboxFlagUpdateTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesOutboxFlagUpdateTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesOutboxFlagUpdateTest.java index 31aa417..3972f4c 100644 --- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesOutboxFlagUpdateTest.java +++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesOutboxFlagUpdateTest.java @@ -43,7 +43,7 @@ import org.apache.james.GuiceJamesServer; import org.apache.james.jmap.HttpJmapAuthentication; import org.apache.james.jmap.api.access.AccessToken; import org.apache.james.mailbox.DefaultMailboxes; -import org.apache.james.mailbox.store.probe.MailboxProbe; +import org.apache.james.mailbox.probe.MailboxProbe; import org.apache.james.modules.MailboxProbeImpl; import org.apache.james.probe.DataProbe; import org.apache.james.queue.api.MailQueue; http://git-wip-us.apache.org/repos/asf/james-project/blob/0e2482e3/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/MainStepdefs.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/MainStepdefs.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/MainStepdefs.java index b07907d..b742f38 100644 --- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/MainStepdefs.java +++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/MainStepdefs.java @@ -27,7 +27,7 @@ import org.apache.james.GuiceJamesServer; import org.apache.james.mailbox.model.MailboxConstants; import org.apache.james.mailbox.model.MailboxId; import org.apache.james.mailbox.model.MessageId; -import org.apache.james.mailbox.store.probe.ACLProbe; +import org.apache.james.mailbox.probe.ACLProbe; import org.apache.james.modules.ACLProbeImpl; import org.apache.james.modules.MailboxProbeImpl; import org.apache.james.probe.DataProbe; --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
