You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2014/12/16 16:13:14 UTC

[03/13] incubator-ignite git commit: # IGNITE-26 Replaced IgniteCheckedException with IgniteException on public API.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/test/java/org/gridgain/loadtests/colocation/GridTestLifecycleBean.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/loadtests/colocation/GridTestLifecycleBean.java b/modules/core/src/test/java/org/gridgain/loadtests/colocation/GridTestLifecycleBean.java
index 6c39289..6e7bcc6 100644
--- a/modules/core/src/test/java/org/gridgain/loadtests/colocation/GridTestLifecycleBean.java
+++ b/modules/core/src/test/java/org/gridgain/loadtests/colocation/GridTestLifecycleBean.java
@@ -22,7 +22,7 @@ public class GridTestLifecycleBean implements LifecycleBean {
     @IgniteInstanceResource
     private Ignite g;
 
-    @Override public void onLifecycleEvent(LifecycleEventType type) throws IgniteCheckedException {
+    @Override public void onLifecycleEvent(LifecycleEventType type) throws IgniteException {
         if (type == LifecycleEventType.AFTER_GRID_START) {
             GridCache<GridTestKey, Long> cache = g.cache("partitioned");
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/test/java/org/gridgain/loadtests/direct/multisplit/GridLoadTestJob.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/loadtests/direct/multisplit/GridLoadTestJob.java b/modules/core/src/test/java/org/gridgain/loadtests/direct/multisplit/GridLoadTestJob.java
index a29c0a2..ba07de8 100644
--- a/modules/core/src/test/java/org/gridgain/loadtests/direct/multisplit/GridLoadTestJob.java
+++ b/modules/core/src/test/java/org/gridgain/loadtests/direct/multisplit/GridLoadTestJob.java
@@ -34,7 +34,7 @@ public class GridLoadTestJob extends ComputeJobAdapter {
 
     /** {@inheritDoc} */
     @SuppressWarnings("unchecked")
-    @Override public Serializable execute() throws IgniteCheckedException {
+    @Override public Serializable execute() throws IgniteException {
         Integer i = this.<Integer>argument(0);
 
         assert i != null && i > 0;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/test/java/org/gridgain/loadtests/direct/multisplit/GridLoadTestTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/loadtests/direct/multisplit/GridLoadTestTask.java b/modules/core/src/test/java/org/gridgain/loadtests/direct/multisplit/GridLoadTestTask.java
index cade932..93c99c2 100644
--- a/modules/core/src/test/java/org/gridgain/loadtests/direct/multisplit/GridLoadTestTask.java
+++ b/modules/core/src/test/java/org/gridgain/loadtests/direct/multisplit/GridLoadTestTask.java
@@ -31,7 +31,7 @@ public class GridLoadTestTask extends ComputeTaskAdapter<Integer, Integer> {
     private Ignite ignite;
 
     /** {@inheritDoc} */
-    @Override public Map<? extends ComputeJob, ClusterNode> map(List<ClusterNode> subgrid, Integer arg) throws IgniteCheckedException {
+    @Override public Map<? extends ComputeJob, ClusterNode> map(List<ClusterNode> subgrid, Integer arg) throws IgniteException {
         assert arg != null;
         assert arg > 1;
 
@@ -59,7 +59,7 @@ public class GridLoadTestTask extends ComputeTaskAdapter<Integer, Integer> {
     }
 
     /** {@inheritDoc} */
-    @Override public Integer reduce(List<ComputeJobResult> results) throws IgniteCheckedException {
+    @Override public Integer reduce(List<ComputeJobResult> results) throws IgniteException {
         assert results != null;
 
         int retVal = 0;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/test/java/org/gridgain/loadtests/direct/newnodes/GridSingleSplitNewNodesTestTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/loadtests/direct/newnodes/GridSingleSplitNewNodesTestTask.java b/modules/core/src/test/java/org/gridgain/loadtests/direct/newnodes/GridSingleSplitNewNodesTestTask.java
index 570f59f..83c0d72 100644
--- a/modules/core/src/test/java/org/gridgain/loadtests/direct/newnodes/GridSingleSplitNewNodesTestTask.java
+++ b/modules/core/src/test/java/org/gridgain/loadtests/direct/newnodes/GridSingleSplitNewNodesTestTask.java
@@ -30,7 +30,7 @@ public class GridSingleSplitNewNodesTestTask extends ComputeTaskAdapter<Integer,
     private ComputeLoadBalancer balancer;
 
     /** {@inheritDoc} */
-    @Override public Map<? extends ComputeJob, ClusterNode> map(List<ClusterNode> subgrid, Integer arg) throws IgniteCheckedException {
+    @Override public Map<? extends ComputeJob, ClusterNode> map(List<ClusterNode> subgrid, Integer arg) throws IgniteException {
         assert !subgrid.isEmpty() : "Subgrid cannot be empty.";
 
         Map<ComputeJobAdapter, ClusterNode> jobs = new HashMap<>(subgrid.size());
@@ -47,7 +47,7 @@ public class GridSingleSplitNewNodesTestTask extends ComputeTaskAdapter<Integer,
                 private ComputeTaskSession jobSes;
 
                 /** {@inheritDoc} */
-                @Override public Serializable execute() throws IgniteCheckedException {
+                @Override public Serializable execute() throws IgniteException {
                     assert jobSes != null;
 
                     Integer arg = this.<Integer>argument(0);
@@ -73,7 +73,7 @@ public class GridSingleSplitNewNodesTestTask extends ComputeTaskAdapter<Integer,
     }
 
     /** {@inheritDoc} */
-    @Override public Integer reduce(List<ComputeJobResult> results) throws IgniteCheckedException {
+    @Override public Integer reduce(List<ComputeJobResult> results) throws IgniteException {
         int retVal = 0;
 
         for (ComputeJobResult res : results) {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/test/java/org/gridgain/loadtests/direct/session/GridSessionLoadTestJob.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/loadtests/direct/session/GridSessionLoadTestJob.java b/modules/core/src/test/java/org/gridgain/loadtests/direct/session/GridSessionLoadTestJob.java
index 7ac5546..4cf62bd 100644
--- a/modules/core/src/test/java/org/gridgain/loadtests/direct/session/GridSessionLoadTestJob.java
+++ b/modules/core/src/test/java/org/gridgain/loadtests/direct/session/GridSessionLoadTestJob.java
@@ -41,7 +41,7 @@ public class GridSessionLoadTestJob extends ComputeJobAdapter {
     }
 
     /** {@inheritDoc} */
-    @Override public Serializable execute() throws IgniteCheckedException {
+    @Override public Serializable execute() throws IgniteException {
         assert taskSes != null;
 
         Object arg = argument(0);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/test/java/org/gridgain/loadtests/direct/session/GridSessionLoadTestTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/loadtests/direct/session/GridSessionLoadTestTask.java b/modules/core/src/test/java/org/gridgain/loadtests/direct/session/GridSessionLoadTestTask.java
index e43e088..b2d8a62 100644
--- a/modules/core/src/test/java/org/gridgain/loadtests/direct/session/GridSessionLoadTestTask.java
+++ b/modules/core/src/test/java/org/gridgain/loadtests/direct/session/GridSessionLoadTestTask.java
@@ -33,7 +33,7 @@ public class GridSessionLoadTestTask extends ComputeTaskAdapter<Integer, Boolean
     private Map<String, Integer> params;
 
     /** {@inheritDoc} */
-    @Override public Map<? extends ComputeJob, ClusterNode> map(List<ClusterNode> subgrid, Integer arg) throws IgniteCheckedException {
+    @Override public Map<? extends ComputeJob, ClusterNode> map(List<ClusterNode> subgrid, Integer arg) throws IgniteException {
         assert taskSes != null;
         assert arg != null;
         assert arg > 0;
@@ -78,7 +78,7 @@ public class GridSessionLoadTestTask extends ComputeTaskAdapter<Integer, Boolean
 
     /** {@inheritDoc} */
     @SuppressWarnings("BusyWait")
-    @Override public Boolean reduce(List<ComputeJobResult> results) throws IgniteCheckedException {
+    @Override public Boolean reduce(List<ComputeJobResult> results) throws IgniteException {
         assert taskSes != null;
         assert results != null;
         assert params != null;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/test/java/org/gridgain/loadtests/direct/stealing/GridStealingLoadTestJob.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/loadtests/direct/stealing/GridStealingLoadTestJob.java b/modules/core/src/test/java/org/gridgain/loadtests/direct/stealing/GridStealingLoadTestJob.java
index 116dada..14e402e 100644
--- a/modules/core/src/test/java/org/gridgain/loadtests/direct/stealing/GridStealingLoadTestJob.java
+++ b/modules/core/src/test/java/org/gridgain/loadtests/direct/stealing/GridStealingLoadTestJob.java
@@ -34,7 +34,7 @@ public class GridStealingLoadTestJob extends ComputeJobAdapter {
     private ComputeJobContext ctx;
 
     /** {@inheritDoc} */
-    @Override public Serializable execute() throws IgniteCheckedException {
+    @Override public Serializable execute() throws IgniteException {
         if (log.isDebugEnabled())
             log.debug("Executing job on node [nodeId=" + nodeId + ", jobId=" + ctx.getJobId() + ']');
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/test/java/org/gridgain/loadtests/direct/stealing/GridStealingLoadTestTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/loadtests/direct/stealing/GridStealingLoadTestTask.java b/modules/core/src/test/java/org/gridgain/loadtests/direct/stealing/GridStealingLoadTestTask.java
index ca5516e..cf8f1d8 100644
--- a/modules/core/src/test/java/org/gridgain/loadtests/direct/stealing/GridStealingLoadTestTask.java
+++ b/modules/core/src/test/java/org/gridgain/loadtests/direct/stealing/GridStealingLoadTestTask.java
@@ -31,7 +31,7 @@ public class GridStealingLoadTestTask extends ComputeTaskAdapter<UUID, Integer>
     private int stolenJobs;
 
     /** {@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 arg != null;
         assert subgrid.size() > 1: "Test requires at least 2 nodes. One with load and another one to steal.";
 
@@ -75,7 +75,7 @@ public class GridStealingLoadTestTask extends ComputeTaskAdapter<UUID, Integer>
     }
 
     /** {@inheritDoc} */
-    @Override public Integer reduce(List<ComputeJobResult> results) throws IgniteCheckedException {
+    @Override public Integer reduce(List<ComputeJobResult> results) throws IgniteException {
         assert results != null;
 
         for (ComputeJobResult res : results) {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/test/java/org/gridgain/loadtests/dsi/GridDsiLifecycleBean.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/loadtests/dsi/GridDsiLifecycleBean.java b/modules/core/src/test/java/org/gridgain/loadtests/dsi/GridDsiLifecycleBean.java
index 6a5dae7..e12cde9 100644
--- a/modules/core/src/test/java/org/gridgain/loadtests/dsi/GridDsiLifecycleBean.java
+++ b/modules/core/src/test/java/org/gridgain/loadtests/dsi/GridDsiLifecycleBean.java
@@ -32,7 +32,7 @@ public class GridDsiLifecycleBean implements LifecycleBean {
     private ApplicationContext springCtx;
 
     /** {@inheritDoc} */
-    @Override public void onLifecycleEvent(LifecycleEventType evt) throws IgniteCheckedException {
+    @Override public void onLifecycleEvent(LifecycleEventType evt) throws IgniteException {
         switch (evt) {
             case BEFORE_GRID_START:
                 break;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/test/java/org/gridgain/loadtests/dsi/GridDsiRequestTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/loadtests/dsi/GridDsiRequestTask.java b/modules/core/src/test/java/org/gridgain/loadtests/dsi/GridDsiRequestTask.java
index a285319..d8cdef4 100644
--- a/modules/core/src/test/java/org/gridgain/loadtests/dsi/GridDsiRequestTask.java
+++ b/modules/core/src/test/java/org/gridgain/loadtests/dsi/GridDsiRequestTask.java
@@ -20,12 +20,12 @@ import java.util.*;
  */
 public class GridDsiRequestTask extends ComputeTaskSplitAdapter<GridDsiMessage, T3<Long, Integer, Integer>> {
     /** {@inheritDoc} */
-    @Override protected Collection<? extends ComputeJob> split(int arg0, GridDsiMessage msg) throws IgniteCheckedException {
+    @Override protected Collection<? extends ComputeJob> split(int arg0, GridDsiMessage msg) throws IgniteException {
         return Collections.singletonList(new GridDsiPerfJob(msg));
     }
 
     /** {@inheritDoc} */
-    @Override public T3<Long, Integer, Integer> reduce(List<ComputeJobResult> results) throws IgniteCheckedException {
+    @Override public T3<Long, Integer, Integer> reduce(List<ComputeJobResult> results) throws IgniteException {
         assert results.size() == 1;
 
         return results.get(0).getData();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/test/java/org/gridgain/loadtests/dsi/GridDsiResponseTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/loadtests/dsi/GridDsiResponseTask.java b/modules/core/src/test/java/org/gridgain/loadtests/dsi/GridDsiResponseTask.java
index 08e01be..621a655 100644
--- a/modules/core/src/test/java/org/gridgain/loadtests/dsi/GridDsiResponseTask.java
+++ b/modules/core/src/test/java/org/gridgain/loadtests/dsi/GridDsiResponseTask.java
@@ -20,12 +20,12 @@ import java.util.*;
  */
 public class GridDsiResponseTask extends ComputeTaskSplitAdapter<GridDsiMessage, T3<Long, Integer, Integer>> {
     /** {@inheritDoc} */
-    @Override protected Collection<? extends ComputeJob> split(int arg0, GridDsiMessage msg) throws IgniteCheckedException {
+    @Override protected Collection<? extends ComputeJob> split(int arg0, GridDsiMessage msg) throws IgniteException {
         return Collections.singletonList(new GridDsiPerfJob(msg));
     }
 
     /** {@inheritDoc} */
-    @Override public T3<Long, Integer, Integer> reduce(List<ComputeJobResult> results) throws IgniteCheckedException {
+    @Override public T3<Long, Integer, Integer> reduce(List<ComputeJobResult> results) throws IgniteException {
         assert results.size() == 1;
 
         return results.get(0).getData();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/test/java/org/gridgain/loadtests/job/GridJobExecutionLoadTestJob.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/loadtests/job/GridJobExecutionLoadTestJob.java b/modules/core/src/test/java/org/gridgain/loadtests/job/GridJobExecutionLoadTestJob.java
index 0ae5d09..33838df 100644
--- a/modules/core/src/test/java/org/gridgain/loadtests/job/GridJobExecutionLoadTestJob.java
+++ b/modules/core/src/test/java/org/gridgain/loadtests/job/GridJobExecutionLoadTestJob.java
@@ -19,7 +19,7 @@ import java.io.*;
  */
 public class GridJobExecutionLoadTestJob implements ComputeJob, Externalizable {
     /** {@inheritDoc} */
-    @Override public Object execute() throws IgniteCheckedException {
+    @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/loadtests/job/GridJobExecutionLoadTestTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/loadtests/job/GridJobExecutionLoadTestTask.java b/modules/core/src/test/java/org/gridgain/loadtests/job/GridJobExecutionLoadTestTask.java
index 396f86c..1cf6fd1 100644
--- a/modules/core/src/test/java/org/gridgain/loadtests/job/GridJobExecutionLoadTestTask.java
+++ b/modules/core/src/test/java/org/gridgain/loadtests/job/GridJobExecutionLoadTestTask.java
@@ -25,17 +25,17 @@ import static org.apache.ignite.compute.ComputeJobResultPolicy.*;
 public class GridJobExecutionLoadTestTask implements ComputeTask<Object, Object> {
     /** {@inheritDoc} */
     @Nullable @Override public Map<? extends ComputeJob, ClusterNode> map(List<ClusterNode> subgrid, @Nullable Object arg)
-        throws IgniteCheckedException {
+        throws IgniteException {
         return F.asMap(new GridJobExecutionLoadTestJob(), subgrid.get(0));
     }
 
     /** {@inheritDoc} */
-    @Override public ComputeJobResultPolicy result(ComputeJobResult res, List<ComputeJobResult> rcvd) throws IgniteCheckedException {
+    @Override public ComputeJobResultPolicy result(ComputeJobResult res, List<ComputeJobResult> rcvd) throws IgniteException {
         return REDUCE;
     }
 
     /** {@inheritDoc} */
-    @Nullable @Override public Object reduce(List<ComputeJobResult> results) throws IgniteCheckedException {
+    @Nullable @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/loadtests/job/GridJobExecutionSingleNodeLoadTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/loadtests/job/GridJobExecutionSingleNodeLoadTest.java b/modules/core/src/test/java/org/gridgain/loadtests/job/GridJobExecutionSingleNodeLoadTest.java
index de4f4b8..867af1f 100644
--- a/modules/core/src/test/java/org/gridgain/loadtests/job/GridJobExecutionSingleNodeLoadTest.java
+++ b/modules/core/src/test/java/org/gridgain/loadtests/job/GridJobExecutionSingleNodeLoadTest.java
@@ -73,7 +73,7 @@ public class GridJobExecutionSingleNodeLoadTest {
                 X.println("Warming up...");
 
                 GridLoadTestUtils.runMultithreadedInLoop(new Callable<Object>() {
-                    @Override public Object call() throws IgniteCheckedException {
+                    @Override public Object call() throws IgniteException {
                         g.compute().execute(GridJobExecutionLoadTestTask.class, null);
 
                         return null;
@@ -198,17 +198,17 @@ public class GridJobExecutionSingleNodeLoadTest {
     private static class GridJobExecutionLoadTestTask implements ComputeTask<Object, Object> {
         /** {@inheritDoc} */
         @Nullable @Override public Map<? extends ComputeJob, ClusterNode> map(List<ClusterNode> subgrid, @Nullable Object arg)
-            throws IgniteCheckedException {
+            throws IgniteException {
             return F.asMap(new GridJobExecutionLoadTestJob(), subgrid.get(0));
         }
 
         /** {@inheritDoc} */
-        @Override public ComputeJobResultPolicy result(ComputeJobResult res, List<ComputeJobResult> rcvd) throws IgniteCheckedException {
+        @Override public ComputeJobResultPolicy result(ComputeJobResult res, List<ComputeJobResult> rcvd) throws IgniteException {
             return REDUCE;
         }
 
         /** {@inheritDoc} */
-        @Nullable @Override public Object reduce(List<ComputeJobResult> results) throws IgniteCheckedException {
+        @Nullable @Override public Object reduce(List<ComputeJobResult> results) throws IgniteException {
             return null;
         }
     }
@@ -218,7 +218,7 @@ public class GridJobExecutionSingleNodeLoadTest {
      */
     private static class GridJobExecutionLoadTestJob implements ComputeJob {
         /** {@inheritDoc} */
-        @Override public Object execute() throws IgniteCheckedException {
+        @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/loadtests/job/GridJobExecutionSingleNodeSemaphoreLoadTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/loadtests/job/GridJobExecutionSingleNodeSemaphoreLoadTest.java b/modules/core/src/test/java/org/gridgain/loadtests/job/GridJobExecutionSingleNodeSemaphoreLoadTest.java
index 851a083..fb16475 100644
--- a/modules/core/src/test/java/org/gridgain/loadtests/job/GridJobExecutionSingleNodeSemaphoreLoadTest.java
+++ b/modules/core/src/test/java/org/gridgain/loadtests/job/GridJobExecutionSingleNodeSemaphoreLoadTest.java
@@ -187,17 +187,17 @@ public class GridJobExecutionSingleNodeSemaphoreLoadTest {
     private static class GridJobExecutionLoadTestTask implements ComputeTask<Object, Object> {
         /** {@inheritDoc} */
         @Nullable @Override public Map<? extends ComputeJob, ClusterNode> map(List<ClusterNode> subgrid, @Nullable Object arg)
-            throws IgniteCheckedException {
+            throws IgniteException {
             return F.asMap(new GridJobExecutionLoadTestJob(), subgrid.get(0));
         }
 
         /** {@inheritDoc} */
-        @Override public ComputeJobResultPolicy result(ComputeJobResult res, List<ComputeJobResult> rcvd) throws IgniteCheckedException {
+        @Override public ComputeJobResultPolicy result(ComputeJobResult res, List<ComputeJobResult> rcvd) throws IgniteException {
             return REDUCE;
         }
 
         /** {@inheritDoc} */
-        @Nullable @Override public Object reduce(List<ComputeJobResult> results) throws IgniteCheckedException {
+        @Nullable @Override public Object reduce(List<ComputeJobResult> results) throws IgniteException {
             return null;
         }
     }
@@ -207,7 +207,7 @@ public class GridJobExecutionSingleNodeSemaphoreLoadTest {
      */
     private static class GridJobExecutionLoadTestJob implements ComputeJob {
         /** {@inheritDoc} */
-        @Override public Object execute() throws IgniteCheckedException {
+        @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/loadtests/job/GridJobLoadTestJob.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/loadtests/job/GridJobLoadTestJob.java b/modules/core/src/test/java/org/gridgain/loadtests/job/GridJobLoadTestJob.java
index c3b293a..1136fef 100644
--- a/modules/core/src/test/java/org/gridgain/loadtests/job/GridJobLoadTestJob.java
+++ b/modules/core/src/test/java/org/gridgain/loadtests/job/GridJobLoadTestJob.java
@@ -74,7 +74,7 @@ public class GridJobLoadTestJob implements ComputeJob {
     }
 
     /**{@inheritDoc}*/
-    @Override public Integer execute() throws IgniteCheckedException {
+    @Override public Integer execute() throws IgniteException {
         try {
             if (log.isInfoEnabled())
                 log.info("Job started " + getJobInfo());

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/test/java/org/gridgain/loadtests/job/GridJobLoadTestTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/loadtests/job/GridJobLoadTestTask.java b/modules/core/src/test/java/org/gridgain/loadtests/job/GridJobLoadTestTask.java
index 4f3f813..5d82f91 100644
--- a/modules/core/src/test/java/org/gridgain/loadtests/job/GridJobLoadTestTask.java
+++ b/modules/core/src/test/java/org/gridgain/loadtests/job/GridJobLoadTestTask.java
@@ -24,7 +24,7 @@ import static org.apache.ignite.compute.ComputeJobResultPolicy.*;
 public class GridJobLoadTestTask extends ComputeTaskAdapter<GridJobLoadTestParams, Integer> {
     /**{@inheritDoc} */
     @Override public Map<? extends ComputeJob, ClusterNode> map(List<ClusterNode> subgrid, @Nullable GridJobLoadTestParams arg)
-        throws IgniteCheckedException {
+        throws IgniteException {
         assert !subgrid.isEmpty();
 
         Map<ComputeJob, ClusterNode> jobs = new HashMap<>();
@@ -46,13 +46,13 @@ public class GridJobLoadTestTask extends ComputeTaskAdapter<GridJobLoadTestParam
      *
      * {@inheritDoc}
      */
-    @Override public ComputeJobResultPolicy result(ComputeJobResult res, List<ComputeJobResult> rcvd) throws IgniteCheckedException {
+    @Override public ComputeJobResultPolicy result(ComputeJobResult res, List<ComputeJobResult> rcvd) throws IgniteException {
         return res.getException() == null ? WAIT :
             res.getException().getCause() instanceof AssertionError ? REDUCE : FAILOVER;
     }
 
     /**{@inheritDoc} */
-    @Override public Integer reduce(List<ComputeJobResult> results) throws IgniteCheckedException {
+    @Override public Integer reduce(List<ComputeJobResult> results) throws IgniteException {
         int sum = 0;
 
         for (ComputeJobResult r: results) {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/test/java/org/gridgain/loadtests/mapper/GridContinuousMapperTask1.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/loadtests/mapper/GridContinuousMapperTask1.java b/modules/core/src/test/java/org/gridgain/loadtests/mapper/GridContinuousMapperTask1.java
index 88673d7..0071e15 100644
--- a/modules/core/src/test/java/org/gridgain/loadtests/mapper/GridContinuousMapperTask1.java
+++ b/modules/core/src/test/java/org/gridgain/loadtests/mapper/GridContinuousMapperTask1.java
@@ -92,7 +92,7 @@ public class GridContinuousMapperTask1 extends ComputeTaskAdapter<Integer, Integ
 
     /** {@inheritDoc} */
     @Override public Map<? extends ComputeJob, ClusterNode> map(List<ClusterNode> subgrid, @Nullable Integer arg)
-        throws IgniteCheckedException {
+        throws IgniteException {
         maxExecs = arg;
 
         // Start worker thread.
@@ -108,7 +108,7 @@ public class GridContinuousMapperTask1 extends ComputeTaskAdapter<Integer, Integ
     }
 
     /** {@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)
             throw new IgniteCheckedException(res.getException());
 
@@ -125,7 +125,7 @@ public class GridContinuousMapperTask1 extends ComputeTaskAdapter<Integer, Integ
     }
 
     /** {@inheritDoc} */
-    @Override public Integer reduce(List<ComputeJobResult> results) throws IgniteCheckedException {
+    @Override public Integer reduce(List<ComputeJobResult> results) throws IgniteException {
         X.println(">>> Reducing task...");
 
         t.interrupt();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/test/java/org/gridgain/loadtests/mapper/GridContinuousMapperTask2.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/loadtests/mapper/GridContinuousMapperTask2.java b/modules/core/src/test/java/org/gridgain/loadtests/mapper/GridContinuousMapperTask2.java
index 3b78a0e..0d7308a 100644
--- a/modules/core/src/test/java/org/gridgain/loadtests/mapper/GridContinuousMapperTask2.java
+++ b/modules/core/src/test/java/org/gridgain/loadtests/mapper/GridContinuousMapperTask2.java
@@ -29,7 +29,7 @@ public class GridContinuousMapperTask2 extends ComputeTaskAdapter<int[], Integer
 
     /** {@inheritDoc} */
     @Override public Map<? extends ComputeJob, ClusterNode> map(List<ClusterNode> subgrid, @Nullable int[] jobIds)
-        throws IgniteCheckedException {
+        throws IgniteException {
         Map<ComputeJob, ClusterNode> mappings = new HashMap<>(jobIds.length);
 
         Iterator<ClusterNode> nodeIter = g.cluster().forRemotes().nodes().iterator();
@@ -63,7 +63,7 @@ public class GridContinuousMapperTask2 extends ComputeTaskAdapter<int[], Integer
     }
 
     /** {@inheritDoc} */
-    @Override public ComputeJobResultPolicy result(ComputeJobResult res, List<ComputeJobResult> rcvd) throws IgniteCheckedException {
+    @Override public ComputeJobResultPolicy result(ComputeJobResult res, List<ComputeJobResult> rcvd) throws IgniteException {
         TestObject o = res.getData();
 
         X.println("Received job result from node [resId=" + o.getId() + ", node=" + res.getNode().id() + ']');
@@ -72,7 +72,7 @@ public class GridContinuousMapperTask2 extends ComputeTaskAdapter<int[], Integer
     }
 
     /** {@inheritDoc} */
-    @Override public Integer reduce(List<ComputeJobResult> results) throws IgniteCheckedException {
+    @Override public Integer reduce(List<ComputeJobResult> results) throws IgniteException {
         X.println(">>> Reducing task...");
 
         return null;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/test/java/org/gridgain/loadtests/mergesort/GridMergeSortLoadTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/loadtests/mergesort/GridMergeSortLoadTask.java b/modules/core/src/test/java/org/gridgain/loadtests/mergesort/GridMergeSortLoadTask.java
index 9795503..e0bc4c2 100644
--- a/modules/core/src/test/java/org/gridgain/loadtests/mergesort/GridMergeSortLoadTask.java
+++ b/modules/core/src/test/java/org/gridgain/loadtests/mergesort/GridMergeSortLoadTask.java
@@ -54,7 +54,7 @@ public class GridMergeSortLoadTask extends ComputeTaskSplitAdapter<int[], int[]>
                 // Task execution result future.
                 private ComputeTaskFuture<int[]> fut;
 
-                @Override public Object execute() throws IgniteCheckedException {
+                @Override public Object execute() throws IgniteException {
                     if (arr.length == 1)
                         return arr;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/test/java/org/gridgain/loadtests/streamer/average/TestStage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/loadtests/streamer/average/TestStage.java b/modules/core/src/test/java/org/gridgain/loadtests/streamer/average/TestStage.java
index 686d258..56e3ec6 100644
--- a/modules/core/src/test/java/org/gridgain/loadtests/streamer/average/TestStage.java
+++ b/modules/core/src/test/java/org/gridgain/loadtests/streamer/average/TestStage.java
@@ -27,7 +27,7 @@ class TestStage implements StreamerStage<Integer> {
 
     /** {@inheritDoc} */
     @Override public Map<String, Collection<?>> run(StreamerContext ctx, Collection<Integer> evts)
-        throws IgniteCheckedException {
+        throws IgniteException {
         ConcurrentMap<String, TestAverage> loc = ctx.localSpace();
 
         TestAverage avg = loc.get("avg");

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/test/java/org/gridgain/testframework/GridTestUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/testframework/GridTestUtils.java b/modules/core/src/test/java/org/gridgain/testframework/GridTestUtils.java
index bdd7042..d6e3883 100644
--- a/modules/core/src/test/java/org/gridgain/testframework/GridTestUtils.java
+++ b/modules/core/src/test/java/org/gridgain/testframework/GridTestUtils.java
@@ -582,7 +582,7 @@ public final class GridTestUtils {
             final GridTestSafeThreadFactory thrFactory = new GridTestSafeThreadFactory("async-runner");
 
             final GridFutureAdapter<T> fut = new GridFutureAdapter<T>() {
-                @Override public boolean cancel() throws IgniteCheckedException {
+                @Override public boolean cancel() throws IgniteException {
                     super.cancel();
 
                     thrFactory.interruptAllThreads();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/core/src/test/java/org/gridgain/testframework/junits/cache/GridAbstractCacheStoreSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/testframework/junits/cache/GridAbstractCacheStoreSelfTest.java b/modules/core/src/test/java/org/gridgain/testframework/junits/cache/GridAbstractCacheStoreSelfTest.java
index 2c56601..545d975 100644
--- a/modules/core/src/test/java/org/gridgain/testframework/junits/cache/GridAbstractCacheStoreSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/testframework/junits/cache/GridAbstractCacheStoreSelfTest.java
@@ -478,7 +478,7 @@ public abstract class GridAbstractCacheStoreSelfTest<T extends GridCacheStore<Ob
         }
 
         /** {@inheritDoc} */
-        @Override public void close() throws IgniteCheckedException {
+        @Override public void close() throws IgniteException {
             // No-op.
         }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/extdata/p2p/src/main/java/org/gridgain/grid/tests/p2p/GridCacheDeploymentTestTask1.java
----------------------------------------------------------------------
diff --git a/modules/extdata/p2p/src/main/java/org/gridgain/grid/tests/p2p/GridCacheDeploymentTestTask1.java b/modules/extdata/p2p/src/main/java/org/gridgain/grid/tests/p2p/GridCacheDeploymentTestTask1.java
index 8a69763..230f6eb 100644
--- a/modules/extdata/p2p/src/main/java/org/gridgain/grid/tests/p2p/GridCacheDeploymentTestTask1.java
+++ b/modules/extdata/p2p/src/main/java/org/gridgain/grid/tests/p2p/GridCacheDeploymentTestTask1.java
@@ -29,13 +29,13 @@ public class GridCacheDeploymentTestTask1 extends ComputeTaskAdapter<ClusterNode
 
     /** {@inheritDoc} */
     @Override public Map<? extends ComputeJob, ClusterNode> map(List<ClusterNode> subgrid,
-        @Nullable ClusterNode node) throws IgniteCheckedException {
+        @Nullable ClusterNode node) throws IgniteException {
         return F.asMap(
             new ComputeJobAdapter() {
                 @IgniteInstanceResource
                 private Ignite ignite;
 
-                @Override public Object execute() throws IgniteCheckedException {
+                @Override public Object execute() throws IgniteException {
                     X.println("Executing GridCacheDeploymentTestTask1 job on node " +
                         ignite.cluster().localNode().id());
 
@@ -52,7 +52,7 @@ public class GridCacheDeploymentTestTask1 extends ComputeTaskAdapter<ClusterNode
     }
 
     /** {@inheritDoc} */
-    @Nullable @Override public Object reduce(List<ComputeJobResult> results) throws IgniteCheckedException {
+    @Nullable @Override public Object reduce(List<ComputeJobResult> results) throws IgniteException {
         return null;
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/extdata/p2p/src/main/java/org/gridgain/grid/tests/p2p/GridCacheDeploymentTestTask2.java
----------------------------------------------------------------------
diff --git a/modules/extdata/p2p/src/main/java/org/gridgain/grid/tests/p2p/GridCacheDeploymentTestTask2.java b/modules/extdata/p2p/src/main/java/org/gridgain/grid/tests/p2p/GridCacheDeploymentTestTask2.java
index 0264e06..406654a 100644
--- a/modules/extdata/p2p/src/main/java/org/gridgain/grid/tests/p2p/GridCacheDeploymentTestTask2.java
+++ b/modules/extdata/p2p/src/main/java/org/gridgain/grid/tests/p2p/GridCacheDeploymentTestTask2.java
@@ -25,7 +25,7 @@ import java.util.*;
 public class GridCacheDeploymentTestTask2 extends ComputeTaskAdapter<ClusterNode, Object> {
     /** {@inheritDoc} */
     @Override public Map<? extends ComputeJob, ClusterNode> map(List<ClusterNode> subgrid,
-        @Nullable ClusterNode node) throws IgniteCheckedException {
+        @Nullable ClusterNode node) throws IgniteException {
         return F.asMap(
             new ComputeJobAdapter() {
                 @IgniteInstanceResource
@@ -43,7 +43,7 @@ public class GridCacheDeploymentTestTask2 extends ComputeTaskAdapter<ClusterNode
     }
 
     /** {@inheritDoc} */
-    @Nullable @Override public Object reduce(List<ComputeJobResult> results) throws IgniteCheckedException {
+    @Nullable @Override public Object reduce(List<ComputeJobResult> results) throws IgniteException {
         return null;
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/extdata/p2p/src/main/java/org/gridgain/grid/tests/p2p/GridCacheDeploymentTestTask3.java
----------------------------------------------------------------------
diff --git a/modules/extdata/p2p/src/main/java/org/gridgain/grid/tests/p2p/GridCacheDeploymentTestTask3.java b/modules/extdata/p2p/src/main/java/org/gridgain/grid/tests/p2p/GridCacheDeploymentTestTask3.java
index f70e4c8..a151777 100644
--- a/modules/extdata/p2p/src/main/java/org/gridgain/grid/tests/p2p/GridCacheDeploymentTestTask3.java
+++ b/modules/extdata/p2p/src/main/java/org/gridgain/grid/tests/p2p/GridCacheDeploymentTestTask3.java
@@ -25,7 +25,7 @@ import java.util.*;
 public class GridCacheDeploymentTestTask3 extends ComputeTaskAdapter<T2<ClusterNode, String>, Object> {
     /** {@inheritDoc} */
     @Override public Map<? extends ComputeJob, ClusterNode> map(List<ClusterNode> subgrid,
-        @Nullable T2<ClusterNode, String> tup) throws IgniteCheckedException {
+        @Nullable T2<ClusterNode, String> tup) throws IgniteException {
         final String val = tup.getValue();
 
         return F.asMap(
@@ -33,7 +33,7 @@ public class GridCacheDeploymentTestTask3 extends ComputeTaskAdapter<T2<ClusterN
                     @IgniteInstanceResource
                     private Ignite ignite;
 
-                    @Override public Object execute() throws IgniteCheckedException {
+                    @Override public Object execute() throws IgniteException {
                         X.println("Executing GridCacheDeploymentTestTask3 job on node " +
                                 ignite.cluster().localNode().id());
 
@@ -48,7 +48,7 @@ public class GridCacheDeploymentTestTask3 extends ComputeTaskAdapter<T2<ClusterN
     }
 
     /** {@inheritDoc} */
-    @Nullable @Override public Object reduce(List<ComputeJobResult> results) throws IgniteCheckedException {
+    @Nullable @Override public Object reduce(List<ComputeJobResult> results) throws IgniteException {
         return null;
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/extdata/p2p/src/main/java/org/gridgain/grid/tests/p2p/GridP2PContinuousDeploymentTask1.java
----------------------------------------------------------------------
diff --git a/modules/extdata/p2p/src/main/java/org/gridgain/grid/tests/p2p/GridP2PContinuousDeploymentTask1.java b/modules/extdata/p2p/src/main/java/org/gridgain/grid/tests/p2p/GridP2PContinuousDeploymentTask1.java
index 9cc627c..7a695a8 100644
--- a/modules/extdata/p2p/src/main/java/org/gridgain/grid/tests/p2p/GridP2PContinuousDeploymentTask1.java
+++ b/modules/extdata/p2p/src/main/java/org/gridgain/grid/tests/p2p/GridP2PContinuousDeploymentTask1.java
@@ -23,12 +23,12 @@ import java.util.*;
  */
 public class GridP2PContinuousDeploymentTask1 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 ComputeJobAdapter() {
             @IgniteInstanceResource
             private Ignite ignite;
 
-            @Override public Object execute() throws IgniteCheckedException {
+            @Override public Object execute() throws IgniteException {
                 X.println(">>> Executing GridP2PContinuousDeploymentTask1 job.");
 
                 ignite.cache(null).putx("key", new GridTestUserResource());
@@ -39,7 +39,7 @@ public class GridP2PContinuousDeploymentTask1 extends ComputeTaskSplitAdapter<Ob
     }
 
     /** {@inheritDoc} */
-    @Nullable @Override public Object reduce(List<ComputeJobResult> results) throws IgniteCheckedException {
+    @Nullable @Override public Object reduce(List<ComputeJobResult> results) throws IgniteException {
         return null;
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/extdata/p2p/src/main/java/org/gridgain/grid/tests/p2p/GridP2PContinuousDeploymentTask2.java
----------------------------------------------------------------------
diff --git a/modules/extdata/p2p/src/main/java/org/gridgain/grid/tests/p2p/GridP2PContinuousDeploymentTask2.java b/modules/extdata/p2p/src/main/java/org/gridgain/grid/tests/p2p/GridP2PContinuousDeploymentTask2.java
index 3b136fc..67ce859 100644
--- a/modules/extdata/p2p/src/main/java/org/gridgain/grid/tests/p2p/GridP2PContinuousDeploymentTask2.java
+++ b/modules/extdata/p2p/src/main/java/org/gridgain/grid/tests/p2p/GridP2PContinuousDeploymentTask2.java
@@ -22,7 +22,7 @@ import java.util.*;
  */
 public class GridP2PContinuousDeploymentTask2 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 ComputeJobAdapter() {
             @Override public Object execute() {
                 X.println(">>> Executing GridP2PContinuousDeploymentTask2 job.");
@@ -33,7 +33,7 @@ public class GridP2PContinuousDeploymentTask2 extends ComputeTaskSplitAdapter<Ob
     }
 
     /** {@inheritDoc} */
-    @Nullable @Override public Object reduce(List<ComputeJobResult> results) throws IgniteCheckedException {
+    @Nullable @Override public Object reduce(List<ComputeJobResult> results) throws IgniteException {
         return null;
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/extdata/p2p/src/main/java/org/gridgain/grid/tests/p2p/GridP2PTestTaskExternalPath1.java
----------------------------------------------------------------------
diff --git a/modules/extdata/p2p/src/main/java/org/gridgain/grid/tests/p2p/GridP2PTestTaskExternalPath1.java b/modules/extdata/p2p/src/main/java/org/gridgain/grid/tests/p2p/GridP2PTestTaskExternalPath1.java
index b9c6e9e..645117a 100644
--- a/modules/extdata/p2p/src/main/java/org/gridgain/grid/tests/p2p/GridP2PTestTaskExternalPath1.java
+++ b/modules/extdata/p2p/src/main/java/org/gridgain/grid/tests/p2p/GridP2PTestTaskExternalPath1.java
@@ -31,7 +31,7 @@ public class GridP2PTestTaskExternalPath1 extends ComputeTaskAdapter<Object, int
      * {@inheritDoc}
      */
     @SuppressWarnings({"unchecked"})
-    @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 {
         if (log.isInfoEnabled()) {
             log.info("Mapping [task=" + this + ", subgrid=" + F.viewReadOnly(subgrid, F.node2id()) +
                 ", arg=" + arg + ']');
@@ -73,7 +73,7 @@ public class GridP2PTestTaskExternalPath1 extends ComputeTaskAdapter<Object, int
     /**
      * {@inheritDoc}
      */
-    @Override public int[] reduce(List<ComputeJobResult> results) throws IgniteCheckedException {
+    @Override public int[] reduce(List<ComputeJobResult> results) throws IgniteException {
         return results.get(0).getData();
     }
 
@@ -123,7 +123,7 @@ public class GridP2PTestTaskExternalPath1 extends ComputeTaskAdapter<Object, int
         }
 
         /** {@inheritDoc} */
-        @Override public int[] execute() throws IgniteCheckedException {
+        @Override public int[] execute() throws IgniteException {
             assert locNodeId.equals(argument(0));
 
             log.info("Running job on node: " + g.cluster().localNode().id());

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/extdata/p2p/src/main/java/org/gridgain/grid/tests/p2p/GridP2PTestTaskExternalPath2.java
----------------------------------------------------------------------
diff --git a/modules/extdata/p2p/src/main/java/org/gridgain/grid/tests/p2p/GridP2PTestTaskExternalPath2.java b/modules/extdata/p2p/src/main/java/org/gridgain/grid/tests/p2p/GridP2PTestTaskExternalPath2.java
index 743eeb6..c74fc14 100644
--- a/modules/extdata/p2p/src/main/java/org/gridgain/grid/tests/p2p/GridP2PTestTaskExternalPath2.java
+++ b/modules/extdata/p2p/src/main/java/org/gridgain/grid/tests/p2p/GridP2PTestTaskExternalPath2.java
@@ -31,7 +31,7 @@ public class GridP2PTestTaskExternalPath2 extends ComputeTaskAdapter<Object, int
      * {@inheritDoc}
      */
     @SuppressWarnings({"unchecked"})
-    @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 {
         if (log.isInfoEnabled()) {
             log.info("Mapping [task=" + this + ", subgrid=" + F.viewReadOnly(subgrid, F.node2id()) +
                 ", arg=" + arg + ']');
@@ -73,7 +73,7 @@ public class GridP2PTestTaskExternalPath2 extends ComputeTaskAdapter<Object, int
     /**
      * {@inheritDoc}
      */
-    @Override public int[] reduce(List<ComputeJobResult> results) throws IgniteCheckedException {
+    @Override public int[] reduce(List<ComputeJobResult> results) throws IgniteException {
         return results.get(0).getData();
     }
 
@@ -114,7 +114,7 @@ public class GridP2PTestTaskExternalPath2 extends ComputeTaskAdapter<Object, int
         /**
          * {@inheritDoc}
          */
-        @Override public int[] execute() throws IgniteCheckedException {
+        @Override public int[] execute() throws IgniteException {
             assert locNodeId.equals(argument(0));
 
             if (sleep) {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/extdata/p2p/src/main/java/org/gridgain/grid/tests/p2p/GridSingleSplitTestTask.java
----------------------------------------------------------------------
diff --git a/modules/extdata/p2p/src/main/java/org/gridgain/grid/tests/p2p/GridSingleSplitTestTask.java b/modules/extdata/p2p/src/main/java/org/gridgain/grid/tests/p2p/GridSingleSplitTestTask.java
index d54f078..efbcff3 100644
--- a/modules/extdata/p2p/src/main/java/org/gridgain/grid/tests/p2p/GridSingleSplitTestTask.java
+++ b/modules/extdata/p2p/src/main/java/org/gridgain/grid/tests/p2p/GridSingleSplitTestTask.java
@@ -23,7 +23,7 @@ public class GridSingleSplitTestTask extends ComputeTaskSplitAdapter<Integer, In
     /**
      * {@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 {
         assert gridSize > 0 : "Subgrid cannot be empty.";
 
         Collection<ComputeJobAdapter> jobs = new ArrayList<>(gridSize);
@@ -37,7 +37,7 @@ public class GridSingleSplitTestTask extends ComputeTaskSplitAdapter<Integer, In
     /**
      * {@inheritDoc}
      */
-    @Override public Integer reduce(List<ComputeJobResult> results) throws IgniteCheckedException {
+    @Override public Integer reduce(List<ComputeJobResult> results) throws IgniteException {
         int retVal = 0;
 
         for (ComputeJobResult res : results) {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/extdata/p2p/src/main/java/org/gridgain/grid/tests/p2p/JobStealingTask.java
----------------------------------------------------------------------
diff --git a/modules/extdata/p2p/src/main/java/org/gridgain/grid/tests/p2p/JobStealingTask.java b/modules/extdata/p2p/src/main/java/org/gridgain/grid/tests/p2p/JobStealingTask.java
index c68a218..260a664 100644
--- a/modules/extdata/p2p/src/main/java/org/gridgain/grid/tests/p2p/JobStealingTask.java
+++ b/modules/extdata/p2p/src/main/java/org/gridgain/grid/tests/p2p/JobStealingTask.java
@@ -29,7 +29,7 @@ public class JobStealingTask extends ComputeTaskAdapter<Object, Map<UUID, Intege
     /** {@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.isEmpty();
 
         Map<ComputeJobAdapter, ClusterNode> map = U.newHashMap(subgrid.size());
@@ -43,7 +43,7 @@ public class JobStealingTask extends ComputeTaskAdapter<Object, Map<UUID, Intege
 
     /** {@inheritDoc} */
     @SuppressWarnings("SuspiciousMethodCalls")
-    @Override public Map<UUID, Integer> reduce(List<ComputeJobResult> results) throws IgniteCheckedException {
+    @Override public Map<UUID, Integer> reduce(List<ComputeJobResult> results) throws IgniteException {
         Map<UUID, Integer> ret = U.newHashMap(results.size());
 
         for (ComputeJobResult res : results) {
@@ -78,7 +78,7 @@ public class JobStealingTask extends ComputeTaskAdapter<Object, Map<UUID, Intege
         }
 
         /** {@inheritDoc} */
-        @Override public Serializable execute() throws IgniteCheckedException {
+        @Override public Serializable execute() throws IgniteException {
             log.info("Started job on node: " + ignite.cluster().localNode().id());
 
             try {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentAbstractTestTask.java
----------------------------------------------------------------------
diff --git a/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentAbstractTestTask.java b/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentAbstractTestTask.java
index 924eba8..4884f02 100644
--- a/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentAbstractTestTask.java
+++ b/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentAbstractTestTask.java
@@ -22,14 +22,14 @@ public abstract class GridUriDeploymentAbstractTestTask extends ComputeTaskSplit
     /**
      * {@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 {
         return null;
     }
 
     /**
      * {@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/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentInnerTestTask.java
----------------------------------------------------------------------
diff --git a/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentInnerTestTask.java b/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentInnerTestTask.java
index 5d063c2..e2d32ed 100644
--- a/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentInnerTestTask.java
+++ b/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentInnerTestTask.java
@@ -24,12 +24,12 @@ public class GridUriDeploymentInnerTestTask {
      */
     public class GridInnerTestTask extends ComputeTaskSplitAdapter<Object, Object> {
         /** {@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 {
             return null;
         }
 
         /** {@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/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentNonePublicTestTask.java
----------------------------------------------------------------------
diff --git a/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentNonePublicTestTask.java b/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentNonePublicTestTask.java
index 8823996..7336282 100644
--- a/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentNonePublicTestTask.java
+++ b/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentNonePublicTestTask.java
@@ -20,12 +20,12 @@ import java.util.*;
  */
 class GridUriDeploymentNonePublicTestTask extends ComputeTaskSplitAdapter<Object, Object> {
     /** {@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 {
         return null;
     }
 
     /** {@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/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestTask0.java
----------------------------------------------------------------------
diff --git a/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestTask0.java b/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestTask0.java
index bd43201..883ef3c 100644
--- a/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestTask0.java
+++ b/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestTask0.java
@@ -20,12 +20,12 @@ import java.util.*;
  */
 public class GridUriDeploymentTestTask0 extends ComputeTaskSplitAdapter<Object, Object> {
     /** {@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 {
         return null;
     }
 
     /** {@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/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestTask1.java
----------------------------------------------------------------------
diff --git a/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestTask1.java b/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestTask1.java
index 892b9a9..40ba731 100644
--- a/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestTask1.java
+++ b/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestTask1.java
@@ -42,14 +42,14 @@ public class GridUriDeploymentTestTask1 extends ComputeTaskSplitAdapter<Object,
     /**
      * {@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 {
         return null;
     }
 
     /**
      * {@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/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestTask2.java
----------------------------------------------------------------------
diff --git a/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestTask2.java b/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestTask2.java
index bbee39f..dc16af0 100644
--- a/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestTask2.java
+++ b/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestTask2.java
@@ -46,7 +46,7 @@ public class GridUriDeploymentTestTask2 extends ComputeTaskSplitAdapter<Object,
     /**
      * {@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 {
         System.out.println("Split is called: " + this);
 
         return null;
@@ -55,7 +55,7 @@ public class GridUriDeploymentTestTask2 extends ComputeTaskSplitAdapter<Object,
     /**
      * {@inheritDoc}
      */
-    @Override public Object reduce(List<ComputeJobResult> results) throws IgniteCheckedException {
+    @Override public Object reduce(List<ComputeJobResult> results) throws IgniteException {
         System.out.println("Reduce is called.");
 
         return null;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestTask3.java
----------------------------------------------------------------------
diff --git a/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestTask3.java b/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestTask3.java
index 738aa94..f8f874d 100644
--- a/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestTask3.java
+++ b/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestTask3.java
@@ -22,14 +22,14 @@ public class GridUriDeploymentTestTask3 extends ComputeTaskSplitAdapter<Object,
     /**
      * {@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 {
         return null;
     }
 
     /**
      * {@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/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestTask4.java
----------------------------------------------------------------------
diff --git a/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestTask4.java b/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestTask4.java
index 738cd13..3d8bc87 100644
--- a/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestTask4.java
+++ b/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestTask4.java
@@ -22,14 +22,14 @@ public class GridUriDeploymentTestTask4 extends ComputeTaskSplitAdapter<Object,
     /**
      * {@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 {
         return null;
     }
 
     /**
      * {@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/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestTask5.java
----------------------------------------------------------------------
diff --git a/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestTask5.java b/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestTask5.java
index 99af880..d1b0248 100644
--- a/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestTask5.java
+++ b/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestTask5.java
@@ -22,14 +22,14 @@ public class GridUriDeploymentTestTask5 extends ComputeTaskSplitAdapter<Object,
     /**
      * {@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 {
         return null;
     }
 
     /**
      * {@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/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestTask6.java
----------------------------------------------------------------------
diff --git a/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestTask6.java b/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestTask6.java
index 7381dad..b82ea95 100644
--- a/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestTask6.java
+++ b/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestTask6.java
@@ -22,14 +22,14 @@ public class GridUriDeploymentTestTask6 extends ComputeTaskSplitAdapter<Object,
     /**
      * {@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 {
         return null;
     }
 
     /**
      * {@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/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestWithNameTask0.java
----------------------------------------------------------------------
diff --git a/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestWithNameTask0.java b/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestWithNameTask0.java
index eaa78d1..79cedfc 100644
--- a/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestWithNameTask0.java
+++ b/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestWithNameTask0.java
@@ -23,14 +23,14 @@ public class GridUriDeploymentTestWithNameTask0 extends ComputeTaskSplitAdapter<
     /**
      * {@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 {
         return null;
     }
 
     /**
      * {@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/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestWithNameTask3.java
----------------------------------------------------------------------
diff --git a/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestWithNameTask3.java b/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestWithNameTask3.java
index f8a014b..a848584 100644
--- a/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestWithNameTask3.java
+++ b/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestWithNameTask3.java
@@ -23,14 +23,14 @@ public class GridUriDeploymentTestWithNameTask3 extends ComputeTaskSplitAdapter<
     /**
      * {@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 {
         return null;
     }
 
     /**
      * {@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/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestWithNameTask4.java
----------------------------------------------------------------------
diff --git a/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestWithNameTask4.java b/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestWithNameTask4.java
index 2b33531..740f478 100644
--- a/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestWithNameTask4.java
+++ b/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestWithNameTask4.java
@@ -23,14 +23,14 @@ public class GridUriDeploymentTestWithNameTask4 extends ComputeTaskSplitAdapter<
     /**
      * {@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 {
         return null;
     }
 
     /**
      * {@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/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestWithNameTask5.java
----------------------------------------------------------------------
diff --git a/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestWithNameTask5.java b/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestWithNameTask5.java
index f59cefa..ebf6b79 100644
--- a/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestWithNameTask5.java
+++ b/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestWithNameTask5.java
@@ -23,14 +23,14 @@ public class GridUriDeploymentTestWithNameTask5 extends ComputeTaskSplitAdapter<
     /**
      * {@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 {
         return null;
     }
 
     /**
      * {@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/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestWithNameTask6.java
----------------------------------------------------------------------
diff --git a/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestWithNameTask6.java b/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestWithNameTask6.java
index b24da56..a00c09f 100644
--- a/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestWithNameTask6.java
+++ b/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestWithNameTask6.java
@@ -23,14 +23,14 @@ public class GridUriDeploymentTestWithNameTask6 extends ComputeTaskSplitAdapter<
     /**
      * {@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 {
         return null;
     }
 
     /**
      * {@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/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestWithNameTask7.java
----------------------------------------------------------------------
diff --git a/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestWithNameTask7.java b/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestWithNameTask7.java
index 3deb38b..fc21b94 100644
--- a/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestWithNameTask7.java
+++ b/modules/extdata/uri/src/main/java/org/apache/ignite/spi/deployment/uri/tasks/GridUriDeploymentTestWithNameTask7.java
@@ -23,14 +23,14 @@ public class GridUriDeploymentTestWithNameTask7 extends ComputeTaskSplitAdapter<
     /**
      * {@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 {
         return null;
     }
 
     /**
      * {@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/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopFileSystemWrapper.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopFileSystemWrapper.java b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopFileSystemWrapper.java
index 39e1b7e..6addadc 100644
--- a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopFileSystemWrapper.java
+++ b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopFileSystemWrapper.java
@@ -139,7 +139,7 @@ public class GridGgfsHadoopFileSystemWrapper implements IgniteFsFileSystem, Auto
     }
 
     /** {@inheritDoc} */
-    @Override public boolean exists(IgniteFsPath path) throws IgniteCheckedException {
+    @Override public boolean exists(IgniteFsPath path) throws IgniteException {
         try {
             return fileSys.exists(convert(path));
         }
@@ -149,7 +149,7 @@ public class GridGgfsHadoopFileSystemWrapper implements IgniteFsFileSystem, Auto
     }
 
     /** {@inheritDoc} */
-    @Nullable @Override public IgniteFsFile update(IgniteFsPath path, Map<String, String> props) throws IgniteCheckedException {
+    @Nullable @Override public IgniteFsFile update(IgniteFsPath path, Map<String, String> props) throws IgniteException {
         GridGgfsHadoopFSProperties props0 = new GridGgfsHadoopFSProperties(props);
 
         try {
@@ -168,7 +168,7 @@ public class GridGgfsHadoopFileSystemWrapper implements IgniteFsFileSystem, Auto
     }
 
     /** {@inheritDoc} */
-    @Override public void rename(IgniteFsPath src, IgniteFsPath dest) throws IgniteCheckedException {
+    @Override public void rename(IgniteFsPath src, IgniteFsPath dest) throws IgniteException {
         // Delegate to the secondary file system.
         try {
             if (!fileSys.rename(convert(src), convert(dest)))
@@ -181,7 +181,7 @@ public class GridGgfsHadoopFileSystemWrapper implements IgniteFsFileSystem, Auto
     }
 
     /** {@inheritDoc} */
-    @Override public boolean delete(IgniteFsPath path, boolean recursive) throws IgniteCheckedException {
+    @Override public boolean delete(IgniteFsPath path, boolean recursive) throws IgniteException {
         try {
             return fileSys.delete(convert(path), recursive);
         }
@@ -191,7 +191,7 @@ public class GridGgfsHadoopFileSystemWrapper implements IgniteFsFileSystem, Auto
     }
 
     /** {@inheritDoc} */
-    @Override public void mkdirs(IgniteFsPath path) throws IgniteCheckedException {
+    @Override public void mkdirs(IgniteFsPath path) throws IgniteException {
         try {
             if (!fileSys.mkdirs(convert(path)))
                 throw new IgniteCheckedException("Failed to make directories [path=" + path + "]");
@@ -202,7 +202,7 @@ public class GridGgfsHadoopFileSystemWrapper implements IgniteFsFileSystem, Auto
     }
 
     /** {@inheritDoc} */
-    @Override public void mkdirs(IgniteFsPath path, @Nullable Map<String, String> props) throws IgniteCheckedException {
+    @Override public void mkdirs(IgniteFsPath path, @Nullable Map<String, String> props) throws IgniteException {
         try {
             if (!fileSys.mkdirs(convert(path), new GridGgfsHadoopFSProperties(props).permission()))
                 throw new IgniteCheckedException("Failed to make directories [path=" + path + ", props=" + props + "]");
@@ -213,7 +213,7 @@ public class GridGgfsHadoopFileSystemWrapper implements IgniteFsFileSystem, Auto
     }
 
     /** {@inheritDoc} */
-    @Override public Collection<IgniteFsPath> listPaths(IgniteFsPath path) throws IgniteCheckedException {
+    @Override public Collection<IgniteFsPath> listPaths(IgniteFsPath path) throws IgniteException {
         try {
             FileStatus[] statuses = fileSys.listStatus(convert(path));
 
@@ -236,7 +236,7 @@ public class GridGgfsHadoopFileSystemWrapper implements IgniteFsFileSystem, Auto
     }
 
     /** {@inheritDoc} */
-    @Override public Collection<IgniteFsFile> listFiles(IgniteFsPath path) throws IgniteCheckedException {
+    @Override public Collection<IgniteFsFile> listFiles(IgniteFsPath path) throws IgniteException {
         try {
             FileStatus[] statuses = fileSys.listStatus(convert(path));
 
@@ -269,7 +269,7 @@ public class GridGgfsHadoopFileSystemWrapper implements IgniteFsFileSystem, Auto
     }
 
     /** {@inheritDoc} */
-    @Override public OutputStream create(IgniteFsPath path, boolean overwrite) throws IgniteCheckedException {
+    @Override public OutputStream create(IgniteFsPath path, boolean overwrite) throws IgniteException {
         try {
             return fileSys.create(convert(path), overwrite);
         }
@@ -280,7 +280,7 @@ public class GridGgfsHadoopFileSystemWrapper implements IgniteFsFileSystem, Auto
 
     /** {@inheritDoc} */
     @Override public OutputStream create(IgniteFsPath path, int bufSize, boolean overwrite, int replication,
-        long blockSize, @Nullable Map<String, String> props) throws IgniteCheckedException {
+        long blockSize, @Nullable Map<String, String> props) throws IgniteException {
         GridGgfsHadoopFSProperties props0 =
             new GridGgfsHadoopFSProperties(props != null ? props : Collections.<String, String>emptyMap());
 
@@ -297,7 +297,7 @@ public class GridGgfsHadoopFileSystemWrapper implements IgniteFsFileSystem, Auto
 
     /** {@inheritDoc} */
     @Override public OutputStream append(IgniteFsPath path, int bufSize, boolean create,
-        @Nullable Map<String, String> props) throws IgniteCheckedException {
+        @Nullable Map<String, String> props) throws IgniteException {
         try {
             return fileSys.append(convert(path), bufSize);
         }
@@ -307,7 +307,7 @@ public class GridGgfsHadoopFileSystemWrapper implements IgniteFsFileSystem, Auto
     }
 
     /** {@inheritDoc} */
-    @Override public IgniteFsFile info(final IgniteFsPath path) throws IgniteCheckedException {
+    @Override public IgniteFsFile info(final IgniteFsPath path) throws IgniteException {
         try {
             final FileStatus status = fileSys.getFileStatus(convert(path));
 
@@ -380,7 +380,7 @@ public class GridGgfsHadoopFileSystemWrapper implements IgniteFsFileSystem, Auto
     }
 
     /** {@inheritDoc} */
-    @Override public long usedSpaceSize() throws IgniteCheckedException {
+    @Override public long usedSpaceSize() throws IgniteException {
         try {
             return fileSys.getContentSummary(new Path(fileSys.getUri())).getSpaceConsumed();
         }
@@ -395,7 +395,7 @@ public class GridGgfsHadoopFileSystemWrapper implements IgniteFsFileSystem, Auto
     }
 
     /** {@inheritDoc} */
-    @Override public void close() throws IgniteCheckedException {
+    @Override public void close() throws IgniteException {
         try {
             fileSys.close();
         }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/jobtracker/GridHadoopJobTracker.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/jobtracker/GridHadoopJobTracker.java b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/jobtracker/GridHadoopJobTracker.java
index c2ee568..f40cf88 100644
--- a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/jobtracker/GridHadoopJobTracker.java
+++ b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/jobtracker/GridHadoopJobTracker.java
@@ -138,7 +138,7 @@ public class GridHadoopJobTracker extends GridHadoopComponent {
                 try {
                     // Must process query callback in a separate thread to avoid deadlocks.
                     evtProcSvc.submit(new EventHandler() {
-                        @Override protected void body() throws IgniteCheckedException {
+                        @Override protected void body() throws IgniteException {
                             processJobMetadataUpdates(evts);
                         }
                     });

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/proto/GridHadoopProtocolTaskAdapter.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/proto/GridHadoopProtocolTaskAdapter.java b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/proto/GridHadoopProtocolTaskAdapter.java
index f660c0c..2b177f2 100644
--- a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/proto/GridHadoopProtocolTaskAdapter.java
+++ b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/proto/GridHadoopProtocolTaskAdapter.java
@@ -26,18 +26,18 @@ import java.util.*;
 public abstract class GridHadoopProtocolTaskAdapter<R> implements ComputeTask<GridHadoopProtocolTaskArguments, R> {
     /** {@inheritDoc} */
     @Nullable @Override public Map<? extends ComputeJob, ClusterNode> map(List<ClusterNode> subgrid,
-        @Nullable GridHadoopProtocolTaskArguments arg) throws IgniteCheckedException {
+        @Nullable GridHadoopProtocolTaskArguments arg) throws IgniteException {
         return Collections.singletonMap(new Job(arg), subgrid.get(0));
     }
 
     /** {@inheritDoc} */
     @Override public ComputeJobResultPolicy result(ComputeJobResult res, List<ComputeJobResult> rcvd)
-        throws IgniteCheckedException {
+        throws IgniteException {
         return ComputeJobResultPolicy.REDUCE;
     }
 
     /** {@inheritDoc} */
-    @Nullable @Override public R reduce(List<ComputeJobResult> results) throws IgniteCheckedException {
+    @Nullable @Override public R reduce(List<ComputeJobResult> results) throws IgniteException {
         if (!F.isEmpty(results)) {
             ComputeJobResult res = results.get(0);
 
@@ -79,7 +79,7 @@ public abstract class GridHadoopProtocolTaskAdapter<R> implements ComputeTask<Gr
         }
 
         /** {@inheritDoc} */
-        @Nullable @Override public Object execute() throws IgniteCheckedException {
+        @Nullable @Override public Object execute() throws IgniteException {
             return run(jobCtx, ignite.hadoop(), args);
         }
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/shuffle/GridHadoopShuffleJob.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/shuffle/GridHadoopShuffleJob.java b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/shuffle/GridHadoopShuffleJob.java
index 1a8614f..e907822 100644
--- a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/shuffle/GridHadoopShuffleJob.java
+++ b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/shuffle/GridHadoopShuffleJob.java
@@ -395,7 +395,7 @@ public class GridHadoopShuffleJob<T> implements AutoCloseable {
     }
 
     /** {@inheritDoc} */
-    @Override public void close() throws IgniteCheckedException {
+    @Override public void close() throws IgniteException {
         if (snd != null) {
             snd.cancel();
 
@@ -575,7 +575,7 @@ public class GridHadoopShuffleJob<T> implements AutoCloseable {
         }
 
         /** {@inheritDoc} */
-        @Override public void close() throws IgniteCheckedException {
+        @Override public void close() throws IgniteException {
             for (GridHadoopTaskOutput adder : adders) {
                 if (adder != null)
                     adder.close();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/shuffle/collections/GridHadoopConcurrentHashMultimap.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/shuffle/collections/GridHadoopConcurrentHashMultimap.java b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/shuffle/collections/GridHadoopConcurrentHashMultimap.java
index 6265a99..b45cae0 100644
--- a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/shuffle/collections/GridHadoopConcurrentHashMultimap.java
+++ b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/shuffle/collections/GridHadoopConcurrentHashMultimap.java
@@ -169,7 +169,7 @@ public class GridHadoopConcurrentHashMultimap extends GridHadoopHashMultimapBase
         assert s != State.REHASHING;
 
         return new Input(taskCtx) {
-            @Override public void close() throws IgniteCheckedException {
+            @Override public void close() throws IgniteException {
                 if (inputs.decrementAndGet() < 0)
                     throw new IllegalStateException();
 
@@ -535,7 +535,7 @@ public class GridHadoopConcurrentHashMultimap extends GridHadoopHashMultimapBase
         }
 
         /** {@inheritDoc} */
-        @Override public void close() throws IgniteCheckedException {
+        @Override public void close() throws IgniteException {
             if (!adders.remove(this))
                 throw new IllegalStateException();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc850c2/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/shuffle/collections/GridHadoopHashMultimapBase.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/shuffle/collections/GridHadoopHashMultimapBase.java b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/shuffle/collections/GridHadoopHashMultimapBase.java
index 8616a70..2b343b4 100644
--- a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/shuffle/collections/GridHadoopHashMultimapBase.java
+++ b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/shuffle/collections/GridHadoopHashMultimapBase.java
@@ -193,7 +193,7 @@ public abstract class GridHadoopHashMultimapBase extends GridHadoopMultimapBase
         }
 
         /** {@inheritDoc} */
-        @Override public void close() throws IgniteCheckedException {
+        @Override public void close() throws IgniteException {
             keyReader.close();
             valReader.close();
         }