ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [39/67] [abbrv] [partial] incubator-ignite git commit: Rename GridException to IgniteCheckedException, GridRuntimeException to IgniteException.
Date Fri, 12 Dec 2014 09:29:40 GMT
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentManager.java b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentManager.java
index 2bfa4d5..69c18ef 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentManager.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentManager.java
@@ -9,16 +9,16 @@
 
 package org.gridgain.grid.kernal.managers.deployment;
 
+import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.compute.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.lang.*;
-import org.gridgain.grid.*;
+import org.apache.ignite.spi.deployment.*;
 import org.gridgain.grid.kernal.*;
 import org.gridgain.grid.kernal.managers.*;
 import org.gridgain.grid.kernal.managers.deployment.protocol.gg.*;
 import org.gridgain.grid.kernal.processors.task.*;
-import org.apache.ignite.spi.deployment.*;
 import org.gridgain.grid.util.typedef.*;
 import org.gridgain.grid.util.typedef.internal.*;
 import org.jetbrains.annotations.*;
@@ -72,7 +72,7 @@ public class GridDeploymentManager extends GridManagerAdapter<DeploymentSpi> {
     }
 
     /** {@inheritDoc} */
-    @Override public void start() throws GridException {
+    @Override public void start() throws IgniteCheckedException {
         GridProtocolHandler.registerDeploymentManager(this);
 
         assertParameter(ctx.config().getDeploymentMode() != null, "ctx.config().getDeploymentMode() != null");
@@ -102,7 +102,7 @@ public class GridDeploymentManager extends GridManagerAdapter<DeploymentSpi> {
     }
 
     /** {@inheritDoc} */
-    @Override public void stop(boolean cancel) throws GridException {
+    @Override public void stop(boolean cancel) throws IgniteCheckedException {
         GridProtocolHandler.deregisterDeploymentManager();
 
         if (verStore != null)
@@ -126,7 +126,7 @@ public class GridDeploymentManager extends GridManagerAdapter<DeploymentSpi> {
     }
 
     /** {@inheritDoc} */
-    @Override public void onKernalStart0() throws GridException {
+    @Override public void onKernalStart0() throws IgniteCheckedException {
         locStore.onKernalStart();
         ldrStore.onKernalStart();
         verStore.onKernalStart();
@@ -205,7 +205,7 @@ public class GridDeploymentManager extends GridManagerAdapter<DeploymentSpi> {
             try {
                 comm.sendUndeployRequest(taskName, rmtNodes);
             }
-            catch (GridException e) {
+            catch (IgniteCheckedException e) {
                 U.error(log, "Failed to send undeployment request for task: " + taskName, e);
             }
         }
@@ -232,10 +232,10 @@ public class GridDeploymentManager extends GridManagerAdapter<DeploymentSpi> {
     /**
      * @param cls Class to deploy.
      * @param clsLdr Class loader.
-     * @throws GridException If deployment failed.
+     * @throws IgniteCheckedException If deployment failed.
      * @return Grid deployment.
      */
-    @Nullable public GridDeployment deploy(Class<?> cls, ClassLoader clsLdr) throws GridException {
+    @Nullable public GridDeployment deploy(Class<?> cls, ClassLoader clsLdr) throws IgniteCheckedException {
         if (clsLdr == null)
             clsLdr = getClass().getClassLoader();
 
@@ -251,7 +251,7 @@ public class GridDeploymentManager extends GridManagerAdapter<DeploymentSpi> {
                 cls = Class.forName(clsName, true, clsLdr);
             }
             catch (ClassNotFoundException e) {
-                throw new GridException("Cannot deploy parent class for lambda: " + clsName, e);
+                throw new IgniteCheckedException("Cannot deploy parent class for lambda: " + clsName, e);
             }
         }
 
@@ -262,7 +262,7 @@ public class GridDeploymentManager extends GridManagerAdapter<DeploymentSpi> {
             if ((ldr.deployMode() == ISOLATED || ldr.deployMode() == PRIVATE) &&
                 (ctx.config().getDeploymentMode() == SHARED || ctx.config().getDeploymentMode() == CONTINUOUS) &&
                 !U.hasAnnotation(cls, GridInternal.class))
-                throw new GridException("Attempt to deploy class loaded in ISOLATED or PRIVATE mode on node with " +
+                throw new IgniteCheckedException("Attempt to deploy class loaded in ISOLATED or PRIVATE mode on node with " +
                     "SHARED or CONTINUOUS deployment mode [cls=" + cls + ", clsDeployMode=" + ldr.deployMode() +
                     ", localDeployMode=" + ctx.config().getDeploymentMode() + ']');
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentPerLoaderStore.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentPerLoaderStore.java b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentPerLoaderStore.java
index 10709fe..702b025 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentPerLoaderStore.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentPerLoaderStore.java
@@ -9,18 +9,18 @@
 
 package org.gridgain.grid.kernal.managers.deployment;
 
+import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.events.*;
 import org.apache.ignite.lang.*;
 import org.apache.ignite.marshaller.optimized.*;
-import org.gridgain.grid.*;
+import org.apache.ignite.spi.deployment.*;
 import org.gridgain.grid.kernal.*;
 import org.gridgain.grid.kernal.managers.eventstorage.*;
 import org.gridgain.grid.kernal.processors.timeout.*;
-import org.apache.ignite.spi.deployment.*;
-import org.gridgain.grid.util.typedef.internal.*;
 import org.gridgain.grid.util.*;
+import org.gridgain.grid.util.typedef.internal.*;
 import org.jetbrains.annotations.*;
 
 import java.util.*;
@@ -55,7 +55,7 @@ public class GridDeploymentPerLoaderStore extends GridDeploymentStoreAdapter {
     }
 
     /** {@inheritDoc} */
-    @Override public void start() throws GridException {
+    @Override public void start() throws IgniteCheckedException {
         ctxLdr = U.detectClassLoader(getClass());
 
         discoLsnr = new GridLocalEventListener() {
@@ -121,7 +121,7 @@ public class GridDeploymentPerLoaderStore extends GridDeploymentStoreAdapter {
     }
 
     /** {@inheritDoc} */
-    @Override public void onKernalStart() throws GridException {
+    @Override public void onKernalStart() throws IgniteCheckedException {
         Collection<IsolatedDeployment> rmv = new LinkedList<>();
 
         // Check existing deployments for presence of obsolete nodes.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentPerVersionStore.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentPerVersionStore.java b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentPerVersionStore.java
index 15c23cd..d62b708 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentPerVersionStore.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentPerVersionStore.java
@@ -9,15 +9,15 @@
 
 package org.gridgain.grid.kernal.managers.deployment;
 
+import org.apache.ignite.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.events.*;
 import org.apache.ignite.lang.*;
 import org.apache.ignite.marshaller.optimized.*;
-import org.gridgain.grid.*;
+import org.apache.ignite.spi.deployment.*;
 import org.gridgain.grid.kernal.*;
 import org.gridgain.grid.kernal.managers.eventstorage.*;
 import org.gridgain.grid.kernal.processors.timeout.*;
-import org.apache.ignite.spi.deployment.*;
 import org.gridgain.grid.util.*;
 import org.gridgain.grid.util.typedef.*;
 import org.gridgain.grid.util.typedef.internal.*;
@@ -74,7 +74,7 @@ public class GridDeploymentPerVersionStore extends GridDeploymentStoreAdapter {
     }
 
     /** {@inheritDoc} */
-    @Override public void start() throws GridException {
+    @Override public void start() throws IgniteCheckedException {
         discoLsnr = new GridLocalEventListener() {
             @Override public void onEvent(IgniteEvent evt) {
                 assert evt instanceof IgniteDiscoveryEvent;
@@ -162,7 +162,7 @@ public class GridDeploymentPerVersionStore extends GridDeploymentStoreAdapter {
     }
 
     /** {@inheritDoc} */
-    @Override public void onKernalStart() throws GridException {
+    @Override public void onKernalStart() throws IgniteCheckedException {
         Collection<SharedDeployment> undeployed = new LinkedList<>();
 
         synchronized (mux) {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentStore.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentStore.java b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentStore.java
index dd618bf..40d15de 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentStore.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentStore.java
@@ -9,8 +9,8 @@
 
 package org.gridgain.grid.kernal.managers.deployment;
 
+import org.apache.ignite.*;
 import org.apache.ignite.lang.*;
-import org.gridgain.grid.*;
 import org.jetbrains.annotations.*;
 
 import java.util.*;
@@ -22,9 +22,9 @@ public interface GridDeploymentStore {
     /**
      * Starts store.
      *
-     * @throws GridException If start failed.
+     * @throws IgniteCheckedException If start failed.
      */
-    public void start() throws GridException;
+    public void start() throws IgniteCheckedException;
 
     /**
      * Stops store.
@@ -34,9 +34,9 @@ public interface GridDeploymentStore {
     /**
      * Kernal started callback.
      *
-     * @throws GridException If callback execution failed.
+     * @throws IgniteCheckedException If callback execution failed.
      */
-    public void onKernalStart() throws GridException;
+    public void onKernalStart() throws IgniteCheckedException;
 
     /**
      * Kernel stopping callback.
@@ -69,9 +69,9 @@ public interface GridDeploymentStore {
      * @param cls Class to explicitly deploy.
      * @param clsLdr Class loader.
      * @return Grid deployment.
-     * @throws GridException Id deployment failed.
+     * @throws IgniteCheckedException Id deployment failed.
      */
-    public GridDeployment explicitDeploy(Class<?> cls, ClassLoader clsLdr) throws GridException;
+    public GridDeployment explicitDeploy(Class<?> cls, ClassLoader clsLdr) throws IgniteCheckedException;
 
     /**
      * @param nodeId Optional ID of node that initiated request.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentStoreAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentStoreAdapter.java b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentStoreAdapter.java
index f491d70..6ea9228 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentStoreAdapter.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentStoreAdapter.java
@@ -68,7 +68,7 @@ abstract class GridDeploymentStoreAdapter implements GridDeploymentStore {
     }
 
     /** {@inheritDoc} */
-    @Override public void onKernalStart() throws GridException {
+    @Override public void onKernalStart() throws IgniteCheckedException {
         if (log.isDebugEnabled())
             log.debug("Ignoring kernel started callback: " + this);
     }
@@ -79,7 +79,7 @@ abstract class GridDeploymentStoreAdapter implements GridDeploymentStore {
     }
 
     /** {@inheritDoc} */
-    @Nullable @Override public GridDeployment explicitDeploy(Class<?> cls, ClassLoader clsLdr) throws GridException {
+    @Nullable @Override public GridDeployment explicitDeploy(Class<?> cls, ClassLoader clsLdr) throws IgniteCheckedException {
         if (log.isDebugEnabled())
             log.debug("Ignoring explicit deploy [cls=" + cls + ", clsLdr=" + clsLdr + ']');
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/discovery/GridDiscoveryManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/discovery/GridDiscoveryManager.java b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/discovery/GridDiscoveryManager.java
index 48fee0d..54994d1 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/discovery/GridDiscoveryManager.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/discovery/GridDiscoveryManager.java
@@ -9,12 +9,16 @@
 
 package org.gridgain.grid.kernal.managers.discovery;
 
+import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.events.*;
 import org.apache.ignite.lang.*;
 import org.apache.ignite.plugin.extensions.discovery.*;
+import org.apache.ignite.plugin.security.*;
+import org.apache.ignite.plugin.segmentation.*;
 import org.apache.ignite.product.*;
 import org.apache.ignite.spi.*;
+import org.apache.ignite.spi.discovery.*;
 import org.apache.ignite.thread.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.kernal.*;
@@ -25,9 +29,6 @@ import org.gridgain.grid.kernal.managers.security.*;
 import org.gridgain.grid.kernal.processors.cache.*;
 import org.gridgain.grid.kernal.processors.jobmetrics.*;
 import org.gridgain.grid.kernal.processors.service.*;
-import org.apache.ignite.plugin.security.*;
-import org.apache.ignite.plugin.segmentation.*;
-import org.apache.ignite.spi.discovery.*;
 import org.gridgain.grid.util.*;
 import org.gridgain.grid.util.future.*;
 import org.gridgain.grid.util.lang.*;
@@ -46,8 +47,8 @@ import java.util.zip.*;
 
 import static java.util.concurrent.TimeUnit.*;
 import static org.apache.ignite.events.IgniteEventType.*;
-import static org.gridgain.grid.kernal.GridNodeAttributes.*;
 import static org.apache.ignite.plugin.segmentation.GridSegmentationPolicy.*;
+import static org.gridgain.grid.kernal.GridNodeAttributes.*;
 
 /**
  * Discovery SPI manager.
@@ -206,7 +207,7 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi> {
     }
 
     /** {@inheritDoc} */
-    @Override public void start() throws GridException {
+    @Override public void start() throws IgniteCheckedException {
         discoOrdered = discoOrdered();
 
         histSupported = historySupported();
@@ -219,7 +220,7 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi> {
 
         if (hasRslvrs) {
             if (segChkFreq < 0)
-                throw new GridException("Segment check frequency cannot be negative: " + segChkFreq);
+                throw new IgniteCheckedException("Segment check frequency cannot be negative: " + segChkFreq);
 
             if (segChkFreq > 0 && segChkFreq < 2000)
                 U.warn(log, "Configuration parameter 'segmentCheckFrequency' is too low " +
@@ -234,7 +235,7 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi> {
 
         getSpi().setAuthenticator(new DiscoverySpiNodeAuthenticator() {
             @Override public GridSecurityContext authenticateNode(ClusterNode node, GridSecurityCredentials cred)
-                throws GridException {
+                throws IgniteCheckedException {
                 return ctx.security().authenticateNode(node, cred);
             }
 
@@ -584,9 +585,9 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi> {
     /**
      * Checks segment on start waiting for correct segment if necessary.
      *
-     * @throws GridException If check failed.
+     * @throws IgniteCheckedException If check failed.
      */
-    private void checkSegmentOnStart() throws GridException {
+    private void checkSegmentOnStart() throws IgniteCheckedException {
         assert hasRslvrs;
 
         if (log.isDebugEnabled())
@@ -603,7 +604,7 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi> {
                 U.sleep(2000);
             }
             else
-                throw new GridException("Failed to check network segment.");
+                throw new IgniteCheckedException("Failed to check network segment.");
         }
 
         if (log.isDebugEnabled())
@@ -614,9 +615,9 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi> {
      * Checks whether attributes of the local node are consistent with remote nodes.
      *
      * @param nodes List of remote nodes to check attributes on.
-     * @throws GridException In case of error.
+     * @throws IgniteCheckedException In case of error.
      */
-    private void checkAttributes(Iterable<ClusterNode> nodes) throws GridException {
+    private void checkAttributes(Iterable<ClusterNode> nodes) throws IgniteCheckedException {
         ClusterNode locNode = getSpi().getLocalNode();
 
         assert locNode != null;
@@ -652,7 +653,7 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi> {
                 Object rmtMode = n.attribute(ATTR_DEPLOYMENT_MODE);
 
                 if (!locMode.equals(rmtMode))
-                    throw new GridException("Remote node has deployment mode different from local " +
+                    throw new IgniteCheckedException("Remote node has deployment mode different from local " +
                         "[locId8=" + U.id8(locNode.id()) + ", locMode=" + locMode +
                         ", rmtId8=" + U.id8(n.id()) + ", rmtMode=" + rmtMode +
                         ", rmtAddrs=" + U.addressesAsString(n) + ']');
@@ -660,7 +661,7 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi> {
                 boolean rmtP2pEnabled = n.attribute(ATTR_PEER_CLASSLOADING);
 
                 if (locP2pEnabled != rmtP2pEnabled)
-                    throw new GridException("Remote node has peer class loading enabled flag different from local " +
+                    throw new IgniteCheckedException("Remote node has peer class loading enabled flag different from local " +
                         "[locId8=" + U.id8(locNode.id()) + ", locPeerClassLoading=" + locP2pEnabled +
                         ", rmtId8=" + U.id8(n.id()) + ", rmtPeerClassLoading=" + rmtP2pEnabled +
                         ", rmtAddrs=" + U.addressesAsString(n) + ']');
@@ -797,11 +798,11 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi> {
         }
 
         if (!locJoinEvt.isDone())
-            locJoinEvt.onDone(new GridException("Failed to wait for local node joined event (grid is stopping)."));
+            locJoinEvt.onDone(new IgniteCheckedException("Failed to wait for local node joined event (grid is stopping)."));
     }
 
     /** {@inheritDoc} */
-    @Override public void stop(boolean cancel) throws GridException {
+    @Override public void stop(boolean cancel) throws IgniteCheckedException {
         // Stop receiving notifications.
         getSpi().setListener(null);
 
@@ -1128,7 +1129,7 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi> {
         }
 
         if (cache == null) {
-            throw new GridRuntimeException("Failed to resolve nodes topology [cacheName=" + cacheName +
+            throw new IgniteException("Failed to resolve nodes topology [cacheName=" + cacheName +
                 ", topVer=" + topVer + ", history=" + discoCacheHist.keySet() +
                 ", locNode=" + ctx.discovery().localNode() + ']');
         }
@@ -1172,8 +1173,8 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi> {
         try {
             return locJoinEvt.get();
         }
-        catch (GridException e) {
-            throw new GridRuntimeException(e);
+        catch (IgniteCheckedException e) {
+            throw new IgniteException(e);
         }
     }
 
@@ -1411,7 +1412,7 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi> {
                     try {
                         checkAttributes(F.asList(node));
                     }
-                    catch (GridException e) {
+                    catch (IgniteCheckedException e) {
                         U.warn(log, e.getMessage()); // We a have well-formed attribute warning here.
                     }
 
@@ -1630,7 +1631,7 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi> {
             try {
                 cpuTime = U.<Long>property(os, "processCpuTime");
             }
-            catch (GridRuntimeException ignored) {
+            catch (IgniteException ignored) {
                 return -1;
             }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/eventstorage/GridEventStorageManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/eventstorage/GridEventStorageManager.java b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/eventstorage/GridEventStorageManager.java
index ade9c52..87da0a9 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/eventstorage/GridEventStorageManager.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/eventstorage/GridEventStorageManager.java
@@ -9,18 +9,19 @@
 
 package org.gridgain.grid.kernal.managers.eventstorage;
 
+import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.events.*;
 import org.apache.ignite.lang.*;
 import org.apache.ignite.marshaller.*;
+import org.apache.ignite.plugin.security.*;
 import org.apache.ignite.spi.*;
+import org.apache.ignite.spi.eventstorage.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.kernal.*;
 import org.gridgain.grid.kernal.managers.*;
 import org.gridgain.grid.kernal.managers.communication.*;
 import org.gridgain.grid.kernal.managers.deployment.*;
-import org.apache.ignite.plugin.security.*;
-import org.apache.ignite.spi.eventstorage.*;
 import org.gridgain.grid.util.*;
 import org.gridgain.grid.util.future.*;
 import org.gridgain.grid.util.typedef.*;
@@ -205,7 +206,7 @@ public class GridEventStorageManager extends GridManagerAdapter<EventStorageSpi>
     }
 
     /** {@inheritDoc} */
-    @Override public void stop(boolean cancel) throws GridException {
+    @Override public void stop(boolean cancel) throws IgniteCheckedException {
         stopSpi();
 
         if (log.isDebugEnabled())
@@ -213,7 +214,7 @@ public class GridEventStorageManager extends GridManagerAdapter<EventStorageSpi>
     }
 
     /** {@inheritDoc} */
-    @Override public void start() throws GridException {
+    @Override public void start() throws IgniteCheckedException {
         Map<IgnitePredicate<? extends IgniteEvent>, int[]> evtLsnrs = ctx.config().getLocalEventListeners();
 
         if (evtLsnrs != null) {
@@ -513,8 +514,8 @@ public class GridEventStorageManager extends GridManagerAdapter<EventStorageSpi>
         try {
             ctx.resource().injectGeneric(lsnr);
         }
-        catch (GridException e) {
-            throw new GridRuntimeException("Failed to inject resources to event listener: " + lsnr, e);
+        catch (IgniteCheckedException e) {
+            throw new IgniteException("Failed to inject resources to event listener: " + lsnr, e);
         }
 
         addLocalEventListener(new UserListenerWrapper(lsnr), types);
@@ -677,10 +678,10 @@ public class GridEventStorageManager extends GridManagerAdapter<EventStorageSpi>
      * @param p Optional predicate.
      * @param types Event types to wait for.
      * @return Event.
-     * @throws GridException Thrown in case of any errors.
+     * @throws IgniteCheckedException Thrown in case of any errors.
      */
     public IgniteEvent waitForEvent(long timeout, @Nullable Runnable c,
-        @Nullable final IgnitePredicate<? super IgniteEvent> p, int... types) throws GridException {
+        @Nullable final IgnitePredicate<? super IgniteEvent> p, int... types) throws IgniteCheckedException {
         assert timeout >= 0;
 
         final GridFutureAdapter<IgniteEvent> fut = new GridFutureAdapter<>(ctx);
@@ -700,7 +701,7 @@ public class GridEventStorageManager extends GridManagerAdapter<EventStorageSpi>
                 c.run();
         }
         catch (Exception e) {
-            throw new GridException(e);
+            throw new IgniteCheckedException(e);
         }
 
         return fut.get(timeout);
@@ -764,7 +765,7 @@ public class GridEventStorageManager extends GridManagerAdapter<EventStorageSpi>
                 try {
                     fut.onDone(query(p, nodes, timeout));
                 }
-                catch (GridException e) {
+                catch (IgniteCheckedException e) {
                     fut.onDone(e);
                 }
             }
@@ -778,11 +779,11 @@ public class GridEventStorageManager extends GridManagerAdapter<EventStorageSpi>
      * @param nodes Collection of nodes.
      * @param timeout Maximum time to wait for result, if {@code 0}, then wait until result is received.
      * @return Collection of events.
-     * @throws GridException Thrown in case of any errors.
+     * @throws IgniteCheckedException Thrown in case of any errors.
      */
     @SuppressWarnings({"SynchronizationOnLocalVariableOrMethodParameter", "deprecation"})
     private <T extends IgniteEvent> List<T> query(IgnitePredicate<T> p, Collection<? extends ClusterNode> nodes,
-        long timeout) throws GridException {
+        long timeout) throws IgniteCheckedException {
         assert p != null;
         assert nodes != null;
 
@@ -839,7 +840,7 @@ public class GridEventStorageManager extends GridManagerAdapter<EventStorageSpi>
                     if (res.exceptionBytes() != null)
                         res.exception(marsh.<Throwable>unmarshal(res.exceptionBytes(), null));
                 }
-                catch (GridException e) {
+                catch (IgniteCheckedException e) {
                     U.error(log, "Failed to unmarshal events query response: " + msg, e);
 
                     return;
@@ -914,11 +915,11 @@ public class GridEventStorageManager extends GridManagerAdapter<EventStorageSpi>
                 catch (InterruptedException e) {
                     Thread.currentThread().interrupt();
 
-                    throw new GridException("Got interrupted while waiting for event query responses.", e);
+                    throw new IgniteCheckedException("Got interrupted while waiting for event query responses.", e);
                 }
 
                 if (err.get() != null)
-                    throw new GridException("Failed to query events due to exception on remote node.", err.get());
+                    throw new IgniteCheckedException("Failed to query events due to exception on remote node.", err.get());
 
                 if (!uids.isEmpty())
                     uidsCp = new LinkedList<>(uids);
@@ -932,7 +933,7 @@ public class GridEventStorageManager extends GridManagerAdapter<EventStorageSpi>
                         iter.remove();
 
                 if (!uidsCp.isEmpty())
-                    throw new GridException("Failed to receive event query response from following nodes: " +
+                    throw new IgniteCheckedException("Failed to receive event query response from following nodes: " +
                         uidsCp);
             }
         }
@@ -952,10 +953,10 @@ public class GridEventStorageManager extends GridManagerAdapter<EventStorageSpi>
      * @param topic Topic to send the message to.
      * @param msg Event to be sent.
      * @param plc Type of processing.
-     * @throws GridException If sending failed.
+     * @throws IgniteCheckedException If sending failed.
      */
     private void sendMessage(Collection<? extends ClusterNode> nodes, GridTopic topic,
-        GridEventStorageMessage msg, GridIoPolicy plc) throws GridException {
+        GridEventStorageMessage msg, GridIoPolicy plc) throws IgniteCheckedException {
         ClusterNode locNode = F.find(nodes, null, F.localNode(ctx.localNodeId()));
 
         Collection<? extends ClusterNode> rmtNodes = F.view(nodes, F.remoteNodes(ctx.localNodeId()));
@@ -1054,7 +1055,7 @@ public class GridEventStorageManager extends GridManagerAdapter<EventStorageSpi>
                     // Get local events.
                     evts = localEvents(filter);
                 }
-                catch (GridException e) {
+                catch (IgniteCheckedException e) {
                     U.error(log, "Failed to query events [nodeId=" + nodeId + ", filter=" + filter + ']', e);
 
                     evts = Collections.emptyList();
@@ -1084,7 +1085,7 @@ public class GridEventStorageManager extends GridManagerAdapter<EventStorageSpi>
 
                     ctx.io().send(node, req.responseTopic(), res, PUBLIC_POOL);
                 }
-                catch (GridException e) {
+                catch (IgniteCheckedException e) {
                     U.error(log, "Failed to send event query response to node [node=" + nodeId + ", res=" +
                         res + ']', e);
                 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/failover/GridFailoverContextImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/failover/GridFailoverContextImpl.java b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/failover/GridFailoverContextImpl.java
index 5e78803..f275eaa 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/failover/GridFailoverContextImpl.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/failover/GridFailoverContextImpl.java
@@ -9,14 +9,15 @@
 
 package org.gridgain.grid.kernal.managers.failover;
 
+import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.compute.*;
-import org.gridgain.grid.*;
+import org.apache.ignite.spi.failover.*;
 import org.gridgain.grid.kernal.*;
 import org.gridgain.grid.kernal.managers.loadbalancer.*;
-import org.apache.ignite.spi.failover.*;
-import org.gridgain.grid.util.typedef.internal.*;
 import org.gridgain.grid.util.tostring.*;
+import org.gridgain.grid.util.typedef.internal.*;
+
 import java.util.*;
 
 /**
@@ -62,7 +63,7 @@ public class GridFailoverContextImpl implements FailoverContext {
     }
 
     /** {@inheritDoc} */
-    @Override public ClusterNode getBalancedNode(List<ClusterNode> top) throws GridException {
+    @Override public ClusterNode getBalancedNode(List<ClusterNode> top) throws IgniteCheckedException {
         return loadMgr.getBalancedNode(taskSes, top, jobRes.getJob());
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/failover/GridFailoverManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/failover/GridFailoverManager.java b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/failover/GridFailoverManager.java
index 97e1679..bae1221 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/failover/GridFailoverManager.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/failover/GridFailoverManager.java
@@ -9,12 +9,13 @@
 
 package org.gridgain.grid.kernal.managers.failover;
 
+import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.compute.*;
-import org.gridgain.grid.*;
+import org.apache.ignite.spi.failover.*;
 import org.gridgain.grid.kernal.*;
 import org.gridgain.grid.kernal.managers.*;
-import org.apache.ignite.spi.failover.*;
+
 import java.util.*;
 
 /**
@@ -29,7 +30,7 @@ public class GridFailoverManager extends GridManagerAdapter<FailoverSpi> {
     }
 
     /** {@inheritDoc} */
-    @Override public void start() throws GridException {
+    @Override public void start() throws IgniteCheckedException {
         startSpi();
 
         if (log.isDebugEnabled())
@@ -37,7 +38,7 @@ public class GridFailoverManager extends GridManagerAdapter<FailoverSpi> {
     }
 
     /** {@inheritDoc} */
-    @Override public void stop(boolean cancel) throws GridException {
+    @Override public void stop(boolean cancel) throws IgniteCheckedException {
         stopSpi();
 
         if (log.isDebugEnabled())

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/indexing/GridIndexingManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/indexing/GridIndexingManager.java b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/indexing/GridIndexingManager.java
index 52cb769..bccc4d8 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/indexing/GridIndexingManager.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/indexing/GridIndexingManager.java
@@ -9,13 +9,13 @@
 
 package org.gridgain.grid.kernal.managers.indexing;
 
+import org.apache.ignite.*;
 import org.apache.ignite.spi.*;
-import org.gridgain.grid.*;
+import org.apache.ignite.spi.indexing.*;
 import org.gridgain.grid.kernal.*;
+import org.gridgain.grid.kernal.managers.*;
 import org.gridgain.grid.util.*;
 import org.gridgain.grid.util.typedef.internal.*;
-import org.gridgain.grid.kernal.managers.*;
-import org.apache.ignite.spi.indexing.*;
 
 import java.util.*;
 
@@ -34,9 +34,9 @@ public class GridIndexingManager extends GridManagerAdapter<GridIndexingSpi> {
     }
 
     /**
-     * @throws GridException Thrown in case of any errors.
+     * @throws IgniteCheckedException Thrown in case of any errors.
      */
-    @Override public void start() throws GridException {
+    @Override public void start() throws IgniteCheckedException {
         if (ctx.config().isDaemon())
             return;
 
@@ -58,9 +58,9 @@ public class GridIndexingManager extends GridManagerAdapter<GridIndexingSpi> {
     }
 
     /**
-     * @throws GridException Thrown in case of any errors.
+     * @throws IgniteCheckedException Thrown in case of any errors.
      */
-    @Override public void stop(boolean cancel) throws GridException {
+    @Override public void stop(boolean cancel) throws IgniteCheckedException {
         if (ctx.config().isDaemon())
             return;
 
@@ -77,10 +77,10 @@ public class GridIndexingManager extends GridManagerAdapter<GridIndexingSpi> {
      * @param key Key.
      * @param val Value.
      * @param expirationTime Expiration time or 0 if never expires.
-     * @throws GridException In case of error.
+     * @throws IgniteCheckedException In case of error.
      */
     @SuppressWarnings("unchecked")
-    public <K, V> void store(final String space, final K key, final V val, long expirationTime) throws GridException {
+    public <K, V> void store(final String space, final K key, final V val, long expirationTime) throws IgniteCheckedException {
         assert key != null;
         assert val != null;
 
@@ -104,10 +104,10 @@ public class GridIndexingManager extends GridManagerAdapter<GridIndexingSpi> {
     /**
      * @param space Space.
      * @param key Key.
-     * @throws GridException Thrown in case of any errors.
+     * @throws IgniteCheckedException Thrown in case of any errors.
      */
     @SuppressWarnings("unchecked")
-    public void remove(String space, Object key) throws GridException {
+    public void remove(String space, Object key) throws IgniteCheckedException {
         assert key != null;
 
         if (!enabled())
@@ -129,13 +129,13 @@ public class GridIndexingManager extends GridManagerAdapter<GridIndexingSpi> {
      * @param params Parameters collection.
      * @param filters Filters.
      * @return Query result.
-     * @throws GridException If failed.
+     * @throws IgniteCheckedException If failed.
      */
     @SuppressWarnings("unchecked")
     public IgniteSpiCloseableIterator<?> query(String space, Collection<Object> params, GridIndexingQueryFilter filters)
-        throws GridException {
+        throws IgniteCheckedException {
         if (!enabled())
-            throw new GridException("Indexing SPI is not configured.");
+            throw new IgniteCheckedException("Indexing SPI is not configured.");
 
         if (!busyLock.enterBusy())
             throw new IllegalStateException("Failed to execute query (grid is stopping).");
@@ -147,13 +147,13 @@ public class GridIndexingManager extends GridManagerAdapter<GridIndexingSpi> {
                 return new GridEmptyCloseableIterator<>();
 
             return new IgniteSpiCloseableIterator<Object>() {
-                @Override public void close() throws GridException {
+                @Override public void close() throws IgniteCheckedException {
                     if (res instanceof AutoCloseable) {
                         try {
                             ((AutoCloseable)res).close();
                         }
                         catch (Exception e) {
-                            throw new GridException(e);
+                            throw new IgniteCheckedException(e);
                         }
                     }
                 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/loadbalancer/GridLoadBalancerManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/loadbalancer/GridLoadBalancerManager.java b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/loadbalancer/GridLoadBalancerManager.java
index c4f5fed..78e2f15 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/loadbalancer/GridLoadBalancerManager.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/loadbalancer/GridLoadBalancerManager.java
@@ -9,15 +9,15 @@
 
 package org.gridgain.grid.kernal.managers.loadbalancer;
 
+import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.compute.*;
-import org.gridgain.grid.*;
+import org.apache.ignite.spi.loadbalancing.*;
 import org.gridgain.grid.cache.*;
 import org.gridgain.grid.cache.affinity.*;
 import org.gridgain.grid.kernal.*;
 import org.gridgain.grid.kernal.managers.*;
 import org.gridgain.grid.kernal.managers.deployment.*;
-import org.apache.ignite.spi.loadbalancing.*;
 import org.gridgain.grid.util.typedef.*;
 import org.gridgain.grid.util.typedef.internal.*;
 import org.jetbrains.annotations.*;
@@ -36,7 +36,7 @@ public class GridLoadBalancerManager extends GridManagerAdapter<LoadBalancingSpi
     }
 
     /** {@inheritDoc} */
-    @Override public void start() throws GridException {
+    @Override public void start() throws IgniteCheckedException {
         startSpi();
 
         if (log.isDebugEnabled())
@@ -44,7 +44,7 @@ public class GridLoadBalancerManager extends GridManagerAdapter<LoadBalancingSpi
     }
 
     /** {@inheritDoc} */
-    @Override public void stop(boolean cancel) throws GridException {
+    @Override public void stop(boolean cancel) throws IgniteCheckedException {
         stopSpi();
 
         if (log.isDebugEnabled())
@@ -56,10 +56,10 @@ public class GridLoadBalancerManager extends GridManagerAdapter<LoadBalancingSpi
      * @param top Task topology.
      * @param job Job to balance.
      * @return Next balanced node.
-     * @throws GridException If anything failed.
+     * @throws IgniteCheckedException If anything failed.
      */
     public ClusterNode getBalancedNode(GridTaskSessionImpl ses, List<ClusterNode> top, ComputeJob job)
-        throws GridException {
+        throws IgniteCheckedException {
         assert ses != null;
         assert top != null;
         assert job != null;
@@ -89,7 +89,7 @@ public class GridLoadBalancerManager extends GridManagerAdapter<LoadBalancingSpi
         // Return value is not intended for sending over network.
         return new GridLoadBalancerAdapter() {
             @Nullable @Override public ClusterNode getBalancedNode(ComputeJob job, @Nullable Collection<ClusterNode> exclNodes)
-                throws GridException {
+                throws IgniteCheckedException {
                 A.notNull(job, "job");
 
                 if (F.isEmpty(exclNodes))
@@ -111,10 +111,10 @@ public class GridLoadBalancerManager extends GridManagerAdapter<LoadBalancingSpi
      * @param job Grid job.
      * @param nodes Topology nodes.
      * @return Cache affinity node or {@code null} if this job is not routed with cache affinity key.
-     * @throws GridException If failed to determine whether to use affinity routing.
+     * @throws IgniteCheckedException If failed to determine whether to use affinity routing.
      */
     @Nullable private ClusterNode cacheAffinityNode(GridDeployment dep, ComputeJob job, Collection<ClusterNode> nodes)
-        throws GridException {
+        throws IgniteCheckedException {
         assert dep != null;
         assert job != null;
         assert nodes != null;
@@ -136,19 +136,19 @@ public class GridLoadBalancerManager extends GridManagerAdapter<LoadBalancingSpi
             ClusterNode node = ctx.affinity().mapKeyToNode(cacheName, key);
 
             if (node == null)
-                throw new GridException("Failed to map key to node (is cache with given name started?) [gridName=" +
+                throw new IgniteCheckedException("Failed to map key to node (is cache with given name started?) [gridName=" +
                     ctx.gridName() + ", key=" + key + ", cacheName=" + cacheName +
                     ", nodes=" + U.toShortString(nodes) + ']');
 
             if (!nodes.contains(node))
-                throw new GridException("Failed to map key to node (projection nodes do not contain affinity node) " +
+                throw new IgniteCheckedException("Failed to map key to node (projection nodes do not contain affinity node) " +
                     "[gridName=" + ctx.gridName() + ", key=" + key + ", cacheName=" + cacheName +
                     ", nodes=" + U.toShortString(nodes) + ", node=" + U.toShortString(node) + ']');
 
             return node;
         }
-        catch (GridException e) {
-            throw new GridException("Failed to map affinity key to node for job [gridName=" + ctx.gridName() +
+        catch (IgniteCheckedException e) {
+            throw new IgniteCheckedException("Failed to map affinity key to node for job [gridName=" + ctx.gridName() +
                 ", job=" + job + ']', e);
         }
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/securesession/GridSecureSessionManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/securesession/GridSecureSessionManager.java b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/securesession/GridSecureSessionManager.java
index 703a74b..e3f17f9 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/securesession/GridSecureSessionManager.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/securesession/GridSecureSessionManager.java
@@ -9,10 +9,10 @@
 
 package org.gridgain.grid.kernal.managers.securesession;
 
-import org.gridgain.grid.*;
+import org.apache.ignite.*;
+import org.apache.ignite.plugin.security.*;
 import org.gridgain.grid.kernal.managers.*;
 import org.gridgain.grid.kernal.managers.security.*;
-import org.apache.ignite.plugin.security.*;
 import org.jetbrains.annotations.*;
 
 import java.util.*;
@@ -27,10 +27,10 @@ public interface GridSecureSessionManager extends GridManager {
      * @param tok Token.
      * @param params Parameters.
      * @return Validated secure session or {@code null} if session is not valid.
-     * @throws GridException If error occurred.
+     * @throws IgniteCheckedException If error occurred.
      */
     public GridSecureSession validateSession(GridSecuritySubjectType subjType, UUID subjId, @Nullable byte[] tok,
-        @Nullable Object params) throws GridException;
+        @Nullable Object params) throws IgniteCheckedException;
 
     /**
      * Generates secure session token.
@@ -42,5 +42,5 @@ public interface GridSecureSessionManager extends GridManager {
      * @return Generated session token.
      */
     public byte[] updateSession(GridSecuritySubjectType subjType, UUID subjId, GridSecurityContext subjCtx,
-        @Nullable Object params) throws GridException;
+        @Nullable Object params) throws IgniteCheckedException;
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/securesession/os/GridOsSecureSessionManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/securesession/os/GridOsSecureSessionManager.java b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/securesession/os/GridOsSecureSessionManager.java
index a3fe176..18e9e66 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/securesession/os/GridOsSecureSessionManager.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/securesession/os/GridOsSecureSessionManager.java
@@ -9,12 +9,12 @@
 
 package org.gridgain.grid.kernal.managers.securesession.os;
 
-import org.gridgain.grid.*;
+import org.apache.ignite.*;
+import org.apache.ignite.plugin.security.*;
 import org.gridgain.grid.kernal.*;
 import org.gridgain.grid.kernal.managers.*;
 import org.gridgain.grid.kernal.managers.securesession.*;
 import org.gridgain.grid.kernal.managers.security.*;
-import org.apache.ignite.plugin.security.*;
 import org.jetbrains.annotations.*;
 
 import java.util.*;
@@ -36,7 +36,7 @@ public class GridOsSecureSessionManager extends GridNoopManagerAdapter implement
     /** {@inheritDoc} */
     @Override public GridSecureSession validateSession(GridSecuritySubjectType subjType, UUID subjId,
         @Nullable byte[] tok,
-        @Nullable Object params) throws GridException {
+        @Nullable Object params) throws IgniteCheckedException {
         return null;
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/security/GridSecurityImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/security/GridSecurityImpl.java b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/security/GridSecurityImpl.java
index efb4df1..307b18d 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/security/GridSecurityImpl.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/security/GridSecurityImpl.java
@@ -9,9 +9,9 @@
 
 package org.gridgain.grid.kernal.managers.security;
 
-import org.gridgain.grid.*;
-import org.gridgain.grid.kernal.*;
+import org.apache.ignite.*;
 import org.apache.ignite.plugin.security.*;
+import org.gridgain.grid.kernal.*;
 
 import java.io.*;
 import java.util.*;
@@ -45,12 +45,12 @@ public class GridSecurityImpl implements GridSecurity, Externalizable {
     }
 
     /** {@inheritDoc} */
-    @Override public Collection<GridSecuritySubject> authenticatedSubjects() throws GridException {
+    @Override public Collection<GridSecuritySubject> authenticatedSubjects() throws IgniteCheckedException {
         return secMgr.authenticatedSubjects();
     }
 
     /** {@inheritDoc} */
-    @Override public GridSecuritySubject authenticatedSubject(UUID subjId) throws GridException {
+    @Override public GridSecuritySubject authenticatedSubject(UUID subjId) throws IgniteCheckedException {
         return secMgr.authenticatedSubject(subjId);
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/security/GridSecurityManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/security/GridSecurityManager.java b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/security/GridSecurityManager.java
index 28f3337..a772077 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/security/GridSecurityManager.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/security/GridSecurityManager.java
@@ -9,11 +9,11 @@
 
 package org.gridgain.grid.kernal.managers.security;
 
+import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;
+import org.apache.ignite.plugin.security.*;
 import org.apache.ignite.spi.authentication.*;
-import org.gridgain.grid.*;
 import org.gridgain.grid.kernal.managers.*;
-import org.apache.ignite.plugin.security.*;
 import org.jetbrains.annotations.*;
 
 import java.util.*;
@@ -28,9 +28,9 @@ public interface GridSecurityManager extends GridManager {
      * @param node Node id to authenticate.
      * @param cred Security credentials.
      * @return {@code True} if succeeded, {@code false} otherwise.
-     * @throws GridException If error occurred.
+     * @throws IgniteCheckedException If error occurred.
      */
-    public GridSecurityContext authenticateNode(ClusterNode node, GridSecurityCredentials cred) throws GridException;
+    public GridSecurityContext authenticateNode(ClusterNode node, GridSecurityCredentials cred) throws IgniteCheckedException;
 
     /**
      * Gets flag indicating whether all nodes or coordinator only should run the authentication for joining node.
@@ -44,26 +44,26 @@ public interface GridSecurityManager extends GridManager {
      *
      * @param ctx Authentication context.
      * @return {@code True} if succeeded, {@code false} otherwise.
-     * @throws GridException If error occurred.
+     * @throws IgniteCheckedException If error occurred.
      */
-    public GridSecurityContext authenticate(AuthenticationContext ctx) throws GridException;
+    public GridSecurityContext authenticate(AuthenticationContext ctx) throws IgniteCheckedException;
 
     /**
      * Gets collection of authenticated nodes.
      *
      * @return Collection of authenticated nodes.
-     * @throws GridException If error occurred.
+     * @throws IgniteCheckedException If error occurred.
      */
-    public Collection<GridSecuritySubject> authenticatedSubjects() throws GridException;
+    public Collection<GridSecuritySubject> authenticatedSubjects() throws IgniteCheckedException;
 
     /**
      * Gets authenticated node subject.
      *
      * @param subjId Subject ID.
      * @return Security subject.
-     * @throws GridException If error occurred.
+     * @throws IgniteCheckedException If error occurred.
      */
-    public GridSecuritySubject authenticatedSubject(UUID subjId) throws GridException;
+    public GridSecuritySubject authenticatedSubject(UUID subjId) throws IgniteCheckedException;
 
     /**
      * Authorizes grid operation.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/security/os/GridOsSecurityManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/security/os/GridOsSecurityManager.java b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/security/os/GridOsSecurityManager.java
index 3831148..a7251e5 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/security/os/GridOsSecurityManager.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/security/os/GridOsSecurityManager.java
@@ -9,13 +9,13 @@
 
 package org.gridgain.grid.kernal.managers.security.os;
 
+import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;
+import org.apache.ignite.plugin.security.*;
 import org.apache.ignite.spi.authentication.*;
-import org.gridgain.grid.*;
 import org.gridgain.grid.kernal.*;
 import org.gridgain.grid.kernal.managers.*;
 import org.gridgain.grid.kernal.managers.security.*;
-import org.apache.ignite.plugin.security.*;
 import org.gridgain.grid.util.typedef.*;
 import org.jetbrains.annotations.*;
 
@@ -38,7 +38,7 @@ public class GridOsSecurityManager extends GridNoopManagerAdapter implements Gri
 
     /** {@inheritDoc} */
     @Override public GridSecurityContext authenticateNode(ClusterNode node, GridSecurityCredentials cred)
-        throws GridException {
+        throws IgniteCheckedException {
         GridSecuritySubjectAdapter s = new GridSecuritySubjectAdapter(GridSecuritySubjectType.REMOTE_NODE, node.id());
 
         s.address(new InetSocketAddress(F.first(node.addresses()), 0));
@@ -54,7 +54,7 @@ public class GridOsSecurityManager extends GridNoopManagerAdapter implements Gri
     }
 
     /** {@inheritDoc} */
-    @Override public GridSecurityContext authenticate(AuthenticationContext authCtx) throws GridException {
+    @Override public GridSecurityContext authenticate(AuthenticationContext authCtx) throws IgniteCheckedException {
         GridSecuritySubjectAdapter s = new GridSecuritySubjectAdapter(authCtx.subjectType(), authCtx.subjectId());
 
         s.permissions(ALLOW_ALL);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/swapspace/GridSwapSpaceManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/swapspace/GridSwapSpaceManager.java b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/swapspace/GridSwapSpaceManager.java
index 93523b9..7a68018 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/swapspace/GridSwapSpaceManager.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/swapspace/GridSwapSpaceManager.java
@@ -9,17 +9,17 @@
 
 package org.gridgain.grid.kernal.managers.swapspace;
 
+import org.apache.ignite.*;
 import org.apache.ignite.events.*;
 import org.apache.ignite.lang.*;
 import org.apache.ignite.marshaller.*;
 import org.apache.ignite.spi.*;
-import org.gridgain.grid.*;
+import org.apache.ignite.spi.swapspace.*;
 import org.gridgain.grid.kernal.*;
 import org.gridgain.grid.kernal.managers.*;
-import org.apache.ignite.spi.swapspace.*;
 import org.gridgain.grid.util.*;
-import org.gridgain.grid.util.typedef.internal.*;
 import org.gridgain.grid.util.lang.*;
+import org.gridgain.grid.util.typedef.internal.*;
 import org.jetbrains.annotations.*;
 
 import java.util.*;
@@ -41,7 +41,7 @@ public class GridSwapSpaceManager extends GridManagerAdapter<SwapSpaceSpi> {
     }
 
     /** {@inheritDoc} */
-    @Override public void start() throws GridException {
+    @Override public void start() throws IgniteCheckedException {
         if (ctx.config().isDaemon())
             return;
 
@@ -116,7 +116,7 @@ public class GridSwapSpaceManager extends GridManagerAdapter<SwapSpaceSpi> {
     }
 
     /** {@inheritDoc} */
-    @Override public void stop(boolean cancel) throws GridException {
+    @Override public void stop(boolean cancel) throws IgniteCheckedException {
         if (ctx.config().isDaemon())
             return;
 
@@ -133,17 +133,17 @@ public class GridSwapSpaceManager extends GridManagerAdapter<SwapSpaceSpi> {
      * @param key Key.
      * @param ldr Class loader (optional).
      * @return Value.
-     * @throws GridException If failed.
+     * @throws IgniteCheckedException If failed.
      */
     @Nullable public byte[] read(@Nullable String spaceName, SwapKey key, @Nullable ClassLoader ldr)
-        throws GridException {
+        throws IgniteCheckedException {
         assert key != null;
 
         try {
             return getSpi().read(spaceName, key, context(ldr));
         }
         catch (IgniteSpiException e) {
-            throw new GridException("Failed to read from swap space [space=" + spaceName + ", key=" + key + ']', e);
+            throw new IgniteCheckedException("Failed to read from swap space [space=" + spaceName + ", key=" + key + ']', e);
         }
     }
 
@@ -154,11 +154,11 @@ public class GridSwapSpaceManager extends GridManagerAdapter<SwapSpaceSpi> {
      * @param key Swap key.
      * @param ldr Class loader (optional).
      * @return Value.
-     * @throws GridException If failed.
+     * @throws IgniteCheckedException If failed.
      */
     @SuppressWarnings({"unchecked"})
     @Nullable public <T> T readValue(@Nullable String spaceName, SwapKey key, @Nullable ClassLoader ldr)
-        throws GridException {
+        throws IgniteCheckedException {
         assert key != null;
 
         return unmarshal(read(spaceName, key, ldr), ldr);
@@ -171,10 +171,10 @@ public class GridSwapSpaceManager extends GridManagerAdapter<SwapSpaceSpi> {
      * @param key Key.
      * @param val Value.
      * @param ldr Class loader (optional).
-     * @throws GridException If failed.
+     * @throws IgniteCheckedException If failed.
      */
     public void write(@Nullable String spaceName, SwapKey key, byte[] val, @Nullable ClassLoader ldr)
-        throws GridException {
+        throws IgniteCheckedException {
         assert key != null;
         assert val != null;
 
@@ -182,7 +182,7 @@ public class GridSwapSpaceManager extends GridManagerAdapter<SwapSpaceSpi> {
             getSpi().store(spaceName, key, val, context(ldr));
         }
         catch (IgniteSpiException e) {
-            throw new GridException("Failed to write to swap space [space=" + spaceName + ", key=" + key +
+            throw new IgniteCheckedException("Failed to write to swap space [space=" + spaceName + ", key=" + key +
                 ", valLen=" + val.length + ']', e);
         }
     }
@@ -193,10 +193,10 @@ public class GridSwapSpaceManager extends GridManagerAdapter<SwapSpaceSpi> {
      * @param spaceName Space name.
      * @param batch Swapped entries.
      * @param ldr Class loader (optional).
-     * @throws GridException If failed.
+     * @throws IgniteCheckedException If failed.
      */
     public <K, V> void writeAll(String spaceName, Map<SwapKey, byte[]> batch,
-        @Nullable ClassLoader ldr) throws GridException {
+        @Nullable ClassLoader ldr) throws IgniteCheckedException {
         getSpi().storeAll(spaceName, batch, context(ldr));
     }
 
@@ -207,10 +207,10 @@ public class GridSwapSpaceManager extends GridManagerAdapter<SwapSpaceSpi> {
      * @param key Key.
      * @param val Value.
      * @param ldr Class loader (optional).
-     * @throws GridException If failed.
+     * @throws IgniteCheckedException If failed.
      */
     public void write(@Nullable String spaceName, Object key, @Nullable Object val, @Nullable ClassLoader ldr)
-        throws GridException {
+        throws IgniteCheckedException {
         assert key != null;
 
         write(spaceName, new SwapKey(key), marshal(val), ldr);
@@ -225,17 +225,17 @@ public class GridSwapSpaceManager extends GridManagerAdapter<SwapSpaceSpi> {
      *      removing. If there was no value in storage the closure is executed given
      *      {@code null} value as parameter.
      * @param ldr Class loader (optional).
-     * @throws GridException If failed.
+     * @throws IgniteCheckedException If failed.
      */
     public void remove(@Nullable String spaceName, SwapKey key, @Nullable IgniteInClosure<byte[]> c,
-        @Nullable ClassLoader ldr) throws GridException {
+        @Nullable ClassLoader ldr) throws IgniteCheckedException {
         assert key != null;
 
         try {
             getSpi().remove(spaceName, key, c, context(ldr));
         }
         catch (IgniteSpiException e) {
-            throw new GridException("Failed to remove from swap space [space=" + spaceName + ", key=" + key + ']', e);
+            throw new IgniteCheckedException("Failed to remove from swap space [space=" + spaceName + ", key=" + key + ']', e);
         }
     }
 
@@ -248,17 +248,17 @@ public class GridSwapSpaceManager extends GridManagerAdapter<SwapSpaceSpi> {
      *      removing. If there was no value in storage the closure is executed given
      *      {@code null} value as parameter.
      * @param ldr Class loader (optional).
-     * @throws GridException If failed.
+     * @throws IgniteCheckedException If failed.
      */
     public void removeAll(@Nullable String spaceName, Collection<SwapKey> keys,
-        IgniteBiInClosure<SwapKey, byte[]> c, @Nullable ClassLoader ldr) throws GridException {
+        IgniteBiInClosure<SwapKey, byte[]> c, @Nullable ClassLoader ldr) throws IgniteCheckedException {
         assert keys != null;
 
         try {
             getSpi().removeAll(spaceName, keys, c, context(ldr));
         }
         catch (IgniteSpiException e) {
-            throw new GridException("Failed to remove from swap space [space=" + spaceName + ", " +
+            throw new IgniteCheckedException("Failed to remove from swap space [space=" + spaceName + ", " +
                 "keysCnt=" + keys.size() + ']', e);
         }
     }
@@ -272,10 +272,10 @@ public class GridSwapSpaceManager extends GridManagerAdapter<SwapSpaceSpi> {
      *      removing. If there was no value in storage the closure is executed given
      *      {@code null} value as parameter.
      * @param ldr Class loader (optional).
-     * @throws GridException If failed.
+     * @throws IgniteCheckedException If failed.
      */
     public void remove(@Nullable String spaceName, Object key, @Nullable IgniteInClosure<byte[]> c,
-        @Nullable ClassLoader ldr) throws GridException {
+        @Nullable ClassLoader ldr) throws IgniteCheckedException {
         assert key != null;
 
         remove(spaceName, new SwapKey(key), c, ldr);
@@ -286,14 +286,14 @@ public class GridSwapSpaceManager extends GridManagerAdapter<SwapSpaceSpi> {
      *
      * @param spaceName Space name.
      * @return Swap size.
-     * @throws GridException If failed.
+     * @throws IgniteCheckedException If failed.
      */
-    public long swapSize(@Nullable String spaceName) throws GridException {
+    public long swapSize(@Nullable String spaceName) throws IgniteCheckedException {
         try {
             return getSpi().size(spaceName);
         }
         catch (IgniteSpiException e) {
-            throw new GridException("Failed to get swap size for space: " + spaceName, e);
+            throw new IgniteCheckedException("Failed to get swap size for space: " + spaceName, e);
         }
     }
 
@@ -302,27 +302,27 @@ public class GridSwapSpaceManager extends GridManagerAdapter<SwapSpaceSpi> {
      *
      * @param spaceName Space name.
      * @return Number of stored entries in swap space.
-     * @throws GridException If failed.
+     * @throws IgniteCheckedException If failed.
      */
-    public long swapKeys(@Nullable String spaceName) throws GridException {
+    public long swapKeys(@Nullable String spaceName) throws IgniteCheckedException {
         try {
             return getSpi().count(spaceName);
         }
         catch (IgniteSpiException e) {
-            throw new GridException("Failed to get swap keys count for space: " + spaceName, e);
+            throw new IgniteCheckedException("Failed to get swap keys count for space: " + spaceName, e);
         }
     }
 
     /**
      * @param spaceName Space name.
-     * @throws GridException If failed.
+     * @throws IgniteCheckedException If failed.
      */
-    public void clear(@Nullable String spaceName) throws GridException {
+    public void clear(@Nullable String spaceName) throws IgniteCheckedException {
         try {
             getSpi().clear(spaceName);
         }
         catch (IgniteSpiException e) {
-            throw new GridException("Failed to clear swap space [space=" + spaceName + ']', e);
+            throw new IgniteCheckedException("Failed to clear swap space [space=" + spaceName + ']', e);
         }
     }
 
@@ -334,20 +334,20 @@ public class GridSwapSpaceManager extends GridManagerAdapter<SwapSpaceSpi> {
      * @throws org.apache.ignite.spi.IgniteSpiException If failed.
      */
     @Nullable public GridCloseableIterator<Map.Entry<byte[], byte[]>> rawIterator(@Nullable String spaceName)
-        throws GridException {
+        throws IgniteCheckedException {
         try {
             IgniteSpiCloseableIterator<Map.Entry<byte[], byte[]>> it = getSpi().rawIterator(spaceName);
 
             return it == null ? null : new GridSpiCloseableIteratorWrapper<>(it);
         }
         catch (IgniteSpiException e) {
-            throw new GridException("Failed to get iterator over swap space [space=" + spaceName + ']', e);
+            throw new IgniteCheckedException("Failed to get iterator over swap space [space=" + spaceName + ']', e);
         }
     }
 
     /** {@inheritDoc} */
     @Nullable public GridCloseableIterator<Map.Entry<byte[], byte[]>> rawIterator(@Nullable String spaceName, int part)
-        throws GridException{
+        throws IgniteCheckedException{
         try {
             IgniteSpiCloseableIterator<Map.Entry<byte[], byte[]>> it = getSpi().rawIterator(spaceName, part);
 
@@ -355,7 +355,7 @@ public class GridSwapSpaceManager extends GridManagerAdapter<SwapSpaceSpi> {
                 new GridSpiCloseableIteratorWrapper<>(it);
         }
         catch (IgniteSpiException e) {
-            throw new GridException("Failed to get iterator over swap space [space=" + spaceName + ']', e);
+            throw new IgniteCheckedException("Failed to get iterator over swap space [space=" + spaceName + ']', e);
         }
     }
 
@@ -368,14 +368,14 @@ public class GridSwapSpaceManager extends GridManagerAdapter<SwapSpaceSpi> {
      * @throws org.apache.ignite.spi.IgniteSpiException If failed.
      */
     @Nullable public <K> GridCloseableIterator<K> keysIterator(@Nullable String spaceName,
-        @Nullable ClassLoader ldr) throws GridException {
+        @Nullable ClassLoader ldr) throws IgniteCheckedException {
         try {
             IgniteSpiCloseableIterator<K> it = getSpi().keyIterator(spaceName, context(ldr));
 
             return it == null ? null : new GridSpiCloseableIteratorWrapper<>(it);
         }
         catch (IgniteSpiException e) {
-            throw new GridException("Failed to get iterator over swap space [space=" + spaceName + ']', e);
+            throw new IgniteCheckedException("Failed to get iterator over swap space [space=" + spaceName + ']', e);
         }
     }
 
@@ -383,10 +383,10 @@ public class GridSwapSpaceManager extends GridManagerAdapter<SwapSpaceSpi> {
      * @param swapBytes Swap bytes to unmarshal.
      * @param ldr Class loader.
      * @return Unmarshalled value.
-     * @throws GridException If failed.
+     * @throws IgniteCheckedException If failed.
      */
     @SuppressWarnings({"unchecked"})
-    private <T> T unmarshal(byte[] swapBytes, @Nullable ClassLoader ldr) throws GridException {
+    private <T> T unmarshal(byte[] swapBytes, @Nullable ClassLoader ldr) throws IgniteCheckedException {
         if (swapBytes == null)
             return null;
 
@@ -398,9 +398,9 @@ public class GridSwapSpaceManager extends GridManagerAdapter<SwapSpaceSpi> {
      *
      * @param obj Object to marshal.
      * @return Marshalled array.
-     * @throws GridException If failed.
+     * @throws IgniteCheckedException If failed.
      */
-    private byte[] marshal(Object obj) throws GridException {
+    private byte[] marshal(Object obj) throws IgniteCheckedException {
         return ctx.config().getMarshaller().marshal(obj);
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/GridProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/GridProcessor.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/GridProcessor.java
index 8a9b795..b53226f 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/GridProcessor.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/GridProcessor.java
@@ -9,7 +9,7 @@
 
 package org.gridgain.grid.kernal.processors;
 
-import org.gridgain.grid.GridException;
+import org.apache.ignite.*;
 import org.gridgain.grid.kernal.*;
 import org.gridgain.grid.util.tostring.*;
 
@@ -24,7 +24,7 @@ public interface GridProcessor extends GridComponent {
      * Adds attributes from this component to map of all node attributes.
      *
      * @param attrs Map of all attributes.
-     * @throws GridException If failed.
+     * @throws IgniteCheckedException If failed.
      */
-    public void addAttributes(Map<String, Object> attrs) throws GridException;
+    public void addAttributes(Map<String, Object> attrs) throws IgniteCheckedException;
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/GridProcessorAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/GridProcessorAdapter.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/GridProcessorAdapter.java
index cd86093..2a3099a 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/GridProcessorAdapter.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/GridProcessorAdapter.java
@@ -44,7 +44,7 @@ public abstract class GridProcessorAdapter implements GridProcessor {
     }
 
     /** {@inheritDoc} */
-    @Override public void onKernalStart() throws GridException {
+    @Override public void onKernalStart() throws IgniteCheckedException {
         // No-op.
     }
 
@@ -64,12 +64,12 @@ public abstract class GridProcessorAdapter implements GridProcessor {
     }
 
     /** {@inheritDoc} */
-    @Override public void start() throws GridException {
+    @Override public void start() throws IgniteCheckedException {
         // No-op.
     }
 
     /** {@inheritDoc} */
-    @Override public void stop(boolean cancel) throws GridException {
+    @Override public void stop(boolean cancel) throws IgniteCheckedException {
         // No-op.
     }
 
@@ -88,11 +88,11 @@ public abstract class GridProcessorAdapter implements GridProcessor {
      *      </pre>
      *      Note that in case when variable name is the same as JavaBean property you
      *      can just copy Java condition expression into description as a string.
-     * @throws GridException Thrown if given condition is {@code false}
+     * @throws IgniteCheckedException Thrown if given condition is {@code false}
      */
-    protected final void assertParameter(boolean cond, String condDesc) throws GridException {
+    protected final void assertParameter(boolean cond, String condDesc) throws IgniteCheckedException {
         if (!cond)
-            throw new GridException("Grid configuration parameter invalid: " + condDesc);
+            throw new IgniteCheckedException("Grid configuration parameter invalid: " + condDesc);
     }
 
     /** {@inheritDoc} */
@@ -101,7 +101,7 @@ public abstract class GridProcessorAdapter implements GridProcessor {
     }
 
     /** {@inheritDoc} */
-    @Override public void addAttributes(Map<String, Object> attrs)  throws GridException {
+    @Override public void addAttributes(Map<String, Object> attrs)  throws IgniteCheckedException {
         // No-op.
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/affinity/GridAffinityAssignmentCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/affinity/GridAffinityAssignmentCache.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/affinity/GridAffinityAssignmentCache.java
index 49206d5..926f717 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/affinity/GridAffinityAssignmentCache.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/affinity/GridAffinityAssignmentCache.java
@@ -344,8 +344,8 @@ public class GridAffinityAssignmentCache {
             if (fut != null)
                 fut.get();
         }
-        catch (GridException e) {
-            throw new GridRuntimeException("Failed to wait for affinity ready future for topology version: " + topVer,
+        catch (IgniteCheckedException e) {
+            throw new IgniteException("Failed to wait for affinity ready future for topology version: " + topVer,
                 e);
         }
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/affinity/GridAffinityProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/affinity/GridAffinityProcessor.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/affinity/GridAffinityProcessor.java
index dfe95c1..74a1a49 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/affinity/GridAffinityProcessor.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/affinity/GridAffinityProcessor.java
@@ -9,10 +9,10 @@
 
 package org.gridgain.grid.kernal.processors.affinity;
 
+import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.events.*;
 import org.apache.ignite.lang.*;
-import org.gridgain.grid.*;
 import org.gridgain.grid.cache.*;
 import org.gridgain.grid.cache.affinity.*;
 import org.gridgain.grid.kernal.*;
@@ -31,9 +31,9 @@ import org.jetbrains.annotations.*;
 import java.util.*;
 import java.util.concurrent.*;
 
-import static org.gridgain.grid.kernal.GridClosureCallMode.*;
-import static org.gridgain.grid.cache.GridCacheMode.*;
 import static org.apache.ignite.events.IgniteEventType.*;
+import static org.gridgain.grid.cache.GridCacheMode.*;
+import static org.gridgain.grid.kernal.GridClosureCallMode.*;
 import static org.gridgain.grid.kernal.processors.affinity.GridAffinityUtils.*;
 
 /**
@@ -99,7 +99,7 @@ public class GridAffinityProcessor extends GridProcessorAdapter {
     }
 
     /** {@inheritDoc} */
-    @Override public void onKernalStart() throws GridException {
+    @Override public void onKernalStart() throws IgniteCheckedException {
         ctx.event().addLocalEventListener(lsnr, EVT_NODE_FAILED, EVT_NODE_LEFT, EVT_NODE_JOINED);
     }
 
@@ -115,10 +115,10 @@ public class GridAffinityProcessor extends GridProcessorAdapter {
      * @param cacheName Cache name.
      * @param keys Keys to map.
      * @return Map of nodes to keys.
-     * @throws GridException If failed.
+     * @throws IgniteCheckedException If failed.
      */
     public <K> Map<ClusterNode, Collection<K>> mapKeysToNodes(@Nullable String cacheName,
-        @Nullable Collection<? extends K> keys) throws GridException {
+        @Nullable Collection<? extends K> keys) throws IgniteCheckedException {
         return keysToNodes(cacheName, keys);
     }
 
@@ -127,10 +127,10 @@ public class GridAffinityProcessor extends GridProcessorAdapter {
      *
      * @param keys Keys to map.
      * @return Map of nodes to keys.
-     * @throws GridException If failed.
+     * @throws IgniteCheckedException If failed.
      */
     public <K> Map<ClusterNode, Collection<K>> mapKeysToNodes(@Nullable Collection<? extends K> keys)
-        throws GridException {
+        throws IgniteCheckedException {
         return keysToNodes(null, keys);
     }
 
@@ -140,9 +140,9 @@ public class GridAffinityProcessor extends GridProcessorAdapter {
      * @param cacheName Cache name.
      * @param key Key to map.
      * @return Picked node.
-     * @throws GridException If failed.
+     * @throws IgniteCheckedException If failed.
      */
-    @Nullable public <K> ClusterNode mapKeyToNode(@Nullable String cacheName, K key) throws GridException {
+    @Nullable public <K> ClusterNode mapKeyToNode(@Nullable String cacheName, K key) throws IgniteCheckedException {
         Map<ClusterNode, Collection<K>> map = keysToNodes(cacheName, F.asList(key));
 
         return map != null ? F.first(map.keySet()) : null;
@@ -154,9 +154,9 @@ public class GridAffinityProcessor extends GridProcessorAdapter {
      * @param cacheName Cache name.
      * @param key Key to map.
      * @return Picked node.
-     * @throws GridException If failed.
+     * @throws IgniteCheckedException If failed.
      */
-    @Nullable public <K> ClusterNode mapKeyToNode(@Nullable String cacheName, K key, long topVer) throws GridException {
+    @Nullable public <K> ClusterNode mapKeyToNode(@Nullable String cacheName, K key, long topVer) throws IgniteCheckedException {
         Map<ClusterNode, Collection<K>> map = keysToNodes(cacheName, F.asList(key), topVer);
 
         return map != null ? F.first(map.keySet()) : null;
@@ -167,9 +167,9 @@ public class GridAffinityProcessor extends GridProcessorAdapter {
      *
      * @param key Key to map.
      * @return Picked node.
-     * @throws GridException If failed.
+     * @throws IgniteCheckedException If failed.
      */
-    @Nullable public <K> ClusterNode mapKeyToNode(K key) throws GridException {
+    @Nullable public <K> ClusterNode mapKeyToNode(K key) throws IgniteCheckedException {
         return mapKeyToNode(null, key);
     }
 
@@ -179,10 +179,10 @@ public class GridAffinityProcessor extends GridProcessorAdapter {
      * @param cacheName Cache name.
      * @param key Cache key.
      * @return Affinity key.
-     * @throws GridException In case of error.
+     * @throws IgniteCheckedException In case of error.
      */
     @SuppressWarnings("unchecked")
-    @Nullable public Object affinityKey(@Nullable String cacheName, @Nullable Object key) throws GridException {
+    @Nullable public Object affinityKey(@Nullable String cacheName, @Nullable Object key) throws IgniteCheckedException {
         if (key == null)
             return null;
 
@@ -209,10 +209,10 @@ public class GridAffinityProcessor extends GridProcessorAdapter {
      * @param cacheName Cache name.
      * @param keys Keys.
      * @return Affinity map.
-     * @throws GridException If failed.
+     * @throws IgniteCheckedException If failed.
      */
     private <K> Map<ClusterNode, Collection<K>> keysToNodes(@Nullable final String cacheName,
-        Collection<? extends K> keys) throws GridException {
+        Collection<? extends K> keys) throws IgniteCheckedException {
         return keysToNodes(cacheName, keys, ctx.discovery().topologyVersion());
     }
 
@@ -221,10 +221,10 @@ public class GridAffinityProcessor extends GridProcessorAdapter {
      * @param keys Keys.
      * @param topVer Topology version.
      * @return Affinity map.
-     * @throws GridException If failed.
+     * @throws IgniteCheckedException If failed.
      */
     private <K> Map<ClusterNode, Collection<K>> keysToNodes(@Nullable final String cacheName,
-        Collection<? extends K> keys, long topVer) throws GridException {
+        Collection<? extends K> keys, long topVer) throws IgniteCheckedException {
         if (F.isEmpty(keys))
             return Collections.emptyMap();
 
@@ -241,10 +241,10 @@ public class GridAffinityProcessor extends GridProcessorAdapter {
     /**
      * @param cacheName Cache name.
      * @return Affinity cache.
-     * @throws GridException In case of error.
+     * @throws IgniteCheckedException In case of error.
      */
     @SuppressWarnings("ErrorNotRethrown")
-    private AffinityInfo affinityCache(@Nullable final String cacheName, long topVer) throws GridException {
+    private AffinityInfo affinityCache(@Nullable final String cacheName, long topVer) throws IgniteCheckedException {
         AffinityAssignmentKey key = new AffinityAssignmentKey(cacheName, topVer);
 
         IgniteFuture<AffinityInfo> fut = affMap.get(key);
@@ -305,7 +305,7 @@ public class GridAffinityProcessor extends GridProcessorAdapter {
             // Double check since we deal with dynamic view.
             if (!it.hasNext())
                 // Exception will be caught in this method.
-                throw new GridException("No cache nodes in topology for cache name: " + cacheName);
+                throw new IgniteCheckedException("No cache nodes in topology for cache name: " + cacheName);
 
             ClusterNode n = it.next();
 
@@ -315,7 +315,7 @@ public class GridAffinityProcessor extends GridProcessorAdapter {
 
             // Map all keys to a single node, if the cache mode is LOCAL.
             if (mode == LOCAL) {
-                fut0.onDone(new GridException("Failed to map keys for LOCAL cache."));
+                fut0.onDone(new IgniteCheckedException("Failed to map keys for LOCAL cache."));
 
                 // Will throw exception.
                 fut0.get();
@@ -328,7 +328,7 @@ public class GridAffinityProcessor extends GridProcessorAdapter {
 
                 break;
             }
-            catch (GridException e) {
+            catch (IgniteCheckedException e) {
                 if (log.isDebugEnabled())
                     log.debug("Failed to get affinity from node (will retry) [cache=" + cacheName +
                         ", node=" + U.toShortString(n) + ", msg=" + e.getMessage() + ']');
@@ -341,12 +341,12 @@ public class GridAffinityProcessor extends GridProcessorAdapter {
 
                 affMap.remove(maskNull(cacheName), fut0);
 
-                fut0.onDone(new GridException("Failed to get affinity mapping from node: " + n, e));
+                fut0.onDone(new IgniteCheckedException("Failed to get affinity mapping from node: " + n, e));
 
                 break;
             }
             catch (RuntimeException | Error e) {
-                fut0.onDone(new GridException("Failed to get affinity mapping from node: " + n, e));
+                fut0.onDone(new IgniteCheckedException("Failed to get affinity mapping from node: " + n, e));
 
                 break;
             }
@@ -361,10 +361,10 @@ public class GridAffinityProcessor extends GridProcessorAdapter {
      * @param cacheName Name of cache on which affinity is requested.
      * @param n Node from which affinity is requested.
      * @return Affinity cached function.
-     * @throws GridException If either local or remote node cannot get deployment for affinity objects.
+     * @throws IgniteCheckedException If either local or remote node cannot get deployment for affinity objects.
      */
     private AffinityInfo affinityInfoFromNode(@Nullable String cacheName, long topVer, ClusterNode n)
-        throws GridException {
+        throws IgniteCheckedException {
         GridTuple3<GridAffinityMessage, GridAffinityMessage, GridAffinityAssignment> t = ctx.closure()
             .callAsyncNoFailover(BALANCE, affinityJob(cacheName, topVer), F.asList(n), true/*system pool*/).get();
 
@@ -386,11 +386,11 @@ public class GridAffinityProcessor extends GridProcessorAdapter {
      * @param aff Affinity function.
      * @param keys Keys.
      * @return Affinity map.
-     * @throws GridException If failed.
+     * @throws IgniteCheckedException If failed.
      */
     @SuppressWarnings({"unchecked"})
     private <K> Map<ClusterNode, Collection<K>> affinityMap(AffinityInfo aff, Collection<? extends K> keys)
-        throws GridException {
+        throws IgniteCheckedException {
         assert aff != null;
         assert !F.isEmpty(keys);
 
@@ -413,9 +413,9 @@ public class GridAffinityProcessor extends GridProcessorAdapter {
 
             return map;
         }
-        catch (GridRuntimeException e) {
-            // Affinity calculation may lead to GridRuntimeException if no cache nodes found for pair cacheName+topVer.
-            throw new GridException("Failed to get affinity map for keys: " + keys, e);
+        catch (IgniteException e) {
+            // Affinity calculation may lead to IgniteException if no cache nodes found for pair cacheName+topVer.
+            throw new IgniteCheckedException("Failed to get affinity map for keys: " + keys, e);
         }
     }
 
@@ -425,15 +425,15 @@ public class GridAffinityProcessor extends GridProcessorAdapter {
      * @param aff Affinity function.
      * @param key Key to check.
      * @return Primary node for given key.
-     * @throws GridException In case of error.
+     * @throws IgniteCheckedException In case of error.
      */
-    private <K> ClusterNode primary(AffinityInfo aff, K key) throws GridException {
+    private <K> ClusterNode primary(AffinityInfo aff, K key) throws IgniteCheckedException {
         int part = aff.affFunc.partition(aff.mapper.affinityKey(key));
 
         Collection<ClusterNode> nodes = aff.assignment.get(part);
 
         if (F.isEmpty(nodes))
-            throw new GridException("Failed to get affinity nodes [aff=" + aff + ", key=" + key + ']');
+            throw new IgniteCheckedException("Failed to get affinity nodes [aff=" + aff + ", key=" + key + ']');
 
         return nodes.iterator().next();
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/affinity/GridAffinityUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/affinity/GridAffinityUtils.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/affinity/GridAffinityUtils.java
index 054ef7c..3bafeb2 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/affinity/GridAffinityUtils.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/affinity/GridAffinityUtils.java
@@ -50,9 +50,9 @@ class GridAffinityUtils {
      * @param ctx  {@code GridKernalContext} instance which provides deployment manager
      * @param o Object for which deployment should be obtained.
      * @return Deployment object for given instance,
-     * @throws GridException If node cannot create deployment for given object.
+     * @throws IgniteCheckedException If node cannot create deployment for given object.
      */
-    private static GridAffinityMessage affinityMessage(GridKernalContext ctx, Object o) throws GridException {
+    private static GridAffinityMessage affinityMessage(GridKernalContext ctx, Object o) throws IgniteCheckedException {
         Class cls = o.getClass();
 
         GridDeployment dep = ctx.deploy().deploy(cls, cls.getClassLoader());
@@ -76,10 +76,10 @@ class GridAffinityUtils {
      * @param sndNodeId {@link UUID} of the sender node.
      * @param msg Transfer object that contains original serialized object and deployment information.
      * @return Unmarshalled object.
-     * @throws GridException If node cannot obtain deployment.
+     * @throws IgniteCheckedException If node cannot obtain deployment.
      */
     static Object unmarshall(GridKernalContext ctx, UUID sndNodeId, GridAffinityMessage msg)
-        throws GridException {
+        throws IgniteCheckedException {
         GridDeployment dep = ctx.deploy().getGlobalDeployment(
             msg.deploymentMode(),
             msg.sourceClassName(),


Mime
View raw message