Merge remote-tracking branch 'remotes/origin/sprint-1' into ignite-94
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5761c457 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5761c457 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5761c457 Branch: refs/heads/ignite-94 Commit: 5761c45716a2cb0d6cdc796b343ae86e72cfb31c Parents: 2597403 bfbb6d2 Author: avinogradov <avinogra...@gridgain.com> Authored: Wed Jan 21 14:30:31 2015 +0300 Committer: avinogradov <avinogra...@gridgain.com> Committed: Wed Jan 21 14:30:31 2015 +0300 ---------------------------------------------------------------------- assembly/release-base.xml | 5 + .../main/java/org/apache/ignite/CacheLock.java | 61 ---- .../java/org/apache/ignite/IgniteCache.java | 1 - .../java/org/apache/ignite/cache/CacheLock.java | 62 ++++ .../cache/CachePartialUpdateException.java | 22 +- .../processors/cache/CacheLockAsyncImpl.java | 2 +- .../processors/cache/CacheLockImpl.java | 1 + .../processors/cache/CacheInvokeEntry.java | 22 +- .../processors/cache/CacheInvokeResult.java | 22 +- .../cache/IgniteCacheExpiryPolicy.java | 22 +- .../distributed/GridCacheTtlUpdateRequest.java | 22 +- .../IgniteExternalizableExpiryPolicy.java | 22 +- .../cache/IgniteCacheAbstractTest.java | 22 +- .../cache/IgniteCacheAtomicInvokeTest.java | 22 +- .../cache/IgniteCacheAtomicLocalInvokeTest.java | 22 +- ...niteCacheAtomicLocalWithStoreInvokeTest.java | 22 +- .../IgniteCacheAtomicNearEnabledInvokeTest.java | 22 +- ...eCacheAtomicPrimaryWriteOrderInvokeTest.java | 22 +- ...micPrimaryWriteOrderWithStoreInvokeTest.java | 22 +- .../cache/IgniteCacheInvokeAbstractTest.java | 22 +- .../cache/IgniteCacheTxInvokeTest.java | 22 +- .../cache/IgniteCacheTxLocalInvokeTest.java | 22 +- .../IgniteCacheTxNearEnabledInvokeTest.java | 22 +- .../IgniteCacheAtomicExpiryPolicyTest.java | 22 +- .../IgniteCacheAtomicLocalExpiryPolicyTest.java | 22 +- ...AtomicPrimaryWriteOrderExpiryPolicyTest.java | 22 +- ...maryWriteOrderWithStoreExpiryPolicyTest.java | 22 +- ...teCacheAtomicReplicatedExpiryPolicyTest.java | 22 +- ...iteCacheAtomicWithStoreExpiryPolicyTest.java | 22 +- .../IgniteCacheExpiryPolicyAbstractTest.java | 22 +- .../IgniteCacheExpiryPolicyTestSuite.java | 22 +- .../expiry/IgniteCacheTxExpiryPolicyTest.java | 22 +- .../IgniteCacheTxLocalExpiryPolicyTest.java | 22 +- ...IgniteCacheTxReplicatedExpiryPolicyTest.java | 22 +- .../IgniteCacheTxWithStoreExpiryPolicyTest.java | 22 +- .../cache/GridCacheAbstractFullApiSelfTest.java | 1 + .../GridCacheMultiNodeLockAbstractTest.java | 3 +- .../dht/GridCacheColocatedDebugTest.java | 1 + .../dht/GridCacheGlobalLoadTest.java | 22 +- .../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 + 49 files changed, 1370 insertions(+), 447 deletions(-) ----------------------------------------------------------------------
