Merge remote-tracking branch 'remotes/origin/ignite-53' into ignite-99 Conflicts: modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFullApiSelfTest.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/fc4e8a94 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/fc4e8a94 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/fc4e8a94 Branch: refs/heads/ignite-99 Commit: fc4e8a9428abd2c2a796126223398072353ee50e Parents: 060bede 83a571b Author: ivasilinets <ivasilin...@gridgain.com> Authored: Wed Jan 21 12:33:23 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Wed Jan 21 12:33:23 2015 +0300 ---------------------------------------------------------------------- LICENSE.txt | 202 ++++ apache-2.0.txt | 202 ---- .../main/java/org/apache/ignite/CacheLock.java | 86 ++ .../java/org/apache/ignite/IgniteCache.java | 23 +- .../apache/ignite/cache/CacheEntryEvent.java | 53 +- .../processors/cache/IgniteCacheProxy.java | 147 ++- .../ignite/portables/PortableRawReader.java | 2 +- .../grid/cache/GridCacheConfiguration.java | 1 + .../cache/query/GridCacheContinuousQuery.java | 10 +- .../grid/dotnet/GridDotNetConfiguration.java | 14 +- .../dotnet/GridDotNetPortableConfiguration.java | 28 +- .../GridDotNetPortableTypeConfiguration.java | 15 +- .../grid/kernal/GridEventConsumeHandler.java | 2 +- .../org/gridgain/grid/kernal/GridGainEx.java | 76 +- .../grid/kernal/GridNodeAttributes.java | 5 +- .../kernal/processors/cache/CacheEntryImpl.java | 2 +- .../cache/CacheIteratorConverter.java | 39 + .../cache/CacheWeakQueryIteratorsHolder.java | 62 +- .../processors/cache/GridCacheAdapter.java | 38 +- .../processors/cache/GridCacheContext.java | 14 +- .../processors/cache/GridCacheEntryImpl.java | 2 +- .../processors/cache/GridCacheGateway.java | 2 + .../processors/cache/GridCacheMapEntry.java | 70 +- .../processors/cache/GridCacheProcessor.java | 1 - .../GridCacheDataStructuresManager.java | 6 +- .../cache/datastructures/GridCacheSetImpl.java | 32 +- .../cache/query/GridCacheQueryAdapter.java | 1 - .../GridCacheContinuousQueryAdapter.java | 45 +- .../GridCacheContinuousQueryEntry.java | 61 +- .../GridCacheContinuousQueryFilterEx.java | 32 + .../GridCacheContinuousQueryHandler.java | 97 +- .../GridCacheContinuousQueryHandlerV2.java | 83 -- .../GridCacheContinuousQueryListener.java | 5 + .../GridCacheContinuousQueryManager.java | 564 +++++++++- .../continuous/GridContinuousMessage.java | 52 +- .../continuous/GridContinuousMessageType.java | 5 +- .../continuous/GridContinuousProcessor.java | 181 +++- .../interop/GridInteropProcessorAdapter.java | 3 - .../service/GridServiceProcessor.java | 4 +- .../IgniteCacheEntryListenerAbstractTest.java | 1005 ++++++++++++++++++ ...IgniteCacheEntryListenerAtomicLocalTest.java | 49 + ...eCacheEntryListenerAtomicReplicatedTest.java | 32 + .../IgniteCacheEntryListenerAtomicTest.java | 55 + ...eCacheEntryListenerEagerTtlDisabledTest.java | 30 + .../IgniteCacheEntryListenerTxLocalTest.java | 49 + ...gniteCacheEntryListenerTxReplicatedTest.java | 32 + .../cache/IgniteCacheEntryListenerTxTest.java | 49 + .../cache/GridCacheAbstractFullApiSelfTest.java | 201 +++- .../cache/GridCacheBasicApiAbstractTest.java | 80 ++ .../junits/common/GridCommonAbstractTest.java | 13 + .../bamboo/GridDataGridTestSuite.java | 8 + 51 files changed, 3277 insertions(+), 593 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc4e8a94/modules/core/src/main/java/org/apache/ignite/IgniteCache.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc4e8a94/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheConfiguration.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc4e8a94/modules/core/src/main/java/org/gridgain/grid/kernal/GridGainEx.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc4e8a94/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc4e8a94/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheEntryImpl.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc4e8a94/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProcessor.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc4e8a94/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheSetImpl.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc4e8a94/modules/core/src/main/java/org/gridgain/grid/kernal/processors/service/GridServiceProcessor.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc4e8a94/modules/core/src/test/java/org/gridgain/testframework/junits/common/GridCommonAbstractTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc4e8a94/modules/core/src/test/java/org/gridgain/testsuites/bamboo/GridDataGridTestSuite.java ----------------------------------------------------------------------