Merge remote-tracking branch 'remotes/community/ignite-1.5.31' into ignite-3547
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/3691079d Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/3691079d Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/3691079d Branch: refs/heads/ignite-3547 Commit: 3691079d222543f15a410ac7fd837dd4cc1c9af1 Parents: 220d68b a39770a Author: sboikov <sboi...@gridgain.com> Authored: Tue Jul 26 14:31:16 2016 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Tue Jul 26 14:31:16 2016 +0300 ---------------------------------------------------------------------- .../ignite/cache/spring/SpringCacheManager.java | 17 ++- .../spring/SpringTransactionManager.java | 59 +++++---- .../test/java/config/spring-transactions.xml | 4 +- .../ignite/TestInjectionLifecycleBean.java | 42 +++++++ .../org/apache/ignite/spring-injection-test.xml | 43 +++++++ .../SpringCacheManagerContextInjectionTest.java | 126 +++++++++++++++++++ .../testsuites/IgniteSpringTestSuite.java | 5 + ...gTransactionManagerContextInjectionTest.java | 125 ++++++++++++++++++ 8 files changed, 393 insertions(+), 28 deletions(-) ----------------------------------------------------------------------
