Merge remote-tracking branch 'remotes/origin/ignite-1' into ignite-53
Conflicts:
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.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/5ee94421
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5ee94421
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5ee94421
Branch: refs/heads/ignite-107
Commit: 5ee944211cf344f6f57a102579cc9dcd89b5b092
Parents: eb74531 4a64d43
Author: ivasilinets <ivasilin...@gridgain.com>
Authored: Mon Jan 19 19:35:35 2015 +0300
Committer: ivasilinets <ivasilin...@gridgain.com>
Committed: Mon Jan 19 19:35:35 2015 +0300
----------------------------------------------------------------------
.../apache/ignite/cache/CacheEntryEvent.java | 53 +-
.../processors/cache/IgniteCacheProxy.java | 3 +-
.../grid/cache/GridCacheConfiguration.java | 1 +
.../cache/query/GridCacheContinuousQuery.java | 10 +-
.../grid/kernal/GridEventConsumeHandler.java | 2 +-
.../processors/cache/GridCacheMapEntry.java | 70 +-
.../processors/cache/GridCacheProcessor.java | 1 -
.../GridCacheDataStructuresManager.java | 6 +-
.../GridCacheContinuousQueryAdapter.java | 42 +-
.../GridCacheContinuousQueryEntry.java | 61 +-
.../GridCacheContinuousQueryHandler.java | 96 +-
.../GridCacheContinuousQueryHandlerV2.java | 83 --
.../GridCacheContinuousQueryHandlerV3.java | 61 --
.../GridCacheContinuousQueryHandlerV4.java | 61 --
.../GridCacheContinuousQueryManager.java | 513 ++++++++-
.../continuous/GridContinuousMessage.java | 52 +-
.../continuous/GridContinuousMessageType.java | 5 +-
.../continuous/GridContinuousProcessor.java | 181 +++-
.../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 +
29 files changed, 2298 insertions(+), 329 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5ee94421/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
----------------------------------------------------------------------
