Merge branches 'ignite-53' and 'sprint-1' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-53
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/1b6e8e6a Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1b6e8e6a Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1b6e8e6a Branch: refs/heads/ignite-94 Commit: 1b6e8e6a560539a43eb1f63db6980b0698acb932 Parents: 83a571b e466b24 Author: Yakov Zhdanov <yzhda...@gridgain.com> Authored: Wed Jan 21 20:02:44 2015 +0300 Committer: Yakov Zhdanov <yzhda...@gridgain.com> Committed: Wed Jan 21 20:02:44 2015 +0300 ---------------------------------------------------------------------- assembly/release-base.xml | 2 +- docs/core-site.gridgain.xml | 21 ++ .../main/java/org/apache/ignite/CacheLock.java | 86 ----- .../java/org/apache/ignite/IgniteCache.java | 1 - .../java/org/apache/ignite/cache/CacheFlag.java | 3 - .../java/org/apache/ignite/cache/CacheLock.java | 57 ++++ .../cache/CachePartialUpdateException.java | 22 +- .../processors/cache/CacheLockImpl.java | 150 +++++++++ .../processors/cache/IgniteCacheProxy.java | 104 +----- .../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 | 65 ++-- .../GridCacheMultiNodeLockAbstractTest.java | 137 +------- .../dht/GridCacheColocatedDebugTest.java | 20 +- .../dht/GridCacheGlobalLoadTest.java | 22 +- .../near/GridCachePartitionedLockSelfTest.java | 23 +- ...idCachePartitionedMultiNodeLockSelfTest.java | 10 - .../GridCacheLocalMultithreadedSelfTest.java | 135 +------- ...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 + 84 files changed, 1861 insertions(+), 1113 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1b6e8e6a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java index e3f60df,31b17d8..7a1dd8f --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java @@@ -23,9 -23,7 +23,8 @@@ import org.apache.ignite.cache.query.* import org.apache.ignite.cluster.*; import org.apache.ignite.lang.*; import org.apache.ignite.resources.*; - import org.gridgain.grid.*; import org.gridgain.grid.cache.*; +import org.gridgain.grid.cache.query.*; import org.gridgain.grid.kernal.*; import org.gridgain.grid.kernal.processors.cache.*; import org.gridgain.grid.util.tostring.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1b6e8e6a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFullApiSelfTest.java ---------------------------------------------------------------------- diff --cc modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFullApiSelfTest.java index 7367cb8,a9e8395..6b4f5aa --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFullApiSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFullApiSelfTest.java @@@ -18,8 -18,8 +18,9 @@@ package org.gridgain.grid.kernal.processors.cache; import com.google.common.collect.*; +import junit.framework.*; import org.apache.ignite.*; + import org.apache.ignite.cache.*; import org.apache.ignite.cluster.*; import org.apache.ignite.configuration.*; import org.apache.ignite.events.*;
