ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [29/51] [abbrv] incubator-ignite git commit: #ignite-106: Remove "grid" from comments in examples.
Date Wed, 04 Feb 2015 12:34:24 GMT
#ignite-106: Remove "grid" from comments in examples.


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/358a5bc9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/358a5bc9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/358a5bc9

Branch: refs/heads/ignite-164
Commit: 358a5bc9135814e50fa4c577f3271bc08c3b57c6
Parents: 57da35e
Author: ivasilinets <vasilinetc.ira@gmail.com>
Authored: Wed Feb 4 02:02:49 2015 +0300
Committer: ivasilinets <vasilinetc.ira@gmail.com>
Committed: Wed Feb 4 02:02:49 2015 +0300

----------------------------------------------------------------------
 examples/config/example-cache.xml                         |  2 +-
 examples/config/example-compute.xml                       |  4 ++--
 examples/config/example-streamer.xml                      | 10 +++++-----
 .../ignite/examples/compute/ComputeTaskMapExample.java    |  8 ++++----
 .../datagrid/datastructures/CacheAtomicLongExample.java   |  4 ++--
 .../datagrid/hibernate/HibernateL2CacheExample.java       |  4 ++--
 .../hibernate/HibernateL2CacheExampleNodeStartup.java     |  4 ++--
 .../datagrid/starschema/CacheStarSchemaExample.java       |  2 +-
 .../datagrid/store/CacheStoreLoadDataExample.java         |  2 +-
 .../ignite/examples/messaging/MessagingExample.java       |  4 ++--
 .../client/memcache/MemcacheRestExampleNodeStartup.java   |  4 ++--
 .../examples/misc/deployment/DeploymentExample.java       |  6 +++---
 .../examples/misc/springbean/SpringBeanExample.java       |  4 ++--
 .../org/apache/ignite/examples/MessagingExample.java      | 10 +++++-----
 .../examples/ScalarCacheAffinitySimpleExample.scala       |  2 +-
 .../ignite/scalar/examples/ScalarCacheExample.scala       |  2 +-
 .../examples/ScalarCachePopularNumbersExample.scala       |  4 ++--
 .../scalar/examples/ScalarContinuationExample.scala       |  8 ++++----
 .../ignite/scalar/examples/ScalarCreditRiskExample.scala  |  8 ++++----
 .../ignite/scalar/examples/ScalarJvmCloudExample.scala    |  8 ++++----
 .../scalar/examples/ScalarPiCalculationExample.scala      |  2 +-
 .../ignite/scalar/examples/ScalarPingPongExample.scala    |  2 +-
 .../ignite/scalar/examples/ScalarPrimeExample.scala       |  2 +-
 .../scalar/examples/ScalarSnowflakeSchemaExample.scala    |  2 +-
 .../apache/ignite/scalar/examples/ScalarTaskExample.scala |  4 ++--
 .../ContinuousMapperExamplesMultiNodeSelfTest.java        |  2 +-
 .../ignite/examples/ContinuousMapperExamplesSelfTest.java |  2 +-
 .../apache/ignite/examples/LifecycleExamplesSelfTest.java |  2 +-
 .../examples/MemcacheRestExamplesMultiNodeSelfTest.java   |  2 +-
 .../ignite/examples/MemcacheRestExamplesSelfTest.java     |  2 +-
 .../examples/MonteCarloExamplesMultiNodeSelfTest.java     |  2 +-
 .../ignite/examples/MonteCarloExamplesSelfTest.java       |  2 +-
 .../ignite/testsuites/IgniteExamplesSelfTestSuite.java    |  2 +-
 33 files changed, 64 insertions(+), 64 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/358a5bc9/examples/config/example-cache.xml
----------------------------------------------------------------------
diff --git a/examples/config/example-cache.xml b/examples/config/example-cache.xml
index ec02084..1264f2f 100644
--- a/examples/config/example-cache.xml
+++ b/examples/config/example-cache.xml
@@ -35,7 +35,7 @@
         http://www.springframework.org/schema/util
         http://www.springframework.org/schema/util/spring-util.xsd">
     <bean id="grid.cfg" class="org.apache.ignite.configuration.IgniteConfiguration">
-        <!-- Set to true to enable grid-aware class loading for examples, default is false.
-->
+        <!-- Set to true to enable distributed class loading for examples, default is
false. -->
         <property name="peerClassLoadingEnabled" value="true"/>
 
         <property name="marshaller">

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/358a5bc9/examples/config/example-compute.xml
----------------------------------------------------------------------
diff --git a/examples/config/example-compute.xml b/examples/config/example-compute.xml
index 420ccdf..b60c2c4 100644
--- a/examples/config/example-compute.xml
+++ b/examples/config/example-compute.xml
@@ -18,7 +18,7 @@
   -->
 
 <!--
-    Grid configuration with all defaults and enabled p2p deployment and enabled events.
+    Ignite configuration with all defaults and enabled p2p deployment and enabled events.
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -29,7 +29,7 @@
         http://www.springframework.org/schema/util
         http://www.springframework.org/schema/util/spring-util.xsd">
     <bean id="grid.cfg" class="org.apache.ignite.configuration.IgniteConfiguration">
