# Merge remote-tracking branch 'remotes/origin/ignite-1' into ignite-42
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/2a42b710 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2a42b710 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2a42b710 Branch: refs/heads/ignite-107 Commit: 2a42b7109e3df55f2a7181e6ce4d91f6bf9afca2 Parents: eafa114 4a64d43 Author: sboikov <sboi...@gridgain.com> Authored: Mon Jan 19 15:50:04 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Mon Jan 19 15:50:04 2015 +0300 ---------------------------------------------------------------------- .../apache/ignite/cache/CacheEntryEvent.java | 53 +- .../processors/cache/IgniteCacheProxy.java | 30 +- .../ignite/portables/PortableRawReader.java | 2 +- .../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 +- .../processors/cache/GridCacheAdapter.java | 18 +- .../processors/cache/GridCacheContext.java | 2 +- .../processors/cache/GridCacheEntryImpl.java | 2 +- .../processors/cache/GridCacheMapEntry.java | 70 +- .../processors/cache/GridCacheProcessor.java | 1 - .../GridCacheDataStructuresManager.java | 6 +- .../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 + .../junits/common/GridCommonAbstractTest.java | 13 + .../bamboo/GridDataGridTestSuite.java | 8 + 38 files changed, 2503 insertions(+), 285 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2a42b710/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2a42b710/modules/core/src/main/java/org/gridgain/grid/kernal/GridGainEx.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2a42b710/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2a42b710/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheContext.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2a42b710/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMapEntry.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2a42b710/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProcessor.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2a42b710/modules/core/src/test/java/org/gridgain/testframework/junits/common/GridCommonAbstractTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2a42b710/modules/core/src/test/java/org/gridgain/testsuites/bamboo/GridDataGridTestSuite.java ----------------------------------------------------------------------
