Merge remote-tracking branch 'remotes/origin/ignite-1' into ignite-43
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/8f8f6ef5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/8f8f6ef5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/8f8f6ef5 Branch: refs/heads/ignite-43 Commit: 8f8f6ef58257b39a87317d7c2f0b4fcc802eaac0 Parents: 0f33ffc 83fb794 Author: sboikov <sboi...@gridgain.com> Authored: Wed Jan 14 11:38:38 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Wed Jan 14 11:38:38 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/CacheInvokeEntry.java | 3 + .../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 | 131 +++++++ .../dht/GridCacheAtomicNearCacheSelfTest.java | 1 + .../cache/eviction/GridCacheMockEntry.java | 8 + .../hadoop/jobtracker/GridHadoopJobTracker.java | 7 +- 19 files changed, 978 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8f8f6ef5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8f8f6ef5/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheConfiguration.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8f8f6ef5/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryEntry.java ----------------------------------------------------------------------