-        <!-- Set to true to enable grid-aware class loading for examples, default is false.
-->
+        <!-- Set to true to enable distributed class loading for examples, default is
false. -->
         <property name="peerClassLoadingEnabled" value="true"/>
 
         <property name="marshaller">

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/358a5bc9/examples/config/example-streamer.xml
----------------------------------------------------------------------
diff --git a/examples/config/example-streamer.xml b/examples/config/example-streamer.xml
index 1789fad..d519904 100644
--- a/examples/config/example-streamer.xml
+++ b/examples/config/example-streamer.xml
@@ -60,7 +60,7 @@
             -->
             <list>
                 <!--
-                    Streamer for GridStreamingRunningAverageExample.
+                    Streamer for StreamingRunningAverageExample.
                 -->
                 <bean class="org.apache.ignite.streamer.StreamerConfiguration">
                     <property name="name" value="running-average"/>
@@ -88,7 +88,7 @@
                         -->
                         <bean class="org.apache.ignite.streamer.router.StreamerRandomEventRouter"/>
                         <!--
-                        <bean class="org.apache.ignite.streamer.router.GridStreamerLocalEventRouter"/>
+                        <bean class="org.apache.ignite.streamer.router.StreamerLocalEventRouter"/>
                         -->
                     </property>
 
@@ -103,7 +103,7 @@
                 </bean>
 
                 <!--
-                    Streamer for GridStreamingPopularNumbersExample.
+                    Streamer for StreamingPopularNumbersExample.
                 -->
                 <bean class="org.apache.ignite.streamer.StreamerConfiguration">
                     <property name="name" value="popular-numbers"/>
@@ -158,7 +158,7 @@
                 </bean>
 
                 <!--
-                    Streamer for GridStreamingOpenHighLowCloseExample.
+                    Streamer for StreamingOpenHighLowCloseExample.
                 -->
                 <bean class="org.apache.ignite.streamer.StreamerConfiguration">
                     <property name="name" value="priceBars"/>
@@ -206,7 +206,7 @@
                 </bean>
 
                 <!--
-                    Streamer for GridStreamingCheckInExample.
+                    Streamer for StreamingCheckInExample.
                 -->
                 <bean class="org.apache.ignite.streamer.StreamerConfiguration">
                     <property name="name" value="check-in"/>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/358a5bc9/examples/src/main/java/org/apache/ignite/examples/compute/ComputeTaskMapExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/compute/ComputeTaskMapExample.java
