ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [3/6] incubator-ignite git commit: #ignite-164: Change GridGain to Ignite in comments.
Date Wed, 04 Feb 2015 17:27:09 GMT
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/86ab8e20/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
index d2e08c4..a5ff2f6 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
@@ -276,7 +276,7 @@ public abstract class IgniteUtils {
     /** Boxed class map. */
     private static final Map<Class<?>, Class<?>> boxedClsMap = new HashMap<>(16, .5f);
 
-    /** Class loader used to load GridGain. */
+    /** Class loader used to load Ignite. */
     private static final ClassLoader gridClassLoader = IgniteUtils.class.getClassLoader();
 
     /** MAC OS invalid argument socket error message. */
@@ -286,10 +286,10 @@ public abstract class IgniteUtils {
     /** Portable classes. */
     private static final Collection<Class<?>> PORTABLE_CLS = new HashSet<>();
 
-    /** GridGain Logging Directory. */
+    /** Ignite Logging Directory. */
     public static final String IGNITE_LOG_DIR = System.getenv(IgniteSystemProperties.IGNITE_LOG_DIR);
 
-    /** GridGain Work Directory. */
+    /** Ignite Work Directory. */
     public static final String IGNITE_WORK_DIR = System.getenv(IgniteSystemProperties.IGNITE_WORK_DIR);
 
     /** Clock timer. */
@@ -1924,7 +1924,7 @@ public abstract class IgniteUtils {
     }
 
     /**
-     * @return Class loader used to load GridGain itself.
+     * @return Class loader used to load Ignite itself.
      */
     public static ClassLoader gridClassLoader() {
         return gridClassLoader;
@@ -2394,7 +2394,7 @@ public abstract class IgniteUtils {
     @Nullable private static String resolveProjectHome() {
         assert Thread.holdsLock(IgniteUtils.class);
 
-        // Resolve GridGain home via environment variables.
+        // Resolve Ignite home via environment variables.
         String ggHome0 = IgniteSystemProperties.getString(IGNITE_HOME);
 
         if (!F.isEmpty(ggHome0))
@@ -2485,7 +2485,7 @@ public abstract class IgniteUtils {
                 ggHomeTup = ggHome;
 
                 if (ggHomeTup == null) {
-                    // Resolve GridGain installation home directory.
+                    // Resolve Ignite installation home directory.
                     ggHome = F.t(ggHome0 = resolveProjectHome());
 
                     if (ggHome0 != null)
@@ -2502,7 +2502,7 @@ public abstract class IgniteUtils {
     }
 
     /**
-     * @param path GridGain home. May be {@code null}.
+     * @param path Ignite home. May be {@code null}.
      */
     public static void setGridGainHome(@Nullable String path) {
         GridTuple<String> ggHomeTup = ggHome;
@@ -5685,7 +5685,7 @@ public abstract class IgniteUtils {
                     }
             }
         }
-        // Don't go into internal GridGain structures.
+        // Don't go into internal Ignite structures.
         else if (isIgnite(obj.getClass()))
             return null;
         else if (obj instanceof Iterable)
@@ -5720,7 +5720,7 @@ public abstract class IgniteUtils {
      * Checks if given class is of {@code Ignite} type.
      *
      * @param cls Class to check.
-     * @return {@code True} if given class is of {@code GridGain} type.
+     * @return {@code True} if given class is of {@code Ignite} type.
      */
     public static boolean isIgnite(Class<?> cls) {
         return cls.getName().startsWith("org.apache.ignite");
@@ -6078,7 +6078,7 @@ public abstract class IgniteUtils {
     }
 
     /**
-     * Indicates that GridGain has been sufficiently tested on the current OS.
+     * Indicates that Ignite has been sufficiently tested on the current OS.
      *
      * @return {@code true} if current OS was sufficiently tested - {@code false} otherwise.
      */
@@ -8043,7 +8043,7 @@ public abstract class IgniteUtils {
      * @param msg Message to start string.
      * @param args Even length array where the odd elements are parameter names
      *      and even elements are parameter values.
-     * @return Log message, formatted as recommended by GridGain guidelines.
+     * @return Log message, formatted as recommended by Ignite guidelines.
      */
     public static String fl(String msg, Object... args) {
         assert args.length % 2 == 0;
@@ -8346,7 +8346,7 @@ public abstract class IgniteUtils {
      * {@link org.apache.ignite.lifecycle.LifecycleAware} interface and executes {@link org.apache.ignite.lifecycle.LifecycleAware#stop} method.
      *
      * @param log Logger used to log error message in case of stop failure.
-     * @param objs Object passed to GridGain configuration.
+     * @param objs Object passed to Ignite configuration.
      */
     public static void stopLifecycleAware(IgniteLogger log, Iterable<?> objs) {
         for (Object obj : objs) {
@@ -8365,7 +8365,7 @@ public abstract class IgniteUtils {
      * Groups given nodes by the node's physical computer (host).
      * <p>
      * Detection of the same physical computer (host) is based on comparing set of network interface MACs.
-     * If two nodes have the same set of MACs, GridGain considers these nodes running on the same
+     * If two nodes have the same set of MACs, Ignite considers these nodes running on the same
      * physical computer.
      *
      * @param nodes Nodes.
@@ -8582,8 +8582,8 @@ public abstract class IgniteUtils {
     }
 
     /**
-     * @param userWorkDir GridGain work folder provided by user.
-     * @param userGgHome GridGain home folder provided by user.
+     * @param userWorkDir Ignite work folder provided by user.
+     * @param userGgHome Ignite home folder provided by user.
      */
     public static void setWorkDirectory(@Nullable String userWorkDir, @Nullable String userGgHome)
         throws IgniteCheckedException {
@@ -8633,7 +8633,7 @@ public abstract class IgniteUtils {
     }
 
     /**
-     * Nullifies GridGain home directory. For test purposes only.
+     * Nullifies Ignite home directory. For test purposes only.
      */
     static void nullifyHomeDirectory() {
         ggHome = null;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/86ab8e20/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java
index 77df627..38ba7fe 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java
@@ -7486,7 +7486,7 @@ public class GridFunc {
     /**
      * Compares two {@link org.apache.ignite.cluster.ClusterNode} instances for equality.
      * <p>
-     * Since introduction of {@link org.apache.ignite.cluster.ClusterNode} in GridGain 3.0 the semantic of equality between
+     * Since introduction of {@link org.apache.ignite.cluster.ClusterNode} in Ignite 3.0 the semantic of equality between
      * grid nodes has changed. Since rich node wraps thin node instance and in the same time
      * implements {@link org.apache.ignite.cluster.ClusterNode} interface, the proper semantic of comparing two grid node is
      * to ignore their runtime types and compare only by their IDs. This method implements this logic.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/86ab8e20/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridPeerDeployAware.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridPeerDeployAware.java b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridPeerDeployAware.java
index 96900d7..dcaa7cc 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridPeerDeployAware.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridPeerDeployAware.java
@@ -22,7 +22,7 @@ import java.io.*;
 /**
  * Represents any class that needs to maintain or carry on peer deployment information.
  * <p>
- * This interface is intended to be used primarily by GridGain's code.
+ * This interface is intended to be used primarily by Ignite's code.
  * User's code can however implement this interface, for example, if it wraps a
  * closure or a predicate and wants to maintain its peer deployment
  * information so that the user class could be peer-deployed as well.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/86ab8e20/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridPeerDeployAwareAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridPeerDeployAwareAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridPeerDeployAwareAdapter.java
index 0d6daccf..20d8481 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridPeerDeployAwareAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridPeerDeployAwareAdapter.java
@@ -34,7 +34,7 @@ public class GridPeerDeployAwareAdapter implements GridPeerDeployAware {
      * will be copied, i.e. this lambda object will be peer deployed
      * using the same class loader as given object.
      * <p>
-     * Note that in most cases GridGain attempts to automatically call this
+     * Note that in most cases Ignite attempts to automatically call this
      * method whenever lambda classes like closures and predicates are created that
      * wrap user object (the peer deploy information in such cases will be copied
      * from the user object).

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/86ab8e20/modules/core/src/main/java/org/apache/ignite/internal/util/nodestart/GridNodeStartUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nodestart/GridNodeStartUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nodestart/GridNodeStartUtils.java
index 44306ab..76f81b5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/nodestart/GridNodeStartUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nodestart/GridNodeStartUtils.java
@@ -49,7 +49,7 @@ public class GridNodeStartUtils {
     /** Key for number of nodes. */
     public static final String NODES = "nodes";
 
-    /** Key for GridGain home folder. */
+    /** Key for Ignite home folder. */
     public static final String IGNITE_HOME = "ggHome";
 
     /** Key for configuration path. */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/86ab8e20/modules/core/src/main/java/org/apache/ignite/internal/util/nodestart/GridRemoteStartSpecification.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nodestart/GridRemoteStartSpecification.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nodestart/GridRemoteStartSpecification.java
index f0d7862..97ac081 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/nodestart/GridRemoteStartSpecification.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nodestart/GridRemoteStartSpecification.java
@@ -48,7 +48,7 @@ public class GridRemoteStartSpecification {
     /** Number of nodes to start. */
     private final int nodes;
 
-    /** GridGain installation folder. */
+    /** Ignite installation folder. */
     private String ggHome;
 
     /** Configuration path. */
@@ -73,7 +73,7 @@ public class GridRemoteStartSpecification {
      * @param passwd Password (can be {@code null} if private key authentication is used).
      * @param key Private key file path.
      * @param nodes Number of nodes to start.
-     * @param ggHome GridGain installation folder.
+     * @param ggHome Ignite installation folder.
      * @param cfg Configuration path.
      * @param script Script path.
      */
@@ -90,7 +90,7 @@ public class GridRemoteStartSpecification {
      * @param passwd Password (can be {@code null} if private key authentication is used).
      * @param key Private key file path.
      * @param nodes Number of nodes to start.
-     * @param ggHome GridGain installation folder.
+     * @param ggHome Ignite installation folder.
      * @param cfg Configuration path.
      * @param script Script path.
      * @param logger Custom logger.
@@ -213,7 +213,7 @@ public class GridRemoteStartSpecification {
     }
 
     /**
-     * @return GridGain installation folder.
+     * @return Ignite installation folder.
      */
     public String ggHome() {
         return ggHome;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/86ab8e20/modules/core/src/main/java/org/apache/ignite/internal/util/portscanner/GridJmxPortFinder.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/portscanner/GridJmxPortFinder.java b/modules/core/src/main/java/org/apache/ignite/internal/util/portscanner/GridJmxPortFinder.java
index d5925ff..671bdf5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/portscanner/GridJmxPortFinder.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/portscanner/GridJmxPortFinder.java
@@ -24,7 +24,7 @@ import java.net.*;
 import java.nio.channels.*;
 
 /**
- * GridGain port scanner.
+ * Ignite port scanner.
  */
 public class GridJmxPortFinder {
     /** Environment variable for overriding JMX port. */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/86ab8e20/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/X.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/X.java b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/X.java
index df411bf..df943f0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/X.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/X.java
@@ -867,10 +867,10 @@ public final class X {
     }
 
     /**
-     * Tries to resolve GridGain installation home folder.
+     * Tries to resolve Ignite installation home folder.
      *
      * @return Installation home folder.
-     * @throws IgniteCheckedException If GridGain home folder was not set.
+     * @throws IgniteCheckedException If Ignite home folder was not set.
      */
     public static String resolveGridGainHome() throws IgniteCheckedException {
         String var = IgniteSystemProperties.getString(IGNITE_HOME);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/86ab8e20/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java
index 3e3fd08..784a39a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java
@@ -63,7 +63,7 @@ public class VisorCacheConfiguration implements Serializable {
     /** Swap enabled flag. */
     private boolean swapEnabled;
 
-    /** Flag indicating whether GridGain should attempt to index value and/or key instances stored in cache. */
+    /** Flag indicating whether Ignite should attempt to index value and/or key instances stored in cache. */
     private boolean queryIndexEnabled;
 
     /** Flag indicating whether to persist once on commit, or after every operation. */
@@ -335,14 +335,14 @@ public class VisorCacheConfiguration implements Serializable {
     }
 
     /**
-     * @return Flag indicating whether GridGain should attempt to index value and/or key instances stored in cache.
+     * @return Flag indicating whether Ignite should attempt to index value and/or key instances stored in cache.
      */
     public boolean queryIndexEnabled() {
         return queryIndexEnabled;
     }
 
     /**
-     * @param qryIdxEnabled New flag indicating whether GridGain should attempt to index value and/or key instances
+     * @param qryIdxEnabled New flag indicating whether Ignite should attempt to index value and/or key instances
      * stored in cache.
      */
     public void queryIndexEnabled(boolean qryIdxEnabled) {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/86ab8e20/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorExecutorServiceConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorExecutorServiceConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorExecutorServiceConfiguration.java
index b279a88..f7bab30 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorExecutorServiceConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorExecutorServiceConfiguration.java
@@ -34,19 +34,19 @@ public class VisorExecutorServiceConfiguration implements Serializable {
     /** Executor service. */
     private String execSvc;
 
-    /** Whether or not GridGain will stop executor service on node shutdown. */
+    /** Whether or not Ignite will stop executor service on node shutdown. */
     private boolean execSvcShutdown;
 
     /** System executor service. */
     private String sysExecSvc;
 
-    /** Whether or not GridGain will stop system executor service on node shutdown. */
+    /** Whether or not Ignite will stop system executor service on node shutdown. */
     private boolean sysExecSvcShutdown;
 
     /** Peer-to-peer executor service. */
     private String p2pExecSvc;
 
-    /** Whether or not GridGain will stop peer-to-peer executor service on node shutdown. */
+    /** Whether or not Ignite will stop peer-to-peer executor service on node shutdown. */
     private boolean p2pExecSvcShutdown;
 
     /** REST requests executor service. */
@@ -96,14 +96,14 @@ public class VisorExecutorServiceConfiguration implements Serializable {
     }
 
     /**
-     * @return Whether or not GridGain will stop executor service on node shutdown.
+     * @return Whether or not Ignite will stop executor service on node shutdown.
      */
     public boolean executeServiceShutdown() {
         return execSvcShutdown;
     }
 
     /**
-     * @param execSvcShutdown New whether or not GridGain will stop executor service on node shutdown.
+     * @param execSvcShutdown New whether or not Ignite will stop executor service on node shutdown.
      */
     public void executeServiceShutdown(boolean execSvcShutdown) {
         this.execSvcShutdown = execSvcShutdown;
@@ -124,14 +124,14 @@ public class VisorExecutorServiceConfiguration implements Serializable {
     }
 
     /**
-     * @return Whether or not GridGain will stop system executor service on node shutdown.
+     * @return Whether or not Ignite will stop system executor service on node shutdown.
      */
     public boolean systemExecutorServiceShutdown() {
         return sysExecSvcShutdown;
     }
 
     /**
-     * @param sysExecSvcShutdown New whether or not GridGain will stop system executor service on node shutdown.
+     * @param sysExecSvcShutdown New whether or not Ignite will stop system executor service on node shutdown.
      */
     public void systemExecutorServiceShutdown(boolean sysExecSvcShutdown) {
         this.sysExecSvcShutdown = sysExecSvcShutdown;
@@ -152,14 +152,14 @@ public class VisorExecutorServiceConfiguration implements Serializable {
     }
 
     /**
-     * @return Whether or not GridGain will stop peer-to-peer executor service on node shutdown.
+     * @return Whether or not Ignite will stop peer-to-peer executor service on node shutdown.
      */
     public boolean p2pExecutorServiceShutdown() {
         return p2pExecSvcShutdown;
     }
 
     /**
-     * @param p2pExecSvcShutdown New whether or not GridGain will stop peer-to-peer executor service on node shutdown.
+     * @param p2pExecSvcShutdown New whether or not Ignite will stop peer-to-peer executor service on node shutdown.
      */
     public void p2pExecutorServiceShutdown(boolean p2pExecSvcShutdown) {
         this.p2pExecSvcShutdown = p2pExecSvcShutdown;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/86ab8e20/modules/core/src/main/java/org/apache/ignite/internal/visor/streamer/VisorStreamerConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/streamer/VisorStreamerConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/streamer/VisorStreamerConfiguration.java
index ab6157f..fe44b70 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/streamer/VisorStreamerConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/streamer/VisorStreamerConfiguration.java
@@ -48,7 +48,7 @@ public class VisorStreamerConfiguration implements Serializable {
     /** Maximum number of concurrent events to be processed. */
     private int maxConcurrentSessions;
 
-    /** Flag indicating whether streamer executor service should be shut down on GridGain stop. */
+    /** Flag indicating whether streamer executor service should be shut down on Ignite stop. */
     private boolean executorServiceShutdown;
 
     /**
@@ -157,7 +157,7 @@ public class VisorStreamerConfiguration implements Serializable {
     }
 
     /**
-     * @return Flag indicating whether streamer executor service should be shut down on GridGain stop.
+     * @return Flag indicating whether streamer executor service should be shut down on Ignite stop.
      */
     public boolean executorServiceShutdown() {
         return executorServiceShutdown;
@@ -165,7 +165,7 @@ public class VisorStreamerConfiguration implements Serializable {
 
     /**
      * @param executorSrvcShutdown New flag indicating whether streamer executor service should be shutdown
-     *      on GridGain stop.
+     *      on Ignite stop.
      */
     public void executorServiceShutdown(boolean executorSrvcShutdown) {
         executorServiceShutdown = executorSrvcShutdown;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/86ab8e20/modules/core/src/main/java/org/apache/ignite/jdbc/IgniteJdbcConnection.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/jdbc/IgniteJdbcConnection.java b/modules/core/src/main/java/org/apache/ignite/jdbc/IgniteJdbcConnection.java
index f5cf638..c07be60 100644
--- a/modules/core/src/main/java/org/apache/ignite/jdbc/IgniteJdbcConnection.java
+++ b/modules/core/src/main/java/org/apache/ignite/jdbc/IgniteJdbcConnection.java
@@ -35,7 +35,7 @@ class IgniteJdbcConnection implements Connection {
     private static final String VALID_TASK_NAME =
         "org.apache.ignite.internal.processors.cache.query.jdbc.GridCacheQueryJdbcValidationTask";
 
-    /** GridGain client. */
+    /** Ignite client. */
     private final GridClient client;
 
     /** Cache name. */
@@ -58,7 +58,7 @@ class IgniteJdbcConnection implements Connection {
      *
      * @param url Connection URL.
      * @param props Additional properties.
-     * @throws SQLException In case GridGain client failed to start.
+     * @throws SQLException In case Ignite client failed to start.
      */
     IgniteJdbcConnection(String url, Properties props) throws SQLException {
         assert url != null;
@@ -500,7 +500,7 @@ class IgniteJdbcConnection implements Connection {
     }
 
     /**
-     * @return GridGain client.
+     * @return Ignite client.
      */
     GridClient client() {
         return client;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/86ab8e20/modules/core/src/main/java/org/apache/ignite/jdbc/IgniteJdbcDriver.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/jdbc/IgniteJdbcDriver.java b/modules/core/src/main/java/org/apache/ignite/jdbc/IgniteJdbcDriver.java
index 73f7cd2..476ac45 100644
--- a/modules/core/src/main/java/org/apache/ignite/jdbc/IgniteJdbcDriver.java
+++ b/modules/core/src/main/java/org/apache/ignite/jdbc/IgniteJdbcDriver.java
@@ -25,11 +25,11 @@ import java.util.logging.*;
 /**
  * JDBC driver implementation for In-Memory Data Grid.
  * <p>
- * Driver allows to get distributed data from GridGain cache using standard
+ * Driver allows to get distributed data from Ignite cache using standard
  * SQL queries and standard JDBC API. It will automatically get only fields that
  * you actually need from objects stored in cache.
  * <h1 class="header">Limitations</h1>
- * Data in GridGain cache is usually distributed across several nodes,
+ * Data in Ignite cache is usually distributed across several nodes,
  * so some queries may not work as expected since the query will be sent to each
  * individual node and results will then be collected and returned as JDBC result set.
  * Keep in mind following limitations (not applied if data is queried from one node only,
@@ -65,11 +65,11 @@ import java.util.logging.*;
  * <p>
  * Note that cache name is case sensitive and you have to always specify it in quotes.
  * <h1 class="header">Dependencies</h1>
- * JDBC driver is located in main GridGain JAR and depends on all libraries located in
+ * JDBC driver is located in main Ignite JAR and depends on all libraries located in
  * {@code IGNITE_HOME/libs} folder. So if you are using JDBC driver in any external tool,
- * you have to add main GridGain JAR will all dependencies to its classpath.
+ * you have to add main Ignite JAR will all dependencies to its classpath.
  * <h1 class="header">Configuration</h1>
- * Internally JDBC driver <b>is based on GridGain Java client</b>. Therefore, all client
+ * Internally JDBC driver <b>is based on Ignite Java client</b>. Therefore, all client
  * configuration properties can be applied to JDBC connection.
  * <p>
  * JDBC connection URL has the following pattern:
@@ -77,7 +77,7 @@ import java.util.logging.*;
  * Note the following:
  * <ul>
  *     <li>Hostname is required.</li>
- *     <li>If port is not defined, {@code 11211} is used (default for GridGain client).</li>
+ *     <li>If port is not defined, {@code 11211} is used (default for Ignite client).</li>
  *     <li>Leave {@code <cache_name>} empty if you are connecting to default cache.</li>
  *     <li>
  *         Provide {@code nodeId} parameter if you want to specify node where to execute
@@ -134,7 +134,7 @@ import java.util.logging.*;
  *     </tr>
  *     <tr>
  *         <td><b>gg.client.ssl.keystore.location</b></td>
- *         <td>Key store to be used by client to connect with GridGain topology.</td>
+ *         <td>Key store to be used by client to connect with Ignite topology.</td>
  *         <td>&nbsp;</td>
  *         <td>No (if {@code SSL} is enabled)</td>
  *     </tr>
@@ -152,7 +152,7 @@ import java.util.logging.*;
  *     </tr>
  *     <tr>
  *         <td><b>gg.client.ssl.truststore.location</b></td>
- *         <td>Trust store to be used by client to connect with GridGain topology.</td>
+ *         <td>Trust store to be used by client to connect with Ignite topology.</td>
  *         <td>&nbsp;</td>
  *         <td>No (if {@code SSL} is enabled)</td>
  *     </tr>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/86ab8e20/modules/core/src/main/java/org/apache/ignite/lang/IgniteClosure.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/lang/IgniteClosure.java b/modules/core/src/main/java/org/apache/ignite/lang/IgniteClosure.java
index eafd24d..70570c9 100644
--- a/modules/core/src/main/java/org/apache/ignite/lang/IgniteClosure.java
+++ b/modules/core/src/main/java/org/apache/ignite/lang/IgniteClosure.java
@@ -23,7 +23,7 @@ import java.io.*;
  * Defines generic closure with one parameter. Closure is a simple executable which accepts a parameter and
  * returns a value.
  * <p>
- * In GridGain closures are mainly used for executing distributed computations
+ * In Ignite closures are mainly used for executing distributed computations
  * on the grid, like in {@link org.apache.ignite.IgniteCompute#apply(IgniteClosure, Object)} method.
  *
  * @param <E> Type of closure parameter.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/86ab8e20/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 929d335..abf14f4 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
@@ -21,7 +21,7 @@ import java.io.*;
 
 /**
  * Defines a predicate which accepts a parameter and returns {@code true} or {@code false}. In
- * GridGain, predicates are generally used for filtering nodes within grid projections, or for
+ * Ignite, predicates are generally used for filtering nodes within grid projections, or for
  * providing atomic filters when performing cache operation, like in
  * {@link org.apache.ignite.cache.GridCache#put(Object, Object, IgnitePredicate[])} method.
  *

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/86ab8e20/modules/core/src/main/java/org/apache/ignite/lifecycle/LifecycleAware.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/lifecycle/LifecycleAware.java b/modules/core/src/main/java/org/apache/ignite/lifecycle/LifecycleAware.java
index 45e4eeb..364ddea 100644
--- a/modules/core/src/main/java/org/apache/ignite/lifecycle/LifecycleAware.java
+++ b/modules/core/src/main/java/org/apache/ignite/lifecycle/LifecycleAware.java
@@ -20,7 +20,7 @@ package org.apache.ignite.lifecycle;
 import org.apache.ignite.*;
 
 /**
- * All components provided in GridGain configuration can implement this interface.
+ * All components provided in Ignite configuration can implement this interface.
  * If a component implements this interface, then method {@link #start()} will be called
  * during grid startup and {@link #stop()} will be called during stop.
  */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/86ab8e20/modules/core/src/main/java/org/apache/ignite/logger/IgniteLoggerNodeIdAware.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/logger/IgniteLoggerNodeIdAware.java b/modules/core/src/main/java/org/apache/ignite/logger/IgniteLoggerNodeIdAware.java
index 04a0166..fd95899 100644
--- a/modules/core/src/main/java/org/apache/ignite/logger/IgniteLoggerNodeIdAware.java
+++ b/modules/core/src/main/java/org/apache/ignite/logger/IgniteLoggerNodeIdAware.java
@@ -20,7 +20,7 @@ package org.apache.ignite.logger;
 import java.util.*;
 
 /**
- * Interface for GridGain file appenders to attach node ID to log file names.
+ * Interface for Ignite file appenders to attach node ID to log file names.
  */
 public interface IgniteLoggerNodeIdAware {
     /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/86ab8e20/modules/core/src/main/java/org/apache/ignite/logger/java/IgniteJavaLogger.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/logger/java/IgniteJavaLogger.java b/modules/core/src/main/java/org/apache/ignite/logger/java/IgniteJavaLogger.java
index 82624a8..92e8d8e 100644
--- a/modules/core/src/main/java/org/apache/ignite/logger/java/IgniteJavaLogger.java
+++ b/modules/core/src/main/java/org/apache/ignite/logger/java/IgniteJavaLogger.java
@@ -34,7 +34,7 @@ import static org.apache.ignite.IgniteSystemProperties.*;
 /**
  * Logger to use with Java logging. Implementation simply delegates to Java Logging.
  * <p>
- * Here is an example of configuring Java logger in GridGain configuration Spring
+ * Here is an example of configuring Java logger in Ignite configuration Spring
  * file to work over log4j implementation. Note that we use the same configuration file
  * as we provide by default:
  * <pre name="code" class="xml">
@@ -58,7 +58,7 @@ import static org.apache.ignite.IgniteSystemProperties.*;
  *      &lt;/property&gt;
  *      ...
  * </pre>
- * And the same configuration if you'd like to configure GridGain in your code:
+ * And the same configuration if you'd like to configure Ignite in your code:
  * <pre name="code" class="java">
  *      GridConfiguration cfg = new GridConfiguration();
  *      ...
@@ -77,7 +77,7 @@ import static org.apache.ignite.IgniteSystemProperties.*;
  * Please take a look at <a target=_new href="http://java.sun.com/j2se/1.4.2/docs/api20/java/util/logging/Logger.html">Logger javadoc</a>
  * for additional information.
  * <p>
- * It's recommended to use GridGain logger injection instead of using/instantiating
+ * It's recommended to use Ignite logger injection instead of using/instantiating
  * logger in your task/job code. See {@link org.apache.ignite.resources.IgniteLoggerResource} annotation about logger
  * injection.
  */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/86ab8e20/modules/core/src/main/java/org/apache/ignite/managed/ManagedService.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/managed/ManagedService.java b/modules/core/src/main/java/org/apache/ignite/managed/ManagedService.java
index df2c654..c0f3ece 100644
--- a/modules/core/src/main/java/org/apache/ignite/managed/ManagedService.java
+++ b/modules/core/src/main/java/org/apache/ignite/managed/ManagedService.java
@@ -23,9 +23,9 @@ import java.io.*;
  * An instance of grid-managed service. Grid-managed services may be deployed from
  * {@link org.apache.ignite.IgniteManaged} facade or directly from grid configuration at startup.
  * <h1 class="header">Deployment</h1>
- * Whenever service is deployed, GridGain will automatically calculate how many
+ * Whenever service is deployed, Ignite will automatically calculate how many
  * instances of this service should be deployed on each node within the cluster.
- * Whenever service is deployed on a cluster node, GridGain will call
+ * Whenever service is deployed on a cluster node, Ignite will call
  * {@link #execute(ManagedServiceContext)} method on that service. It is up to the user
  * to control whenever the service should exit from the {@code execute} method.
  * For example, user may choose to implement service as follows:
@@ -78,19 +78,19 @@ import java.io.*;
  * </pre>
  * <h1 class="header">Cancellation</h1>
  * Services can be cancelled by calling any of the {@code cancel} methods on {@link org.apache.ignite.IgniteManaged} API.
- * Whenever a deployed service is cancelled, GridGain will automatically call
+ * Whenever a deployed service is cancelled, Ignite will automatically call
  * {@link ManagedService#cancel(ManagedServiceContext)} method on that service.
  * <p>
- * Note that GridGain cannot guarantee that the service exits from {@link ManagedService#execute(ManagedServiceContext)}
+ * Note that Ignite cannot guarantee that the service exits from {@link ManagedService#execute(ManagedServiceContext)}
  * method whenever {@link #cancel(ManagedServiceContext)} is called. It is up to the user to
  * make sure that the service code properly reacts to cancellations.
  */
 public interface ManagedService extends Serializable {
     /**
-     * Cancels this service. GridGain will automatically call this method whenever any of the
+     * Cancels this service. Ignite will automatically call this method whenever any of the
      * {@code cancel} methods on {@link org.apache.ignite.IgniteManaged} API are called.
      * <p>
-     * Note that GridGain cannot guarantee that the service exits from {@link #execute(ManagedServiceContext)}
+     * Note that Ignite cannot guarantee that the service exits from {@link #execute(ManagedServiceContext)}
      * method whenever {@code cancel(GridServiceContext)} method is called. It is up to the user to
      * make sure that the service code properly reacts to cancellations.
      *

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/86ab8e20/modules/core/src/main/java/org/apache/ignite/marshaller/IgniteMarshallerExclusions.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/IgniteMarshallerExclusions.java b/modules/core/src/main/java/org/apache/ignite/marshaller/IgniteMarshallerExclusions.java
index 34d99da..b2cac7f 100644
--- a/modules/core/src/main/java/org/apache/ignite/marshaller/IgniteMarshallerExclusions.java
+++ b/modules/core/src/main/java/org/apache/ignite/marshaller/IgniteMarshallerExclusions.java
@@ -39,7 +39,7 @@ public final class IgniteMarshallerExclusions {
      * Note that this list supercedes {@link #EXCL_CLASSES}.
      */
     private static final Class<?>[] INCL_CLASSES = new Class[] {
-        // GridGain classes.
+        // Ignite classes.
         GridLoggerProxy.class,
         GridExecutorService.class
     };
@@ -71,7 +71,7 @@ public final class IgniteMarshallerExclusions {
 
         List<Class<?>> excl = new ArrayList<>();
 
-        // Non-GridGain classes.
+        // Non-Ignite classes.
         excl.add(MBeanServer.class);
         excl.add(ExecutorService.class);
         excl.add(ClassLoader.class);
@@ -80,7 +80,7 @@ public final class IgniteMarshallerExclusions {
         if (springCtxCls != null)
             excl.add(springCtxCls);
 
-        // GridGain classes.
+        // Ignite classes.
         excl.add(IgniteLogger.class);
         excl.add(ComputeTaskSession.class);
         excl.add(ComputeLoadBalancer.class);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/86ab8e20/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/IgniteOptimizedClassResolver.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/IgniteOptimizedClassResolver.java b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/IgniteOptimizedClassResolver.java
index 3ed36d8..747541e 100644
--- a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/IgniteOptimizedClassResolver.java
+++ b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/IgniteOptimizedClassResolver.java
@@ -155,7 +155,7 @@ class IgniteOptimizedClassResolver {
             BigDecimal.class,
             BigInteger.class,
 
-            // GridGain types.
+            // Ignite types.
             IgniteUuid.class,
             GridBoundedConcurrentOrderedSet.class,
             GridBoundedLinkedHashSet.class,

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/86ab8e20/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/IgniteOptimizedMarshallable.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/IgniteOptimizedMarshallable.java b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/IgniteOptimizedMarshallable.java
index 80880bf..62244ca 100644
--- a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/IgniteOptimizedMarshallable.java
+++ b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/IgniteOptimizedMarshallable.java
@@ -27,7 +27,7 @@ import java.util.*;
  * <ul>
  * <li>
  *     Must have static filed (private or public) declared of type {@link Object}
- *     with name {@code GG_CLASS_ID}. GridGain will reflectively initialize this field with
+ *     with name {@code GG_CLASS_ID}. Ignite will reflectively initialize this field with
  *     proper class ID during system startup.
  * </li>
  * <li>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/86ab8e20/modules/core/src/main/java/org/apache/ignite/mxbean/IgniteMXBean.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/mxbean/IgniteMXBean.java b/modules/core/src/main/java/org/apache/ignite/mxbean/IgniteMXBean.java
index 17a89da..06d68bd 100644
--- a/modules/core/src/main/java/org/apache/ignite/mxbean/IgniteMXBean.java
+++ b/modules/core/src/main/java/org/apache/ignite/mxbean/IgniteMXBean.java
@@ -42,9 +42,9 @@ public interface IgniteMXBean {
     public String getFullVersion();
 
     /**
-     * Gets copyright statement for GridGain product.
+     * Gets copyright statement for Ignite product.
      *
-     * @return Copyright statement for GridGain product.
+     * @return Copyright statement for Ignite product.
      */
     @IgniteMXBeanDescription("Copyright statement for GridGain product.")
     public String getCopyright();
@@ -110,9 +110,9 @@ public interface IgniteMXBean {
     public String getExecutorServiceFormatted();
 
     /**
-     * Gets GridGain installation home folder.
+     * Gets Ignite installation home folder.
      *
-     * @return GridGain installation home.
+     * @return Ignite installation home.
      */
     @IgniteMXBeanDescription("GridGain installation home folder.")
     public String getGridGainHome();
@@ -150,10 +150,10 @@ public interface IgniteMXBean {
 
     /**
      * Gets {@code toString()} representation of of lifecycle beans configured
-     * with GridGain.
+     * with Ignite.
      *
      * @return {@code toString()} representation of all lifecycle beans configured
-     *      with GridGain.
+     *      with Ignite.
      */
     @IgniteMXBeanDescription("String representation of lifecycle beans.")
     public Collection<String> getLifecycleBeansFormatted();
@@ -197,7 +197,7 @@ public interface IgniteMXBean {
      * method returns immediately and does not wait until the task will actually be
      * undeployed on every node.
      * <p>
-     * Note that GridGain maintains internal versions for grid tasks in case of redeployment.
+     * Note that Ignite maintains internal versions for grid tasks in case of redeployment.
      * This method will attempt to undeploy all versions on the grid task with
      * given name.
      *

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/86ab8e20/modules/core/src/main/java/org/apache/ignite/plugin/security/GridSecurity.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/security/GridSecurity.java b/modules/core/src/main/java/org/apache/ignite/plugin/security/GridSecurity.java
index 60cae92..bf70055 100644
--- a/modules/core/src/main/java/org/apache/ignite/plugin/security/GridSecurity.java
+++ b/modules/core/src/main/java/org/apache/ignite/plugin/security/GridSecurity.java
@@ -49,12 +49,12 @@ import java.util.*;
  * Node or client authentication happens in {@link org.apache.ignite.spi.authentication.AuthenticationSpi}. Upon successful
  * authentication, the SPI will return list of permissions for authenticated subject.
  * <p>
- * GridGain ships with following authentication SPIs out of the box:
+ * Ignite ships with following authentication SPIs out of the box:
  * <ul>
  * <li>{@code GridJaasAuthenticationSpi} - provides authentication based on JAAS standard.</li>
  * <li>{@code GridPasscodeAuthenticationSpi} - basic username and password authentication.</li>
  * </ul>
- * All permissions supported by GridGain are provided in {@link GridSecurityPermission} enum. Permissions
+ * All permissions supported by Ignite are provided in {@link GridSecurityPermission} enum. Permissions
  * are specified on per-cache or per-task level (wildcards are allowed). Authentication SPIs should usually
  * (although not required) specify security permissions in the following JSON format:
  * <pre class="brush: text">

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/86ab8e20/modules/core/src/main/java/org/apache/ignite/plugin/security/GridSecurityCredentials.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/security/GridSecurityCredentials.java b/modules/core/src/main/java/org/apache/ignite/plugin/security/GridSecurityCredentials.java
index 3f94d7d..78f7abc 100644
--- a/modules/core/src/main/java/org/apache/ignite/plugin/security/GridSecurityCredentials.java
+++ b/modules/core/src/main/java/org/apache/ignite/plugin/security/GridSecurityCredentials.java
@@ -37,7 +37,7 @@ import java.io.*;
  * <p>
  * Getting credentials through {@link GridSecurityCredentialsProvider} abstraction allows
  * users to provide custom implementations for storing user names and passwords in their
- * environment, possibly in encrypted format. GridGain comes with
+ * environment, possibly in encrypted format. Ignite comes with
  * {@link GridSecurityCredentialsBasicProvider} which simply provides
  * the passed in {@code login} and {@code password} when encryption or custom logic is not required.
  * <p>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/86ab8e20/modules/core/src/main/java/org/apache/ignite/plugin/security/GridSecurityCredentialsProvider.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/security/GridSecurityCredentialsProvider.java b/modules/core/src/main/java/org/apache/ignite/plugin/security/GridSecurityCredentialsProvider.java
index 4e0eee5..500d50e8 100644
--- a/modules/core/src/main/java/org/apache/ignite/plugin/security/GridSecurityCredentialsProvider.java
+++ b/modules/core/src/main/java/org/apache/ignite/plugin/security/GridSecurityCredentialsProvider.java
@@ -30,7 +30,7 @@ import org.apache.ignite.*;
  * <p>
  * Getting credentials through {@link GridSecurityCredentialsProvider} abstraction allows
  * users to provide custom implementations for storing user names and passwords in their
- * environment, possibly in encrypted format. GridGain comes with
+ * environment, possibly in encrypted format. Ignite comes with
  * {@link GridSecurityCredentialsBasicProvider} which simply provides
  * the passed in {@code login} and {@code password} when encryption or custom logic is not required.
  * <p>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/86ab8e20/modules/core/src/main/java/org/apache/ignite/plugin/segmentation/GridSegmentationPolicy.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/segmentation/GridSegmentationPolicy.java b/modules/core/src/main/java/org/apache/ignite/plugin/segmentation/GridSegmentationPolicy.java
index bed865c..b9b2c74 100644
--- a/modules/core/src/main/java/org/apache/ignite/plugin/segmentation/GridSegmentationPolicy.java
+++ b/modules/core/src/main/java/org/apache/ignite/plugin/segmentation/GridSegmentationPolicy.java
@@ -26,7 +26,7 @@ public enum GridSegmentationPolicy {
     /**
      * When segmentation policy is {@code RESTART_JVM}, all listeners will receive
      * {@link org.apache.ignite.events.IgniteEventType#EVT_NODE_SEGMENTED} event and then JVM will be restarted.
-     * Note, that this will work <b>only</b> if GridGain is started with {@link org.apache.ignite.startup.cmdline.CommandLineStartup}
+     * Note, that this will work <b>only</b> if Ignite is started with {@link org.apache.ignite.startup.cmdline.CommandLineStartup}
      * via standard {@code ignite.{sh|bat}} shell script.
      */
     RESTART_JVM,

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/86ab8e20/modules/core/src/main/java/org/apache/ignite/plugin/segmentation/GridSegmentationResolver.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/segmentation/GridSegmentationResolver.java b/modules/core/src/main/java/org/apache/ignite/plugin/segmentation/GridSegmentationResolver.java
index 4c094ee..4076870 100644
--- a/modules/core/src/main/java/org/apache/ignite/plugin/segmentation/GridSegmentationResolver.java
+++ b/modules/core/src/main/java/org/apache/ignite/plugin/segmentation/GridSegmentationResolver.java
@@ -29,7 +29,7 @@ import java.io.*;
  * one shared folder). Compound segment checks may be performed using several
  * resolvers.
  * <p>
- * Note that GridGain support a logical segmentation and not limited to network
+ * Note that Ignite support a logical segmentation and not limited to network
  * related segmentation only. For example, a particular segmentation resolver
  * can check for specific application or service present on the network and
  * mark the topology as segmented in case it is not available. In other words

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/86ab8e20/modules/core/src/main/java/org/apache/ignite/portables/PortableConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/portables/PortableConfiguration.java b/modules/core/src/main/java/org/apache/ignite/portables/PortableConfiguration.java
index 4c4ae27..967f8cd 100644
--- a/modules/core/src/main/java/org/apache/ignite/portables/PortableConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/portables/PortableConfiguration.java
@@ -23,7 +23,7 @@ import java.sql.*;
 import java.util.*;
 
 /**
- * Defines configuration for GridGain portable functionality. All configuration
+ * Defines configuration for Ignite portable functionality. All configuration
  * properties defined here can be overridden on per-type level in
  * {@link PortableTypeConfiguration}. Type configurations are provided via
  * {@link #getTypeConfigurations()} method.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/86ab8e20/modules/core/src/main/java/org/apache/ignite/portables/PortableIdMapper.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/portables/PortableIdMapper.java b/modules/core/src/main/java/org/apache/ignite/portables/PortableIdMapper.java
index 46b765b..f3316de 100644
--- a/modules/core/src/main/java/org/apache/ignite/portables/PortableIdMapper.java
+++ b/modules/core/src/main/java/org/apache/ignite/portables/PortableIdMapper.java
@@ -18,8 +18,8 @@
 package org.apache.ignite.portables;
 
 /**
- * Type and field ID mapper for portable objects. GridGain never writes full
- * strings for field or type names. Instead, for performance reasons, GridGain
+ * Type and field ID mapper for portable objects. Ignite never writes full
+ * strings for field or type names. Instead, for performance reasons, Ignite
  * writes integer hash codes for type and field names. It has been tested that
  * hash code conflicts for the type names or the field names
  * within the same type are virtually non-existent and, to gain performance, it is safe

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/86ab8e20/modules/core/src/main/java/org/apache/ignite/portables/PortableMarshalAware.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/portables/PortableMarshalAware.java b/modules/core/src/main/java/org/apache/ignite/portables/PortableMarshalAware.java
index 1ec2cca..b2813a5 100644
--- a/modules/core/src/main/java/org/apache/ignite/portables/PortableMarshalAware.java
+++ b/modules/core/src/main/java/org/apache/ignite/portables/PortableMarshalAware.java
@@ -20,7 +20,7 @@ package org.apache.ignite.portables;
 /**
  * Interface that allows to implement custom serialization
  * logic for portable objects. Portable objects are not required
- * to implement this interface, in which case GridGain will automatically
+ * to implement this interface, in which case Ignite will automatically
  * serialize portable objects using reflection.
  * <p>
  * This interface, in a way, is analogous to {@link java.io.Externalizable}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/86ab8e20/modules/core/src/main/java/org/apache/ignite/portables/PortableObject.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/portables/PortableObject.java b/modules/core/src/main/java/org/apache/ignite/portables/PortableObject.java
index 181c79c..9b21d0f 100644
--- a/modules/core/src/main/java/org/apache/ignite/portables/PortableObject.java
+++ b/modules/core/src/main/java/org/apache/ignite/portables/PortableObject.java
@@ -24,7 +24,7 @@ import java.util.*;
 
 /**
  * Wrapper for portable object in portable binary format. Once an object is defined as portable,
- * GridGain will always store it in memory in the portable (i.e. binary) format.
+ * Ignite will always store it in memory in the portable (i.e. binary) format.
  * User can choose to work either with the portable format or with the deserialized form
  * (assuming that class definitions are present in the classpath).
  * <p>
@@ -62,7 +62,7 @@ import java.util.*;
  * <p>
  * And finally, if we have class definitions in the classpath, we may choose to work with deserialized
  * typed objects at all times. In this case we do incur the deserialization cost, however,
- * GridGain will only deserialize on the first access and will cache the deserialized object,
+ * Ignite will only deserialize on the first access and will cache the deserialized object,
  * so it does not have to be deserialized again:
  * <pre name=code class=java>
  * CacheProjection&lt;MyKey.class, MyValue.class&gt; prj =
@@ -75,7 +75,7 @@ import java.util.*;
  * </pre>
  * <h1 class="header">Working With Maps and Collections</h1>
  * All maps and collections in the portable objects are serialized automatically. When working
- * with different platforms, e.g. C++ or .NET, GridGain will automatically pick the most
+ * with different platforms, e.g. C++ or .NET, Ignite will automatically pick the most
  * adequate collection or map in either language. For example, {@link ArrayList} in Java will become
  * {@code List} in C#, {@link LinkedList} in Java is {@link LinkedList} in C#, {@link HashMap}
  * in Java is {@code Dictionary} in C#, and {@link TreeMap} in Java becomes {@code SortedDictionary}
@@ -90,7 +90,7 @@ import java.util.*;
  * As the structure of a portable object changes, the new fields become available for SQL queries
  * automatically.
  * <h1 class="header">Building Portable Objects</h1>
- * GridGain comes with {@link PortableBuilder} which allows to build portable objects dynamically:
+ * Ignite comes with {@link PortableBuilder} which allows to build portable objects dynamically:
  * <pre name=code class=java>
  * GridPortableBuilder builder = Ignition.ignite().portables().builder("org.project.MyObject");
  *
@@ -111,8 +111,8 @@ import java.util.*;
  * GridPortableObject portableObj = Ignition.ignite().portables().toPortable(obj);
  * </pre>
  * <h1 class="header">Portable Metadata</h1>
- * Even though GridGain portable protocol only works with hash codes for type and field names
- * to achieve better performance, GridGain provides metadata for all portable types which
+ * Even though Ignite portable protocol only works with hash codes for type and field names
+ * to achieve better performance, Ignite provides metadata for all portable types which
  * can be queried ar runtime via any of the {@link org.apache.ignite.IgnitePortables#metadata(Class) GridPortables.metadata(...)}
  * methods. Having metadata also allows for proper formatting of {@code GridPortableObject.toString()} method,
  * even when portable objects are kept in binary format only, which may be necessary for audit reasons.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/86ab8e20/modules/core/src/main/java/org/apache/ignite/portables/PortableReader.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/portables/PortableReader.java b/modules/core/src/main/java/org/apache/ignite/portables/PortableReader.java
index 424f4fc..8059389 100644
--- a/modules/core/src/main/java/org/apache/ignite/portables/PortableReader.java
+++ b/modules/core/src/main/java/org/apache/ignite/portables/PortableReader.java
@@ -28,12 +28,12 @@ import java.util.Date;
  * Reader for portable objects used in {@link PortableMarshalAware} implementations.
  * Useful for the cases when user wants a fine-grained control over serialization.
  * <p>
- * Note that GridGain never writes full strings for field or type names. Instead,
- * for performance reasons, GridGain writes integer hash codes for type and field names.
+ * Note that Ignite never writes full strings for field or type names. Instead,
+ * for performance reasons, Ignite writes integer hash codes for type and field names.
  * It has been tested that hash code conflicts for the type names or the field names
  * within the same type are virtually non-existent and, to gain performance, it is safe
  * to work with hash codes. For the cases when hash codes for different types or fields
- * actually do collide, GridGain provides {@link PortableIdMapper} which
+ * actually do collide, Ignite provides {@link PortableIdMapper} which
  * allows to override the automatically generated hash code IDs for the type and field names.
  */
 public interface PortableReader {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/86ab8e20/modules/core/src/main/java/org/apache/ignite/portables/PortableWriter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/portables/PortableWriter.java b/modules/core/src/main/java/org/apache/ignite/portables/PortableWriter.java
index c1be692..1b44aa3 100644
--- a/modules/core/src/main/java/org/apache/ignite/portables/PortableWriter.java
+++ b/modules/core/src/main/java/org/apache/ignite/portables/PortableWriter.java
@@ -28,12 +28,12 @@ import java.util.Date;
  * Writer for portable object used in {@link PortableMarshalAware} implementations.
  * Useful for the cases when user wants a fine-grained control over serialization.
  * <p>
- * Note that GridGain never writes full strings for field or type names. Instead,
- * for performance reasons, GridGain writes integer hash codes for type and field names.
+ * Note that Ignite never writes full strings for field or type names. Instead,
+ * for performance reasons, Ignite writes integer hash codes for type and field names.
  * It has been tested that hash code conflicts for the type names or the field names
  * within the same type are virtually non-existent and, to gain performance, it is safe
  * to work with hash codes. For the cases when hash codes for different types or fields
- * actually do collide, GridGain provides {@link PortableIdMapper} which
+ * actually do collide, Ignite provides {@link PortableIdMapper} which
  * allows to override the automatically generated hash code IDs for the type and field names.
  */
 public interface PortableWriter {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/86ab8e20/modules/core/src/main/java/org/apache/ignite/resources/IgniteServiceResource.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/resources/IgniteServiceResource.java b/modules/core/src/main/java/org/apache/ignite/resources/IgniteServiceResource.java
index 05f7f84..a7edbfe 100644
--- a/modules/core/src/main/java/org/apache/ignite/resources/IgniteServiceResource.java
+++ b/modules/core/src/main/java/org/apache/ignite/resources/IgniteServiceResource.java
@@ -20,7 +20,7 @@ package org.apache.ignite.resources;
 import java.lang.annotation.*;
 
 /**
- * Annotates a field or a setter method for injection of GridGain service(s) by specified service name.
+ * Annotates a field or a setter method for injection of Ignite service(s) by specified service name.
  * If more than one service is deployed on a server, then the first available instance will be returned.
  * <p>
  * Here is how injection would typically happen:

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/86ab8e20/modules/core/src/main/java/org/apache/ignite/resources/IgniteSpringApplicationContextResource.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/resources/IgniteSpringApplicationContextResource.java b/modules/core/src/main/java/org/apache/ignite/resources/IgniteSpringApplicationContextResource.java
index 2ec27b1..d2d0463 100644
--- a/modules/core/src/main/java/org/apache/ignite/resources/IgniteSpringApplicationContextResource.java
+++ b/modules/core/src/main/java/org/apache/ignite/resources/IgniteSpringApplicationContextResource.java
@@ -21,7 +21,7 @@ import java.lang.annotation.*;
 
 /**
  * Annotates a field or a setter method for injection of Spring ApplicationContext resource.
- * When GridGain starts using Spring configuration, the Application Context for Spring
+ * When Ignite starts using Spring configuration, the Application Context for Spring
  * Configuration is injected as this resource.
  * method.
  * <p>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/86ab8e20/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiConfiguration.java b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiConfiguration.java
index d311c66..c3e62c8 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiConfiguration.java
@@ -23,7 +23,7 @@ import java.lang.annotation.*;
  * Annotates SPI configuration setters on whether or not it is optional.
  * <p>
  * Note that this annotation is used only for documentation purposes now and is not checked by
- * GridGain implementation.
+ * Ignite implementation.
  */
 @Documented
 @Retention(RetentionPolicy.RUNTIME)

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/86ab8e20/modules/core/src/main/java/org/apache/ignite/spi/authentication/AuthenticationSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/authentication/AuthenticationSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/authentication/AuthenticationSpi.java
index 901075b..dc238db 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/authentication/AuthenticationSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/authentication/AuthenticationSpi.java
@@ -44,12 +44,12 @@ import org.apache.ignite.spi.*;
  * </ul>
  * <p>
  * <b>NOTE:</b> multiple authentication SPIs may be started on the same grid node. In this case
- * GridGain will differentiate between them based on {@link #supported(GridSecuritySubjectType)}
+ * Ignite will differentiate between them based on {@link #supported(GridSecuritySubjectType)}
  * value. The first SPI which returns {@code true} for a given subject type will be used for
  * authentication.
  * <p>
  * <b>NOTE:</b> this SPI (i.e. methods in this interface) should never be used directly. SPIs provide
- * internal view on the subsystem and is used internally by GridGain kernal. In rare use cases when
+ * internal view on the subsystem and is used internally by Ignite kernal. In rare use cases when
  * access to a specific implementation of this SPI is required - an instance of this SPI can be obtained
  * via {@link org.apache.ignite.Ignite#configuration()} method to check its configuration properties or call other non-SPI
  * methods. Note again that calling methods from this interface on the obtained instance can lead

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/86ab8e20/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/CheckpointSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/CheckpointSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/CheckpointSpi.java
index 01b686c..30f2528 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/CheckpointSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/CheckpointSpi.java
@@ -41,7 +41,7 @@ import org.jetbrains.annotations.*;
  * <li>{@link org.apache.ignite.compute.ComputeTaskSession#saveCheckpoint(String, Object, org.apache.ignite.compute.ComputeTaskSessionScope, long, boolean)}</li>
  * </ul>
  * <p>
- * GridGain provides the following {@code GridCheckpointSpi} implementations:
+ * Ignite provides the following {@code GridCheckpointSpi} implementations:
  * <ul>
  * <li>{@link org.apache.ignite.spi.checkpoint.noop.NoopCheckpointSpi} - default</li>
  * <li>{@link org.apache.ignite.spi.checkpoint.sharedfs.SharedFsCheckpointSpi}</li>
@@ -50,7 +50,7 @@ import org.jetbrains.annotations.*;
  * <li>{@link org.apache.ignite.spi.checkpoint.cache.CacheCheckpointSpi}</li>
  * </ul>
  * <b>NOTE:</b> this SPI (i.e. methods in this interface) should never be used directly. SPIs provide
- * internal view on the subsystem and is used internally by GridGain kernal. In rare use cases when
+ * internal view on the subsystem and is used internally by Ignite kernal. In rare use cases when
  * access to a specific implementation of this SPI is required - an instance of this SPI can be obtained
  * via {@link org.apache.ignite.Ignite#configuration()} method to check its configuration properties or call other non-SPI
  * methods. Note again that calling methods from this interface on the obtained instance can lead

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/86ab8e20/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/sharedfs/SharedFsCheckpointSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/sharedfs/SharedFsCheckpointSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/sharedfs/SharedFsCheckpointSpi.java
index b5ed8f0..65d9b27 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/sharedfs/SharedFsCheckpointSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/sharedfs/SharedFsCheckpointSpi.java
@@ -173,7 +173,7 @@ public class SharedFsCheckpointSpi extends IgniteSpiAdapter implements Checkpoin
      * <p>
      * If not provided, default value is {@link #DFLT_DIR_PATH}.
      *
-     * @param dirPaths Absolute or GridGain installation home folder relative path where checkpoints
+     * @param dirPaths Absolute or Ignite installation home folder relative path where checkpoints
      * will be stored.
      */
     @IgniteSpiConfiguration(optional = true)

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/86ab8e20/modules/core/src/main/java/org/apache/ignite/spi/collision/CollisionSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/collision/CollisionSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/collision/CollisionSpi.java
index 2dcf0be..bb3b731 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/collision/CollisionSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/collision/CollisionSpi.java
@@ -32,7 +32,7 @@ import org.jetbrains.annotations.*;
  * parallel, etc...
  * <p>
  * Collision SPI provides developer with ability to use the custom logic in determining how
- * grid jobs should be executed on a destination grid node. GridGain comes with the following
+ * grid jobs should be executed on a destination grid node. Ignite comes with the following
  * ready implementations for collision resolution that cover most popular strategies:
  * <ul>
  *      <li>{@link org.apache.ignite.spi.collision.fifoqueue.FifoQueueCollisionSpi}</li>
@@ -40,7 +40,7 @@ import org.jetbrains.annotations.*;
  *      <li>{@link org.apache.ignite.spi.collision.jobstealing.JobStealingCollisionSpi}</li>
  * </ul>
  * <b>NOTE:</b> this SPI (i.e. methods in this interface) should never be used directly. SPIs provide
- * internal view on the subsystem and is used internally by GridGain kernal. In rare use cases when
+ * internal view on the subsystem and is used internally by Ignite kernal. In rare use cases when
  * access to a specific implementation of this SPI is required - an instance of this SPI can be obtained
  * via {@link org.apache.ignite.Ignite#configuration()} method to check its configuration properties or call other non-SPI
  * methods. Note again that calling methods from this interface on the obtained instance can lead
@@ -67,7 +67,7 @@ public interface CollisionSpi extends IgniteSpi {
      * Listener to be set for notification of external collision events (e.g. job stealing).
      * Once grid receives such notification, it will immediately invoke collision SPI.
      * <p>
-     * GridGain uses this listener to enable job stealing from overloaded to underloaded nodes.
+     * Ignite uses this listener to enable job stealing from overloaded to underloaded nodes.
      * However, you can also utilize it, for instance, to provide time based collision
      * resolution. To achieve this, you most likely would mark some job by setting a certain
      * attribute in job context (see {@link org.apache.ignite.compute.ComputeJobContext}) for a job that requires

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/86ab8e20/modules/core/src/main/java/org/apache/ignite/spi/communication/CommunicationSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/communication/CommunicationSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/communication/CommunicationSpi.java
index c09b18c..ce9c5b0 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/communication/CommunicationSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/communication/CommunicationSpi.java
@@ -27,7 +27,7 @@ import java.util.*;
 /**
  * Communication SPI is responsible for data exchange between nodes.
  * <p>
- * Communication SPI is one of the most important SPI in GridGain. It is used
+ * Communication SPI is one of the most important SPI in Ignite. It is used
  * heavily throughout the system and provides means for all data exchanges
  * between nodes, such as internal implementation details and user driven
  * messages.
@@ -38,12 +38,12 @@ import java.util.*;
  *      <li>{@link org.apache.ignite.IgniteMessaging#send(Object, Collection)}</li>
  * </ul>
  * <p>
- * GridGain comes with built-in communication SPI implementations:
+ * Ignite comes with built-in communication SPI implementations:
  * <ul>
  *      <li>{@link org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi}</li>
  * </ul>
  * <b>NOTE:</b> this SPI (i.e. methods in this interface) should never be used directly. SPIs provide
- * internal view on the subsystem and is used internally by GridGain kernal. In rare use cases when
+ * internal view on the subsystem and is used internally by Ignite kernal. In rare use cases when
  * access to a specific implementation of this SPI is required - an instance of this SPI can be obtained
  * via {@link org.apache.ignite.Ignite#configuration()} method to check its configuration properties or call other non-SPI
  * methods. Note again that calling methods from this interface on the obtained instance can lead

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/86ab8e20/modules/core/src/main/java/org/apache/ignite/spi/deployment/DeploymentSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/deployment/DeploymentSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/deployment/DeploymentSpi.java
index b1cee6e..12b03e0 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/deployment/DeploymentSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/deployment/DeploymentSpi.java
@@ -51,7 +51,7 @@ import org.jetbrains.annotations.*;
  * <li>{@ignitelink org.apache.ignite.spi.deployment.uri.UriDeploymentSpi}</li>
  * </ul>
  * <b>NOTE:</b> this SPI (i.e. methods in this interface) should never be used directly. SPIs provide
- * internal view on the subsystem and is used internally by GridGain kernal. In rare use cases when
+ * internal view on the subsystem and is used internally by Ignite kernal. In rare use cases when
  * access to a specific implementation of this SPI is required - an instance of this SPI can be obtained
  * via {@link org.apache.ignite.Ignite#configuration()} method to check its configuration properties or call other non-SPI
  * methods. Note again that calling methods from this interface on the obtained instance can lead

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/86ab8e20/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoveryMetricsProvider.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoveryMetricsProvider.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoveryMetricsProvider.java
index cfe8032..4a03278 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoveryMetricsProvider.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoveryMetricsProvider.java
@@ -24,7 +24,7 @@ import org.apache.ignite.internal.util.tostring.*;
  * Provides metrics to discovery SPI. It is responsibility of discovery SPI
  * to make sure that all nodes have updated metrics data about each other.
  * <p>
- * GridGain implementation will supply discovery SPI with metrics provider
+ * Ignite implementation will supply discovery SPI with metrics provider
  * via {@link DiscoverySpi#setMetricsProvider(DiscoveryMetricsProvider)}
  * method.
  */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/86ab8e20/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoverySpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoverySpi.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoverySpi.java
index 168cfc5..cba57bb 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoverySpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoverySpi.java
@@ -36,7 +36,7 @@ import java.util.*;
  * <li>{@link org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi}</li>
  * </ul>
  * <b>NOTE:</b> this SPI (i.e. methods in this interface) should never be used directly. SPIs provide
- * internal view on the subsystem and is used internally by GridGain kernal. In rare use cases when
+ * internal view on the subsystem and is used internally by Ignite kernal. In rare use cases when
  * access to a specific implementation of this SPI is required - an instance of this SPI can be obtained
  * via {@link org.apache.ignite.Ignite#configuration()} method to check its configuration properties or call other non-SPI
  * methods. Note again that calling methods from this interface on the obtained instance can lead
@@ -87,7 +87,7 @@ public interface DiscoverySpi extends IgniteSpi {
      * {@link org.apache.ignite.events.IgniteDiscoveryEvent} for a set of all possible
      * discovery events.
      * <p>
-     * Note that as of GridGain 3.0.2 this method is called <b>before</b>
+     * Note that as of Ignite 3.0.2 this method is called <b>before</b>
      * method {@link #spiStart(String)} is called. This is done to
      * avoid potential window when SPI is started but the listener is
      * not registered yet.
@@ -97,7 +97,7 @@ public interface DiscoverySpi extends IgniteSpi {
     public void setListener(@Nullable DiscoverySpiListener lsnr);
 
     /**
-     * Sets a handler for initial data exchange between GridGain nodes.
+     * Sets a handler for initial data exchange between Ignite nodes.
      *
      * @param exchange Discovery data exchange handler.
      */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/86ab8e20/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoverySpiDataExchange.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoverySpiDataExchange.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoverySpiDataExchange.java
index 053e7be..bb64919 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoverySpiDataExchange.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoverySpiDataExchange.java
@@ -20,7 +20,7 @@ package org.apache.ignite.spi.discovery;
 import java.util.*;
 
 /**
- * Handler for initial data exchange between GridGain nodes. Data exchange
+ * Handler for initial data exchange between Ignite nodes. Data exchange
  * is initiated by a new node when it tries to join topology and finishes
  * before it actually joins.
  */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/86ab8e20/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 4ba86d0..d6b1003 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
@@ -206,7 +206,7 @@ abstract class TcpDiscoverySpiAdapter extends IgniteSpiAdapter implements Discov
      * Sets socket operations timeout. This timeout is used to limit connection time and
      * write-to-socket time.
      * <p>
-     * Note that when running GridGain on Amazon EC2, socket timeout must be set to a value
+     * Note that when running Ignite on Amazon EC2, socket timeout must be set to a value
      * significantly greater than the default (e.g. to {@code 30000}).
      * <p>
      * If not specified, default is {@link #DFLT_SOCK_TIMEOUT}.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/86ab8e20/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 6725abd..c903573 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
@@ -45,7 +45,7 @@ import static java.sql.Connection.*;
  * <h2 class="header">Optional</h2>
  * The following configuration parameters are optional:
  * <ul>
- *     <li>Flag indicating whether DB schema should be initialized by GridGain (default behaviour) or
+ *     <li>Flag indicating whether DB schema should be initialized by Ignite (default behaviour) or
  *         was explicitly created by user (see {@link #setInitSchema(boolean)})</li>
  * </ul>
  * <p>
@@ -252,10 +252,10 @@ public class TcpDiscoveryJdbcIpFinder extends TcpDiscoveryIpFinderAdapter {
     }
 
     /**
-     * Flag indicating whether DB schema should be initialized by GridGain (default behaviour) or
+     * Flag indicating whether DB schema should be initialized by Ignite (default behaviour) or
      * was explicitly created by user.
      *
-     * @param initSchema {@code True} if DB schema should be initialized by GridGain (default behaviour),
+     * @param initSchema {@code True} if DB schema should be initialized by Ignite (default behaviour),
      *      {code @false} if schema was explicitly created by user.
      */
     @IgniteSpiConfiguration(optional = true)

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/86ab8e20/modules/core/src/main/java/org/apache/ignite/spi/eventstorage/EventStorageSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/eventstorage/EventStorageSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/eventstorage/EventStorageSpi.java
index d4c570d..01ae2da 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/eventstorage/EventStorageSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/eventstorage/EventStorageSpi.java
@@ -28,7 +28,7 @@ import java.util.*;
  * node events and querying recorded local events. Every node during its life-cycle
  * goes through a serious of events such as task deployment, task execution, job
  * execution, etc. For
- * performance reasons GridGain is designed to store all locally produced events
+ * performance reasons Ignite is designed to store all locally produced events
  * locally. These events can be later retrieved using either distributed query:
  * <ul>
  *      <li>{@link org.apache.ignite.IgniteEvents#remoteQuery(org.apache.ignite.lang.IgnitePredicate, long, int...)}</li>
@@ -38,7 +38,7 @@ import java.util.*;
  *      <li>{@link org.apache.ignite.IgniteEvents#localQuery(org.apache.ignite.lang.IgnitePredicate, int...)}</li>
  * </ul>
  * <b>NOTE:</b> this SPI (i.e. methods in this interface) should never be used directly. SPIs provide
- * internal view on the subsystem and is used internally by GridGain kernal. In rare use cases when
+ * internal view on the subsystem and is used internally by Ignite kernal. In rare use cases when
  * access to a specific implementation of this SPI is required - an instance of this SPI can be obtained
  * via {@link org.apache.ignite.Ignite#configuration()} method to check its configuration properties or call other non-SPI
  * methods. Note again that calling methods from this interface on the obtained instance can lead

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/86ab8e20/modules/core/src/main/java/org/apache/ignite/spi/failover/FailoverSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/failover/FailoverSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/failover/FailoverSpi.java
index c81404e..ee45fcc 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/failover/FailoverSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/failover/FailoverSpi.java
@@ -37,14 +37,14 @@ import java.util.*;
  * {@link org.apache.ignite.compute.ComputeJobResult#getNode() GridFailoverContext.getJobResult().node()}
  * method.
  * <p>
- * GridGain comes with the following built-in failover SPI implementations:
+ * Ignite comes with the following built-in failover SPI implementations:
  * <ul>
  *      <li>{@link org.apache.ignite.spi.failover.never.NeverFailoverSpi}</li>
  *      <li>{@link org.apache.ignite.spi.failover.always.AlwaysFailoverSpi}</li>
  *      <li>{@link org.apache.ignite.spi.failover.jobstealing.JobStealingFailoverSpi}</li>
  * </ul>
  * <b>NOTE:</b> this SPI (i.e. methods in this interface) should never be used directly. SPIs provide
- * internal view on the subsystem and is used internally by GridGain kernal. In rare use cases when
+ * internal view on the subsystem and is used internally by Ignite kernal. In rare use cases when
  * access to a specific implementation of this SPI is required - an instance of this SPI can be obtained
  * via {@link org.apache.ignite.Ignite#configuration()} method to check its configuration properties or call other non-SPI
  * methods. Note again that calling methods from this interface on the obtained instance can lead

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/86ab8e20/modules/core/src/main/java/org/apache/ignite/spi/indexing/GridIndexingSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/indexing/GridIndexingSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/indexing/GridIndexingSpi.java
index 6f1fa23..a02c51e 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/indexing/GridIndexingSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/indexing/GridIndexingSpi.java
@@ -27,7 +27,7 @@ import java.util.*;
  * Usually cache name will be used as space name, so multiple caches can write to single indexing SPI instance.
  * <p>
  * <b>NOTE:</b> this SPI (i.e. methods in this interface) should never be used directly. SPIs provide
- * internal view on the subsystem and is used internally by GridGain kernal. In rare use cases when
+ * internal view on the subsystem and is used internally by Ignite kernal. In rare use cases when
  * access to a specific implementation of this SPI is required - an instance of this SPI can be obtained
  * via {@link org.apache.ignite.Ignite#configuration()} method to check its configuration properties or call other non-SPI
  * methods. Note again that calling methods from this interface on the obtained instance can lead

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/86ab8e20/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/LoadBalancingSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/LoadBalancingSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/LoadBalancingSpi.java
index 9897ca3..ecc9f29 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/LoadBalancingSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/LoadBalancingSpi.java
@@ -95,14 +95,14 @@ import java.util.*;
  * }
  * </pre>
  * <p>
- * GridGain comes with the following load balancing SPI implementations out of the box:
+ * Ignite comes with the following load balancing SPI implementations out of the box:
  * <ul>
  * <li>{@link org.apache.ignite.spi.loadbalancing.roundrobin.RoundRobinLoadBalancingSpi} - default</li>
  * <li>{@link org.apache.ignite.spi.loadbalancing.adaptive.AdaptiveLoadBalancingSpi}</li>
  * <li>{@link org.apache.ignite.spi.loadbalancing.weightedrandom.WeightedRandomLoadBalancingSpi}</li>
  * </ul>
  * <b>NOTE:</b> this SPI (i.e. methods in this interface) should never be used directly. SPIs provide
- * internal view on the subsystem and is used internally by GridGain kernal. In rare use cases when
+ * internal view on the subsystem and is used internally by Ignite kernal. In rare use cases when
  * access to a specific implementation of this SPI is required - an instance of this SPI can be obtained
  * via {@link org.apache.ignite.Ignite#configuration()} method to check its configuration properties or call other non-SPI
  * methods. Note again that calling methods from this interface on the obtained instance can lead

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/86ab8e20/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/adaptive/AdaptiveCpuLoadProbe.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/adaptive/AdaptiveCpuLoadProbe.java b/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/adaptive/AdaptiveCpuLoadProbe.java
index 10ff19b..63eb9b5 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/adaptive/AdaptiveCpuLoadProbe.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/adaptive/AdaptiveCpuLoadProbe.java
@@ -41,7 +41,7 @@ import org.apache.ignite.internal.util.typedef.internal.*;
  * for that, you should set {@link #setProcessorCoefficient(double)} parameter to
  * {@code 0.75} .
  * <p>
- * Below is an example of how CPU load probe would be configured in GridGain
+ * Below is an example of how CPU load probe would be configured in Ignite
  * Spring configuration file:
  * <pre name="code" class="xml">
  * &lt;property name="loadBalancingSpi"&gt;


Mime
View raw message