You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2014/12/09 14:57:26 UTC
incubator-ignite git commit: # Ignite: fix for AOP and fix
GridComputeJob - ComputeJob.
Repository: incubator-ignite
Updated Branches:
refs/heads/master 70b8af951 -> 06fbf5735
# Ignite: fix for AOP and fix GridComputeJob - ComputeJob.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/06fbf573
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/06fbf573
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/06fbf573
Branch: refs/heads/master
Commit: 06fbf5735caa7e30d52c121389875ab974f96ddd
Parents: 70b8af9
Author: sboikov <sb...@gridgain.com>
Authored: Tue Dec 9 16:57:15 2014 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Tue Dec 9 16:57:15 2014 +0300
----------------------------------------------------------------------
.../compute/gridify/aop/aspectj/GridifyAspectJAspect.java | 2 +-
.../gridify/aop/aspectj/GridifySetToSetAspectJAspect.java | 2 +-
.../gridify/aop/aspectj/GridifySetToValueAspectJAspect.java | 2 +-
modules/aop/src/test/config/aop/aspectj/META-INF/aop.xml | 4 ++--
.../java/org/gridgain/grid/gridify/GridAbstractAopTest.java | 2 +-
.../org/gridgain/grid/gridify/GridNonSpringAopSelfTest.java | 2 +-
.../java/org/apache/ignite/compute/ComputeJobAfterSend.java | 2 +-
.../org/apache/ignite/compute/ComputeJobBeforeFailover.java | 2 +-
.../apache/ignite/compute/ComputeJobContinuationAdapter.java | 2 +-
.../java/org/apache/ignite/compute/ComputeLoadBalancer.java | 6 +++---
.../src/main/java/org/apache/ignite/compute/ComputeTask.java | 4 ++--
.../java/org/apache/ignite/compute/ComputeTaskAdapter.java | 2 +-
.../org/apache/ignite/compute/ComputeTaskSplitAdapter.java | 2 +-
.../java/org/apache/ignite/marshaller/IgniteMarshaller.java | 4 ++--
.../apache/ignite/marshaller/jdk/IgniteJdkMarshaller.java | 4 ++--
.../marshaller/optimized/IgniteOptimizedMarshaller.java | 4 ++--
.../ignite/resources/IgniteExecutorServiceResource.java | 4 ++--
.../java/org/apache/ignite/resources/IgniteHomeResource.java | 4 ++--
.../org/apache/ignite/resources/IgniteInstanceResource.java | 4 ++--
.../apache/ignite/resources/IgniteJobContextResource.java | 4 ++--
.../org/apache/ignite/resources/IgniteLocalHostResource.java | 4 ++--
.../apache/ignite/resources/IgniteLocalNodeIdResource.java | 4 ++--
.../org/apache/ignite/resources/IgniteLoggerResource.java | 4 ++--
.../apache/ignite/resources/IgniteMBeanServerResource.java | 4 ++--
.../apache/ignite/resources/IgniteMarshallerResource.java | 4 ++--
.../java/org/apache/ignite/resources/IgniteNameResource.java | 4 ++--
.../org/apache/ignite/resources/IgniteServiceResource.java | 4 ++--
.../resources/IgniteSpringApplicationContextResource.java | 4 ++--
.../org/apache/ignite/resources/IgniteSpringResource.java | 4 ++--
.../ignite/resources/IgniteTaskContinuousMapperResource.java | 4 ++--
.../apache/ignite/resources/IgniteTaskSessionResource.java | 4 ++--
.../java/org/apache/ignite/resources/IgniteUserResource.java | 4 ++--
.../collision/priorityqueue/PriorityQueueCollisionSpi.java | 8 ++++----
.../apache/ignite/spi/loadbalancing/LoadBalancingSpi.java | 6 +++---
.../spi/loadbalancing/adaptive/AdaptiveLoadBalancingSpi.java | 4 ++--
.../loadbalancing/roundrobin/RoundRobinLoadBalancingSpi.java | 4 ++--
.../weightedrandom/WeightedRandomLoadBalancingSpi.java | 4 ++--
.../managers/deployment/GridDeploymentClassLoader.java | 4 ++--
.../main/scala/org/gridgain/scalar/ScalarConversions.scala | 2 +-
.../src/main/scala/org/gridgain/scalar/lang/ScalarJob.scala | 2 +-
40 files changed, 72 insertions(+), 72 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06fbf573/modules/aop/src/main/java/org/gridgain/grid/compute/gridify/aop/aspectj/GridifyAspectJAspect.java
----------------------------------------------------------------------
diff --git a/modules/aop/src/main/java/org/gridgain/grid/compute/gridify/aop/aspectj/GridifyAspectJAspect.java b/modules/aop/src/main/java/org/gridgain/grid/compute/gridify/aop/aspectj/GridifyAspectJAspect.java
index dd9a54f..a42d3a0 100644
--- a/modules/aop/src/main/java/org/gridgain/grid/compute/gridify/aop/aspectj/GridifyAspectJAspect.java
+++ b/modules/aop/src/main/java/org/gridgain/grid/compute/gridify/aop/aspectj/GridifyAspectJAspect.java
@@ -42,7 +42,7 @@ public class GridifyAspectJAspect {
* @throws Throwable If execution failed.
*/
@SuppressWarnings({"ProhibitedExceptionDeclared", "ProhibitedExceptionThrown", "CatchGenericClass", "unchecked"})
- @Around("execution(@org.gridgain.grid.compute.gridify.Gridify * *(..)) && !cflow(call(* org.gridgain.grid.compute.GridComputeJob.*(..)))")
+ @Around("execution(@org.apache.ignite.compute.gridify.Gridify * *(..)) && !cflow(call(* org.apache.ignite.compute.ComputeJob.*(..)))")
public Object gridify(ProceedingJoinPoint joinPnt) throws Throwable {
Method mtd = ((MethodSignature) joinPnt.getSignature()).getMethod();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06fbf573/modules/aop/src/main/java/org/gridgain/grid/compute/gridify/aop/aspectj/GridifySetToSetAspectJAspect.java
----------------------------------------------------------------------
diff --git a/modules/aop/src/main/java/org/gridgain/grid/compute/gridify/aop/aspectj/GridifySetToSetAspectJAspect.java b/modules/aop/src/main/java/org/gridgain/grid/compute/gridify/aop/aspectj/GridifySetToSetAspectJAspect.java
index a3cdadb..f1a1417 100644
--- a/modules/aop/src/main/java/org/gridgain/grid/compute/gridify/aop/aspectj/GridifySetToSetAspectJAspect.java
+++ b/modules/aop/src/main/java/org/gridgain/grid/compute/gridify/aop/aspectj/GridifySetToSetAspectJAspect.java
@@ -43,7 +43,7 @@ public class GridifySetToSetAspectJAspect extends GridifySetToSetAbstractAspect
* @throws Throwable If execution failed.
*/
@SuppressWarnings({"ProhibitedExceptionDeclared", "ProhibitedExceptionThrown", "CatchGenericClass"})
- @Around("execution(@org.gridgain.grid.compute.gridify.GridifySetToSet * *(..)) && !cflow(call(* org.gridgain.grid.compute.GridComputeJob.*(..)))")
+ @Around("execution(@org.apache.ignite.compute.gridify.GridifySetToSet * *(..)) && !cflow(call(* org.apache.ignite.compute.ComputeJob.*(..)))")
public Object gridify(ProceedingJoinPoint joinPnt) throws Throwable {
Method mtd = ((MethodSignature) joinPnt.getSignature()).getMethod();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06fbf573/modules/aop/src/main/java/org/gridgain/grid/compute/gridify/aop/aspectj/GridifySetToValueAspectJAspect.java
----------------------------------------------------------------------
diff --git a/modules/aop/src/main/java/org/gridgain/grid/compute/gridify/aop/aspectj/GridifySetToValueAspectJAspect.java b/modules/aop/src/main/java/org/gridgain/grid/compute/gridify/aop/aspectj/GridifySetToValueAspectJAspect.java
index fb76b7b..706daa4 100644
--- a/modules/aop/src/main/java/org/gridgain/grid/compute/gridify/aop/aspectj/GridifySetToValueAspectJAspect.java
+++ b/modules/aop/src/main/java/org/gridgain/grid/compute/gridify/aop/aspectj/GridifySetToValueAspectJAspect.java
@@ -43,7 +43,7 @@ public class GridifySetToValueAspectJAspect extends GridifySetToValueAbstractAsp
* @throws Throwable If execution failed.
*/
@SuppressWarnings({"ProhibitedExceptionDeclared", "ProhibitedExceptionThrown", "CatchGenericClass"})
- @Around("execution(@org.gridgain.grid.compute.gridify.GridifySetToValue * *(..)) && !cflow(call(* org.gridgain.grid.compute.GridComputeJob.*(..)))")
+ @Around("execution(@org.apache.ignite.compute.gridify.GridifySetToValue * *(..)) && !cflow(call(* org.apache.ignite.compute.ComputeJob.*(..)))")
public Object gridify(ProceedingJoinPoint joinPnt) throws Throwable {
Method mtd = ((MethodSignature) joinPnt.getSignature()).getMethod();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06fbf573/modules/aop/src/test/config/aop/aspectj/META-INF/aop.xml
----------------------------------------------------------------------
diff --git a/modules/aop/src/test/config/aop/aspectj/META-INF/aop.xml b/modules/aop/src/test/config/aop/aspectj/META-INF/aop.xml
index 883371c..afb9138 100644
--- a/modules/aop/src/test/config/aop/aspectj/META-INF/aop.xml
+++ b/modules/aop/src/test/config/aop/aspectj/META-INF/aop.xml
@@ -68,7 +68,7 @@
<exclude within="com.tangosol..*"/>
<!-- Apache libs. -->
- <exclude within="org.apache..*"/>
+ <!--<exclude within="org.apache..*"/>-->
<!-- Javassist libs. -->
<exclude within="javassist..*"/>
@@ -214,7 +214,7 @@
<exclude within="com.tangosol..*"/>
<!-- Apache libs. -->
- <exclude within="org.apache..*"/>
+ <!--<exclude within="org.apache..*"/>-->
<!-- Javassist libs. -->
<exclude within="javassist..*"/>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06fbf573/modules/aop/src/test/java/org/gridgain/grid/gridify/GridAbstractAopTest.java
----------------------------------------------------------------------
diff --git a/modules/aop/src/test/java/org/gridgain/grid/gridify/GridAbstractAopTest.java b/modules/aop/src/test/java/org/gridgain/grid/gridify/GridAbstractAopTest.java
index 7b9489a..94cec1b 100644
--- a/modules/aop/src/test/java/org/gridgain/grid/gridify/GridAbstractAopTest.java
+++ b/modules/aop/src/test/java/org/gridgain/grid/gridify/GridAbstractAopTest.java
@@ -483,7 +483,7 @@ public abstract class GridAbstractAopTest extends GridCommonAbstractTest {
res = ((GridTestAopTargetInterface) targetObj).gridifyNonDefaultClass("1");
if (res != 10)
- fail("Method gridifyNonDefault returned wrong value [result=" + res + ", expect=1]");
+ fail("Method gridifyNonDefault returned wrong value [result=" + res + ", expect=10]");
}
finally {
stopGrid();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06fbf573/modules/aop/src/test/java/org/gridgain/grid/gridify/GridNonSpringAopSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/aop/src/test/java/org/gridgain/grid/gridify/GridNonSpringAopSelfTest.java b/modules/aop/src/test/java/org/gridgain/grid/gridify/GridNonSpringAopSelfTest.java
index 86466dd..c66e11f 100644
--- a/modules/aop/src/test/java/org/gridgain/grid/gridify/GridNonSpringAopSelfTest.java
+++ b/modules/aop/src/test/java/org/gridgain/grid/gridify/GridNonSpringAopSelfTest.java
@@ -31,7 +31,7 @@ import org.gridgain.testframework.junits.common.*;
*
* 1. The JVM is started with following parameters for enable AspectJ online weaving
* (replace ${GRIDGAIN_HOME} to you $GRIDGAIN_HOME):
- * -javaagent:${GRIDGAIN_HOME}/libs/aspectjweaver-1.7.2.jar
+ * -javaagent:${GRIDGAIN_HOME}/libs/optional/gridgain-aop/aspectjweaver-1.7.2.jar
*
* 2. Classpath should contains the ${GRIDGAIN_HOME}/modules/tests/config/aop/aspectj folder.
*/
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06fbf573/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 63ea199..b0d66ed 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
@@ -21,7 +21,7 @@ import java.lang.annotation.*;
* <p>
* Example:
* <pre name="code" class="java">
- * public class MyGridJob implements GridComputeJob {
+ * public class MyGridJob implements ComputeJob {
* ...
* @GridComputeJobAfterSend
* public void onJobAfterSend() {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06fbf573/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 82002eb..80647e6 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
@@ -22,7 +22,7 @@ import java.lang.annotation.*;
* <p>
* Example:
* <pre name="code" class="java">
- * public class MyGridJob implements GridComputeJob {
+ * public class MyGridJob implements ComputeJob {
* ...
* @GridComputeJobBeforeFailover
* public void onJobBeforeFailover() {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06fbf573/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 75a70f5..9c6ab66 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
@@ -35,7 +35,7 @@ import org.jetbrains.annotations.*;
* private int multiplier = 3;
*
* @Override
- * protected Collection<? extends GridComputeJob> split(int gridSize, final String arg) throws GridException {
+ * protected Collection<? extends ComputeJob> split(int gridSize, final String arg) throws GridException {
* List<GridComputeJobAdapter<String>> jobs = new ArrayList<GridComputeJobAdapter<String>>(gridSize);
*
* for (int i = 0; i < gridSize; i++) {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06fbf573/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 54a265c..640b708 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
@@ -33,7 +33,7 @@ import java.util.*;
* <pre name="code" class="java">
* public class MyFooBarTask extends GridComputeTaskSplitAdapter<String> {
* @Override
- * protected Collection<? extends GridComputeJob> split(int gridSize, String arg) throws GridException {
+ * protected Collection<? extends ComputeJob> split(int gridSize, String arg) throws GridException {
* List<MyFooBarJob> jobs = new ArrayList<MyFooBarJob>(gridSize);
*
* for (int i = 0; i < gridSize; i++) {
@@ -59,14 +59,14 @@ import java.util.*;
* GridComputeLoadBalancer balancer;
*
* // Map jobs to grid nodes.
- * public Map<? extends GridComputeJob, GridNode> map(List<GridNode> subgrid, String arg) throws GridException {
+ * public Map<? extends ComputeJob, GridNode> map(List<GridNode> subgrid, String arg) throws GridException {
* Map<MyFooBarJob, GridNode> jobs = new HashMap<MyFooBarJob, GridNode>(subgrid.size());
*
* // In more complex cases, you can actually do
* // more complicated assignments of jobs to nodes.
* for (int i = 0; i < subgrid.size(); i++) {
* // Pick the next best balanced node for the job.
- * GridComputeJob myJob = new MyFooBarJob(arg);
+ * ComputeJob myJob = new MyFooBarJob(arg);
*
* jobs.put(myJob, balancer.getBalancedNode(myJob, null));
* }
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06fbf573/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 2340def..3e64544 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
@@ -153,7 +153,7 @@ import java.util.*;
* GridComputeLoadBalancer balancer;
*
* // Map jobs to grid nodes.
- * public Map<? extends GridComputeJob, GridNode> map(List<GridNode> subgrid, String arg) throws GridException {
+ * public Map<? extends ComputeJob, GridNode> map(List<GridNode> subgrid, String arg) throws GridException {
* Map<MyFooBarJob, GridNode> jobs = new HashMap<MyFooBarJob, GridNode>(subgrid.size());
*
* // In more complex cases, you can actually do
@@ -192,7 +192,7 @@ import java.util.*;
* <pre name="code" class="java">
* public class MyFooBarTask extends GridComputeTaskSplitAdapter<Object, String> {
* @Override
- * protected Collection<? extends GridComputeJob> split(int gridSize, Object arg) throws GridException {
+ * protected Collection<? extends ComputeJob> split(int gridSize, Object arg) throws GridException {
* List<MyFooBarJob> jobs = new ArrayList<MyFooBarJob>(gridSize);
*
* for (int i = 0; i < gridSize; i++) {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06fbf573/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 fae5153..5081dfb 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
@@ -24,7 +24,7 @@ import java.util.*;
* GridComputeLoadBalancer balancer;
*
* // Map jobs to grid nodes.
- * public Map<? extends GridComputeJob, GridNode> map(List<GridNode> subgrid, String arg) throws GridException {
+ * public Map<? extends ComputeJob, GridNode> map(List<GridNode> subgrid, String arg) throws GridException {
* Map<MyFooBarJob, GridNode> jobs = new HashMap<MyFooBarJob, GridNode>(subgrid.size());
*
* // In more complex cases, you can actually do
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06fbf573/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 005c251..9189252 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
@@ -27,7 +27,7 @@ import java.util.*;
* <pre name="code" class="java">
* public class MyFooBarTask extends GridComputeTaskSplitAdapter<Object, String> {
* @Override
- * protected Collection<? extends GridComputeJob> split(int gridSize, Object arg) throws GridException {
+ * protected Collection<? extends ComputeJob> split(int gridSize, Object arg) throws GridException {
* List<MyFooBarJob> jobs = new ArrayList<MyFooBarJob>(gridSize);
*
* for (int i = 0; i < gridSize; i++) {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06fbf573/modules/core/src/main/java/org/apache/ignite/marshaller/IgniteMarshaller.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/IgniteMarshaller.java b/modules/core/src/main/java/org/apache/ignite/marshaller/IgniteMarshaller.java
index ace4c9c..033f54b 100644
--- a/modules/core/src/main/java/org/apache/ignite/marshaller/IgniteMarshaller.java
+++ b/modules/core/src/main/java/org/apache/ignite/marshaller/IgniteMarshaller.java
@@ -58,7 +58,7 @@ import java.io.*;
* <h2 class="header">Injection Example</h2>
* GridMarshaller can be injected in users task, job or SPI as following:
* <pre name="code" class="java">
- * public class MyGridJob implements GridComputeJob {
+ * public class MyGridJob implements ComputeJob {
* ...
* @GridMarshallerResource
* private GridMarshaller marshaller;
@@ -71,7 +71,7 @@ import java.io.*;
* </pre>
* or
* <pre name="code" class="java">
- * public class MyGridJob implements GridComputeJob {
+ * public class MyGridJob implements ComputeJob {
* ...
* private GridMarshaller marshaller;
* ...
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06fbf573/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/IgniteJdkMarshaller.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/IgniteJdkMarshaller.java b/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/IgniteJdkMarshaller.java
index 02dbd9c..97e5f4a 100644
--- a/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/IgniteJdkMarshaller.java
+++ b/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/IgniteJdkMarshaller.java
@@ -53,7 +53,7 @@ import java.io.*;
* <h2 class="header">Injection Example</h2>
* GridMarshaller can be injected in users task, job or SPI as following:
* <pre name="code" class="java">
- * public class MyGridJob implements GridComputeJob {
+ * public class MyGridJob implements ComputeJob {
* ...
* @GridMarshallerResource
* private GridMarshaller marshaller;
@@ -62,7 +62,7 @@ import java.io.*;
* </pre>
* or
* <pre name="code" class="java">
- * public class MyGridJob implements GridComputeJob {
+ * public class MyGridJob implements ComputeJob {
* ...
* private GridMarshaller marshaller;
* ...
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06fbf573/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/IgniteOptimizedMarshaller.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/IgniteOptimizedMarshaller.java b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/IgniteOptimizedMarshaller.java
index 8595bf0..02632d9 100644
--- a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/IgniteOptimizedMarshaller.java
+++ b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/IgniteOptimizedMarshaller.java
@@ -70,7 +70,7 @@ import java.util.*;
* <h2 class="header">Injection Example</h2>
* GridMarshaller can be injected in users task, job or SPI as following:
* <pre name="code" class="java">
- * public class MyGridJob implements GridComputeJob {
+ * public class MyGridJob implements ComputeJob {
* ...
* @GridMarshallerResource
* private GridMarshaller marshaller;
@@ -79,7 +79,7 @@ import java.util.*;
* </pre>
* or
* <pre name="code" class="java">
- * public class MyGridJob implements GridComputeJob {
+ * public class MyGridJob implements ComputeJob {
* ...
* private GridMarshaller marshaller;
* ...
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06fbf573/modules/core/src/main/java/org/apache/ignite/resources/IgniteExecutorServiceResource.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/resources/IgniteExecutorServiceResource.java b/modules/core/src/main/java/org/apache/ignite/resources/IgniteExecutorServiceResource.java
index 7483139..8d6ba25 100644
--- a/modules/core/src/main/java/org/apache/ignite/resources/IgniteExecutorServiceResource.java
+++ b/modules/core/src/main/java/org/apache/ignite/resources/IgniteExecutorServiceResource.java
@@ -27,7 +27,7 @@ import java.util.concurrent.*;
* <p>
* Here is how injection would typically happen:
* <pre name="code" class="java">
- * public class MyGridJob implements GridComputeJob {
+ * public class MyGridJob implements ComputeJob {
* ...
* @GridExecutorServiceResource
* private ExecutorService execSvc;
@@ -36,7 +36,7 @@ import java.util.concurrent.*;
* </pre>
* or
* <pre name="code" class="java">
- * public class MyGridJob implements GridComputeJob {
+ * public class MyGridJob implements ComputeJob {
* ...
* private ExecutorService execSvc;
* ...
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06fbf573/modules/core/src/main/java/org/apache/ignite/resources/IgniteHomeResource.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/resources/IgniteHomeResource.java b/modules/core/src/main/java/org/apache/ignite/resources/IgniteHomeResource.java
index 92cafa9..d5e55cb 100644
--- a/modules/core/src/main/java/org/apache/ignite/resources/IgniteHomeResource.java
+++ b/modules/core/src/main/java/org/apache/ignite/resources/IgniteHomeResource.java
@@ -26,7 +26,7 @@ import java.lang.annotation.*;
* <p>
* Here is how injection would typically happen:
* <pre name="code" class="java">
- * public class MyGridJob implements GridComputeJob {
+ * public class MyGridJob implements ComputeJob {
* ...
* @GridHomeResource
* private String home;
@@ -35,7 +35,7 @@ import java.lang.annotation.*;
* </pre>
* or
* <pre name="code" class="java">
- * public class MyGridJob implements GridComputeJob {
+ * public class MyGridJob implements ComputeJob {
* ...
* private String home;
* ...
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06fbf573/modules/core/src/main/java/org/apache/ignite/resources/IgniteInstanceResource.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/resources/IgniteInstanceResource.java b/modules/core/src/main/java/org/apache/ignite/resources/IgniteInstanceResource.java
index 6adc3f3..d75026d 100644
--- a/modules/core/src/main/java/org/apache/ignite/resources/IgniteInstanceResource.java
+++ b/modules/core/src/main/java/org/apache/ignite/resources/IgniteInstanceResource.java
@@ -27,7 +27,7 @@ import java.lang.annotation.*;
* <p>
* Here is how injection would typically happen:
* <pre name="code" class="java">
- * public class MyGridJob implements GridComputeJob {
+ * public class MyGridJob implements ComputeJob {
* ...
* @GridInstanceResource
* private Grid grid;
@@ -36,7 +36,7 @@ import java.lang.annotation.*;
* </pre>
* or
* <pre name="code" class="java">
- * public class MyGridJob implements GridComputeJob {
+ * public class MyGridJob implements ComputeJob {
* ...
* private Grid grid;
* ...
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06fbf573/modules/core/src/main/java/org/apache/ignite/resources/IgniteJobContextResource.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/resources/IgniteJobContextResource.java b/modules/core/src/main/java/org/apache/ignite/resources/IgniteJobContextResource.java
index f5ba533..d64dc42 100644
--- a/modules/core/src/main/java/org/apache/ignite/resources/IgniteJobContextResource.java
+++ b/modules/core/src/main/java/org/apache/ignite/resources/IgniteJobContextResource.java
@@ -22,7 +22,7 @@ import java.lang.annotation.*;
* <p>
* Here is how injection would typically happen:
* <pre name="code" class="java">
- * public class MyGridJob implements GridComputeJob {
+ * public class MyGridJob implements ComputeJob {
* ...
* @GridJobContextResource
* private GridComputeJobContext jobCtx;
@@ -31,7 +31,7 @@ import java.lang.annotation.*;
* </pre>
* or
* <pre name="code" class="java">
- * public class MyGridJob implements GridComputeJob {
+ * public class MyGridJob implements ComputeJob {
* ...
* private GridComputeJobContext jobCtx;
* ...
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06fbf573/modules/core/src/main/java/org/apache/ignite/resources/IgniteLocalHostResource.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/resources/IgniteLocalHostResource.java b/modules/core/src/main/java/org/apache/ignite/resources/IgniteLocalHostResource.java
index f831f9a..c67e58d 100644
--- a/modules/core/src/main/java/org/apache/ignite/resources/IgniteLocalHostResource.java
+++ b/modules/core/src/main/java/org/apache/ignite/resources/IgniteLocalHostResource.java
@@ -27,7 +27,7 @@ import java.lang.annotation.*;
* <p>
* Here is how injection would typically happen:
* <pre name="code" class="java">
- * public class MyGridJob implements GridComputeJob {
+ * public class MyGridJob implements ComputeJob {
* ...
* @GridLocalHostResource
* private String locHost;
@@ -36,7 +36,7 @@ import java.lang.annotation.*;
* </pre>
* or
* <pre name="code" class="java">
- * public class MyGridJob implements GridComputeJob {
+ * public class MyGridJob implements ComputeJob {
* ...
* private String locHost;
* ...
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06fbf573/modules/core/src/main/java/org/apache/ignite/resources/IgniteLocalNodeIdResource.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/resources/IgniteLocalNodeIdResource.java b/modules/core/src/main/java/org/apache/ignite/resources/IgniteLocalNodeIdResource.java
index 2b57db1..e5525e3 100644
--- a/modules/core/src/main/java/org/apache/ignite/resources/IgniteLocalNodeIdResource.java
+++ b/modules/core/src/main/java/org/apache/ignite/resources/IgniteLocalNodeIdResource.java
@@ -27,7 +27,7 @@ import java.util.*;
* <p>
* Here is how injection would typically happen:
* <pre name="code" class="java">
- * public class MyGridJob implements GridComputeJob {
+ * public class MyGridJob implements ComputeJob {
* ...
* @GridLocalNodeIdResource
* private UUID nodeId;
@@ -36,7 +36,7 @@ import java.util.*;
* </pre>
* or
* <pre name="code" class="java">
- * public class MyGridJob implements GridComputeJob {
+ * public class MyGridJob implements ComputeJob {
* ...
* private UUID nodeId;
* ...
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06fbf573/modules/core/src/main/java/org/apache/ignite/resources/IgniteLoggerResource.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/resources/IgniteLoggerResource.java b/modules/core/src/main/java/org/apache/ignite/resources/IgniteLoggerResource.java
index 0522d20..9695d16 100644
--- a/modules/core/src/main/java/org/apache/ignite/resources/IgniteLoggerResource.java
+++ b/modules/core/src/main/java/org/apache/ignite/resources/IgniteLoggerResource.java
@@ -26,7 +26,7 @@ import java.lang.annotation.*;
* <p>
* Here is how injection would typically happen:
* <pre name="code" class="java">
- * public class MyGridJob implements GridComputeJob {
+ * public class MyGridJob implements ComputeJob {
* ...
* @GridLoggerResource
* private GridLogger log;
@@ -35,7 +35,7 @@ import java.lang.annotation.*;
* </pre>
* or
* <pre name="code" class="java">
- * public class MyGridJob implements GridComputeJob {
+ * public class MyGridJob implements ComputeJob {
* ...
* private GridLogger log;
* ...
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06fbf573/modules/core/src/main/java/org/apache/ignite/resources/IgniteMBeanServerResource.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/resources/IgniteMBeanServerResource.java b/modules/core/src/main/java/org/apache/ignite/resources/IgniteMBeanServerResource.java
index e33811d..50c8153 100644
--- a/modules/core/src/main/java/org/apache/ignite/resources/IgniteMBeanServerResource.java
+++ b/modules/core/src/main/java/org/apache/ignite/resources/IgniteMBeanServerResource.java
@@ -27,7 +27,7 @@ import java.lang.annotation.*;
* <p>
* Here is how injection would typically happen:
* <pre name="code" class="java">
- * public class MyGridJob implements GridComputeJob {
+ * public class MyGridJob implements ComputeJob {
* ...
* @GridMBeanServerResource
* private MBeanServer mbeanSrv;
@@ -36,7 +36,7 @@ import java.lang.annotation.*;
* </pre>
* or
* <pre name="code" class="java">
- * public class MyGridJob implements GridComputeJob {
+ * public class MyGridJob implements ComputeJob {
* ...
* private MBeanSever mbeanSrv;
* ...
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06fbf573/modules/core/src/main/java/org/apache/ignite/resources/IgniteMarshallerResource.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/resources/IgniteMarshallerResource.java b/modules/core/src/main/java/org/apache/ignite/resources/IgniteMarshallerResource.java
index 508be1d..eac1c48 100644
--- a/modules/core/src/main/java/org/apache/ignite/resources/IgniteMarshallerResource.java
+++ b/modules/core/src/main/java/org/apache/ignite/resources/IgniteMarshallerResource.java
@@ -26,7 +26,7 @@ import java.lang.annotation.*;
* <p>
* Here is how injection would typically happen:
* <pre name="code" class="java">
- * public class MyGridJob implements GridComputeJob {
+ * public class MyGridJob implements ComputeJob {
* ...
* @GridMarshallerResource
* private GridMarshaller marshaller;
@@ -35,7 +35,7 @@ import java.lang.annotation.*;
* </pre>
* or
* <pre name="code" class="java">
- * public class MyGridJob implements GridComputeJob {
+ * public class MyGridJob implements ComputeJob {
* ...
* private GridMarshaller marshaller;
* ...
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06fbf573/modules/core/src/main/java/org/apache/ignite/resources/IgniteNameResource.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/resources/IgniteNameResource.java b/modules/core/src/main/java/org/apache/ignite/resources/IgniteNameResource.java
index b1064f3..7c8e210 100644
--- a/modules/core/src/main/java/org/apache/ignite/resources/IgniteNameResource.java
+++ b/modules/core/src/main/java/org/apache/ignite/resources/IgniteNameResource.java
@@ -26,7 +26,7 @@ import java.lang.annotation.*;
* <p>
* Here is how injection would typically happen:
* <pre name="code" class="java">
- * public class MyGridJob implements GridComputeJob {
+ * public class MyGridJob implements ComputeJob {
* ...
* @GridNameResource
* private String name;
@@ -35,7 +35,7 @@ import java.lang.annotation.*;
* </pre>
* or
* <pre name="code" class="java">
- * public class MyGridJob implements GridComputeJob {
+ * public class MyGridJob implements ComputeJob {
* ...
* private String gridName;
* ...
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06fbf573/modules/core/src/main/java/org/apache/ignite/resources/IgniteServiceResource.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/resources/IgniteServiceResource.java b/modules/core/src/main/java/org/apache/ignite/resources/IgniteServiceResource.java
index 575aaa3..4b8edb5 100644
--- a/modules/core/src/main/java/org/apache/ignite/resources/IgniteServiceResource.java
+++ b/modules/core/src/main/java/org/apache/ignite/resources/IgniteServiceResource.java
@@ -17,7 +17,7 @@ import java.lang.annotation.*;
* <p>
* Here is how injection would typically happen:
* <pre name="code" class="java">
- * public class MyGridJob implements GridComputeJob {
+ * public class MyGridJob implements ComputeJob {
* ...
* // Inject single instance of 'myService'. If there is
* // more than one, first deployed instance will be picked.
@@ -28,7 +28,7 @@ import java.lang.annotation.*;
* </pre>
* or attach the same annotations to methods:
* <pre name="code" class="java">
- * public class MyGridJob implements GridComputeJob {
+ * public class MyGridJob implements ComputeJob {
* ...
* private MyService svc;
* ...
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06fbf573/modules/core/src/main/java/org/apache/ignite/resources/IgniteSpringApplicationContextResource.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/resources/IgniteSpringApplicationContextResource.java b/modules/core/src/main/java/org/apache/ignite/resources/IgniteSpringApplicationContextResource.java
index 4ad837e..895e37a 100644
--- a/modules/core/src/main/java/org/apache/ignite/resources/IgniteSpringApplicationContextResource.java
+++ b/modules/core/src/main/java/org/apache/ignite/resources/IgniteSpringApplicationContextResource.java
@@ -28,7 +28,7 @@ import java.lang.annotation.*;
* <p>
* Here is how injection would typically happen:
* <pre name="code" class="java">
- * public class MyGridJob implements GridComputeJob {
+ * public class MyGridJob implements ComputeJob {
* ...
* @GridSpringApplicationContextResource
* private ApplicationContext springCtx;
@@ -37,7 +37,7 @@ import java.lang.annotation.*;
* </pre>
* or
* <pre name="code" class="java">
- * public class MyGridJob implements GridComputeJob {
+ * public class MyGridJob implements ComputeJob {
* ...
* private ApplicationContext springCtx;
* ...
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06fbf573/modules/core/src/main/java/org/apache/ignite/resources/IgniteSpringResource.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/resources/IgniteSpringResource.java b/modules/core/src/main/java/org/apache/ignite/resources/IgniteSpringResource.java
index 56dbb30..4452731 100644
--- a/modules/core/src/main/java/org/apache/ignite/resources/IgniteSpringResource.java
+++ b/modules/core/src/main/java/org/apache/ignite/resources/IgniteSpringResource.java
@@ -41,7 +41,7 @@ import java.lang.annotation.*;
* <h1 class="header">Examples</h1>
* Here is how injection would typically happen:
* <pre name="code" class="java">
- * public class MyGridJob implements GridComputeJob {
+ * public class MyGridJob implements ComputeJob {
* ...
* @GridSpringResource(resourceName = "bean-name")
* private transient MyUserBean rsrc;
@@ -53,7 +53,7 @@ import java.lang.annotation.*;
* </pre>
* or
* <pre name="code" class="java">
- * public class MyGridJob implements GridComputeJob {
+ * public class MyGridJob implements ComputeJob {
* ...
* private transient MyUserBean rsrc;
* ...
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06fbf573/modules/core/src/main/java/org/apache/ignite/resources/IgniteTaskContinuousMapperResource.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/resources/IgniteTaskContinuousMapperResource.java b/modules/core/src/main/java/org/apache/ignite/resources/IgniteTaskContinuousMapperResource.java
index cbb4932..bf20a65 100644
--- a/modules/core/src/main/java/org/apache/ignite/resources/IgniteTaskContinuousMapperResource.java
+++ b/modules/core/src/main/java/org/apache/ignite/resources/IgniteTaskContinuousMapperResource.java
@@ -20,7 +20,7 @@ import java.lang.annotation.*;
* <p>
* Here is how injection would typically happen:
* <pre name="code" class="java">
- * public class MyGridJob implements GridComputeJob {
+ * public class MyGridJob implements ComputeJob {
* ...
* @GridTaskContinuousMapperResource
* private GridComputeTaskContinuousMapper mapper;
@@ -29,7 +29,7 @@ import java.lang.annotation.*;
* </pre>
* or
* <pre name="code" class="java">
- * public class MyGridJob implements GridComputeJob {
+ * public class MyGridJob implements ComputeJob {
* ...
* private GridComputeTaskContinuousMapper mapper;
* ...
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06fbf573/modules/core/src/main/java/org/apache/ignite/resources/IgniteTaskSessionResource.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/resources/IgniteTaskSessionResource.java b/modules/core/src/main/java/org/apache/ignite/resources/IgniteTaskSessionResource.java
index b98f8be..5e1c325 100644
--- a/modules/core/src/main/java/org/apache/ignite/resources/IgniteTaskSessionResource.java
+++ b/modules/core/src/main/java/org/apache/ignite/resources/IgniteTaskSessionResource.java
@@ -23,7 +23,7 @@ import java.lang.annotation.*;
* <p>
* Here is how injection would typically happen:
* <pre name="code" class="java">
- * public class MyGridJob implements GridComputeJob {
+ * public class MyGridJob implements ComputeJob {
* ...
* @GridTaskSessionResource
* private GridComputeTaskSession taskSes;
@@ -32,7 +32,7 @@ import java.lang.annotation.*;
* </pre>
* or
* <pre name="code" class="java">
- * public class MyGridJob implements GridComputeJob {
+ * public class MyGridJob implements ComputeJob {
* ...
* private GridComputeTaskSession taskSes;
* ...
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06fbf573/modules/core/src/main/java/org/apache/ignite/resources/IgniteUserResource.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/resources/IgniteUserResource.java b/modules/core/src/main/java/org/apache/ignite/resources/IgniteUserResource.java
index 9cdc808..7824ef2 100644
--- a/modules/core/src/main/java/org/apache/ignite/resources/IgniteUserResource.java
+++ b/modules/core/src/main/java/org/apache/ignite/resources/IgniteUserResource.java
@@ -59,7 +59,7 @@ import java.lang.annotation.*;
* <h1 class="header">Examples</h1>
* Here is how injection would typically happen:
* <pre name="code" class="java">
- * public class MyGridJob implements GridComputeJob {
+ * public class MyGridJob implements ComputeJob {
* ...
* @GridUserResource
* private transient MyUserResource rsrc;
@@ -68,7 +68,7 @@ import java.lang.annotation.*;
* </pre>
* or
* <pre name="code" class="java">
- * public class MyGridJob implements GridComputeJob {
+ * public class MyGridJob implements ComputeJob {
* ...
* private transient MyUserResource rsrc;
* ...
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06fbf573/modules/core/src/main/java/org/apache/ignite/spi/collision/priorityqueue/PriorityQueueCollisionSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/collision/priorityqueue/PriorityQueueCollisionSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/collision/priorityqueue/PriorityQueueCollisionSpi.java
index 5a002a2..c20f1b4 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/collision/priorityqueue/PriorityQueueCollisionSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/collision/priorityqueue/PriorityQueueCollisionSpi.java
@@ -101,13 +101,13 @@ import java.util.*;
* private GridComputeTaskSession taskSes;
*
* @Override
- * protected Collection<? extends GridComputeJob> split(int gridSize, Object arg) throws GridException {
+ * protected Collection<? extends ComputeJob> split(int gridSize, Object arg) throws GridException {
* ...
* // Set low task priority (note that attribute name is used by the SPI
* // and should not be changed).
* taskSes.setAttribute("grid.task.priority", 5);
*
- * Collection<GridComputeJob> jobs = new ArrayList<GridComputeJob>(SPLIT_COUNT);
+ * Collection<ComputeJob> jobs = new ArrayList<ComputeJob>(SPLIT_COUNT);
*
* for (int i = 1; i <= SPLIT_COUNT; i++) {
* jobs.add(new GridComputeJobAdapter<Integer>(i) {
@@ -127,13 +127,13 @@ import java.util.*;
* private GridComputeTaskSession taskSes;
*
* @Override
- * protected Collection<? extends GridComputeJob> split(int gridSize, Object arg) throws GridException {
+ * protected Collection<? extends ComputeJob> split(int gridSize, Object arg) throws GridException {
* ...
* // Set high task priority (note that attribute name is used by the SPI
* // and should not be changed).
* taskSes.setAttribute("grid.task.priority", 10);
*
- * Collection<GridComputeJob> jobs = new ArrayList<GridComputeJob>(SPLIT_COUNT);
+ * Collection<ComputeJob> jobs = new ArrayList<ComputeJob>(SPLIT_COUNT);
*
* for (int i = 1; i <= SPLIT_COUNT; i++) {
* jobs.add(new GridComputeJobAdapter<Integer>(i) {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06fbf573/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 e3713c5..8307372 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
@@ -28,7 +28,7 @@ import java.util.*;
* <pre name="code" class="java">
* public class MyFooBarTask extends GridComputeTaskSplitAdapter<Object,Object> {
* @Override
- * protected Collection<? extends GridComputeJob> split(int gridSize, Object arg) throws GridException {
+ * protected Collection<? extends ComputeJob> split(int gridSize, Object arg) throws GridException {
* List<MyFooBarJob> jobs = new ArrayList<MyFooBarJob>(gridSize);
*
* for (int i = 0; i < gridSize; i++) {
@@ -54,14 +54,14 @@ import java.util.*;
* GridComputeLoadBalancer balancer;
*
* // Map jobs to grid nodes.
- * public Map<? extends GridComputeJob, GridNode> map(List<GridNode> subgrid, String arg) throws GridException {
+ * public Map<? extends ComputeJob, GridNode> map(List<GridNode> subgrid, String arg) throws GridException {
* Map<MyFooBarJob, GridNode> jobs = new HashMap<MyFooBarJob, GridNode>(subgrid.size());
*
* // In more complex cases, you can actually do
* // more complicated assignments of jobs to nodes.
* for (int i = 0; i < subgrid.size(); i++) {
* // Pick the next best balanced node for the job.
- * GridComputeJob myJob = new MyFooBarJob(arg);
+ * ComputeJob myJob = new MyFooBarJob(arg);
*
* jobs.put(myJob, balancer.getBalancedNode(myJob, null));
* }
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06fbf573/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 5bb4501..281a9af 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
@@ -113,7 +113,7 @@ import static org.apache.ignite.events.IgniteEventType.*;
* <pre name="code" class="java">
* public class MyFooBarTask extends GridComputeTaskSplitAdapter<Object, Object> {
* @Override
- * protected Collection<? extends GridComputeJob> split(int gridSize, Object arg) throws GridException {
+ * protected Collection<? extends ComputeJob> split(int gridSize, Object arg) throws GridException {
* List<MyFooBarJob> jobs = new ArrayList<MyFooBarJob>(gridSize);
*
* for (int i = 0; i < gridSize; i++) {
@@ -139,7 +139,7 @@ import static org.apache.ignite.events.IgniteEventType.*;
* GridComputeLoadBalancer balancer;
*
* // Map jobs to grid nodes.
- * public Map<? extends GridComputeJob, GridNode> map(List<GridNode> subgrid, String arg) throws GridException {
+ * public Map<? extends ComputeJob, GridNode> map(List<GridNode> subgrid, String arg) throws GridException {
* Map<MyFooBarJob, GridNode> jobs = new HashMap<MyFooBarJob, GridNode>(subgrid.size());
*
* // In more complex cases, you can actually do
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06fbf573/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 bb49cc0..069c7eb 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
@@ -52,7 +52,7 @@ import static org.apache.ignite.events.IgniteEventType.*;
* <pre name="code" class="java">
* public class MyFooBarTask extends GridComputeTaskSplitAdapter<Object, Object> {
* @Override
- * protected Collection<? extends GridComputeJob> split(int gridSize, Object arg) throws GridException {
+ * protected Collection<? extends ComputeJob> split(int gridSize, Object arg) throws GridException {
* List<MyFooBarJob> jobs = new ArrayList<MyFooBarJob>(gridSize);
*
* for (int i = 0; i < gridSize; i++) {
@@ -78,7 +78,7 @@ import static org.apache.ignite.events.IgniteEventType.*;
* GridComputeLoadBalancer balancer;
*
* // Map jobs to grid nodes.
- * public Map<? extends GridComputeJob, GridNode> map(List<GridNode> subgrid, String arg) throws GridException {
+ * public Map<? extends ComputeJob, GridNode> map(List<GridNode> subgrid, String arg) throws GridException {
* Map<MyFooBarJob, GridNode> jobs = new HashMap<MyFooBarJob, GridNode>(subgrid.size());
*
* // In more complex cases, you can actually do
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06fbf573/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 6c4de36..bd629e6 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
@@ -41,7 +41,7 @@ import static org.apache.ignite.events.IgniteEventType.*;
* <pre name="code" class="java">
* public class MyFooBarTask extends GridComputeTaskSplitAdapter<Object, Object> {
* @Override
- * protected Collection<? extends GridComputeJob> split(int gridSize, Object arg) throws GridException {
+ * protected Collection<? extends ComputeJob> split(int gridSize, Object arg) throws GridException {
* List<MyFooBarJob> jobs = new ArrayList<MyFooBarJob>(gridSize);
*
* for (int i = 0; i < gridSize; i++) {
@@ -67,7 +67,7 @@ import static org.apache.ignite.events.IgniteEventType.*;
* GridComputeLoadBalancer balancer;
*
* // Map jobs to grid nodes.
- * public Map<? extends GridComputeJob, GridNode> map(List<GridNode> subgrid, String arg) throws GridException {
+ * public Map<? extends ComputeJob, GridNode> map(List<GridNode> subgrid, String arg) throws GridException {
* Map<MyFooBarJob, GridNode> jobs = new HashMap<MyFooBarJob, GridNode>(subgrid.size());
*
* // In more complex cases, you can actually do
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06fbf573/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentClassLoader.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentClassLoader.java b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentClassLoader.java
index 9d0a874..49ff2fd 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentClassLoader.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentClassLoader.java
@@ -409,12 +409,12 @@ class GridDeploymentClassLoader extends ClassLoader implements GridDeploymentInf
assert !Thread.holdsLock(mux);
// Check if we have package name on list of P2P loaded.
- // GridComputeJob must be always loaded locally to avoid
+ // ComputeJob must be always loaded locally to avoid
// any possible class casting issues.
Class<?> cls = null;
try {
- if (!"org.gridgain.grid.GridComputeJob".equals(name)) {
+ if (!"org.apache.ignite.compute.ComputeJob".equals(name)) {
if (isLocallyExcluded(name))
// P2P loaded class.
cls = p2pLoadClass(name, true);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06fbf573/modules/scalar/src/main/scala/org/gridgain/scalar/ScalarConversions.scala
----------------------------------------------------------------------
diff --git a/modules/scalar/src/main/scala/org/gridgain/scalar/ScalarConversions.scala b/modules/scalar/src/main/scala/org/gridgain/scalar/ScalarConversions.scala
index edb5093..860560b 100644
--- a/modules/scalar/src/main/scala/org/gridgain/scalar/ScalarConversions.scala
+++ b/modules/scalar/src/main/scala/org/gridgain/scalar/ScalarConversions.scala
@@ -403,7 +403,7 @@ trait ScalarConversions {
ScalarCacheProjectionPimp[K, V](impl)
/**
- * Implicit converter from Scala function to `GridComputeJob`.
+ * Implicit converter from Scala function to `ComputeJob`.
*
* @param f Scala function to convert.
*/
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06fbf573/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarJob.scala
----------------------------------------------------------------------
diff --git a/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarJob.scala b/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarJob.scala
index 6d7f9b4..208cad0 100644
--- a/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarJob.scala
+++ b/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarJob.scala
@@ -15,7 +15,7 @@ import org.apache.ignite.compute.ComputeJobAdapter
import org.gridgain.grid.util.{GridUtils => U}
/**
- * Peer deploy aware adapter for Java's `GridComputeJob`.
+ * Peer deploy aware adapter for Java's `ComputeJob`.
*/
class ScalarJob(private val inner: () => Any) extends ComputeJobAdapter {
assert(inner != null)