Return-Path: 
 <commits-return-483-apmail-ignite-commits-archive=ignite.apache.org@ignite.incubator.apache.org>
X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org
Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id BFE5B9616
	for <apmail-ignite-commits-archive@minotaur.apache.org>;
 Fri, 12 Dec 2014 07:16:49 +0000 (UTC)
Received: (qmail 3295 invoked by uid 500); 12 Dec 2014 07:16:49 -0000
Delivered-To: apmail-ignite-commits-archive@ignite.apache.org
Received: (qmail 3265 invoked by uid 500); 12 Dec 2014 07:16:49 -0000
Mailing-List: contact commits-help@ignite.incubator.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@ignite.incubator.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@ignite.incubator.apache.org>
List-Post: <mailto:commits@ignite.incubator.apache.org>
List-Id: <commits.ignite.incubator.apache.org>
Reply-To: dev@ignite.incubator.apache.org
Delivered-To: mailing list commits@ignite.incubator.apache.org
Received: (qmail 3255 invoked by uid 99); 12 Dec 2014 07:16:49 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 12 Dec 2014 07:16:49 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED,T_RP_MATCHES_RCVD
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with SMTP; Fri, 12 Dec 2014 07:14:45 +0000
Received: (qmail 95482 invoked by uid 99); 12 Dec 2014 07:14:40 -0000
Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org)
 (140.211.11.114)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 12 Dec 2014 07:14:40 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id 58C9EA285D2; Fri, 12 Dec 2014 07:14:40 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: sboikov@apache.org
To: commits@ignite.incubator.apache.org
Date: Fri, 12 Dec 2014 07:14:58 -0000
Message-Id: <c212392fe0fc43adb35f716256d91d4d@git.apache.org>
In-Reply-To: <858f2843d730461b9380ed10f06a037b@git.apache.org>
References: <858f2843d730461b9380ed10f06a037b@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [20/64] [abbrv] [partial] incubator-ignite git commit: Rename
 GridException to IgniteCheckedException,
 GridRuntimeException to IgniteException.
X-Virus-Checked: Checked by ClamAV on apache.org

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/VisorMultiNodeTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/VisorMultiNodeTask.java b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/VisorMultiNodeTask.java
index fe6289d..802d409 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/VisorMultiNodeTask.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/VisorMultiNodeTask.java
@@ -9,18 +9,18 @@
 
 package org.gridgain.grid.kernal.visor;
 
+import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.compute.*;
 import org.apache.ignite.resources.*;
-import org.gridgain.grid.*;
 import org.gridgain.grid.kernal.*;
 import org.gridgain.grid.util.typedef.internal.*;
 import org.jetbrains.annotations.*;
 
-import static org.gridgain.grid.kernal.visor.util.VisorTaskUtils.*;
-
 import java.util.*;
 
+import static org.gridgain.grid.kernal.visor.util.VisorTaskUtils.*;
+
 /**
  * Base class for Visor tasks intended to query data from a multiple node.
  *
@@ -48,7 +48,7 @@ public abstract class VisorMultiNodeTask<A, R, J> implements ComputeTask<VisorTa
 
     /** {@inheritDoc} */
     @Override public Map<? extends ComputeJob, ClusterNode> map(List<ClusterNode> subgrid, VisorTaskArgument<A> arg)