b/examples/src/main/java/org/apache/ignite/examples/compute/ComputeTaskMapExample.java
index a4ef155..df67513 100644
--- a/examples/src/main/java/org/apache/ignite/examples/compute/ComputeTaskMapExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/compute/ComputeTaskMapExample.java
@@ -68,21 +68,21 @@ public class ComputeTaskMapExample {
          * Splits the received string to words, creates a child job for each word, and sends
          * these jobs to other nodes for processing. Each such job simply prints out the
received word.
          *
-         * @param subgrid Nodes available for this task execution.
+         * @param nodes Nodes available for this task execution.
          * @param arg String to split into words for processing.
          * @return Map of jobs to nodes.
          */
-        @Override public Map<? extends ComputeJob, ClusterNode> map(List<ClusterNode>
subgrid, String arg) {
+        @Override public Map<? extends ComputeJob, ClusterNode> map(List<ClusterNode>
nodes, String arg) {
             String[] words = arg.split(" ");
 
             Map<ComputeJob, ClusterNode> map = new HashMap<>();
 
-            Iterator<ClusterNode> it = subgrid.iterator();
+            Iterator<ClusterNode> it = nodes.iterator();
 
             for (final String word : arg.split(" ")) {
                 // If we used all nodes, restart the iterator.
                 if (!it.hasNext())
-                    it = subgrid.iterator();
+                    it = nodes.iterator();
 
                 ClusterNode node = it.next();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/358a5bc9/examples/src/main/java/org/apache/ignite/examples/datagrid/datastructures/CacheAtomicLongExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/datastructures/CacheAtomicLongExample.java
b/examples/src/main/java/org/apache/ignite/examples/datagrid/datastructures/CacheAtomicLongExample.java
index a4d1cee..fc657f1 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datagrid/datastructures/CacheAtomicLongExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/datastructures/CacheAtomicLongExample.java
@@ -60,8 +60,8 @@ public final class CacheAtomicLongExample {
             System.out.println();
             System.out.println("Atomic long initial value : " + atomicLong.get() + '.');
 
-            // Try increment atomic long from all grid nodes.
-            // Note that this node is also part of the grid.
+            // Try increment atomic long from all nodes.
+            // Note that this node is also part of the ignite cluster.
             ignite.compute(ignite.cluster().forCacheNodes(CACHE_NAME)).call(new IgniteCallable<Object>()
{
                 @Override public Object call() throws  Exception {
                     for (int i = 0; i < RETRIES; i++)

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/358a5bc9/examples/src/main/java/org/apache/ignite/examples/datagrid/hibernate/HibernateL2CacheExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/hibernate/HibernateL2CacheExample.java
b/examples/src/main/java/org/apache/ignite/examples/datagrid/hibernate/HibernateL2CacheExample.java
index 36370b9..7ba7ea1 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datagrid/hibernate/HibernateL2CacheExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/hibernate/HibernateL2CacheExample.java
@@ -29,7 +29,7 @@ import java.net.*;
 import java.util.*;
 
 /**
- * This example demonstrates the use of Ignite In-Memory Data Grid as a Hibernate
+ * This example demonstrates the use of Ignite In-Memory Data Ignite cluster as a Hibernate
  * Second-Level cache provider.
  * <p>
  * The Hibernate Second-Level cache (or "L2 cache" shortly) lets you significantly
@@ -49,7 +49,7 @@ import java.util.*;
  * When running example, it's easy to notice that when an object is first
  * put into a database, the L2 cache is not used and it's contents is empty.
  * However, when an object is first read from the database, it is immediately
- * stored in L2 cache (which is Ignite In-Memory Data Grid in fact), which can
+ * stored in L2 cache (which is Ignite In-Memory Data Ignite cluster in fact), which can
  * be seen in stats output. Further requests of the same object only read the data
  * from L2 cache and do not hit the database.
  * <p>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/358a5bc9/examples/src/main/java/org/apache/ignite/examples/datagrid/hibernate/HibernateL2CacheExampleNodeStartup.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/hibernate/HibernateL2CacheExampleNodeStartup.java
b/examples/src/main/java/org/apache/ignite/examples/datagrid/hibernate/HibernateL2CacheExampleNodeStartup.java
index c4daa8b..8ebba72 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datagrid/hibernate/HibernateL2CacheExampleNodeStartup.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/hibernate/HibernateL2CacheExampleNodeStartup.java
@@ -44,9 +44,9 @@ public class HibernateL2CacheExampleNodeStartup {
     }
 
     /**
-     * Create Grid configuration with IgniteFs and enabled IPC.
+     * Create Ignite configuration with IgniteFs and enabled IPC.
      *
-     * @return Grid configuration.
+     * @return Ignite configuration.
      * @throws IgniteException If configuration creation failed.
      */
     public static IgniteConfiguration configuration() throws IgniteException {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/358a5bc9/examples/src/main/java/org/apache/ignite/examples/datagrid/starschema/CacheStarSchemaExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/starschema/CacheStarSchemaExample.java
b/examples/src/main/java/org/apache/ignite/examples/datagrid/starschema/CacheStarSchemaExample.java
index dbd4a65..1df3368 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datagrid/starschema/CacheStarSchemaExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/starschema/CacheStarSchemaExample.java
@@ -35,7 +35,7 @@ import java.util.concurrent.*;
  * such architecture is supported via cross-cache queries. By storing <i>dimensions</i>
in
  * {@link org.apache.ignite.cache.CacheMode#REPLICATED REPLICATED} caches and <i>facts</i>
in much larger
  * {@link org.apache.ignite.cache.CacheMode#PARTITIONED PARTITIONED} caches you can freely
execute distributed joins across
- * your whole in-memory data grid, thus querying your in memory data without any limitations.
+ * your whole in-memory data ignite cluster, thus querying your in memory data without any
limitations.
  * <p>
  * In this example we have two <i>dimensions</i>, {@link DimProduct} and {@link
DimStore} and
  * one <i>fact</i> - {@link FactPurchase}. Queries are executed by joining dimensions
and facts

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/358a5bc9/examples/src/main/java/org/apache/ignite/examples/datagrid/store/CacheStoreLoadDataExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/CacheStoreLoadDataExample.java
b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/CacheStoreLoadDataExample.java
index 9e2fb62..7bc7133 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/CacheStoreLoadDataExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/CacheStoreLoadDataExample.java
@@ -23,7 +23,7 @@ import org.apache.ignite.lang.*;
 
 /**
  * Loads data from persistent store at cache startup by calling
- * {@link org.apache.ignite.cache.GridCache#loadCache(org.apache.ignite.lang.IgniteBiPredicate,
long, Object...)} method on
+ * {@link IgniteCache#loadCache(IgniteBiPredicate, Object...)} method on
  * all nodes.
  * <p>
  * Remote nodes should always be started using {@link CacheNodeWithStoreStartup}.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/358a5bc9/examples/src/main/java/org/apache/ignite/examples/messaging/MessagingExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/messaging/MessagingExample.java
b/examples/src/main/java/org/apache/ignite/examples/messaging/MessagingExample.java
index 6dd930e..e02853a 100644
--- a/examples/src/main/java/org/apache/ignite/examples/messaging/MessagingExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/messaging/MessagingExample.java
@@ -98,7 +98,7 @@ public final class MessagingExample {
     /**
      * Start listening to messages on all cluster nodes within passed in projection.
      *
-     * @param msg Grid messaging.
+     * @param msg Ignite messaging.
      */
     private static void startListening(IgniteMessaging msg) {
         // Add ordered message listener.
@@ -143,7 +143,7 @@ public final class MessagingExample {
     /**
      * Listen for messages from remote nodes.
      *
-     * @param msg Grid messaging.
+     * @param msg Ignite messaging.
      * @param orderedLatch Latch for ordered messages acks.
      * @param unorderedLatch Latch for unordered messages acks.
      */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/358a5bc9/examples/src/main/java/org/apache/ignite/examples/misc/client/memcache/MemcacheRestExampleNodeStartup.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/misc/client/memcache/MemcacheRestExampleNodeStartup.java
b/examples/src/main/java/org/apache/ignite/examples/misc/client/memcache/MemcacheRestExampleNodeStartup.java
index 41e4f81..612cda2 100644
--- a/examples/src/main/java/org/apache/ignite/examples/misc/client/memcache/MemcacheRestExampleNodeStartup.java
+++ b/examples/src/main/java/org/apache/ignite/examples/misc/client/memcache/MemcacheRestExampleNodeStartup.java
@@ -50,9 +50,9 @@ public class MemcacheRestExampleNodeStartup {
     }
 
     /**
-     * Create Grid configuration with IgniteFs and enabled IPC.
+     * Create Ignite configuration with IgniteFs and enabled IPC.
      *
-     * @return Grid configuration.
+     * @return Ignite configuration.
      * @throws IgniteException If configuration creation failed.
      */
     public static IgniteConfiguration configuration() throws IgniteException {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/358a5bc9/examples/src/main/java/org/apache/ignite/examples/misc/deployment/DeploymentExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/misc/deployment/DeploymentExample.java
b/examples/src/main/java/org/apache/ignite/examples/misc/deployment/DeploymentExample.java
index b9084f2..da4d7e3 100644
--- a/examples/src/main/java/org/apache/ignite/examples/misc/deployment/DeploymentExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/misc/deployment/DeploymentExample.java
@@ -29,7 +29,7 @@ import java.util.*;
  * Demonstrates how to explicitly deploy a task. Note that
  * it is very rare when you would need such functionality as tasks are
  * auto-deployed on demand first time you execute them. So in most cases
- * you would just apply any of the {@code Grid.execute(...)} methods directly.
+ * you would just apply any of the {@code Ignite.execute(...)} methods directly.
  * However, sometimes a task is not in local class path, so you may not even
  * know the code it will execute, but you still need to execute it. For example,
  * you have two independent components in the system, and one loads the task
@@ -64,8 +64,8 @@ public final class DeploymentExample {
             // onto remote nodes on demand. For this example this task is
             // available on the classpath, however in real life that may not
             // always be the case. In those cases you should use explicit
-            // 'GridCompute.localDeployTask(Class, ClassLoader) apply and
-            // then use 'GridCompute.execute(String, Object)' method
+            // 'IgniteCompute.localDeployTask(Class, ClassLoader) apply and
+            // then use 'IgniteCompute.execute(String, Object)' method
             // passing your task name as first parameter.
             ignite.compute().localDeployTask(ExampleTask.class, ExampleTask.class.getClassLoader());
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/358a5bc9/examples/src/main/java/org/apache/ignite/examples/misc/springbean/SpringBeanExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/misc/springbean/SpringBeanExample.java
b/examples/src/main/java/org/apache/ignite/examples/misc/springbean/SpringBeanExample.java
index b75840e..b6c80ed 100644
--- a/examples/src/main/java/org/apache/ignite/examples/misc/springbean/SpringBeanExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/misc/springbean/SpringBeanExample.java
@@ -27,11 +27,11 @@ import java.util.concurrent.*;
  * Demonstrates a simple use of Ignite configured with Spring.
  * <p>
  * String "Hello World." is printed out by Callable passed into
- * the executor service provided by Grid. This statement could be printed
+ * the executor service provided by Ignite. This statement could be printed
  * out on any node in the cluster.
  * <p>
  * The major point of this example is to show ignite injection by Spring
- * framework. Grid bean is described in {@code spring-bean.xml} file and instantiated
+ * framework. Ignite bean is described in {@code spring-bean.xml} file and instantiated
  * by Spring context. Once application completed its execution Spring will
  * apply ignite bean destructor and stop the ignite.
  * <p>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/358a5bc9/examples/src/main/java8/org/apache/ignite/examples/MessagingExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java8/org/apache/ignite/examples/MessagingExample.java b/examples/src/main/java8/org/apache/ignite/examples/MessagingExample.java
index 65b7e8f..27d2d87 100644
--- a/examples/src/main/java8/org/apache/ignite/examples/MessagingExample.java
+++ b/examples/src/main/java8/org/apache/ignite/examples/MessagingExample.java
@@ -96,7 +96,7 @@ public final class MessagingExample {
     /**
      * Start listening to messages on all cluster nodes within passed in projection.
      *
-     * @param prj Grid projection.
+     * @param prj Cluster group.
      * @throws IgniteException If failed.
      */
     private static void startListening(ClusterGroup prj) throws IgniteException {
@@ -105,8 +105,8 @@ public final class MessagingExample {
             System.out.println("Received ordered message [msg=" + msg + ", fromNodeId=" +
nodeId + ']');
 
             try {
-                // Projection does not contain local node: GridProjection rmtPrj = g.forRemotes();
-                // So, need to get projection for sender node through entire grid.
+                // Projection does not contain local node: ClusterGroup rmtPrj = g.forRemotes();
+                // So, need to get projection for sender node through entire cluster.
                 prj.ignite().forNodeId(nodeId).message().send(TOPIC.ORDERED, msg);
             }
             catch (IgniteException e) {
@@ -121,8 +121,8 @@ public final class MessagingExample {
             System.out.println("Received unordered message [msg=" + msg + ", fromNodeId="
+ nodeId + ']');
 
             try {
-                // Projection does not contain local node: GridProjection rmtPrj = g.forRemotes();
-                // So, need to get projection for sender node through entire grid.
+                // Projection does not contain local node: ClusterGroup rmtPrj = g.forRemotes();
+                // So, need to get projection for sender node through entire cluster.
                 prj.ignite().forNodeId(nodeId).message().send(TOPIC.UNORDERED, msg);
             }
             catch (IgniteException e) {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/358a5bc9/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheAffinitySimpleExample.scala
----------------------------------------------------------------------
diff --git a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheAffinitySimpleExample.scala
b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheAffinitySimpleExample.scala
index 6db5164..ad980e8 100644
--- a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheAffinitySimpleExample.scala
+++ b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheAffinitySimpleExample.scala
@@ -60,7 +60,7 @@ object ScalarCacheAffinitySimpleExample extends App {
     }
 
     /**
-     * Visits every in-memory data grid entry on the remote node it resides by co-locating
visiting
+     * Visits every in-memory data ignite entry on the remote node it resides by co-locating
visiting
      * closure with the cache key.
      *
      * @param c Cache to use.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/358a5bc9/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheExample.scala
----------------------------------------------------------------------
diff --git a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheExample.scala
b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheExample.scala
index d95939a..f0dbe83 100644
--- a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheExample.scala
+++ b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheExample.scala
@@ -27,7 +27,7 @@ import org.apache.ignite.scalar.scalar._
 import scala.collection.JavaConversions._
 
 /**
- * Demonstrates basic In-Memory Data Grid operations with Scalar.
+ * Demonstrates basic In-Memory Data Ignite Cluster operations with Scalar.
  * <p>
  * Remote nodes should always be started with configuration file which includes
  * cache: `'ignite.sh examples/config/example-cache.xml'`. Local node can

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/358a5bc9/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCachePopularNumbersExample.scala
----------------------------------------------------------------------
diff --git a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCachePopularNumbersExample.scala
b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCachePopularNumbersExample.scala
index af82e14..9453d58 100644
--- a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCachePopularNumbersExample.scala
+++ b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCachePopularNumbersExample.scala
@@ -90,7 +90,7 @@ object ScalarCachePopularNumbersExample extends App {
     @throws[IgniteException]
     def streamData() {
         // Set larger per-node buffer size since our state is relatively small.
-        // Reduce parallel operations since we running the whole grid locally under heavy
load.
+        // Reduce parallel operations since we running the whole ignite cluster locally under
heavy load.
         val ldr = dataLoader$[Int, Long](CACHE_NAME, 2048)
 
         // TODO IGNITE-44: restore invoke.
@@ -101,7 +101,7 @@ object ScalarCachePopularNumbersExample extends App {
     }
 
     /**
-     * Queries a subset of most popular numbers from in-memory data grid.
+     * Queries a subset of most popular numbers from in-memory data ignite cluster.
      *
      * @param cnt Number of most popular numbers to return.
      */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/358a5bc9/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarContinuationExample.scala
----------------------------------------------------------------------
diff --git a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarContinuationExample.scala
b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarContinuationExample.scala
index 94a8346..c9808ee 100644
--- a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarContinuationExample.scala
+++ b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarContinuationExample.scala
@@ -28,13 +28,13 @@ import org.apache.ignite.scalar.scalar._
 import org.jetbrains.annotations.Nullable
 
 /**
- * This example recursively calculates `Fibonacci` numbers on the grid. This is
+ * This example recursively calculates `Fibonacci` numbers on the ignite cluster. This is
  * a powerful design pattern which allows for creation of fully distributively recursive
  * (a.k.a. nested) tasks or closures with continuations. This example also shows
  * usage of `continuations`, which allows us to wait for results from remote nodes
  * without blocking threads.
  * <p>
- * Note that because this example utilizes local node storage via `GridNodeLocal`,
+ * Note that because this example utilizes local node storage via `NodeLocal`,
  * it gets faster if you execute it multiple times, as the more you execute it,
  * the more values it will be cached on remote nodes.
  * <p>
@@ -71,7 +71,7 @@ object ScalarContinuationExample {
 /**
  * Closure to execute.
  *
- * @param excludeNodeId Node to exclude from execution if there are more then 1 node in grid.
+ * @param excludeNodeId Node to exclude from execution if there are more then 1 node in cluster.
  */
 class FibonacciClosure (
     private[this] val excludeNodeId: util.UUID
@@ -117,7 +117,7 @@ class FibonacciClosure (
             val comp = ignite$.compute(prj).withAsync()
 
             // If future is not cached in node-local store, cache it.
-            // Note recursive grid execution!
+            // Note recursive execution!
             if (fut1 == null) {
                 comp.apply(new FibonacciClosure(excludeNodeId), n - 1)
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/358a5bc9/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCreditRiskExample.scala
----------------------------------------------------------------------
diff --git a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCreditRiskExample.scala
b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCreditRiskExample.scala
index f7b7cef..8857050 100644
--- a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCreditRiskExample.scala
+++ b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCreditRiskExample.scala
@@ -60,7 +60,7 @@ object ScalarCreditRiskExample {
             val start = System.currentTimeMillis
 
             // Calculate credit risk and print it out.
-            // As you can see the grid enabling is completely hidden from the caller
+            // As you can see the ignite cluster enabling is completely hidden from the caller
             // and it is fully transparent to him. In fact, the caller is never directly
             // aware if method was executed just locally or on the 100s of cluster nodes.
             // Credit risk crdRisk is the minimal amount that creditor has to have
@@ -76,7 +76,7 @@ object ScalarCreditRiskExample {
     /**
      * Creates closures for calculating credit risks.
      *
-     * @param clusterSize Size of the grid.
+     * @param clusterSize Size of the cluster.
      * @param portfolio Portfolio.
      * @param horizon Forecast horizon in days.
      * @param iter Number of Monte-Carlo iterations.
@@ -134,9 +134,9 @@ private case class Credit(
 private class CreditRiskManager {
     /**
      * Default randomizer with normal distribution.
-     * Note that since every JVM on the grid will have its own random
+     * Note that since every JVM on the ignite cluster will have its own random
      * generator (independently initialized) the Monte-Carlo simulation
-     * will be slightly skewed when performed on the grid due to skewed
+     * will be slightly skewed when performed on the ignite cluster due to skewed
      * normal distribution of the sub-jobs comparing to execution on the
      * local node only with single random generator. Real-life applications
      * may want to provide its own implementation of distributed random

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/358a5bc9/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarJvmCloudExample.scala
----------------------------------------------------------------------
diff --git a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarJvmCloudExample.scala
b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarJvmCloudExample.scala
index 9635660..a5b8fd2 100644
--- a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarJvmCloudExample.scala
+++ b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarJvmCloudExample.scala
@@ -30,13 +30,13 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder
 /**
  * This example demonstrates how you can easily startup multiple nodes
  * in the same JVM with Scala. All started nodes use default configuration
- * with only difference of the grid name which has to be different for
+ * with only difference of the ignite cluster name which has to be different for
  * every node so they can be differentiated within JVM.
  * <p>
  * Starting multiple nodes in the same JVM is especially useful during
- * testing and debugging as it allows you to create a full grid within
+ * testing and debugging as it allows you to create a full ignite cluster within
  * a test case, simulate various scenarios, and watch how jobs and data
- * behave within a grid.
+ * behave within a ignite cluster.
  */
 object ScalarJvmCloudExample {
     /** Names of nodes to start. */
@@ -58,7 +58,7 @@ object ScalarJvmCloudExample {
                     cfg.setGridName(name)
 
                     // Configure in-VM TCP discovery so we don't
-                    // interfere with other grids running on the same network.
+                    // interfere with other ignites running on the same network.
                     val discoSpi = new TcpDiscoverySpi
 
                     discoSpi.setIpFinder(ipFinder)

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/358a5bc9/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarPiCalculationExample.scala
----------------------------------------------------------------------
diff --git a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarPiCalculationExample.scala
b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarPiCalculationExample.scala
index c3480d6..42dcb20 100644
--- a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarPiCalculationExample.scala
+++ b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarPiCalculationExample.scala
@@ -23,7 +23,7 @@ import org.apache.ignite.scalar.scalar._
 import scala.math._
 
 /**
- * This example calculates Pi number in parallel on the grid. Note that these few
+ * This example calculates Pi number in parallel on the ignite cluster. Note that these few
  * lines of code work on one node, two nodes or hundreds of nodes without any changes
  * or any explicit deployment.
  * <p>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/358a5bc9/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarPingPongExample.scala
----------------------------------------------------------------------
diff --git a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarPingPongExample.scala
b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarPingPongExample.scala
index 877f016..05e052b 100644
--- a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarPingPongExample.scala
+++ b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarPingPongExample.scala
@@ -26,7 +26,7 @@ import org.apache.ignite.scalar.scalar._
 
 /**
  * Demonstrates simple protocol-based exchange in playing a ping-pong between
- * two nodes. It is analogous to `GridMessagingPingPongExample` on Java side.
+ * two nodes. It is analogous to `MessagingPingPongExample` on Java side.
  * <p>
  * Remote nodes should always be started with special configuration file which
  * enables P2P class loading: `'ignite.{sh|bat} examples/config/example-compute.xml'`.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/358a5bc9/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarPrimeExample.scala
----------------------------------------------------------------------
diff --git a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarPrimeExample.scala
b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarPrimeExample.scala
index c22aced..b24f5e6 100644
--- a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarPrimeExample.scala
+++ b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarPrimeExample.scala
@@ -28,7 +28,7 @@ import scala.util.control.Breaks._
  * Prime Number calculation example based on Scalar.
  *
  * ==Starting Remote Nodes==
- * To try this example you should (but don't have to) start remote grid instances.
+ * To try this example you should (but don't have to) start remote ignite instances.
  * You can start as many as you like by executing the following script:
  * `{IGNITE_HOME}/bin/ignite.{bat|sh} examples/config/example-compute.xml`
  *

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/358a5bc9/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarSnowflakeSchemaExample.scala
----------------------------------------------------------------------
diff --git a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarSnowflakeSchemaExample.scala
b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarSnowflakeSchemaExample.scala
index b4f7124..029ab96 100644
--- a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarSnowflakeSchemaExample.scala
+++ b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarSnowflakeSchemaExample.scala
@@ -37,7 +37,7 @@ import scala.collection.JavaConversions._
  * such architecture is supported via cross-cache queries. By storing <i>dimensions</i>
in
  * `CacheMode#REPLICATED REPLICATED` caches and <i>facts</i> in much larger
  * `CacheMode#PARTITIONED PARTITIONED` caches you can freely execute distributed joins across
- * your whole in-memory data grid, thus querying your in memory data without any limitations.
+ * your whole in-memory data ignite cluster, thus querying your in memory data without any
limitations.
  * <p>
  * In this example we have two <i>dimensions</i>, `DimProduct` and `DimStore`
and
  * one <i>fact</i> - `FactPurchase`. Queries are executed by joining dimensions
and facts

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/358a5bc9/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarTaskExample.scala
----------------------------------------------------------------------
diff --git a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarTaskExample.scala
b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarTaskExample.scala
index f8b2d5e..8a6c562 100644
--- a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarTaskExample.scala
+++ b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarTaskExample.scala
@@ -26,8 +26,8 @@ import org.apache.ignite.scalar.scalar._
 import scala.collection.JavaConversions._
 
 /**
- * Demonstrates use of full grid task API using Scalar. Note that using task-based
- * grid enabling gives you all the advanced features of Ignite such as custom topology
+ * Demonstrates use of full ignite task API using Scalar. Note that using task-based
+ * ignite enabling gives you all the advanced features of Ignite such as custom topology
  * and collision resolution, custom failover, mapping, reduction, load balancing, etc.
  * As a trade off in such cases the more code needs to be written vs. simple closure execution.
  * <p>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/358a5bc9/examples/src/test/java/org/apache/ignite/examples/ContinuousMapperExamplesMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java/org/apache/ignite/examples/ContinuousMapperExamplesMultiNodeSelfTest.java
b/examples/src/test/java/org/apache/ignite/examples/ContinuousMapperExamplesMultiNodeSelfTest.java
index 59bc10d..2d435f4 100644
--- a/examples/src/test/java/org/apache/ignite/examples/ContinuousMapperExamplesMultiNodeSelfTest.java
+++ b/examples/src/test/java/org/apache/ignite/examples/ContinuousMapperExamplesMultiNodeSelfTest.java
@@ -18,7 +18,7 @@
 package org.apache.ignite.examples;
 
 /**
- * GridContinuousMapperExample multi-node self test.
+ * ContinuousMapperExample multi-node self test.
  */
 public class ContinuousMapperExamplesMultiNodeSelfTest extends ContinuationExamplesSelfTest
{
     /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/358a5bc9/examples/src/test/java/org/apache/ignite/examples/ContinuousMapperExamplesSelfTest.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java/org/apache/ignite/examples/ContinuousMapperExamplesSelfTest.java
b/examples/src/test/java/org/apache/ignite/examples/ContinuousMapperExamplesSelfTest.java
index c4d8622..21c7952 100644
--- a/examples/src/test/java/org/apache/ignite/examples/ContinuousMapperExamplesSelfTest.java
+++ b/examples/src/test/java/org/apache/ignite/examples/ContinuousMapperExamplesSelfTest.java
@@ -21,7 +21,7 @@ import org.apache.ignite.examples.compute.*;
 import org.apache.ignite.testframework.junits.common.*;
 
 /**
- * GridContinuousMapperExample self test.
+ * ContinuousMapperExample self test.
  */
 public class ContinuousMapperExamplesSelfTest extends GridAbstractExamplesTest {
     /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/358a5bc9/examples/src/test/java/org/apache/ignite/examples/LifecycleExamplesSelfTest.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java/org/apache/ignite/examples/LifecycleExamplesSelfTest.java
b/examples/src/test/java/org/apache/ignite/examples/LifecycleExamplesSelfTest.java
index 4dafcbf..f121780 100644
--- a/examples/src/test/java/org/apache/ignite/examples/LifecycleExamplesSelfTest.java
+++ b/examples/src/test/java/org/apache/ignite/examples/LifecycleExamplesSelfTest.java
@@ -21,7 +21,7 @@ import org.apache.ignite.examples.misc.lifecycle.*;
 import org.apache.ignite.testframework.junits.common.*;
 
 /**
- * GridLifecycleExample self test.
+ * LifecycleExample self test.
  */
 public class LifecycleExamplesSelfTest extends GridAbstractExamplesTest {
     /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/358a5bc9/examples/src/test/java/org/apache/ignite/examples/MemcacheRestExamplesMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java/org/apache/ignite/examples/MemcacheRestExamplesMultiNodeSelfTest.java
b/examples/src/test/java/org/apache/ignite/examples/MemcacheRestExamplesMultiNodeSelfTest.java
index 9a87f55..573999e 100644
--- a/examples/src/test/java/org/apache/ignite/examples/MemcacheRestExamplesMultiNodeSelfTest.java
+++ b/examples/src/test/java/org/apache/ignite/examples/MemcacheRestExamplesMultiNodeSelfTest.java
@@ -20,7 +20,7 @@ package org.apache.ignite.examples;
 import org.apache.ignite.examples.misc.client.memcache.*;
 
 /**
- * GridMemcacheRestExample multi-node self test.
+ * MemcacheRestExample multi-node self test.
  */
 public class MemcacheRestExamplesMultiNodeSelfTest extends MemcacheRestExamplesSelfTest {
     /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/358a5bc9/examples/src/test/java/org/apache/ignite/examples/MemcacheRestExamplesSelfTest.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java/org/apache/ignite/examples/MemcacheRestExamplesSelfTest.java
b/examples/src/test/java/org/apache/ignite/examples/MemcacheRestExamplesSelfTest.java
index ebb4071..fe1604d 100644
--- a/examples/src/test/java/org/apache/ignite/examples/MemcacheRestExamplesSelfTest.java
+++ b/examples/src/test/java/org/apache/ignite/examples/MemcacheRestExamplesSelfTest.java
@@ -21,7 +21,7 @@ import org.apache.ignite.examples.misc.client.memcache.*;
 import org.apache.ignite.testframework.junits.common.*;
 
 /**
- * GridMemcacheRestExample self test.
+ * MemcacheRestExample self test.
  */
 public class MemcacheRestExamplesSelfTest extends GridAbstractExamplesTest {
     /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/358a5bc9/examples/src/test/java/org/apache/ignite/examples/MonteCarloExamplesMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java/org/apache/ignite/examples/MonteCarloExamplesMultiNodeSelfTest.java
b/examples/src/test/java/org/apache/ignite/examples/MonteCarloExamplesMultiNodeSelfTest.java
index 0c3bc38..f432a1a 100644
--- a/examples/src/test/java/org/apache/ignite/examples/MonteCarloExamplesMultiNodeSelfTest.java
+++ b/examples/src/test/java/org/apache/ignite/examples/MonteCarloExamplesMultiNodeSelfTest.java
@@ -18,7 +18,7 @@
 package org.apache.ignite.examples;
 
 /**
- * GridPrimeExample multi-node self test.
+ * PrimeExample multi-node self test.
  */
 public class MonteCarloExamplesMultiNodeSelfTest extends MonteCarloExamplesSelfTest {
     /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/358a5bc9/examples/src/test/java/org/apache/ignite/examples/MonteCarloExamplesSelfTest.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java/org/apache/ignite/examples/MonteCarloExamplesSelfTest.java
b/examples/src/test/java/org/apache/ignite/examples/MonteCarloExamplesSelfTest.java
index c42fa9b..63b91e6 100644
--- a/examples/src/test/java/org/apache/ignite/examples/MonteCarloExamplesSelfTest.java
+++ b/examples/src/test/java/org/apache/ignite/examples/MonteCarloExamplesSelfTest.java
@@ -21,7 +21,7 @@ import org.apache.ignite.examples.compute.montecarlo.*;
 import org.apache.ignite.testframework.junits.common.*;
 
 /**
- * Gridify examples self test. Excludes Gridify Spring tests.
+ * Ignite examples self test. Excludes Ignite Spring tests.
  *
  * <h1 class="header">AOP Configuration</h1>
  * In order for this test to execute, any of the following

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/358a5bc9/examples/src/test/java/org/apache/ignite/testsuites/IgniteExamplesSelfTestSuite.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java/org/apache/ignite/testsuites/IgniteExamplesSelfTestSuite.java
b/examples/src/test/java/org/apache/ignite/testsuites/IgniteExamplesSelfTestSuite.java
index 11d7555..495e7d5 100644
--- a/examples/src/test/java/org/apache/ignite/testsuites/IgniteExamplesSelfTestSuite.java
+++ b/examples/src/test/java/org/apache/ignite/testsuites/IgniteExamplesSelfTestSuite.java
@@ -26,7 +26,7 @@ import static org.apache.ignite.IgniteSystemProperties.*;
 /**
  * Examples test suite.
  * <p>
- * Contains only Spring gridify examples tests.
+ * Contains only Spring ignite examples tests.
  */
 public class IgniteExamplesSelfTestSuite extends TestSuite {
     /**


Mime
View raw message