http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobCheckpointCleanupSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobCheckpointCleanupSelfTest.java
 
b/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobCheckpointCleanupSelfTest.java
index ac2c46f..bf12b1e 100644
--- 
a/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobCheckpointCleanupSelfTest.java
+++ 
b/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobCheckpointCleanupSelfTest.java
@@ -119,14 +119,14 @@ public class GridJobCheckpointCleanupSelfTest extends 
GridCommonAbstractTest {
     private static class CheckpointCountingTestTask extends 
ComputeTaskAdapter<ClusterNode, Object> {
         /** {@inheritDoc} */
         @Override public Map<? extends ComputeJob, ClusterNode> 
map(List<ClusterNode> subgrid, @Nullable ClusterNode arg)
-            throws IgniteCheckedException {
+            throws IgniteException {
             for (ClusterNode node : subgrid) {
                 if (node.id().equals(arg.id()))
                     return Collections.singletonMap(new ComputeJobAdapter() {
                         @IgniteTaskSessionResource
                         private ComputeTaskSession ses;
 
-                        @Nullable @Override public Object execute() throws 
IgniteCheckedException {
+                        @Nullable @Override public Object execute() throws 
IgniteException {
                             ses.saveCheckpoint("checkpoint-key", 
"checkpoint-value");
 
                             return null;
@@ -141,7 +141,7 @@ public class GridJobCheckpointCleanupSelfTest extends 
GridCommonAbstractTest {
         }
 
         /** {@inheritDoc} */
-        @Override public Object reduce(List<ComputeJobResult> results) throws 
IgniteCheckedException {
+        @Override public Object reduce(List<ComputeJobResult> results) throws 
IgniteException {
             return null;
         }
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobContextSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobContextSelfTest.java
 
b/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobContextSelfTest.java
index 82d4961..7105226 100644
--- 
a/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobContextSelfTest.java
+++ 
b/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobContextSelfTest.java
@@ -47,7 +47,7 @@ public class GridJobContextSelfTest extends 
GridCommonAbstractTest {
     /** */
     @SuppressWarnings("PublicInnerClass")
     public static class JobContextTask extends ComputeTaskSplitAdapter<Object, 
Object> {
-        @Override protected Collection<? extends ComputeJob> split(int 
gridSize, Object arg) throws IgniteCheckedException {
+        @Override protected Collection<? extends ComputeJob> split(int 
gridSize, Object arg) throws IgniteException {
             Collection<ComputeJobAdapter> jobs = new ArrayList<>(gridSize);
 
             for (int i = 0; i < gridSize; i++) {
@@ -89,7 +89,7 @@ public class GridJobContextSelfTest extends 
GridCommonAbstractTest {
         }
 
         /** {@inheritDoc} */
-        @Override public Object reduce(List<ComputeJobResult> results) throws 
IgniteCheckedException {
+        @Override public Object reduce(List<ComputeJobResult> results) throws 
IgniteException {
             for (ComputeJobResult res : results) {
                 ComputeJobContext jobCtx = res.getJobContext();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobMasterLeaveAwareSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobMasterLeaveAwareSelfTest.java
 
b/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobMasterLeaveAwareSelfTest.java
index 6aae0f6..f5db8d6 100644
--- 
a/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobMasterLeaveAwareSelfTest.java
+++ 
b/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobMasterLeaveAwareSelfTest.java
@@ -592,7 +592,7 @@ public class GridJobMasterLeaveAwareSelfTest extends 
GridCommonAbstractTest {
         }
 
         /** {@inheritDoc} */
-        @Override public void onMasterNodeLeft(ComputeTaskSession ses) throws 
IgniteCheckedException {
+        @Override public void onMasterNodeLeft(ComputeTaskSession ses) throws 
IgniteException {
             masterLeaveAware.onMasterLeave(log, this);
         }
     }
@@ -614,7 +614,7 @@ public class GridJobMasterLeaveAwareSelfTest extends 
GridCommonAbstractTest {
         }
 
         /** {@inheritDoc} */
-        @Override public void onMasterNodeLeft(ComputeTaskSession ses) throws 
IgniteCheckedException {
+        @Override public void onMasterNodeLeft(ComputeTaskSession ses) throws 
IgniteException {
             masterLeaveAware.onMasterLeave(log, this);
         }
     }
@@ -638,7 +638,7 @@ public class GridJobMasterLeaveAwareSelfTest extends 
GridCommonAbstractTest {
         }
 
         /** {@inheritDoc} */
-        @Override public void onMasterNodeLeft(ComputeTaskSession ses) throws 
IgniteCheckedException {
+        @Override public void onMasterNodeLeft(ComputeTaskSession ses) throws 
IgniteException {
             masterLeaveAware.onMasterLeave(log, this);
         }
     }
@@ -664,7 +664,7 @@ public class GridJobMasterLeaveAwareSelfTest extends 
GridCommonAbstractTest {
         }
 
         /** {@inheritDoc} */
-        @Override protected Collection<? extends ComputeJob> split(int 
gridSize, String arg) throws IgniteCheckedException {
+        @Override protected Collection<? extends ComputeJob> split(int 
gridSize, String arg) throws IgniteException {
             Collection<ComputeJobAdapter> jobs = new ArrayList<>(jobCnt);
 
             for (int i = 0; i < jobCnt; i++)
@@ -674,7 +674,7 @@ public class GridJobMasterLeaveAwareSelfTest extends 
GridCommonAbstractTest {
         }
 
         /** {@inheritDoc} */
-        @Override public Integer reduce(List<ComputeJobResult> results) throws 
IgniteCheckedException {
+        @Override public Integer reduce(List<ComputeJobResult> results) throws 
IgniteException {
             return null;
         }
     }
@@ -698,14 +698,14 @@ public class GridJobMasterLeaveAwareSelfTest extends 
GridCommonAbstractTest {
         }
 
         /** {@inheritDoc} */
-        @Override public Object execute() throws IgniteCheckedException {
+        @Override public Object execute() throws IgniteException {
             masterLeaveAware.execute(log);
 
             return null;
         }
 
         /** {@inheritDoc} */
-        @Override public void onMasterNodeLeft(ComputeTaskSession ses) throws 
IgniteCheckedException {
+        @Override public void onMasterNodeLeft(ComputeTaskSession ses) throws 
IgniteException {
             masterLeaveAware.onMasterLeave(log, this);
         }
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobStealingSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobStealingSelfTest.java
 
b/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobStealingSelfTest.java
index 60b3458..b68536c 100644
--- 
a/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobStealingSelfTest.java
+++ 
b/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobStealingSelfTest.java
@@ -315,7 +315,7 @@ public class GridJobStealingSelfTest extends 
GridCommonAbstractTest {
         /** {@inheritDoc} */
         @SuppressWarnings("ForLoopReplaceableByForEach")
         @Override public Map<? extends ComputeJob, ClusterNode> 
map(List<ClusterNode> subgrid,
-            @Nullable Object arg) throws IgniteCheckedException {
+            @Nullable Object arg) throws IgniteException {
             //assert subgrid.size() == 2 : "Invalid subgrid size: " + 
subgrid.size();
 
             Map<ComputeJobAdapter, ClusterNode> map = new 
HashMap<>(subgrid.size());
@@ -335,7 +335,7 @@ public class GridJobStealingSelfTest extends 
GridCommonAbstractTest {
 
         /** {@inheritDoc} */
         @SuppressWarnings("SuspiciousMethodCalls")
-        @Override public Object reduce(List<ComputeJobResult> results) throws 
IgniteCheckedException {
+        @Override public Object reduce(List<ComputeJobResult> results) throws 
IgniteException {
             for (ComputeJobResult res : results) {
                 log.info("Job result: " + res.getData());
             }
@@ -365,7 +365,7 @@ public class GridJobStealingSelfTest extends 
GridCommonAbstractTest {
         /** {@inheritDoc} */
         @SuppressWarnings("ForLoopReplaceableByForEach")
         @Override public Map<? extends ComputeJob, ClusterNode> 
map(List<ClusterNode> subgrid,
-            @Nullable Object arg) throws IgniteCheckedException {
+            @Nullable Object arg) throws IgniteException {
             assert subgrid.size() > 1 : "Invalid subgrid size: " + 
subgrid.size();
 
             Map<ComputeJobAdapter, ClusterNode> map = new 
HashMap<>(subgrid.size());
@@ -398,7 +398,7 @@ public class GridJobStealingSelfTest extends 
GridCommonAbstractTest {
         }
 
         /** {@inheritDoc} */
-        @Override public Serializable execute() throws IgniteCheckedException {
+        @Override public Serializable execute() throws IgniteException {
             log.info("Started job on node: " + 
ignite.cluster().localNode().id());
 
             if (!jobDistrMap.containsKey(ignite.cluster().localNode().id())) {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobStealingZeroActiveJobsSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobStealingZeroActiveJobsSelfTest.java
 
b/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobStealingZeroActiveJobsSelfTest.java
index 8641fc9..d04fffc 100644
--- 
a/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobStealingZeroActiveJobsSelfTest.java
+++ 
b/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobStealingZeroActiveJobsSelfTest.java
@@ -95,7 +95,7 @@ public class GridJobStealingZeroActiveJobsSelfTest extends 
GridCommonAbstractTes
         private IgniteLogger log;
 
         /** {@inheritDoc} */
-        @Override public Map<? extends ComputeJob, ClusterNode> 
map(List<ClusterNode> subgrid, @Nullable Object arg) throws 
IgniteCheckedException {
+        @Override public Map<? extends ComputeJob, ClusterNode> 
map(List<ClusterNode> subgrid, @Nullable Object arg) throws IgniteException {
             assert subgrid.size() == 2 : "Invalid subgrid size: " + 
subgrid.size();
 
             Map<ComputeJobAdapter, ClusterNode> map = new 
HashMap<>(subgrid.size());
@@ -108,7 +108,7 @@ public class GridJobStealingZeroActiveJobsSelfTest extends 
GridCommonAbstractTes
         }
 
         /** {@inheritDoc} */
-        @Override public Object reduce(List<ComputeJobResult> results) throws 
IgniteCheckedException {
+        @Override public Object reduce(List<ComputeJobResult> results) throws 
IgniteException {
             assert results.size() == 2;
 
             for (ComputeJobResult res : results) {
@@ -144,7 +144,7 @@ public class GridJobStealingZeroActiveJobsSelfTest extends 
GridCommonAbstractTes
         }
 
         /** {@inheritDoc} */
-        @Override public Serializable execute() throws IgniteCheckedException {
+        @Override public Serializable execute() throws IgniteException {
             try {
                 Long sleep = argument(0);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobSubjectIdSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobSubjectIdSelfTest.java
 
b/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobSubjectIdSelfTest.java
index 7d3bc4e..e08ab28 100644
--- 
a/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobSubjectIdSelfTest.java
+++ 
b/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobSubjectIdSelfTest.java
@@ -102,7 +102,7 @@ public class GridJobSubjectIdSelfTest extends 
GridCommonAbstractTest {
 
         /** {@inheritDoc} */
         @Nullable @Override public Map<? extends ComputeJob, ClusterNode> 
map(List<ClusterNode> subgrid,
-            @Nullable Object arg) throws IgniteCheckedException {
+            @Nullable Object arg) throws IgniteException {
             taskSubjId = ((GridTaskSessionInternal)ses).subjectId();
 
             ClusterNode node = null;
@@ -121,7 +121,7 @@ public class GridJobSubjectIdSelfTest extends 
GridCommonAbstractTest {
         }
 
         /** {@inheritDoc} */
-        @Nullable @Override public Object reduce(List<ComputeJobResult> 
results) throws IgniteCheckedException {
+        @Nullable @Override public Object reduce(List<ComputeJobResult> 
results) throws IgniteException {
             return null;
         }
     }
@@ -136,7 +136,7 @@ public class GridJobSubjectIdSelfTest extends 
GridCommonAbstractTest {
         private ComputeTaskSession ses;
 
         /** {@inheritDoc} */
-        @Nullable @Override public Object execute() throws 
IgniteCheckedException {
+        @Nullable @Override public Object execute() throws IgniteException {
             jobSubjId = ((GridTaskSessionInternal)ses).subjectId();
 
             return null;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/test/java/org/gridgain/grid/kernal/GridLifecycleAwareSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/gridgain/grid/kernal/GridLifecycleAwareSelfTest.java
 
b/modules/core/src/test/java/org/gridgain/grid/kernal/GridLifecycleAwareSelfTest.java
index 372d74c..79a006b 100644
--- 
a/modules/core/src/test/java/org/gridgain/grid/kernal/GridLifecycleAwareSelfTest.java
+++ 
b/modules/core/src/test/java/org/gridgain/grid/kernal/GridLifecycleAwareSelfTest.java
@@ -56,7 +56,7 @@ public class GridLifecycleAwareSelfTest extends 
GridAbstractLifecycleAwareSelfTe
         }
 
         /** {@inheritDoc} */
-        @Override public boolean isValidSegment() throws 
IgniteCheckedException {
+        @Override public boolean isValidSegment() throws IgniteException {
             return true;
         }
     }
@@ -86,7 +86,7 @@ public class GridLifecycleAwareSelfTest extends 
GridAbstractLifecycleAwareSelfTe
         }
 
         /** {@inheritDoc} */
-        @Override public void onLifecycleEvent(LifecycleEventType evt) throws 
IgniteCheckedException {
+        @Override public void onLifecycleEvent(LifecycleEventType evt) throws 
IgniteException {
             // No-op.
         }
     }
@@ -98,12 +98,12 @@ public class GridLifecycleAwareSelfTest extends 
GridAbstractLifecycleAwareSelfTe
         private final TestLifecycleAware lifecycleAware = new 
TestLifecycleAware(null);
 
         /** {@inheritDoc} */
-        @Override public void start() throws IgniteCheckedException {
+        @Override public void start() throws IgniteException {
             lifecycleAware.start();
         }
 
         /** {@inheritDoc} */
-        @Override public void stop() throws IgniteCheckedException {
+        @Override public void stop() throws IgniteException {
             lifecycleAware.stop();
         }
 
@@ -122,12 +122,12 @@ public class GridLifecycleAwareSelfTest extends 
GridAbstractLifecycleAwareSelfTe
         private final TestLifecycleAware lifecycleAware = new 
TestLifecycleAware(null);
 
         /** {@inheritDoc} */
-        @Override public void start() throws IgniteCheckedException {
+        @Override public void start() throws IgniteException {
             lifecycleAware.start();
         }
 
         /** {@inheritDoc} */
-        @Override public void stop() throws IgniteCheckedException {
+        @Override public void stop() throws IgniteException {
             lifecycleAware.stop();
         }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/test/java/org/gridgain/grid/kernal/GridLifecycleBeanSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/gridgain/grid/kernal/GridLifecycleBeanSelfTest.java
 
b/modules/core/src/test/java/org/gridgain/grid/kernal/GridLifecycleBeanSelfTest.java
index 152cde3..889a747 100644
--- 
a/modules/core/src/test/java/org/gridgain/grid/kernal/GridLifecycleBeanSelfTest.java
+++ 
b/modules/core/src/test/java/org/gridgain/grid/kernal/GridLifecycleBeanSelfTest.java
@@ -243,7 +243,7 @@ public class GridLifecycleBeanSelfTest extends 
GridCommonAbstractTest {
         }
 
         /** {@inheritDoc} */
-        @Override public void onLifecycleEvent(LifecycleEventType evt) throws 
IgniteCheckedException {
+        @Override public void onLifecycleEvent(LifecycleEventType evt) throws 
IgniteException {
             callsCntr.get(evt).incrementAndGet();
         }
 
@@ -275,7 +275,7 @@ public class GridLifecycleBeanSelfTest extends 
GridCommonAbstractTest {
         }
 
         /** {@inheritDoc} */
-        @Override public void onLifecycleEvent(LifecycleEventType evt) throws 
IgniteCheckedException {
+        @Override public void onLifecycleEvent(LifecycleEventType evt) throws 
IgniteException {
             if (evt == errType) {
                 if (gridErr)
                     throw new IgniteCheckedException("Expected exception for 
event: " + evt) {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/test/java/org/gridgain/grid/kernal/GridListenActorSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/gridgain/grid/kernal/GridListenActorSelfTest.java
 
b/modules/core/src/test/java/org/gridgain/grid/kernal/GridListenActorSelfTest.java
index e31ade4..53f13b8 100644
--- 
a/modules/core/src/test/java/org/gridgain/grid/kernal/GridListenActorSelfTest.java
+++ 
b/modules/core/src/test/java/org/gridgain/grid/kernal/GridListenActorSelfTest.java
@@ -108,7 +108,7 @@ public class GridListenActorSelfTest extends 
GridCommonAbstractTest {
             final ClusterNode rmt = grid(1).localNode();
 
             grid().message().localListen(null, new 
MessagingListenActor<String>() {
-                @Override protected void receive(UUID nodeId, String rcvMsg) 
throws IgniteCheckedException {
+                @Override protected void receive(UUID nodeId, String rcvMsg) 
throws IgniteException {
                     System.out.println("Local node received message: '" + 
rcvMsg + "'");
 
                     respond(rmt.id(), "RESPONSE");
@@ -152,7 +152,7 @@ public class GridListenActorSelfTest extends 
GridCommonAbstractTest {
 
         grid().message().localListen(null, new MessagingListenActor<String>() {
             @Override
-            protected void receive(UUID nodeId, String rcvMsg) throws 
IgniteCheckedException {
+            protected void receive(UUID nodeId, String rcvMsg) throws 
IgniteException {
                 System.out.println("Received message: '" + rcvMsg + "'");
 
                 if ("PING".equals(rcvMsg)) {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/test/java/org/gridgain/grid/kernal/GridManagementJobSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/gridgain/grid/kernal/GridManagementJobSelfTest.java
 
b/modules/core/src/test/java/org/gridgain/grid/kernal/GridManagementJobSelfTest.java
index c8d2d7b..818661c 100644
--- 
a/modules/core/src/test/java/org/gridgain/grid/kernal/GridManagementJobSelfTest.java
+++ 
b/modules/core/src/test/java/org/gridgain/grid/kernal/GridManagementJobSelfTest.java
@@ -123,7 +123,7 @@ public class GridManagementJobSelfTest extends 
GridCommonAbstractTest {
         protected ComputeTaskSession ses;
 
         /** {@inheritDoc} */
-        @Nullable @Override public Object call() throws IgniteCheckedException 
{
+        @Nullable @Override public Object call() throws IgniteException {
             String threadName = Thread.currentThread().getName();
 
             assertFalse(threadName.startsWith(MGMT_THREAD_PREFIX));
@@ -139,7 +139,7 @@ public class GridManagementJobSelfTest extends 
GridCommonAbstractTest {
     @GridInternal
     private static class TestJobInternal implements Callable<Object>, 
Serializable {
         /** {@inheritDoc} */
-        @Nullable @Override public Object call() throws IgniteCheckedException 
{
+        @Nullable @Override public Object call() throws IgniteException {
             String threadName = Thread.currentThread().getName();
 
             assertTrue(threadName.startsWith(MGMT_THREAD_PREFIX));

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/test/java/org/gridgain/grid/kernal/GridMultipleSpisSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/gridgain/grid/kernal/GridMultipleSpisSelfTest.java
 
b/modules/core/src/test/java/org/gridgain/grid/kernal/GridMultipleSpisSelfTest.java
index c7fde8e..fff71c3 100644
--- 
a/modules/core/src/test/java/org/gridgain/grid/kernal/GridMultipleSpisSelfTest.java
+++ 
b/modules/core/src/test/java/org/gridgain/grid/kernal/GridMultipleSpisSelfTest.java
@@ -168,7 +168,7 @@ public class GridMultipleSpisSelfTest extends 
GridCommonAbstractTest {
 
         /** {@inheritDoc} */
         @Override public ClusterNode getBalancedNode(ComputeTaskSession ses, 
List<ClusterNode> top,
-            ComputeJob job) throws IgniteCheckedException {
+            ComputeJob job) throws IgniteException {
             if (getName().equals(expName))
                 isTaskLoadBalancingCalled = true;
             else
@@ -230,7 +230,7 @@ public class GridMultipleSpisSelfTest extends 
GridCommonAbstractTest {
         private Ignite ignite;
 
         /** {@inheritDoc} */
-        @Override public Map<? extends ComputeJob, ClusterNode> 
map(List<ClusterNode> subgrid, UUID arg) throws IgniteCheckedException {
+        @Override public Map<? extends ComputeJob, ClusterNode> 
map(List<ClusterNode> subgrid, UUID arg) throws IgniteException {
             assert subgrid.size() == 2;
             assert taskSes != null;
             assert ignite != null;
@@ -244,7 +244,7 @@ public class GridMultipleSpisSelfTest extends 
GridCommonAbstractTest {
 
         /** {@inheritDoc} */
         @Override public ComputeJobResultPolicy result(ComputeJobResult res,
-            List<ComputeJobResult> received) throws IgniteCheckedException {
+            List<ComputeJobResult> received) throws IgniteException {
             if (res.getException() != null)
                 return ComputeJobResultPolicy.FAILOVER;
 
@@ -277,7 +277,7 @@ public class GridMultipleSpisSelfTest extends 
GridCommonAbstractTest {
         }
 
         /** {@inheritDoc} */
-        @Override public UUID execute() throws IgniteCheckedException {
+        @Override public UUID execute() throws IgniteException {
             assert locId != null;
             assert jobSes != null;
             assert argument(0) != null;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/test/java/org/gridgain/grid/kernal/GridMultipleVersionsDeploymentSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/gridgain/grid/kernal/GridMultipleVersionsDeploymentSelfTest.java
 
b/modules/core/src/test/java/org/gridgain/grid/kernal/GridMultipleVersionsDeploymentSelfTest.java
index 3753614..879dde3 100644
--- 
a/modules/core/src/test/java/org/gridgain/grid/kernal/GridMultipleVersionsDeploymentSelfTest.java
+++ 
b/modules/core/src/test/java/org/gridgain/grid/kernal/GridMultipleVersionsDeploymentSelfTest.java
@@ -231,7 +231,7 @@ public class GridMultipleVersionsDeploymentSelfTest extends 
GridCommonAbstractTe
         private UUID locNodeId;
 
         /** {@inheritDoc} */
-        @Override public Map<? extends ComputeJob, ClusterNode> 
map(List<ClusterNode> subgrid, Object arg) throws IgniteCheckedException {
+        @Override public Map<? extends ComputeJob, ClusterNode> 
map(List<ClusterNode> subgrid, Object arg) throws IgniteException {
             Map<ComputeJobAdapter, ClusterNode> map = new 
HashMap<>(subgrid.size());
 
             boolean ignoreLocNode = false;
@@ -253,7 +253,7 @@ public class GridMultipleVersionsDeploymentSelfTest extends 
GridCommonAbstractTe
         }
 
         /** {@inheritDoc} */
-        @Override public Integer reduce(List<ComputeJobResult> results) throws 
IgniteCheckedException {
+        @Override public Integer reduce(List<ComputeJobResult> results) throws 
IgniteException {
             return results.get(0).getData();
         }
     }
@@ -269,7 +269,7 @@ public class GridMultipleVersionsDeploymentSelfTest extends 
GridCommonAbstractTe
         private IgniteLogger log;
 
         /** {@inheritDoc} */
-        @Override public Integer execute() throws IgniteCheckedException {
+        @Override public Integer execute() throws IgniteException {
             try {
                 if (log.isInfoEnabled())
                     log.info("GridDeploymentTestJob job started");

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/test/java/org/gridgain/grid/kernal/GridMultithreadedJobStealingSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/gridgain/grid/kernal/GridMultithreadedJobStealingSelfTest.java
 
b/modules/core/src/test/java/org/gridgain/grid/kernal/GridMultithreadedJobStealingSelfTest.java
index 6335dda..ff74770 100644
--- 
a/modules/core/src/test/java/org/gridgain/grid/kernal/GridMultithreadedJobStealingSelfTest.java
+++ 
b/modules/core/src/test/java/org/gridgain/grid/kernal/GridMultithreadedJobStealingSelfTest.java
@@ -152,7 +152,7 @@ public class GridMultithreadedJobStealingSelfTest extends 
GridCommonAbstractTest
         /** {@inheritDoc} */
         @SuppressWarnings("ForLoopReplaceableByForEach")
             @Override public Map<? extends ComputeJob, ClusterNode> 
map(List<ClusterNode> subgrid,
-            @Nullable Object arg) throws IgniteCheckedException {
+            @Nullable Object arg) throws IgniteException {
             assert subgrid.size() == 2 : "Invalid subgrid size: " + 
subgrid.size();
 
             Map<ComputeJobAdapter, ClusterNode> map = new 
HashMap<>(subgrid.size());
@@ -165,7 +165,7 @@ public class GridMultithreadedJobStealingSelfTest extends 
GridCommonAbstractTest
         }
 
         /** {@inheritDoc} */
-        @Override public JobStealingResult reduce(List<ComputeJobResult> 
results) throws IgniteCheckedException {
+        @Override public JobStealingResult reduce(List<ComputeJobResult> 
results) throws IgniteException {
             assert results.size() == 2;
 
             for (ComputeJobResult res : results) {
@@ -201,7 +201,7 @@ public class GridMultithreadedJobStealingSelfTest extends 
GridCommonAbstractTest
         }
 
         /** {@inheritDoc} */
-        @Override public Serializable execute() throws IgniteCheckedException {
+        @Override public Serializable execute() throws IgniteException {
             try {
                 Long sleep = argument(0);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/test/java/org/gridgain/grid/kernal/GridNonHistoryMetricsSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/gridgain/grid/kernal/GridNonHistoryMetricsSelfTest.java
 
b/modules/core/src/test/java/org/gridgain/grid/kernal/GridNonHistoryMetricsSelfTest.java
index 821a7f7..3674fd2 100644
--- 
a/modules/core/src/test/java/org/gridgain/grid/kernal/GridNonHistoryMetricsSelfTest.java
+++ 
b/modules/core/src/test/java/org/gridgain/grid/kernal/GridNonHistoryMetricsSelfTest.java
@@ -110,7 +110,7 @@ public class GridNonHistoryMetricsSelfTest extends 
GridCommonAbstractTest {
         }
 
         /** {@inheritDoc} */
-        @Override public Object reduce(List<ComputeJobResult> results) throws 
IgniteCheckedException {
+        @Override public Object reduce(List<ComputeJobResult> results) throws 
IgniteException {
             return results;
         }
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/test/java/org/gridgain/grid/kernal/GridProjectionAbstractTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/gridgain/grid/kernal/GridProjectionAbstractTest.java
 
b/modules/core/src/test/java/org/gridgain/grid/kernal/GridProjectionAbstractTest.java
index d375fd8..45da985 100644
--- 
a/modules/core/src/test/java/org/gridgain/grid/kernal/GridProjectionAbstractTest.java
+++ 
b/modules/core/src/test/java/org/gridgain/grid/kernal/GridProjectionAbstractTest.java
@@ -723,7 +723,7 @@ public abstract class GridProjectionAbstractTest extends 
GridCommonAbstractTest
     @SuppressWarnings({"PublicInnerClass"})
     public static class TestTask extends ComputeTaskSplitAdapter<String, Void> 
{
         /** {@inheritDoc} */
-        @Override protected Collection<? extends ComputeJob> split(int 
gridSize, String arg) throws IgniteCheckedException {
+        @Override protected Collection<? extends ComputeJob> split(int 
gridSize, String arg) throws IgniteException {
             Collection<ComputeJob> jobs = new HashSet<>();
 
             for (int i = 0; i < gridSize; i++)
@@ -733,7 +733,7 @@ public abstract class GridProjectionAbstractTest extends 
GridCommonAbstractTest
         }
 
         /** {@inheritDoc} */
-        @Nullable @Override public Void reduce(List<ComputeJobResult> results) 
throws IgniteCheckedException {
+        @Nullable @Override public Void reduce(List<ComputeJobResult> results) 
throws IgniteException {
             return null;
         }
     }
@@ -744,7 +744,7 @@ public abstract class GridProjectionAbstractTest extends 
GridCommonAbstractTest
     @SuppressWarnings({"PublicInnerClass"})
     public static class TestJob extends ComputeJobAdapter {
         /** {@inheritDoc} */
-        @Nullable @Override public Object execute() throws 
IgniteCheckedException {
+        @Nullable @Override public Object execute() throws IgniteException {
             return null;
         }
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/test/java/org/gridgain/grid/kernal/GridRuntimeExceptionSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/gridgain/grid/kernal/GridRuntimeExceptionSelfTest.java
 
b/modules/core/src/test/java/org/gridgain/grid/kernal/GridRuntimeExceptionSelfTest.java
index 967ffd3..c114840 100644
--- 
a/modules/core/src/test/java/org/gridgain/grid/kernal/GridRuntimeExceptionSelfTest.java
+++ 
b/modules/core/src/test/java/org/gridgain/grid/kernal/GridRuntimeExceptionSelfTest.java
@@ -217,7 +217,7 @@ public class GridRuntimeExceptionSelfTest extends 
GridCommonAbstractTest {
         /** {@inheritDoc} */
         @SuppressWarnings({"ProhibitedExceptionThrown"})
         @Override public Map<? extends ComputeJob, ClusterNode> 
map(List<ClusterNode> subgrid, Serializable arg)
-            throws IgniteCheckedException {
+            throws IgniteException {
             if (log.isInfoEnabled())
                 log.info("Mapping job [job=" + this + ", grid=" + subgrid + ", 
arg=" + arg + ']');
 
@@ -239,7 +239,7 @@ public class GridRuntimeExceptionSelfTest extends 
GridCommonAbstractTest {
 
         /** {@inheritDoc} */
         @SuppressWarnings({"ProhibitedExceptionThrown"})
-        @Override public ComputeJobResultPolicy result(ComputeJobResult res, 
List<ComputeJobResult> received) throws IgniteCheckedException {
+        @Override public ComputeJobResultPolicy result(ComputeJobResult res, 
List<ComputeJobResult> received) throws IgniteException {
             if (failType == FailType.RESULT)
                 throw new RuntimeException("Failing out of result method.");
 
@@ -251,7 +251,7 @@ public class GridRuntimeExceptionSelfTest extends 
GridCommonAbstractTest {
 
         /** {@inheritDoc} */
         @SuppressWarnings({"ProhibitedExceptionThrown"})
-        @Override public Serializable reduce(List<ComputeJobResult> results) 
throws IgniteCheckedException {
+        @Override public Serializable reduce(List<ComputeJobResult> results) 
throws IgniteException {
             assert results != null;
 
             if (failType == FailType.REDUCE)

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/test/java/org/gridgain/grid/kernal/GridStopWithCancelSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/gridgain/grid/kernal/GridStopWithCancelSelfTest.java
 
b/modules/core/src/test/java/org/gridgain/grid/kernal/GridStopWithCancelSelfTest.java
index 89f6ee2..bbe995e 100644
--- 
a/modules/core/src/test/java/org/gridgain/grid/kernal/GridStopWithCancelSelfTest.java
+++ 
b/modules/core/src/test/java/org/gridgain/grid/kernal/GridStopWithCancelSelfTest.java
@@ -77,7 +77,7 @@ public class GridStopWithCancelSelfTest extends 
GridCommonAbstractTest {
 
         /** {@inheritDoc} */
         @Override public Map<? extends ComputeJob, ClusterNode> 
map(List<ClusterNode> subgrid,
-            @Nullable String arg) throws IgniteCheckedException {
+            @Nullable String arg) throws IgniteException {
             for (ClusterNode node : subgrid) {
                 if (node.id().equals(locId)) {
                     return Collections.singletonMap(new ComputeJobAdapter() {
@@ -88,7 +88,7 @@ public class GridStopWithCancelSelfTest extends 
GridCommonAbstractTest {
                             cancelCorrect = true;
                         }
 
-                        @Override public Serializable execute() throws 
IgniteCheckedException {
+                        @Override public Serializable execute() throws 
IgniteException {
                             cnt.countDown();
 
                             try {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/test/java/org/gridgain/grid/kernal/GridStopWithWaitSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/gridgain/grid/kernal/GridStopWithWaitSelfTest.java
 
b/modules/core/src/test/java/org/gridgain/grid/kernal/GridStopWithWaitSelfTest.java
index c7b0f2a..4ba0c82 100644
--- 
a/modules/core/src/test/java/org/gridgain/grid/kernal/GridStopWithWaitSelfTest.java
+++ 
b/modules/core/src/test/java/org/gridgain/grid/kernal/GridStopWithWaitSelfTest.java
@@ -125,7 +125,7 @@ public class GridStopWithWaitSelfTest extends 
GridCommonAbstractTest {
     @ComputeTaskSessionFullSupport
     private static class GridWaitTask extends ComputeTaskAdapter<UUID, 
Integer> {
         /** {@inheritDoc} */
-        @Override public Map<? extends ComputeJob, ClusterNode> 
map(List<ClusterNode> subgrid, UUID arg) throws IgniteCheckedException {
+        @Override public Map<? extends ComputeJob, ClusterNode> 
map(List<ClusterNode> subgrid, UUID arg) throws IgniteException {
             ClusterNode mappedNode = null;
 
             for (ClusterNode node : subgrid) {
@@ -148,7 +148,7 @@ public class GridStopWithWaitSelfTest extends 
GridCommonAbstractTest {
         }
 
         /** {@inheritDoc} */
-        @Override public Integer reduce(List<ComputeJobResult> results) throws 
IgniteCheckedException {
+        @Override public Integer reduce(List<ComputeJobResult> results) throws 
IgniteException {
             return results.get(0).getData();
         }
     }
@@ -167,7 +167,7 @@ public class GridStopWithWaitSelfTest extends 
GridCommonAbstractTest {
         private UUID locId;
 
         /** {@inheritDoc} */
-        @Override public Map<? extends ComputeJob, ClusterNode> 
map(List<ClusterNode> subgrid, String arg) throws IgniteCheckedException {
+        @Override public Map<? extends ComputeJob, ClusterNode> 
map(List<ClusterNode> subgrid, String arg) throws IgniteException {
             ses.setAttribute("fail", true);
 
             ClusterNode node = F.view(subgrid, 
F.<ClusterNode>remoteNodes(locId)).iterator().next();
@@ -183,7 +183,7 @@ public class GridStopWithWaitSelfTest extends 
GridCommonAbstractTest {
                 @IgniteLoggerResource
                 private IgniteLogger log;
 
-                @Override public Serializable execute() throws 
IgniteCheckedException {
+                @Override public Serializable execute() throws IgniteException 
{
                     jobStarted.countDown();
 
                     log.info("Starting to execute job with fail attribute: " + 
ses.getAttribute("fail"));
@@ -223,7 +223,7 @@ public class GridStopWithWaitSelfTest extends 
GridCommonAbstractTest {
         }
 
         /** {@inheritDoc} */
-        @Override public ComputeJobResultPolicy result(ComputeJobResult res, 
List<ComputeJobResult> rcvd) throws IgniteCheckedException {
+        @Override public ComputeJobResultPolicy result(ComputeJobResult res, 
List<ComputeJobResult> rcvd) throws IgniteException {
             if (res.getException() != null && !(res.getException() instanceof 
ComputeUserUndeclaredException)) {
                 assert res.getNode().id().equals(nodeRef.get().id());
 
@@ -236,7 +236,7 @@ public class GridStopWithWaitSelfTest extends 
GridCommonAbstractTest {
         }
 
         /** {@inheritDoc} */
-        @Override public Object reduce(List<ComputeJobResult> res) throws 
IgniteCheckedException {
+        @Override public Object reduce(List<ComputeJobResult> res) throws 
IgniteException {
             assert res.size() == 1;
 
             assert nodeRef.get() != null;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskCancelSingleNodeSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskCancelSingleNodeSelfTest.java
 
b/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskCancelSingleNodeSelfTest.java
index 604dd62..449b331 100644
--- 
a/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskCancelSingleNodeSelfTest.java
+++ 
b/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskCancelSingleNodeSelfTest.java
@@ -171,7 +171,7 @@ public class GridTaskCancelSingleNodeSelfTest extends 
GridCommonAbstractTest {
         }
 
         /** {@inheritDoc} */
-        @Nullable @Override public Void reduce(List<ComputeJobResult> results) 
throws IgniteCheckedException {
+        @Nullable @Override public Void reduce(List<ComputeJobResult> results) 
throws IgniteException {
             return null;
         }
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskContinuousMapperSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskContinuousMapperSelfTest.java
 
b/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskContinuousMapperSelfTest.java
index 526e74d..5c6c7dd 100644
--- 
a/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskContinuousMapperSelfTest.java
+++ 
b/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskContinuousMapperSelfTest.java
@@ -80,7 +80,7 @@ public class GridTaskContinuousMapperSelfTest extends 
GridCommonAbstractTest {
         private int cnt;
 
         /** {@inheritDoc} */
-        @Override public Map<? extends ComputeJob, ClusterNode> 
map(List<ClusterNode> subgrid, Object arg) throws IgniteCheckedException {
+        @Override public Map<? extends ComputeJob, ClusterNode> 
map(List<ClusterNode> subgrid, Object arg) throws IgniteException {
             assert subgrid.size() == 2;
 
             mapper.send(new TestJob(cnt++), subgrid.get(0));
@@ -107,7 +107,7 @@ public class GridTaskContinuousMapperSelfTest extends 
GridCommonAbstractTest {
         }
 
         /** {@inheritDoc} */
-        @Override public Object reduce(List<ComputeJobResult> results) throws 
IgniteCheckedException {
+        @Override public Object reduce(List<ComputeJobResult> results) throws 
IgniteException {
             assert results.size() == cnt : "Unexpected result count: " + 
results.size();
 
             return null;
@@ -137,14 +137,14 @@ public class GridTaskContinuousMapperSelfTest extends 
GridCommonAbstractTest {
         }
 
         /** {@inheritDoc} */
-        @Override public Map<? extends ComputeJob, ClusterNode> 
map(List<ClusterNode> subgrid, Object arg) throws IgniteCheckedException {
+        @Override public Map<? extends ComputeJob, ClusterNode> 
map(List<ClusterNode> subgrid, Object arg) throws IgniteException {
             mapper.send(new TestJob());
 
             return null;
         }
 
         /** {@inheritDoc} */
-        @Override public ComputeJobResultPolicy result(ComputeJobResult res, 
List<ComputeJobResult> received) throws IgniteCheckedException {
+        @Override public ComputeJobResultPolicy result(ComputeJobResult res, 
List<ComputeJobResult> received) throws IgniteException {
             ComputeJobResultPolicy plc = super.result(res, received);
 
             if (received != null && received.size() == 2)
@@ -154,7 +154,7 @@ public class GridTaskContinuousMapperSelfTest extends 
GridCommonAbstractTest {
         }
 
         /** {@inheritDoc} */
-        @Override public Object reduce(List<ComputeJobResult> results) throws 
IgniteCheckedException {
+        @Override public Object reduce(List<ComputeJobResult> results) throws 
IgniteException {
             assert results.size() == 3 : "Unexpected result count: " + 
results.size();
 
             ClusterNode node = results.get(0).getNode();
@@ -216,7 +216,7 @@ public class GridTaskContinuousMapperSelfTest extends 
GridCommonAbstractTest {
         private IgniteLogger log;
 
         /** {@inheritDoc} */
-        @Override public Map<? extends ComputeJob, ClusterNode> 
map(List<ClusterNode> subgrid, Object arg) throws IgniteCheckedException {
+        @Override public Map<? extends ComputeJob, ClusterNode> 
map(List<ClusterNode> subgrid, Object arg) throws IgniteException {
             try {
                 mapper.send(new TestJob(), null);
 
@@ -294,7 +294,7 @@ public class GridTaskContinuousMapperSelfTest extends 
GridCommonAbstractTest {
         }
 
         /** {@inheritDoc} */
-        @Override public Object reduce(List<ComputeJobResult> results) throws 
IgniteCheckedException {
+        @Override public Object reduce(List<ComputeJobResult> results) throws 
IgniteException {
             assert results.size() == 1;
 
             return null;
@@ -317,7 +317,7 @@ public class GridTaskContinuousMapperSelfTest extends 
GridCommonAbstractTest {
         }
 
         /** {@inheritDoc} */
-        @Override public Serializable execute() throws IgniteCheckedException {
+        @Override public Serializable execute() throws IgniteException {
             return argument(0);
         }
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskExecutionContextSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskExecutionContextSelfTest.java
 
b/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskExecutionContextSelfTest.java
index 9df7cf0..c23a948 100644
--- 
a/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskExecutionContextSelfTest.java
+++ 
b/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskExecutionContextSelfTest.java
@@ -147,12 +147,12 @@ public class GridTaskExecutionContextSelfTest extends 
GridCommonAbstractTest {
         }
 
         /** {@inheritDoc} */
-        @Override protected Collection<? extends ComputeJob> split(int 
gridSize, Void arg) throws IgniteCheckedException {
+        @Override protected Collection<? extends ComputeJob> split(int 
gridSize, Void arg) throws IgniteException {
             return F.asSet(new ComputeJobAdapter() {
                 @IgniteTaskSessionResource
                 private ComputeTaskSession ses;
 
-                @Override public Object execute() throws 
IgniteCheckedException {
+                @Override public Object execute() throws IgniteException {
                     CNT.incrementAndGet();
 
                     if (fail)
@@ -164,7 +164,7 @@ public class GridTaskExecutionContextSelfTest extends 
GridCommonAbstractTest {
         }
 
         /** {@inheritDoc} */
-        @Override public String reduce(List<ComputeJobResult> results) throws 
IgniteCheckedException {
+        @Override public String reduce(List<ComputeJobResult> results) throws 
IgniteException {
             return F.first(results).getData();
         }
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskFailoverSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskFailoverSelfTest.java
 
b/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskFailoverSelfTest.java
index 247c249..81ef776 100644
--- 
a/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskFailoverSelfTest.java
+++ 
b/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskFailoverSelfTest.java
@@ -86,7 +86,7 @@ public class GridTaskFailoverSelfTest extends 
GridCommonAbstractTest {
 
         /** {@inheritDoc} */
         @Override public ComputeJobResultPolicy result(ComputeJobResult res, 
List<ComputeJobResult> received) throws
-            IgniteCheckedException {
+            IgniteException {
             if (res.getException() != null)
                 throw res.getException();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskFutureImplStopGridSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskFutureImplStopGridSelfTest.java
 
b/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskFutureImplStopGridSelfTest.java
index 955d696..e70e1e3 100644
--- 
a/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskFutureImplStopGridSelfTest.java
+++ 
b/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskFutureImplStopGridSelfTest.java
@@ -142,7 +142,7 @@ public class GridTaskFutureImplStopGridSelfTest extends 
GridCommonAbstractTest {
         private IgniteLogger log;
 
         /** {@inheritDoc} */
-        @Override public Collection<? extends ComputeJob> split(int gridSize, 
Object arg) throws IgniteCheckedException {
+        @Override public Collection<? extends ComputeJob> split(int gridSize, 
Object arg) throws IgniteException {
             if (log.isInfoEnabled())
                 log.info("Splitting job [job=" + this + ", gridSize=" + 
gridSize + ", arg=" + arg + ']');
 
@@ -155,7 +155,7 @@ public class GridTaskFutureImplStopGridSelfTest extends 
GridCommonAbstractTest {
         }
 
         /** {@inheritDoc} */
-        @Override public Serializable reduce(List<ComputeJobResult> results) 
throws IgniteCheckedException {
+        @Override public Serializable reduce(List<ComputeJobResult> results) 
throws IgniteException {
             if (log.isInfoEnabled())
                 log.info("Aggregating job [job=" + this + ", results=" + 
results + ']');
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskInstanceExecutionSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskInstanceExecutionSelfTest.java
 
b/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskInstanceExecutionSelfTest.java
index cd63264..f8a3d23 100644
--- 
a/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskInstanceExecutionSelfTest.java
+++ 
b/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskInstanceExecutionSelfTest.java
@@ -92,7 +92,7 @@ public class GridTaskInstanceExecutionSelfTest extends 
GridCommonAbstractTest {
         }
 
         /** {@inheritDoc} */
-        @Override public ComputeJobResultPolicy result(ComputeJobResult res, 
List<ComputeJobResult> received) throws IgniteCheckedException {
+        @Override public ComputeJobResultPolicy result(ComputeJobResult res, 
List<ComputeJobResult> received) throws IgniteException {
             log.info("Task result state: " + state);
 
             assert state != null;
@@ -102,7 +102,7 @@ public class GridTaskInstanceExecutionSelfTest extends 
GridCommonAbstractTest {
         }
 
         /** {@inheritDoc} */
-        @Override public Object reduce(List<ComputeJobResult> results) throws 
IgniteCheckedException {
+        @Override public Object reduce(List<ComputeJobResult> results) throws 
IgniteException {
             log.info("Task reduce state: " + state);
 
             assert state != null;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskInstantiationSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskInstantiationSelfTest.java
 
b/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskInstantiationSelfTest.java
index 2ce5c70..df76582 100644
--- 
a/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskInstantiationSelfTest.java
+++ 
b/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskInstantiationSelfTest.java
@@ -60,7 +60,7 @@ public class GridTaskInstantiationSelfTest extends 
GridCommonAbstractTest {
 
         /** {@inheritDoc} */
         @Override public Map<? extends ComputeJob, ClusterNode> 
map(List<ClusterNode> subgrid,
-            @Nullable String arg) throws IgniteCheckedException {
+            @Nullable String arg) throws IgniteException {
             for (ClusterNode node : subgrid)
                 if (node.id().equals(locId))
                     return Collections.singletonMap(new ComputeJobAdapter() {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskJobRejectSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskJobRejectSelfTest.java
 
b/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskJobRejectSelfTest.java
index 5e3edcf..bf74d4c 100644
--- 
a/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskJobRejectSelfTest.java
+++ 
b/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskJobRejectSelfTest.java
@@ -118,7 +118,7 @@ public class GridTaskJobRejectSelfTest extends 
GridCommonAbstractTest {
             }
 
             /** {@inheritDoc} */
-            @Nullable @Override public Void reduce(List<ComputeJobResult> 
results) throws IgniteCheckedException {
+            @Nullable @Override public Void reduce(List<ComputeJobResult> 
results) throws IgniteException {
                 return null;
             }
         }, null);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskListenerSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskListenerSelfTest.java
 
b/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskListenerSelfTest.java
index 680cfd5..075219d 100644
--- 
a/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskListenerSelfTest.java
+++ 
b/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskListenerSelfTest.java
@@ -77,7 +77,7 @@ public class GridTaskListenerSelfTest extends 
GridCommonAbstractTest {
     /** Test task. */
     private static class TestTask extends 
ComputeTaskSplitAdapter<Serializable, Object> {
         /** {@inheritDoc} */
-        @Override protected Collection<? extends ComputeJob> split(int 
gridSize, Serializable arg) throws IgniteCheckedException {
+        @Override protected Collection<? extends ComputeJob> split(int 
gridSize, Serializable arg) throws IgniteException {
             Collection<ComputeJobAdapter> jobs = new ArrayList<>();
 
             for (int i = 0; i < 5; i++) {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskMapAsyncSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskMapAsyncSelfTest.java
 
b/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskMapAsyncSelfTest.java
index 101e041..42b095a 100644
--- 
a/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskMapAsyncSelfTest.java
+++ 
b/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskMapAsyncSelfTest.java
@@ -69,7 +69,7 @@ public class GridTaskMapAsyncSelfTest extends 
GridCommonAbstractTest {
     @ComputeTaskMapAsync
     private static class AsyncMappedTask extends BaseTask {
         /** {@inheritDoc} */
-        @Override protected Collection<? extends ComputeJob> split(int 
gridSize, Object arg) throws IgniteCheckedException {
+        @Override protected Collection<? extends ComputeJob> split(int 
gridSize, Object arg) throws IgniteException {
             Collection<? extends ComputeJob> res = super.split(gridSize, arg);
 
             assert mainThread != mapper;
@@ -83,7 +83,7 @@ public class GridTaskMapAsyncSelfTest extends 
GridCommonAbstractTest {
      */
     private static class SyncMappedTask extends BaseTask {
         /** {@inheritDoc} */
-        @Override protected Collection<? extends ComputeJob> split(int 
gridSize, Object arg) throws IgniteCheckedException {
+        @Override protected Collection<? extends ComputeJob> split(int 
gridSize, Object arg) throws IgniteException {
             Collection<? extends ComputeJob> res = super.split(gridSize, arg);
 
             assert mainThread == mapper;
@@ -110,7 +110,7 @@ public class GridTaskMapAsyncSelfTest extends 
GridCommonAbstractTest {
         protected IgniteLogger log;
 
         /** {@inheritDoc} */
-        @Override protected Collection<? extends ComputeJob> split(int 
gridSize, Object arg) throws IgniteCheckedException {
+        @Override protected Collection<? extends ComputeJob> split(int 
gridSize, Object arg) throws IgniteException {
             mapper = Thread.currentThread();
 
             return Collections.singleton(new ComputeJobAdapter() {
@@ -127,7 +127,7 @@ public class GridTaskMapAsyncSelfTest extends 
GridCommonAbstractTest {
         }
 
         /** {@inheritDoc} */
-        @Nullable @Override public Void reduce(List<ComputeJobResult> results) 
throws IgniteCheckedException {
+        @Nullable @Override public Void reduce(List<ComputeJobResult> results) 
throws IgniteException {
             return null;
         }
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskNameAnnotationSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskNameAnnotationSelfTest.java
 
b/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskNameAnnotationSelfTest.java
index 561b6a8..50375b7 100644
--- 
a/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskNameAnnotationSelfTest.java
+++ 
b/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskNameAnnotationSelfTest.java
@@ -75,7 +75,7 @@ public class GridTaskNameAnnotationSelfTest extends 
GridCommonAbstractTest {
     private static class TestTask implements ComputeTask<Void, String> {
         /** {@inheritDoc} */
         @Override public Map<? extends ComputeJob, ClusterNode> 
map(List<ClusterNode> subgrid,
-            @Nullable Void arg) throws IgniteCheckedException {
+            @Nullable Void arg) throws IgniteException {
             return F.asMap(new ComputeJobAdapter() {
                 @IgniteTaskSessionResource
                 private ComputeTaskSession ses;
@@ -88,12 +88,12 @@ public class GridTaskNameAnnotationSelfTest extends 
GridCommonAbstractTest {
 
         /** {@inheritDoc} */
         @Override public ComputeJobResultPolicy result(ComputeJobResult res, 
List<ComputeJobResult> rcvd)
-            throws IgniteCheckedException {
+            throws IgniteException {
             return WAIT;
         }
 
         /** {@inheritDoc} */
-        @Override public String reduce(List<ComputeJobResult> results) throws 
IgniteCheckedException {
+        @Override public String reduce(List<ComputeJobResult> results) throws 
IgniteException {
             return F.first(results).getData();
         }
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskResultCacheSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskResultCacheSelfTest.java
 
b/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskResultCacheSelfTest.java
index ea63b8b..9e5697c 100644
--- 
a/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskResultCacheSelfTest.java
+++ 
b/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskResultCacheSelfTest.java
@@ -54,7 +54,7 @@ public class GridTaskResultCacheSelfTest extends 
GridCommonAbstractTest {
     @ComputeTaskNoResultCache
     private static class GridResultNoCacheTestTask extends 
GridAbstractCacheTestTask {
         /** {@inheritDoc} */
-        @Override public ComputeJobResultPolicy result(ComputeJobResult res, 
List<ComputeJobResult> rcvd) throws IgniteCheckedException {
+        @Override public ComputeJobResultPolicy result(ComputeJobResult res, 
List<ComputeJobResult> rcvd) throws IgniteException {
             assert res.getData() != null;
             assert rcvd.isEmpty();
 
@@ -62,7 +62,7 @@ public class GridTaskResultCacheSelfTest extends 
GridCommonAbstractTest {
         }
 
         /** {@inheritDoc} */
-        @Override public Object reduce(List<ComputeJobResult> results) throws 
IgniteCheckedException {
+        @Override public Object reduce(List<ComputeJobResult> results) throws 
IgniteException {
             assert results.isEmpty();
 
             return null;
@@ -75,7 +75,7 @@ public class GridTaskResultCacheSelfTest extends 
GridCommonAbstractTest {
     private static class GridResultCacheTestTask extends 
GridAbstractCacheTestTask {
         /** {@inheritDoc} */
         @Override public ComputeJobResultPolicy result(ComputeJobResult res, 
List<ComputeJobResult> rcvd)
-            throws IgniteCheckedException {
+            throws IgniteException {
             assert res.getData() != null;
             assert rcvd.contains(res);
 
@@ -86,7 +86,7 @@ public class GridTaskResultCacheSelfTest extends 
GridCommonAbstractTest {
         }
 
         /** {@inheritDoc} */
-        @Override public Object reduce(List<ComputeJobResult> results) throws 
IgniteCheckedException {
+        @Override public Object reduce(List<ComputeJobResult> results) throws 
IgniteException {
             for (ComputeJobResult res : results) {
                 if (res.getException() != null)
                     throw res.getException();
@@ -103,7 +103,7 @@ public class GridTaskResultCacheSelfTest extends 
GridCommonAbstractTest {
      */
     private abstract static class GridAbstractCacheTestTask extends 
ComputeTaskSplitAdapter<String, Object> {
         /** {@inheritDoc} */
-        @Override protected Collection<? extends ComputeJob> split(int 
gridSize, String arg) throws IgniteCheckedException {
+        @Override protected Collection<? extends ComputeJob> split(int 
gridSize, String arg) throws IgniteException {
             String[] words = arg.split(" ");
 
             Collection<ComputeJobAdapter> jobs = new ArrayList<>(words.length);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskTimeoutSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskTimeoutSelfTest.java
 
b/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskTimeoutSelfTest.java
index 67c4d32..1af2e41 100644
--- 
a/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskTimeoutSelfTest.java
+++ 
b/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskTimeoutSelfTest.java
@@ -172,7 +172,7 @@ public class GridTaskTimeoutSelfTest extends 
GridCommonAbstractTest {
      */
     private static class GridTaskTimeoutTestTask extends 
ComputeTaskSplitAdapter<Serializable, Object> {
         /** {@inheritDoc} */
-        @Override protected Collection<? extends ComputeJob> split(int 
gridSize, Serializable arg) throws IgniteCheckedException {
+        @Override protected Collection<? extends ComputeJob> split(int 
gridSize, Serializable arg) throws IgniteException {
             Collection<GridTaskTimeoutTestJob> jobs = new 
ArrayList<>(SPLIT_COUNT);
 
             for (int i = 0; i < SPLIT_COUNT; i++) {
@@ -187,7 +187,7 @@ public class GridTaskTimeoutSelfTest extends 
GridCommonAbstractTest {
         }
 
         /** {@inheritDoc} */
-        @Override public Object reduce(List<ComputeJobResult> results) throws 
IgniteCheckedException {
+        @Override public Object reduce(List<ComputeJobResult> results) throws 
IgniteException {
             return null;
         }
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/test/java/org/gridgain/grid/kernal/managers/checkpoint/GridCheckpointManagerAbstractSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/gridgain/grid/kernal/managers/checkpoint/GridCheckpointManagerAbstractSelfTest.java
 
b/modules/core/src/test/java/org/gridgain/grid/kernal/managers/checkpoint/GridCheckpointManagerAbstractSelfTest.java
index ace207c..566a201 100644
--- 
a/modules/core/src/test/java/org/gridgain/grid/kernal/managers/checkpoint/GridCheckpointManagerAbstractSelfTest.java
+++ 
b/modules/core/src/test/java/org/gridgain/grid/kernal/managers/checkpoint/GridCheckpointManagerAbstractSelfTest.java
@@ -295,7 +295,7 @@ public abstract class GridCheckpointManagerAbstractSelfTest 
extends GridCommonAb
 
         /** {@inheritDoc} */
         @SuppressWarnings({"TooBroadScope"})
-        @Override public String execute() throws IgniteCheckedException {
+        @Override public String execute() throws IgniteException {
             assert ignite != null;
             assert taskSes != null;
 
@@ -388,12 +388,12 @@ public abstract class 
GridCheckpointManagerAbstractSelfTest extends GridCommonAb
     @ComputeTaskSessionFullSupport
     private static class GridTestCheckpointTask extends 
ComputeTaskSplitAdapter<Object, Object> {
         /** {@inheritDoc} */
-        @Override protected Collection<? extends ComputeJob> split(int 
gridSize, Object arg) throws IgniteCheckedException {
+        @Override protected Collection<? extends ComputeJob> split(int 
gridSize, Object arg) throws IgniteException {
             return Collections.singleton(new GridTestCheckpointJob());
         }
 
         /** {@inheritDoc} */
-        @Override public Serializable reduce(List<ComputeJobResult> results) 
throws IgniteCheckedException {
+        @Override public Serializable reduce(List<ComputeJobResult> results) 
throws IgniteException {
             return null;
         }
     }
@@ -411,7 +411,7 @@ public abstract class GridCheckpointManagerAbstractSelfTest 
extends GridCommonAb
         private ComputeTaskSession taskSes;
 
         /** {@inheritDoc} */
-        @Override public String execute() throws IgniteCheckedException {
+        @Override public String execute() throws IgniteException {
             assert ignite != null;
             assert taskSes != null;
 
@@ -515,7 +515,7 @@ public abstract class GridCheckpointManagerAbstractSelfTest 
extends GridCommonAb
         private ComputeTaskSession taskSes;
 
         /** {@inheritDoc} */
-        @Override public String execute() throws IgniteCheckedException {
+        @Override public String execute() throws IgniteException {
             assert taskSes != null;
 
             assert startLatch != null;
@@ -618,7 +618,7 @@ public abstract class GridCheckpointManagerAbstractSelfTest 
extends GridCommonAb
     @ComputeTaskSessionFullSupport
     private static class GridMultiNodeTestCheckPointTask extends 
ComputeTaskSplitAdapter<Object, Object> {
         /** {@inheritDoc} */
-        @Override protected Collection<? extends ComputeJob> split(int 
gridSize, Object arg) throws IgniteCheckedException {
+        @Override protected Collection<? extends ComputeJob> split(int 
gridSize, Object arg) throws IgniteException {
             assert gridSize == 2;
 
             return Arrays.asList(
@@ -628,7 +628,7 @@ public abstract class GridCheckpointManagerAbstractSelfTest 
extends GridCommonAb
         }
 
         /** {@inheritDoc} */
-        @Override public Object reduce(List<ComputeJobResult> results) throws 
IgniteCheckedException {
+        @Override public Object reduce(List<ComputeJobResult> results) throws 
IgniteException {
             return null;
         }
     }
@@ -641,9 +641,9 @@ public abstract class GridCheckpointManagerAbstractSelfTest 
extends GridCommonAb
         private ComputeTaskSession taskSes;
 
         /** {@inheritDoc} */
-        @Override protected Collection<? extends ComputeJob> split(int 
gridSize, Object arg) throws IgniteCheckedException {
+        @Override protected Collection<? extends ComputeJob> split(int 
gridSize, Object arg) throws IgniteException {
             return Collections.singleton(new ComputeJobAdapter() {
-                @Nullable @Override public Object execute() throws 
IgniteCheckedException {
+                @Nullable @Override public Object execute() throws 
IgniteException {
                     assert taskSes != null;
 
                     assert startLatch != null;
@@ -726,7 +726,7 @@ public abstract class GridCheckpointManagerAbstractSelfTest 
extends GridCommonAb
         }
 
         /** {@inheritDoc} */
-        @Nullable @Override public Integer reduce(List<ComputeJobResult> 
results) throws IgniteCheckedException {
+        @Nullable @Override public Integer reduce(List<ComputeJobResult> 
results) throws IgniteException {
             int sum = 0;
 
             for (ComputeJobResult res : results)

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/test/java/org/gridgain/grid/kernal/managers/checkpoint/GridCheckpointTaskSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/gridgain/grid/kernal/managers/checkpoint/GridCheckpointTaskSelfTest.java
 
b/modules/core/src/test/java/org/gridgain/grid/kernal/managers/checkpoint/GridCheckpointTaskSelfTest.java
index f8f8392..1554f33 100644
--- 
a/modules/core/src/test/java/org/gridgain/grid/kernal/managers/checkpoint/GridCheckpointTaskSelfTest.java
+++ 
b/modules/core/src/test/java/org/gridgain/grid/kernal/managers/checkpoint/GridCheckpointTaskSelfTest.java
@@ -133,7 +133,7 @@ public class GridCheckpointTaskSelfTest extends 
GridCommonAbstractTest {
 
         /** {@inheritDoc} */
         @Override public Map<? extends ComputeJob, ClusterNode> 
map(List<ClusterNode> subgrid,
-            @Nullable Void arg) throws IgniteCheckedException {
+            @Nullable Void arg) throws IgniteException {
             assert ignite.cluster().nodes().size() == 2;
 
             ClusterNode rmt = F.first(ignite.cluster().forRemotes().nodes());
@@ -148,7 +148,7 @@ public class GridCheckpointTaskSelfTest extends 
GridCommonAbstractTest {
                     @IgniteTaskSessionResource
                     private ComputeTaskSession ses;
 
-                    @Override public Object execute() throws 
IgniteCheckedException {
+                    @Override public Object execute() throws IgniteException {
                         X.println("Executing FailoverTestTask job on node " + 
nodeId);
 
                         Boolean cpVal = ses.loadCheckpoint(CP_KEY);
@@ -169,7 +169,7 @@ public class GridCheckpointTaskSelfTest extends 
GridCommonAbstractTest {
         }
 
         /** {@inheritDoc} */
-        @Nullable @Override public Void reduce(List<ComputeJobResult> results) 
throws IgniteCheckedException {
+        @Nullable @Override public Void reduce(List<ComputeJobResult> results) 
throws IgniteException {
             return null;
         }
     }
@@ -189,7 +189,7 @@ public class GridCheckpointTaskSelfTest extends 
GridCommonAbstractTest {
 
         /** {@inheritDoc} */
         @Override public Map<? extends ComputeJob, ClusterNode> 
map(List<ClusterNode> subgrid,
-            @Nullable Void arg) throws IgniteCheckedException {
+            @Nullable Void arg) throws IgniteException {
             assert ignite.cluster().nodes().size() == 2;
 
             ClusterNode rmt = F.first(ignite.cluster().forRemotes().nodes());
@@ -202,7 +202,7 @@ public class GridCheckpointTaskSelfTest extends 
GridCommonAbstractTest {
                     @IgniteTaskSessionResource
                     private ComputeTaskSession ses;
 
-                    @Override public Object execute() throws 
IgniteCheckedException {
+                    @Override public Object execute() throws IgniteException {
                         X.println("Executing ReduceTestTask job on node " + 
nodeId);
 
                         ses.saveCheckpoint(CP_KEY, true);
@@ -215,7 +215,7 @@ public class GridCheckpointTaskSelfTest extends 
GridCommonAbstractTest {
         }
 
         /** {@inheritDoc} */
-        @Override public Void reduce(List<ComputeJobResult> results) throws 
IgniteCheckedException {
+        @Override public Void reduce(List<ComputeJobResult> results) throws 
IgniteException {
             assert ses.loadCheckpoint(CP_KEY) != null;
 
             return null;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/test/java/org/gridgain/grid/kernal/managers/communication/GridCommunicationManagerListenersSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/gridgain/grid/kernal/managers/communication/GridCommunicationManagerListenersSelfTest.java
 
b/modules/core/src/test/java/org/gridgain/grid/kernal/managers/communication/GridCommunicationManagerListenersSelfTest.java
index 360e35b..e8737af 100644
--- 
a/modules/core/src/test/java/org/gridgain/grid/kernal/managers/communication/GridCommunicationManagerListenersSelfTest.java
+++ 
b/modules/core/src/test/java/org/gridgain/grid/kernal/managers/communication/GridCommunicationManagerListenersSelfTest.java
@@ -122,7 +122,7 @@ public class GridCommunicationManagerListenersSelfTest 
extends GridCommonAbstrac
         private AtomicBoolean stop = new AtomicBoolean();
 
         /** {@inheritDoc} */
-        @Override public Collection<? extends ComputeJob> split(int gridSize, 
Object arg) throws IgniteCheckedException {
+        @Override public Collection<? extends ComputeJob> split(int gridSize, 
Object arg) throws IgniteException {
             ignite.message().localListen(null, new P2<UUID, Object>() {
                 @Override public boolean apply(UUID uuid, Object o) {
                     return stop.get();
@@ -137,7 +137,7 @@ public class GridCommunicationManagerListenersSelfTest 
extends GridCommonAbstrac
         }
 
         /** {@inheritDoc} */
-        @Override public Object reduce(List<ComputeJobResult> results) throws 
IgniteCheckedException {
+        @Override public Object reduce(List<ComputeJobResult> results) throws 
IgniteException {
             stop.set(true);
 
             return null;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFullApiSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFullApiSelfTest.java
 
b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFullApiSelfTest.java
index 7ac3801..db3b76d 100644
--- 
a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFullApiSelfTest.java
+++ 
b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFullApiSelfTest.java
@@ -3243,7 +3243,7 @@ public abstract class GridCacheAbstractFullApiSelfTest 
extends GridCacheAbstract
             assert cache().isLockedByThread("key");
 
             assert !forLocal(dfltIgnite).call(new Callable<Boolean>() {
-                @Override public Boolean call() throws IgniteCheckedException {
+                @Override public Boolean call() throws IgniteException {
                     return cache().lock("key", 100);
                 }
             });
@@ -3271,7 +3271,7 @@ public abstract class GridCacheAbstractFullApiSelfTest 
extends GridCacheAbstract
             assert e.isLocked();
 
             assert !forLocal(dfltIgnite).call(new Callable<Boolean>() {
-                @Override public Boolean call() throws IgniteCheckedException {
+                @Override public Boolean call() throws IgniteException {
                     return e.lock(100);
                 }
             });

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAffinityRoutingSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAffinityRoutingSelfTest.java
 
b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAffinityRoutingSelfTest.java
index 6b33771..d49d0fe 100644
--- 
a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAffinityRoutingSelfTest.java
+++ 
b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAffinityRoutingSelfTest.java
@@ -562,7 +562,7 @@ public class GridCacheAffinityRoutingSelfTest extends 
GridCommonAbstractTest {
         }
 
         /** {@inheritDoc} */
-        @Override protected Collection<? extends ComputeJob> split(int 
gridSize, Integer arg) throws IgniteCheckedException {
+        @Override protected Collection<? extends ComputeJob> split(int 
gridSize, Integer arg) throws IgniteException {
             return F.asList(new ComputeJobAdapter() {
                 @Override public Object execute() {
                     GridCacheAffinity<Object> aff = 
ignite.cache(null).affinity();
@@ -578,7 +578,7 @@ public class GridCacheAffinityRoutingSelfTest extends 
GridCommonAbstractTest {
         }
 
         /** {@inheritDoc} */
-        @Override public Boolean reduce(List<ComputeJobResult> results) throws 
IgniteCheckedException {
+        @Override public Boolean reduce(List<ComputeJobResult> results) throws 
IgniteException {
             return results.get(0).getData();
         }
     }
@@ -670,7 +670,7 @@ public class GridCacheAffinityRoutingSelfTest extends 
GridCommonAbstractTest {
         }
 
         /** {@inheritDoc} */
-        @Override public Object call() throws IgniteCheckedException {
+        @Override public Object call() throws IgniteException {
             assert 
ignite.cluster().localNode().id().equals(ignite.cluster().mapKeyToNode(null, 
affKey).id());
             assert 
ignite.cluster().localNode().id().equals(ignite.cluster().mapKeyToNode(null, 
key).id());
             assert jobCtx.affinityKey().equals(affKey);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheConcurrentTxMultiNodeTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheConcurrentTxMultiNodeTest.java
 
b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheConcurrentTxMultiNodeTest.java
index dcbf820..1cd917c 100644
--- 
a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheConcurrentTxMultiNodeTest.java
+++ 
b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheConcurrentTxMultiNodeTest.java
@@ -821,12 +821,12 @@ public class GridCacheConcurrentTxMultiNodeTest extends 
GridCommonAbstractTest {
     @SuppressWarnings( {"UnusedDeclaration"})
     private static class ResponseTask extends ComputeTaskSplitAdapter<Message, 
Void> {
         /** {@inheritDoc} */
-        @Override protected Collection<? extends ComputeJob> split(int arg0, 
Message msg) throws IgniteCheckedException {
+        @Override protected Collection<? extends ComputeJob> split(int arg0, 
Message msg) throws IgniteException {
             return Collections.singletonList(new PerfJob(msg));
         }
 
         /** {@inheritDoc} */
-        @Nullable @Override public Void reduce(List<ComputeJobResult> results) 
throws IgniteCheckedException {
+        @Nullable @Override public Void reduce(List<ComputeJobResult> results) 
throws IgniteException {
             return null;
         }
     }
@@ -836,12 +836,12 @@ public class GridCacheConcurrentTxMultiNodeTest extends 
GridCommonAbstractTest {
      */
     private static class RequestTask extends ComputeTaskSplitAdapter<Message, 
Void> {
         /** {@inheritDoc} */
-        @Override protected Collection<? extends ComputeJob> split(int arg0, 
Message msg) throws IgniteCheckedException {
+        @Override protected Collection<? extends ComputeJob> split(int arg0, 
Message msg) throws IgniteException {
             return Collections.singletonList(new PerfJob(msg));
         }
 
         /** {@inheritDoc} */
-        @Nullable @Override public Void reduce(List<ComputeJobResult> results) 
throws IgniteCheckedException {
+        @Nullable @Override public Void reduce(List<ComputeJobResult> results) 
throws IgniteException {
             return null;
         }
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheGroupLockPutTask.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheGroupLockPutTask.java
 
b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheGroupLockPutTask.java
index 7a9ac04..718205b 100644
--- 
a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheGroupLockPutTask.java
+++ 
b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheGroupLockPutTask.java
@@ -64,7 +64,7 @@ class GridCacheGroupLockPutTask extends 
ComputeTaskAdapter<Collection<Integer>,
      *                       
org.apache.ignite.compute.ComputeTaskFuture#get()} method.
      */
     @Override public Map<? extends ComputeJob, ClusterNode> 
map(List<ClusterNode> subgrid,
-        @Nullable final Collection<Integer> data) throws 
IgniteCheckedException {
+        @Nullable final Collection<Integer> data) throws IgniteException {
         assert !subgrid.isEmpty();
 
         // Give preference to wanted node. Otherwise, take the first one.
@@ -82,7 +82,7 @@ class GridCacheGroupLockPutTask extends 
ComputeTaskAdapter<Collection<Integer>,
                 @IgniteInstanceResource
                 private Ignite ignite;
 
-                @Override public Object execute() throws 
IgniteCheckedException {
+                @Override public Object execute() throws IgniteException {
                     log.info("Going to put data: " + data.size());
 
                     GridCache<Object, Object> cache = ignite.cache(cacheName);
@@ -143,7 +143,7 @@ class GridCacheGroupLockPutTask extends 
ComputeTaskAdapter<Collection<Integer>,
     }
 
     /** {@inheritDoc} */
-    @Nullable @Override public Void reduce(List<ComputeJobResult> results) 
throws IgniteCheckedException {
+    @Nullable @Override public Void reduce(List<ComputeJobResult> results) 
throws IgniteException {
         return null;
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCachePutAllTask.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCachePutAllTask.java
 
b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCachePutAllTask.java
index bd9dd51..416a137 100644
--- 
a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCachePutAllTask.java
+++ 
b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCachePutAllTask.java
@@ -38,7 +38,7 @@ class GridCachePutAllTask extends 
ComputeTaskAdapter<Collection<Integer>, Void>
 
     /** {@inheritDoc} */
     @Override public Map<? extends ComputeJob, ClusterNode> 
map(List<ClusterNode> subgrid,
-        @Nullable final Collection<Integer> data) throws 
IgniteCheckedException {
+        @Nullable final Collection<Integer> data) throws IgniteException {
         assert !subgrid.isEmpty();
 
         // Give preference to wanted node. Otherwise, take the first one.
@@ -57,7 +57,7 @@ class GridCachePutAllTask extends 
ComputeTaskAdapter<Collection<Integer>, Void>
                 @IgniteInstanceResource
                 private Ignite ignite;
 
-                @Override public Object execute() throws 
IgniteCheckedException {
+                @Override public Object execute() throws IgniteException {
                     log.info("Going to put data: " + data);
 
                     GridCacheProjection<Object, Object> cache = 
ignite.cache(cacheName);
@@ -102,7 +102,7 @@ class GridCachePutAllTask extends 
ComputeTaskAdapter<Collection<Integer>, Void>
     }
 
     /** {@inheritDoc} */
-    @Override public ComputeJobResultPolicy result(ComputeJobResult res, 
List<ComputeJobResult> rcvd) throws IgniteCheckedException {
+    @Override public ComputeJobResultPolicy result(ComputeJobResult res, 
List<ComputeJobResult> rcvd) throws IgniteException {
         if (res.getException() != null)
             return ComputeJobResultPolicy.FAILOVER;
 
@@ -110,7 +110,7 @@ class GridCachePutAllTask extends 
ComputeTaskAdapter<Collection<Integer>, Void>
     }
 
     /** {@inheritDoc} */
-    @Nullable @Override public Void reduce(List<ComputeJobResult> results) 
throws IgniteCheckedException {
+    @Nullable @Override public Void reduce(List<ComputeJobResult> results) 
throws IgniteException {
         return null;
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheQueryIndexingDisabledSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheQueryIndexingDisabledSelfTest.java
 
b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheQueryIndexingDisabledSelfTest.java
index f8c00b6..b31e4f9 100644
--- 
a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheQueryIndexingDisabledSelfTest.java
+++ 
b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheQueryIndexingDisabledSelfTest.java
@@ -47,7 +47,7 @@ public class GridCacheQueryIndexingDisabledSelfTest extends 
GridCacheAbstractSel
      */
     public void testSqlFieldsQuery() throws IgniteCheckedException {
         doTest(new Callable<Object>() {
-            @Override public Object call() throws IgniteCheckedException {
+            @Override public Object call() throws IgniteException {
                 return cache().queries().createSqlFieldsQuery("select * from 
dual").execute()
                     .get();
             }
@@ -59,7 +59,7 @@ public class GridCacheQueryIndexingDisabledSelfTest extends 
GridCacheAbstractSel
      */
     public void testTextQuery() throws IgniteCheckedException {
         doTest(new Callable<Object>() {
-            @Override public Object call() throws IgniteCheckedException {
+            @Override public Object call() throws IgniteException {
                 return cache().queries().createFullTextQuery(String.class, 
"text")
                     .execute().get();
             }
@@ -71,7 +71,7 @@ public class GridCacheQueryIndexingDisabledSelfTest extends 
GridCacheAbstractSel
      */
     public void testSqlQuery() throws IgniteCheckedException {
         doTest(new Callable<Object>() {
-            @Override public Object call() throws IgniteCheckedException {
+            @Override public Object call() throws IgniteException {
                 return cache().queries().createSqlQuery(String.class, "1 = 1")
                     .execute().get();
             }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxMultiNodeAbstractTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxMultiNodeAbstractTest.java
 
b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxMultiNodeAbstractTest.java
index 2650fec..863c2c7 100644
--- 
a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxMultiNodeAbstractTest.java
+++ 
b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxMultiNodeAbstractTest.java
@@ -819,7 +819,7 @@ public abstract class GridCacheTxMultiNodeAbstractTest 
extends GridCommonAbstrac
 
         /** {@inheritDoc} */
         @SuppressWarnings("unchecked")
-        @Override public Integer call() throws IgniteCheckedException {
+        @Override public Integer call() throws IgniteException {
             assertNotNull(ignite);
 
             ignite.log().info("Running job [node=" + 
ignite.cluster().localNode().id() + ", job=" + this + "]");
@@ -846,7 +846,7 @@ public abstract class GridCacheTxMultiNodeAbstractTest 
extends GridCommonAbstrac
 
         /** {@inheritDoc} */
         @SuppressWarnings("unchecked")
-        @Override public Integer call() throws IgniteCheckedException {
+        @Override public Integer call() throws IgniteException {
             assertNotNull(ignite);
 
             ignite.log().info("Running job [node=" + 
ignite.cluster().localNode().id() + ", job=" + this + "]");
@@ -873,7 +873,7 @@ public abstract class GridCacheTxMultiNodeAbstractTest 
extends GridCommonAbstrac
 
         /** {@inheritDoc} */
         @SuppressWarnings("unchecked")
-        @Override public Integer call() throws IgniteCheckedException {
+        @Override public Integer call() throws IgniteException {
             assertNotNull(ignite);
 
             ignite.log().info("Running job [node=" + 
ignite.cluster().localNode().id() + ", job=" + this + "]");
@@ -900,7 +900,7 @@ public abstract class GridCacheTxMultiNodeAbstractTest 
extends GridCommonAbstrac
 
         /** {@inheritDoc} */
         @SuppressWarnings("unchecked")
-        @Override public Integer call() throws IgniteCheckedException {
+        @Override public Integer call() throws IgniteException {
             assertNotNull(ignite);
 
             ignite.log().info("Running job [node=" + 
ignite.cluster().localNode().id() + ", job=" + this + "]");

Reply via email to