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 8D7B61841C for ; Wed, 17 Jun 2015 10:45:09 +0000 (UTC) Received: (qmail 46747 invoked by uid 500); 17 Jun 2015 10:45:09 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 46713 invoked by uid 500); 17 Jun 2015 10:45:09 -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 46704 invoked by uid 99); 17 Jun 2015 10:45:09 -0000 Received: from Unknown (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 17 Jun 2015 10:45:09 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id E2F83182568 for ; Wed, 17 Jun 2015 10:45:08 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.791 X-Spam-Level: * X-Spam-Status: No, score=1.791 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, T_RP_MATCHES_RCVD=-0.01, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-eu-west.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id cBtBTNAyTuuk for ; Wed, 17 Jun 2015 10:44:54 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-eu-west.apache.org (ASF Mail Server at mx1-eu-west.apache.org) with SMTP id 937062D85D for ; Wed, 17 Jun 2015 10:44:52 +0000 (UTC) Received: (qmail 45425 invoked by uid 99); 17 Jun 2015 10:44:51 -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; Wed, 17 Jun 2015 10:44:51 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 21AA1E3C53; Wed, 17 Jun 2015 10:44:51 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sergi@apache.org To: commits@ignite.incubator.apache.org Date: Wed, 17 Jun 2015 10:44:55 -0000 Message-Id: <0a157ee7af2142ffb9bccd9654250f01@git.apache.org> In-Reply-To: <26ea68dd35634e44b86ea33d72b75e0e@git.apache.org> References: <26ea68dd35634e44b86ea33d72b75e0e@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [05/39] incubator-ignite git commit: #ignite-960: Small fix in javadoc #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/90f42a4b Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/90f42a4b Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/90f42a4b Branch: refs/heads/ignite-484-1 Commit: 90f42a4b78c5b0aba8dcc5ff9985470077dc66e0 Parents: 6affd3f Author: ivasilinets Authored: Tue Jun 2 11:00:22 2015 +0300 Committer: ivasilinets Committed: Tue Jun 2 11:00:22 2015 +0300 ---------------------------------------------------------------------- .../ignite/resources/SpringApplicationContextResource.java | 4 ++-- modules/spring/src/test/config/store-cache.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90f42a4b/modules/core/src/main/java/org/apache/ignite/resources/SpringApplicationContextResource.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/resources/SpringApplicationContextResource.java b/modules/core/src/main/java/org/apache/ignite/resources/SpringApplicationContextResource.java index 93c9a30..38c0c88 100644 --- a/modules/core/src/main/java/org/apache/ignite/resources/SpringApplicationContextResource.java +++ b/modules/core/src/main/java/org/apache/ignite/resources/SpringApplicationContextResource.java @@ -37,7 +37,7 @@ import java.lang.annotation.*; *
  * public class MyGridJob implements ComputeJob {
  *      ...
- *      @IgniteSpringApplicationContextResource
+ *      @SpringApplicationContextResource
  *      private ApplicationContext springCtx;
  *      ...
  *  }
@@ -48,7 +48,7 @@ import java.lang.annotation.*;
  *     ...
  *     private ApplicationContext springCtx;
  *     ...
- *     @IgniteSpringApplicationContextResource
+ *     @SpringApplicationContextResource
  *     public void setApplicationContext(MBeanServer springCtx) {
  *          this.springCtx = springCtx;
  *     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90f42a4b/modules/spring/src/test/config/store-cache.xml
----------------------------------------------------------------------
diff --git a/modules/spring/src/test/config/store-cache.xml b/modules/spring/src/test/config/store-cache.xml
index 23cf3ea..af5928b 100644
--- a/modules/spring/src/test/config/store-cache.xml
+++ b/modules/spring/src/test/config/store-cache.xml
@@ -24,7 +24,7 @@
 
     
 
-    
+