IGNITE-35: Fixed javadoc
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/a9c0e0c1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a9c0e0c1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a9c0e0c1 Branch: refs/heads/ignite-32 Commit: a9c0e0c15ccc172597965308ab1c5f532c75c636 Parents: f6b4190 Author: nikolay_tikhonov <ntikho...@gridgain.com> Authored: Thu Jan 22 17:20:24 2015 +0300 Committer: nikolay_tikhonov <ntikho...@gridgain.com> Committed: Thu Jan 22 17:20:24 2015 +0300 ---------------------------------------------------------------------- .../java/org/apache/ignite/IgniteCompute.java | 4 +-- .../java/org/apache/ignite/IgniteManaged.java | 6 ++--- .../org/apache/ignite/compute/ComputeJob.java | 6 ++--- .../ignite/compute/ComputeLoadBalancer.java | 4 +-- .../org/apache/ignite/compute/ComputeTask.java | 8 +++--- .../ignite/compute/ComputeTaskAdapter.java | 4 +-- .../compute/ComputeTaskContinuousMapper.java | 8 +++--- .../ignite/compute/ComputeTaskSession.java | 6 ++--- .../apache/ignite/lifecycle/LifecycleBean.java | 8 +++--- .../apache/ignite/managed/ManagedService.java | 4 +-- .../ignite/marshaller/IgniteMarshaller.java | 27 -------------------- .../marshaller/jdk/IgniteJdkMarshaller.java | 25 ------------------ .../optimized/IgniteOptimizedMarshaller.java | 23 ----------------- .../resources/IgniteCacheNameResource.java | 4 +-- .../resources/IgniteJobContextResource.java | 10 ++++---- .../resources/IgniteLoadBalancerResource.java | 14 +++++----- .../ignite/resources/IgniteLoggerResource.java | 8 +++--- .../resources/IgniteMBeanServerResource.java | 4 +-- .../ignite/resources/IgniteServiceResource.java | 4 +-- .../IgniteSpringApplicationContextResource.java | 4 +-- .../ignite/resources/IgniteSpringResource.java | 17 +++++------- .../IgniteTaskContinuousMapperResource.java | 10 ++++---- .../resources/IgniteTaskSessionResource.java | 10 ++++---- .../java/org/apache/ignite/spi/IgniteSpi.java | 4 +-- .../PriorityQueueCollisionSpi.java | 16 ++++++------ .../spi/loadbalancing/LoadBalancingSpi.java | 8 +++--- .../adaptive/AdaptiveLoadBalancingSpi.java | 4 +-- .../roundrobin/RoundRobinLoadBalancingSpi.java | 10 ++++---- .../WeightedRandomLoadBalancingSpi.java | 8 +++--- .../grid/cache/GridCacheInterceptor.java | 2 +- .../org/gridgain/grid/kernal/GridGainEx.java | 8 +++--- .../GridResourceJobContextInjector.java | 2 +- .../resource/GridResourceProcessor.java | 2 +- .../loadtests/dsi/GridDsiLifecycleBean.java | 2 +- .../java/org/gridgain/grid/GridGainSpring.java | 8 +++--- 35 files changed, 107 insertions(+), 185 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a9c0e0c1/modules/core/src/main/java/org/apache/ignite/IgniteCompute.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteCompute.java b/modules/core/src/main/java/org/apache/ignite/IgniteCompute.java index 638055f..798c75d 100644 --- a/modules/core/src/main/java/org/apache/ignite/IgniteCompute.java +++ b/modules/core/src/main/java/org/apache/ignite/IgniteCompute.java @@ -76,7 +76,7 @@ import java.util.concurrent.*; * {@link FailoverSpi} in grid configuration. * <h1 class="header">Resource Injection</h1> * All compute jobs, including closures, runnables, callables, and tasks can be injected with - * grid resources. Both, field and method based injections are supported. The following grid + * ignite resources. Both, field and method based injections are supported. The following grid * resources can be injected: * <ul> * <li>{@link IgniteTaskSessionResource}</li> @@ -90,7 +90,7 @@ import java.util.concurrent.*; * <pre name="code" class="java"> * public class MyGridJob extends GridRunnable { * ... - * @GridInstanceResource + * @IgniteInstanceResource * private Grid grid; * ... * } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a9c0e0c1/modules/core/src/main/java/org/apache/ignite/IgniteManaged.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteManaged.java b/modules/core/src/main/java/org/apache/ignite/IgniteManaged.java index e75f483..f711503 100644 --- a/modules/core/src/main/java/org/apache/ignite/IgniteManaged.java +++ b/modules/core/src/main/java/org/apache/ignite/IgniteManaged.java @@ -79,7 +79,7 @@ import java.util.*; * of any topology changes, including node crashes. * <h1 class="header">Resource Injection</h1> * All distributed services can be injected with - * grid resources. Both, field and method based injections are supported. The following grid + * ignite resources. Both, field and method based injections are supported. The following ignite * resources can be injected: * <ul> * <li>{@link IgniteInstanceResource}</li> @@ -94,9 +94,9 @@ import java.util.*; * // Simple service implementation. * public class MyGridService implements GridService { * ... - * // Example of grid resource injection. All resources are optional. + * // Example of ignite resource injection. All resources are optional. * // You should inject resources only as needed. - * @GridInstanceResource + * @IgniteInstanceResource * private Grid grid; * ... * @Override public void cancel(GridServiceContext ctx) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a9c0e0c1/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 b91a59c..b9a116a 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 @@ -91,8 +91,8 @@ import java.util.*; * <p> * <h1 class="header">Resource Injection</h1> * Grid job implementation can be injected using IoC (dependency injection) with - * grid resources. Both, field and method based injection are supported. - * The following grid resources can be injected: + * ignite resources. Both, field and method based injection are supported. + * The following ignite resources can be injected: * <ul> * <li>{@link org.apache.ignite.resources.IgniteTaskSessionResource}</li> * <li>{@link org.apache.ignite.resources.IgniteJobContextResource}</li> @@ -117,7 +117,7 @@ import java.util.*; * of certain event or state change that occurred during job execution. * <p> * Distributed task session can be injected into {@link ComputeJob} implementation - * using {@link org.apache.ignite.resources.IgniteTaskSessionResource @GridTaskSessionResource} annotation. + * using {@link org.apache.ignite.resources.IgniteTaskSessionResource @IgniteTaskSessionResource} annotation. * Both, field and method based injections are supported. Refer to * {@link ComputeTaskSession} documentation for more information on session functionality. * <p> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a9c0e0c1/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 f998219..d00461b 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 @@ -64,8 +64,8 @@ import java.util.*; * <pre name="code" class="java"> * public class MyFooBarTask extends GridComputeTaskAdapter<String, String> { * // Inject load balancer. - * @GridLoadBalancerResource - * GridComputeLoadBalancer balancer; + * @IgniteLoadBalancerResource + * ComputeLoadBalancer balancer; * * // Map jobs to grid nodes. * public Map<? extends ComputeJob, GridNode> map(List<GridNode> subgrid, String arg) throws IgniteCheckedException { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a9c0e0c1/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 d6cb4a6..27f618c 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 @@ -129,8 +129,8 @@ import java.util.*; * <p> * <h1 class="header">Resource Injection</h1> * Grid task implementation can be injected using IoC (dependency injection) with - * grid resources. Both, field and method based injection are supported. - * The following grid resources can be injected: + * ignite resources. Both, field and method based injection are supported. + * The following ignite resources can be injected: * <ul> * <li>{@link org.apache.ignite.resources.IgniteTaskSessionResource}</li> * <li>{@link org.apache.ignite.resources.IgniteInstanceResource}</li> @@ -152,8 +152,8 @@ import java.util.*; * <pre name="code" class="java"> * public class MyFooBarTask extends GridComputeTaskAdapter<String, String> { * // Inject load balancer. - * @GridLoadBalancerResource - * GridComputeLoadBalancer balancer; + * @IgniteLoadBalancerResource + * ComputeLoadBalancer balancer; * * // Map jobs to grid nodes. * public Map<? extends ComputeJob, GridNode> map(List<GridNode> subgrid, String arg) throws IgniteCheckedException { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a9c0e0c1/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 60e8538..bc78be4 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 @@ -29,8 +29,8 @@ import java.util.*; * <pre name="code" class="java"> * public class MyFooBarTask extends GridComputeTaskAdapter<String, String> { * // Inject load balancer. - * @GridLoadBalancerResource - * GridComputeLoadBalancer balancer; + * @IgniteLoadBalancerResource + * ComputeLoadBalancer balancer; * * // Map jobs to grid nodes. * public Map<? extends ComputeJob, GridNode> map(List<GridNode> subgrid, String arg) throws IgniteCheckedException { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a9c0e0c1/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskContinuousMapper.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskContinuousMapper.java b/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskContinuousMapper.java index 7f0116a..e36303c 100644 --- a/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskContinuousMapper.java +++ b/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskContinuousMapper.java @@ -47,16 +47,16 @@ import java.util.*; * <pre name="code" class="java"> * ... * // This field will be injected with task continuous mapper. - * @GridTaskContinuousMapperResource - * private GridComputeTaskContinuousMapper mapper; + * @IgniteTaskContinuousMapperResource + * private ComputeTaskContinuousMapper mapper; * ... * </pre> * or from a setter method: * <pre name="code" class="java"> * // This setter method will be automatically called by the system * // to set grid task continuous mapper. - * @GridTaskContinuousMapperResource - * void setSession(GridComputeTaskContinuousMapper mapper) { + * @IgniteTaskContinuousMapperResource + * void setSession(ComputeTaskContinuousMapper mapper) { * this.mapper = mapper; * } * </pre> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a9c0e0c1/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 7c524c7..cae75a7 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 @@ -76,13 +76,13 @@ import java.util.*; * <p> * <h1 class="header">Session Injection</h1> * Session can be injected into a task or a job using IoC (dependency - * injection) by attaching {@link org.apache.ignite.resources.IgniteTaskSessionResource @GridTaskSessionResource} + * injection) by attaching {@link org.apache.ignite.resources.IgniteTaskSessionResource @IgniteTaskSessionResource} * annotation to a field or a setter method inside of {@link ComputeTask} or * {@link ComputeJob} implementations as follows: * <pre name="code" class="java"> * ... * // This field will be injected with distributed task session. - * @GridTaskSessionResource + * @IgniteTaskSessionResource * private GridComputeTaskSession ses; * ... * </pre> @@ -90,7 +90,7 @@ import java.util.*; * <pre name="code" class="java"> * // This setter method will be automatically called by the system * // to set grid task session. - * @GridTaskSessionResource + * @IgniteTaskSessionResource * void setSession(GridComputeTaskSession ses) { * this.ses = ses; * } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a9c0e0c1/modules/core/src/main/java/org/apache/ignite/lifecycle/LifecycleBean.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/lifecycle/LifecycleBean.java b/modules/core/src/main/java/org/apache/ignite/lifecycle/LifecycleBean.java index e23a70d..c9c68f5 100644 --- a/modules/core/src/main/java/org/apache/ignite/lifecycle/LifecycleBean.java +++ b/modules/core/src/main/java/org/apache/ignite/lifecycle/LifecycleBean.java @@ -29,7 +29,7 @@ import org.apache.ignite.*; * <li> * {@link LifecycleEventType#BEFORE_GRID_START} invoked before grid startup * routine is initiated. Note that grid is not available during this event, - * therefore if you injected a grid instance via {@link org.apache.ignite.resources.IgniteInstanceResource} + * therefore if you injected a ignite instance via {@link org.apache.ignite.resources.IgniteInstanceResource} * annotation, you cannot use it yet. * </li> * <li> @@ -42,7 +42,7 @@ import org.apache.ignite.*; * <li> * {@link LifecycleEventType#BEFORE_GRID_STOP} invoked right before grid * stop routine is initiated. Grid is still available at this stage, so - * if you injected a grid instance via {@link org.apache.ignite.resources.IgniteInstanceResource} annotation, + * if you injected a ignite instance via {@link org.apache.ignite.resources.IgniteInstanceResource} annotation, * you can use it. * </li> * <li> @@ -52,8 +52,8 @@ import org.apache.ignite.*; * </ul> * <h1 class="header">Resource Injection</h1> * Lifecycle beans can be injected using IoC (dependency injection) with - * grid resources. Both, field and method based injection are supported. - * The following grid resources can be injected: + * ignite resources. Both, field and method based injection are supported. + * The following ignite resources can be injected: * <ul> * <li>{@link org.apache.ignite.resources.IgniteLoggerResource}</li> * <li>{@link org.apache.ignite.resources.IgniteSpringApplicationContextResource}</li> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a9c0e0c1/modules/core/src/main/java/org/apache/ignite/managed/ManagedService.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/managed/ManagedService.java b/modules/core/src/main/java/org/apache/ignite/managed/ManagedService.java index 738663a..af200bf 100644 --- a/modules/core/src/main/java/org/apache/ignite/managed/ManagedService.java +++ b/modules/core/src/main/java/org/apache/ignite/managed/ManagedService.java @@ -32,9 +32,9 @@ import java.io.*; * <pre name="code" class="java"> * public class MyGridService implements GridService { * ... - * // Example of grid resource injection. All resources are optional. + * // Example of ignite resource injection. All resources are optional. * // You should inject resources only as needed. - * @GridInstanceResource + * @IgniteInstanceResource * private Grid grid; * ... * @Override public void cancel(GridServiceContext ctx) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a9c0e0c1/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 3a887eb..655fbd5 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 @@ -63,33 +63,6 @@ import java.io.*; * <img src="http://www.gridgain.com/images/spring-small.png";> * <br> * For information about Spring framework visit <a href="http://www.springframework.org/";>www.springframework.org</a> - * <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 ComputeJob { - * ... - * @GridMarshallerResource - * private GridMarshaller marshaller; - * - * public Serializable execute() { - * // Use marshaller to serialize/deserialize any object. - * ... - * } - * } - * </pre> - * or - * <pre name="code" class="java"> - * public class MyGridJob implements ComputeJob { - * ... - * private GridMarshaller marshaller; - * ... - * @GridMarshallerResource - * public void setMarshaller(GridMarshaller marshaller) { - * this.marshaller = marshaller; - * } - * ... - * } - * </pre> */ public interface IgniteMarshaller { /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a9c0e0c1/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 7e4bedc..a45bc84 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 @@ -58,31 +58,6 @@ import java.io.*; * <img src="http://www.gridgain.com/images/spring-small.png";> * <br> * For information about Spring framework visit <a href="http://www.springframework.org/";>www.springframework.org</a> - * <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 ComputeJob { - * ... - * @GridMarshallerResource - * private GridMarshaller marshaller; - * ... - * } - * </pre> - * or - * <pre name="code" class="java"> - * public class MyGridJob implements ComputeJob { - * ... - * private GridMarshaller marshaller; - * ... - * @GridMarshallerResource - * public void setMarshaller(GridMarshaller marshaller) { - * this.marshaller = marshaller; - * } - * ... - * } - * </pre> - * <br> - * */ public class IgniteJdkMarshaller extends IgniteAbstractMarshaller { /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a9c0e0c1/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 719aa02..a1c28b2 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 @@ -75,29 +75,6 @@ import java.util.*; * <img src="http://www.gridgain.com/images/spring-small.png";> * <br> * For information about Spring framework visit <a href="http://www.springframework.org/";>www.springframework.org</a> - * <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 ComputeJob { - * ... - * @GridMarshallerResource - * private GridMarshaller marshaller; - * ... - * } - * </pre> - * or - * <pre name="code" class="java"> - * public class MyGridJob implements ComputeJob { - * ... - * private GridMarshaller marshaller; - * ... - * @GridMarshallerResource - * public void setMarshaller(GridMarshaller marshaller) { - * this.marshaller = marshaller; - * } - * ... - * } - * </pre> */ public class IgniteOptimizedMarshaller extends IgniteAbstractMarshaller { /** Whether or not to require an object to be serializable in order to be marshalled. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a9c0e0c1/modules/core/src/main/java/org/apache/ignite/resources/IgniteCacheNameResource.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/resources/IgniteCacheNameResource.java b/modules/core/src/main/java/org/apache/ignite/resources/IgniteCacheNameResource.java index 8b843f3..ba5688e 100644 --- a/modules/core/src/main/java/org/apache/ignite/resources/IgniteCacheNameResource.java +++ b/modules/core/src/main/java/org/apache/ignite/resources/IgniteCacheNameResource.java @@ -31,7 +31,7 @@ import org.gridgain.grid.cache.*; * <pre name="code" class="java"> * public class MyCacheStore implements GridCacheStore { * ... - * @GridCacheNameResource + * @IgniteCacheNameResource * private String cacheName; * ... * } @@ -42,7 +42,7 @@ import org.gridgain.grid.cache.*; * ... * private String cacheName; * ... - * @GridCacheNameResource + * @IgniteCacheNameResource * public void setCacheName(String cacheName) { * this.cacheName = cacheName; * } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a9c0e0c1/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 d54fe3f..c52f80d 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 @@ -32,8 +32,8 @@ import java.lang.annotation.*; * <pre name="code" class="java"> * public class MyGridJob implements ComputeJob { * ... - * @GridJobContextResource - * private GridComputeJobContext jobCtx; + * @IgniteJobContextResource + * private ComputeJobContext jobCtx; * ... * } * </pre> @@ -41,10 +41,10 @@ import java.lang.annotation.*; * <pre name="code" class="java"> * public class MyGridJob implements ComputeJob { * ... - * private GridComputeJobContext jobCtx; + * private ComputeJobContext jobCtx; * ... - * @GridJobContextResource - * public void setJobContext(GridComputeJobContext jobCtx) { + * @IgniteJobContextResource + * public void setJobContext(ComputeJobContext jobCtx) { * this.jobCtx = jobCtx; * } * ... http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a9c0e0c1/modules/core/src/main/java/org/apache/ignite/resources/IgniteLoadBalancerResource.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/resources/IgniteLoadBalancerResource.java b/modules/core/src/main/java/org/apache/ignite/resources/IgniteLoadBalancerResource.java index 1354307..3dbc29d 100644 --- a/modules/core/src/main/java/org/apache/ignite/resources/IgniteLoadBalancerResource.java +++ b/modules/core/src/main/java/org/apache/ignite/resources/IgniteLoadBalancerResource.java @@ -32,19 +32,19 @@ import java.lang.annotation.*; * <p> * Here is how injection would typically happen: * <pre name="code" class="java"> - * public class MyGridTask extends GridComputeTask<String, Integer> { - * @GridLoadBalancerResource - * private ` balancer; + * public class MyGridTask extends ComputeTask<String, Integer> { + * @IgniteLoadBalancerResource + * private ComputeLoadBalancer balancer; * } * </pre> * or * <pre name="code" class="java"> - * public class MyGridTask extends GridComputeTask<String, Integer> { + * public class MyGridTask extends ComputeTask<String, Integer> { * ... - * private GridComputeLoadBalancer balancer; + * private ComputeLoadBalancer balancer; * ... - * @GridLoadBalancerResource - * public void setBalancer(GridComputeLoadBalancer balancer) { + * @IgniteLoadBalancerResource + * public void setBalancer(ComputeLoadBalancer balancer) { * this.balancer = balancer; * } * ... http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a9c0e0c1/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 a150de0..b396fc8 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 @@ -35,7 +35,7 @@ import java.lang.annotation.*; * <pre name="code" class="java"> * public class MyGridJob implements ComputeJob { * ... - * @GridLoggerResource + * @IgniteLoggerResource * private GridLogger log; * ... * } @@ -44,10 +44,10 @@ import java.lang.annotation.*; * <pre name="code" class="java"> * public class MyGridJob implements ComputeJob { * ... - * private GridLogger log; + * private Ignite log; * ... - * @GridLoggerResource - * public void setGridLogger(GridLogger log) { + * @IgniteLoggerResource + * public void setGridLogger(IgniteLogger log) { * this.log = log; * } * ... http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a9c0e0c1/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 6dad56c..e6c7d83 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 @@ -36,7 +36,7 @@ import java.lang.annotation.*; * <pre name="code" class="java"> * public class MyGridJob implements ComputeJob { * ... - * @GridMBeanServerResource + * @IgniteMBeanServerResource * private MBeanServer mbeanSrv; * ... * } @@ -47,7 +47,7 @@ import java.lang.annotation.*; * ... * private MBeanSever mbeanSrv; * ... - * @GridMBeanServerResource + * @IgniteMBeanServerResource * public void setMBeanServer(MBeanServer mbeanSrv) { * this.mbeanSrv = mbeanSrv; * } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a9c0e0c1/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 9a354c9..05f7f84 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 @@ -29,7 +29,7 @@ import java.lang.annotation.*; * ... * // Inject single instance of 'myService'. If there is * // more than one, first deployed instance will be picked. - * @GridServiceResource(serviceName = "myService", proxyInterface = MyService.class) + * @IgniteServiceResource(serviceName = "myService", proxyInterface = MyService.class) * private MyService svc; * ... * } @@ -41,7 +41,7 @@ import java.lang.annotation.*; * private MyService svc; * ... * // Inject all locally deployed instances of 'myService'. - * @GridServiceResource(serviceName = "myService") + * @IgniteServiceResource(serviceName = "myService") * public void setMyService(MyService svc) { * this.svc = svc; * } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a9c0e0c1/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 6ba1f87..2ec27b1 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 @@ -37,7 +37,7 @@ import java.lang.annotation.*; * <pre name="code" class="java"> * public class MyGridJob implements ComputeJob { * ... - * @GridSpringApplicationContextResource + * @IgniteSpringApplicationContextResource * private ApplicationContext springCtx; * ... * } @@ -48,7 +48,7 @@ import java.lang.annotation.*; * ... * private ApplicationContext springCtx; * ... - * @GridSpringApplicationContextResource + * @IgniteSpringApplicationContextResource * public void setApplicationContext(MBeanServer springCtx) { * this.springCtx = springCtx; * } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a9c0e0c1/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 d68ec0b..3b98703 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 @@ -50,12 +50,9 @@ import java.lang.annotation.*; * <pre name="code" class="java"> * public class MyGridJob implements ComputeJob { * ... - * @GridSpringResource(resourceName = "bean-name") + * @IgniteSpringResource(resourceName = "bean-name") * private transient MyUserBean rsrc; * ... - * @GridUserResource - * private transient MyUserResource rsrc; - * ... * } * </pre> * or @@ -64,7 +61,7 @@ import java.lang.annotation.*; * ... * private transient MyUserBean rsrc; * ... - * @GridSpringResource(resourceName = "bean-name") + * @IgniteSpringResource(resourceName = "bean-name") * public void setMyUserBean(MyUserBean rsrc) { * this.rsrc = rsrc; * } @@ -75,16 +72,16 @@ import java.lang.annotation.*; * <pre name="code" class="java"> * public class MyUserResource { * ... - * @GridSpringResource(resourceName = "bean-name") + * @IgniteSpringResource(resourceName = "bean-name") * private MyUserBean rsrc; * ... * // Inject logger (or any other resource). - * @GridLoggerResource + * @IgniteLoggerResource * private GridLogger log; * - * // Inject grid instance (or any other resource). - * @GridInstanceResource - * private Grid grid; + * // Inject ignite instance (or any other resource). + * @IgniteInstanceResource + * private Ignite ignite; * ... * } * </pre> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a9c0e0c1/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 8717ca2..fe1b857 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 @@ -30,8 +30,8 @@ import java.lang.annotation.*; * <pre name="code" class="java"> * public class MyGridJob implements ComputeJob { * ... - * @GridTaskContinuousMapperResource - * private GridComputeTaskContinuousMapper mapper; + * @IgniteTaskContinuousMapperResource + * private ComputeTaskContinuousMapper mapper; * ... * } * </pre> @@ -39,10 +39,10 @@ import java.lang.annotation.*; * <pre name="code" class="java"> * public class MyGridJob implements ComputeJob { * ... - * private GridComputeTaskContinuousMapper mapper; + * private ComputeTaskContinuousMapper mapper; * ... - * @GridTaskContinuousMapperResource - * public void setMapper(GridComputeTaskContinuousMapper mapper) { + * @IgniteTaskContinuousMapperResource + * public void setMapper(ComputeTaskContinuousMapper mapper) { * this.mapper = mapper; * } * ... http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a9c0e0c1/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 e562423..508af5d 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 @@ -33,8 +33,8 @@ import java.lang.annotation.*; * <pre name="code" class="java"> * public class MyGridJob implements ComputeJob { * ... - * @GridTaskSessionResource - * private GridComputeTaskSession taskSes; + * @IgniteTaskSessionResource + * private ComputeTaskSession taskSes; * ... * } * </pre> @@ -42,10 +42,10 @@ import java.lang.annotation.*; * <pre name="code" class="java"> * public class MyGridJob implements ComputeJob { * ... - * private GridComputeTaskSession taskSes; + * private ComputeTaskSession taskSes; * ... - * @GridTaskSessionResource - * public void setTaskSession(GridComputeTaskSession taskSes) { + * @IgniteTaskSessionResource + * public void setTaskSession(ComputeTaskSession taskSes) { * this.taskSes = taskSes; * } * ... http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a9c0e0c1/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpi.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpi.java index d36dc01..29db278 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpi.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpi.java @@ -25,8 +25,8 @@ import java.util.*; * this interface. Kernal will not load SPI that doesn't implement this interface. * <p> * Grid SPI's can be injected using IoC (dependency injection) - * with grid resources. Both, field and method based injection are supported. - * The following grid resources can be injected: + * with ignite resources. Both, field and method based injection are supported. + * The following ignite resources can be injected: * <ul> * <li>{@link org.apache.ignite.resources.IgniteLoggerResource}</li> * <li>{@link org.apache.ignite.resources.IgniteSpringApplicationContextResource}</li> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a9c0e0c1/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 dee32d7..9d77107 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 @@ -102,11 +102,11 @@ import java.util.*; * be activated first (one by one) and jobs from {@code MyGridUsualTask} with lowest priority * will wait. Once higher priority jobs complete, lower priority jobs will be scheduled. * <pre name="code" class="java"> - * public class MyGridUsualTask extends GridComputeTaskSplitAdapter<Object, Object> { + * public class MyGridUsualTask extends ComputeTaskSplitAdapter<Object, Object> { * public static final int SPLIT_COUNT = 20; * - * @GridTaskSessionResource - * private GridComputeTaskSession taskSes; + * @IgniteTaskSessionResource + * private ComputeTaskSession taskSes; * * @Override * protected Collection<? extends ComputeJob> split(int gridSize, Object arg) throws IgniteCheckedException { @@ -118,7 +118,7 @@ import java.util.*; * Collection<ComputeJob> jobs = new ArrayList<ComputeJob>(SPLIT_COUNT); * * for (int i = 1; i <= SPLIT_COUNT; i++) { - * jobs.add(new GridComputeJobAdapter<Integer>(i) { + * jobs.add(new ComputeJobAdapter<Integer>(i) { * ... * }); * } @@ -128,11 +128,11 @@ import java.util.*; * </pre> * and * <pre name="code" class="java"> - * public class MyGridUrgentTask extends GridComputeTaskSplitAdapter<Object, Object> { + * public class MyGridUrgentTask extends ComputeTaskSplitAdapter<Object, Object> { * public static final int SPLIT_COUNT = 5; * - * @GridTaskSessionResource - * private GridComputeTaskSession taskSes; + * @IgniteTaskSessionResource + * private ComputeTaskSession taskSes; * * @Override * protected Collection<? extends ComputeJob> split(int gridSize, Object arg) throws IgniteCheckedException { @@ -144,7 +144,7 @@ import java.util.*; * Collection<ComputeJob> jobs = new ArrayList<ComputeJob>(SPLIT_COUNT); * * for (int i = 1; i <= SPLIT_COUNT; i++) { - * jobs.add(new GridComputeJobAdapter<Integer>(i) { + * jobs.add(new ComputeJobAdapter<Integer>(i) { * ... * }); * } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a9c0e0c1/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 a98116e..a3fd272 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 @@ -58,8 +58,8 @@ import java.util.*; * <pre name="code" class="java"> * public class MyFooBarTask extends GridComputeTaskAdapter<String,String> { * // Inject load balancer. - * @GridLoadBalancerResource - * GridComputeLoadBalancer balancer; + * @IgniteLoadBalancerResource + * ComputeLoadBalancer balancer; * * // Map jobs to grid nodes. * public Map<? extends ComputeJob, GridNode> map(List<GridNode> subgrid, String arg) throws IgniteCheckedException { @@ -78,13 +78,13 @@ import java.util.*; * } * * // Aggregate results into one compound result. - * public String reduce(List<GridComputeJobResult> results) throws IgniteCheckedException { + * public String reduce(List<ComputeJobResult> 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/incubator-ignite/blob/a9c0e0c1/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 a7bfe72..ade9a48 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 @@ -143,8 +143,8 @@ import static org.apache.ignite.events.IgniteEventType.*; * <pre name="code" class="java"> * public class MyFooBarTask extends GridComputeTaskAdapter<String, String> { * // Inject load balancer. - * @GridLoadBalancerResource - * GridComputeLoadBalancer balancer; + * @IgniteLoadBalancerResource + * ComputeLoadBalancer balancer; * * // Map jobs to grid nodes. * public Map<? extends ComputeJob, GridNode> map(List<GridNode> subgrid, String arg) throws IgniteCheckedException { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a9c0e0c1/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 fbef75f..fb12c6a 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 @@ -80,10 +80,10 @@ import static org.apache.ignite.events.IgniteEventType.*; * 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<String, String> { + * public class MyFooBarTask extends ComputeTaskAdapter<String, String> { * // Inject load balancer. - * @GridLoadBalancerResource - * GridComputeLoadBalancer balancer; + * @LoadBalancerResource + * ComputeLoadBalancer balancer; * * // Map jobs to grid nodes. * public Map<? extends ComputeJob, GridNode> map(List<GridNode> subgrid, String arg) throws IgniteCheckedException { @@ -100,13 +100,13 @@ import static org.apache.ignite.events.IgniteEventType.*; * } * * // Aggregate results into one compound result. - * public String reduce(List<GridComputeJobResult> results) throws IgniteCheckedException { + * public String reduce(List<ComputeJobResult> 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/incubator-ignite/blob/a9c0e0c1/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 7f4c1d8..9dac1ae 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 @@ -71,8 +71,8 @@ import static org.apache.ignite.events.IgniteEventType.*; * <pre name="code" class="java"> * public class MyFooBarTask extends GridComputeTaskAdapter<String, String> { * // Inject load balancer. - * @GridLoadBalancerResource - * GridComputeLoadBalancer balancer; + * @LoadBalancerResource + * ComputeLoadBalancer balancer; * * // Map jobs to grid nodes. * public Map<? extends ComputeJob, GridNode> map(List<GridNode> subgrid, String arg) throws IgniteCheckedException { @@ -89,13 +89,13 @@ import static org.apache.ignite.events.IgniteEventType.*; * } * * // Aggregate results into one compound result. - * public String reduce(List<GridComputeJobResult> results) throws IgniteCheckedException { + * public String reduce(List<ComputeJobResult> 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/incubator-ignite/blob/a9c0e0c1/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheInterceptor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheInterceptor.java b/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheInterceptor.java index 904c844..c09602b 100644 --- a/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheInterceptor.java +++ b/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheInterceptor.java @@ -29,7 +29,7 @@ import org.jetbrains.annotations.*; * Cache interceptor is configured via {@link GridCacheConfiguration#getInterceptor()} * configuration property. * <p> - * Any grid resource from {@code org.gridgain.grid.resources} package can be injected + * Any grid resource from {@code org.apache.ignite.resources} package can be injected * into implementation of this interface. */ public interface GridCacheInterceptor<K, V> { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a9c0e0c1/modules/core/src/main/java/org/gridgain/grid/kernal/GridGainEx.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/GridGainEx.java b/modules/core/src/main/java/org/gridgain/grid/kernal/GridGainEx.java index 92ac498..1fb94bd 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/GridGainEx.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/GridGainEx.java @@ -422,7 +422,7 @@ public class GridGainEx { * @param springCtx Optional Spring application context, possibly {@code null}. * Spring bean definitions for bean injection are taken from this context. * If provided, this context can be injected into grid tasks and grid jobs using - * {@link org.apache.ignite.resources.IgniteSpringApplicationContextResource @GridSpringApplicationContextResource} annotation. + * {@link org.apache.ignite.resources.IgniteSpringApplicationContextResource @IgniteSpringApplicationContextResource} annotation. * @return Started grid. * @throws IgniteCheckedException If default grid could not be started. This exception will be thrown * also if default grid has already been started. @@ -459,7 +459,7 @@ public class GridGainEx { * @param springCtx Optional Spring application context, possibly {@code null}. * Spring bean definitions for bean injection are taken from this context. * If provided, this context can be injected into grid tasks and grid jobs using - * {@link org.apache.ignite.resources.IgniteSpringApplicationContextResource @GridSpringApplicationContextResource} annotation. + * {@link org.apache.ignite.resources.IgniteSpringApplicationContextResource @IgniteSpringApplicationContextResource} annotation. * @return Started grid. * @throws IgniteCheckedException If grid could not be started. This exception will be thrown * also if named grid has already been started. @@ -645,7 +645,7 @@ public class GridGainEx { * @param springCtx Optional Spring application context, possibly {@code null}. * Spring bean definitions for bean injection are taken from this context. * If provided, this context can be injected into grid tasks and grid jobs using - * {@link org.apache.ignite.resources.IgniteSpringApplicationContextResource @GridSpringApplicationContextResource} annotation. + * {@link org.apache.ignite.resources.IgniteSpringApplicationContextResource @IgniteSpringApplicationContextResource} annotation. * @return Started grid. If Spring configuration contains multiple grid instances, * then the 1st found instance is returned. * @throws IgniteCheckedException If grid could not be started or configuration @@ -693,7 +693,7 @@ public class GridGainEx { * @param springCtx Optional Spring application context, possibly {@code null}. * Spring bean definitions for bean injection are taken from this context. * If provided, this context can be injected into grid tasks and grid jobs using - * {@link org.apache.ignite.resources.IgniteSpringApplicationContextResource @GridSpringApplicationContextResource} annotation. + * {@link org.apache.ignite.resources.IgniteSpringApplicationContextResource @IgniteSpringApplicationContextResource} annotation. * @return Started grid. If Spring configuration contains multiple grid instances, * then the 1st found instance is returned. * @throws IgniteCheckedException If grid could not be started or configuration http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a9c0e0c1/modules/core/src/main/java/org/gridgain/grid/kernal/processors/resource/GridResourceJobContextInjector.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/resource/GridResourceJobContextInjector.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/resource/GridResourceJobContextInjector.java index c3ab0fc..6325604 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/resource/GridResourceJobContextInjector.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/resource/GridResourceJobContextInjector.java @@ -22,7 +22,7 @@ import org.apache.ignite.compute.*; import org.gridgain.grid.kernal.managers.deployment.*; /** - * Simple injector which wraps GridComputeJobContext resource object. + * Simple injector which wraps ComputeJobContext resource object. */ public class GridResourceJobContextInjector extends GridResourceBasicInjector<ComputeJobContext> { /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a9c0e0c1/modules/core/src/main/java/org/gridgain/grid/kernal/processors/resource/GridResourceProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/resource/GridResourceProcessor.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/resource/GridResourceProcessor.java index f068967..512f8b9 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/resource/GridResourceProcessor.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/resource/GridResourceProcessor.java @@ -35,7 +35,7 @@ import java.lang.reflect.*; import java.util.*; /** - * Processor for all Grid and task/job resources. + * Processor for all Ignite and task/job resources. */ public class GridResourceProcessor extends GridProcessorAdapter { /** */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a9c0e0c1/modules/core/src/test/java/org/gridgain/loadtests/dsi/GridDsiLifecycleBean.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/loadtests/dsi/GridDsiLifecycleBean.java b/modules/core/src/test/java/org/gridgain/loadtests/dsi/GridDsiLifecycleBean.java index 026c174..2dea769 100644 --- a/modules/core/src/test/java/org/gridgain/loadtests/dsi/GridDsiLifecycleBean.java +++ b/modules/core/src/test/java/org/gridgain/loadtests/dsi/GridDsiLifecycleBean.java @@ -27,7 +27,7 @@ import org.springframework.context.*; */ public class GridDsiLifecycleBean implements LifecycleBean { /** - * Grid instance will be automatically injected. For additional resources + * Ignite instance will be automatically injected. For additional resources * that can be injected into lifecycle beans see * {@link org.apache.ignite.lifecycle.LifecycleBean} documentation. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a9c0e0c1/modules/spring/src/main/java/org/gridgain/grid/GridGainSpring.java ---------------------------------------------------------------------- diff --git a/modules/spring/src/main/java/org/gridgain/grid/GridGainSpring.java b/modules/spring/src/main/java/org/gridgain/grid/GridGainSpring.java index fd69ecc..2fa53db 100644 --- a/modules/spring/src/main/java/org/gridgain/grid/GridGainSpring.java +++ b/modules/spring/src/main/java/org/gridgain/grid/GridGainSpring.java @@ -28,7 +28,7 @@ import java.net.*; /** * Factory methods to start GridGain with optional Spring application context, this context can be injected into - * grid tasks and grid jobs using {@link org.apache.ignite.resources.IgniteSpringApplicationContextResource @GridSpringApplicationContextResource} + * grid tasks and grid jobs using {@link org.apache.ignite.resources.IgniteSpringApplicationContextResource @IgniteSpringApplicationContextResource} * annotation. * <p> * You can also instantiate grid directly from Spring without using {@code GridGain}. @@ -43,7 +43,7 @@ public class GridGainSpring { * @param springCtx Optional Spring application context, possibly {@code null}. * Spring bean definitions for bean injection are taken from this context. * If provided, this context can be injected into grid tasks and grid jobs using - * {@link org.apache.ignite.resources.IgniteSpringApplicationContextResource @GridSpringApplicationContextResource} annotation. + * {@link org.apache.ignite.resources.IgniteSpringApplicationContextResource @IgniteSpringApplicationContextResource} annotation. * @return Started grid. * @throws IgniteCheckedException If default grid could not be started. This exception will be thrown * also if default grid has already been started. @@ -59,7 +59,7 @@ public class GridGainSpring { * @param springCtx Optional Spring application context, possibly {@code null}. * Spring bean definitions for bean injection are taken from this context. * If provided, this context can be injected into grid tasks and grid jobs using - * {@link org.apache.ignite.resources.IgniteSpringApplicationContextResource @GridSpringApplicationContextResource} annotation. + * {@link org.apache.ignite.resources.IgniteSpringApplicationContextResource @IgniteSpringApplicationContextResource} annotation. * @return Started grid. * @throws IgniteCheckedException If grid could not be started. This exception will be thrown * also if named grid has already been started. @@ -81,7 +81,7 @@ public class GridGainSpring { * @param springCtx Optional Spring application context, possibly {@code null}. * Spring bean definitions for bean injection are taken from this context. * If provided, this context can be injected into grid tasks and grid jobs using - * {@link org.apache.ignite.resources.IgniteSpringApplicationContextResource @GridSpringApplicationContextResource} annotation. + * {@link org.apache.ignite.resources.IgniteSpringApplicationContextResource @IgniteSpringApplicationContextResource} annotation. * @return Started grid. If Spring configuration contains multiple grid instances, * then the 1st found instance is returned. * @throws IgniteCheckedException If grid could not be started or configuration
![http://www.gridgain.com/images/spring-small.png"](http://www.gridgain.com/images/spring-small.png"){kind=link}