ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [53/54] [abbrv] incubator-ignite git commit: # ignite-42
Date Thu, 22 Jan 2015 15:18:02 GMT
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/550d6033/modules/core/src/main/java/org/apache/ignite/cache/datastructures/GridCacheCountDownLatch.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/datastructures/GridCacheCountDownLatch.java b/modules/core/src/main/java/org/apache/ignite/cache/datastructures/GridCacheCountDownLatch.java
index 1e90237..e2c621c 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/datastructures/GridCacheCountDownLatch.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/datastructures/GridCacheCountDownLatch.java
@@ -18,7 +18,6 @@
 package org.apache.ignite.cache.datastructures;
 
 import org.apache.ignite.*;
-import org.gridgain.grid.*;
 
 import java.util.concurrent.*;
 
@@ -85,11 +84,11 @@ public interface GridCacheCountDownLatch {
      *      <li>has its interrupted status set on entry to this method; or
      *      <li>is interrupted while waiting,
      * </ul>
-     * then {@link GridInterruptedException} is thrown and the current thread's
+     * then {@link org.apache.ignite.IgniteInterruptedException} is thrown and the current thread's
      * interrupted status is cleared.
      *
      * @throws IgniteCheckedException If operation failed.
-     * @throws GridInterruptedException if the current thread is interrupted
+     * @throws org.apache.ignite.IgniteInterruptedException if the current thread is interrupted
      *      while waiting
      */
     public void await() throws IgniteCheckedException;
@@ -119,7 +118,7 @@ public interface GridCacheCountDownLatch {
      *      <li>has its interrupted status set on entry to this method; or
      *      <li>is interrupted while waiting,
      * </ul>
-     * then {@link GridInterruptedException} is thrown and the current thread's
+     * then {@link org.apache.ignite.IgniteInterruptedException} is thrown and the current thread's
      * interrupted status is cleared.
      * <p>
      * If the specified waiting time elapses then the value {@code false}
@@ -129,7 +128,7 @@ public interface GridCacheCountDownLatch {
      * @param timeout The maximum time to wait in milliseconds.
      * @return {@code True} if the count reached zero and {@code false}
      *      if the waiting time elapsed before the count reached zero.
-     * @throws GridInterruptedException If the current thread is interrupted
+     * @throws org.apache.ignite.IgniteInterruptedException If the current thread is interrupted
      *      while waiting.
      * @throws IgniteCheckedException If operation failed.
      */
@@ -160,7 +159,7 @@ public interface GridCacheCountDownLatch {
      *      <li>has its interrupted status set on entry to this method; or
      *      <li>is interrupted while waiting,
      * </ul>
-     * then {@link GridInterruptedException} is thrown and the current thread's
+     * then {@link org.apache.ignite.IgniteInterruptedException} is thrown and the current thread's
      * interrupted status is cleared.
      * <p>
      * If the specified waiting time elapses then the value {@code false}
@@ -172,7 +171,7 @@ public interface GridCacheCountDownLatch {
      * @param unit The time unit of the {@code timeout} argument.
      * @return {@code True} if the count reached zero and {@code false}
      *      if the waiting time elapsed before the count reached zero.
-     * @throws GridInterruptedException If the current thread is interrupted
+     * @throws org.apache.ignite.IgniteInterruptedException If the current thread is interrupted
      *      while waiting.
      * @throws IgniteCheckedException If operation failed.
      */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/550d6033/modules/core/src/main/java/org/apache/ignite/cache/datastructures/GridCacheDataStructures.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/datastructures/GridCacheDataStructures.java b/modules/core/src/main/java/org/apache/ignite/cache/datastructures/GridCacheDataStructures.java
index 72855f1..4cfd5d5 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/datastructures/GridCacheDataStructures.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/datastructures/GridCacheDataStructures.java
@@ -18,7 +18,6 @@
 package org.apache.ignite.cache.datastructures;
 
 import org.apache.ignite.*;
-import org.gridgain.grid.cache.*;
 import org.jetbrains.annotations.*;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/550d6033/modules/core/src/main/java/org/apache/ignite/cache/eviction/GridCacheEvictionFilter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/eviction/GridCacheEvictionFilter.java b/modules/core/src/main/java/org/apache/ignite/cache/eviction/GridCacheEvictionFilter.java
index 4dca249..d07a0af 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/eviction/GridCacheEvictionFilter.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/eviction/GridCacheEvictionFilter.java
@@ -18,7 +18,6 @@
 package org.apache.ignite.cache.eviction;
 
 import org.apache.ignite.cache.*;
-import org.gridgain.grid.cache.*;
 
 /**
  * Eviction filter to specify which entries should not be evicted. Not applicable when

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/550d6033/modules/core/src/main/java/org/apache/ignite/cache/eviction/GridCacheEvictionPolicy.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/eviction/GridCacheEvictionPolicy.java b/modules/core/src/main/java/org/apache/ignite/cache/eviction/GridCacheEvictionPolicy.java
index 719caee..36d740d 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/eviction/GridCacheEvictionPolicy.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/eviction/GridCacheEvictionPolicy.java
@@ -18,7 +18,6 @@
 package org.apache.ignite.cache.eviction;
 
 import org.apache.ignite.cache.*;
-import org.gridgain.grid.cache.*;
 
 /**
  * Pluggable cache eviction policy. Usually, implementations will internally order

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/550d6033/modules/core/src/main/java/org/apache/ignite/cache/eviction/fifo/GridCacheFifoEvictionPolicy.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/eviction/fifo/GridCacheFifoEvictionPolicy.java b/modules/core/src/main/java/org/apache/ignite/cache/eviction/fifo/GridCacheFifoEvictionPolicy.java
index b57deb4..591fda2 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/eviction/fifo/GridCacheFifoEvictionPolicy.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/eviction/fifo/GridCacheFifoEvictionPolicy.java
@@ -19,9 +19,7 @@ package org.apache.ignite.cache.eviction.fifo;
 
 import org.apache.ignite.*;
 import org.apache.ignite.cache.*;
-import org.apache.ignite.cache.*;
 import org.apache.ignite.cache.eviction.*;
-import org.gridgain.grid.cache.*;
 import org.jdk8.backport.*;
 import org.jdk8.backport.ConcurrentLinkedDeque8.*;
 import org.gridgain.grid.util.typedef.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/550d6033/modules/core/src/main/java/org/apache/ignite/cache/eviction/ggfs/GridCacheGgfsEvictionFilter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/eviction/ggfs/GridCacheGgfsEvictionFilter.java b/modules/core/src/main/java/org/apache/ignite/cache/eviction/ggfs/GridCacheGgfsEvictionFilter.java
index a2c6a1c..0dd98b7 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/eviction/ggfs/GridCacheGgfsEvictionFilter.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/eviction/ggfs/GridCacheGgfsEvictionFilter.java
@@ -19,7 +19,6 @@ package org.apache.ignite.cache.eviction.ggfs;
 
 import org.apache.ignite.cache.*;
 import org.apache.ignite.cache.eviction.*;
-import org.gridgain.grid.cache.*;
 import org.gridgain.grid.kernal.processors.ggfs.*;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/550d6033/modules/core/src/main/java/org/apache/ignite/cache/eviction/ggfs/GridCacheGgfsPerBlockLruEvictionPolicy.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/eviction/ggfs/GridCacheGgfsPerBlockLruEvictionPolicy.java b/modules/core/src/main/java/org/apache/ignite/cache/eviction/ggfs/GridCacheGgfsPerBlockLruEvictionPolicy.java
index 5a1d7d3..8662dc5 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/eviction/ggfs/GridCacheGgfsPerBlockLruEvictionPolicy.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/eviction/ggfs/GridCacheGgfsPerBlockLruEvictionPolicy.java
@@ -21,7 +21,6 @@ import org.apache.ignite.*;
 import org.apache.ignite.cache.*;
 import org.apache.ignite.cache.eviction.*;
 import org.apache.ignite.fs.*;
-import org.gridgain.grid.cache.*;
 import org.gridgain.grid.kernal.processors.ggfs.*;
 import org.jdk8.backport.*;
 import org.jdk8.backport.ConcurrentLinkedDeque8.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/550d6033/modules/core/src/main/java/org/apache/ignite/cache/eviction/lru/GridCacheLruEvictionPolicy.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/eviction/lru/GridCacheLruEvictionPolicy.java b/modules/core/src/main/java/org/apache/ignite/cache/eviction/lru/GridCacheLruEvictionPolicy.java
index dc070fe..7f387dc 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/eviction/lru/GridCacheLruEvictionPolicy.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/eviction/lru/GridCacheLruEvictionPolicy.java
@@ -18,9 +18,7 @@
 package org.apache.ignite.cache.eviction.lru;
 
 import org.apache.ignite.cache.*;
-import org.apache.ignite.cache.*;
 import org.apache.ignite.cache.eviction.*;
-import org.gridgain.grid.cache.*;
 import org.jdk8.backport.*;
 import org.jdk8.backport.ConcurrentLinkedDeque8.*;
 import org.gridgain.grid.util.typedef.internal.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/550d6033/modules/core/src/main/java/org/apache/ignite/cache/eviction/random/GridCacheRandomEvictionPolicy.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/eviction/random/GridCacheRandomEvictionPolicy.java b/modules/core/src/main/java/org/apache/ignite/cache/eviction/random/GridCacheRandomEvictionPolicy.java
index 3e80f47..74ae621 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/eviction/random/GridCacheRandomEvictionPolicy.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/eviction/random/GridCacheRandomEvictionPolicy.java
@@ -19,9 +19,7 @@ package org.apache.ignite.cache.eviction.random;
 
 import org.apache.ignite.*;
 import org.apache.ignite.cache.*;
-import org.apache.ignite.cache.*;
 import org.apache.ignite.cache.eviction.*;
-import org.gridgain.grid.cache.*;
 import org.gridgain.grid.util.typedef.*;
 import org.gridgain.grid.util.typedef.internal.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/550d6033/modules/core/src/main/java/org/apache/ignite/cache/query/GridCacheContinuousQuery.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/query/GridCacheContinuousQuery.java b/modules/core/src/main/java/org/apache/ignite/cache/query/GridCacheContinuousQuery.java
index 9681734..3295229 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/query/GridCacheContinuousQuery.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/query/GridCacheContinuousQuery.java
@@ -20,7 +20,6 @@ package org.apache.ignite.cache.query;
 import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.lang.*;
-import org.gridgain.grid.cache.*;
 import org.jetbrains.annotations.*;
 
 import java.util.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/550d6033/modules/core/src/main/java/org/apache/ignite/cache/query/GridCacheQuery.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/query/GridCacheQuery.java b/modules/core/src/main/java/org/apache/ignite/cache/query/GridCacheQuery.java
index 556e7e5..b696c3f 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/query/GridCacheQuery.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/query/GridCacheQuery.java
@@ -20,8 +20,6 @@ package org.apache.ignite.cache.query;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.lang.*;
-import org.gridgain.grid.cache.*;
-import org.gridgain.grid.cache.affinity.*;
 import org.jetbrains.annotations.*;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/550d6033/modules/core/src/main/java/org/apache/ignite/cache/store/CacheLoadOnlyStoreAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/store/CacheLoadOnlyStoreAdapter.java b/modules/core/src/main/java/org/apache/ignite/cache/store/CacheLoadOnlyStoreAdapter.java
index de7b0fc..628b86d 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/store/CacheLoadOnlyStoreAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/store/CacheLoadOnlyStoreAdapter.java
@@ -20,7 +20,6 @@ package org.apache.ignite.cache.store;
 import org.apache.ignite.*;
 import org.apache.ignite.lang.*;
 import org.apache.ignite.resources.*;
-import org.gridgain.grid.cache.*;
 import org.gridgain.grid.util.typedef.internal.*;
 import org.jetbrains.annotations.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/550d6033/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStore.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStore.java b/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStore.java
index 1c59641..7cda78b 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStore.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStore.java
@@ -24,8 +24,6 @@ import org.apache.ignite.lang.*;
 import org.apache.ignite.portables.*;
 import org.apache.ignite.resources.*;
 import org.apache.ignite.transactions.*;
-import org.gridgain.grid.*;
-import org.gridgain.grid.cache.*;
 import org.jetbrains.annotations.*;
 
 import javax.cache.integration.*;
@@ -57,7 +55,7 @@ import static javax.cache.Cache.*;
  * </ul>
  * <p>
  * All transactional operations of this API are provided with ongoing {@link IgniteTx},
- * if any. As transaction is {@link GridMetadataAware}, you can attach any metadata to
+ * if any. As transaction is {@link org.apache.ignite.IgniteMetadataAware}, you can attach any metadata to
  * it, e.g. to recognize if several operations belong to the same transaction or not.
  * Here is an example of how attach a JDBC connection as transaction metadata:
  * <pre name="code" class="java">

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/550d6033/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStoreAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStoreAdapter.java b/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStoreAdapter.java
index 475cfba..c166480 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStoreAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStoreAdapter.java
@@ -18,7 +18,6 @@
 package org.apache.ignite.cache.store;
 
 import org.apache.ignite.lang.*;
-import org.gridgain.grid.cache.*;
 
 import javax.cache.*;
 import java.util.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/550d6033/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheJdbcBlobStore.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheJdbcBlobStore.java b/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheJdbcBlobStore.java
index 4ad668b..9ce6f35 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheJdbcBlobStore.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheJdbcBlobStore.java
@@ -22,7 +22,6 @@ import org.apache.ignite.cache.store.*;
 import org.apache.ignite.marshaller.*;
 import org.apache.ignite.resources.*;
 import org.apache.ignite.transactions.*;
-import org.gridgain.grid.*;
 import org.gridgain.grid.util.tostring.*;
 import org.gridgain.grid.util.typedef.*;
 import org.gridgain.grid.util.typedef.internal.*;
@@ -437,7 +436,7 @@ public class CacheJdbcBlobStore<K, V> extends CacheStoreAdapter<K, V> {
                 try {
                     U.await(initLatch);
                 }
-                catch (GridInterruptedException e) {
+                catch (IgniteInterruptedException e) {
                     throw new IgniteException(e);
                 }
             }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/550d6033/modules/core/src/main/java/org/apache/ignite/client/impl/GridClientAbstractProjection.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/client/impl/GridClientAbstractProjection.java b/modules/core/src/main/java/org/apache/ignite/client/impl/GridClientAbstractProjection.java
index 2c66296..242e392 100644
--- a/modules/core/src/main/java/org/apache/ignite/client/impl/GridClientAbstractProjection.java
+++ b/modules/core/src/main/java/org/apache/ignite/client/impl/GridClientAbstractProjection.java
@@ -17,6 +17,7 @@
 
 package org.apache.ignite.client.impl;
 
+import org.apache.ignite.*;
 import org.apache.ignite.client.*;
 import org.apache.ignite.client.balancer.*;
 import org.apache.ignite.client.impl.connection.*;
@@ -143,7 +144,7 @@ abstract class GridClientAbstractProjection<T extends GridClientAbstractProjecti
         catch (GridClientException e) {
             return new GridClientFutureAdapter<>(e);
         }
-        catch (GridInterruptedException | InterruptedException e) {
+        catch (IgniteInterruptedException | InterruptedException e) {
             Thread.currentThread().interrupt();
 
             return new GridClientFutureAdapter<>(
@@ -215,7 +216,7 @@ abstract class GridClientAbstractProjection<T extends GridClientAbstractProjecti
         catch (GridClientException e) {
             return new GridClientFutureAdapter<>(e);
         }
-        catch (GridInterruptedException | InterruptedException e) {
+        catch (IgniteInterruptedException | InterruptedException e) {
             Thread.currentThread().interrupt();
 
             return new GridClientFutureAdapter<>(new GridClientException("Interrupted when (re)trying to perform " +

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/550d6033/modules/core/src/main/java/org/apache/ignite/cluster/ClusterNode.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cluster/ClusterNode.java b/modules/core/src/main/java/org/apache/ignite/cluster/ClusterNode.java
index 2b28069..3678eb1 100644
--- a/modules/core/src/main/java/org/apache/ignite/cluster/ClusterNode.java
+++ b/modules/core/src/main/java/org/apache/ignite/cluster/ClusterNode.java
@@ -17,9 +17,8 @@
 
 package org.apache.ignite.cluster;
 
-import org.apache.ignite.IgniteCluster;
+import org.apache.ignite.*;
 import org.apache.ignite.product.*;
-import org.gridgain.grid.*;
 import org.gridgain.grid.kernal.*;
 import org.jetbrains.annotations.*;
 
@@ -107,7 +106,7 @@ import java.util.*;
  * that comes with JDK as it also provides ability to view any node parameter
  * as a graph.
  */
-public interface ClusterNode extends GridMetadataAware {
+public interface ClusterNode extends IgniteMetadataAware {
     /**
      * Gets globally unique node ID. A new ID is generated every time a node restarts.
      *

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/550d6033/modules/core/src/main/java/org/apache/ignite/cluster/ClusterNodeLocalMap.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cluster/ClusterNodeLocalMap.java b/modules/core/src/main/java/org/apache/ignite/cluster/ClusterNodeLocalMap.java
index dbf66de..afb3fad 100644
--- a/modules/core/src/main/java/org/apache/ignite/cluster/ClusterNodeLocalMap.java
+++ b/modules/core/src/main/java/org/apache/ignite/cluster/ClusterNodeLocalMap.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.cluster;
 
-import org.gridgain.grid.*;
+import org.apache.ignite.*;
 import org.jetbrains.annotations.*;
 import java.util.concurrent.*;
 
@@ -34,7 +34,7 @@ import java.util.concurrent.*;
  * <p>
  * You can get an instance of {@code GridNodeLocalMap} by calling {@link org.apache.ignite.IgniteCluster#nodeLocalMap()} method.
  */
-public interface ClusterNodeLocalMap<K, V> extends ConcurrentMap<K, V>, GridMetadataAware {
+public interface ClusterNodeLocalMap<K, V> extends ConcurrentMap<K, V>, IgniteMetadataAware {
     /**
      * Gets the value with given key. If that value does not exist, calls given closure
      * to get the default value, puts it into the map and returns it. If closure is {@code null}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/550d6033/modules/core/src/main/java/org/apache/ignite/compute/ComputeJobSibling.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/compute/ComputeJobSibling.java b/modules/core/src/main/java/org/apache/ignite/compute/ComputeJobSibling.java
index 2bc81eb..cf60513 100644
--- a/modules/core/src/main/java/org/apache/ignite/compute/ComputeJobSibling.java
+++ b/modules/core/src/main/java/org/apache/ignite/compute/ComputeJobSibling.java
@@ -19,7 +19,6 @@ package org.apache.ignite.compute;
 
 import org.apache.ignite.*;
 import org.apache.ignite.lang.*;
-import org.gridgain.grid.*;
 
 import java.util.*;
 
@@ -27,7 +26,7 @@ import java.util.*;
  * Job sibling interface defines a job from the same split. In other words a sibling is a job returned
  * from the same {@link ComputeTask#map(List, Object)} method invocation.
  */
-public interface ComputeJobSibling extends GridMetadataAware {
+public interface ComputeJobSibling extends IgniteMetadataAware {
     /**
      * Gets ID of this grid job sibling. Note that ID stays constant
      * throughout job life time, even if a job gets failed over to another

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/550d6033/modules/core/src/main/java/org/apache/ignite/compute/ComputeLoadBalancer.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/compute/ComputeLoadBalancer.java b/modules/core/src/main/java/org/apache/ignite/compute/ComputeLoadBalancer.java
index f998219..06a123a 100644
--- a/modules/core/src/main/java/org/apache/ignite/compute/ComputeLoadBalancer.java
+++ b/modules/core/src/main/java/org/apache/ignite/compute/ComputeLoadBalancer.java
@@ -19,7 +19,6 @@ package org.apache.ignite.compute;
 
 import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;
-import org.gridgain.grid.*;
 import org.jetbrains.annotations.*;
 
 import java.util.*;
@@ -101,7 +100,7 @@ import java.util.*;
  * }
  * </pre>
  */
-public interface ComputeLoadBalancer extends GridMetadataAware {
+public interface ComputeLoadBalancer extends IgniteMetadataAware {
     /**
      * Gets the next balanced node according to the underlying load balancing policy.
      *

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/550d6033/modules/core/src/main/java/org/apache/ignite/hadoop/GridHadoopTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/hadoop/GridHadoopTask.java b/modules/core/src/main/java/org/apache/ignite/hadoop/GridHadoopTask.java
index 138a54f..9a99226 100644
--- a/modules/core/src/main/java/org/apache/ignite/hadoop/GridHadoopTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/hadoop/GridHadoopTask.java
@@ -18,7 +18,6 @@
 package org.apache.ignite.hadoop;
 
 import org.apache.ignite.*;
-import org.gridgain.grid.*;
 
 import java.io.*;
 
@@ -61,7 +60,7 @@ public abstract class GridHadoopTask {
      * Runs task.
      *
      * @param taskCtx Context.
-     * @throws GridInterruptedException If interrupted.
+     * @throws org.apache.ignite.IgniteInterruptedException If interrupted.
      * @throws IgniteCheckedException If failed.
      */
     public abstract void run(GridHadoopTaskContext taskCtx) throws IgniteCheckedException;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/550d6033/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheLockImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheLockImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheLockImpl.java
index 43b9579..110dd51 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheLockImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheLockImpl.java
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -20,7 +20,6 @@ package org.apache.ignite.internal.processors.cache;
 import org.apache.ignite.*;
 import org.apache.ignite.cache.*;
 import org.apache.ignite.lang.*;
-import org.gridgain.grid.*;
 import org.gridgain.grid.kernal.processors.cache.*;
 import org.jetbrains.annotations.*;
 
@@ -109,7 +108,7 @@ class CacheLockImpl<K> implements CacheLock {
 
                 return fut.get();
             }
-            catch (GridInterruptedException e) {
+            catch (IgniteInterruptedException e) {
                 if (fut != null) {
                     if (!fut.cancel()) {
                         if (fut.isDone()) {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/550d6033/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
index 69d462a..86d6704 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
@@ -24,7 +24,6 @@ import org.apache.ignite.cache.query.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.lang.*;
 import org.apache.ignite.resources.*;
-import org.gridgain.grid.cache.*;
 import org.gridgain.grid.kernal.processors.cache.*;
 import org.gridgain.grid.util.tostring.*;
 import org.gridgain.grid.util.typedef.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/550d6033/modules/core/src/main/java/org/apache/ignite/jdbc/GridJdbcDriver.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/jdbc/GridJdbcDriver.java b/modules/core/src/main/java/org/apache/ignite/jdbc/GridJdbcDriver.java
index c13ecf6..aba7114 100644
--- a/modules/core/src/main/java/org/apache/ignite/jdbc/GridJdbcDriver.java
+++ b/modules/core/src/main/java/org/apache/ignite/jdbc/GridJdbcDriver.java
@@ -17,7 +17,6 @@
 
 package org.apache.ignite.jdbc;
 
-import org.gridgain.grid.cache.affinity.*;
 
 import java.sql.*;
 import java.util.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/550d6033/modules/core/src/main/java/org/apache/ignite/lang/IgniteFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/lang/IgniteFuture.java b/modules/core/src/main/java/org/apache/ignite/lang/IgniteFuture.java
index 214a5f4..5c67f55 100644
--- a/modules/core/src/main/java/org/apache/ignite/lang/IgniteFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/lang/IgniteFuture.java
@@ -18,7 +18,6 @@
 package org.apache.ignite.lang;
 
 import org.apache.ignite.*;
-import org.gridgain.grid.*;
 import org.jetbrains.annotations.*;
 
 import java.util.concurrent.*;
@@ -35,7 +34,7 @@ public interface IgniteFuture<R> {
      * returns computation result.
      *
      * @return Computation result.
-     * @throws GridInterruptedException Subclass of {@link IgniteCheckedException} thrown if the wait was interrupted.
+     * @throws org.apache.ignite.IgniteInterruptedException Subclass of {@link IgniteCheckedException} thrown if the wait was interrupted.
      * @throws IgniteFutureCancelledException Subclass of {@link IgniteCheckedException} throws if computation was cancelled.
      * @throws IgniteCheckedException If computation failed.
      */
@@ -48,7 +47,7 @@ public interface IgniteFuture<R> {
      *
      * @param timeout The maximum time to wait in milliseconds.
      * @return Computation result.
-     * @throws GridInterruptedException Subclass of {@link IgniteCheckedException} thrown if the wait was interrupted.
+     * @throws org.apache.ignite.IgniteInterruptedException Subclass of {@link IgniteCheckedException} thrown if the wait was interrupted.
      * @throws IgniteFutureTimeoutException Subclass of {@link IgniteCheckedException} thrown if the wait was timed out.
      * @throws IgniteFutureCancelledException Subclass of {@link IgniteCheckedException} throws if computation was cancelled.
      * @throws IgniteCheckedException If computation failed.
@@ -62,7 +61,7 @@ public interface IgniteFuture<R> {
      * @param timeout The maximum time to wait.
      * @param unit The time unit of the {@code timeout} argument.
      * @return Computation result.
-     * @throws GridInterruptedException Subclass of {@link IgniteCheckedException} thrown if the wait was interrupted.
+     * @throws org.apache.ignite.IgniteInterruptedException Subclass of {@link IgniteCheckedException} thrown if the wait was interrupted.
      * @throws IgniteFutureTimeoutException Subclass of {@link IgniteCheckedException} thrown if the wait was timed out.
      * @throws IgniteFutureCancelledException Subclass of {@link IgniteCheckedException} throws if computation was cancelled.
      * @throws IgniteCheckedException If computation failed.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/550d6033/modules/core/src/main/java/org/apache/ignite/lang/IgnitePredicate.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/lang/IgnitePredicate.java b/modules/core/src/main/java/org/apache/ignite/lang/IgnitePredicate.java
index dc4660c..929d335 100644
--- a/modules/core/src/main/java/org/apache/ignite/lang/IgnitePredicate.java
+++ b/modules/core/src/main/java/org/apache/ignite/lang/IgnitePredicate.java
@@ -17,8 +17,6 @@
 
 package org.apache.ignite.lang;
 
-import org.gridgain.grid.cache.*;
-
 import java.io.*;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/550d6033/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/IgniteOptimizedObjectStreamRegistry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/IgniteOptimizedObjectStreamRegistry.java b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/IgniteOptimizedObjectStreamRegistry.java
index a931cdf..86bbf60 100644
--- a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/IgniteOptimizedObjectStreamRegistry.java
+++ b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/IgniteOptimizedObjectStreamRegistry.java
@@ -18,7 +18,6 @@
 package org.apache.ignite.marshaller.optimized;
 
 import org.apache.ignite.*;
-import org.gridgain.grid.*;
 import org.gridgain.grid.util.typedef.internal.*;
 import org.gridgain.grid.util.io.*;
 
@@ -65,9 +64,9 @@ class IgniteOptimizedObjectStreamRegistry {
      * Gets output stream.
      *
      * @return Object output stream.
-     * @throws GridInterruptedException If thread is interrupted while trying to take holder from pool.
+     * @throws org.apache.ignite.IgniteInterruptedException If thread is interrupted while trying to take holder from pool.
      */
-    static IgniteOptimizedObjectOutputStream out() throws GridInterruptedException {
+    static IgniteOptimizedObjectOutputStream out() throws IgniteInterruptedException {
         return holder().acquireOut();
     }
 
@@ -75,9 +74,9 @@ class IgniteOptimizedObjectStreamRegistry {
      * Gets input stream.
      *
      * @return Object input stream.
-     * @throws GridInterruptedException If thread is interrupted while trying to take holder from pool.
+     * @throws org.apache.ignite.IgniteInterruptedException If thread is interrupted while trying to take holder from pool.
      */
-    static IgniteOptimizedObjectInputStream in() throws GridInterruptedException {
+    static IgniteOptimizedObjectInputStream in() throws IgniteInterruptedException {
         return holder().acquireIn();
     }
 
@@ -128,9 +127,9 @@ class IgniteOptimizedObjectStreamRegistry {
      * Gets holder from pool or thread local.
      *
      * @return Stream holder.
-     * @throws GridInterruptedException If thread is interrupted while trying to take holder from pool.
+     * @throws org.apache.ignite.IgniteInterruptedException If thread is interrupted while trying to take holder from pool.
      */
-    private static StreamHolder holder() throws GridInterruptedException {
+    private static StreamHolder holder() throws IgniteInterruptedException {
         StreamHolder holder = holders.get();
 
         if (holder == null) {
@@ -138,7 +137,7 @@ class IgniteOptimizedObjectStreamRegistry {
                 holders.set(holder = pool != null ? pool.take() : new StreamHolder());
             }
             catch (InterruptedException e) {
-                throw new GridInterruptedException("Failed to take object stream from pool (thread interrupted).", e);
+                throw new IgniteInterruptedException("Failed to take object stream from pool (thread interrupted).", e);
             }
         }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/550d6033/modules/core/src/main/java/org/apache/ignite/package.html
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/package.html b/modules/core/src/main/java/org/apache/ignite/package.html
new file mode 100644
index 0000000..863a686
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/package.html
@@ -0,0 +1,23 @@
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<body>
+    <!-- Package description. -->
+    Contains entry-point <b>GridGain & HPC APIs.</b>
+</body>
+</html>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/550d6033/modules/core/src/main/java/org/apache/ignite/scheduler/SchedulerFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/scheduler/SchedulerFuture.java b/modules/core/src/main/java/org/apache/ignite/scheduler/SchedulerFuture.java
index bf79480..006bec2 100644
--- a/modules/core/src/main/java/org/apache/ignite/scheduler/SchedulerFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/scheduler/SchedulerFuture.java
@@ -19,7 +19,6 @@ package org.apache.ignite.scheduler;
 
 import org.apache.ignite.*;
 import org.apache.ignite.lang.*;
-import org.gridgain.grid.*;
 
 import java.util.concurrent.*;
 
@@ -134,7 +133,7 @@ public interface SchedulerFuture<R> extends IgniteFuture<R> {
      *
      * @return Result of the next execution.
      * @throws CancellationException {@inheritDoc}
-     * @throws GridInterruptedException {@inheritDoc}
+     * @throws org.apache.ignite.IgniteInterruptedException {@inheritDoc}
      * @throws IgniteCheckedException {@inheritDoc}
      */
     @Override public R get() throws IgniteCheckedException;
@@ -147,7 +146,7 @@ public interface SchedulerFuture<R> extends IgniteFuture<R> {
      * @param timeout {@inheritDoc}
      * @return The computed result of the next execution.
      * @throws CancellationException {@inheritDoc}
-     * @throws GridInterruptedException {@inheritDoc}
+     * @throws org.apache.ignite.IgniteInterruptedException {@inheritDoc}
      * @throws org.apache.ignite.lang.IgniteFutureTimeoutException {@inheritDoc}
      * @throws IgniteCheckedException {@inheritDoc}
      */
@@ -161,7 +160,7 @@ public interface SchedulerFuture<R> extends IgniteFuture<R> {
      * @param unit {@inheritDoc}
      * @return The computed result of the next execution.
      * @throws CancellationException {@inheritDoc}
-     * @throws GridInterruptedException {@inheritDoc}
+     * @throws org.apache.ignite.IgniteInterruptedException {@inheritDoc}
      * @throws org.apache.ignite.lang.IgniteFutureTimeoutException {@inheritDoc}
      * @throws IgniteCheckedException {@inheritDoc}
      */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/550d6033/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
index 0f55d83..6deccc3 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
@@ -27,7 +27,6 @@ import org.apache.ignite.product.*;
 import org.apache.ignite.resources.*;
 import org.apache.ignite.spi.*;
 import org.apache.ignite.thread.*;
-import org.gridgain.grid.*;
 import org.gridgain.grid.kernal.managers.eventstorage.*;
 import org.apache.ignite.spi.communication.*;
 import org.gridgain.grid.util.*;
@@ -1534,7 +1533,7 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter
                 if (log.isDebugEnabled())
                     log.debug("Context has been initialized.");
             }
-            catch (GridInterruptedException e) {
+            catch (IgniteInterruptedException e) {
                 U.warn(log, "Thread has been interrupted while waiting for SPI context initialization.", e);
             }
         }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/550d6033/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java
index d9f8e30..0bf5539 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java
@@ -26,7 +26,6 @@ import org.apache.ignite.spi.discovery.*;
 import org.apache.ignite.spi.discovery.tcp.internal.*;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.multicast.*;
 import org.apache.ignite.spi.discovery.tcp.messages.*;
-import org.gridgain.grid.*;
 import org.gridgain.grid.util.typedef.*;
 import org.gridgain.grid.util.typedef.internal.*;
 import org.jdk8.backport.*;
@@ -495,7 +494,7 @@ public class TcpClientDiscoverySpi extends TcpDiscoverySpiAdapter implements Tcp
                                 U.closeQuiet(sock);
                         }
                     }
-                    catch (GridInterruptedException ignored) {
+                    catch (IgniteInterruptedException ignored) {
                         if (log.isDebugEnabled())
                             log.debug("Joining thread was interrupted.");
 
@@ -518,7 +517,7 @@ public class TcpClientDiscoverySpi extends TcpDiscoverySpiAdapter implements Tcp
                     U.sleep(2000);
                 }
             }
-            catch (GridInterruptedException ignored) {
+            catch (IgniteInterruptedException ignored) {
                 if (log.isDebugEnabled())
                     log.debug("Joining thread was interrupted.");
             }
@@ -617,7 +616,7 @@ public class TcpClientDiscoverySpi extends TcpDiscoverySpiAdapter implements Tcp
                         }
                     }
                 }
-                catch (GridInterruptedException ignored) {
+                catch (IgniteInterruptedException ignored) {
                     if (log.isDebugEnabled())
                         log.debug("Disconnect handler was interrupted.");
 
@@ -662,7 +661,7 @@ public class TcpClientDiscoverySpi extends TcpDiscoverySpiAdapter implements Tcp
                     sockRdr.addMessage(msg);
                 }
             }
-            catch (GridInterruptedException ignored) {
+            catch (IgniteInterruptedException ignored) {
                 if (log.isDebugEnabled())
                     log.debug("Heartbeat sender was interrupted.");
             }
@@ -784,7 +783,7 @@ public class TcpClientDiscoverySpi extends TcpDiscoverySpiAdapter implements Tcp
                 try {
                     U.join(msgWrk);
                 }
-                catch (GridInterruptedException ignored) {
+                catch (IgniteInterruptedException ignored) {
                     // No-op.
                 }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/550d6033/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
index e5573e6..d250509 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
@@ -24,7 +24,6 @@ import org.apache.ignite.lang.*;
 import org.apache.ignite.marshaller.*;
 import org.apache.ignite.resources.*;
 import org.apache.ignite.spi.*;
-import org.gridgain.grid.*;
 import org.gridgain.grid.kernal.*;
 import org.gridgain.grid.kernal.managers.security.*;
 import org.apache.ignite.plugin.security.*;
@@ -797,7 +796,7 @@ public class TcpDiscoverySpi extends TcpDiscoverySpiAdapter implements TcpDiscov
             try {
                 U.sleep(2000);
             }
-            catch (GridInterruptedException e) {
+            catch (IgniteInterruptedException e) {
                 throw new IgniteSpiException("Thread has been interrupted.", e);
             }
         }
@@ -888,7 +887,7 @@ public class TcpDiscoverySpi extends TcpDiscoverySpiAdapter implements TcpDiscov
                 if (log.isDebugEnabled())
                     log.debug("Context has been initialized.");
             }
-            catch (GridInterruptedException e) {
+            catch (IgniteInterruptedException e) {
                 U.warn(log, "Thread has been interrupted while waiting for SPI context initialization.", e);
             }
         }
@@ -1481,7 +1480,7 @@ public class TcpDiscoverySpi extends TcpDiscoverySpiAdapter implements TcpDiscov
                 try {
                     U.sleep(2000);
                 }
-                catch (GridInterruptedException e) {
+                catch (IgniteInterruptedException e) {
                     throw new IgniteSpiException("Thread has been interrupted.", e);
                 }
             }
@@ -1505,7 +1504,7 @@ public class TcpDiscoverySpi extends TcpDiscoverySpiAdapter implements TcpDiscov
                 try {
                     U.sleep(2000);
                 }
-                catch (GridInterruptedException e) {
+                catch (IgniteInterruptedException e) {
                     throw new IgniteSpiException("Thread has been interrupted.", e);
                 }
             }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/550d6033/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiAdapter.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiAdapter.java
index bfdeb27..9082fa1 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiAdapter.java
@@ -24,7 +24,6 @@ import org.apache.ignite.marshaller.jdk.*;
 import org.apache.ignite.product.*;
 import org.apache.ignite.resources.*;
 import org.apache.ignite.spi.*;
-import org.gridgain.grid.*;
 import org.apache.ignite.spi.discovery.*;
 import org.apache.ignite.spi.discovery.tcp.internal.*;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
@@ -634,7 +633,7 @@ abstract class TcpDiscoverySpiAdapter extends IgniteSpiAdapter implements Discov
             try {
                 U.sleep(2000);
             }
-            catch (GridInterruptedException e) {
+            catch (IgniteInterruptedException e) {
                 throw new IgniteSpiException("Thread has been interrupted.", e);
             }
         }
@@ -703,7 +702,7 @@ abstract class TcpDiscoverySpiAdapter extends IgniteSpiAdapter implements Discov
     protected IgniteSpiException authenticationFailedError(TcpDiscoveryAuthFailedMessage msg) {
         assert msg != null;
 
-        return new IgniteSpiException(new GridAuthenticationException("Authentication failed [nodeId=" +
+        return new IgniteSpiException(new IgniteAuthenticationException("Authentication failed [nodeId=" +
             msg.creatorNodeId() + ", addr=" + msg.address().getHostAddress() + ']'));
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/550d6033/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/jdbc/TcpDiscoveryJdbcIpFinder.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/jdbc/TcpDiscoveryJdbcIpFinder.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/jdbc/TcpDiscoveryJdbcIpFinder.java
index c38952c..9ccfa41 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/jdbc/TcpDiscoveryJdbcIpFinder.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/jdbc/TcpDiscoveryJdbcIpFinder.java
@@ -20,7 +20,6 @@ package org.apache.ignite.spi.discovery.tcp.ipfinder.jdbc;
 import org.apache.ignite.*;
 import org.apache.ignite.resources.*;
 import org.apache.ignite.spi.*;
-import org.gridgain.grid.*;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
 import org.gridgain.grid.util.typedef.*;
 import org.gridgain.grid.util.typedef.internal.*;
@@ -335,7 +334,7 @@ public class TcpDiscoveryJdbcIpFinder extends TcpDiscoveryIpFinderAdapter {
         try {
             U.await(initLatch);
         }
-        catch (GridInterruptedException e) {
+        catch (IgniteInterruptedException e) {
             throw new IgniteSpiException("Thread has been interrupted.", e);
         }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/550d6033/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/multicast/TcpDiscoveryMulticastIpFinder.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/multicast/TcpDiscoveryMulticastIpFinder.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/multicast/TcpDiscoveryMulticastIpFinder.java
index 23cfa8b..6d8b6e9 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/multicast/TcpDiscoveryMulticastIpFinder.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/multicast/TcpDiscoveryMulticastIpFinder.java
@@ -22,7 +22,6 @@ import org.apache.ignite.marshaller.*;
 import org.apache.ignite.marshaller.jdk.*;
 import org.apache.ignite.resources.*;
 import org.apache.ignite.spi.*;
-import org.gridgain.grid.*;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
 import org.gridgain.grid.util.typedef.*;
 import org.gridgain.grid.util.typedef.internal.*;
@@ -484,7 +483,7 @@ public class TcpDiscoveryMulticastIpFinder extends TcpDiscoveryVmIpFinder {
 
             return rmtAddrs;
         }
-        catch (GridInterruptedException ignored) {
+        catch (IgniteInterruptedException ignored) {
             U.warn(log, "Got interrupted while sending address request.");
 
             Thread.currentThread().interrupt();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/550d6033/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/sharedfs/TcpDiscoverySharedFsIpFinder.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/sharedfs/TcpDiscoverySharedFsIpFinder.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/sharedfs/TcpDiscoverySharedFsIpFinder.java
index 07d2ba6..36a4f32 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/sharedfs/TcpDiscoverySharedFsIpFinder.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/sharedfs/TcpDiscoverySharedFsIpFinder.java
@@ -20,7 +20,6 @@ package org.apache.ignite.spi.discovery.tcp.ipfinder.sharedfs;
 import org.apache.ignite.*;
 import org.apache.ignite.resources.*;
 import org.apache.ignite.spi.*;
-import org.gridgain.grid.*;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
 import org.gridgain.grid.util.typedef.*;
 import org.gridgain.grid.util.typedef.internal.*;
@@ -161,7 +160,7 @@ public class TcpDiscoverySharedFsIpFinder extends TcpDiscoveryIpFinderAdapter {
             try {
                 U.await(initLatch);
             }
-            catch (GridInterruptedException e) {
+            catch (IgniteInterruptedException e) {
                 throw new IgniteSpiException("Thread has been interrupted.", e);
             }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/550d6033/modules/core/src/main/java/org/apache/ignite/spi/swapspace/file/FileSwapSpaceSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/swapspace/file/FileSwapSpaceSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/swapspace/file/FileSwapSpaceSpi.java
index ae3407d..4c7031b 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/swapspace/file/FileSwapSpaceSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/swapspace/file/FileSwapSpaceSpi.java
@@ -22,7 +22,6 @@ import org.apache.ignite.lang.*;
 import org.apache.ignite.marshaller.*;
 import org.apache.ignite.resources.*;
 import org.apache.ignite.spi.*;
-import org.gridgain.grid.*;
 import org.apache.ignite.spi.swapspace.*;
 import org.gridgain.grid.util.*;
 import org.gridgain.grid.util.typedef.*;
@@ -293,7 +292,7 @@ public class FileSwapSpaceSpi extends IgniteSpiAdapter implements SwapSpaceSpi,
             try {
                 space.stop();
             }
-            catch (GridInterruptedException e) {
+            catch (IgniteInterruptedException e) {
                 U.error(log, "Interrupted.", e);
             }
         }
@@ -1554,9 +1553,9 @@ public class FileSwapSpaceSpi extends IgniteSpiAdapter implements SwapSpaceSpi,
         /**
          * Stops space.
          *
-         * @throws GridInterruptedException If interrupted.
+         * @throws org.apache.ignite.IgniteInterruptedException If interrupted.
          */
-        public void stop() throws GridInterruptedException {
+        public void stop() throws IgniteInterruptedException {
             U.interrupt(writer);
             U.interrupt(compactor);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/550d6033/modules/core/src/main/java/org/apache/ignite/streamer/router/StreamerCacheAffinityEventRouter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/streamer/router/StreamerCacheAffinityEventRouter.java b/modules/core/src/main/java/org/apache/ignite/streamer/router/StreamerCacheAffinityEventRouter.java
index df02346..f6de5f8 100644
--- a/modules/core/src/main/java/org/apache/ignite/streamer/router/StreamerCacheAffinityEventRouter.java
+++ b/modules/core/src/main/java/org/apache/ignite/streamer/router/StreamerCacheAffinityEventRouter.java
@@ -22,7 +22,6 @@ import org.apache.ignite.cache.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.resources.*;
 import org.apache.ignite.streamer.*;
-import org.gridgain.grid.cache.*;
 import org.gridgain.grid.kernal.*;
 import org.jetbrains.annotations.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/550d6033/modules/core/src/main/java/org/apache/ignite/streamer/window/StreamerBoundedSizeBatchWindow.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/streamer/window/StreamerBoundedSizeBatchWindow.java b/modules/core/src/main/java/org/apache/ignite/streamer/window/StreamerBoundedSizeBatchWindow.java
index cab5ea0..6a6407d 100644
--- a/modules/core/src/main/java/org/apache/ignite/streamer/window/StreamerBoundedSizeBatchWindow.java
+++ b/modules/core/src/main/java/org/apache/ignite/streamer/window/StreamerBoundedSizeBatchWindow.java
@@ -18,7 +18,6 @@
 package org.apache.ignite.streamer.window;
 
 import org.apache.ignite.*;
-import org.gridgain.grid.*;
 import org.gridgain.grid.kernal.processors.streamer.*;
 import org.gridgain.grid.util.lang.*;
 import org.gridgain.grid.util.tostring.*;
@@ -240,7 +239,7 @@ public class StreamerBoundedSizeBatchWindow<E> extends StreamerWindowAdapter<E>
         try {
             return enqueueInternal(evt);
         }
-        catch (GridInterruptedException ignored) {
+        catch (IgniteInterruptedException ignored) {
             return false;
         }
     }
@@ -251,10 +250,10 @@ public class StreamerBoundedSizeBatchWindow<E> extends StreamerWindowAdapter<E>
      * @param evt Event to add.
      * @return {@code True} if event was added.
      *
-     * @throws GridInterruptedException If thread was interrupted.
+     * @throws org.apache.ignite.IgniteInterruptedException If thread was interrupted.
      */
     @SuppressWarnings("LockAcquiredButNotSafelyReleased")
-    private boolean enqueueInternal(E evt) throws GridInterruptedException {
+    private boolean enqueueInternal(E evt) throws IgniteInterruptedException {
         QueueHolder tup = holder;
 
         ConcurrentLinkedDeque8<Batch> evts = tup.batchQueue();
@@ -625,9 +624,9 @@ public class StreamerBoundedSizeBatchWindow<E> extends StreamerWindowAdapter<E>
         /**
          * Waits for latch count down after last event was added.
          *
-         * @throws GridInterruptedException If wait was interrupted.
+         * @throws org.apache.ignite.IgniteInterruptedException If wait was interrupted.
          */
-        public void finish() throws GridInterruptedException {
+        public void finish() throws IgniteInterruptedException {
             writeLock().lock();
 
             try {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/550d6033/modules/core/src/main/java/org/apache/ignite/streamer/window/StreamerBoundedTimeBatchWindow.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/streamer/window/StreamerBoundedTimeBatchWindow.java b/modules/core/src/main/java/org/apache/ignite/streamer/window/StreamerBoundedTimeBatchWindow.java
index 2dc5415..a544c25 100644
--- a/modules/core/src/main/java/org/apache/ignite/streamer/window/StreamerBoundedTimeBatchWindow.java
+++ b/modules/core/src/main/java/org/apache/ignite/streamer/window/StreamerBoundedTimeBatchWindow.java
@@ -18,7 +18,6 @@
 package org.apache.ignite.streamer.window;
 
 import org.apache.ignite.*;
-import org.gridgain.grid.*;
 import org.gridgain.grid.kernal.processors.streamer.*;
 import org.gridgain.grid.util.lang.*;
 import org.gridgain.grid.util.tostring.*;
@@ -274,7 +273,7 @@ public class StreamerBoundedTimeBatchWindow<E> extends StreamerWindowAdapter<E>
         try {
             return enqueue0(evt, U.currentTimeMillis());
         }
-        catch (GridInterruptedException ignored) {
+        catch (IgniteInterruptedException ignored) {
             return false;
         }
     }
@@ -286,9 +285,9 @@ public class StreamerBoundedTimeBatchWindow<E> extends StreamerWindowAdapter<E>
      * @param ts Event timestamp.
      * @return {@code True} if event was added.
      *
-     * @throws GridInterruptedException If thread was interrupted.
+     * @throws org.apache.ignite.IgniteInterruptedException If thread was interrupted.
      */
-    private boolean enqueue0(E evt, long ts) throws GridInterruptedException {
+    private boolean enqueue0(E evt, long ts) throws IgniteInterruptedException {
         WindowHolder tup = ref.get();
 
         ConcurrentLinkedDeque8<Batch> evts = tup.batchQueue();
@@ -705,9 +704,9 @@ public class StreamerBoundedTimeBatchWindow<E> extends StreamerWindowAdapter<E>
         /**
          * Waits for latch count down after last event was added.
          *
-         * @throws GridInterruptedException If wait was interrupted.
+         * @throws org.apache.ignite.IgniteInterruptedException If wait was interrupted.
          */
-        public void finish() throws GridInterruptedException {
+        public void finish() throws IgniteInterruptedException {
             writeLock().lock();
 
             try {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/550d6033/modules/core/src/main/java/org/apache/ignite/transactions/IgniteTx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/transactions/IgniteTx.java b/modules/core/src/main/java/org/apache/ignite/transactions/IgniteTx.java
index b0539a2..c6b3e96 100644
--- a/modules/core/src/main/java/org/apache/ignite/transactions/IgniteTx.java
+++ b/modules/core/src/main/java/org/apache/ignite/transactions/IgniteTx.java
@@ -20,7 +20,6 @@ package org.apache.ignite.transactions;
 import org.apache.ignite.*;
 import org.apache.ignite.cache.*;
 import org.apache.ignite.lang.*;
-import org.gridgain.grid.cache.*;
 
 import java.util.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/550d6033/modules/core/src/main/java/org/apache/ignite/transactions/IgniteTxSynchronization.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/transactions/IgniteTxSynchronization.java b/modules/core/src/main/java/org/apache/ignite/transactions/IgniteTxSynchronization.java
index 54029b8..756e23e 100644
--- a/modules/core/src/main/java/org/apache/ignite/transactions/IgniteTxSynchronization.java
+++ b/modules/core/src/main/java/org/apache/ignite/transactions/IgniteTxSynchronization.java
@@ -17,7 +17,6 @@
 
 package org.apache.ignite.transactions;
 
-import org.gridgain.grid.cache.*;
 import org.jetbrains.annotations.*;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/550d6033/modules/core/src/main/java/org/gridgain/grid/GridAuthenticationException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/GridAuthenticationException.java b/modules/core/src/main/java/org/gridgain/grid/GridAuthenticationException.java
deleted file mode 100644
index 66a6dee..0000000
--- a/modules/core/src/main/java/org/gridgain/grid/GridAuthenticationException.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.gridgain.grid;
-
-import org.apache.ignite.*;
-
-/**
- * Exception that represents authentication failure.
- */
-public class GridAuthenticationException extends IgniteCheckedException {
-    /** */
-    private static final long serialVersionUID = 0L;
-
-    /**
-     * Creates authentication exception with given error message.
-     *
-     * @param msg Error message.
-     */
-    public GridAuthenticationException(String msg) {
-        super(msg);
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/550d6033/modules/core/src/main/java/org/gridgain/grid/GridBasicWarmupClosure.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/GridBasicWarmupClosure.java b/modules/core/src/main/java/org/gridgain/grid/GridBasicWarmupClosure.java
deleted file mode 100644
index 52519ec..0000000
--- a/modules/core/src/main/java/org/gridgain/grid/GridBasicWarmupClosure.java
+++ /dev/null
@@ -1,563 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.gridgain.grid;
-
-import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
-import org.apache.ignite.cache.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.logger.*;
-import org.gridgain.grid.cache.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-import org.gridgain.grid.util.typedef.*;
-import org.gridgain.grid.util.typedef.internal.*;
-
-import java.text.*;
-import java.util.*;
-import java.util.concurrent.*;
-
-/**
- * Basic warm-up closure which warm-ups cache operations.
- */
-public class GridBasicWarmupClosure implements IgniteInClosure<IgniteConfiguration> {
-    /** */
-    private static final long serialVersionUID = 9175346848249957458L;
-
-    /** Default grid count to warm up. */
-    public static final int DFLT_GRID_CNT = 2;
-
-    /** Default iteration count per thread. */
-    public static final int DFLT_ITERATION_CNT = 30_000;
-
-    /** Default key range. */
-    public static final int DFLT_KEY_RANGE = 10_000;
-
-    /** Grid count. */
-    private int gridCnt = DFLT_GRID_CNT;
-
-    /** Warmup date format. */
-    private static final SimpleDateFormat WARMUP_DATE_FMT = new SimpleDateFormat("HH:mm:ss");
-
-    /** Warmup thread count. */
-    private int threadCnt = Runtime.getRuntime().availableProcessors() * 2;
-
-    /** Per thread iteration count. */
-    private int iterCnt = DFLT_ITERATION_CNT;
-
-    /** Key range. */
-    private int keyRange = DFLT_KEY_RANGE;
-
-    /** Warmup discovery port. */
-    private int discoveryPort = 27000;
-
-    /** Methods to warmup. */
-    private String[] warmupMethods = {"put", "putx", "get", "remove", "removex", "putIfAbsent", "replace"};
-
-    /**
-     * Gets number of grids to start and run warmup.
-     *
-     * @return Number of grids.
-     */
-    public int getGridCount() {
-        return gridCnt;
-    }
-
-    /**
-     * Sets number of grids to start and run the warmup.
-     *
-     * @param gridCnt Number of grids.
-     */
-    public void setGridCount(int gridCnt) {
-        this.gridCnt = gridCnt;
-    }
-
-    /**
-     * Gets warmup methods to use for cache warmup.
-     *
-     * @return Warmup methods.
-     */
-    public String[] getWarmupMethods() {
-        return warmupMethods;
-    }
-
-    /**
-     * Sets warmup methods to use for cache warmup.
-     *
-     * @param warmupMethods Array of warmup methods.
-     */
-    public void setWarmupMethods(String... warmupMethods) {
-        this.warmupMethods = warmupMethods;
-    }
-
-    /**
-     * Gets thread count for warmup.
-     *
-     * @return Thread count.
-     */
-    public int getThreadCount() {
-        return threadCnt;
-    }
-
-    /**
-     * Sets thread count for warmup.
-     *
-     * @param threadCnt Thread count.
-     */
-    public void setThreadCount(int threadCnt) {
-        this.threadCnt = threadCnt;
-    }
-
-    /**
-     * Gets iteration count for warmup.
-     *
-     * @return Iteration count.
-     */
-    public int getIterationCount() {
-        return iterCnt;
-    }
-
-    /**
-     * Sets iteration count for warmup.
-     *
-     * @param iterCnt Iteration count for warmup.
-     */
-    public void setIterationCount(int iterCnt) {
-        this.iterCnt = iterCnt;
-    }
-
-    /**
-     * Gets key range.
-     *
-     * @return Key range.
-     */
-    public int getKeyRange() {
-        return keyRange;
-    }
-
-    /**
-     * Sets key range.
-     *
-     * @param keyRange Key range.
-     */
-    public void setKeyRange(int keyRange) {
-        this.keyRange = keyRange;
-    }
-
-    /**
-     * Gets discovery port for warmup.
-     *
-     * @return Discovery port.
-     */
-    public int getDiscoveryPort() {
-        return discoveryPort;
-    }
-
-    /**
-     * Sets discovery port for warmup.
-     *
-     * @param discoveryPort Discovery port.
-     */
-    public void setDiscoveryPort(int discoveryPort) {
-        this.discoveryPort = discoveryPort;
-    }
-
-    /** {@inheritDoc} */
-    @Override public void apply(IgniteConfiguration gridCfg) {
-        // Remove cache duplicates, clean up the rest, etc.
-        IgniteConfiguration cfg = prepareConfiguration(gridCfg);
-
-        // Do nothing if no caches found.
-        if (cfg == null)
-            return;
-
-        out("Starting grids to warmup caches [gridCnt=" + gridCnt +
-            ", caches=" + cfg.getCacheConfiguration().length + ']');
-
-        Collection<Ignite> ignites = new LinkedList<>();
-
-        String old = System.getProperty(IgniteSystemProperties.GG_UPDATE_NOTIFIER);
-
-        try {
-            System.setProperty(IgniteSystemProperties.GG_UPDATE_NOTIFIER, "false");
-
-            TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true);
-
-            for (int i = 0; i < gridCnt; i++) {
-                IgniteConfiguration cfg0 = new IgniteConfiguration(cfg);
-
-                TcpDiscoverySpi discoSpi = new TcpDiscoverySpi();
-
-                discoSpi.setIpFinder(ipFinder);
-
-                discoSpi.setLocalPort(discoveryPort);
-
-                cfg0.setDiscoverySpi(discoSpi);
-
-                cfg0.setGridLogger(new IgniteNullLogger());
-
-                cfg0.setGridName("gridgain-warmup-grid-" + i);
-
-                ignites.add(Ignition.start(cfg0));
-            }
-
-            doWarmup(ignites);
-        }
-        catch (Exception e) {
-            throw new IgniteException(e);
-        }
-        finally {
-            for (Ignite ignite : ignites)
-                Ignition.stop(ignite.name(), false);
-
-            out("Stopped warmup grids.");
-
-            if (old == null)
-                old = "false";
-
-            System.setProperty(IgniteSystemProperties.GG_UPDATE_NOTIFIER, old);
-        }
-    }
-
-    /**
-     * @param grids Grids to warmup.
-     */
-    private void doWarmup(Iterable<Ignite> grids) throws Exception {
-        Ignite first = F.first(grids);
-
-        ExecutorService svc = Executors.newFixedThreadPool(threadCnt);
-
-        try {
-            for (GridCache<?, ?> cache : first.caches()) {
-                GridCache<Object, Object> cache0 = first.cache(cache.name());
-
-                for (String warmupMethod : warmupMethods) {
-                    Collection<Future> futs = new ArrayList<>(threadCnt);
-
-                    for (int i = 0; i < threadCnt; i++) {
-                        Callable call;
-
-                        switch (warmupMethod) {
-                            case "get": {
-                                call = new GetCallable(cache0);
-
-                                break;
-                            }
-
-                            case "put": {
-                                call = new PutCallable(cache0);
-
-                                break;
-                            }
-
-                            case "putx": {
-                                call = new PutxCallable(cache0);
-
-                                break;
-                            }
-
-                            case "remove": {
-                                call = new RemoveCallable(cache0);
-
-                                break;
-                            }
-
-                            case "removex": {
-                                call = new RemovexCallable(cache0);
-
-                                break;
-                            }
-
-                            case "putIfAbsent": {
-                                call = new PutIfAbsentCallable(cache0);
-
-                                break;
-                            }
-
-                            case "replace": {
-                                call = new ReplaceCallable(cache0);
-
-                                break;
-                            }
-
-                            default:
-                                throw new IgniteCheckedException("Unsupported warmup method: " + warmupMethod);
-                        }
-
-                        futs.add(svc.submit(call));
-                    }
-
-                    out("Running warmup [cacheName=" + cache.name() + ", method=" + warmupMethod + ']');
-
-                    for (Future fut : futs)
-                        fut.get();
-
-                    for (int key = 0; key < keyRange; key++)
-                        cache0.remove(key);
-                }
-            }
-        }
-        finally {
-            svc.shutdownNow();
-        }
-    }
-
-    /**
-     * Output for warmup messages.
-     *
-     * @param msg Format message.
-     */
-    private static void out(String msg) {
-        System.out.println('[' + WARMUP_DATE_FMT.format(new Date(System.currentTimeMillis())) + "][WARMUP][" +
-            Thread.currentThread().getName() + ']' + ' ' + msg);
-    }
-
-    /**
-     * Prepares configuration for warmup.
-     *
-     * @param gridCfg Original grid configuration.
-     * @return Prepared configuration or {@code null} if no caches found.
-     */
-    private IgniteConfiguration prepareConfiguration(IgniteConfiguration gridCfg) {
-        if (F.isEmpty(gridCfg.getCacheConfiguration()))
-            return null;
-
-        IgniteConfiguration cp = new IgniteConfiguration();
-
-        cp.setClientConnectionConfiguration(null);
-
-        Collection<CacheConfiguration> reduced = new ArrayList<>();
-
-        for (CacheConfiguration ccfg : gridCfg.getCacheConfiguration()) {
-            if (CU.isSystemCache(ccfg.getName()))
-                continue;
-
-            if (!matches(reduced, ccfg)) {
-                CacheConfiguration ccfgCp = new CacheConfiguration(ccfg);
-
-                if (ccfgCp.getDistributionMode() == GridCacheDistributionMode.CLIENT_ONLY)
-                    ccfgCp.setDistributionMode(GridCacheDistributionMode.PARTITIONED_ONLY);
-                else if (ccfgCp.getDistributionMode() == GridCacheDistributionMode.NEAR_ONLY)
-                    ccfgCp.setDistributionMode(GridCacheDistributionMode.NEAR_PARTITIONED);
-
-                ccfgCp.setCacheStoreFactory(null);
-                ccfgCp.setWriteBehindEnabled(false);
-
-                reduced.add(ccfgCp);
-            }
-        }
-
-        if (F.isEmpty(reduced))
-            return null;
-
-        CacheConfiguration[] res = new CacheConfiguration[reduced.size()];
-
-        reduced.toArray(res);
-
-        cp.setCacheConfiguration(res);
-
-        return cp;
-    }
-
-    /**
-     * Checks if passed configuration matches one of the configurations in the list.
-     *
-     * @param reduced Reduced configurations.
-     * @param ccfg Cache configuration to match.
-     * @return {@code True} if matching configuration is found, {@code false} otherwise.
-     */
-    private boolean matches(Iterable<CacheConfiguration> reduced, CacheConfiguration ccfg) {
-        for (CacheConfiguration ccfg0 : reduced) {
-            if (matches(ccfg0, ccfg))
-                return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Checks if cache configurations are alike for warmup.
-     *
-     * @param ccfg0 First configuration.
-     * @param ccfg1 Second configuration.
-     * @return {@code True} if configurations match.
-     */
-    private boolean matches(CacheConfiguration ccfg0, CacheConfiguration ccfg1) {
-        return
-            F.eq(ccfg0.getCacheMode(), ccfg1.getCacheMode()) &&
-            F.eq(ccfg0.getBackups(), ccfg1.getBackups()) &&
-            F.eq(ccfg0.getAtomicityMode(), ccfg1.getAtomicityMode()) &&
-            F.eq(ccfg0.getAtomicWriteOrderMode(), ccfg1.getAtomicWriteOrderMode()) &&
-            F.eq(ccfg0.getMemoryMode(), ccfg1.getMemoryMode()) &&
-            F.eq(ccfg0.getDistributionMode(), ccfg1.getDistributionMode());
-    }
-
-    /**
-     * Base class for all warmup callables.
-     */
-    private abstract class BaseWarmupCallable implements Callable<Object> {
-        /** Cache. */
-        protected final GridCache<Object, Object> cache;
-
-        /**
-         * @param cache Cache.
-         */
-        protected BaseWarmupCallable(GridCache<Object, Object> cache) {
-            this.cache = cache;
-        }
-
-        /** {@inheritDoc} */
-        @Override public Object call() throws Exception {
-            ThreadLocalRandom rnd = ThreadLocalRandom.current();
-
-            for (int i = 0; i < iterCnt; i++)
-                operation(rnd.nextInt(keyRange));
-
-            return null;
-        }
-
-        /**
-         * Runs operation.
-         *
-         * @param key Key.
-         * @throws Exception If failed.
-         */
-        protected abstract void operation(int key) throws Exception;
-    }
-
-    /**
-     *
-     */
-    private class GetCallable extends BaseWarmupCallable {
-        /**
-         * @param cache Cache.
-         */
-        private GetCallable(GridCache<Object, Object> cache) {
-            super(cache);
-        }
-
-        /** {@inheritDoc} */
-        @Override protected void operation(int key) throws Exception {
-            cache.get(key);
-        }
-    }
-
-    /**
-     *
-     */
-    private class PutCallable extends BaseWarmupCallable {
-        /**
-         * @param cache Cache.
-         */
-        private PutCallable(GridCache<Object, Object> cache) {
-            super(cache);
-        }
-
-        /** {@inheritDoc} */
-        @Override protected void operation(int key) throws Exception {
-            cache.put(key, key);
-        }
-    }
-
-    /**
-     *
-     */
-    private class PutxCallable extends BaseWarmupCallable {
-        /**
-         * @param cache Cache.
-         */
-        private PutxCallable(GridCache<Object, Object> cache) {
-            super(cache);
-        }
-
-        /** {@inheritDoc} */
-        @Override protected void operation(int key) throws Exception {
-            cache.putx(key, key);
-        }
-    }
-
-    /**
-     *
-     */
-    private class RemoveCallable extends BaseWarmupCallable {
-        /**
-         * @param cache Cache.
-         */
-        private RemoveCallable(GridCache<Object, Object> cache) {
-            super(cache);
-        }
-
-        /** {@inheritDoc} */
-        @Override protected void operation(int key) throws Exception {
-            cache.remove(key);
-        }
-    }
-
-    /**
-     *
-     */
-    private class RemovexCallable extends BaseWarmupCallable {
-        /**
-         * @param cache Cache.
-         */
-        private RemovexCallable(GridCache<Object, Object> cache) {
-            super(cache);
-        }
-
-        /** {@inheritDoc} */
-        @Override protected void operation(int key) throws Exception {
-            cache.removex(key);
-        }
-    }
-
-    /**
-     *
-     */
-    private class PutIfAbsentCallable extends BaseWarmupCallable {
-        /**
-         * @param cache Cache.
-         */
-        private PutIfAbsentCallable(GridCache<Object, Object> cache) {
-            super(cache);
-        }
-
-        /** {@inheritDoc} */
-        @Override protected void operation(int key) throws Exception {
-            cache.putIfAbsent(key, key);
-        }
-    }
-
-    /**
-     *
-     */
-    private class ReplaceCallable extends BaseWarmupCallable {
-        /**
-         * @param cache Cache.
-         */
-        private ReplaceCallable(GridCache<Object, Object> cache) {
-            super(cache);
-        }
-
-        /** {@inheritDoc} */
-        @Override protected void operation(int key) throws Exception {
-            cache.replace(key, key, key);
-        }
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/550d6033/modules/core/src/main/java/org/gridgain/grid/GridDeploymentException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/GridDeploymentException.java b/modules/core/src/main/java/org/gridgain/grid/GridDeploymentException.java
deleted file mode 100644
index 3168e9a..0000000
--- a/modules/core/src/main/java/org/gridgain/grid/GridDeploymentException.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.gridgain.grid;
-
-import org.apache.ignite.*;
-import org.jetbrains.annotations.*;
-
-/**
- * Deployment or re-deployment failed.
- */
-public class GridDeploymentException extends IgniteCheckedException {
-    /** */
-    private static final long serialVersionUID = 0L;
-
-    /**
-     * Creates new exception with given error message.
-     *
-     * @param msg Error message.
-     */
-    public GridDeploymentException(String msg) {
-        super(msg);
-    }
-
-    /**
-     * Creates new exception with given throwable as a nested cause and
-     * source of error message.
-     *
-     * @param cause Non-null throwable cause.
-     */
-    public GridDeploymentException(Throwable cause) {
-        this(cause.getMessage(), cause);
-    }
-
-    /**
-     * Creates a new exception with given error message and optional nested cause exception.
-     *
-     * @param msg Error message.
-     * @param cause Optional nested exception (can be {@code null}).
-     */
-    public GridDeploymentException(String msg, @Nullable Throwable cause) {
-        super(msg, cause);
-    }
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/550d6033/modules/core/src/main/java/org/gridgain/grid/GridIllegalStateException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/GridIllegalStateException.java b/modules/core/src/main/java/org/gridgain/grid/GridIllegalStateException.java
deleted file mode 100644
index 5fb037f..0000000
--- a/modules/core/src/main/java/org/gridgain/grid/GridIllegalStateException.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.gridgain.grid;
-
-import org.gridgain.grid.util.typedef.*;
-import org.jetbrains.annotations.*;
-
-/**
- * This exception indicates the grid access in invalid state.
- */
-public class GridIllegalStateException extends IllegalStateException {
-    /** */
-    private static final long serialVersionUID = 0L;
-
-    /**
-     * Constructs exception with given message and cause.
-     *
-     * @param msg Exception message.
-     * @param cause Exception cause.
-     */
-    public GridIllegalStateException(String msg, @Nullable Throwable cause) {
-        super(msg, cause);
-    }
-
-    /**
-     * Creates exception given throwable as a cause and
-     * source of error message.
-     *
-     * @param cause Non-null throwable cause.
-     */
-    public GridIllegalStateException(Throwable cause) {
-        this(cause.getMessage(), cause);
-    }
-
-    /**
-     * Constructs exception with given message.
-     *
-     * @param msg Exception message.
-     */
-    public GridIllegalStateException(String msg) {
-        super(msg);
-    }
-
-    /**
-     * Checks if this exception has given class in {@code 'cause'} hierarchy.
-     *
-     * @param cls Cause class to check (if {@code null}, {@code false} is returned)..
-     * @return {@code True} if one of the causing exception is an instance of passed in class,
-     *      {@code false} otherwise.
-     */
-    public boolean hasCause(@Nullable Class<? extends Throwable>... cls) {
-        return X.hasCause(this, cls);
-    }
-
-    /**
-     * Gets first exception of given class from {@code 'cause'} hierarchy if any.
-     *
-     * @param cls Cause class to get cause (if {@code null}, {@code null} is returned).
-     * @return First causing exception of passed in class, {@code null} otherwise.
-     */
-    @Nullable public <T extends Throwable> T getCause(@Nullable Class<T> cls) {
-        return X.cause(this, cls);
-    }
-
-    /** {@inheritDoc} */
-    @Override public String toString() {
-        return getClass() + ": " + getMessage();
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/550d6033/modules/core/src/main/java/org/gridgain/grid/GridInterruptedException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/GridInterruptedException.java b/modules/core/src/main/java/org/gridgain/grid/GridInterruptedException.java
deleted file mode 100644
index a52dd9a..0000000
--- a/modules/core/src/main/java/org/gridgain/grid/GridInterruptedException.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.gridgain.grid;
-
-import org.apache.ignite.*;
-
-/**
- * This exception is used to wrap standard {@link InterruptedException} into {@link IgniteCheckedException}.
- */
-@SuppressWarnings({"TypeMayBeWeakened"})
-public class GridInterruptedException extends IgniteCheckedException {
-    /** */
-    private static final long serialVersionUID = 0L;
-
-    /**
-     * Creates new exception with given throwable as a nested cause and
-     * source of error message.
-     *
-     * @param cause Non-null throwable cause.
-     */
-    public GridInterruptedException(InterruptedException cause) {
-        this(cause.getMessage(), cause);
-    }
-
-    /**
-     * Creates a new exception with given error message and optional nested cause exception.
-     *
-     * @param msg Error message.
-     */
-    public GridInterruptedException(String msg) {
-        super(msg);
-    }
-
-    /**
-     * Creates a new exception with given error message and optional nested cause exception.
-     *
-     * @param msg Error message.
-     * @param cause Optional nested exception (can be {@code null}).
-     */
-    public GridInterruptedException(String msg, InterruptedException cause) {
-        super(msg, cause);
-    }
-}
\ No newline at end of file


Mime
View raw message