ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [2/6] incubator-ignite git commit: #ignite-164: Change GridGain to Ignite in comments.
Date Wed, 04 Feb 2015 17:27:08 GMT
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/86ab8e20/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/adaptive/AdaptiveJobCountLoadProbe.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/adaptive/AdaptiveJobCountLoadProbe.java b/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/adaptive/AdaptiveJobCountLoadProbe.java
index b3d98a8..bc272f7 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/adaptive/AdaptiveJobCountLoadProbe.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/adaptive/AdaptiveJobCountLoadProbe.java
@@ -27,7 +27,7 @@ import org.apache.ignite.internal.util.typedef.internal.*;
  * <p>
  * The load of a node is simply calculated by adding active and waiting job counts.
  * <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;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/86ab8e20/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/adaptive/AdaptiveProcessingTimeLoadProbe.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/adaptive/AdaptiveProcessingTimeLoadProbe.java b/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/adaptive/AdaptiveProcessingTimeLoadProbe.java
index dfc646f..44a75ea 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/adaptive/AdaptiveProcessingTimeLoadProbe.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/adaptive/AdaptiveProcessingTimeLoadProbe.java
@@ -27,7 +27,7 @@ import org.apache.ignite.internal.util.typedef.internal.*;
  * time values or current (default is to use averages). The algorithm
  * returns a sum of job wait time and job execution time.
  * <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;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/86ab8e20/modules/core/src/main/java/org/apache/ignite/spi/securesession/SecureSessionSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/securesession/SecureSessionSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/securesession/SecureSessionSpi.java
index 5d6505b..b7fcdaf 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/securesession/SecureSessionSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/securesession/SecureSessionSpi.java
@@ -44,12 +44,12 @@ import java.util.*;
  * </ul>
  * <p>
  * <b>NOTE:</b> that multiple secure session 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
  * session validation.
  * <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/swapspace/SwapSpaceSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/swapspace/SwapSpaceSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/swapspace/SwapSpaceSpi.java
index 0277407..b3d1475 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/swapspace/SwapSpaceSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/swapspace/SwapSpaceSpi.java
@@ -24,7 +24,7 @@ import org.jetbrains.annotations.*;
 import java.util.*;
 
 /**
- * Provides a mechanism in grid for storing data on disk. GridGain cache uses swap space to overflow
+ * Provides a mechanism in grid for storing data on disk. Ignite cache uses swap space to overflow
  * data to disk if it cannot fit in memory. It's also possible to use swap space directly
  * by calling {@link org.apache.ignite.Ignite} API swap-related methods. Logically storage is organized into
  * independent 'spaces' in which data is stored.
@@ -46,7 +46,7 @@ import java.util.*;
  * <p>
  * <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/startup/cmdline/CommandLineStartup.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/startup/cmdline/CommandLineStartup.java b/modules/core/src/main/java/org/apache/ignite/startup/cmdline/CommandLineStartup.java
index c414db1..7ce7783 100644
--- a/modules/core/src/main/java/org/apache/ignite/startup/cmdline/CommandLineStartup.java
+++ b/modules/core/src/main/java/org/apache/ignite/startup/cmdline/CommandLineStartup.java
@@ -41,13 +41,13 @@ import static org.apache.ignite.IgniteSystemProperties.*;
 import static org.apache.ignite.internal.GridProductImpl.*;
 
 /**
- * This class defines command-line GridGain startup. This startup can be used to start GridGain
+ * This class defines command-line Ignite startup. This startup can be used to start Ignite
  * outside of any hosting environment from command line. This startup is a Java application with
  * {@link #main(String[])} method that accepts command line arguments. It accepts just one
  * parameter which is Spring XML configuration file path. You can run this class from command
  * line without parameters to get help message.
  * <p>
- * Note that scripts {@code ${IGNITE_HOME}/bin/ignite.{sh|bat}} shipped with GridGain use
+ * Note that scripts {@code ${IGNITE_HOME}/bin/ignite.{sh|bat}} shipped with Ignite use
  * this startup and you can use them as an example.
  */
 @SuppressWarnings({"CallToSystemExit"})

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/86ab8e20/modules/core/src/main/java/org/apache/ignite/startup/cmdline/CommandLineTransformer.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/startup/cmdline/CommandLineTransformer.java b/modules/core/src/main/java/org/apache/ignite/startup/cmdline/CommandLineTransformer.java
index 2a29095..0c1452c 100644
--- a/modules/core/src/main/java/org/apache/ignite/startup/cmdline/CommandLineTransformer.java
+++ b/modules/core/src/main/java/org/apache/ignite/startup/cmdline/CommandLineTransformer.java
@@ -21,7 +21,7 @@ import java.io.*;
 import java.util.*;
 
 /**
- * This class is a workaround for a versatile problems with passing arguments to the GridGain Windows batch launcher
+ * This class is a workaround for a versatile problems with passing arguments to the Ignite Windows batch launcher
  * scripts. It transforms command line options passed to the *.bat launcher scripts into a reformatted, adapted for
  * Windows batch usage variables.
  * <p>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/86ab8e20/modules/core/src/main/java/org/apache/ignite/startup/package-info.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/startup/package-info.java b/modules/core/src/main/java/org/apache/ignite/startup/package-info.java
index 4132d93..7c5467f 100644
--- a/modules/core/src/main/java/org/apache/ignite/startup/package-info.java
+++ b/modules/core/src/main/java/org/apache/ignite/startup/package-info.java
@@ -16,6 +16,6 @@
  */
 
 /**
- * Contains GridGain runtime startup classes.
+ * Contains Ignite runtime startup classes.
  */
 package org.apache.ignite.startup;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/86ab8e20/modules/core/src/main/java/org/apache/ignite/streamer/StreamerConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/streamer/StreamerConfiguration.java b/modules/core/src/main/java/org/apache/ignite/streamer/StreamerConfiguration.java
