Merge branches 'ignite-35' and 'sprint-1' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-35
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/eeaf55e6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/eeaf55e6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/eeaf55e6 Branch: refs/heads/ignite-35 Commit: eeaf55e6cd3db2750cfa332fa5a5d4136d021fde Parents: 55bbebc e466b24 Author: Yakov Zhdanov <yzhda...@gridgain.com> Authored: Wed Jan 21 19:42:32 2015 +0300 Committer: Yakov Zhdanov <yzhda...@gridgain.com> Committed: Wed Jan 21 19:42:32 2015 +0300 ---------------------------------------------------------------------- docs/core-site.gridgain.xml | 21 ++ .../java/org/apache/ignite/cache/CacheFlag.java | 3 - .../java/org/apache/ignite/cache/CacheLock.java | 25 +- .../cache/CachePartialUpdateException.java | 22 +- .../processors/cache/CacheLockAsyncImpl.java | 141 --------- .../processors/cache/CacheLockImpl.java | 31 +- .../grid/cache/GridCacheConfiguration.java | 32 ++ .../org/gridgain/grid/cache/GridCacheFlag.java | 3 - .../processors/cache/CacheInvokeEntry.java | 22 +- .../processors/cache/CacheInvokeResult.java | 22 +- .../processors/cache/GridCacheAdapter.java | 8 +- .../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 | 23 +- .../GridCacheMultiNodeLockAbstractTest.java | 150 +-------- .../dht/GridCacheColocatedDebugTest.java | 9 +- .../dht/GridCacheGlobalLoadTest.java | 22 +- .../near/GridCachePartitionedLockSelfTest.java | 16 +- ...idCachePartitionedMultiNodeLockSelfTest.java | 10 - .../GridCacheLocalMultithreadedSelfTest.java | 119 ------- ...heGgfsPerBlockLruEvictionPolicySelfTest.java | 15 +- .../ggfs/GridGgfsAbstractSelfTest.java | 20 +- .../ggfs/GridGgfsMetricsSelfTest.java | 10 +- .../processors/ggfs/GridGgfsModesSelfTest.java | 6 +- ...IpcEndpointRegistrationAbstractSelfTest.java | 33 +- ...dpointRegistrationOnLinuxAndMacSelfTest.java | 6 +- ...pcEndpointRegistrationOnWindowsSelfTest.java | 4 +- ...idIpcServerEndpointDeserializerSelfTest.java | 76 ++--- .../testframework/GridGgfsTestUtils.java | 55 ---- .../counter/GridHadoopFSCounterWriter.java | 4 +- .../counter/GridHadoopPerformanceCounter.java | 18 +- .../v2/GridHadoopV2JobResourceManager.java | 13 +- .../grid/ggfs/GridGgfsEventsTestSuite.java | 26 +- ...dGgfsHadoop20FileSystemAbstractSelfTest.java | 9 +- ...doop20FileSystemLoopbackPrimarySelfTest.java | 11 +- ...sHadoop20FileSystemShmemPrimarySelfTest.java | 11 +- .../GridGgfsHadoopDualAbstractSelfTest.java | 19 +- ...ridGgfsHadoopFileSystemAbstractSelfTest.java | 15 +- .../GridGgfsHadoopFileSystemClientSelfTest.java | 6 +- ...idGgfsHadoopFileSystemHandshakeSelfTest.java | 7 +- ...ridGgfsHadoopFileSystemIpcCacheSelfTest.java | 7 +- ...GgfsHadoopFileSystemLoggerStateSelfTest.java | 7 +- ...adoopFileSystemLoopbackAbstractSelfTest.java | 9 +- ...fsHadoopFileSystemSecondaryModeSelfTest.java | 12 +- ...fsHadoopFileSystemShmemAbstractSelfTest.java | 7 +- .../ggfs/GridGgfsNearOnlyMultiNodeSelfTest.java | 7 +- .../grid/hadoop/GridHadoopTestUtils.java | 20 +- .../hadoop/GridHadoopCommandLineTest.java | 2 +- .../hadoop/GridHadoopMapReduceTest.java | 5 +- .../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 + 81 files changed, 1621 insertions(+), 1087 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/eeaf55e6/modules/spring/src/test/java/org/gridgain/testsuites/bamboo/GridSpringTestSuite.java ---------------------------------------------------------------------- diff --cc modules/spring/src/test/java/org/gridgain/testsuites/bamboo/GridSpringTestSuite.java index 2179f4d,c5850a8..fa41d34 --- a/modules/spring/src/test/java/org/gridgain/testsuites/bamboo/GridSpringTestSuite.java +++ b/modules/spring/src/test/java/org/gridgain/testsuites/bamboo/GridSpringTestSuite.java @@@ -41,8 -41,10 +41,9 @@@ public class GridSpringTestSuite extend // Tests moved to this suite since they require Spring functionality. suite.addTest(new TestSuite(GridP2PUserVersionChangeSelfTest.class)); - suite.addTest(new TestSuite(GridP2PContinuousLocalDeploySelfTest.class)); suite.addTest(new TestSuite(GridSpringCacheManagerSelfTest.class)); + suite.addTest(new TestSuite(GridSpringDynamicCacheManagerSelfTest.class)); return suite; }
