Merge remote-tracking branch 'origin/ignite-sprint-3' into ignite-sprint-3
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/13edeb41 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/13edeb41 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/13edeb41 Branch: refs/heads/ignite-gg-9950 Commit: 13edeb417cb23cf009e59dd862716b3dffd45119 Parents: f7e32fb 35d05e9 Author: Artem Shutak <ashu...@gridgain.com> Authored: Wed Apr 1 11:58:33 2015 +0300 Committer: Artem Shutak <ashu...@gridgain.com> Committed: Wed Apr 1 11:58:33 2015 +0300 ---------------------------------------------------------------------- .../checkpoint/s3/S3CheckpointSpiSelfTest.java | 12 +-- .../configuration/CacheConfiguration.java | 23 ++++ .../ignite/internal/GridCachePluginContext.java | 72 +++++++++++++ .../ignite/internal/GridKernalContextImpl.java | 12 +-- .../org/apache/ignite/internal/IgnitionEx.java | 10 +- .../internal/MarshallerContextAdapter.java | 6 +- .../ignite/internal/MarshallerContextImpl.java | 90 ++++++++++++++-- .../processors/cache/GridCacheContext.java | 17 ++- .../processors/cache/GridCacheProcessor.java | 52 ++++----- .../processors/cache/GridCacheUtils.java | 39 +++++++ .../distributed/near/GridNearAtomicCache.java | 3 +- .../CacheContinuousQueryListener.java | 3 + .../continuous/CacheContinuousQueryManager.java | 2 +- .../transactions/IgniteTransactionsImpl.java | 4 + .../processors/plugin/CachePluginManager.java | 107 +++++++++++++++++++ .../ignite/internal/util/IgniteUtils.java | 2 +- .../ignite/marshaller/MarshallerContext.java | 3 +- .../optimized/OptimizedMarshallerUtils.java | 9 +- .../ignite/plugin/CachePluginConfiguration.java | 33 ++++++ .../ignite/plugin/CachePluginContext.java | 54 ++++++++++ .../ignite/plugin/CachePluginProvider.java | 83 ++++++++++++++ ...eJdbcStoreAbstractMultithreadedSelfTest.java | 11 +- .../managers/GridNoopManagerSelfTest.java | 2 +- .../communication/GridIoManagerSelfTest.java | 9 +- .../cache/GridCacheMemoryModeSelfTest.java | 12 ++- .../IgniteCacheSystemTransactionsSelfTest.java | 38 ++----- ...ridCacheContinuousQueryAbstractSelfTest.java | 2 +- .../internal/util/IgniteUtilsSelfTest.java | 2 +- .../loadtests/hashmap/GridCacheTestContext.java | 4 +- .../OptimizedMarshallerNodeFailoverTest.java | 71 +++++++++++- .../spi/GridSpiLocalHostInjectionTest.java | 2 +- .../GridPriorityQueueCollisionSpiSelfTest.java | 2 +- ...RobinLoadBalancingSpiNotPerTaskSelfTest.java | 2 +- .../testframework/junits/GridAbstractTest.java | 28 +++-- .../junits/GridTestKernalContext.java | 2 +- .../junits/IgniteTestResources.java | 8 +- .../junits/spi/GridSpiAbstractTest.java | 13 +-- .../commands/disco/VisorDiscoveryCommand.scala | 8 +- .../commands/events/VisorEventsCommand.scala | 24 ++--- .../commands/tasks/VisorTasksCommand.scala | 6 +- 40 files changed, 739 insertions(+), 143 deletions(-) ----------------------------------------------------------------------