index 629e3a7..3cb4724 100644
--- a/modules/core/src/main/java/org/apache/ignite/streamer/StreamerConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/streamer/StreamerConfiguration.java
@@ -248,20 +248,20 @@ public class StreamerConfiguration {
     }
 
     /**
-     * Flag indicating whether streamer executor service should be shut down on GridGain stop. If this flag
+     * Flag indicating whether streamer executor service should be shut down on Ignite stop. If this flag
      * is {@code true}, executor service will be shut down regardless of whether executor was specified externally
-     * or it was created by GridGain.
+     * or it was created by Ignite.
      *
-     * @return {@code True} if executor service should be shut down on GridGain stop.
+     * @return {@code True} if executor service should be shut down on Ignite stop.
      */
     public boolean isExecutorServiceShutdown() {
         return execSvcShutdown;
     }
 
     /**
-     * Sets flag indicating whether executor service should be shut down on GridGain stop.
+     * Sets flag indicating whether executor service should be shut down on Ignite stop.
      *
-     * @param execSvcShutdown {@code True} if executor service should be shut down on GridGain stop.
+     * @param execSvcShutdown {@code True} if executor service should be shut down on Ignite stop.
      * @see #isExecutorServiceShutdown()
      */
     public void setExecutorServiceShutdown(boolean execSvcShutdown) {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/86ab8e20/modules/core/src/main/java/org/apache/ignite/streamer/StreamerWindow.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/streamer/StreamerWindow.java b/modules/core/src/main/java/org/apache/ignite/streamer/StreamerWindow.java
index ae9e778..730735e 100644
--- a/modules/core/src/main/java/org/apache/ignite/streamer/StreamerWindow.java
+++ b/modules/core/src/main/java/org/apache/ignite/streamer/StreamerWindow.java
@@ -30,7 +30,7 @@ import java.util.*;
  * are my top 10 best selling products over last 24 hours?", or "Who are my top 10 users out of
  * last 1,000,000 users who logged in?"
  * <p>
- * GridGain comes with following rolling windows implementations out of the box:
+ * Ignite comes with following rolling windows implementations out of the box:
  * <ul>
  * <li>{@link org.apache.ignite.streamer.window.StreamerUnboundedWindow}</li>
  * <li>{@link org.apache.ignite.streamer.window.StreamerBoundedSizeWindow}</li>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/86ab8e20/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 99d176c..c6f27f5 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
@@ -88,7 +88,7 @@ import java.util.*;
  * </ul>
  * <p>
  * <h1 class="header">Cache Atomicity Mode</h1>
- * In addition to standard {@link org.apache.ignite.cache.CacheAtomicityMode#TRANSACTIONAL} behavior, GridGain also supports
+ * In addition to standard {@link org.apache.ignite.cache.CacheAtomicityMode#TRANSACTIONAL} behavior, Ignite also supports
  * a lighter {@link org.apache.ignite.cache.CacheAtomicityMode#ATOMIC} mode as well. In this mode distributed transactions
  * and distributed locking are not supported. Disabling transactions and locking allows to achieve much higher
  * performance and throughput ratios. It is recommended that {@link org.apache.ignite.cache.CacheAtomicityMode#ATOMIC} mode

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/86ab8e20/modules/core/src/test/config/benchmark/spring-cache-client-benchmark-1.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/config/benchmark/spring-cache-client-benchmark-1.xml b/modules/core/src/test/config/benchmark/spring-cache-client-benchmark-1.xml
index 557a00c..5e11c2b 100644
--- a/modules/core/src/test/config/benchmark/spring-cache-client-benchmark-1.xml
+++ b/modules/core/src/test/config/benchmark/spring-cache-client-benchmark-1.xml
@@ -18,12 +18,12 @@
   -->
 
 <!--
-    GridGain Spring configuration file to startup grid cache.
+    Ignite Spring configuration file to startup grid cache.
 
-    When starting a standalone GridGain node, you need to execute the following command:
+    When starting a standalone Ignite node, you need to execute the following command:
     {IGNITE_HOME}/bin/ignite.{bat|sh} path-to-this-file/example-cache.xml
 
-    When starting GridGain from Java IDE, pass path to this file into Ignition:
+    When starting Ignite from Java IDE, pass path to this file into Ignition:
     Ignition.start("path-to-this-file/example-benchmark.xml");
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/86ab8e20/modules/core/src/test/config/benchmark/spring-cache-client-benchmark-2.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/config/benchmark/spring-cache-client-benchmark-2.xml b/modules/core/src/test/config/benchmark/spring-cache-client-benchmark-2.xml
index cc2ccc0..56575c6 100644
--- a/modules/core/src/test/config/benchmark/spring-cache-client-benchmark-2.xml
+++ b/modules/core/src/test/config/benchmark/spring-cache-client-benchmark-2.xml
@@ -18,12 +18,12 @@
   -->
 
 <!--
-    GridGain Spring configuration file to startup grid cache.
+    Ignite Spring configuration file to startup grid cache.
 
-    When starting a standalone GridGain node, you need to execute the following command:
+    When starting a standalone Ignite node, you need to execute the following command:
     {IGNITE_HOME}/bin/ignite.{bat|sh} path-to-this-file/example-cache.xml
 
-    When starting GridGain from Java IDE, pass path to this file into Ignition:
+    When starting Ignite from Java IDE, pass path to this file into Ignition:
     Ignition.start("path-to-this-file/example-benchmark.xml");
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/86ab8e20/modules/core/src/test/config/benchmark/spring-cache-client-benchmark-3.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/config/benchmark/spring-cache-client-benchmark-3.xml b/modules/core/src/test/config/benchmark/spring-cache-client-benchmark-3.xml
index 25826b1..3b74318 100644
--- a/modules/core/src/test/config/benchmark/spring-cache-client-benchmark-3.xml
+++ b/modules/core/src/test/config/benchmark/spring-cache-client-benchmark-3.xml
@@ -18,12 +18,12 @@
   -->
 
 <!--
-    GridGain Spring configuration file to startup grid cache.
+    Ignite Spring configuration file to startup grid cache.
 
-    When starting a standalone GridGain node, you need to execute the following command:
+    When starting a standalone Ignite node, you need to execute the following command:
     {IGNITE_HOME}/bin/ignite.{bat|sh} path-to-this-file/example-cache.xml
 
-    When starting GridGain from Java IDE, pass path to this file into Ignition:
+    When starting Ignite from Java IDE, pass path to this file into Ignition:
     Ignition.start("path-to-this-file/example-benchmark.xml");
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/86ab8e20/modules/core/src/test/config/ggfs-shmem.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/config/ggfs-shmem.xml b/modules/core/src/test/config/ggfs-shmem.xml
index 4bf902f..1044748 100644
--- a/modules/core/src/test/config/ggfs-shmem.xml
+++ b/modules/core/src/test/config/ggfs-shmem.xml
@@ -18,12 +18,12 @@
   -->
 
 <!--
-    GridGain Spring configuration file to startup grid cache.
+    Ignite Spring configuration file to startup grid cache.
 
-    When starting a standalone GridGain node, you need to execute the following command:
+    When starting a standalone Ignite node, you need to execute the following command:
     {IGNITE_HOME}/bin/ignite.{bat|sh} path-to-this-file/example-ggfs-shmem.xml
 
-    When starting GridGain from Java IDE, pass path to this file into Ignition:
+    When starting Ignite from Java IDE, pass path to this file into Ignition:
     Ignition.start("path-to-this-file/example-ggfs-shmem.xml");
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/86ab8e20/modules/core/src/test/config/load/cache-benchmark.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/config/load/cache-benchmark.xml b/modules/core/src/test/config/load/cache-benchmark.xml
index 5447e83..880269b 100644
--- a/modules/core/src/test/config/load/cache-benchmark.xml
+++ b/modules/core/src/test/config/load/cache-benchmark.xml
@@ -18,7 +18,7 @@
   -->
 
 <!--
-    GridGain Spring configuration file to startup grid cache.
+    Ignite Spring configuration file to startup grid cache.
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/86ab8e20/modules/core/src/test/config/load/cache-client-benchmark.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/config/load/cache-client-benchmark.xml b/modules/core/src/test/config/load/cache-client-benchmark.xml
index 717bd7a..ab3893a 100644
--- a/modules/core/src/test/config/load/cache-client-benchmark.xml
+++ b/modules/core/src/test/config/load/cache-client-benchmark.xml
@@ -18,7 +18,7 @@
   -->
 
 <!--
-    GridGain Spring configuration file to startup grid cache.
+    Ignite Spring configuration file to startup grid cache.
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/86ab8e20/modules/core/src/test/config/load/merge-sort-base.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/config/load/merge-sort-base.xml b/modules/core/src/test/config/load/merge-sort-base.xml
index 0476feb..27634b3 100644
--- a/modules/core/src/test/config/load/merge-sort-base.xml
+++ b/modules/core/src/test/config/load/merge-sort-base.xml
@@ -35,17 +35,17 @@
 
         <!--
             Events and Performance
-            Note that by default all events in GridGain are enabled and therefore generated and stored by
-            whatever event storage SPI is configured. GridGain can and often does generate thousands events per
+            Note that by default all events in Ignite are enabled and therefore generated and stored by
+            whatever event storage SPI is configured. Ignite can and often does generate thousands events per
             seconds under the load and therefore it creates a significant additional load on the system. If
             these events are not needed by the application this load is unnecessary and leads to significant
             performance degradation.
 
             It is highly recommended to enable only those events that your application logic requires by using
             either GridConfiguration.getExcludeEventTypes() orGridConfiguration.getIncludeEventTypes() methods
-            in GridGain configuration. Note that certain events are required for GridGain's internal operations
+            in Ignite configuration. Note that certain events are required for Ignite's internal operations
             and such events will still be generated but not stored by event storage SPI if they are disabled in
-            GridGain configuration.
+            Ignite configuration.
         -->
         <property name="includeEventTypes">
             <list/>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/86ab8e20/modules/core/src/test/config/log4j-test.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/config/log4j-test.xml b/modules/core/src/test/config/log4j-test.xml
index 42e1230..0183c27 100644
--- a/modules/core/src/test/config/log4j-test.xml
+++ b/modules/core/src/test/config/log4j-test.xml
@@ -76,7 +76,7 @@
     </appender>
 
     <!--
-        Uncomment to enable GridGain query execution debugging.
+        Uncomment to enable Ignite query execution debugging.
     -->
     <!--
     <category name="org.apache.ignite.cache.query">

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/86ab8e20/modules/core/src/test/config/spring-cache-load.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/config/spring-cache-load.xml b/modules/core/src/test/config/spring-cache-load.xml
index b9b6173..921129a 100644
--- a/modules/core/src/test/config/spring-cache-load.xml
+++ b/modules/core/src/test/config/spring-cache-load.xml
@@ -18,12 +18,12 @@
   -->
 
 <!--
-    GridGain Spring configuration file to startup grid cache.
+    Ignite Spring configuration file to startup grid cache.
 
-    When starting a standalone GridGain node, you need to execute the following command:
+    When starting a standalone Ignite node, you need to execute the following command:
     {IGNITE_HOME}/bin/ignite.{bat|sh} path-to-this-file/example-cache.xml
 
-    When starting GridGain from Java IDE, pass path to this file into Ignition:
+    When starting Ignite from Java IDE, pass path to this file into Ignition:
     Ignition.start("path-to-this-file/example-benchmark.xml");
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/86ab8e20/modules/core/src/test/config/spring-cache-put-remove-load.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/config/spring-cache-put-remove-load.xml b/modules/core/src/test/config/spring-cache-put-remove-load.xml
index eeaa74e..a546fa3 100644
--- a/modules/core/src/test/config/spring-cache-put-remove-load.xml
+++ b/modules/core/src/test/config/spring-cache-put-remove-load.xml
@@ -18,7 +18,7 @@
   -->
 
 <!--
-    GridGain Spring configuration file to startup grid cache.
+    Ignite Spring configuration file to startup grid cache.
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/86ab8e20/modules/core/src/test/config/spring-cache-swap.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/config/spring-cache-swap.xml b/modules/core/src/test/config/spring-cache-swap.xml
index a18083f..8030f98 100644
--- a/modules/core/src/test/config/spring-cache-swap.xml
+++ b/modules/core/src/test/config/spring-cache-swap.xml
@@ -18,7 +18,7 @@
   -->
 
 <!--
-    GridGain Spring configuration file.
+    Ignite Spring configuration file.
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/86ab8e20/modules/core/src/test/config/spring-cache-teststore.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/config/spring-cache-teststore.xml b/modules/core/src/test/config/spring-cache-teststore.xml
index 3ba7830..ecdd347 100644
--- a/modules/core/src/test/config/spring-cache-teststore.xml
+++ b/modules/core/src/test/config/spring-cache-teststore.xml
@@ -18,7 +18,7 @@
   -->
 
 <!--
-    GridGain Spring configuration file.
+    Ignite Spring configuration file.
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/86ab8e20/modules/core/src/test/config/spring-multicache.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/config/spring-multicache.xml b/modules/core/src/test/config/spring-multicache.xml
index 6f2dc19..3ca6f27 100644
--- a/modules/core/src/test/config/spring-multicache.xml
+++ b/modules/core/src/test/config/spring-multicache.xml
@@ -18,12 +18,12 @@
   -->
 
 <!--
-    GridGain Spring configuration file to startup grid cache.
+    Ignite Spring configuration file to startup grid cache.
 
-    When starting a standalone GridGain node, you need to execute the following command:
+    When starting a standalone Ignite node, you need to execute the following command:
     {IGNITE_HOME}/bin/ignite.{bat|sh} path-to-this-file/example-cache.xml
 
-    When starting GridGain from Java IDE, pass path to this file into Ignition:
+    When starting Ignite from Java IDE, pass path to this file into Ignition:
     Ignition.start("path-to-this-file/example-benchmark.xml");
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/86ab8e20/modules/core/src/test/config/spring-start-nodes-attr.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/config/spring-start-nodes-attr.xml b/modules/core/src/test/config/spring-start-nodes-attr.xml
index 3c18ed0..49d9232 100644
--- a/modules/core/src/test/config/spring-start-nodes-attr.xml
+++ b/modules/core/src/test/config/spring-start-nodes-attr.xml
@@ -18,7 +18,7 @@
   -->
 
 <!--
-    GridGain Spring configuration file.
+    Ignite Spring configuration file.
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/86ab8e20/modules/core/src/test/config/spring-start-nodes.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/config/spring-start-nodes.xml b/modules/core/src/test/config/spring-start-nodes.xml
index 38a6188..2343611 100644
--- a/modules/core/src/test/config/spring-start-nodes.xml
+++ b/modules/core/src/test/config/spring-start-nodes.xml
@@ -18,7 +18,7 @@
   -->
 
 <!--
-    GridGain Spring configuration file.
+    Ignite Spring configuration file.
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/86ab8e20/modules/core/src/test/config/streamer/average/spring-streamer-average-base.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/config/streamer/average/spring-streamer-average-base.xml b/modules/core/src/test/config/streamer/average/spring-streamer-average-base.xml
index 0004ef2..77bd5b1 100644
--- a/modules/core/src/test/config/streamer/average/spring-streamer-average-base.xml
+++ b/modules/core/src/test/config/streamer/average/spring-streamer-average-base.xml
@@ -18,12 +18,12 @@
   -->
 
 <!--
-    GridGain Spring configuration file to startup grid cache.
+    Ignite Spring configuration file to startup grid cache.
 
-    When starting a standalone GridGain node, you need to execute the following command:
+    When starting a standalone Ignite node, you need to execute the following command:
     {IGNITE_HOME}/bin/ignite.{bat|sh} examples/config/example-cache.xml
 
-    When starting GridGain from Java IDE, pass path to this file into Ignition:
+    When starting Ignite from Java IDE, pass path to this file into Ignition:
     Ignition.start("examples/config/example-cache.xml");
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/86ab8e20/modules/core/src/test/config/streamer/average/spring-streamer-average-local.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/config/streamer/average/spring-streamer-average-local.xml b/modules/core/src/test/config/streamer/average/spring-streamer-average-local.xml
index 3f1ce0d..aacc965 100644
--- a/modules/core/src/test/config/streamer/average/spring-streamer-average-local.xml
+++ b/modules/core/src/test/config/streamer/average/spring-streamer-average-local.xml
@@ -18,12 +18,12 @@
   -->
 
 <!--
-    GridGain Spring configuration file to startup grid cache.
+    Ignite Spring configuration file to startup grid cache.
 
-    When starting a standalone GridGain node, you need to execute the following command:
+    When starting a standalone Ignite node, you need to execute the following command:
     {IGNITE_HOME}/bin/ignite.{bat|sh} examples/config/example-cache.xml
 
-    When starting GridGain from Java IDE, pass path to this file into Ignition:
+    When starting Ignite from Java IDE, pass path to this file into Ignition:
     Ignition.start("examples/config/example-cache.xml");
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/86ab8e20/modules/core/src/test/config/streamer/average/spring-streamer-average-random.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/config/streamer/average/spring-streamer-average-random.xml b/modules/core/src/test/config/streamer/average/spring-streamer-average-random.xml
index 946b94a..eadbe15 100644
--- a/modules/core/src/test/config/streamer/average/spring-streamer-average-random.xml
+++ b/modules/core/src/test/config/streamer/average/spring-streamer-average-random.xml
@@ -18,12 +18,12 @@
   -->
 
 <!--
-    GridGain Spring configuration file to startup grid cache.
+    Ignite Spring configuration file to startup grid cache.
 
-    When starting a standalone GridGain node, you need to execute the following command:
+    When starting a standalone Ignite node, you need to execute the following command:
     {IGNITE_HOME}/bin/ignite.{bat|sh} examples/config/example-cache.xml
 
-    When starting GridGain from Java IDE, pass path to this file into Ignition:
+    When starting Ignite from Java IDE, pass path to this file into Ignition:
     Ignition.start("examples/config/example-cache.xml");
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/86ab8e20/modules/core/src/test/config/streamer/spring-streamer-base.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/config/streamer/spring-streamer-base.xml b/modules/core/src/test/config/streamer/spring-streamer-base.xml
index ef5c0c8..0b890c2 100644
--- a/modules/core/src/test/config/streamer/spring-streamer-base.xml
+++ b/modules/core/src/test/config/streamer/spring-streamer-base.xml
@@ -18,12 +18,12 @@
   -->
 
 <!--
-    GridGain Spring configuration file to startup grid cache.
+    Ignite Spring configuration file to startup grid cache.
 
-    When starting a standalone GridGain node, you need to execute the following command:
+    When starting a standalone Ignite node, you need to execute the following command:
     {IGNITE_HOME}/bin/ignite.{bat|sh} examples/config/example-cache.xml
 
-    When starting GridGain from Java IDE, pass path to this file into Ignition:
+    When starting Ignite from Java IDE, pass path to this file into Ignition:
     Ignition.start("examples/config/example-cache.xml");
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/86ab8e20/modules/core/src/test/java/org/apache/ignite/internal/GridNodeVisorAttributesSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridNodeVisorAttributesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridNodeVisorAttributesSelfTest.java
index f1c0ac3..f0288ca 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridNodeVisorAttributesSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridNodeVisorAttributesSelfTest.java
@@ -36,7 +36,7 @@ public class GridNodeVisorAttributesSelfTest extends GridCommonAbstractTest {
         "os.version"
     };
 
-    /** GridGain-specific properties required by Visor. */
+    /** Ignite-specific properties required by Visor. */
     private static final String[] IGNITE_PROPS = new String[] {
         "org.apache.ignite.jvm.pid"
     };

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/86ab8e20/modules/core/src/test/java/org/apache/ignite/internal/GridStartupMain.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridStartupMain.java b/modules/core/src/test/java/org/apache/ignite/internal/GridStartupMain.java
index ae3728a..8ed4149 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridStartupMain.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridStartupMain.java
@@ -22,7 +22,7 @@ import org.apache.ignite.internal.util.typedef.*;
 import javax.swing.*;
 
 /**
- * GridGain startup.
+ * Ignite startup.
  */
 public class GridStartupMain {
     /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/86ab8e20/modules/core/src/test/java/org/apache/ignite/internal/GridStartupTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridStartupTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridStartupTest.java
index 160f0f8..6ac4e79 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridStartupTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridStartupTest.java
@@ -23,7 +23,7 @@ import org.apache.ignite.testframework.junits.common.*;
 import javax.swing.*;
 
 /**
- * GridGain startup.
+ * Ignite startup.
  */
 @SuppressWarnings({"ProhibitedExceptionDeclared"})
 @GridCommonTest(group = "Kernal")

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/86ab8e20/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheMultiNodeDataStructureTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheMultiNodeDataStructureTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheMultiNodeDataStructureTest.java
index a265a51..d4f023a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheMultiNodeDataStructureTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheMultiNodeDataStructureTest.java
@@ -24,7 +24,7 @@ import org.apache.ignite.internal.util.typedef.*;
 
 /**
  * Starts up an node with cache configuration.
- * You can also must start a stand-alone GridGain instance by passing the path
+ * You can also must start a stand-alone Ignite instance by passing the path
  * to configuration file to {@code 'ignite.{sh|bat}'} script, like so:
  * {@code 'ignite.sh examples/config/example-cache.xml'}.
  */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/86ab8e20/modules/core/src/test/java/org/apache/ignite/loadtests/capacity/spring-capacity-cache.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/capacity/spring-capacity-cache.xml b/modules/core/src/test/java/org/apache/ignite/loadtests/capacity/spring-capacity-cache.xml
index 72a6529..26f5a66 100644
--- a/modules/core/src/test/java/org/apache/ignite/loadtests/capacity/spring-capacity-cache.xml
+++ b/modules/core/src/test/java/org/apache/ignite/loadtests/capacity/spring-capacity-cache.xml
@@ -18,12 +18,12 @@
   -->
 
 <!--
-    GridGain Spring configuration file to startup grid cache.
+    Ignite Spring configuration file to startup grid cache.
 
-    When starting a standalone GridGain node, you need to execute the following command:
+    When starting a standalone Ignite node, you need to execute the following command:
     {IGNITE_HOME}/bin/ignite.{bat|sh} path-to-this-file/example-cache.xml
 
-    When starting GridGain from Java IDE, pass path to this file into Ignition:
+    When starting Ignite from Java IDE, pass path to this file into Ignition:
     Ignition.start("path-to-this-file/example-benchmark.xml");
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/86ab8e20/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/spring-colocation.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/spring-colocation.xml b/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/spring-colocation.xml
index 8539abe..231a3bc 100644
--- a/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/spring-colocation.xml
+++ b/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/spring-colocation.xml
@@ -18,12 +18,12 @@
   -->
 
 <!--
-    GridGain Spring configuration file to startup grid cache.
+    Ignite Spring configuration file to startup grid cache.
 
-    When starting a standalone GridGain node, you need to execute the following command:
+    When starting a standalone Ignite node, you need to execute the following command:
     {IGNITE_HOME}/bin/ignite.{bat|sh} path-to-this-file/example-cache.xml
 
-    When starting GridGain from Java IDE, pass path to this file into Ignition:
+    When starting Ignite from Java IDE, pass path to this file into Ignition:
     Ignition.start("path-to-this-file/example-benchmark.xml");
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/86ab8e20/modules/core/src/test/java/org/apache/ignite/loadtests/communication/GridIoManagerBenchmark.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/communication/GridIoManagerBenchmark.java b/modules/core/src/test/java/org/apache/ignite/loadtests/communication/GridIoManagerBenchmark.java
index 7470f27..9013bb8 100644
--- a/modules/core/src/test/java/org/apache/ignite/loadtests/communication/GridIoManagerBenchmark.java
+++ b/modules/core/src/test/java/org/apache/ignite/loadtests/communication/GridIoManagerBenchmark.java
@@ -39,7 +39,7 @@ import static org.apache.ignite.internal.managers.communication.GridIoPolicy.*;
 import static org.apache.ignite.testframework.GridLoadTestUtils.*;
 
 /**
- * By default this benchmarks uses original GridGain configuration
+ * By default this benchmarks uses original Ignite configuration
  * with message dispatching from NIO threads.
  *
  * By changing {@link #DFLT_CONFIG} constant you can use ForkJoin thread pool instead of JDK default.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/86ab8e20/modules/core/src/test/java/org/apache/ignite/loadtests/job/GridJobLoadTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/job/GridJobLoadTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/job/GridJobLoadTest.java
index 6953271..e3c16d6 100644
--- a/modules/core/src/test/java/org/apache/ignite/loadtests/job/GridJobLoadTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/loadtests/job/GridJobLoadTest.java
@@ -162,7 +162,7 @@ public class GridJobLoadTest implements Runnable {
             for (int i = 0; i < srvNodes; i++)
                 startNode("server", SERVER_NODE_CONFIGURATION);
 
-            // Start clients in the second order to cache a client node in GridGain.
+            // Start clients in the second order to cache a client node in Ignite.
             for (int i = 0; i < clientNodes; i++)
                 clientIgnites.add(startNode("client", CLIENT_NODE_CONFIGURATION));
         }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/86ab8e20/modules/core/src/test/java/org/apache/ignite/loadtests/mapper/GridNodeStartup.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/mapper/GridNodeStartup.java b/modules/core/src/test/java/org/apache/ignite/loadtests/mapper/GridNodeStartup.java
index 1fb7d71..928df5c 100644
--- a/modules/core/src/test/java/org/apache/ignite/loadtests/mapper/GridNodeStartup.java
+++ b/modules/core/src/test/java/org/apache/ignite/loadtests/mapper/GridNodeStartup.java
@@ -24,7 +24,7 @@ import javax.swing.*;
 
 /**
  * Starts up an empty node with cache configuration.
- * You can also start a stand-alone GridGain instance by passing the path
+ * You can also start a stand-alone Ignite instance by passing the path
  * to configuration file to {@code 'ignite.{sh|bat}'} script, like so:
  * {@code 'ignite.sh examples/config/example-cache.xml'}.
  * <p>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/86ab8e20/modules/core/src/test/java/org/apache/ignite/startup/GridRandomCommandLineLoader.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/startup/GridRandomCommandLineLoader.java b/modules/core/src/test/java/org/apache/ignite/startup/GridRandomCommandLineLoader.java
index 4fab850..39b2ea4 100644
--- a/modules/core/src/test/java/org/apache/ignite/startup/GridRandomCommandLineLoader.java
+++ b/modules/core/src/test/java/org/apache/ignite/startup/GridRandomCommandLineLoader.java
@@ -40,8 +40,8 @@ import java.util.concurrent.*;
 import static org.apache.ignite.IgniteState.*;
 
 /**
- * This class defines random command-line GridGain loader. This loader can be used
- * to randomly start and stop GridGain from command line for tests. This loader is a Java
+ * This class defines random command-line Ignite loader. This loader can be used
+ * to randomly start and stop Ignite from command line for tests. This loader is a Java
  * application with {@link #main(String[])} method that accepts command line arguments.
  * See below for details.
  */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/86ab8e20/modules/core/src/test/java/org/apache/ignite/startup/servlet/GridServletLoaderTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/startup/servlet/GridServletLoaderTest.java b/modules/core/src/test/java/org/apache/ignite/startup/servlet/GridServletLoaderTest.java
index 55bd5fb..4a75ffe 100644
--- a/modules/core/src/test/java/org/apache/ignite/startup/servlet/GridServletLoaderTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/startup/servlet/GridServletLoaderTest.java
@@ -28,7 +28,7 @@ import java.util.*;
 /**
  * Servlet loader test.
  *
- * 1. Create folder where all GridGain jar files will be placed.
+ * 1. Create folder where all Ignite jar files will be placed.
  * For example: /home/ggdev/apache-tomcat-6.0.14/gridgain
  *
  * 2. Add in {@code $TOMCAT_HOME/conf/catalina.properties} for property {@code common.loader}
@@ -38,7 +38,7 @@ import java.util.*;
  * 3. Add in {@code $TOMCAT_HOME/conf/web.xml}
  *          <pre class="snippet">
  *          &lt;servlet&gt;
- *              &lt;servlet-name&gt;GridGain&lt;/servlet-name&gt;
+ *              &lt;servlet-name&gt;Ignite&lt;/servlet-name&gt;
  *              &lt;servlet-class&gt;org.apache.ignite.loaders.servlet.GridServletLoader&lt;/servlet-class&gt;
  *              &lt;init-param&gt;
  *                  &lt;param-name&gt;cfgFilePath&lt;/param-name&gt;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/86ab8e20/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java b/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java
index e506271..300cdce 100644
--- a/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java
@@ -639,7 +639,7 @@ public final class GridTestUtils {
     }
 
     /**
-     * @return GridGain home.
+     * @return Ignite home.
      * @throws Exception If failed.
      */
     @SuppressWarnings({"ProhibitedExceptionThrown"})

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/86ab8e20/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
index e4f131b..aac0409 100644
--- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
@@ -57,7 +57,7 @@ import static org.apache.ignite.cache.CacheDistributionMode.*;
 import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
 
 /**
- * Common abstract test for GridGain tests.
+ * Common abstract test for Ignite tests.
  */
 @SuppressWarnings({
     "TransientFieldInNonSerializableClass",
@@ -1035,7 +1035,7 @@ public abstract class GridAbstractTest extends TestCase {
     }
 
     /**
-     * @return GridGain home.
+     * @return Ignite home.
      */
     protected String home() {
         return getTestResources().getGridgainHome();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/86ab8e20/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteTestResources.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteTestResources.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteTestResources.java
index 3a271b0..d830c37 100644
--- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteTestResources.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteTestResources.java
@@ -186,7 +186,7 @@ public class IgniteTestResources {
     }
 
     /**
-     * @return GridGain home.
+     * @return Ignite home.
      */
     public String getGridgainHome() {
         return home;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/86ab8e20/modules/core/src/test/java/org/apache/ignite/testframework/junits/logger/GridTestLog4jLogger.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/logger/GridTestLog4jLogger.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/logger/GridTestLog4jLogger.java
index 3777053..e9d5f04 100644
--- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/logger/GridTestLog4jLogger.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/logger/GridTestLog4jLogger.java
@@ -39,7 +39,7 @@ import static org.apache.ignite.IgniteSystemProperties.*;
  * Log4j-based implementation for logging. This logger should be used
  * by loaders that have prefer <a target=_new href="http://logging.apache.org/log4j/docs/">log4j</a>-based logging.
  * <p>
- * Here is a typical example of configuring log4j logger in GridGain configuration file:
+ * Here is a typical example of configuring log4j logger in Ignite configuration file:
  * <pre name="code" class="xml">
  *      &lt;property name="gridLogger"&gt;
  *          &lt;bean class="org.apache.ignite.logger.log4j.GridLog4jLogger"&gt;
@@ -51,7 +51,7 @@ import static org.apache.ignite.IgniteSystemProperties.*;
  * <pre name="code" class="java">
  *      GridConfiguration cfg = new GridConfiguration();
  *      ...
- *      URL xml = U.resolveGridGainUrl("config/custom-log4j.xml");
+ *      URL xml = U.resolveIgniteUrl("config/custom-log4j.xml");
  *      GridLogger log = new GridLog4jLogger(xml);
  *      ...
  *      cfg.setGridLogger(log);
@@ -60,7 +60,7 @@ import static org.apache.ignite.IgniteSystemProperties.*;
  * Please take a look at <a target=_new href="http://logging.apache.org/log4j/1.2/index.html>Apache Log4j 1.2</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/test/java/org/apache/ignite/testsuites/IgniteCacheWriteBehindTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheWriteBehindTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheWriteBehindTestSuite.java
index 0f58aec..452dbf1 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheWriteBehindTestSuite.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheWriteBehindTestSuite.java
@@ -25,7 +25,7 @@ import org.apache.ignite.internal.processors.cache.*;
  */
 public class IgniteCacheWriteBehindTestSuite extends TestSuite {
     /**
-     * @return GridGain Bamboo in-memory data grid test suite.
+     * @return Ignite Bamboo in-memory data grid test suite.
      * @throws Exception Thrown in case of the failure.
      */
     public static TestSuite suite() throws Exception {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/86ab8e20/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteFsTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteFsTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteFsTestSuite.java
index 295d786..27fabb1 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteFsTestSuite.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteFsTestSuite.java
@@ -25,7 +25,7 @@ import org.apache.ignite.internal.util.ipc.*;
 import org.apache.ignite.internal.util.typedef.internal.*;
 
 /**
- * Test suite for Hadoop file system over GridGain cache.
+ * Test suite for Hadoop file system over Ignite cache.
  * Contains platform independent tests only.
  */
 public class IgniteFsTestSuite extends TestSuite {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/86ab8e20/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteUtilSelfTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteUtilSelfTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteUtilSelfTestSuite.java
index 679aabe..8d36413 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteUtilSelfTestSuite.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteUtilSelfTestSuite.java
@@ -31,7 +31,7 @@ import org.apache.ignite.util.*;
 import org.apache.ignite.util.mbeans.*;
 
 /**
- * Test suite for GridGain utility classes.
+ * Test suite for Ignite utility classes.
  */
 public class IgniteUtilSelfTestSuite extends TestSuite {
     /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/86ab8e20/modules/core/src/test/webapp/META-INF/gg-config.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/webapp/META-INF/gg-config.xml b/modules/core/src/test/webapp/META-INF/gg-config.xml
index 4cc14bd..cc108b7 100644
--- a/modules/core/src/test/webapp/META-INF/gg-config.xml
+++ b/modules/core/src/test/webapp/META-INF/gg-config.xml
@@ -18,12 +18,12 @@
   -->
 
 <!--
-    GridGain Spring configuration file to startup grid cache.
+    Ignite Spring configuration file to startup grid cache.
 
-    When starting a standalone GridGain node, you need to execute the following command:
+    When starting a standalone Ignite node, you need to execute the following command:
     {IGNITE_HOME}/bin/ignite.{bat|sh} examples/config/spring-cache.xml
 
-    When starting GridGain from Java IDE, pass path to this file into Ignition:
+    When starting Ignite from Java IDE, pass path to this file into Ignition:
     Ignition.start("examples/config/spring-cache.xml");
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/86ab8e20/modules/hadoop/src/main/java/org/apache/ignite/client/hadoop/GridHadoopClientProtocol.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/client/hadoop/GridHadoopClientProtocol.java b/modules/hadoop/src/main/java/org/apache/ignite/client/hadoop/GridHadoopClientProtocol.java
index 255fc30..cd3cfcd 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/client/hadoop/GridHadoopClientProtocol.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/client/hadoop/GridHadoopClientProtocol.java
@@ -46,13 +46,13 @@ import static org.apache.ignite.internal.processors.hadoop.GridHadoopUtils.*;
  * Hadoop client protocol.
  */
 public class GridHadoopClientProtocol implements ClientProtocol {
-    /** GridGain framework name property. */
+    /** Ignite framework name property. */
     public static final String FRAMEWORK_NAME = "gridgain";
 
     /** Protocol version. */
     private static final long PROTO_VER = 1L;
 
-    /** Default GridGain system directory. */
+    /** Default Ignite system directory. */
     private static final String SYS_DIR = ".gridgain/system";
 
     /** Configuration. */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/86ab8e20/modules/hadoop/src/main/java/org/apache/ignite/fs/hadoop/v1/GridGgfsHadoopFileSystem.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/fs/hadoop/v1/GridGgfsHadoopFileSystem.java b/modules/hadoop/src/main/java/org/apache/ignite/fs/hadoop/v1/GridGgfsHadoopFileSystem.java
index d95f7d1..25dca31 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/fs/hadoop/v1/GridGgfsHadoopFileSystem.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/fs/hadoop/v1/GridGgfsHadoopFileSystem.java
@@ -59,11 +59,11 @@ import static org.apache.ignite.internal.fs.hadoop.GridGgfsHadoopUtils.*;
  *      &lt;value&gt;org.apache.ignite.fs.hadoop.GridGgfsHadoopFileSystem&lt;/value&gt;
  *  &lt;/property&gt;
  * </pre>
- * You should also add GridGain JAR and all libraries to Hadoop classpath. To
+ * You should also add Ignite JAR and all libraries to Hadoop classpath. To
  * do this, add following lines to {@code conf/hadoop-env.sh} script in Hadoop
  * distribution:
  * <pre name="code" class="bash">
- * export IGNITE_HOME=/path/to/GridGain/distribution
+ * export IGNITE_HOME=/path/to/Ignite/distribution
  * export HADOOP_CLASSPATH=$IGNITE_HOME/gridgain*.jar
  *
  * for f in $IGNITE_HOME/libs/*.jar; do
@@ -78,7 +78,7 @@ import static org.apache.ignite.internal.fs.hadoop.GridGgfsHadoopUtils.*;
  * started together with Hadoop {@code task-tracker} processes.
  * <p>
  * For sample client and data node configuration refer to {@code config/hadoop/default-config-client.xml}
- * and {@code config/hadoop/default-config.xml} configuration files in GridGain installation.
+ * and {@code config/hadoop/default-config.xml} configuration files in Ignite installation.
  */
 public class GridGgfsHadoopFileSystem extends FileSystem {
     /** Internal property to indicate management connection. */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/86ab8e20/modules/hadoop/src/main/java/org/apache/ignite/fs/hadoop/v2/GridGgfsHadoopFileSystem.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/fs/hadoop/v2/GridGgfsHadoopFileSystem.java b/modules/hadoop/src/main/java/org/apache/ignite/fs/hadoop/v2/GridGgfsHadoopFileSystem.java
index f239471..2cdcd8a 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/fs/hadoop/v2/GridGgfsHadoopFileSystem.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/fs/hadoop/v2/GridGgfsHadoopFileSystem.java
@@ -59,11 +59,11 @@ import static org.apache.ignite.internal.fs.hadoop.GridGgfsHadoopUtils.*;
  *      &lt;value&gt;org.apache.ignite.fs.hadoop.GridGgfsHadoopFileSystem&lt;/value&gt;
  *  &lt;/property&gt;
  * </pre>
- * You should also add GridGain JAR and all libraries to Hadoop classpath. To
+ * You should also add Ignite JAR and all libraries to Hadoop classpath. To
  * do this, add following lines to {@code conf/hadoop-env.sh} script in Hadoop
  * distribution:
  * <pre name="code" class="bash">
- * export IGNITE_HOME=/path/to/GridGain/distribution
+ * export IGNITE_HOME=/path/to/Ignite/distribution
  * export HADOOP_CLASSPATH=$IGNITE_HOME/gridgain*.jar
  *
  * for f in $IGNITE_HOME/libs/*.jar; do
@@ -78,7 +78,7 @@ import static org.apache.ignite.internal.fs.hadoop.GridGgfsHadoopUtils.*;
  * started together with Hadoop {@code task-tracker} processes.
  * <p>
  * For sample client and data node configuration refer to {@code config/hadoop/default-config-client.xml}
- * and {@code config/hadoop/default-config.xml} configuration files in GridGain installation.
+ * and {@code config/hadoop/default-config.xml} configuration files in Ignite installation.
  */
 public class GridGgfsHadoopFileSystem extends AbstractFileSystem implements Closeable {
     /** Logger. */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/86ab8e20/modules/hadoop/src/main/java/org/apache/ignite/hadoop/GridHadoopSetup.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/hadoop/GridHadoopSetup.java b/modules/hadoop/src/main/java/org/apache/ignite/hadoop/GridHadoopSetup.java
index 0fbfdf7..50b1a54 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/hadoop/GridHadoopSetup.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/hadoop/GridHadoopSetup.java
@@ -62,14 +62,14 @@ public class GridHadoopSetup {
     }
 
     /**
-     * This operation prepares the clean unpacked Hadoop distributive to work as client with GridGain-Hadoop.
+     * This operation prepares the clean unpacked Hadoop distributive to work as client with Ignite-Hadoop.
      * It performs these operations:
      * <ul>
      *     <li>Check for setting of HADOOP_HOME environment variable.</li>
      *     <li>Try to resolve HADOOP_COMMON_HOME or evaluate it relative to HADOOP_HOME.</li>
      *     <li>In Windows check if winutils.exe exists and try to fix issue with some restrictions.</li>
      *     <li>In Windows check new line character issues in CMD scripts.</li>
-     *     <li>Scan Hadoop lib directory to detect GridGain JARs. If these don't exist tries to create ones.</li>
+     *     <li>Scan Hadoop lib directory to detect Ignite JARs. If these don't exist tries to create ones.</li>
      * </ul>
      */
     private static void configureHadoop() {
@@ -288,9 +288,9 @@ public class GridHadoopSetup {
     }
 
     /**
-     * Checks GridGain home.
+     * Checks Ignite home.
      *
-     * @param ggHome GridGain home.
+     * @param ggHome Ignite home.
      */
     private static void checkGridGainHome(String ggHome) {
         URL jarUrl = U.class.getProtectionDomain().getCodeSource().getLocation();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/86ab8e20/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/GridHadoopClassLoader.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/GridHadoopClassLoader.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/GridHadoopClassLoader.java
index 1aa01b5..2916b0a 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/GridHadoopClassLoader.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/GridHadoopClassLoader.java
@@ -68,7 +68,7 @@ public class GridHadoopClassLoader extends URLClassLoader {
     }
 
     /**
-     * Need to parse only GridGain Hadoop and GGFS classes.
+     * Need to parse only Ignite Hadoop and GGFS classes.
      *
      * @param cls Class name.
      * @return {@code true} if we need to check this class.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/86ab8e20/modules/hadoop/src/test/java/org/apache/ignite/hadoop/GridHadoopPopularWordsTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/hadoop/GridHadoopPopularWordsTest.java b/modules/hadoop/src/test/java/org/apache/ignite/hadoop/GridHadoopPopularWordsTest.java
index f44b8e8..26b1c72 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/hadoop/GridHadoopPopularWordsTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/hadoop/GridHadoopPopularWordsTest.java
@@ -45,7 +45,7 @@ import static java.util.Collections.*;
  * path.
  */
 public class GridHadoopPopularWordsTest {
-    /** GridGain home. */
+    /** Ignite home. */
     private static final String IGNITE_HOME = U.getGridGainHome();
 
     /** The path to the input directory. ALl files in that directory will be processed. */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/86ab8e20/modules/hadoop/src/test/java/org/apache/ignite/testsuites/IgniteFsLinuxAndMacOSTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/testsuites/IgniteFsLinuxAndMacOSTestSuite.java b/modules/hadoop/src/test/java/org/apache/ignite/testsuites/IgniteFsLinuxAndMacOSTestSuite.java
index 640932d..4383a2c 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/testsuites/IgniteFsLinuxAndMacOSTestSuite.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/testsuites/IgniteFsLinuxAndMacOSTestSuite.java
@@ -25,7 +25,7 @@ import org.apache.ignite.internal.processors.hadoop.*;
 import static org.apache.ignite.testsuites.IgniteHadoopTestSuite.*;
 
 /**
- * Test suite for Hadoop file system over GridGain cache.
+ * Test suite for Hadoop file system over Ignite cache.
  * Contains tests which works on Linux and Mac OS platform only.
  */
 public class IgniteFsLinuxAndMacOSTestSuite extends TestSuite {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/86ab8e20/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateCollectionRegion.java
----------------------------------------------------------------------
diff --git a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateCollectionRegion.java b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateCollectionRegion.java
index 6935f45..6a249da 100644
--- a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateCollectionRegion.java
+++ b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateCollectionRegion.java
@@ -32,7 +32,7 @@ import org.hibernate.cache.spi.access.*;
  *     &lt;!-- Enable L2 cache. --&gt;
  *     &lt;property name="cache.use_second_level_cache"&gt;true&lt;/property&gt;
  *
- *     &lt;!-- Use GridGain as L2 cache provider. --&gt;
+ *     &lt;!-- Use Ignite as L2 cache provider. --&gt;
  *     &lt;property name="cache.region.factory_class"&gt;org.apache.ignite.cache.hibernate.GridHibernateRegionFactory&lt;/property&gt;
  *
  *     &lt;!-- Specify entities. --&gt;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/86ab8e20/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateEntityRegion.java
----------------------------------------------------------------------
diff --git a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateEntityRegion.java b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateEntityRegion.java
index 1892931..76a5ecd 100644
--- a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateEntityRegion.java
+++ b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateEntityRegion.java
@@ -32,7 +32,7 @@ import org.hibernate.cache.spi.access.*;
  *     &lt;!-- Enable L2 cache. --&gt;
  *     &lt;property name="cache.use_second_level_cache"&gt;true&lt;/property&gt;
  *
- *     &lt;!-- Use GridGain as L2 cache provider. --&gt;
+ *     &lt;!-- Use Ignite as L2 cache provider. --&gt;
  *     &lt;property name="cache.region.factory_class"&gt;org.apache.ignite.cache.hibernate.GridHibernateRegionFactory&lt;/property&gt;
  *
  *     &lt;!-- Specify entity. --&gt;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/86ab8e20/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateNonStrictAccessStrategy.java
----------------------------------------------------------------------
diff --git a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateNonStrictAccessStrategy.java b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateNonStrictAccessStrategy.java
index 1ae2555..e2a8989 100644
--- a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateNonStrictAccessStrategy.java
+++ b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateNonStrictAccessStrategy.java
@@ -37,7 +37,7 @@ import java.util.*;
  *     &lt;!-- Enable L2 cache. --&gt;
  *     &lt;property name="cache.use_second_level_cache"&gt;true&lt;/property&gt;
  *
- *     &lt;!-- Use GridGain as L2 cache provider. --&gt;
+ *     &lt;!-- Use Ignite as L2 cache provider. --&gt;
  *     &lt;property name="cache.region.factory_class"&gt;org.apache.ignite.cache.hibernate.GridHibernateRegionFactory&lt;/property&gt;
  *
  *     &lt;!-- Specify entity. --&gt;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/86ab8e20/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateQueryResultsRegion.java
----------------------------------------------------------------------
diff --git a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateQueryResultsRegion.java b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateQueryResultsRegion.java
index 6a473fd..af781a4 100644
--- a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateQueryResultsRegion.java
+++ b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateQueryResultsRegion.java
@@ -34,7 +34,7 @@ import org.hibernate.cache.spi.*;
  *     &lt;!-- Enable query cache. --&gt;
  *     &lt;property name="cache.use_second_level_cache"&gt;true&lt;/property&gt;
 
- *     &lt;!-- Use GridGain as L2 cache provider. --&gt;
+ *     &lt;!-- Use Ignite as L2 cache provider. --&gt;
  *     &lt;property name="cache.region.factory_class"&gt;org.apache.ignite.cache.hibernate.GridHibernateRegionFactory&lt;/property&gt;
  *
  *     &lt;!-- Specify entity. --&gt;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/86ab8e20/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateReadOnlyAccessStrategy.java
----------------------------------------------------------------------
diff --git a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateReadOnlyAccessStrategy.java b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateReadOnlyAccessStrategy.java
index 930bd7c..8d253de 100644
--- a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateReadOnlyAccessStrategy.java
+++ b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateReadOnlyAccessStrategy.java
@@ -33,7 +33,7 @@ import org.jetbrains.annotations.*;
  *     &lt;!-- Enable L2 cache. --&gt;
  *     &lt;property name="cache.use_second_level_cache"&gt;true&lt;/property&gt;
  *
- *     &lt;!-- Use GridGain as L2 cache provider. --&gt;
+ *     &lt;!-- Use Ignite as L2 cache provider. --&gt;
  *     &lt;property name="cache.region.factory_class"&gt;org.apache.ignite.cache.hibernate.GridHibernateRegionFactory&lt;/property&gt;
  *
  *     &lt;!-- Specify entity. --&gt;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/86ab8e20/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateReadWriteAccessStrategy.java
----------------------------------------------------------------------
diff --git a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateReadWriteAccessStrategy.java b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateReadWriteAccessStrategy.java
index 2e11949..b764b5d 100644
--- a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateReadWriteAccessStrategy.java
+++ b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateReadWriteAccessStrategy.java
@@ -39,7 +39,7 @@ import static org.apache.ignite.transactions.IgniteTxIsolation.*;
  *     &lt;!-- Enable L2 cache. --&gt;
  *     &lt;property name="cache.use_second_level_cache"&gt;true&lt;/property&gt;
  *
- *     &lt;!-- Use GridGain as L2 cache provider. --&gt;
+ *     &lt;!-- Use Ignite as L2 cache provider. --&gt;
  *     &lt;property name="cache.region.factory_class"&gt;org.apache.ignite.cache.hibernate.GridHibernateRegionFactory&lt;/property&gt;
  *
  *     &lt;!-- Specify entity. --&gt;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/86ab8e20/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateRegionFactory.java
----------------------------------------------------------------------
diff --git a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateRegionFactory.java b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateRegionFactory.java
index e1c164d..1218d6c 100644
--- a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateRegionFactory.java
+++ b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateRegionFactory.java
@@ -39,8 +39,8 @@ import static org.hibernate.cache.spi.access.AccessType.*;
  * hibernate.cache.use_second_level_cache=true
  * hibernate.cache.region.factory_class=org.apache.ignite.cache.hibernate.GridHibernateRegionFactory
  * </pre>
- * Note that before region factory is started you need to start properly configured GridGain node in the same JVM.
- * For example to start GridGain node one of loader provided in {@code org.gridgain.grid.startup} package can be used.
+ * Note that before region factory is started you need to start properly configured Ignite node in the same JVM.
+ * For example to start Ignite node one of loader provided in {@code org.gridgain.grid.startup} package can be used.
  * <p>
  * Name of grid to be used for region factory must be specified as following Hibernate property:
  * <pre name="code" class="brush: xml; gutter: false;">

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/86ab8e20/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateTransactionalAccessStrategy.java
----------------------------------------------------------------------
diff --git a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateTransactionalAccessStrategy.java b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateTransactionalAccessStrategy.java
index a498db9..45c101c 100644
--- a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateTransactionalAccessStrategy.java
+++ b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateTransactionalAccessStrategy.java
@@ -36,7 +36,7 @@ import org.jetbrains.annotations.*;
  *     &lt;!-- Enable L2 cache. --&gt;
  *     &lt;property name="cache.use_second_level_cache"&gt;true&lt;/property&gt;
  *
- *     &lt;!-- Use GridGain as L2 cache provider. --&gt;
+ *     &lt;!-- Use Ignite as L2 cache provider. --&gt;
  *     &lt;property name="cache.region.factory_class"&gt;org.apache.ignite.cache.hibernate.GridHibernateRegionFactory&lt;/property&gt;
  *
  *     &lt;!-- Specify entity. --&gt;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/86ab8e20/modules/jcl/src/main/java/org/apache/ignite/logger/jcl/IgniteJclLogger.java
----------------------------------------------------------------------
diff --git a/modules/jcl/src/main/java/org/apache/ignite/logger/jcl/IgniteJclLogger.java b/modules/jcl/src/main/java/org/apache/ignite/logger/jcl/IgniteJclLogger.java
index 3e2ea2a..2d6629f 100644
--- a/modules/jcl/src/main/java/org/apache/ignite/logger/jcl/IgniteJclLogger.java
+++ b/modules/jcl/src/main/java/org/apache/ignite/logger/jcl/IgniteJclLogger.java
@@ -26,7 +26,7 @@ import org.jetbrains.annotations.*;
  * loggers. Implementation simply delegates to underlying JCL logger. This logger
  * should be used by loaders that have JCL-based internal logging (e.g., Websphere).
  * <p>
- * Here is an example of configuring JCL logger in GridGain configuration Spring
+ * Here is an example of configuring JCL 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">
@@ -50,7 +50,7 @@ import org.jetbrains.annotations.*;
  *      &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();
  *      ...
@@ -68,7 +68,7 @@ import org.jetbrains.annotations.*;
  * </pre>
  *
  * <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/log4j/src/main/java/org/apache/ignite/logger/log4j/IgniteLog4jLogger.java
----------------------------------------------------------------------
diff --git a/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/IgniteLog4jLogger.java b/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/IgniteLog4jLogger.java
index 7deb111..2c867b8 100644
--- a/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/IgniteLog4jLogger.java
+++ b/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/IgniteLog4jLogger.java
@@ -39,7 +39,7 @@ import static org.apache.ignite.IgniteSystemProperties.*;
  * Log4j-based implementation for logging. This logger should be used
  * by loaders that have prefer <a target=_new href="http://logging.apache.org/log4j/docs/">log4j</a>-based logging.
  * <p>
- * Here is a typical example of configuring log4j logger in GridGain configuration file:
+ * Here is a typical example of configuring log4j logger in Ignite configuration file:
  * <pre name="code" class="xml">
  *      &lt;property name="gridLogger"&gt;
  *          &lt;bean class="org.gridgain.grid.logger.log4j.GridLog4jLogger"&gt;
@@ -60,7 +60,7 @@ import static org.apache.ignite.IgniteSystemProperties.*;
  * Please take a look at <a target=_new href="http://logging.apache.org/log4j/1.2/index.html">Apache Log4j 1.2</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/scalar/src/main/scala/org/apache/ignite/scalar/ScalarConversions.scala
----------------------------------------------------------------------
diff --git a/modules/scalar/src/main/scala/org/apache/ignite/scalar/ScalarConversions.scala b/modules/scalar/src/main/scala/org/apache/ignite/scalar/ScalarConversions.scala
index 0a6f06b..5ab8ef7 100644
--- a/modules/scalar/src/main/scala/org/apache/ignite/scalar/ScalarConversions.scala
+++ b/modules/scalar/src/main/scala/org/apache/ignite/scalar/ScalarConversions.scala
@@ -36,7 +36,7 @@ import scala.util.control.Breaks._
 /**
  * ==Overview==
  * Mixin for `scalar` object providing `implicit` and `explicit` conversions between
- * Java and Scala GridGain components.
+ * Java and Scala Ignite components.
  *
  * It is very important to review this class as it defines what `implicit` conversions
  * will take place when using Scalar. Note that object `scalar` mixes in this

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/86ab8e20/modules/scalar/src/main/scala/org/apache/ignite/scalar/pimps/Packet.scala
----------------------------------------------------------------------
diff --git a/modules/scalar/src/main/scala/org/apache/ignite/scalar/pimps/Packet.scala b/modules/scalar/src/main/scala/org/apache/ignite/scalar/pimps/Packet.scala
index 997b15c..0dc99b6 100644
--- a/modules/scalar/src/main/scala/org/apache/ignite/scalar/pimps/Packet.scala
+++ b/modules/scalar/src/main/scala/org/apache/ignite/scalar/pimps/Packet.scala
@@ -18,6 +18,6 @@
 package org.apache.ignite.scalar
 
 /**
- * Contains Scala "Pimp" implementations for main GridGain entities.
+ * Contains Scala "Pimp" implementations for main Ignite entities.
  */
 package object pimps

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/86ab8e20/modules/scalar/src/main/scala/org/apache/ignite/scalar/pimps/ScalarCachePimp.scala
----------------------------------------------------------------------
diff --git a/modules/scalar/src/main/scala/org/apache/ignite/scalar/pimps/ScalarCachePimp.scala b/modules/scalar/src/main/scala/org/apache/ignite/scalar/pimps/ScalarCachePimp.scala
index a790a29..de38166 100644
--- a/modules/scalar/src/main/scala/org/apache/ignite/scalar/pimps/ScalarCachePimp.scala
+++ b/modules/scalar/src/main/scala/org/apache/ignite/scalar/pimps/ScalarCachePimp.scala
@@ -30,7 +30,7 @@ import org.apache.ignite.cache.GridCache
  * Scalar's pimp and replace the original call with a call on that pimp.
  *
  * Note that Scalar provide extensive library of implicit conversion between Java and
- * Scala GridGain counterparts in `ScalarConversions` object
+ * Scala Ignite counterparts in `ScalarConversions` object
  *
  * ==Suffix '$' In Names==
  * Symbol `$` is used in names when they conflict with the names in the base Java class

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/86ab8e20/modules/scalar/src/main/scala/org/apache/ignite/scalar/pimps/ScalarCacheProjectionPimp.scala
----------------------------------------------------------------------
diff --git a/modules/scalar/src/main/scala/org/apache/ignite/scalar/pimps/ScalarCacheProjectionPimp.scala b/modules/scalar/src/main/scala/org/apache/ignite/scalar/pimps/ScalarCacheProjectionPimp.scala
index c92a984..50cdb92 100644
--- a/modules/scalar/src/main/scala/org/apache/ignite/scalar/pimps/ScalarCacheProjectionPimp.scala
+++ b/modules/scalar/src/main/scala/org/apache/ignite/scalar/pimps/ScalarCacheProjectionPimp.scala
@@ -60,7 +60,7 @@ object ScalarCacheProjectionPimp {
  * Scalar's pimp and replace the original call with a call on that pimp.
  *
  * Note that Scalar provide extensive library of implicit conversion between Java and
- * Scala GridGain counterparts in `ScalarConversions` object
+ * Scala Ignite counterparts in `ScalarConversions` object
  *
  * ==Suffix '$' In Names==
  * Symbol `$` is used in names when they conflict with the names in the base Java class
@@ -89,7 +89,7 @@ class ScalarCacheProjectionPimp[@specialized K, @specialized V] extends PimpedTy
         toScalaSeq(value.iterator).iterator
 
     /**
-     * Unwraps sequence of functions to sequence of GridGain predicates.
+     * Unwraps sequence of functions to sequence of Ignite predicates.
      */
     private def unwrap(@Nullable p: Seq[EntryPred]): Seq[IgnitePredicate[CacheEntry[K, V]]] =
         if (p == null)

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/86ab8e20/modules/scalar/src/main/scala/org/apache/ignite/scalar/pimps/ScalarGridPimp.scala
----------------------------------------------------------------------
diff --git a/modules/scalar/src/main/scala/org/apache/ignite/scalar/pimps/ScalarGridPimp.scala b/modules/scalar/src/main/scala/org/apache/ignite/scalar/pimps/ScalarGridPimp.scala
index f61266d..0f1dfaf 100644
--- a/modules/scalar/src/main/scala/org/apache/ignite/scalar/pimps/ScalarGridPimp.scala
+++ b/modules/scalar/src/main/scala/org/apache/ignite/scalar/pimps/ScalarGridPimp.scala
@@ -53,7 +53,7 @@ object ScalarGridPimp {
  * Scalar's pimp and replace the original call with a call on that pimp.
  *
  * Note that Scalar provide extensive library of implicit conversion between Java and
- * Scala GridGain counterparts in `ScalarConversions` object
+ * Scala Ignite counterparts in `ScalarConversions` object
  *
  * ==Suffix '$' In Names==
  * Symbol `$` is used in names when they conflict with the names in the base Java class

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/86ab8e20/modules/scalar/src/main/scala/org/apache/ignite/scalar/pimps/ScalarProjectionPimp.scala
----------------------------------------------------------------------
diff --git a/modules/scalar/src/main/scala/org/apache/ignite/scalar/pimps/ScalarProjectionPimp.scala b/modules/scalar/src/main/scala/org/apache/ignite/scalar/pimps/ScalarProjectionPimp.scala
index e645f75..c7fa9fe 100644
--- a/modules/scalar/src/main/scala/org/apache/ignite/scalar/pimps/ScalarProjectionPimp.scala
+++ b/modules/scalar/src/main/scala/org/apache/ignite/scalar/pimps/ScalarProjectionPimp.scala
@@ -53,7 +53,7 @@ object ScalarProjectionPimp {
  * Scalar's pimp and replace the original call with a call on that pimp.
  *
  * Note that Scalar provide extensive library of implicit conversion between Java and
- * Scala GridGain counterparts in `ScalarConversions` object
+ * Scala Ignite counterparts in `ScalarConversions` object
  *
  * ==Suffix '$' In Names==
  * Symbol `$` is used in names when they conflict with the names in the base Java class
@@ -586,7 +586,7 @@ class ScalarProjectionPimp[A <: ClusterGroup] extends PimpedType[A] with Iterabl
      * be serializable. Other marshallers, e.g. JBoss marshaller, may not have this limitation. Please consult
      * with specific marshaller implementation for the details. Note that all closures and predicates in
      * `org.apache.ignite.lang` package are serializable and can be freely used in the distributed
-     * context with all marshallers currently shipped with GridGain.
+     * context with all marshallers currently shipped with Ignite.
      *
      * @param cacheName Name of the cache to use for affinity co-location.
      * @param affKey Affinity key.
@@ -620,9 +620,9 @@ class ScalarProjectionPimp[A <: ClusterGroup] extends PimpedType[A] with Iterabl
      *
      * Note that class `GridAbsClosure` implements `Runnable` and class `GridOutClosure`
      * implements `Callable` interface. Note also that class `GridFunc` and typedefs provide rich
-     * APIs and functionality for closures and predicates based processing in GridGain. While Java interfaces
+     * APIs and functionality for closures and predicates based processing in Ignite. While Java interfaces
      * `Runnable` and `Callable` allow for lowest common denominator for APIs - it is advisable
-     * to use richer Functional Programming support provided by GridGain available in `org.apache.ignite.lang`
+     * to use richer Functional Programming support provided by Ignite available in `org.apache.ignite.lang`
      * package.
      *
      * Notice that `Runnable` and `Callable` implementations must support serialization as required
@@ -630,7 +630,7 @@ class ScalarProjectionPimp[A <: ClusterGroup] extends PimpedType[A] with Iterabl
      * be serializable. Other marshallers, e.g. JBoss marshaller, may not have this limitation. Please consult
      * with specific marshaller implementation for the details. Note that all closures and predicates in
      * `org.apache.ignite.lang` package are serializable and can be freely used in the distributed
-     * context with all marshallers currently shipped with GridGain.
+     * context with all marshallers currently shipped with Ignite.
      *
      * @param cacheName Name of the cache to use for affinity co-location.
      * @param affKey Affinity key.


Mime
View raw message