Merge remote-tracking branch 'remotes/origin/sprint-1' into ignite-86
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/09b09b71 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/09b09b71 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/09b09b71 Branch: refs/heads/ingite-9655-merge Commit: 09b09b712c6c1fb6ce4a089d8b2580e6fe26b7b2 Parents: cb767aa 9fd191a Author: ivasilinets <ivasilin...@gridgain.com> Authored: Mon Jan 26 12:35:35 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Mon Jan 26 12:35:35 2015 +0300 ---------------------------------------------------------------------- LICENSE.txt | 27 ++ NOTICE.txt | 15 + examples/pom-standalone.xml | 32 +- .../spi/checkpoint/s3/S3CheckpointSpiMBean.java | 2 +- .../services/javax.cache.spi.CachingProvider | 2 +- .../org/apache/ignite/IgniteCacheMXBean.java | 72 ---- .../org/apache/ignite/IgniteCacheManager.java | 372 ------------------ .../apache/ignite/IgniteCachingProvider.java | 189 --------- .../org/apache/ignite/cache/CacheMBean.java | 2 +- .../org/apache/ignite/cache/CacheManager.java | 372 ++++++++++++++++++ .../apache/ignite/cache/CachingProvider.java | 189 +++++++++ .../cache/GridCachePartialUpdateException.java | 64 --- .../fifo/CacheFifoEvictionPolicyMBean.java | 2 +- ...CacheGgfsPerBlockLruEvictionPolicyMBean.java | 2 +- .../lru/CacheLruEvictionPolicyMBean.java | 2 +- .../random/CacheRandomEvictionPolicyMBean.java | 2 +- .../client/router/GridTcpRouterMBean.java | 2 +- .../ignite/cluster/ClusterNodeMetrics.java | 2 +- .../internal/ClusterNodeMetricsMBean.java | 2 +- .../org/apache/ignite/internal/GridGainEx.java | 2 +- .../org/apache/ignite/internal/GridKernal.java | 2 +- .../internal/IgniteThreadPoolMBeanAdapter.java | 4 +- .../ignite/internal/IgnitionMBeanAdapter.java | 2 +- .../processors/cache/CacheEntryImpl.java | 8 +- .../cache/CacheIteratorConverter.java | 39 ++ .../cache/CacheWeakQueryIteratorsHolder.java | 228 +++++++++++ .../processors/cache/GridCacheAdapter.java | 31 ++ .../processors/cache/GridCacheContext.java | 12 + .../processors/cache/GridCacheGateway.java | 2 + .../processors/cache/IgniteCacheProxy.java | 27 +- .../cache/datastructures/GridCacheSetImpl.java | 175 +-------- .../cache/query/GridCacheQueryAdapter.java | 14 +- .../query/GridCacheQueryFutureAdapter.java | 7 +- .../cache/query/GridCacheQueryManager.java | 4 +- .../apache/ignite/internal/util/GridUtils.java | 2 +- .../org/apache/ignite/mbean/IgniteMBean.java | 386 ------------------- .../ignite/mbean/IgniteMBeanDescription.java | 34 -- .../IgniteMBeanParametersDescriptions.java | 34 -- .../mbean/IgniteMBeanParametersNames.java | 34 -- .../ignite/mbean/IgniteStandardMBean.java | 275 ------------- .../ignite/mbean/IgniteThreadPoolMBean.java | 152 -------- .../org/apache/ignite/mbean/IgnitionMBean.java | 151 -------- .../java/org/apache/ignite/mbean/package.html | 23 -- .../apache/ignite/mxbean/IgniteCacheMXBean.java | 72 ++++ .../org/apache/ignite/mxbean/IgniteMBean.java | 386 +++++++++++++++++++ .../ignite/mxbean/IgniteMBeanDescription.java | 34 ++ .../IgniteMBeanParametersDescriptions.java | 34 ++ .../mxbean/IgniteMBeanParametersNames.java | 34 ++ .../ignite/mxbean/IgniteStandardMBean.java | 275 +++++++++++++ .../ignite/mxbean/IgniteThreadPoolMBean.java | 152 ++++++++ .../org/apache/ignite/mxbean/IgnitionMBean.java | 151 ++++++++ .../java/org/apache/ignite/mxbean/package.html | 23 ++ .../ignite/spi/IgniteSpiManagementMBean.java | 2 +- .../noop/NoopAuthenticationSpiMBean.java | 2 +- .../cache/CacheCheckpointSpiMBean.java | 2 +- .../checkpoint/jdbc/JdbcCheckpointSpiMBean.java | 2 +- .../sharedfs/SharedFsCheckpointSpiMBean.java | 2 +- .../fifoqueue/FifoQueueCollisionSpiMBean.java | 2 +- .../JobStealingCollisionSpiMBean.java | 2 +- .../PriorityQueueCollisionSpiMBean.java | 2 +- .../tcp/TcpCommunicationSpiMBean.java | 2 +- .../local/LocalDeploymentSpiMBean.java | 2 +- .../tcp/TcpClientDiscoverySpiMBean.java | 2 +- .../spi/discovery/tcp/TcpDiscoverySpiMBean.java | 2 +- .../memory/MemoryEventStorageSpiMBean.java | 2 +- .../failover/always/AlwaysFailoverSpiMBean.java | 2 +- .../JobStealingFailoverSpiMBean.java | 2 +- .../failover/never/NeverFailoverSpiMBean.java | 2 +- .../adaptive/AdaptiveLoadBalancingSpiMBean.java | 2 +- .../RoundRobinLoadBalancingSpiMBean.java | 2 +- .../WeightedRandomLoadBalancingSpiMBean.java | 2 +- .../noop/NoopSecureSessionSpiMBean.java | 2 +- .../swapspace/file/FileSwapSpaceSpiMBean.java | 2 +- .../apache/ignite/streamer/StreamerMBean.java | 2 +- .../ignite/streamer/StreamerStageMBean.java | 2 +- .../ignite/streamer/StreamerWindowMBean.java | 2 +- .../index/StreamerIndexProviderMBean.java | 2 +- .../GridCheckpointManagerAbstractSelfTest.java | 2 +- .../cache/GridCacheAbstractFullApiSelfTest.java | 178 +++++++++ .../cache/GridCacheDeploymentSelfTest.java | 12 +- .../cache/IgniteCachingProviderSelfTest.java | 14 +- .../optimized/GridOptimizedMarshallerTest.java | 4 +- .../GridP2PDifferentClassLoaderSelfTest.java | 4 +- .../p2p/GridP2PHotRedeploymentSelfTest.java | 2 +- .../ignite/p2p/GridP2PNodeLeftSelfTest.java | 2 +- .../p2p/GridP2PSameClassLoaderSelfTest.java | 4 +- .../ignite/util/mbeans/GridMBeanSelfTest.java | 2 +- modules/extdata/p2p/META-INF/gridgain.xml | 4 +- .../tests/p2p/CacheDeploymentTestKey.java | 63 +++ .../tests/p2p/CacheDeploymentTestTask1.java | 65 ++++ .../tests/p2p/CacheDeploymentTestTask2.java | 56 +++ .../tests/p2p/CacheDeploymentTestTask3.java | 61 +++ .../tests/p2p/CacheDeploymentTestValue.java | 27 ++ .../tests/p2p/CacheDeploymentTestValue2.java | 25 ++ .../tests/p2p/GridCacheDeploymentTestKey.java | 63 --- .../tests/p2p/GridCacheDeploymentTestTask1.java | 65 ---- .../tests/p2p/GridCacheDeploymentTestTask2.java | 56 --- .../tests/p2p/GridCacheDeploymentTestTask3.java | 61 --- .../tests/p2p/GridCacheDeploymentTestValue.java | 26 -- .../p2p/GridCacheDeploymentTestValue2.java | 24 -- .../tests/p2p/GridP2PTestTaskExternalPath2.java | 137 ------- .../tests/p2p/GridSingleSplitTestTask.java | 76 ---- .../tests/p2p/P2PTestTaskExternalPath2.java | 137 +++++++ .../ignite/tests/p2p/SingleSplitTestTask.java | 76 ++++ .../GridSpringDynamicCacheManagerSelfTest.java | 4 +- .../uri/GridUriDeploymentSpiMBean.java | 2 +- .../deployment/uri/META-INF/p2p-gridgain.xml | 2 +- 107 files changed, 2887 insertions(+), 2578 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/09b09b71/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java ----------------------------------------------------------------------
