Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 64E79200CFD for ; Wed, 6 Sep 2017 10:26:35 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 63DC71609BA; Wed, 6 Sep 2017 08:26:35 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 667A51609D0 for ; Wed, 6 Sep 2017 10:26:34 +0200 (CEST) Received: (qmail 15409 invoked by uid 500); 6 Sep 2017 08:26:33 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 15318 invoked by uid 99); 6 Sep 2017 08:26:33 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 06 Sep 2017 08:26:33 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C6537F5632; Wed, 6 Sep 2017 08:26:32 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sboikov@apache.org To: commits@ignite.apache.org Date: Wed, 06 Sep 2017 08:26:35 -0000 Message-Id: <53a14c31b58e4834bce5963d7942b257@git.apache.org> In-Reply-To: <0d14d53b4d5640b08690616cae2c42f3@git.apache.org> References: <0d14d53b4d5640b08690616cae2c42f3@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [04/10] ignite git commit: ignite-6273 Moved ServiceDeploymentException to org.apache.ignite.services archived-at: Wed, 06 Sep 2017 08:26:35 -0000 ignite-6273 Moved ServiceDeploymentException to org.apache.ignite.services Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d7e215d6 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d7e215d6 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d7e215d6 Branch: refs/heads/ignite-3478 Commit: d7e215d67cc059363a0149629c53fb3d7343d28f Parents: 8f13169 Author: sboikov Authored: Tue Sep 5 17:03:57 2017 +0300 Committer: sboikov Committed: Tue Sep 5 17:03:57 2017 +0300 ---------------------------------------------------------------------- .../java/org/apache/ignite/IgniteServices.java | 2 +- .../GridServiceDeploymentCompoundFuture.java | 1 + .../service/GridServiceProcessor.java | 1 + .../service/ServiceDeploymentException.java | 78 -------------------- .../services/ServiceDeploymentException.java | 77 +++++++++++++++++++ ...ServiceDeploymentCompoundFutureSelfTest.java | 1 + ...GridServiceProcessorBatchDeploySelfTest.java | 1 + 7 files changed, 82 insertions(+), 79 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/d7e215d6/modules/core/src/main/java/org/apache/ignite/IgniteServices.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteServices.java b/modules/core/src/main/java/org/apache/ignite/IgniteServices.java index 271adbb..e161b11 100644 --- a/modules/core/src/main/java/org/apache/ignite/IgniteServices.java +++ b/modules/core/src/main/java/org/apache/ignite/IgniteServices.java @@ -20,7 +20,7 @@ package org.apache.ignite; import java.util.Collection; import org.apache.ignite.cluster.ClusterGroup; import org.apache.ignite.configuration.IgniteConfiguration; -import org.apache.ignite.internal.processors.service.ServiceDeploymentException; +import org.apache.ignite.services.ServiceDeploymentException; import org.apache.ignite.lang.IgniteAsyncSupport; import org.apache.ignite.lang.IgniteAsyncSupported; import org.apache.ignite.lang.IgniteFuture; http://git-wip-us.apache.org/repos/asf/ignite/blob/d7e215d6/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceDeploymentCompoundFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceDeploymentCompoundFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceDeploymentCompoundFuture.java index 12b88e5..bbf0370 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceDeploymentCompoundFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceDeploymentCompoundFuture.java @@ -29,6 +29,7 @@ import org.apache.ignite.internal.util.future.GridCompoundFuture; import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.lang.IgniteInClosure; import org.apache.ignite.services.ServiceConfiguration; +import org.apache.ignite.services.ServiceDeploymentException; import org.jetbrains.annotations.Nullable; /** http://git-wip-us.apache.org/repos/asf/ignite/blob/d7e215d6/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java index 3adad23..2b3a882 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java @@ -98,6 +98,7 @@ import org.apache.ignite.resources.JobContextResource; import org.apache.ignite.resources.LoggerResource; import org.apache.ignite.services.Service; import org.apache.ignite.services.ServiceConfiguration; +import org.apache.ignite.services.ServiceDeploymentException; import org.apache.ignite.services.ServiceDescriptor; import org.apache.ignite.thread.IgniteThreadFactory; import org.apache.ignite.transactions.Transaction; http://git-wip-us.apache.org/repos/asf/ignite/blob/d7e215d6/modules/core/src/main/java/org/apache/ignite/internal/processors/service/ServiceDeploymentException.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/ServiceDeploymentException.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/ServiceDeploymentException.java deleted file mode 100644 index 32fbf6f..0000000 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/ServiceDeploymentException.java +++ /dev/null @@ -1,78 +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.ignite.internal.processors.service; - -import java.util.Collection; -import org.apache.ignite.IgniteException; -import org.apache.ignite.services.ServiceConfiguration; -import org.jetbrains.annotations.Nullable; - -/** - * Exception indicating service deployment failure. - */ -public class ServiceDeploymentException extends IgniteException { - /** */ - private static final long serialVersionUID = 0L; - - /** */ - private final Collection cfgs; - - /** - * Creates service deployment exception with error message. - * - * @param msg Error message. - * @param cfgs Configurations of services that failed to deploy. - */ - public ServiceDeploymentException(String msg, Collection cfgs) { - super(msg); - - this.cfgs = cfgs; - } - - /** - * Creates service deployment exception with {@link Throwable} as a cause. - * - * @param cause Cause. - * @param cfgs Configurations of services that failed to deploy. - */ - public ServiceDeploymentException(Throwable cause, Collection cfgs) { - super(cause); - - this.cfgs = cfgs; - } - - /** - * Creates service deployment exception with error message and {@link Throwable} as a cause. - * - * @param msg Error message. - * @param cause Cause. - * @param cfgs Configurations of services that failed to deploy. - */ - public ServiceDeploymentException(String msg, @Nullable Throwable cause, Collection cfgs) { - super(msg, cause); - - this.cfgs = cfgs; - } - - /** - * @return Configurations of services that failed to deploy. - */ - public Collection getFailedConfigurations() { - return cfgs; - } -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/d7e215d6/modules/core/src/main/java/org/apache/ignite/services/ServiceDeploymentException.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/services/ServiceDeploymentException.java b/modules/core/src/main/java/org/apache/ignite/services/ServiceDeploymentException.java new file mode 100644 index 0000000..843a8fe --- /dev/null +++ b/modules/core/src/main/java/org/apache/ignite/services/ServiceDeploymentException.java @@ -0,0 +1,77 @@ +/* + * 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.ignite.services; + +import java.util.Collection; +import org.apache.ignite.IgniteException; +import org.jetbrains.annotations.Nullable; + +/** + * Exception indicating service deployment failure. + */ +public class ServiceDeploymentException extends IgniteException { + /** */ + private static final long serialVersionUID = 0L; + + /** */ + private final Collection cfgs; + + /** + * Creates service deployment exception with error message. + * + * @param msg Error message. + * @param cfgs Configurations of services that failed to deploy. + */ + public ServiceDeploymentException(String msg, Collection cfgs) { + super(msg); + + this.cfgs = cfgs; + } + + /** + * Creates service deployment exception with {@link Throwable} as a cause. + * + * @param cause Cause. + * @param cfgs Configurations of services that failed to deploy. + */ + public ServiceDeploymentException(Throwable cause, Collection cfgs) { + super(cause); + + this.cfgs = cfgs; + } + + /** + * Creates service deployment exception with error message and {@link Throwable} as a cause. + * + * @param msg Error message. + * @param cause Cause. + * @param cfgs Configurations of services that failed to deploy. + */ + public ServiceDeploymentException(String msg, @Nullable Throwable cause, Collection cfgs) { + super(msg, cause); + + this.cfgs = cfgs; + } + + /** + * @return Configurations of services that failed to deploy. + */ + public Collection getFailedConfigurations() { + return cfgs; + } +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/d7e215d6/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceDeploymentCompoundFutureSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceDeploymentCompoundFutureSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceDeploymentCompoundFutureSelfTest.java index 51c3407..ca95198 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceDeploymentCompoundFutureSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceDeploymentCompoundFutureSelfTest.java @@ -28,6 +28,7 @@ import org.apache.ignite.internal.IgniteKernal; import org.apache.ignite.internal.util.future.GridFutureAdapter; import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.services.ServiceConfiguration; +import org.apache.ignite.services.ServiceDeploymentException; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; /** */ http://git-wip-us.apache.org/repos/asf/ignite/blob/d7e215d6/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorBatchDeploySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorBatchDeploySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorBatchDeploySelfTest.java index 4916aff..dc19f33 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorBatchDeploySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorBatchDeploySelfTest.java @@ -35,6 +35,7 @@ import org.apache.ignite.internal.IgniteNodeAttributes; import org.apache.ignite.lang.IgniteFuture; import org.apache.ignite.lang.IgnitePredicate; import org.apache.ignite.services.ServiceConfiguration; +import org.apache.ignite.services.ServiceDeploymentException; import org.apache.ignite.services.ServiceDescriptor; import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;