Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 01A01200D29 for ; Thu, 26 Oct 2017 11:03:27 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id F4123160BFE; Thu, 26 Oct 2017 09:03:26 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 67762160BF2 for ; Thu, 26 Oct 2017 11:03:26 +0200 (CEST) Received: (qmail 76965 invoked by uid 500); 26 Oct 2017 09:03:25 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 76956 invoked by uid 99); 26 Oct 2017 09:03:25 -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; Thu, 26 Oct 2017 09:03:25 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id E65D4DF9E6; Thu, 26 Oct 2017 09:03:22 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sboikov@apache.org To: commits@ignite.apache.org Date: Thu, 26 Oct 2017 09:03:25 -0000 Message-Id: In-Reply-To: <66973493cc4044c2b15f99e07f75394f@git.apache.org> References: <66973493cc4044c2b15f99e07f75394f@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [04/12] ignite git commit: Merge remote-tracking branch 'origin/master' archived-at: Thu, 26 Oct 2017 09:03:27 -0000 Merge remote-tracking branch 'origin/master' Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f7aa443b Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f7aa443b Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f7aa443b Branch: refs/heads/ignite-3478 Commit: f7aa443ba1ebe1fffdfede5a42028ac18485bb3a Parents: ee6daae dde3486 Author: devozerov Authored: Wed Oct 25 14:45:15 2017 +0300 Committer: devozerov Committed: Wed Oct 25 14:45:15 2017 +0300 ---------------------------------------------------------------------- .../org/apache/ignite/IgniteSpringBean.java | 32 ++- .../GridSpringBeanSerializationSelfTest.java | 4 +- .../ignite/internal/IgniteSpringBeanTest.java | 2 +- .../GridServiceInjectionSpringResourceTest.java | 10 +- ...teSpringBeanSpringResourceInjectionTest.java | 215 +++++++++++++++++++ .../ignite/spring/injection/spring-bean.xml | 84 ++++++++ .../testsuites/IgniteSpringTestSuite.java | 2 + 7 files changed, 334 insertions(+), 15 deletions(-) ----------------------------------------------------------------------