ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [10/35] ignite git commit: IGNITE-3015 - Clean up some GridGain references in Javadoc - Fixes #650.
Date Thu, 28 Apr 2016 13:01:54 GMT
IGNITE-3015 - Clean up some GridGain references in Javadoc - Fixes #650.

Signed-off-by: Alexey Kuznetsov <akuznetsov@apache.org>


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

Branch: refs/heads/ignite-db-x-10884
Commit: 00f8d654cd9ce0099020b2888831b6351b2763ca
Parents: 6e00766
Author: Matt Hoffman <matt.hoffman@lucidworks.com>
Authored: Tue Apr 26 09:57:00 2016 +0700
Committer: Alexey Kuznetsov <akuznetsov@apache.org>
Committed: Tue Apr 26 09:57:00 2016 +0700

----------------------------------------------------------------------
 .../org/apache/ignite/compute/ComputeJob.java   |  2 +-
 .../ignite/compute/ComputeJobAfterSend.java     |  2 +-
 .../compute/ComputeJobBeforeFailover.java       |  2 +-
 .../ignite/compute/ComputeJobContext.java       |  2 +-
 .../compute/ComputeJobContinuationAdapter.java  | 12 ++++-----
 .../ignite/compute/ComputeLoadBalancer.java     | 12 ++++-----
 .../org/apache/ignite/compute/ComputeTask.java  | 26 ++++++++++----------
 .../ignite/compute/ComputeTaskAdapter.java      |  8 +++---
 .../compute/ComputeTaskNoResultCache.java       |  6 ++---
 .../ignite/compute/ComputeTaskSession.java      |  4 +--
 .../ignite/compute/ComputeTaskSplitAdapter.java |  8 +++---
 .../apache/ignite/compute/gridify/Gridify.java  |  2 +-
 .../apache/ignite/igfs/mapreduce/IgfsTask.java  |  6 ++---
 .../ignite/internal/GridTaskSessionImpl.java    |  2 +-
 .../internal/processors/job/GridJobWorker.java  |  4 +--
 .../GridResourceJobContextInjector.java         |  4 +--
 .../processors/task/GridTaskProcessor.java      |  6 ++---
 .../processors/task/GridTaskWorker.java         | 10 ++++----
 .../org/apache/ignite/internal/util/F0.java     |  4 +--
 .../ignite/internal/util/IgniteUtils.java       |  2 +-
 .../ignite/internal/util/lang/GridFunc.java     |  4 +--
 .../apache/ignite/internal/util/typedef/PN.java |  2 +-
 .../jobstealing/JobStealingDisabled.java        |  2 +-
 .../communication/tcp/TcpCommunicationSpi.java  |  6 ++---
 .../spi/loadbalancing/LoadBalancingSpi.java     |  8 +++---
 .../adaptive/AdaptiveLoadBalancingSpi.java      | 20 +++++++--------
 .../adaptive/AdaptiveLoadProbe.java             |  2 +-
 .../roundrobin/RoundRobinLoadBalancingSpi.java  |  6 ++---
 .../WeightedRandomLoadBalancingSpi.java         | 14 +++++------
 .../GridEventStorageCheckAllEventsSelfTest.java |  2 +-
 .../GridTcpCommunicationBenchmark.java          | 26 ++++++++++----------
 .../GridP2PMissedResourceCacheSizeSelfTest.java |  6 ++---
 .../scalar/pimps/ScalarProjectionPimp.scala     |  4 +--
 .../scalar/pimps/ScalarTaskThreadContext.scala  |  4 +--
 .../uri/GridUriDeploymentFileProcessor.java     |  2 +-
 .../commands/top/VisorTopologyCommand.scala     |  2 +-
 .../scala/org/apache/ignite/visor/visor.scala   |  2 +-
 37 files changed, 118 insertions(+), 118 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/00f8d654/modules/core/src/main/java/org/apache/ignite/compute/ComputeJob.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/compute/ComputeJob.java b/modules/core/src/main/java/org/apache/ignite/compute/ComputeJob.java
index 9558255..dadc05d 100644
--- a/modules/core/src/main/java/org/apache/ignite/compute/ComputeJob.java
+++ b/modules/core/src/main/java/org/apache/ignite/compute/ComputeJob.java
@@ -102,7 +102,7 @@ import org.apache.ignite.IgniteException;
  * </ul>
  * Refer to corresponding resource documentation for more information.
  * <p>
