Merge remote-tracking branch 'remotes/origin/ignite-45' into ignite-1
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/22796ee9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/22796ee9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/22796ee9 Branch: refs/heads/ignite-42 Commit: 22796ee9cb21e4fa7cfb3f3886249e2c9e04f699 Parents: bb32d46 7b5d5f4 Author: sevdokimov <sevdoki...@gridgain.com> Authored: Tue Jan 13 18:20:14 2015 +0300 Committer: sevdokimov <sevdoki...@gridgain.com> Committed: Tue Jan 13 18:20:14 2015 +0300 ---------------------------------------------------------------------- .../services/javax.cache.spi.CachingProvider | 1 + .../org/apache/ignite/IgniteCacheMXBean.java | 72 ++++ .../org/apache/ignite/IgniteCacheManager.java | 372 +++++++++++++++++++ .../apache/ignite/IgniteCachingProvider.java | 189 ++++++++++ .../processors/cache/IgniteCacheProxy.java | 35 +- .../grid/cache/GridCacheConfiguration.java | 11 +- .../org/gridgain/grid/cache/GridCacheEntry.java | 3 +- .../org/gridgain/grid/kernal/GridGainEx.java | 2 +- .../processors/cache/GridCacheEntryImpl.java | 8 + .../cache/GridCacheEvictionEntry.java | 8 + .../cache/GridCacheFilterEvaluationEntry.java | 8 + .../cache/query/GridCacheQueryManager.java | 8 + .../GridCacheContinuousQueryEntry.java | 8 + .../grid/kernal/tck/TCKMBeanServerBuilder.java | 118 ++++++ .../cache/IgniteCachingProviderSelfTest.java | 123 ++++++ .../cache/eviction/GridCacheMockEntry.java | 8 + 16 files changed, 960 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/22796ee9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java ----------------------------------------------------------------------
