Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 973D8181DF for ; Tue, 16 Jun 2015 23:41:36 +0000 (UTC) Received: (qmail 1788 invoked by uid 500); 16 Jun 2015 23:41:36 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 1756 invoked by uid 500); 16 Jun 2015 23:41:36 -0000 Mailing-List: contact commits-help@ignite.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.incubator.apache.org Delivered-To: mailing list commits@ignite.incubator.apache.org Received: (qmail 1746 invoked by uid 99); 16 Jun 2015 23:41:36 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 16 Jun 2015 23:41:36 +0000 X-ASF-Spam-Status: No, hits=-2000.4 required=5.0 tests=ALL_TRUSTED,RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Tue, 16 Jun 2015 23:39:23 +0000 Received: (qmail 99432 invoked by uid 99); 16 Jun 2015 23:41:10 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 16 Jun 2015 23:41:10 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 5AD61E3C48; Tue, 16 Jun 2015 23:41:10 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: vkulichenko@apache.org To: commits@ignite.incubator.apache.org Date: Tue, 16 Jun 2015 23:41:10 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [01/50] incubator-ignite git commit: #ignite-960: Small fix in javadoc X-Virus-Checked: Checked by ClamAV on apache.org Repository: incubator-ignite Updated Branches: refs/heads/ignite-884 d41af24d2 -> edc42c427 #ignite-960: Small fix in 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/6affd3fe Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6affd3fe Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6affd3fe Branch: refs/heads/ignite-884 Commit: 6affd3fe32dce9b055a94a2174a497746427b120 Parents: f4a122c Author: ivasilinets Authored: Tue Jun 2 10:52:49 2015 +0300 Committer: ivasilinets Committed: Tue Jun 2 10:52:49 2015 +0300 ---------------------------------------------------------------------- .../main/java/org/apache/ignite/resources/SpringResource.java | 6 +++--- .../processors/resource/GridResourceSpringBeanInjector.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6affd3fe/modules/core/src/main/java/org/apache/ignite/resources/SpringResource.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/resources/SpringResource.java b/modules/core/src/main/java/org/apache/ignite/resources/SpringResource.java index 0d6a207..4426637 100644 --- a/modules/core/src/main/java/org/apache/ignite/resources/SpringResource.java +++ b/modules/core/src/main/java/org/apache/ignite/resources/SpringResource.java @@ -50,7 +50,7 @@ import java.lang.annotation.*; * 
  * public class MyGridJob implements ComputeJob {
  *      ...
- *      @IgniteSpringResource(resourceName = "bean-name")
+ *      @SpringResource(resourceName = "bean-name")
  *      private transient MyUserBean rsrc;
  *      ...
  *  }
@@ -61,7 +61,7 @@ import java.lang.annotation.*;
  *     ...
  *     private transient MyUserBean rsrc;
  *     ...
- *     @IgniteSpringResource(resourceName = "bean-name")
+ *     @SpringResource(resourceName = "bean-name")
  *     public void setMyUserBean(MyUserBean rsrc) {
  *          this.rsrc = rsrc;
  *     }
@@ -72,7 +72,7 @@ import java.lang.annotation.*;
  * 
  * public class MyUserResource {
  *     ...
- *     @IgniteSpringResource(resourceName = "bean-name")
+ *     @SpringResource(resourceName = "bean-name")
  *     private MyUserBean rsrc;
  *     ...
  *     // Inject logger (or any other resource).

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6affd3fe/modules/spring/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceSpringBeanInjector.java
----------------------------------------------------------------------
diff --git a/modules/spring/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceSpringBeanInjector.java b/modules/spring/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceSpringBeanInjector.java
index fb57027..3acb070 100644
--- a/modules/spring/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceSpringBeanInjector.java
+++ b/modules/spring/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceSpringBeanInjector.java
@@ -56,7 +56,7 @@ public class GridResourceSpringBeanInjector implements GridResourceInjector {
         // Check for 'transient' modifier only in serializable classes.
         if (!Modifier.isTransient(field.getField().getModifiers()) &&
             Serializable.class.isAssignableFrom(field.getField().getDeclaringClass())) {
-            throw new IgniteCheckedException("@GridSpringResource must only be used with 'transient' fields: " +
+            throw new IgniteCheckedException("@SpringResource must only be used with 'transient' fields: " +
                 field.getField());
         }