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/master Commit: f7aa443ba1ebe1fffdfede5a42028ac18485bb3a Parents: ee6daae dde3486 Author: devozerov <[email protected]> Authored: Wed Oct 25 14:45:15 2017 +0300 Committer: devozerov <[email protected]> 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(-) ----------------------------------------------------------------------