-        throws GridException {
+        throws IgniteCheckedException {
         assert arg != null;
 
         start = U.currentTimeMillis();
@@ -69,10 +69,10 @@ public abstract class VisorMultiNodeTask<A, R, J> implements ComputeTask<VisorTa
      * @param arg Task execution argument.
      * @param subgrid Nodes available for this task execution.
      * @return Map of grid jobs assigned to subgrid node.
-     * @throws GridException If mapping could not complete successfully.
+     * @throws IgniteCheckedException If mapping could not complete successfully.
      */
     protected Map<? extends ComputeJob, ClusterNode> map0(List<ClusterNode> subgrid, VisorTaskArgument<A> arg)
-        throws GridException {
+        throws IgniteCheckedException {
         Collection<UUID> nodeIds = arg.nodes();
 
         Map<ComputeJob, ClusterNode> map = U.newHashMap(nodeIds.size());
@@ -92,7 +92,7 @@ public abstract class VisorMultiNodeTask<A, R, J> implements ComputeTask<VisorTa
 
     /** {@inheritDoc} */
     @Override public ComputeJobResultPolicy result(ComputeJobResult res,
-        List<ComputeJobResult> rcvd) throws GridException {
+        List<ComputeJobResult> rcvd) throws IgniteCheckedException {
         // All Visor tasks should handle exceptions in reduce method.
         return ComputeJobResultPolicy.WAIT;
     }
@@ -102,12 +102,12 @@ public abstract class VisorMultiNodeTask<A, R, J> implements ComputeTask<VisorTa
      *
      * @param results Job results.
      * @return Task result.
-     * @throws GridException If reduction or results caused an error.
+     * @throws IgniteCheckedException If reduction or results caused an error.
      */
-    @Nullable protected abstract R reduce0(List<ComputeJobResult> results) throws GridException;
+    @Nullable protected abstract R reduce0(List<ComputeJobResult> results) throws IgniteCheckedException;
 
     /** {@inheritDoc} */
-    @Nullable @Override public final R reduce(List<ComputeJobResult> results) throws GridException {
+    @Nullable @Override public final R reduce(List<ComputeJobResult> results) throws IgniteCheckedException {
         try {
             return reduce0(results);
         }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/VisorOneNodeTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/VisorOneNodeTask.java b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/VisorOneNodeTask.java
index 3748968..7a46cac 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/VisorOneNodeTask.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/VisorOneNodeTask.java
@@ -9,8 +9,8 @@
 
 package org.gridgain.grid.kernal.visor;
 
+import org.apache.ignite.*;
 import org.apache.ignite.compute.*;
-import org.gridgain.grid.*;
 import org.gridgain.grid.util.typedef.*;
 import org.jetbrains.annotations.*;
 
@@ -21,7 +21,7 @@ import java.util.*;
  */
 public abstract class VisorOneNodeTask<A, R> extends VisorMultiNodeTask<A, R, R> {
     /** {@inheritDoc} */
-    @Nullable @Override protected R reduce0(List<ComputeJobResult> results) throws GridException {
+    @Nullable @Override protected R reduce0(List<ComputeJobResult> results) throws IgniteCheckedException {
         assert results.size() == 1;
 
         ComputeJobResult res = F.first(results);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCache.java b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCache.java
index 39427b8..9dcf4a1 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCache.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCache.java
@@ -88,9 +88,9 @@ public class VisorCache implements Serializable {
      * @param c Actual cache.
      * @param sample Sample size.
      * @return Data transfer object for given cache.
-     * @throws GridException
+     * @throws IgniteCheckedException
      */
-    public static VisorCache from(Ignite g, GridCache c, int sample) throws GridException {
+    public static VisorCache from(Ignite g, GridCache c, int sample) throws IgniteCheckedException {
         assert g != null;
         assert c != null;
 
@@ -105,7 +105,7 @@ public class VisorCache implements Serializable {
             swapSize = ca.swapSize();
             swapKeys = ca.swapKeys();
         }
-        catch (GridException ignored) {
+        catch (IgniteCheckedException ignored) {
             swapSize = -1;
             swapKeys = -1;
         }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheClearTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheClearTask.java b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheClearTask.java
index f604c3f..0ba5aee 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheClearTask.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheClearTask.java
@@ -9,8 +9,8 @@
 
 package org.gridgain.grid.kernal.visor.cache;
 
+import org.apache.ignite.*;
 import org.apache.ignite.lang.*;
-import org.gridgain.grid.*;
 import org.gridgain.grid.cache.*;
 import org.gridgain.grid.kernal.processors.task.*;
 import org.gridgain.grid.kernal.visor.*;
@@ -49,7 +49,7 @@ public class VisorCacheClearTask extends VisorOneNodeTask<Set<String>, Map<Strin
         }
 
         /** {@inheritDoc} */
-        @Override protected Map<String, IgniteBiTuple<Integer, Integer>> run(Set<String> arg) throws GridException {
+        @Override protected Map<String, IgniteBiTuple<Integer, Integer>> run(Set<String> arg) throws IgniteCheckedException {
             Map<String, IgniteBiTuple<Integer, Integer>> res = new HashMap<>();
 
             for(GridCache cache : g.cachesx()) {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheCompactTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheCompactTask.java b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheCompactTask.java
index 4891d32..45aaac2 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheCompactTask.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheCompactTask.java
@@ -9,8 +9,8 @@
 
 package org.gridgain.grid.kernal.visor.cache;
 
+import org.apache.ignite.*;
 import org.apache.ignite.lang.*;
-import org.gridgain.grid.*;
 import org.gridgain.grid.cache.*;
 import org.gridgain.grid.kernal.processors.task.*;
 import org.gridgain.grid.kernal.visor.*;
@@ -47,7 +47,7 @@ public class VisorCacheCompactTask extends VisorOneNodeTask<Set<String>, Map<Str
         }
 
         /** {@inheritDoc} */
-        @Override protected Map<String, IgniteBiTuple<Integer, Integer>> run(Set<String> names) throws GridException {
+        @Override protected Map<String, IgniteBiTuple<Integer, Integer>> run(Set<String> names) throws IgniteCheckedException {
             final Map<String, IgniteBiTuple<Integer, Integer>> res = new HashMap<>();
 
             for(GridCache cache : g.cachesx()) {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheLoadTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheLoadTask.java b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheLoadTask.java
index abd9521..df6a74f 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheLoadTask.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheLoadTask.java
@@ -9,7 +9,7 @@
 
 package org.gridgain.grid.kernal.visor.cache;
 
-import org.gridgain.grid.*;
+import org.apache.ignite.*;
 import org.gridgain.grid.cache.*;
 import org.gridgain.grid.kernal.processors.task.*;
 import org.gridgain.grid.kernal.visor.*;
@@ -48,7 +48,7 @@ public class VisorCacheLoadTask extends
         }
 
         /** {@inheritDoc} */
-        @Override protected Map<String, Integer> run(GridTuple3<Set<String>, Long, Object[]> arg) throws GridException {
+        @Override protected Map<String, Integer> run(GridTuple3<Set<String>, Long, Object[]> arg) throws IgniteCheckedException {
             Set<String> cacheNames = arg.get1();
             Long ttl = arg.get2();
             Object[] loaderArgs = arg.get3();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheMetadataTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheMetadataTask.java b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheMetadataTask.java
index 101a6df..0ab4dc9 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheMetadataTask.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheMetadataTask.java
@@ -9,7 +9,7 @@
 
 package org.gridgain.grid.kernal.visor.cache;
 
-import org.gridgain.grid.*;
+import org.apache.ignite.*;
 import org.gridgain.grid.cache.*;
 import org.gridgain.grid.kernal.processors.cache.query.*;
 import org.gridgain.grid.kernal.processors.task.*;
@@ -48,7 +48,7 @@ public class VisorCacheMetadataTask extends VisorOneNodeTask<String, GridCacheSq
         }
 
         /** {@inheritDoc} */
-        @Override protected GridCacheSqlMetadata run(String cacheName) throws GridException {
+        @Override protected GridCacheSqlMetadata run(String cacheName) throws IgniteCheckedException {
             GridCache<Object, Object> cache = g.cachex(cacheName);
 
             if (cache != null) {
@@ -57,7 +57,7 @@ public class VisorCacheMetadataTask extends VisorOneNodeTask<String, GridCacheSq
                 return F.first(queries.sqlMetadata());
             }
 
-            throw new GridException("Cache not found: " + escapeName(cacheName));
+            throw new IgniteCheckedException("Cache not found: " + escapeName(cacheName));
         }
 
         /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheMetricsCollectorTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheMetricsCollectorTask.java b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheMetricsCollectorTask.java
index 36f64f8..cd92579 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheMetricsCollectorTask.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheMetricsCollectorTask.java
@@ -9,10 +9,10 @@
 
 package org.gridgain.grid.kernal.visor.cache;
 
+import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.compute.*;
 import org.apache.ignite.lang.*;
-import org.gridgain.grid.*;
 import org.gridgain.grid.cache.*;
 import org.gridgain.grid.cache.query.*;
 import org.gridgain.grid.kernal.processors.task.*;
@@ -39,7 +39,7 @@ public class VisorCacheMetricsCollectorTask extends VisorMultiNodeTask<IgniteBiT
 
     /** {@inheritDoc} */
     @Nullable @Override protected Iterable<VisorCacheAggregatedMetrics> reduce0(List<ComputeJobResult> results)
-        throws GridException {
+        throws IgniteCheckedException {
         Map<String, VisorCacheAggregatedMetrics> grpAggrMetrics = new HashMap<>();
 
         for (ComputeJobResult res : results) {
@@ -128,7 +128,7 @@ public class VisorCacheMetricsCollectorTask extends VisorMultiNodeTask<IgniteBiT
         }
 
         /** {@inheritDoc} */
-        @Override protected Collection<VisorCacheMetrics2> run(IgniteBiTuple<Boolean, String> arg) throws GridException {
+        @Override protected Collection<VisorCacheMetrics2> run(IgniteBiTuple<Boolean, String> arg) throws IgniteCheckedException {
             Collection<? extends GridCache<?, ?>> caches = arg.get1() ? g.cachesx() : F.asList(g.cachex(arg.get2()));
 
             if (caches != null) {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCachePreloadTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCachePreloadTask.java b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCachePreloadTask.java
index f5738dd..d9bcd72 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCachePreloadTask.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCachePreloadTask.java
@@ -9,8 +9,8 @@
 
 package org.gridgain.grid.kernal.visor.cache;
 
+import org.apache.ignite.*;
 import org.apache.ignite.lang.*;
-import org.gridgain.grid.*;
 import org.gridgain.grid.cache.*;
 import org.gridgain.grid.kernal.processors.task.*;
 import org.gridgain.grid.kernal.visor.*;
@@ -47,7 +47,7 @@ public class VisorCachePreloadTask extends VisorOneNodeTask<Set<String>, Void> {
         }
 
         /** {@inheritDoc} */
-        @Override protected Void run(Set<String> cacheNames) throws GridException {
+        @Override protected Void run(Set<String> cacheNames) throws IgniteCheckedException {
             Collection<IgniteFuture<?>> futs = new ArrayList<>();
 
             for(GridCache c : g.cachesx()) {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheResetMetricsTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheResetMetricsTask.java b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheResetMetricsTask.java
index 35a3666..1662a88 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheResetMetricsTask.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheResetMetricsTask.java
@@ -9,7 +9,7 @@
 
 package org.gridgain.grid.kernal.visor.cache;
 
-import org.gridgain.grid.*;
+import org.apache.ignite.*;
 import org.gridgain.grid.cache.*;
 import org.gridgain.grid.kernal.processors.task.*;
 import org.gridgain.grid.kernal.visor.*;
@@ -44,7 +44,7 @@ public class VisorCacheResetMetricsTask extends VisorOneNodeTask<String, Void> {
         }
 
         /** {@inheritDoc} */
-        @Override protected Void run(String cacheName) throws GridException {
+        @Override protected Void run(String cacheName) throws IgniteCheckedException {
             GridCache cache = g.cachex(cacheName);
 
             if (cache != null)

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheSwapBackupsTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheSwapBackupsTask.java b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheSwapBackupsTask.java
index edc16bd..0348ce1 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheSwapBackupsTask.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheSwapBackupsTask.java
@@ -9,8 +9,8 @@
 
 package org.gridgain.grid.kernal.visor.cache;
 
+import org.apache.ignite.*;
 import org.apache.ignite.lang.*;
-import org.gridgain.grid.*;
 import org.gridgain.grid.cache.*;
 import org.gridgain.grid.kernal.processors.task.*;
 import org.gridgain.grid.kernal.visor.*;
@@ -51,7 +51,7 @@ public class VisorCacheSwapBackupsTask extends VisorOneNodeTask<Set<String>, Map
         }
 
         /** {@inheritDoc} */
-        @Override protected Map<String, IgniteBiTuple<Integer, Integer>> run(Set<String> names) throws GridException {
+        @Override protected Map<String, IgniteBiTuple<Integer, Integer>> run(Set<String> names) throws IgniteCheckedException {
             Map<String, IgniteBiTuple<Integer, Integer>> total = new HashMap<>();
 
             for (GridCache c: g.cachesx()) {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/compute/VisorComputeCancelSessionsTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/compute/VisorComputeCancelSessionsTask.java b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/compute/VisorComputeCancelSessionsTask.java
index 1fb7826..faeddeb 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/compute/VisorComputeCancelSessionsTask.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/compute/VisorComputeCancelSessionsTask.java
@@ -34,7 +34,7 @@ public class VisorComputeCancelSessionsTask extends VisorMultiNodeTask<Map<UUID,
     }
 
     /** {@inheritDoc} */
-    @Nullable @Override protected Void reduce0(List<ComputeJobResult> results) throws GridException {
+    @Nullable @Override protected Void reduce0(List<ComputeJobResult> results) throws IgniteCheckedException {
         // No-op, just awaiting all jobs done.
         return null;
     }
@@ -55,7 +55,7 @@ public class VisorComputeCancelSessionsTask extends VisorMultiNodeTask<Map<UUID,
         }
 
         /** {@inheritDoc} */
-        @Override protected Void run(Map<UUID, Set<IgniteUuid>> arg) throws GridException {
+        @Override protected Void run(Map<UUID, Set<IgniteUuid>> arg) throws IgniteCheckedException {
             Set<IgniteUuid> sesIds = arg.get(g.localNode().id());
 
             if (sesIds != null && !sesIds.isEmpty()) {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/compute/VisorComputeResetMetricsTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/compute/VisorComputeResetMetricsTask.java b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/compute/VisorComputeResetMetricsTask.java
index b743a0e..35acb56 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/compute/VisorComputeResetMetricsTask.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/compute/VisorComputeResetMetricsTask.java
@@ -9,7 +9,7 @@
 
 package org.gridgain.grid.kernal.visor.compute;
 
-import org.gridgain.grid.*;
+import org.apache.ignite.*;
 import org.gridgain.grid.kernal.processors.task.*;
 import org.gridgain.grid.kernal.visor.*;
 import org.gridgain.grid.util.typedef.internal.*;
@@ -43,7 +43,7 @@ public class VisorComputeResetMetricsTask extends VisorOneNodeTask<Void, Void> {
         }
 
         /** {@inheritDoc} */
-        @Override protected Void run(Void arg) throws GridException {
+        @Override protected Void run(Void arg) throws IgniteCheckedException {
             g.resetMetrics();
 
             return null;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/compute/VisorComputeToggleMonitoringTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/compute/VisorComputeToggleMonitoringTask.java b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/compute/VisorComputeToggleMonitoringTask.java
index 99d868b..7535fa1 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/compute/VisorComputeToggleMonitoringTask.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/compute/VisorComputeToggleMonitoringTask.java
@@ -9,10 +9,10 @@
 
 package org.gridgain.grid.kernal.visor.compute;
 
+import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.compute.*;
 import org.apache.ignite.lang.*;
-import org.gridgain.grid.*;
 import org.gridgain.grid.kernal.processors.task.*;
 import org.gridgain.grid.kernal.visor.*;
 import org.gridgain.grid.util.typedef.internal.*;
@@ -20,8 +20,8 @@ import org.jetbrains.annotations.*;
 
 import java.util.*;
 
-import static org.gridgain.grid.kernal.visor.util.VisorTaskUtils.*;
 import static org.gridgain.grid.kernal.visor.compute.VisorComputeMonitoringHolder.*;
+import static org.gridgain.grid.kernal.visor.util.VisorTaskUtils.*;
 
 /**
  * Task to run gc on nodes.
@@ -33,7 +33,7 @@ public class VisorComputeToggleMonitoringTask extends
     private static final long serialVersionUID = 0L;
 
     /** {@inheritDoc} */
-    @Nullable @Override protected Boolean reduce0(List<ComputeJobResult> results) throws GridException {
+    @Nullable @Override protected Boolean reduce0(List<ComputeJobResult> results) throws IgniteCheckedException {
         Collection<Boolean> toggles = new HashSet<>();
 
         for (ComputeJobResult res: results)
@@ -64,7 +64,7 @@ public class VisorComputeToggleMonitoringTask extends
         }
 
         /** {@inheritDoc} */
-        @Override protected Boolean run(IgniteBiTuple<String, Boolean> arg) throws GridException {
+        @Override protected Boolean run(IgniteBiTuple<String, Boolean> arg) throws IgniteCheckedException {
             if (checkExplicitTaskMonitoring(g))
                 return true;
             else {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/debug/VisorThreadDumpTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/debug/VisorThreadDumpTask.java b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/debug/VisorThreadDumpTask.java
index b24904b..91dfc5a 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/debug/VisorThreadDumpTask.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/debug/VisorThreadDumpTask.java
@@ -9,8 +9,8 @@
 
 package org.gridgain.grid.kernal.visor.debug;
 
+import org.apache.ignite.*;
 import org.apache.ignite.lang.*;
-import org.gridgain.grid.*;
 import org.gridgain.grid.kernal.processors.task.*;
 import org.gridgain.grid.kernal.visor.*;
 import org.gridgain.grid.util.typedef.internal.*;
@@ -46,7 +46,7 @@ public class VisorThreadDumpTask extends VisorOneNodeTask<Void, IgniteBiTuple<Vi
         }
 
         /** {@inheritDoc} */
-        @Override protected IgniteBiTuple<VisorThreadInfo[], long[]> run(Void arg) throws GridException {
+        @Override protected IgniteBiTuple<VisorThreadInfo[], long[]> run(Void arg) throws IgniteCheckedException {
             ThreadMXBean mx = U.getThreadMx();
 
             ThreadInfo[] info = mx.dumpAllThreads(true, true);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/file/VisorFileBlockTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/file/VisorFileBlockTask.java b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/file/VisorFileBlockTask.java
index 10140d3..84275c0 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/file/VisorFileBlockTask.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/file/VisorFileBlockTask.java
@@ -9,8 +9,8 @@
 
 package org.gridgain.grid.kernal.visor.file;
 
+import org.apache.ignite.*;
 import org.apache.ignite.lang.*;
-import org.gridgain.grid.*;
 import org.gridgain.grid.kernal.processors.task.*;
 import org.gridgain.grid.kernal.visor.*;
 import org.gridgain.grid.util.typedef.internal.*;
@@ -91,7 +91,7 @@ public class VisorFileBlockTask extends VisorOneNodeTask<VisorFileBlockTask.Viso
         }
 
         /** {@inheritDoc} */
-        @Override protected IgniteBiTuple<? extends IOException, VisorFileBlock> run(VisorFileBlockArg arg) throws GridException {
+        @Override protected IgniteBiTuple<? extends IOException, VisorFileBlock> run(VisorFileBlockArg arg) throws IgniteCheckedException {
             try {
                 URL url = U.resolveGridGainUrl(arg.path);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/file/VisorLatestTextFilesTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/file/VisorLatestTextFilesTask.java b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/file/VisorLatestTextFilesTask.java
index cf44d2f..834320c 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/file/VisorLatestTextFilesTask.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/file/VisorLatestTextFilesTask.java
@@ -9,8 +9,8 @@
 
 package org.gridgain.grid.kernal.visor.file;
 
+import org.apache.ignite.*;
 import org.apache.ignite.lang.*;
-import org.gridgain.grid.*;
 import org.gridgain.grid.kernal.processors.task.*;
 import org.gridgain.grid.kernal.visor.*;
 import org.gridgain.grid.kernal.visor.log.*;
@@ -52,7 +52,7 @@ public class VisorLatestTextFilesTask extends VisorOneNodeTask<IgniteBiTuple<Str
         }
 
         /** {@inheritDoc} */
-        @Nullable @Override protected Collection<VisorLogFile> run(final IgniteBiTuple<String, String> arg) throws GridException {
+        @Nullable @Override protected Collection<VisorLogFile> run(final IgniteBiTuple<String, String> arg) throws IgniteCheckedException {
             String path = arg.get1();
             String regexp = arg.get2();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/ggfs/VisorGgfs.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/ggfs/VisorGgfs.java b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/ggfs/VisorGgfs.java
index 2bd761b..4889613 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/ggfs/VisorGgfs.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/ggfs/VisorGgfs.java
@@ -58,9 +58,9 @@ public class VisorGgfs implements Serializable {
     /**
      * @param ggfs Source GGFS.
      * @return Data transfer object for given GGFS.
-     * @throws GridException
+     * @throws IgniteCheckedException
      */
-    public static VisorGgfs from(IgniteFs ggfs) throws GridException {
+    public static VisorGgfs from(IgniteFs ggfs) throws IgniteCheckedException {
         assert ggfs != null;
 
         return new VisorGgfs(

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/ggfs/VisorGgfsFormatTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/ggfs/VisorGgfsFormatTask.java b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/ggfs/VisorGgfsFormatTask.java
index 4ed43e9..d742fc6 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/ggfs/VisorGgfsFormatTask.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/ggfs/VisorGgfsFormatTask.java
@@ -9,7 +9,7 @@
 
 package org.gridgain.grid.kernal.visor.ggfs;
 
-import org.gridgain.grid.*;
+import org.apache.ignite.*;
 import org.gridgain.grid.kernal.processors.task.*;
 import org.gridgain.grid.kernal.visor.*;
 import org.gridgain.grid.util.typedef.internal.*;
@@ -43,12 +43,12 @@ public class VisorGgfsFormatTask extends VisorOneNodeTask<String, Void> {
         }
 
         /** {@inheritDoc} */
-        @Override protected Void run(String ggfsName) throws GridException {
+        @Override protected Void run(String ggfsName) throws IgniteCheckedException {
             try {
                 g.fileSystem(ggfsName).format();
             }
             catch (IllegalArgumentException iae) {
-                throw new GridException("Failed to format GGFS: " + ggfsName, iae);
+                throw new IgniteCheckedException("Failed to format GGFS: " + ggfsName, iae);
             }
 
             return null;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/ggfs/VisorGgfsProfilerClearTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/ggfs/VisorGgfsProfilerClearTask.java b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/ggfs/VisorGgfsProfilerClearTask.java
index 98e3d6f..e6325b2 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/ggfs/VisorGgfsProfilerClearTask.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/ggfs/VisorGgfsProfilerClearTask.java
@@ -47,7 +47,7 @@ public class VisorGgfsProfilerClearTask extends VisorOneNodeTask<String, IgniteB
         }
 
         /** {@inheritDoc} */
-        @Override protected IgniteBiTuple<Integer, Integer> run(String arg) throws GridException {
+        @Override protected IgniteBiTuple<Integer, Integer> run(String arg) throws IgniteCheckedException {
             int deleted = 0;
             int notDeleted = 0;
 
@@ -85,7 +85,7 @@ public class VisorGgfsProfilerClearTask extends VisorOneNodeTask<String, IgniteB
                 }
             }
             catch (IOException | IllegalArgumentException ioe) {
-                throw new GridException("Failed to clear profiler logs for GGFS: " + arg, ioe);
+                throw new IgniteCheckedException("Failed to clear profiler logs for GGFS: " + arg, ioe);
             }
 
             return new IgniteBiTuple<>(deleted, notDeleted);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/ggfs/VisorGgfsProfilerTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/ggfs/VisorGgfsProfilerTask.java b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/ggfs/VisorGgfsProfilerTask.java
index 2981638..d5b71c7 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/ggfs/VisorGgfsProfilerTask.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/ggfs/VisorGgfsProfilerTask.java
@@ -9,8 +9,8 @@
 
 package org.gridgain.grid.kernal.visor.ggfs;
 
+import org.apache.ignite.*;
 import org.apache.ignite.fs.*;
-import org.gridgain.grid.*;
 import org.gridgain.grid.kernal.processors.task.*;
 import org.gridgain.grid.kernal.visor.*;
 import org.gridgain.grid.util.typedef.*;
@@ -152,7 +152,7 @@ public class VisorGgfsProfilerTask extends VisorOneNodeTask<String, Collection<V
         }
 
         /** {@inheritDoc} */
-        @Override protected Collection<VisorGgfsProfilerEntry> run(String arg) throws GridException {
+        @Override protected Collection<VisorGgfsProfilerEntry> run(String arg) throws IgniteCheckedException {
             try {
                 Path logsDir = resolveGgfsProfilerLogsDir(g.fileSystem(arg));
 
@@ -162,7 +162,7 @@ public class VisorGgfsProfilerTask extends VisorOneNodeTask<String, Collection<V
                     return Collections.emptyList();
             }
             catch (IOException | IllegalArgumentException e) {
-                throw new GridException("Failed to parse profiler logs for GGFS: " + arg, e);
+                throw new IgniteCheckedException("Failed to parse profiler logs for GGFS: " + arg, e);
             }
         }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/ggfs/VisorGgfsResetMetricsTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/ggfs/VisorGgfsResetMetricsTask.java b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/ggfs/VisorGgfsResetMetricsTask.java
index f3c0867..fd92518 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/ggfs/VisorGgfsResetMetricsTask.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/ggfs/VisorGgfsResetMetricsTask.java
@@ -9,7 +9,7 @@
 
 package org.gridgain.grid.kernal.visor.ggfs;
 
-import org.gridgain.grid.*;
+import org.apache.ignite.*;
 import org.gridgain.grid.kernal.processors.task.*;
 import org.gridgain.grid.kernal.visor.*;
 import org.gridgain.grid.util.typedef.internal.*;
@@ -45,13 +45,13 @@ public class VisorGgfsResetMetricsTask extends VisorOneNodeTask<Set<String>, Voi
         }
 
         /** {@inheritDoc} */
-        @Override protected Void run(Set<String> ggfsNames) throws GridException {
+        @Override protected Void run(Set<String> ggfsNames) throws IgniteCheckedException {
             for (String ggfsName: ggfsNames)
                 try {
                     g.fileSystem(ggfsName).resetMetrics();
                 }
                 catch (IllegalArgumentException iae) {
-                    throw new GridException("Failed to reset metrics for GGFS: " + ggfsName, iae);
+                    throw new IgniteCheckedException("Failed to reset metrics for GGFS: " + ggfsName, iae);
                 }
 
             return null;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/ggfs/VisorGgfsSamplingStateTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/ggfs/VisorGgfsSamplingStateTask.java b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/ggfs/VisorGgfsSamplingStateTask.java
index 8c4d1f1..d4a9e11 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/ggfs/VisorGgfsSamplingStateTask.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/ggfs/VisorGgfsSamplingStateTask.java
@@ -9,8 +9,8 @@
 
 package org.gridgain.grid.kernal.visor.ggfs;
 
+import org.apache.ignite.*;
 import org.apache.ignite.lang.*;
-import org.gridgain.grid.*;
 import org.gridgain.grid.kernal.processors.ggfs.*;
 import org.gridgain.grid.kernal.processors.task.*;
 import org.gridgain.grid.kernal.visor.*;
@@ -42,14 +42,14 @@ public class VisorGgfsSamplingStateTask extends VisorOneNodeTask<IgniteBiTuple<S
         }
 
         /** {@inheritDoc} */
-        @Override protected Void run(IgniteBiTuple<String, Boolean> arg) throws GridException {
+        @Override protected Void run(IgniteBiTuple<String, Boolean> arg) throws IgniteCheckedException {
             try {
                 ((GridGgfsEx) g.fileSystem(arg.get1())).globalSampling(arg.get2());
 
                 return null;
             }
             catch (IllegalArgumentException iae) {
-                throw new GridException("Failed to set sampling state for GGFS: " + arg.get1(), iae);
+                throw new IgniteCheckedException("Failed to set sampling state for GGFS: " + arg.get1(), iae);
             }
         }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/log/VisorLogSearchTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/log/VisorLogSearchTask.java b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/log/VisorLogSearchTask.java
index 618a122..865f6ef 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/log/VisorLogSearchTask.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/log/VisorLogSearchTask.java
@@ -9,9 +9,9 @@
 
 package org.gridgain.grid.kernal.visor.log;
 
+import org.apache.ignite.*;
 import org.apache.ignite.compute.*;
 import org.apache.ignite.lang.*;
-import org.gridgain.grid.*;
 import org.gridgain.grid.kernal.*;
 import org.gridgain.grid.kernal.processors.task.*;
 import org.gridgain.grid.kernal.visor.*;
@@ -50,7 +50,7 @@ public class VisorLogSearchTask extends VisorMultiNodeTask<VisorLogSearchTask.Vi
 
     /** {@inheritDoc} */
     @Nullable @Override protected IgniteBiTuple<Iterable<IgniteBiTuple<Exception, UUID>>,
-            Iterable<VisorLogSearchResult>> reduce0(List<ComputeJobResult> results) throws GridException {
+            Iterable<VisorLogSearchResult>> reduce0(List<ComputeJobResult> results) throws IgniteCheckedException {
         Collection<VisorLogSearchResult> searchRes = new ArrayList<>();
         Collection<IgniteBiTuple<Exception, UUID>> exRes = new ArrayList<>();
 
@@ -200,7 +200,7 @@ public class VisorLogSearchTask extends VisorMultiNodeTask<VisorLogSearchTask.Vi
         }
 
         /** {@inheritDoc} */
-        @Override protected  Collection<VisorLogSearchResult> run(VisorLogSearchArg arg) throws GridException {
+        @Override protected  Collection<VisorLogSearchResult> run(VisorLogSearchArg arg) throws IgniteCheckedException {
             URL url = U.resolveGridGainUrl(arg.folder);
 
             if (url == null)
@@ -250,7 +250,7 @@ public class VisorLogSearchTask extends VisorMultiNodeTask<VisorLogSearchTask.Vi
 
                 return results.isEmpty() ? null : results;
             } catch (Exception e) {
-                throw new GridException(e);
+                throw new IgniteCheckedException(e);
             }
         }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/misc/VisorAckTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/misc/VisorAckTask.java b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/misc/VisorAckTask.java
index f752586..102cd28 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/misc/VisorAckTask.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/misc/VisorAckTask.java
@@ -9,8 +9,8 @@
 
 package org.gridgain.grid.kernal.visor.misc;
 
+import org.apache.ignite.*;
 import org.apache.ignite.compute.*;
-import org.gridgain.grid.*;
 import org.gridgain.grid.kernal.processors.task.*;
 import org.gridgain.grid.kernal.visor.*;
 import org.gridgain.grid.util.typedef.internal.*;
@@ -32,7 +32,7 @@ public class VisorAckTask extends VisorMultiNodeTask<String, Void, Void> {
     }
 
     /** {@inheritDoc} */
-    @Nullable @Override protected Void reduce0(List<ComputeJobResult> results) throws GridException {
+    @Nullable @Override protected Void reduce0(List<ComputeJobResult> results) throws IgniteCheckedException {
         return null;
     }
 
@@ -54,7 +54,7 @@ public class VisorAckTask extends VisorMultiNodeTask<String, Void, Void> {
         }
 
         /** {@inheritDoc} */
-        @Override protected Void run(String arg) throws GridException {
+        @Override protected Void run(String arg) throws IgniteCheckedException {
             System.out.println("<visor>: ack: " + (arg == null ? g.localNode().id() : arg));
 
             return null;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/misc/VisorLatestVersionTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/misc/VisorLatestVersionTask.java b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/misc/VisorLatestVersionTask.java
index 21f9bf8..018024f 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/misc/VisorLatestVersionTask.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/misc/VisorLatestVersionTask.java
@@ -9,7 +9,7 @@
 
 package org.gridgain.grid.kernal.visor.misc;
 
-import org.gridgain.grid.*;
+import org.apache.ignite.*;
 import org.gridgain.grid.kernal.processors.task.*;
 import org.gridgain.grid.kernal.visor.*;
 import org.gridgain.grid.util.typedef.internal.*;
@@ -43,7 +43,7 @@ public class VisorLatestVersionTask extends VisorOneNodeTask<Void, String> {
         }
 
         /** {@inheritDoc} */
-        @Override protected String run(Void arg) throws GridException {
+        @Override protected String run(Void arg) throws IgniteCheckedException {
             return g.product().latestVersion();
         }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/misc/VisorNopTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/misc/VisorNopTask.java b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/misc/VisorNopTask.java
index 1a51799..cea6f5a 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/misc/VisorNopTask.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/misc/VisorNopTask.java
@@ -9,9 +9,9 @@
 
 package org.gridgain.grid.kernal.visor.misc;
 
+import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.compute.*;
-import org.gridgain.grid.*;
 import org.gridgain.grid.util.*;
 import org.gridgain.grid.util.typedef.internal.*;
 import org.jetbrains.annotations.*;
@@ -27,7 +27,7 @@ public class VisorNopTask implements ComputeTask<Integer, Void> {
 
     /** {@inheritDoc} */
     @Nullable @Override public Map<? extends ComputeJob, ClusterNode> map(List<ClusterNode> subgrid,
-        @Nullable Integer arg) throws GridException {
+        @Nullable Integer arg) throws IgniteCheckedException {
 
         Map<ComputeJob, ClusterNode> map = new GridLeanMap<>(subgrid.size());
 
@@ -39,12 +39,12 @@ public class VisorNopTask implements ComputeTask<Integer, Void> {
 
     /** {@inheritDoc} */
     @Override public ComputeJobResultPolicy result(ComputeJobResult res,
-        List<ComputeJobResult> rcvd) throws GridException {
+        List<ComputeJobResult> rcvd) throws IgniteCheckedException {
         return ComputeJobResultPolicy.WAIT;
     }
 
     /** {@inheritDoc} */
-    @Nullable @Override public Void reduce(List<ComputeJobResult> results) throws GridException {
+    @Nullable @Override public Void reduce(List<ComputeJobResult> results) throws IgniteCheckedException {
         return null;
     }
 
@@ -61,7 +61,7 @@ public class VisorNopTask implements ComputeTask<Integer, Void> {
 
         /** {@inheritDoc} */
         @SuppressWarnings("ConstantConditions")
-        @Nullable @Override public Object execute() throws GridException {
+        @Nullable @Override public Object execute() throws IgniteCheckedException {
             try {
                 Integer maxTimeout = argument(0);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/misc/VisorResolveHostNameTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/misc/VisorResolveHostNameTask.java b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/misc/VisorResolveHostNameTask.java
index 0f68cd4..42089fa 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/misc/VisorResolveHostNameTask.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/misc/VisorResolveHostNameTask.java
@@ -9,8 +9,8 @@
 
 package org.gridgain.grid.kernal.visor.misc;
 
+import org.apache.ignite.*;
 import org.apache.ignite.lang.*;
-import org.gridgain.grid.*;
 import org.gridgain.grid.kernal.processors.task.*;
 import org.gridgain.grid.kernal.visor.*;
 import org.gridgain.grid.util.*;
@@ -50,7 +50,7 @@ public class VisorResolveHostNameTask extends VisorOneNodeTask<Void, Map<String,
         }
 
         /** {@inheritDoc} */
-        @Override protected Map<String, String> run(Void arg) throws GridException {
+        @Override protected Map<String, String> run(Void arg) throws IgniteCheckedException {
             Map<String, String> res = new HashMap<>();
 
             try {
@@ -82,7 +82,7 @@ public class VisorResolveHostNameTask extends VisorOneNodeTask<Void, Map<String,
                 }
             }
             catch (Throwable e) {
-                throw new GridException("Failed to resolve host name", e);
+                throw new IgniteCheckedException("Failed to resolve host name", e);
             }
 
             return res;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorNodeDataCollectorJob.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorNodeDataCollectorJob.java b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorNodeDataCollectorJob.java
index 7b3cec1..794ef7f 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorNodeDataCollectorJob.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorNodeDataCollectorJob.java
@@ -160,12 +160,12 @@ public class VisorNodeDataCollectorJob extends VisorJob<VisorNodeDataCollectorTa
     }
 
     /** {@inheritDoc} */
-    @Override protected VisorNodeDataCollectorJobResult run(VisorNodeDataCollectorTaskArg arg) throws GridException {
+    @Override protected VisorNodeDataCollectorJobResult run(VisorNodeDataCollectorTaskArg arg) throws IgniteCheckedException {
         return run(new VisorNodeDataCollectorJobResult(), arg);
     }
 
     protected VisorNodeDataCollectorJobResult run(VisorNodeDataCollectorJobResult res,
-        VisorNodeDataCollectorTaskArg arg) throws GridException {
+        VisorNodeDataCollectorTaskArg arg) throws IgniteCheckedException {
         res.gridName(g.name());
 
         res.topologyVersion(g.topologyVersion());

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorNodeDataCollectorTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorNodeDataCollectorTask.java b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorNodeDataCollectorTask.java
index 6107d4a..dc4ff6c 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorNodeDataCollectorTask.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorNodeDataCollectorTask.java
@@ -9,9 +9,9 @@
 
 package org.gridgain.grid.kernal.visor.node;
 
+import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.compute.*;
-import org.gridgain.grid.*;
 import org.gridgain.grid.kernal.processors.task.*;
 import org.gridgain.grid.kernal.visor.*;
 import org.gridgain.grid.util.typedef.internal.*;
@@ -32,7 +32,7 @@ public class VisorNodeDataCollectorTask extends VisorMultiNodeTask<VisorNodeData
 
     /** {@inheritDoc} */
     @Override protected Map<? extends ComputeJob, ClusterNode> map0(List<ClusterNode> subgrid,
-        VisorTaskArgument<VisorNodeDataCollectorTaskArg> arg) throws GridException {
+        VisorTaskArgument<VisorNodeDataCollectorTaskArg> arg) throws IgniteCheckedException {
         assert arg != null;
 
         Map<ComputeJob, ClusterNode> map = U.newHashMap(subgrid.size());
@@ -54,19 +54,19 @@ public class VisorNodeDataCollectorTask extends VisorMultiNodeTask<VisorNodeData
     }
 
     /** {@inheritDoc} */
-    @Nullable @Override protected VisorNodeDataCollectorTaskResult reduce0(List<ComputeJobResult> results) throws GridException {
+    @Nullable @Override protected VisorNodeDataCollectorTaskResult reduce0(List<ComputeJobResult> results) throws IgniteCheckedException {
         return reduce(new VisorNodeDataCollectorTaskResult(), results);
     }
 
     protected VisorNodeDataCollectorTaskResult reduce(VisorNodeDataCollectorTaskResult taskResult,
-        List<ComputeJobResult> results) throws GridException {
+        List<ComputeJobResult> results) throws IgniteCheckedException {
         for (ComputeJobResult res : results) {
             VisorNodeDataCollectorJobResult jobResult = res.getData();
 
             if (jobResult != null) {
                 UUID nid = res.getNode().id();
 
-                GridException unhandledEx = res.getException();
+                IgniteCheckedException unhandledEx = res.getException();
 
                 if (unhandledEx == null)
                     reduceJobResult(taskResult, jobResult, nid);
@@ -82,7 +82,7 @@ public class VisorNodeDataCollectorTask extends VisorMultiNodeTask<VisorNodeData
     }
 
     protected void reduceJobResult(VisorNodeDataCollectorTaskResult taskResult,
-        VisorNodeDataCollectorJobResult jobResult, UUID nid) throws GridException {
+        VisorNodeDataCollectorJobResult jobResult, UUID nid) throws IgniteCheckedException {
         taskResult.gridNames().put(nid, jobResult.gridName());
 
         taskResult.topologyVersions().put(nid, jobResult.topologyVersion());

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorNodeEventsCollectorTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorNodeEventsCollectorTask.java b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorNodeEventsCollectorTask.java
index ef17bd8..2e4ab21 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorNodeEventsCollectorTask.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorNodeEventsCollectorTask.java
@@ -9,11 +9,11 @@
 
 package org.gridgain.grid.kernal.visor.node;
 
+import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.compute.*;
 import org.apache.ignite.events.*;
 import org.apache.ignite.lang.*;
-import org.gridgain.grid.*;
 import org.gridgain.grid.kernal.processors.task.*;
 import org.gridgain.grid.kernal.visor.*;
 import org.gridgain.grid.kernal.visor.event.*;
@@ -43,7 +43,7 @@ public class VisorNodeEventsCollectorTask extends VisorMultiNodeTask<VisorNodeEv
 
     /** {@inheritDoc} */
     @Override protected Iterable<? extends VisorGridEvent> reduce0(
-        List<ComputeJobResult> results) throws GridException {
+        List<ComputeJobResult> results) throws IgniteCheckedException {
 
         Collection<VisorGridEvent> allEvents = new ArrayList<>();
 
@@ -255,7 +255,7 @@ public class VisorNodeEventsCollectorTask extends VisorMultiNodeTask<VisorNodeEv
 
         /** {@inheritDoc} */
         @Override protected Collection<? extends VisorGridEvent> run(final VisorNodeEventsCollectorTaskArg arg)
-            throws GridException {
+            throws IgniteCheckedException {
             final long startEvtTime = arg.timeArgument() == null ? 0L : System.currentTimeMillis() - arg.timeArgument();
 
             final ClusterNodeLocalMap<String, Long> nl = g.nodeLocalMap();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorNodeGcTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorNodeGcTask.java b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorNodeGcTask.java
index 9c267dd..6e144cc 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorNodeGcTask.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorNodeGcTask.java
@@ -9,10 +9,10 @@
 
 package org.gridgain.grid.kernal.visor.node;
 
+import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.compute.*;
 import org.apache.ignite.lang.*;
-import org.gridgain.grid.*;
 import org.gridgain.grid.kernal.processors.task.*;
 import org.gridgain.grid.kernal.visor.*;
 import org.gridgain.grid.util.typedef.internal.*;
@@ -36,7 +36,7 @@ public class VisorNodeGcTask extends VisorMultiNodeTask<Void, Map<UUID, IgniteBi
 
     /** {@inheritDoc} */
     @Nullable @Override protected Map<UUID, IgniteBiTuple<Long, Long>> reduce0(List<ComputeJobResult> results)
-        throws GridException {
+        throws IgniteCheckedException {
         Map<UUID, IgniteBiTuple<Long, Long>> total = new HashMap<>();
 
         for (ComputeJobResult res: results) {
@@ -64,7 +64,7 @@ public class VisorNodeGcTask extends VisorMultiNodeTask<Void, Map<UUID, IgniteBi
         }
 
         /** {@inheritDoc} */
-        @Override protected IgniteBiTuple<Long, Long> run(Void arg) throws GridException {
+        @Override protected IgniteBiTuple<Long, Long> run(Void arg) throws IgniteCheckedException {
             ClusterNode locNode = g.localNode();
 
             long before = freeHeap(locNode);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorNodePingTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorNodePingTask.java b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorNodePingTask.java
index e1e1ae8..9905131 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorNodePingTask.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorNodePingTask.java
@@ -9,9 +9,9 @@
 
 package org.gridgain.grid.kernal.visor.node;
 
+import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.compute.*;
-import org.gridgain.grid.*;
 import org.gridgain.grid.kernal.processors.task.*;
 import org.gridgain.grid.kernal.visor.*;
 import org.gridgain.grid.util.lang.*;
@@ -34,7 +34,7 @@ public class VisorNodePingTask extends VisorOneNodeTask<UUID, GridTuple3<Boolean
     }
 
     /** {@inheritDoc} */
-    @Nullable @Override protected GridTuple3<Boolean, Long, Long> reduce0(List<ComputeJobResult> results) throws GridException {
+    @Nullable @Override protected GridTuple3<Boolean, Long, Long> reduce0(List<ComputeJobResult> results) throws IgniteCheckedException {
         try {
             return super.reduce0(results);
         }
@@ -59,7 +59,7 @@ public class VisorNodePingTask extends VisorOneNodeTask<UUID, GridTuple3<Boolean
         }
 
         /** {@inheritDoc} */
-        @Override protected GridTuple3<Boolean, Long, Long> run(UUID nodeToPing) throws GridException {
+        @Override protected GridTuple3<Boolean, Long, Long> run(UUID nodeToPing) throws IgniteCheckedException {
             long start = System.currentTimeMillis();
 
             return new GridTuple3<>(g.pingNode(nodeToPing), start, System.currentTimeMillis());

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorNodeRestartTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorNodeRestartTask.java b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorNodeRestartTask.java
index 38a3133..d4ce281 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorNodeRestartTask.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorNodeRestartTask.java
@@ -28,7 +28,7 @@ public class VisorNodeRestartTask extends VisorMultiNodeTask<Void, Void, Void> {
     private static final long serialVersionUID = 0L;
 
     /** {@inheritDoc} */
-    @Nullable @Override protected Void reduce0(List<ComputeJobResult> results) throws GridException {
+    @Nullable @Override protected Void reduce0(List<ComputeJobResult> results) throws IgniteCheckedException {
         return null;
     }
 
@@ -48,7 +48,7 @@ public class VisorNodeRestartTask extends VisorMultiNodeTask<Void, Void, Void> {
         }
 
         /** {@inheritDoc} */
-        @Override protected Void run(Void arg) throws GridException {
+        @Override protected Void run(Void arg) throws IgniteCheckedException {
             new Thread(new Runnable() {
                 @Override public void run() {
                     Ignition.restart(true);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorNodeStopTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorNodeStopTask.java b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorNodeStopTask.java
index c094dc1..5415bc5 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorNodeStopTask.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorNodeStopTask.java
@@ -33,7 +33,7 @@ public class VisorNodeStopTask extends VisorMultiNodeTask<Void, Void, Void> {
     }
 
     /** {@inheritDoc} */
-    @Nullable @Override protected Void reduce0(List<ComputeJobResult> results) throws GridException {
+    @Nullable @Override protected Void reduce0(List<ComputeJobResult> results) throws IgniteCheckedException {
         return null;
     }
 
@@ -53,7 +53,7 @@ public class VisorNodeStopTask extends VisorMultiNodeTask<Void, Void, Void> {
         }
 
         /** {@inheritDoc} */
-        @Override protected Void run(Void arg) throws GridException {
+        @Override protected Void run(Void arg) throws IgniteCheckedException {
             new Thread(new Runnable() {
                 @Override public void run() {
                     Ignition.kill(true);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/portable/VisorPortableMetadataCollectorTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/portable/VisorPortableMetadataCollectorTask.java b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/portable/VisorPortableMetadataCollectorTask.java
index 9ee00da..0b54261 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/portable/VisorPortableMetadataCollectorTask.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/portable/VisorPortableMetadataCollectorTask.java
@@ -48,7 +48,7 @@ public class VisorPortableMetadataCollectorTask extends VisorOneNodeTask<Long, I
         }
 
         /** {@inheritDoc} */
-        @Override protected IgniteBiTuple<Long, Collection<VisorPortableMetadata>> run(Long lastUpdate) throws GridException {
+        @Override protected IgniteBiTuple<Long, Collection<VisorPortableMetadata>> run(Long lastUpdate) throws IgniteCheckedException {
             final IgnitePortables p = g.portables();
 
             final Collection<VisorPortableMetadata> data = new ArrayList<>(p.metadata().size());

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/query/VisorQueryCleanupTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/query/VisorQueryCleanupTask.java b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/query/VisorQueryCleanupTask.java
index fe298a6..ca6834d 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/query/VisorQueryCleanupTask.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/query/VisorQueryCleanupTask.java
@@ -9,9 +9,9 @@
 
 package org.gridgain.grid.kernal.visor.query;
 
+import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.compute.*;
-import org.gridgain.grid.*;
 import org.gridgain.grid.kernal.processors.task.*;
 import org.gridgain.grid.kernal.visor.*;
 import org.gridgain.grid.util.typedef.internal.*;
@@ -36,7 +36,7 @@ public class VisorQueryCleanupTask extends VisorMultiNodeTask<Map<UUID, Collecti
 
     /** {@inheritDoc} */
     @Override protected Map<? extends ComputeJob, ClusterNode> map0(List<ClusterNode> subgrid,
-        @Nullable VisorTaskArgument<Map<UUID, Collection<String>>> arg) throws GridException {
+        @Nullable VisorTaskArgument<Map<UUID, Collection<String>>> arg) throws IgniteCheckedException {
         Set<UUID> nodeIds = taskArg.keySet();
 
         Map<ComputeJob, ClusterNode> map = U.newHashMap(nodeIds.size());
@@ -55,7 +55,7 @@ public class VisorQueryCleanupTask extends VisorMultiNodeTask<Map<UUID, Collecti
     }
 
     /** {@inheritDoc} */
-    @Nullable @Override protected Void reduce0(List list) throws GridException {
+    @Nullable @Override protected Void reduce0(List list) throws IgniteCheckedException {
         return null;
     }
 
@@ -77,7 +77,7 @@ public class VisorQueryCleanupTask extends VisorMultiNodeTask<Map<UUID, Collecti
         }
 
         /** {@inheritDoc} */
-        @Override protected Void run(Collection<String> qryIds) throws GridException {
+        @Override protected Void run(Collection<String> qryIds) throws IgniteCheckedException {
             ClusterNodeLocalMap<String, VisorQueryTask.VisorFutureResultSetHolder> locMap = g.nodeLocalMap();
 
             for (String qryId : qryIds)

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/query/VisorQueryNextPageTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/query/VisorQueryNextPageTask.java b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/query/VisorQueryNextPageTask.java
index 7cc0eb8..2296062 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/query/VisorQueryNextPageTask.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/query/VisorQueryNextPageTask.java
@@ -9,9 +9,9 @@
 
 package org.gridgain.grid.kernal.visor.query;
 
+import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.lang.*;
-import org.gridgain.grid.*;
 import org.gridgain.grid.kernal.*;
 import org.gridgain.grid.kernal.processors.task.*;
 import org.gridgain.grid.kernal.visor.*;
@@ -50,12 +50,12 @@ public class VisorQueryNextPageTask extends VisorOneNodeTask<IgniteBiTuple<Strin
         }
 
         /** {@inheritDoc} */
-        @Override protected VisorQueryResult run(IgniteBiTuple<String, Integer> arg) throws GridException {
+        @Override protected VisorQueryResult run(IgniteBiTuple<String, Integer> arg) throws IgniteCheckedException {
             return arg.get1().startsWith(VisorQueryUtils.SCAN_QRY_NAME) ? nextScanPage(arg) : nextSqlPage(arg);
         }
 
         /** Collect data from SQL query */
-        private VisorQueryResult nextSqlPage(IgniteBiTuple<String, Integer> arg) throws GridException {
+        private VisorQueryResult nextSqlPage(IgniteBiTuple<String, Integer> arg) throws IgniteCheckedException {
             long start = U.currentTimeMillis();
 
             ClusterNodeLocalMap<String, VisorQueryTask.VisorFutureResultSetHolder<List<?>>> storage = g.nodeLocalMap();
@@ -78,7 +78,7 @@ public class VisorQueryNextPageTask extends VisorOneNodeTask<IgniteBiTuple<Strin
         }
 
         /** Collect data from SCAN query */
-        private VisorQueryResult nextScanPage(IgniteBiTuple<String, Integer> arg) throws GridException {
+        private VisorQueryResult nextScanPage(IgniteBiTuple<String, Integer> arg) throws IgniteCheckedException {
             long start = U.currentTimeMillis();
 
             ClusterNodeLocalMap<String, VisorQueryTask.VisorFutureResultSetHolder<Map.Entry<Object, Object>>> storage = g.nodeLocalMap();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/query/VisorQueryTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/query/VisorQueryTask.java b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/query/VisorQueryTask.java
index f1cb38b..446406d 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/query/VisorQueryTask.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/query/VisorQueryTask.java
@@ -9,21 +9,21 @@
 
 package org.gridgain.grid.kernal.visor.query;
 
+import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;
-import org.gridgain.grid.*;
-import org.gridgain.grid.cache.GridCache;
-import org.gridgain.grid.cache.query.GridCacheQueryFuture;
-import org.gridgain.grid.kernal.GridKernal;
+import org.apache.ignite.lang.*;
+import org.gridgain.grid.cache.*;
+import org.gridgain.grid.cache.query.*;
+import org.gridgain.grid.kernal.*;
 import org.gridgain.grid.kernal.processors.cache.query.*;
 import org.gridgain.grid.kernal.processors.query.*;
-import org.gridgain.grid.kernal.processors.task.GridInternal;
-import org.gridgain.grid.kernal.processors.timeout.GridTimeoutObjectAdapter;
+import org.gridgain.grid.kernal.processors.task.*;
+import org.gridgain.grid.kernal.processors.timeout.*;
 import org.gridgain.grid.kernal.visor.*;
-import org.apache.ignite.lang.IgniteBiTuple;
 import org.gridgain.grid.util.typedef.internal.*;
 
 import java.io.*;
-import java.sql.SQLException;
+import java.sql.*;
 import java.util.*;
 
 import static org.gridgain.grid.kernal.visor.util.VisorTaskUtils.*;
@@ -176,7 +176,7 @@ public class VisorQueryTask extends VisorOneNodeTask<VisorQueryTask.VisorQueryAr
 
         /** {@inheritDoc} */
         @Override protected IgniteBiTuple<? extends Exception, VisorQueryResultEx> run(VisorQueryArg arg)
-            throws GridException {
+            throws IgniteCheckedException {
             try {
                 Boolean scan = arg.queryTxt().toUpperCase().startsWith("SCAN");
 
@@ -185,7 +185,7 @@ public class VisorQueryTask extends VisorOneNodeTask<VisorQueryTask.VisorQueryAr
                 GridCache<Object, Object> c = g.cachex(arg.cacheName());
 
                 if (c == null)
-                    return new IgniteBiTuple<>(new GridException("Cache not found: " + escapeName(arg.cacheName())), null);
+                    return new IgniteBiTuple<>(new IgniteCheckedException("Cache not found: " + escapeName(arg.cacheName())), null);
 
                 if (scan) {
                     GridCacheQueryFuture<Map.Entry<Object, Object>> fut = c.queries().createScanQuery(null)

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/query/VisorQueryUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/query/VisorQueryUtils.java b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/query/VisorQueryUtils.java
index 5a5ba83..9cd1ec7 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/query/VisorQueryUtils.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/query/VisorQueryUtils.java
@@ -9,8 +9,8 @@
 
 package org.gridgain.grid.kernal.visor.query;
 
+import org.apache.ignite.*;
 import org.apache.ignite.lang.*;
-import org.gridgain.grid.*;
 import org.gridgain.grid.cache.query.*;
 import org.gridgain.grid.util.*;
 
@@ -114,7 +114,7 @@ public class VisorQueryUtils {
      */
     public static IgniteBiTuple<List<Object[]>, Map.Entry<Object, Object>> fetchScanQueryRows(
         GridCacheQueryFuture<Map.Entry<Object, Object>> fut, Map.Entry<Object, Object> savedNext, int pageSize)
-        throws GridException {
+        throws IgniteCheckedException {
         List<Object[]> rows = new ArrayList<>();
 
         int cnt = 0;
@@ -164,7 +164,7 @@ public class VisorQueryUtils {
      * @return Fetched rows and last processed element.
      */
     public static IgniteBiTuple<List<Object[]>, List<?>> fetchSqlQueryRows(GridCacheQueryFuture<List<?>> fut,
-        List<?> savedNext, int pageSize) throws GridException {
+        List<?> savedNext, int pageSize) throws IgniteCheckedException {
         List<Object[]> rows = new ArrayList<>();
 
         int cnt = 0;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/streamer/VisorStreamerMetricsResetTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/streamer/VisorStreamerMetricsResetTask.java b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/streamer/VisorStreamerMetricsResetTask.java
index ec05f2e..dd15d9c 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/streamer/VisorStreamerMetricsResetTask.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/streamer/VisorStreamerMetricsResetTask.java
@@ -46,7 +46,7 @@ public class VisorStreamerMetricsResetTask extends VisorOneNodeTask<String, Void
         }
 
         /** {@inheritDoc} */
-        @Override protected Void run(String streamerName) throws GridException {
+        @Override protected Void run(String streamerName) throws IgniteCheckedException {
             try {
                 IgniteStreamer streamer = g.streamer(streamerName);
 
@@ -55,7 +55,7 @@ public class VisorStreamerMetricsResetTask extends VisorOneNodeTask<String, Void
                 return null;
             }
             catch (IllegalArgumentException iae) {
-                throw new GridException("Failed to reset metrics for streamer: " + escapeName(streamerName) +
+                throw new IgniteCheckedException("Failed to reset metrics for streamer: " + escapeName(streamerName) +
                     " on node: " + g.localNode().id(), iae);
             }
         }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/streamer/VisorStreamerResetTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/streamer/VisorStreamerResetTask.java b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/streamer/VisorStreamerResetTask.java
index d0e9d59..8fa7950 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/streamer/VisorStreamerResetTask.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/streamer/VisorStreamerResetTask.java
@@ -46,7 +46,7 @@ public class VisorStreamerResetTask extends VisorOneNodeTask<String, Void> {
         }
 
         /** {@inheritDoc} */
-        @Override protected Void run(String streamerName) throws GridException {
+        @Override protected Void run(String streamerName) throws IgniteCheckedException {
             try {
                 IgniteStreamer streamer = g.streamer(streamerName);
 
@@ -55,7 +55,7 @@ public class VisorStreamerResetTask extends VisorOneNodeTask<String, Void> {
                 return null;
             }
             catch (IllegalArgumentException iae) {
-                throw new GridException("Failed to reset streamer: " + escapeName(streamerName)
+                throw new IgniteCheckedException("Failed to reset streamer: " + escapeName(streamerName)
                     + " on node: " + g.localNode().id(), iae);
             }
         }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/util/VisorTaskUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/util/VisorTaskUtils.java b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/util/VisorTaskUtils.java
index 16f9453..345b774 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/util/VisorTaskUtils.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/util/VisorTaskUtils.java
@@ -603,17 +603,17 @@ public class VisorTaskUtils {
      *
      * @param ggfs GGFS instance to resolve logs dir for.
      * @return {@link Path} to log dir or {@code null} if not found.
-     * @throws GridException if failed to resolve.
+     * @throws IgniteCheckedException if failed to resolve.
      */
-    public static Path resolveGgfsProfilerLogsDir(IgniteFs ggfs) throws GridException {
+    public static Path resolveGgfsProfilerLogsDir(IgniteFs ggfs) throws IgniteCheckedException {
         String logsDir;
 
         if (ggfs instanceof GridGgfsEx)
             logsDir = ((GridGgfsEx) ggfs).clientLogDirectory();
         else if (ggfs == null)
-            throw new GridException("Failed to get profiler log folder (GGFS instance not found)");
+            throw new IgniteCheckedException("Failed to get profiler log folder (GGFS instance not found)");
         else
-            throw new GridException("Failed to get profiler log folder (unexpected GGFS instance type)");
+            throw new IgniteCheckedException("Failed to get profiler log folder (unexpected GGFS instance type)");
 
         URL logsDirUrl = U.resolveGridGainUrl(logsDir != null ? logsDir : DFLT_GGFS_LOG_DIR);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/main/java/org/gridgain/grid/util/GridAtomicInitializer.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/util/GridAtomicInitializer.java b/modules/core/src/main/java/org/gridgain/grid/util/GridAtomicInitializer.java
index 470f2af..6814ce2 100644
--- a/modules/core/src/main/java/org/gridgain/grid/util/GridAtomicInitializer.java
+++ b/modules/core/src/main/java/org/gridgain/grid/util/GridAtomicInitializer.java
@@ -9,6 +9,7 @@
 
 package org.gridgain.grid.util;
 
+import org.apache.ignite.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.util.typedef.internal.*;
 
@@ -37,9 +38,9 @@ public class GridAtomicInitializer<T> {
      *
      * @param c Initialization operation.
      * @return Result of initialization.
-     * @throws GridException If failed.
+     * @throws IgniteCheckedException If failed.
      */
-    public T init(Callable<T> c) throws GridException {
+    public T init(Callable<T> c) throws IgniteCheckedException {
         if (!finished) {
             synchronized (mux) {
                 if (!finished) {
@@ -59,7 +60,7 @@ public class GridAtomicInitializer<T> {
         }
 
         if (e != null)
-            throw e instanceof GridException ? (GridException)e : new GridException(e);
+            throw e instanceof IgniteCheckedException ? (IgniteCheckedException)e : new IgniteCheckedException(e);
 
         return res;
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/main/java/org/gridgain/grid/util/GridCircularBuffer.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/util/GridCircularBuffer.java b/modules/core/src/main/java/org/gridgain/grid/util/GridCircularBuffer.java
index 91c4a63..9ac8e69 100644
--- a/modules/core/src/main/java/org/gridgain/grid/util/GridCircularBuffer.java
+++ b/modules/core/src/main/java/org/gridgain/grid/util/GridCircularBuffer.java
@@ -9,12 +9,12 @@
 
 package org.gridgain.grid.util;
 
+import org.apache.ignite.*;
 import org.apache.ignite.lang.*;
-import org.gridgain.grid.*;
-import org.gridgain.grid.util.typedef.*;
-import org.gridgain.grid.util.typedef.internal.*;
 import org.gridgain.grid.util.lang.*;
 import org.gridgain.grid.util.tostring.*;
+import org.gridgain.grid.util.typedef.*;
+import org.gridgain.grid.util.typedef.internal.*;
 import org.jetbrains.annotations.*;
 
 import java.util.*;
@@ -111,9 +111,9 @@ public class GridCircularBuffer<T> {
      * @param c Closure to by applied on evicted object before eviction.
      * @return Evicted object or {@code null} if nothing evicted.
      * @throws InterruptedException If interrupted.
-     * @throws GridException If closure throws exception.
+     * @throws IgniteCheckedException If closure throws exception.
      */
-    @Nullable public T add(T t, @Nullable IgniteInClosureX<T> c) throws InterruptedException, GridException {
+    @Nullable public T add(T t, @Nullable IgniteInClosureX<T> c) throws InterruptedException, IgniteCheckedException {
         long idx = idxGen.getAndIncrement();
 
         int idx0 = (int)(idx & sizeMask);
@@ -183,10 +183,10 @@ public class GridCircularBuffer<T> {
          * @param c Closure applied on evicted object before eviction.
          * @return Evicted value on success or {@code null} if update failed.
          * @throws InterruptedException If interrupted.
-         * @throws GridException If closure throws exception.
+         * @throws IgniteCheckedException If closure throws exception.
          */
         @Nullable synchronized V update(long newIdx, V newItem, long maxIdxDiff, @Nullable IgniteInClosureX<V> c)
-            throws InterruptedException, GridException {
+            throws InterruptedException, IgniteCheckedException {
             assert newIdx >= 0;
 
             // Thread should wait and allow previous update to finish.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/main/java/org/gridgain/grid/util/GridCloseableIteratorAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/util/GridCloseableIteratorAdapter.java b/modules/core/src/main/java/org/gridgain/grid/util/GridCloseableIteratorAdapter.java
index 1bcb4f0..2a88959 100644
--- a/modules/core/src/main/java/org/gridgain/grid/util/GridCloseableIteratorAdapter.java
+++ b/modules/core/src/main/java/org/gridgain/grid/util/GridCloseableIteratorAdapter.java
@@ -9,7 +9,7 @@
 
 package org.gridgain.grid.util;
 
-import org.gridgain.grid.*;
+import org.apache.ignite.*;
 import org.gridgain.grid.util.lang.*;
 
 import java.util.*;
@@ -26,7 +26,7 @@ public abstract class GridCloseableIteratorAdapter<T> extends GridIteratorAdapte
     private boolean closed;
 
     /** {@inheritDoc} */
-    @Override public final T nextX() throws GridException {
+    @Override public final T nextX() throws IgniteCheckedException {
         if (!hasNextX())
             throw new NoSuchElementException();
 
@@ -35,24 +35,24 @@ public abstract class GridCloseableIteratorAdapter<T> extends GridIteratorAdapte
 
     /**
      * @return Next element.
-     * @throws GridException If failed.
+     * @throws IgniteCheckedException If failed.
      * @throws NoSuchElementException If no element found.
      */
-    protected abstract T onNext() throws GridException;
+    protected abstract T onNext() throws IgniteCheckedException;
 
     /** {@inheritDoc} */
-    @Override public final boolean hasNextX() throws GridException {
+    @Override public final boolean hasNextX() throws IgniteCheckedException {
         return !closed && onHasNext();
     }
 
     /**
      * @return {@code True} if iterator has next element.
-     * @throws GridException If failed.
+     * @throws IgniteCheckedException If failed.
      */
-    protected abstract boolean onHasNext() throws GridException;
+    protected abstract boolean onHasNext() throws IgniteCheckedException;
 
     /** {@inheritDoc} */
-    @Override public final void removeX() throws GridException {
+    @Override public final void removeX() throws IgniteCheckedException {
         checkClosed();
 
         onRemove();
@@ -61,14 +61,14 @@ public abstract class GridCloseableIteratorAdapter<T> extends GridIteratorAdapte
     /**
      * Called on remove from iterator.
      *
-     * @throws GridException If failed.
+     * @throws IgniteCheckedException If failed.
      */
-    protected void onRemove() throws GridException {
+    protected void onRemove() throws IgniteCheckedException {
         throw new UnsupportedOperationException();
     }
 
     /** {@inheritDoc} */
-    @Override public final void close() throws GridException {
+    @Override public final void close() throws IgniteCheckedException {
         if (!closed) {
             onClose();
 
@@ -84,9 +84,9 @@ public abstract class GridCloseableIteratorAdapter<T> extends GridIteratorAdapte
     /**
      * Invoked on iterator close.
      *
-     * @throws GridException If closing failed.
+     * @throws IgniteCheckedException If closing failed.
      */
-    protected void onClose() throws GridException {
+    protected void onClose() throws IgniteCheckedException {
         // No-op.
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/main/java/org/gridgain/grid/util/GridCloseableIteratorAdapterEx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/util/GridCloseableIteratorAdapterEx.java b/modules/core/src/main/java/org/gridgain/grid/util/GridCloseableIteratorAdapterEx.java
index a6209fd..d53f3ce 100644
--- a/modules/core/src/main/java/org/gridgain/grid/util/GridCloseableIteratorAdapterEx.java
+++ b/modules/core/src/main/java/org/gridgain/grid/util/GridCloseableIteratorAdapterEx.java
@@ -9,7 +9,7 @@
 
 package org.gridgain.grid.util;
 
-import org.gridgain.grid.*;
+import org.apache.ignite.*;
 import org.gridgain.grid.util.lang.*;
 
 import java.util.*;
@@ -27,7 +27,7 @@ public abstract class GridCloseableIteratorAdapterEx<T> extends GridIteratorAdap
     private final AtomicBoolean closed = new AtomicBoolean();
 
     /** {@inheritDoc} */
-    @Override public final T nextX() throws GridException {
+    @Override public final T nextX() throws IgniteCheckedException {
         if (closed.get())
             return null;
 
@@ -37,7 +37,7 @@ public abstract class GridCloseableIteratorAdapterEx<T> extends GridIteratorAdap
 
             return onNext();
         }
-        catch (GridException e) {
+        catch (IgniteCheckedException e) {
             if (closed.get())
                 return null;
             else
@@ -47,20 +47,20 @@ public abstract class GridCloseableIteratorAdapterEx<T> extends GridIteratorAdap
 
     /**
      * @return Next element.
-     * @throws GridException If failed.
+     * @throws IgniteCheckedException If failed.
      * @throws NoSuchElementException If no element found.
      */
-    protected abstract T onNext() throws GridException;
+    protected abstract T onNext() throws IgniteCheckedException;
 
     /** {@inheritDoc} */
-    @Override public final boolean hasNextX() throws GridException {
+    @Override public final boolean hasNextX() throws IgniteCheckedException {
         if (closed.get())
             return false;
 
         try {
             return onHasNext();
         }
-        catch (GridException e) {
+        catch (IgniteCheckedException e) {
             if (closed.get())
                 return false;
             else
@@ -70,19 +70,19 @@ public abstract class GridCloseableIteratorAdapterEx<T> extends GridIteratorAdap
 
     /**
      * @return {@code True} if iterator has next element.
-     * @throws GridException If failed.
+     * @throws IgniteCheckedException If failed.
      */
-    protected abstract boolean onHasNext() throws GridException;
+    protected abstract boolean onHasNext() throws IgniteCheckedException;
 
     /** {@inheritDoc} */
-    @Override public final void removeX() throws GridException {
+    @Override public final void removeX() throws IgniteCheckedException {
         if (closed.get())
             throw new NoSuchElementException("Iterator has been closed.");
 
         try {
             onRemove();
         }
-        catch (GridException e) {
+        catch (IgniteCheckedException e) {
             if (!closed.get())
                 throw e;
         }
@@ -91,14 +91,14 @@ public abstract class GridCloseableIteratorAdapterEx<T> extends GridIteratorAdap
     /**
      * Called on remove from iterator.
      *
-     * @throws GridException If failed.
+     * @throws IgniteCheckedException If failed.
      */
-    protected void onRemove() throws GridException {
+    protected void onRemove() throws IgniteCheckedException {
         throw new UnsupportedOperationException("Remove is not supported.");
     }
 
     /** {@inheritDoc} */
-    @Override public final void close() throws GridException {
+    @Override public final void close() throws IgniteCheckedException {
         if (closed.compareAndSet(false, true))
             onClose();
     }
@@ -106,9 +106,9 @@ public abstract class GridCloseableIteratorAdapterEx<T> extends GridIteratorAdap
     /**
      * Invoked on iterator close.
      *
-     * @throws GridException If closing failed.
+     * @throws IgniteCheckedException If closing failed.
      */
-    protected void onClose() throws GridException {
+    protected void onClose() throws IgniteCheckedException {
         // No-op.
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/main/java/org/gridgain/grid/util/GridEmptyCloseableIterator.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/util/GridEmptyCloseableIterator.java b/modules/core/src/main/java/org/gridgain/grid/util/GridEmptyCloseableIterator.java
index 793d01c..09ecf94 100644
--- a/modules/core/src/main/java/org/gridgain/grid/util/GridEmptyCloseableIterator.java
+++ b/modules/core/src/main/java/org/gridgain/grid/util/GridEmptyCloseableIterator.java
@@ -9,7 +9,7 @@
 
 package org.gridgain.grid.util;
 
-import org.gridgain.grid.*;
+import org.apache.ignite.*;
 import org.gridgain.grid.util.lang.*;
 
 /**
@@ -23,7 +23,7 @@ public class GridEmptyCloseableIterator<T> extends GridEmptyIterator<T> implemen
     private boolean closed;
 
     /** {@inheritDoc} */
-    @Override public void close() throws GridException {
+    @Override public void close() throws IgniteCheckedException {
         closed = true;
     }