Merge remote-tracking branch 'remotes/origin/sprint-1' into ignite-107
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/000c2d02 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/000c2d02 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/000c2d02 Branch: refs/heads/sprint-1 Commit: 000c2d02c23ef7a90f79591bb5241797ccbb1233 Parents: 52b8967 1a2d2ca Author: avinogradov <avinogra...@gridgain.com> Authored: Wed Jan 21 12:40:16 2015 +0300 Committer: avinogradov <avinogra...@gridgain.com> Committed: Wed Jan 21 12:40:16 2015 +0300 ---------------------------------------------------------------------- .../main/java/org/apache/ignite/CacheLock.java | 61 ---- .../java/org/apache/ignite/IgniteCache.java | 1 - .../java/org/apache/ignite/cache/CacheLock.java | 62 ++++ .../processors/cache/CacheLockAsyncImpl.java | 2 +- .../processors/cache/CacheLockImpl.java | 1 + .../cache/GridCacheAbstractFullApiSelfTest.java | 1 + .../GridCacheMultiNodeLockAbstractTest.java | 3 +- .../dht/GridCacheColocatedDebugTest.java | 1 + .../near/GridCachePartitionedLockSelfTest.java | 2 +- .../GridCacheLocalMultithreadedSelfTest.java | 1 + .../grid/cache/spring/GridSpringCache.java | 185 +++++++++++ .../cache/spring/GridSpringCacheManager.java | 190 ++--------- .../spring/GridSpringDynamicCacheManager.java | 316 +++++++++++++++++++ .../spring/GridSpringCacheManagerSelfTest.java | 2 +- .../GridSpringDynamicCacheManagerSelfTest.java | 218 +++++++++++++ .../GridSpringDynamicCacheTestService.java | 62 ++++ .../cache/spring/spring-dynamic-caching.xml | 43 +++ .../testsuites/bamboo/GridSpringTestSuite.java | 1 + 18 files changed, 915 insertions(+), 237 deletions(-) ----------------------------------------------------------------------
