ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [02/27] incubator-ignite git commit: Ignite-432
Date Wed, 18 Mar 2015 14:13:36 GMT
Ignite-432


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

Branch: refs/heads/sprint-2
Commit: 4ba50f427eda5cb350b0fdd4937bccd0325ca451
Parents: 37ddf31
Author: avinogradov <avinogradov@gridgain.com>
Authored: Fri Mar 13 17:47:41 2015 +0300
Committer: avinogradov <avinogradov@gridgain.com>
Committed: Fri Mar 13 17:47:41 2015 +0300

----------------------------------------------------------------------
 modules/core/src/main/java/org/apache/ignite/IgniteCompute.java  | 4 ----
 modules/core/src/main/java/org/apache/ignite/IgniteQueue.java    | 4 ++--
 .../org/apache/ignite/cache/affinity/CacheAffinityKeyMapped.java | 3 +--
 pom.xml                                                          | 2 +-
 4 files changed, 4 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ba50f42/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 b473905..acc4ce1 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteCompute.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteCompute.java
@@ -117,8 +117,6 @@ public interface IgniteCompute extends IgniteAsyncSupport {
      * @param cacheName Name of the cache to use for affinity co-location.
      * @param affKey Affinity key.
      * @param job Job which will be co-located on the node with given affinity key.
-     * @see ComputeJobContext#cacheName()
-     * @see ComputeJobContext#affinityKey()
      * @throws IgniteException If job failed.
      */
     @IgniteAsyncSupported
@@ -135,8 +133,6 @@ public interface IgniteCompute extends IgniteAsyncSupport {
      * @param job Job which will be co-located on the node with given affinity key.
      * @return Job result.
      * @throws IgniteException If job failed.
-     * @see ComputeJobContext#cacheName()
-     * @see ComputeJobContext#affinityKey()
      */
     @IgniteAsyncSupported
     public <R> R affinityCall(@Nullable String cacheName, Object affKey, IgniteCallable<R>
job) throws IgniteException;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ba50f42/modules/core/src/main/java/org/apache/ignite/IgniteQueue.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteQueue.java b/modules/core/src/main/java/org/apache/ignite/IgniteQueue.java
index 1103e2c..3c32ed9 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteQueue.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteQueue.java
@@ -64,9 +64,9 @@ import java.util.concurrent.*;
  * Instances of distributed cache queues can be created by calling the following method
  * on {@link Ignite} API:
  * <ul>
- *     <li>{@link Ignite#queue(String, CollectionConfiguration, int, boolean)}</li>
+ *     <li>{@link Ignite#queue(String, int, org.apache.ignite.configuration.CollectionConfiguration)}</li>
  * </ul>
- * @see Ignite#queue(String, CollectionConfiguration, int, boolean)
+ * @see Ignite#queue(String, int, org.apache.ignite.configuration.CollectionConfiguration)
  */
 public interface IgniteQueue<T> extends BlockingQueue<T>, Closeable {
     /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ba50f42/modules/core/src/main/java/org/apache/ignite/cache/affinity/CacheAffinityKeyMapped.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/affinity/CacheAffinityKeyMapped.java
b/modules/core/src/main/java/org/apache/ignite/cache/affinity/CacheAffinityKeyMapped.java
index 904add6..8ad644b 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/affinity/CacheAffinityKeyMapped.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/affinity/CacheAffinityKeyMapped.java
@@ -90,8 +90,7 @@ import java.util.concurrent.*;
  * {@link org.apache.ignite.lang.IgniteClosure}. It should be attached to a method or field
that provides affinity key
  * for the computation. Only one annotation per class is allowed. Whenever such annotation
is detected,
  * then {@link org.apache.ignite.spi.loadbalancing.LoadBalancingSpi} will be bypassed, and
computation will be routed to the grid node
- * where the specified affinity key is cached. You can also use optional {@link org.apache.ignite.cache.CacheName
@CacheName}
- * annotation whenever non-default cache name needs to be specified.
+ * where the specified affinity key is cached.
  * <p>
  * Here is how this annotation can be used to route a job to a node where Person object
  * is cached with ID "1234":

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ba50f42/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 26c8159..051416e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -704,7 +704,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-javadoc-plugin</artifactId>
-                        <version>2.9.1</version>
+                        <version>2.10.1</version>
                         <executions>
                             <execution>
                                 <id>module-javadoc</id>


Mime
View raw message