JAMES-1842: Rename ExtendedServerProbe to ExtendedJmapServerProbe
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/0c37cef3 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/0c37cef3 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/0c37cef3 Branch: refs/heads/master Commit: 0c37cef36a4ac4d941d09225e755ebcb32fb72c1 Parents: 270a97f Author: Quynh Nguyen <qngu...@linagora.com> Authored: Fri Oct 28 16:20:28 2016 +0700 Committer: Quynh Nguyen <qngu...@linagora.com> Committed: Fri Nov 18 09:25:34 2016 +0700 ---------------------------------------------------------------------- .../java/org/apache/james/GuiceJamesServer.java | 4 +- .../james/utils/ExtendedJmapServerProbe.java | 46 ++++++++++++++++++++ .../apache/james/utils/ExtendedServerProbe.java | 46 -------------------- .../apache/james/utils/GuiceServerProbe.java | 4 +- .../james/mailets/TemporaryJamesServer.java | 4 +- 5 files changed, 52 insertions(+), 52 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/0c37cef3/server/container/guice/guice-common/src/main/java/org/apache/james/GuiceJamesServer.java ---------------------------------------------------------------------- diff --git a/server/container/guice/guice-common/src/main/java/org/apache/james/GuiceJamesServer.java b/server/container/guice/guice-common/src/main/java/org/apache/james/GuiceJamesServer.java index b3dc728..e9ce3f6 100644 --- a/server/container/guice/guice-common/src/main/java/org/apache/james/GuiceJamesServer.java +++ b/server/container/guice/guice-common/src/main/java/org/apache/james/GuiceJamesServer.java @@ -29,7 +29,7 @@ import org.apache.james.modules.MailetProcessingModule; import org.apache.james.modules.ProtocolsModule; import org.apache.james.onami.lifecycle.Stager; import org.apache.james.utils.ConfigurationsPerformer; -import org.apache.james.utils.ExtendedServerProbe; +import org.apache.james.utils.ExtendedJmapServerProbe; import org.apache.james.utils.GuiceServerProbe; import org.apache.james.webadmin.Port; import org.apache.james.webadmin.WebAdminServer; @@ -100,7 +100,7 @@ public class GuiceJamesServer { } } - public ExtendedServerProbe serverProbe() { + public ExtendedJmapServerProbe serverProbe() { return serverProbe; } http://git-wip-us.apache.org/repos/asf/james-project/blob/0c37cef3/server/container/guice/guice-common/src/main/java/org/apache/james/utils/ExtendedJmapServerProbe.java ---------------------------------------------------------------------- diff --git a/server/container/guice/guice-common/src/main/java/org/apache/james/utils/ExtendedJmapServerProbe.java b/server/container/guice/guice-common/src/main/java/org/apache/james/utils/ExtendedJmapServerProbe.java new file mode 100644 index 0000000..415dfcc --- /dev/null +++ b/server/container/guice/guice-common/src/main/java/org/apache/james/utils/ExtendedJmapServerProbe.java @@ -0,0 +1,46 @@ +/**************************************************************** + * 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.utils; + +import java.io.InputStream; +import java.util.Date; + +import javax.mail.Flags; + +import org.apache.james.cli.probe.ServerProbe; +import org.apache.james.jmap.api.vacation.AccountId; +import org.apache.james.jmap.api.vacation.Vacation; +import org.apache.james.jmap.api.vacation.VacationPatch; +import org.apache.james.mailbox.exception.BadCredentialsException; +import org.apache.james.mailbox.exception.MailboxException; +import org.apache.james.mailbox.model.MailboxPath; +import org.apache.james.mailbox.store.mail.model.Mailbox; + +public interface ExtendedJmapServerProbe extends ServerProbe { + + void appendMessage(String username, MailboxPath mailboxPath, InputStream message, Date internalDate, boolean isRecent, Flags flags) + throws BadCredentialsException, MailboxException; + + Mailbox getMailbox(String namespace, String user, String name); + + void modifyVacation(AccountId accountId, VacationPatch vacationPatch); + + Vacation retrieveVacation(AccountId accountId); +} http://git-wip-us.apache.org/repos/asf/james-project/blob/0c37cef3/server/container/guice/guice-common/src/main/java/org/apache/james/utils/ExtendedServerProbe.java ---------------------------------------------------------------------- diff --git a/server/container/guice/guice-common/src/main/java/org/apache/james/utils/ExtendedServerProbe.java b/server/container/guice/guice-common/src/main/java/org/apache/james/utils/ExtendedServerProbe.java deleted file mode 100644 index 4120abe..0000000 --- a/server/container/guice/guice-common/src/main/java/org/apache/james/utils/ExtendedServerProbe.java +++ /dev/null @@ -1,46 +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.utils; - -import java.io.InputStream; -import java.util.Date; - -import javax.mail.Flags; - -import org.apache.james.cli.probe.ServerProbe; -import org.apache.james.jmap.api.vacation.AccountId; -import org.apache.james.jmap.api.vacation.Vacation; -import org.apache.james.jmap.api.vacation.VacationPatch; -import org.apache.james.mailbox.exception.BadCredentialsException; -import org.apache.james.mailbox.exception.MailboxException; -import org.apache.james.mailbox.model.MailboxPath; -import org.apache.james.mailbox.store.mail.model.Mailbox; - -public interface ExtendedServerProbe extends ServerProbe { - - void appendMessage(String username, MailboxPath mailboxPath, InputStream message, Date internalDate, boolean isRecent, Flags flags) - throws BadCredentialsException, MailboxException; - - Mailbox getMailbox(String namespace, String user, String name); - - void modifyVacation(AccountId accountId, VacationPatch vacationPatch); - - Vacation retrieveVacation(AccountId accountId); -} http://git-wip-us.apache.org/repos/asf/james-project/blob/0c37cef3/server/container/guice/guice-common/src/main/java/org/apache/james/utils/GuiceServerProbe.java ---------------------------------------------------------------------- diff --git a/server/container/guice/guice-common/src/main/java/org/apache/james/utils/GuiceServerProbe.java b/server/container/guice/guice-common/src/main/java/org/apache/james/utils/GuiceServerProbe.java index 4b313cc..cbc7f81 100644 --- a/server/container/guice/guice-common/src/main/java/org/apache/james/utils/GuiceServerProbe.java +++ b/server/container/guice/guice-common/src/main/java/org/apache/james/utils/GuiceServerProbe.java @@ -35,8 +35,8 @@ import org.apache.james.adapter.mailbox.SerializableQuota; import org.apache.james.domainlist.api.DomainList; import org.apache.james.jmap.api.vacation.AccountId; import org.apache.james.jmap.api.vacation.Vacation; -import org.apache.james.jmap.api.vacation.VacationRepository; import org.apache.james.jmap.api.vacation.VacationPatch; +import org.apache.james.jmap.api.vacation.VacationRepository; import org.apache.james.mailbox.MailboxManager; import org.apache.james.mailbox.MailboxSession; import org.apache.james.mailbox.MessageManager; @@ -59,7 +59,7 @@ import com.google.common.base.Throwables; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; -public class GuiceServerProbe implements ExtendedServerProbe { +public class GuiceServerProbe implements ExtendedJmapServerProbe { private static final Logger LOGGER = LoggerFactory.getLogger(GuiceServerProbe.class); http://git-wip-us.apache.org/repos/asf/james-project/blob/0c37cef3/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/TemporaryJamesServer.java ---------------------------------------------------------------------- diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/TemporaryJamesServer.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/TemporaryJamesServer.java index 2dd1c87..531fec4 100644 --- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/TemporaryJamesServer.java +++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/TemporaryJamesServer.java @@ -32,7 +32,7 @@ import org.apache.james.GuiceJamesServer; import org.apache.james.MemoryJamesServerMain; import org.apache.james.mailets.configuration.MailetContainer; import org.apache.james.modules.TestJMAPServerModule; -import org.apache.james.utils.ExtendedServerProbe; +import org.apache.james.utils.ExtendedJmapServerProbe; import org.junit.rules.TemporaryFolder; import com.google.common.collect.ImmutableList; @@ -76,7 +76,7 @@ public class TemporaryJamesServer { jamesServer.stop(); } - public ExtendedServerProbe getServerProbe() { + public ExtendedJmapServerProbe getServerProbe() { return jamesServer.serverProbe(); } } --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