- * <h1 class="header">GridComputeJobAdapter</h1>
+ * <h1 class="header">ComputeJobAdapter</h1>
  * Ignite comes with convenience {@link ComputeJobAdapter} adapter that provides
  * default empty implementation for {@link ComputeJob#cancel()} method and also
  * allows user to set and get job argument, if there is one.

http://git-wip-us.apache.org/repos/asf/ignite/blob/00f8d654/modules/core/src/main/java/org/apache/ignite/compute/ComputeJobAfterSend.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/compute/ComputeJobAfterSend.java b/modules/core/src/main/java/org/apache/ignite/compute/ComputeJobAfterSend.java
index f81e969..4cc867f 100644
--- a/modules/core/src/main/java/org/apache/ignite/compute/ComputeJobAfterSend.java
+++ b/modules/core/src/main/java/org/apache/ignite/compute/ComputeJobAfterSend.java
@@ -35,7 +35,7 @@ import java.lang.annotation.Target;
  * <pre name="code" class="java">
  * public class MyGridJob implements ComputeJob {
  *     ...
- *     &#64;GridComputeJobAfterSend
+ *     &#64;ComputeJobAfterSend
  *     public void onJobAfterSend() {
  *          ...
  *     }

http://git-wip-us.apache.org/repos/asf/ignite/blob/00f8d654/modules/core/src/main/java/org/apache/ignite/compute/ComputeJobBeforeFailover.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/compute/ComputeJobBeforeFailover.java b/modules/core/src/main/java/org/apache/ignite/compute/ComputeJobBeforeFailover.java
index 7ae6455..7ad6350 100644
--- a/modules/core/src/main/java/org/apache/ignite/compute/ComputeJobBeforeFailover.java
+++ b/modules/core/src/main/java/org/apache/ignite/compute/ComputeJobBeforeFailover.java
@@ -36,7 +36,7 @@ import java.lang.annotation.Target;
  * <pre name="code" class="java">
  * public class MyGridJob implements ComputeJob {
  *     ...
- *     &#64;GridComputeJobBeforeFailover
+ *     &#64;ComputeJobBeforeFailover
  *     public void onJobBeforeFailover() {
  *          ...
  *     }

http://git-wip-us.apache.org/repos/asf/ignite/blob/00f8d654/modules/core/src/main/java/org/apache/ignite/compute/ComputeJobContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/compute/ComputeJobContext.java b/modules/core/src/main/java/org/apache/ignite/compute/ComputeJobContext.java
index 086356a..a0a22d2 100644
--- a/modules/core/src/main/java/org/apache/ignite/compute/ComputeJobContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/compute/ComputeJobContext.java
@@ -38,7 +38,7 @@ import org.jetbrains.annotations.Nullable;
  * all context attributes set on one node will be available on any other node
  * this job travels to.
  * <p>
- * You can also use {@code GridComputeJobContext} to communicate between SPI's and jobs.
+ * You can also use {@code ComputeJobContext} to communicate between SPI's and jobs.
  * For example, if you need to cancel an actively running job from {@link org.apache.ignite.spi.collision.CollisionSpi}
  * you may choose to set some context attribute on the job to mark the fact
  * that a job was cancelled by grid and not by a user. Context attributes can

http://git-wip-us.apache.org/repos/asf/ignite/blob/00f8d654/modules/core/src/main/java/org/apache/ignite/compute/ComputeJobContinuationAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/compute/ComputeJobContinuationAdapter.java b/modules/core/src/main/java/org/apache/ignite/compute/ComputeJobContinuationAdapter.java
index 936c9c7..8f92d98 100644
--- a/modules/core/src/main/java/org/apache/ignite/compute/ComputeJobContinuationAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/compute/ComputeJobContinuationAdapter.java
@@ -33,21 +33,21 @@ import org.jetbrains.annotations.Nullable;
  *      and {@link #argument(int)} methods.
  * </li>
  * </ul>
- * Here is an example of how {@code GridComputeJobAdapter} can be used from task logic
+ * Here is an example of how {@code ComputeJobAdapter} can be used from task logic
  * to create jobs. The example creates job adapter as anonymous class, but you
  * are free to create a separate class for it.
  * <pre name="code" class="java">
- * public class TestGridTask extends GridComputeTaskSplitAdapter&lt;String, Integer&gt; {
+ * public class TestGridTask extends ComputeTaskSplitAdapter&lt;String, Integer&gt; {
  *     // Used to imitate some logic for the
  *     // sake of this example
  *     private int multiplier = 3;
  *
  *     &#64;Override
  *     protected Collection&lt;? extends ComputeJob&gt; split(int gridSize, final String arg) throws IgniteCheckedException {
- *         List&lt;GridComputeJobAdapter&lt;String&gt;&gt; jobs = new ArrayList&lt;GridComputeJobAdapter&lt;String&gt;&gt;(gridSize);
+ *         List&lt;ComputeJobAdapter&lt;String&gt;&gt; jobs = new ArrayList&lt;ComputeJobAdapter&lt;String&gt;&gt;(gridSize);
  *
  *         for (int i = 0; i < gridSize; i++) {
- *             jobs.add(new GridComputeJobAdapter() {
+ *             jobs.add(new ComputeJobAdapter() {
  *                 // Job execution logic.
  *                 public Object execute() throws IgniteCheckedException {
  *                     return multiplier * arg.length();
@@ -60,11 +60,11 @@ import org.jetbrains.annotations.Nullable;
  *
  *     // Aggregate multiple job results into
  *     // one task result.
- *     public Integer reduce(List&lt;GridComputeJobResult&gt; results) throws IgniteCheckedException {
+ *     public Integer reduce(List&lt;ComputeJobResult&gt; results) throws IgniteCheckedException {
  *         int sum = 0;
  *
  *         // For the sake of this example, let's sum all results.
- *         for (GridComputeJobResult res : results) {
+ *         for (ComputeJobResult res : results) {
  *             sum += (Integer)res.getData();
  *         }
  *

http://git-wip-us.apache.org/repos/asf/ignite/blob/00f8d654/modules/core/src/main/java/org/apache/ignite/compute/ComputeLoadBalancer.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/compute/ComputeLoadBalancer.java b/modules/core/src/main/java/org/apache/ignite/compute/ComputeLoadBalancer.java
index 356e5a6..7c4736c 100644
--- a/modules/core/src/main/java/org/apache/ignite/compute/ComputeLoadBalancer.java
+++ b/modules/core/src/main/java/org/apache/ignite/compute/ComputeLoadBalancer.java
@@ -39,7 +39,7 @@ import org.jetbrains.annotations.Nullable;
  * is transparent to your code and is handled automatically by the adapter.
  * Here is an example of how your task will look:
  * <pre name="code" class="java">
- * public class MyFooBarTask extends GridComputeTaskSplitAdapter&lt;String> {
+ * public class MyFooBarTask extends ComputeTaskSplitAdapter&lt;String> {
  *     &#64;Override
  *     protected Collection&lt;? extends ComputeJob> split(int gridSize, String arg) throws IgniteCheckedException {
  *         List&lt;MyFooBarJob> jobs = new ArrayList&lt;MyFooBarJob>(gridSize);
@@ -61,14 +61,14 @@ import org.jetbrains.annotations.Nullable;
  * case we manually inject load balancer and use it to pick the best node. Doing it in
  * such way would allow user to map some jobs manually and for others use load balancer.
  * <pre name="code" class="java">
- * public class MyFooBarTask extends GridComputeTaskAdapter&lt;String, String> {
+ * public class MyFooBarTask extends ComputeTaskAdapter&lt;String, String> {
  *     // Inject load balancer.
  *     &#64;LoadBalancerResource
  *     ComputeLoadBalancer balancer;
  *
  *     // Map jobs to grid nodes.
- *     public Map&lt;? extends ComputeJob, GridNode> map(List&lt;GridNode> subgrid, String arg) throws IgniteCheckedException {
- *         Map&lt;MyFooBarJob, GridNode> jobs = new HashMap&lt;MyFooBarJob, GridNode>(subgrid.size());
+ *     public Map&lt;? extends ComputeJob, ClusterNode> map(List&lt;ClusterNode> subgrid, String arg) throws IgniteCheckedException {
+ *         Map&lt;MyFooBarJob, ClusterNode> jobs = new HashMap&lt;MyFooBarJob, ClusterNode>(subgrid.size());
  *
  *         // In more complex cases, you can actually do
  *         // more complicated assignments of jobs to nodes.
@@ -83,13 +83,13 @@ import org.jetbrains.annotations.Nullable;
  *     }
  *
  *     // Aggregate results into one compound result.
- *     public String reduce(List&lt;GridComputeJobResult&gt; results) throws IgniteCheckedException {
+ *     public String reduce(List&lt;ComputeJobResult&gt; results) throws IgniteCheckedException {
  *         // For the purpose of this example we simply
  *         // concatenate string representation of every
  *         // job result
  *         StringBuilder buf = new StringBuilder();
  *
- *         for (GridComputeJobResult res : results) {
+ *         for (ComputeJobResult res : results) {
  *             // Append string representation of result
  *             // returned by every job.
  *             buf.append(res.getData().toString());

http://git-wip-us.apache.org/repos/asf/ignite/blob/00f8d654/modules/core/src/main/java/org/apache/ignite/compute/ComputeTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/compute/ComputeTask.java b/modules/core/src/main/java/org/apache/ignite/compute/ComputeTask.java
index d24bf00..0c69fab 100644
--- a/modules/core/src/main/java/org/apache/ignite/compute/ComputeTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/compute/ComputeTask.java
@@ -36,7 +36,7 @@ import org.jetbrains.annotations.Nullable;
  *      Upon request to execute a grid task with given task name system will find
  *      deployed task with given name. Task needs to be deployed prior to execution
  *      (see {@link org.apache.ignite.IgniteCompute#localDeployTask(Class, ClassLoader)} method), however if task does not specify
- *      its name explicitly via {@link ComputeTaskName @GridComputeTaskName} annotation, it
+ *      its name explicitly via {@link ComputeTaskName @ComputeTaskName} annotation, it
  *      will be auto-deployed first time it gets executed.
  * </li>
  * <li>
@@ -62,7 +62,7 @@ import org.jetbrains.annotations.Nullable;
  *      on the remote node (immediately, buffered or canceled).
  * </li>
  * <li>
- *      Once job execution results become available method {@link #result(ComputeJobResult, List) result(GridComputeJobResult, List)}
+ *      Once job execution results become available method {@link #result(ComputeJobResult, List) result(ComputeJobResult, List)}
  *      will be called for each received job result. The policy returned by this method will
  *      determine the way task reacts to every job result:
  *      <ul>
@@ -80,7 +80,7 @@ import org.jetbrains.annotations.Nullable;
  *          If {@link ComputeJobResultPolicy#FAILOVER} policy is returned, then job will
  *          be failed over to another node for execution. The node to which job will get
  *          failed over is decided by {@link org.apache.ignite.spi.failover.FailoverSpi} SPI implementation.
- *          Note that if you use {@link ComputeTaskAdapter} adapter for {@code GridComputeTask}
+ *          Note that if you use {@link ComputeTaskAdapter} adapter for {@code ComputeTask}
  *          implementation, then it will automatically fail jobs to another node for 2
  *          known failure cases:
  *          <ul>
@@ -99,7 +99,7 @@ import org.jetbrains.annotations.Nullable;
  *      </ul>
  * </li>
  * <li>
- *      Once all results are received or {@link #result(ComputeJobResult, List) result(GridComputeJobResult, List)}
+ *      Once all results are received or {@link #result(ComputeJobResult, List) result(ComputeJobResult, List)}
  *      method returned {@link ComputeJobResultPolicy#REDUCE} policy, method {@link #reduce(List) reduce(List)}
  *      is called to aggregate received results into one final result. Once this method is finished the
  *      execution of the grid task is complete. This result will be returned to the user through
@@ -113,12 +113,12 @@ import org.jetbrains.annotations.Nullable;
  * use {@link ComputeTaskContinuousMapper} to continuously stream jobs from task even after {@code map(...)}
  * step is complete. Usually with continuous mapper the number of jobs within task
  * may grow too large - in this case it may make sense to use it in combination with
- * {@link ComputeTaskNoResultCache @GridComputeTaskNoResultCache} annotation.
+ * {@link ComputeTaskNoResultCache @ComputeTaskNoResultCache} annotation.
  * <p>
  * <h1 class="header">Task Result Caching</h1>
  * Sometimes job results are too large or task simply has too many jobs to keep track
  * of which may hinder performance. In such cases it may make sense to disable task
- * result caching by attaching {@link ComputeTaskNoResultCache @GridComputeTaskNoResultCache} annotation to task class, and
+ * result caching by attaching {@link ComputeTaskNoResultCache @ComputeTaskNoResultCache} annotation to task class, and
  * processing all results as they come in {@link #result(ComputeJobResult, List)} method.
  * When Ignite sees this annotation it will disable tracking of job results and
  * list of all job results passed into {@link #result(ComputeJobResult, List)} or
@@ -140,7 +140,7 @@ import org.jetbrains.annotations.Nullable;
  * Refer to corresponding resource documentation for more information.
  * <p>
  * <h1 class="header">Grid Task Adapters</h1>
- * {@code GridComputeTask} comes with several convenience adapters to make the usage easier:
+ * {@code ComputeTask} comes with several convenience adapters to make the usage easier:
  * <ul>
  * <li>
  * {@link ComputeTaskAdapter} provides default implementation for {@link ComputeTask#result(ComputeJobResult, List)}
@@ -149,14 +149,14 @@ import org.jetbrains.annotations.Nullable;
  * execution rejection (detected by {@link ComputeExecutionRejectedException} exception).
  * Here is an example of how a you would implement your task using {@link ComputeTaskAdapter}:
  * <pre name="code" class="java">
- * public class MyFooBarTask extends GridComputeTaskAdapter&lt;String, String&gt; {
+ * public class MyFooBarTask extends ComputeTaskAdapter&lt;String, String&gt; {
  *     // Inject load balancer.
  *     &#64;LoadBalancerResource
  *     ComputeLoadBalancer balancer;
  *
  *     // Map jobs to grid nodes.
- *     public Map&lt;? extends ComputeJob, GridNode&gt; map(List&lt;GridNode&gt; subgrid, String arg) throws IgniteCheckedException {
- *         Map&lt;MyFooBarJob, GridNode&gt; jobs = new HashMap&lt;MyFooBarJob, GridNode&gt;(subgrid.size());
+ *     public Map&lt;? extends ComputeJob, ClusterNode&gt; map(List&lt;ClusterNode&gt; subgrid, String arg) throws IgniteCheckedException {
+ *         Map&lt;MyFooBarJob, ClusterNode&gt; jobs = new HashMap&lt;MyFooBarJob, ClusterNode&gt;(subgrid.size());
  *
  *         // In more complex cases, you can actually do
  *         // more complicated assignments of jobs to nodes.
@@ -192,7 +192,7 @@ import org.jetbrains.annotations.Nullable;
  * method for splitting task into sub-jobs in homogeneous environments.
  * Here is an example of how you would implement your task using {@link ComputeTaskSplitAdapter}:
  * <pre name="code" class="java">
- * public class MyFooBarTask extends GridComputeTaskSplitAdapter&lt;Object, String&gt; {
+ * public class MyFooBarTask extends ComputeTaskSplitAdapter&lt;Object, String&gt; {
  *     &#64;Override
  *     protected Collection&lt;? extends ComputeJob&gt; split(int gridSize, Object arg) throws IgniteCheckedException {
  *         List&lt;MyFooBarJob&gt; jobs = new ArrayList&lt;MyFooBarJob&gt;(gridSize);
@@ -207,13 +207,13 @@ import org.jetbrains.annotations.Nullable;
  *     }
  *
  *     // Aggregate results into one compound result.
- *     public String reduce(List&lt;GridComputeJobResult&gt; results) throws IgniteCheckedException {
+ *     public String reduce(List&lt;ComputeJobResult&gt; results) throws IgniteCheckedException {
  *         // For the purpose of this example we simply
  *         // concatenate string representation of every
  *         // job result
  *         StringBuilder buf = new StringBuilder();
  *
- *         for (GridComputeJobResult res : results) {
+ *         for (ComputeJobResult res : results) {
  *             // Append string representation of result
  *             // returned by every job.
  *             buf.append(res.getData().string());

http://git-wip-us.apache.org/repos/asf/ignite/blob/00f8d654/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskAdapter.java b/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskAdapter.java
index 2de0794..c5352aa 100644
--- a/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskAdapter.java
@@ -23,16 +23,16 @@ import org.apache.ignite.cluster.ClusterTopologyException;
 
 /**
  * Convenience adapter for {@link ComputeTask} interface. Here is an example of
- * how {@code GridComputeTaskAdapter} can be used:
+ * how {@code ComputeTaskAdapter} can be used:
  * <pre name="code" class="java">
- * public class MyFooBarTask extends GridComputeTaskAdapter&lt;String, String&gt; {
+ * public class MyFooBarTask extends ComputeTaskAdapter&lt;String, String&gt; {
  *     // Inject load balancer.
  *     &#64;LoadBalancerResource
  *     ComputeLoadBalancer balancer;
  *
  *     // Map jobs to grid nodes.
- *     public Map&lt;? extends ComputeJob, GridNode&gt; map(List&lt;GridNode&gt; subgrid, String arg) throws IgniteCheckedException {
- *         Map&lt;MyFooBarJob, GridNode&gt; jobs = new HashMap&lt;MyFooBarJob, GridNode&gt;(subgrid.size());
+ *     public Map&lt;? extends ComputeJob, ClusterNode&gt; map(List&lt;ClusterNode&gt; subgrid, String arg) throws IgniteCheckedException {
+ *         Map&lt;MyFooBarJob, ClusterNode&gt; jobs = new HashMap&lt;MyFooBarJob, ClusterNode&gt;(subgrid.size());
  *
  *         // In more complex cases, you can actually do
  *         // more complicated assignments of jobs to nodes.

http://git-wip-us.apache.org/repos/asf/ignite/blob/00f8d654/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskNoResultCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskNoResultCache.java b/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskNoResultCache.java
index bbd0ff4..23f2082 100644
--- a/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskNoResultCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskNoResultCache.java
@@ -28,8 +28,8 @@ import java.util.List;
  * This annotation disables caching of task results when attached to {@link ComputeTask} class
  * being executed. Use it when number of jobs within task grows too big, or jobs themselves
  * are too large to keep in memory throughout task execution. By default all results are cached and passed into
- * {@link ComputeTask#result(ComputeJobResult,List) GridComputeTask.result(GridComputeJobResult, List&lt;GridComputeJobResult&gt;)}
- * method or {@link ComputeTask#reduce(List) GridComputeTask.reduce(List&lt;GridComputeJobResult&gt;)} method.
+ * {@link ComputeTask#result(ComputeJobResult,List) ComputeTask.result(ComputeJobResult, List&lt;ComputeJobResult&gt;)}
+ * method or {@link ComputeTask#reduce(List) ComputeTask.reduce(List&lt;ComputeJobResult&gt;)} method.
  * When this annotation is attached to a task class, then this list of job results will always be empty.
  * <p>
  * Note that if this annotation is attached to a task class, then job siblings list is not maintained
@@ -44,7 +44,7 @@ import java.util.List;
  *
  * Use this annotation when job results are too large to hold in memory and can be discarded
  * after being processed in
- * {@link ComputeTask#result(ComputeJobResult, List) GridComputeTask.result(GridComputeJobResult, List&lt;GridComputeJobResult&gt;)}
+ * {@link ComputeTask#result(ComputeJobResult, List) ComputeTask.result(ComputeJobResult, List&lt;ComputeJobResult&gt;)}
  * method.
  */
 @Documented

http://git-wip-us.apache.org/repos/asf/ignite/blob/00f8d654/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskSession.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskSession.java b/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskSession.java
index d6ebe15..66a72f7 100644
--- a/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskSession.java
+++ b/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskSession.java
@@ -86,7 +86,7 @@ import org.jetbrains.annotations.Nullable;
  * ...
  * // This field will be injected with distributed task session.
  * &#64TaskSessionResource
- * private GridComputeTaskSession ses;
+ * private ComputeTaskSession ses;
  * ...
  * </pre>
  * or from a setter method:
@@ -94,7 +94,7 @@ import org.jetbrains.annotations.Nullable;
  * // This setter method will be automatically called by the system
  * // to set grid task session.
  * &#64TaskSessionResource
- * void setSession(GridComputeTaskSession ses) {
+ * void setSession(ComputeTaskSession ses) {
  *     this.ses = ses;
  * }
  * </pre>

http://git-wip-us.apache.org/repos/asf/ignite/blob/00f8d654/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskSplitAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskSplitAdapter.java b/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskSplitAdapter.java
index 0b62519..73ca7f7 100644
--- a/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskSplitAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskSplitAdapter.java
@@ -32,9 +32,9 @@ import org.apache.ignite.resources.LoadBalancerResource;
  * in most homogeneous environments where all nodes are equally suitable for executing grid
  * job. See {@link #split(int, Object)} method for more details.
  * <p>
- * Below is a coding example of how you would use {@code GridComputeTaskSplitAdapter}:
+ * Below is a coding example of how you would use {@code ComputeTaskSplitAdapter}:
  * <pre name="code" class="java">
- * public class MyFooBarTask extends GridComputeTaskSplitAdapter&lt;Object, String&gt; {
+ * public class MyFooBarTask extends ComputeTaskSplitAdapter&lt;Object, String&gt; {
  *     &#64;Override
  *     protected Collection&lt;? extends ComputeJob&gt; split(int gridSize, Object arg) throws IgniteCheckedException {
  *         List&lt;MyFooBarJob&gt; jobs = new ArrayList&lt;MyFooBarJob&gt;(gridSize);
@@ -49,13 +49,13 @@ import org.apache.ignite.resources.LoadBalancerResource;
  *     }
  *
  *     // Aggregate results into one compound result.
- *     public String reduce(List&lt;GridComputeJobResult&gt; results) throws IgniteCheckedException {
+ *     public String reduce(List&lt;ComputeJobResult&gt; results) throws IgniteCheckedException {
  *         // For the purpose of this example we simply
  *         // concatenate string representation of every
  *         // job result
  *         StringBuilder buf = new StringBuilder();
  *
- *         for (GridComputeJobResult res : results) {
+ *         for (ComputeJobResult res : results) {
  *             // Append string representation of result
  *             // returned by every job.
  *             buf.append(res.getData().string());

http://git-wip-us.apache.org/repos/asf/ignite/blob/00f8d654/modules/core/src/main/java/org/apache/ignite/compute/gridify/Gridify.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/compute/gridify/Gridify.java b/modules/core/src/main/java/org/apache/ignite/compute/gridify/Gridify.java
index f7d96e0..3cf1b73 100644
--- a/modules/core/src/main/java/org/apache/ignite/compute/gridify/Gridify.java
+++ b/modules/core/src/main/java/org/apache/ignite/compute/gridify/Gridify.java
@@ -92,7 +92,7 @@ import org.apache.ignite.compute.gridify.aop.GridifyDefaultTask;
  *        }));
  *    }
  *
- *    public Integer reduce(List&lt;GridComputeJobResult&gt; results) throws IgniteCheckedException {
+ *    public Integer reduce(List&lt;ComputeJobResult&gt; results) throws IgniteCheckedException {
  *        return results.size() - 1 + F.sum(F.&lt;Integer&gt;jobResults(results));
  *    }
  * }

http://git-wip-us.apache.org/repos/asf/ignite/blob/00f8d654/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/IgfsTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/IgfsTask.java b/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/IgfsTask.java
index 34eb7da..fa0f137 100644
--- a/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/IgfsTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/IgfsTask.java
@@ -53,7 +53,7 @@ import org.jetbrains.annotations.Nullable;
  * <p>
  * Finally all generated jobs are sent to Grid nodes for execution.
  * <p>
- * As with regular {@code GridComputeTask} you can define your own logic for results handling and reduce step.
+ * As with regular {@code ComputeTask} you can define your own logic for results handling and reduce step.
  * <p>
  * Here is an example of such a task:
  * <pre name="code" class="java">
@@ -66,10 +66,10 @@ import org.jetbrains.annotations.Nullable;
  *     }
  *
  *     // Aggregate results into one compound result.
- *     public Integer reduce(List&lt;GridComputeJobResult&gt; results) throws IgniteCheckedException {
+ *     public Integer reduce(List&lt;ComputeJobResult&gt; results) throws IgniteCheckedException {
  *         Integer total = 0;
  *
- *         for (GridComputeJobResult res : results) {
+ *         for (ComputeJobResult res : results) {
  *             Integer cnt = res.getData();
  *
  *             // Null can be returned for non-existent file in case we decide to ignore such situations.

http://git-wip-us.apache.org/repos/asf/ignite/blob/00f8d654/modules/core/src/main/java/org/apache/ignite/internal/GridTaskSessionImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridTaskSessionImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/GridTaskSessionImpl.java
index 677d464..bbe05b8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridTaskSessionImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridTaskSessionImpl.java
@@ -188,7 +188,7 @@ public class GridTaskSessionImpl implements GridTaskSessionInternal {
         if (!fullSup)
             throw new IllegalStateException("Sessions attributes and checkpoints are disabled by default " +
                 "for better performance (to enable, annotate task class with " +
-                "@GridComputeTaskSessionFullSupport annotation).");
+                "@ComputeTaskSessionFullSupport annotation).");
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/ignite/blob/00f8d654/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobWorker.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobWorker.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobWorker.java
index 164c9e7..5b04d6f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobWorker.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobWorker.java
@@ -849,11 +849,11 @@ public class GridJobWorker extends GridWorker implements GridTimeoutObject {
                     ((ComputeJobMasterLeaveAware)job).onMasterNodeLeft(ses.session());
 
                     if (log.isDebugEnabled())
-                        log.debug("Successfully executed GridComputeJobMasterLeaveAware.onMasterNodeLeft() callback " +
+                        log.debug("Successfully executed ComputeJobMasterLeaveAware.onMasterNodeLeft() callback " +
                             "[nodeId=" + taskNode.id() + ", jobId=" + ses.getJobId() + ", job=" + job + ']');
                 }
                 catch (Exception e) {
-                    U.error(log, "Failed to execute GridComputeJobMasterLeaveAware.onMasterNodeLeft() callback " +
+                    U.error(log, "Failed to execute ComputeJobMasterLeaveAware.onMasterNodeLeft() callback " +
                         "[nodeId=" + taskNode.id() + ", jobId=" + ses.getJobId() + ", job=" + job + ']', e);
                 }
             }

http://git-wip-us.apache.org/repos/asf/ignite/blob/00f8d654/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceJobContextInjector.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceJobContextInjector.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceJobContextInjector.java
index 3a6e779..69cab2e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceJobContextInjector.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceJobContextInjector.java
@@ -27,9 +27,9 @@ import org.apache.ignite.internal.managers.deployment.GridDeployment;
  */
 public class GridResourceJobContextInjector extends GridResourceBasicInjector<ComputeJobContext> {
     /**
-     * Creates GridComputeJobContext injector.
+     * Creates ComputeJobContext injector.
      *
-     * @param rsrc GridComputeJobContext resource to inject.
+     * @param rsrc ComputeJobContext resource to inject.
      */
     GridResourceJobContextInjector(ComputeJobContext rsrc) {
         super(rsrc);

http://git-wip-us.apache.org/repos/asf/ignite/blob/00f8d654/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskProcessor.java
index 75f3023..f54277c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskProcessor.java
@@ -719,14 +719,14 @@ public class GridTaskProcessor extends GridProcessorAdapter {
 
     /**
      * Gets task name for a task class. It firstly checks
-     * {@link @GridComputeTaskName} annotation, then thread context
+     * {@link @ComputeTaskName} annotation, then thread context
      * map. If both are empty, class name is returned.
      *
      * @param dep Deployment.
      * @param cls Class.
      * @param map Thread context map.
      * @return Task name.
-     * @throws IgniteCheckedException If {@link @GridComputeTaskName} annotation is found, but has empty value.
+     * @throws IgniteCheckedException If {@link @ComputeTaskName} annotation is found, but has empty value.
      */
     private String taskName(GridDeployment dep, Class<?> cls,
         Map<GridTaskThreadContextKey, Object> map) throws IgniteCheckedException {
@@ -742,7 +742,7 @@ public class GridTaskProcessor extends GridProcessorAdapter {
             taskName = ann.value();
 
             if (F.isEmpty(taskName))
-                throw new IgniteCheckedException("Task name specified by @GridComputeTaskName annotation" +
+                throw new IgniteCheckedException("Task name specified by @ComputeTaskName annotation" +
                     " cannot be empty for class: " + cls);
         }
         else

http://git-wip-us.apache.org/repos/asf/ignite/blob/00f8d654/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskWorker.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskWorker.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskWorker.java
index dc86343..659d5a6 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskWorker.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskWorker.java
@@ -594,7 +594,7 @@ class GridTaskWorker<T, R> extends GridWorker implements GridTimeoutObject {
                 if (resCache && jobRes.size() > ctx.discovery().size() && jobRes.size() % SPLIT_WARN_THRESHOLD == 0)
                     LT.warn(log, null, "Number of jobs in task is too large for task: " + ses.getTaskName() +
                         ". Consider reducing number of jobs or disabling job result cache with " +
-                        "@GridComputeTaskNoResultCache annotation.");
+                        "@ComputeTaskNoResultCache annotation.");
             }
         }
 
@@ -801,7 +801,7 @@ class GridTaskWorker<T, R> extends GridWorker implements GridTimeoutObject {
                 ComputeJobResultPolicy plc = result(jobRes, results);
 
                 if (plc == null) {
-                    String errMsg = "Failed to obtain remote job result policy for result from GridComputeTask.result(..) " +
+                    String errMsg = "Failed to obtain remote job result policy for result from ComputeTask.result(..) " +
                         "method that returned null (will fail the whole task): " + jobRes;
 
                     finishTask(null, new IgniteCheckedException(errMsg));
@@ -814,7 +814,7 @@ class GridTaskWorker<T, R> extends GridWorker implements GridTimeoutObject {
                     // then there is no point to proceed.
                     if (state != State.WAITING) {
                         if (log.isDebugEnabled())
-                            log.debug("Ignoring GridComputeTask.result(..) value since task is already reducing or" +
+                            log.debug("Ignoring ComputeTask.result(..) value since task is already reducing or" +
                                 "finishing [res=" + res + ", job=" + ses + ", state=" + state + ']');
 
                         return;
@@ -941,7 +941,7 @@ class GridTaskWorker<T, R> extends GridWorker implements GridTimeoutObject {
                     else if (X.hasCause(e, ComputeJobFailoverException.class)) {
                         IgniteCheckedException e0 = new IgniteCheckedException(" Job was not failed over because " +
                             "ComputeJobResultPolicy.FAILOVER was not returned from " +
-                            "ComputeTask.result(...) method for job result with GridComputeJobFailoverException.", e);
+                            "ComputeTask.result(...) method for job result with ComputeJobFailoverException.", e);
 
                         finishTask(null, e0);
 
@@ -957,7 +957,7 @@ class GridTaskWorker<T, R> extends GridWorker implements GridTimeoutObject {
                 }
                 catch (Throwable e) {
                     String errMsg = "Failed to obtain remote job result policy for result from" +
-                        "GridComputeTask.result(..) method due to undeclared user exception " +
+                        "ComputeTask.result(..) method due to undeclared user exception " +
                         "(will fail the whole task): " + jobRes;
 
                     U.error(log, errMsg, e);

http://git-wip-us.apache.org/repos/asf/ignite/blob/00f8d654/modules/core/src/main/java/org/apache/ignite/internal/util/F0.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/F0.java b/modules/core/src/main/java/org/apache/ignite/internal/util/F0.java
index 7e9e448..130987b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/F0.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/F0.java
@@ -318,7 +318,7 @@ public class F0 {
                     ids.addAll(((GridNodePredicate)p).nodeIds());
             }
 
-            // T must be <T extends GridNode>.
+            // T must be <T extends ClusterNode>.
             return (IgnitePredicate<T>)new GridNodePredicate(ids);
         }
         else {
@@ -394,7 +394,7 @@ public class F0 {
             else
                 ids.retainAll(list);
 
-            // T must be <T extends GridNode>.
+            // T must be <T extends ClusterNode>.
             return (IgnitePredicate<T>)new GridNodePredicate(ids);
         }
         else {

http://git-wip-us.apache.org/repos/asf/ignite/blob/00f8d654/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
index ad6f0e9..8a313cb 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
@@ -6523,7 +6523,7 @@ public abstract class IgniteUtils {
      * @return Short string representing the node.
      */
     public static String toShortString(ClusterNode n) {
-        return "GridNode [id=" + n.id() + ", order=" + n.order() + ", addr=" + n.addresses() +
+        return "ClusterNode [id=" + n.id() + ", order=" + n.order() + ", addr=" + n.addresses() +
             ", daemon=" + n.isDaemon() + ']';
     }
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/00f8d654/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java
index 7551b0e..8234dc4 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java
@@ -568,7 +568,7 @@ public class GridFunc {
      * Here's the typical example of how this method is used in {@code reduce()} method
      * implementation (this example sums up all the values of {@code Integer} type):
      * <pre name="code" class="java">
-     * public Integer reduce(List&lt;GridComputeJobResult&gt; res) throws IgniteCheckedException {
+     * public Integer reduce(List&lt;ComputeJobResult&gt; res) throws IgniteCheckedException {
      *     return F.sum(F.&lt;Integer&gt;jobResults(res));
      * }
      * </pre>
@@ -3014,7 +3014,7 @@ public class GridFunc {
                 }
             }
 
-            // T must be <T extends GridNode>.
+            // T must be <T extends ClusterNode>.
             return (IgnitePredicate<T>)new GridNodePredicate(ids);
         }
         else {

http://git-wip-us.apache.org/repos/asf/ignite/blob/00f8d654/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/PN.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/PN.java b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/PN.java
index c706873..8623555 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/PN.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/PN.java
@@ -22,7 +22,7 @@ import org.apache.ignite.internal.util.lang.GridFunc;
 import org.apache.ignite.lang.IgnitePredicate;
 
 /**
- * Defines {@code alias} for <tt>GridPredicate&lt;GridNode&gt;</tt> by extending
+ * Defines {@code alias} for <tt>GridPredicate&lt;ClusterNode&gt;</tt> by extending
  * {@link org.apache.ignite.lang.IgnitePredicate}. Since Java doesn't provide type aliases (like Scala, for example) we resort
  * to these types of measures. This is intended to provide for more concise code without sacrificing
  * readability. For more information see {@link org.apache.ignite.lang.IgnitePredicate} and {@link org.apache.ignite.cluster.ClusterNode}.

http://git-wip-us.apache.org/repos/asf/ignite/blob/00f8d654/modules/core/src/main/java/org/apache/ignite/spi/collision/jobstealing/JobStealingDisabled.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/collision/jobstealing/JobStealingDisabled.java b/modules/core/src/main/java/org/apache/ignite/spi/collision/jobstealing/JobStealingDisabled.java
index 9aad93d..bf16a68 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/collision/jobstealing/JobStealingDisabled.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/collision/jobstealing/JobStealingDisabled.java
@@ -31,7 +31,7 @@ import java.lang.annotation.Target;
  * Here is an example of how this annotation can be attached to a job class:
  * <pre name="code" class="java">
  * &#64;GridJobStealingDisabled
- * public class MyJob extends GridComputeJobAdapter&lt;Object&gt; {
+ * public class MyJob extends ComputeJobAdapter&lt;Object&gt; {
  *     public Serializable execute() throws IgniteCheckedException {
  *         // Job logic goes here.
  *         ...

http://git-wip-us.apache.org/repos/asf/ignite/blob/00f8d654/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
index 080437d..904047e 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
@@ -2422,7 +2422,7 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter
 
                         if (errs == null)
                             errs = new IgniteCheckedException("Failed to connect to node (is node still alive?). " +
-                                "Make sure that each GridComputeTask and GridCacheTransaction has a timeout set " +
+                                "Make sure that each ComputeTask and GridCacheTransaction has a timeout set " +
                                 "in order to prevent parties from waiting forever in case of network issues " +
                                 "[nodeId=" + node.id() + ", addrs=" + addrs + ']');
 
@@ -2450,7 +2450,7 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter
 
                         if (errs == null)
                             errs = new IgniteCheckedException("Failed to connect to node (is node still alive?). " +
-                                "Make sure that each GridComputeTask and GridCacheTransaction has a timeout set " +
+                                "Make sure that each ComputeTask and GridCacheTransaction has a timeout set " +
                                 "in order to prevent parties from waiting forever in case of network issues " +
                                 "[nodeId=" + node.id() + ", addrs=" + addrs + ']');
 
@@ -2490,7 +2490,7 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter
 
                     if (errs == null)
                         errs = new IgniteCheckedException("Failed to connect to node (is node still alive?). " +
-                            "Make sure that each GridComputeTask and GridCacheTransaction has a timeout set " +
+                            "Make sure that each ComputeTask and GridCacheTransaction has a timeout set " +
                             "in order to prevent parties from waiting forever in case of network issues " +
                             "[nodeId=" + node.id() + ", addrs=" + addrs + ']');
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/00f8d654/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/LoadBalancingSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/LoadBalancingSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/LoadBalancingSpi.java
index 6431fab..9d0c2b1 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/LoadBalancingSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/LoadBalancingSpi.java
@@ -34,7 +34,7 @@ import org.apache.ignite.spi.IgniteSpi;
  * is transparent to your code and is handled automatically by the adapter.
  * Here is an example of how your task could look:
  * <pre name="code" class="java">
- * public class MyFooBarTask extends GridComputeTaskSplitAdapter&lt;Object,Object&gt; {
+ * public class MyFooBarTask extends ComputeTaskSplitAdapter&lt;Object,Object&gt; {
  *    &#64;Override
  *    protected Collection&lt;? extends ComputeJob&gt; split(int gridSize, Object arg) throws IgniteCheckedException {
  *        List&lt;MyFooBarJob&gt; jobs = new ArrayList&lt;MyFooBarJob&gt;(gridSize);
@@ -56,14 +56,14 @@ import org.apache.ignite.spi.IgniteSpi;
  * case we manually inject load balancer and use it to pick the best node. Doing it in
  * such way would allow user to map some jobs manually and for others use load balancer.
  * <pre name="code" class="java">
- * public class MyFooBarTask extends GridComputeTaskAdapter&lt;String,String&gt; {
+ * public class MyFooBarTask extends ComputeTaskAdapter&lt;String,String&gt; {
  *    // Inject load balancer.
  *    &#64;LoadBalancerResource
  *    ComputeLoadBalancer balancer;
  *
  *    // Map jobs to grid nodes.
- *    public Map&lt;? extends ComputeJob, GridNode&gt; map(List&lt;GridNode&gt; subgrid, String arg) throws IgniteCheckedException {
- *        Map&lt;MyFooBarJob, GridNode&gt; jobs = new HashMap&lt;MyFooBarJob, GridNode&gt;(subgrid.size());
+ *    public Map&lt;? extends ComputeJob, ClusterNode&gt; map(List&lt;ClusterNode&gt; subgrid, String arg) throws IgniteCheckedException {
+ *        Map&lt;MyFooBarJob, ClusterNode&gt; jobs = new HashMap&lt;MyFooBarJob, ClusterNode&gt;(subgrid.size());
  *
  *        // In more complex cases, you can actually do
  *        // more complicated assignments of jobs to nodes.

http://git-wip-us.apache.org/repos/asf/ignite/blob/00f8d654/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/adaptive/AdaptiveLoadBalancingSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/adaptive/AdaptiveLoadBalancingSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/adaptive/AdaptiveLoadBalancingSpi.java
index 3db9441..82bc015 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/adaptive/AdaptiveLoadBalancingSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/adaptive/AdaptiveLoadBalancingSpi.java
@@ -116,7 +116,7 @@ import static org.apache.ignite.events.EventType.EVT_TASK_FINISHED;
  *     }
  *
  *     // Calculate load based on number of active and waiting jobs.
- *     public double getLoad(GridNode node, int jobsSentSinceLastUpdate) {
+ *     public double getLoad(ClusterNode node, int jobsSentSinceLastUpdate) {
  *         GridNodeMetrics metrics = node.getMetrics();
  *
  *         if (useAvg) {
@@ -143,7 +143,7 @@ import static org.apache.ignite.events.EventType.EVT_TASK_FINISHED;
  * is transparent to your code and is handled automatically by the adapter.
  * Here is an example of how your task will look:
  * <pre name="code" class="java">
- * public class MyFooBarTask extends GridComputeTaskSplitAdapter&lt;Object, Object&gt; {
+ * public class MyFooBarTask extends ComputeTaskSplitAdapter&lt;Object, Object&gt; {
  *    &#64;Override
  *    protected Collection&lt;? extends ComputeJob&gt; split(int gridSize, Object arg) throws IgniteCheckedException {
  *        List&lt;MyFooBarJob&gt; jobs = new ArrayList&lt;MyFooBarJob&gt;(gridSize);
@@ -165,14 +165,14 @@ import static org.apache.ignite.events.EventType.EVT_TASK_FINISHED;
  * case we manually inject load balancer and use it to pick the best node. Doing it in
  * such way would allow user to map some jobs manually and for others use load balancer.
  * <pre name="code" class="java">
- * public class MyFooBarTask extends GridComputeTaskAdapter&lt;String, String&gt; {
+ * public class MyFooBarTask extends ComputeTaskAdapter&lt;String, String&gt; {
  *    // Inject load balancer.
  *    &#64;LoadBalancerResource
  *    ComputeLoadBalancer balancer;
  *
  *    // Map jobs to grid nodes.
- *    public Map&lt;? extends ComputeJob, GridNode&gt; map(List&lt;GridNode&gt; subgrid, String arg) throws IgniteCheckedException {
- *        Map&lt;MyFooBarJob, GridNode&gt; jobs = new HashMap&lt;MyFooBarJob, GridNode&gt;(subgrid.size());
+ *    public Map&lt;? extends ComputeJob, ClusterNode&gt; map(List&lt;ClusterNode&gt; subgrid, String arg) throws IgniteCheckedException {
+ *        Map&lt;MyFooBarJob, ClusterNode&gt; jobs = new HashMap&lt;MyFooBarJob, ClusterNode&gt;(subgrid.size());
  *
  *        // In more complex cases, you can actually do
  *        // more complicated assignments of jobs to nodes.
@@ -185,13 +185,13 @@ import static org.apache.ignite.events.EventType.EVT_TASK_FINISHED;
  *    }
  *
  *    // Aggregate results into one compound result.
- *    public String reduce(List&lt;GridComputeJobResult&gt; results) throws IgniteCheckedException {
+ *    public String reduce(List&lt;ComputeJobResult&gt; results) throws IgniteCheckedException {
  *        // For the purpose of this example we simply
  *        // concatenate string representation of every
  *        // job result
  *        StringBuilder buf = new StringBuilder();
  *
- *        for (GridComputeJobResult res : results) {
+ *        for (ComputeJobResult res : results) {
  *            // Append string representation of result
  *            // returned by every job.
  *            buf.append(res.getData().string());
@@ -351,7 +351,7 @@ public class AdaptiveLoadBalancingSpi extends IgniteSpiAdapter implements LoadBa
                     }
 
                     case EVT_JOB_MAPPED: {
-                        // We should keep topology and use cache in GridComputeTask#map() method to
+                        // We should keep topology and use cache in ComputeTask#map() method to
                         // avoid O(n*n/2) complexity, after that we can drop caches.
                         // Here we set mapped property and later cache will be ignored
                         JobEvent jobEvt = (JobEvent)evt;
@@ -448,11 +448,11 @@ public class AdaptiveLoadBalancingSpi extends IgniteSpiAdapter implements LoadBa
         // Create new cached topology if there is no one. Do not
         // use cached topology after task has been mapped.
         if (weightedTop == null)
-            // Called from GridComputeTask#map(). Put new topology and false as not mapped yet.
+            // Called from ComputeTask#map(). Put new topology and false as not mapped yet.
             taskTops.put(ses.getId(), weightedTop = F.t(false, new WeightedTopology(top)));
         // We have topology - check if task has been mapped.
         else if (weightedTop.get1())
-            // Do not use cache after GridComputeTask#map().
+            // Do not use cache after ComputeTask#map().
             return new WeightedTopology(top).pickWeightedNode();
 
         return weightedTop.get2().pickWeightedNode();

http://git-wip-us.apache.org/repos/asf/ignite/blob/00f8d654/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/adaptive/AdaptiveLoadProbe.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/adaptive/AdaptiveLoadProbe.java b/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/adaptive/AdaptiveLoadProbe.java
index eb23d97..57fa4a9 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/adaptive/AdaptiveLoadProbe.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/adaptive/AdaptiveLoadProbe.java
@@ -46,7 +46,7 @@ import org.apache.ignite.cluster.ClusterNode;
  *     }
  *
  *     // Calculate load based on number of active and waiting jobs.
- *     public double getLoad(GridNode node, int jobsSentSinceLastUpdate) {
+ *     public double getLoad(ClusterNode node, int jobsSentSinceLastUpdate) {
  *         GridNodeMetrics metrics = node.getMetrics();
  *
  *         if (useAvg) {

http://git-wip-us.apache.org/repos/asf/ignite/blob/00f8d654/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/roundrobin/RoundRobinLoadBalancingSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/roundrobin/RoundRobinLoadBalancingSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/roundrobin/RoundRobinLoadBalancingSpi.java
index 170e6be..069641b 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/roundrobin/RoundRobinLoadBalancingSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/roundrobin/RoundRobinLoadBalancingSpi.java
@@ -71,7 +71,7 @@ import static org.apache.ignite.events.EventType.EVT_TASK_FINISHED;
  * is transparent to your code and is handled automatically by the adapter.
  * Here is an example of how your task will look:
  * <pre name="code" class="java">
- * public class MyFooBarTask extends GridComputeTaskSplitAdapter&lt;Object, Object&gt; {
+ * public class MyFooBarTask extends ComputeTaskSplitAdapter&lt;Object, Object&gt; {
  *    &#64;Override
  *    protected Collection&lt;? extends ComputeJob&gt; split(int gridSize, Object arg) throws IgniteCheckedException {
  *        List&lt;MyFooBarJob&gt; jobs = new ArrayList&lt;MyFooBarJob&gt;(gridSize);
@@ -99,8 +99,8 @@ import static org.apache.ignite.events.EventType.EVT_TASK_FINISHED;
  *    ComputeLoadBalancer balancer;
  *
  *    // Map jobs to grid nodes.
- *    public Map&lt;? extends ComputeJob, GridNode&gt; map(List&lt;GridNode&gt; subgrid, String arg) throws IgniteCheckedException {
- *        Map&lt;MyFooBarJob, GridNode&gt; jobs = new HashMap&lt;MyFooBarJob, GridNode&gt;(subgrid.size());
+ *    public Map&lt;? extends ComputeJob, ClusterNode&gt; map(List&lt;ClusterNode&gt; subgrid, String arg) throws IgniteCheckedException {
+ *        Map&lt;MyFooBarJob, ClusterNode&gt; jobs = new HashMap&lt;MyFooBarJob, ClusterNode&gt;(subgrid.size());
  *
  *        // In more complex cases, you can actually do
  *        // more complicated assignments of jobs to nodes.

http://git-wip-us.apache.org/repos/asf/ignite/blob/00f8d654/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/weightedrandom/WeightedRandomLoadBalancingSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/weightedrandom/WeightedRandomLoadBalancingSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/weightedrandom/WeightedRandomLoadBalancingSpi.java
index 05dd3cb..1f69b52 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/weightedrandom/WeightedRandomLoadBalancingSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/weightedrandom/WeightedRandomLoadBalancingSpi.java
@@ -64,7 +64,7 @@ import static org.apache.ignite.events.EventType.EVT_TASK_FINISHED;
  * is transparent to your code and is handled automatically by the adapter.
  * Here is an example of how your task could look:
  * <pre name="code" class="java">
- * public class MyFooBarTask extends GridComputeTaskSplitAdapter&lt;Object, Object&gt; {
+ * public class MyFooBarTask extends ComputeTaskSplitAdapter&lt;Object, Object&gt; {
  *    &#64;Override
  *    protected Collection&lt;? extends ComputeJob&gt; split(int gridSize, Object arg) throws IgniteCheckedException {
  *        List&lt;MyFooBarJob&gt; jobs = new ArrayList&lt;MyFooBarJob&gt;(gridSize);
@@ -86,14 +86,14 @@ import static org.apache.ignite.events.EventType.EVT_TASK_FINISHED;
  * case we manually inject load balancer and use it to pick the best node. Doing it in
  * such way would allow user to map some jobs manually and for others use load balancer.
  * <pre name="code" class="java">
- * public class MyFooBarTask extends GridComputeTaskAdapter&lt;String, String&gt; {
+ * public class MyFooBarTask extends ComputeTaskAdapter&lt;String, String&gt; {
  *    // Inject load balancer.
  *    &#64;LoadBalancerResource
  *    ComputeLoadBalancer balancer;
  *
  *    // Map jobs to grid nodes.
- *    public Map&lt;? extends ComputeJob, GridNode&gt; map(List&lt;GridNode&gt; subgrid, String arg) throws IgniteCheckedException {
- *        Map&lt;MyFooBarJob, GridNode&gt; jobs = new HashMap&lt;MyFooBarJob, GridNode&gt;(subgrid.size());
+ *    public Map&lt;? extends ComputeJob, ClusterNode&gt; map(List&lt;ClusterNode&gt; subgrid, String arg) throws IgniteCheckedException {
+ *        Map&lt;MyFooBarJob, ClusterNode&gt; jobs = new HashMap&lt;MyFooBarJob, ClusterNode&gt;(subgrid.size());
  *
  *        // In more complex cases, you can actually do
  *        // more complicated assignments of jobs to nodes.
@@ -291,7 +291,7 @@ public class WeightedRandomLoadBalancingSpi extends IgniteSpiAdapter implements
                     if (log.isDebugEnabled())
                         log.debug("Removed task topology from topology cache for session: " + sesId);
                 }
-                // We should keep topology and use cache in GridComputeTask#map() method to
+                // We should keep topology and use cache in ComputeTask#map() method to
                 // avoid O(n*n/2) complexity, after that we can drop caches.
                 // Here we set mapped property and later cache will be ignored
                 else if (evt.type() == EVT_JOB_MAPPED) {
@@ -338,12 +338,12 @@ public class WeightedRandomLoadBalancingSpi extends IgniteSpiAdapter implements
         // Create new cached topology if there is no one. Do not
         // use cached topology after task has been mapped.
         if (weightedTop == null) {
-            // Called from GridComputeTask#map(). Put new topology and false as not mapped yet.
+            // Called from ComputeTask#map(). Put new topology and false as not mapped yet.
             taskTops.put(ses.getId(), weightedTop = F.t(false, new WeightedTopology(top)));
         }
         // We have topology - check if task has been mapped.
         else if (weightedTop.get1()) {
-            // Do not use cache after GridComputeTask#map().
+            // Do not use cache after ComputeTask#map().
             return new WeightedTopology(top).pickWeightedNode();
         }
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/00f8d654/modules/core/src/test/java/org/apache/ignite/internal/GridEventStorageCheckAllEventsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridEventStorageCheckAllEventsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridEventStorageCheckAllEventsSelfTest.java
index ad15894..c3f77c7 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridEventStorageCheckAllEventsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridEventStorageCheckAllEventsSelfTest.java
@@ -198,7 +198,7 @@ public class GridEventStorageCheckAllEventsSelfTest extends GridCommonAbstractTe
         try {
             fut.get();
 
-            assert false : "Grid with locally executed job with timeout should throw GridComputeTaskTimeoutException.";
+            assert false : "Grid with locally executed job with timeout should throw ComputeTaskTimeoutException.";
         }
         catch (IgniteException e) {
             info("Expected exception caught [taskFuture=" + fut + ", exception=" + e + ']');

http://git-wip-us.apache.org/repos/asf/ignite/blob/00f8d654/modules/core/src/test/java/org/apache/ignite/loadtests/communication/GridTcpCommunicationBenchmark.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/communication/GridTcpCommunicationBenchmark.java b/modules/core/src/test/java/org/apache/ignite/loadtests/communication/GridTcpCommunicationBenchmark.java
index d732b14..b6c6797 100644
--- a/modules/core/src/test/java/org/apache/ignite/loadtests/communication/GridTcpCommunicationBenchmark.java
+++ b/modules/core/src/test/java/org/apache/ignite/loadtests/communication/GridTcpCommunicationBenchmark.java
@@ -52,7 +52,7 @@ package org.apache.ignite.loadtests.communication;
 //    private final Map<UUID, GridCommunicationSpi> spis = new HashMap<>();
 //
 //    /** */
-//    private final Collection<GridNode> nodes = new ArrayList<>();
+//    private final Collection<ClusterNode> nodes = new ArrayList<>();
 //
 //    /**
 //     * Disable automatic test SPI start.
@@ -63,7 +63,7 @@ package org.apache.ignite.loadtests.communication;
 //
 //    /** {@inheritDoc} */
 //    @Override protected void beforeTest() throws Exception {
-//        Map<GridNode, GridSpiTestContext> ctxs = new HashMap<>();
+//        Map<ClusterNode, GridSpiTestContext> ctxs = new HashMap<>();
 //
 //        for (int i = 0; i < 2; i++) {
 //            GridCommunicationSpi spi = getCommunication();
@@ -94,8 +94,8 @@ package org.apache.ignite.loadtests.communication;
 //        }
 //
 //        // For each context set remote nodes.
-//        for (Map.Entry<GridNode, GridSpiTestContext> e : ctxs.entrySet()) {
-//            for (GridNode n : nodes) {
+//        for (Map.Entry<ClusterNode, GridSpiTestContext> e : ctxs.entrySet()) {
+//            for (ClusterNode n : nodes) {
 //                if (!n.equals(e.getKey()))
 //                    e.getValue().remoteNodes().add(n);
 //            }
@@ -136,10 +136,10 @@ package org.apache.ignite.loadtests.communication;
 //        assert spis.size() == 2;
 //        assert nodes.size() == 2;
 //
-//        Iterator<GridNode> it = nodes.iterator();
+//        Iterator<ClusterNode> it = nodes.iterator();
 //
-//        final GridNode sndNode = it.next();
-//        final GridNode rcvNode = it.next();
+//        final ClusterNode sndNode = it.next();
+//        final ClusterNode rcvNode = it.next();
 //
 //        final GridCommunicationSpi sndComm = spis.get(sndNode.id());
 //        final GridCommunicationSpi rcvComm = spis.get(rcvNode.id());
@@ -250,10 +250,10 @@ package org.apache.ignite.loadtests.communication;
 //        assert spis.size() == 2;
 //        assert nodes.size() == 2;
 //
-//        Iterator<GridNode> it = nodes.iterator();
+//        Iterator<ClusterNode> it = nodes.iterator();
 //
-//        final GridNode sndNode = it.next();
-//        final GridNode rcvNode = it.next();
+//        final ClusterNode sndNode = it.next();
+//        final ClusterNode rcvNode = it.next();
 //
 //        final GridCommunicationSpi sndComm = spis.get(sndNode.id());
 //        final GridCommunicationSpi rcvComm = spis.get(rcvNode.id());
@@ -377,10 +377,10 @@ package org.apache.ignite.loadtests.communication;
 //        assert spis.size() == 2;
 //        assert nodes.size() == 2;
 //
-//        Iterator<GridNode> it = nodes.iterator();
+//        Iterator<ClusterNode> it = nodes.iterator();
 //
-//        final GridNode sndNode = it.next();
-//        final GridNode rcvNode = it.next();
+//        final ClusterNode sndNode = it.next();
+//        final ClusterNode rcvNode = it.next();
 //
 //        final GridCommunicationSpi sndComm = spis.get(sndNode.id());
 //        final GridCommunicationSpi rcvComm = spis.get(rcvNode.id());

http://git-wip-us.apache.org/repos/asf/ignite/blob/00f8d654/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PMissedResourceCacheSizeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PMissedResourceCacheSizeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PMissedResourceCacheSizeSelfTest.java
index 817b1ff..909089e 100644
--- a/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PMissedResourceCacheSizeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PMissedResourceCacheSizeSelfTest.java
@@ -189,8 +189,8 @@ public class GridP2PMissedResourceCacheSizeSelfTest extends GridCommonAbstractTe
 //
 //            g1.deployTask(task1);
 //            g1.deployTask(task2);
-//            g1.queryEvents(filter1, 0, F.<GridNode>localNode(g1)); // Deploy filter1.
-//            g1.queryEvents(filter2, 0, F.<GridNode>localNode(g2)); // Deploy filter2.
+//            g1.queryEvents(filter1, 0, F.<ClusterNode>localNode(g1)); // Deploy filter1.
+//            g1.queryEvents(filter2, 0, F.<ClusterNode>localNode(g2)); // Deploy filter2.
 //
 //            ldr.setExcludeClassNames(TASK_NAME1, TASK_NAME2, FILTER_NAME1, FILTER_NAME2);
 //
@@ -212,7 +212,7 @@ public class GridP2PMissedResourceCacheSizeSelfTest extends GridCommonAbstractTe
 //            executeFail(g1, filter2);
 //            executeFail(g1, g2, task2);
 //
-//            g1.queryEvents(filter1, 0, F.<GridNode>alwaysTrue());
+//            g1.queryEvents(filter1, 0, F.<ClusterNode>alwaysTrue());
 //
 //            g1.execute(task1, g2.localNode().id()).get();
 //        }

http://git-wip-us.apache.org/repos/asf/ignite/blob/00f8d654/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 c7fa9fe..737a798 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
@@ -579,7 +579,7 @@ class ScalarProjectionPimp[A <: ClusterGroup] extends PimpedType[A] with Iterabl
      * All default SPI implementations configured for this grid instance will be
      * used (i.e. failover, load balancing, collision resolution, etc.).
      * Note that if you need greater control on any aspects of Java code execution on the grid
-     * you should implement `GridComputeTask` which will provide you with full control over the execution.
+     * you should implement `ComputeTask` which will provide you with full control over the execution.
      *
      * Notice that `Runnable` and `Callable` implementations must support serialization as required
      * by the configured marshaller. For example, JDK marshaller will require that implementations would
@@ -616,7 +616,7 @@ class ScalarProjectionPimp[A <: ClusterGroup] extends PimpedType[A] with Iterabl
      * not block and returns immediately with future. All default SPI implementations
      * configured for this grid instance will be used (i.e. failover, load balancing, collision resolution, etc.).
      * Note that if you need greater control on any aspects of Java code execution on the grid
-     * you should implement `GridComputeTask` which will provide you with full control over the execution.
+     * you should implement `ComputeTask` which will provide you with full control over the execution.
      *
      * Note that class `GridAbsClosure` implements `Runnable` and class `GridOutClosure`
      * implements `Callable` interface. Note also that class `GridFunc` and typedefs provide rich

http://git-wip-us.apache.org/repos/asf/ignite/blob/00f8d654/modules/scalar/src/main/scala/org/apache/ignite/scalar/pimps/ScalarTaskThreadContext.scala
----------------------------------------------------------------------
diff --git a/modules/scalar/src/main/scala/org/apache/ignite/scalar/pimps/ScalarTaskThreadContext.scala b/modules/scalar/src/main/scala/org/apache/ignite/scalar/pimps/ScalarTaskThreadContext.scala
index 1fe0352..544ed40 100644
--- a/modules/scalar/src/main/scala/org/apache/ignite/scalar/pimps/ScalarTaskThreadContext.scala
+++ b/modules/scalar/src/main/scala/org/apache/ignite/scalar/pimps/ScalarTaskThreadContext.scala
@@ -30,7 +30,7 @@ import org.jetbrains.annotations._
  */
 trait ScalarTaskThreadContext[T <: ClusterGroup] extends ScalarConversions { this: PimpedType[T] =>
     /**
-     * Properly typed version of `GridCompute#withName(...)` method.
+     * Properly typed version of `Compute#withName(...)` method.
      *
      * @param taskName Name of the task.
      */
@@ -38,7 +38,7 @@ trait ScalarTaskThreadContext[T <: ClusterGroup] extends ScalarConversions { thi
         value.ignite().compute(value).withName(taskName).asInstanceOf[T]
 
     /**
-     * Properly typed version of `GridCompute#withNoFailover()` method.
+     * Properly typed version of `Compute#withNoFailover()` method.
      */
     def withNoFailover$(): T =
         value.ignite().compute(value).withNoFailover().asInstanceOf[T]

http://git-wip-us.apache.org/repos/asf/ignite/blob/00f8d654/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentFileProcessor.java
----------------------------------------------------------------------
diff --git a/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentFileProcessor.java b/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentFileProcessor.java
index f507c11..d82a57e 100644
--- a/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentFileProcessor.java
+++ b/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentFileProcessor.java
@@ -343,7 +343,7 @@ final class GridUriDeploymentFileProcessor {
             for (Class<? extends ComputeTask<?, ?>> task : tasks) {
                 if (!isAllowedTaskClass(task)) {
                     U.warn(log, "Failed to load task. Task should be public none-abstract class " +
-                        "(might be inner static one) that implements GridComputeTask interface [taskCls=" + task + ']');
+                        "(might be inner static one) that implements ComputeTask interface [taskCls=" + task + ']');
                 }
                 else {
                     if (log.isDebugEnabled())

http://git-wip-us.apache.org/repos/asf/ignite/blob/00f8d654/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/top/VisorTopologyCommand.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/top/VisorTopologyCommand.scala b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/top/VisorTopologyCommand.scala
index d2ec662..63b6d2b 100644
--- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/top/VisorTopologyCommand.scala
+++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/top/VisorTopologyCommand.scala
@@ -152,7 +152,7 @@ class VisorTopologyCommand extends VisorConsoleCommand {
 
             val all = hasArgFlag("a", argLst)
 
-            var f: NodeFilter = (GridNode) => true
+            var f: NodeFilter = (ClusterNode) => true
 
             try {
                 argLst foreach (arg => {

http://git-wip-us.apache.org/repos/asf/ignite/blob/00f8d654/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala b/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala
index 335eb9f..3b4bf82 100644
--- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala
+++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala
@@ -244,7 +244,7 @@ object visor extends VisorTag {
      * Get grid node for specified ID.
      *
      * @param nid Node ID.
-     * @return GridNode instance.
+     * @return ClusterNode instance.
      * @throws IgniteException if Visor is disconnected or node not found.
      */
     def node(nid: UUID): ClusterNode = {


Mime
View raw message