Merge branch 'ignite-sprint-7' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-959-x
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/fe55c65a Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/fe55c65a Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/fe55c65a Branch: refs/heads/ignite-959-x Commit: fe55c65ad35e528d00b7e0c553333bb3a1daef5c Parents: 6a2c2cb f72b291 Author: S.Vladykin <svlady...@gridgain.com> Authored: Mon Jul 6 05:25:46 2015 +0300 Committer: S.Vladykin <svlady...@gridgain.com> Committed: Mon Jul 6 05:25:46 2015 +0300 ---------------------------------------------------------------------- bin/ignite.bat | 8 +- bin/ignite.sh | 6 +- bin/include/parseargs.bat | 1 + bin/include/parseargs.sh | 3 + .../java/org/apache/ignite/IgniteCache.java | 5 + .../apache/ignite/IgniteSystemProperties.java | 3 + .../processors/cache/CacheOperationContext.java | 44 ++- .../processors/cache/GridCacheAdapter.java | 91 +++-- .../processors/cache/GridCacheAtomicFuture.java | 12 +- .../processors/cache/GridCacheMvccManager.java | 8 +- .../processors/cache/GridCacheProxyImpl.java | 10 +- .../processors/cache/GridCacheUtils.java | 42 +++ .../processors/cache/IgniteCacheProxy.java | 36 +- .../dht/atomic/GridDhtAtomicCache.java | 18 +- .../dht/atomic/GridDhtAtomicUpdateFuture.java | 15 +- .../dht/atomic/GridNearAtomicUpdateFuture.java | 177 ++++++++- .../datastructures/GridCacheAtomicLongImpl.java | 25 +- .../GridCacheAtomicSequenceImpl.java | 11 +- .../GridCacheAtomicStampedImpl.java | 21 +- .../GridCacheCountDownLatchImpl.java | 16 +- .../communication/tcp/TcpCommunicationSpi.java | 2 +- .../startup/cmdline/CommandLineStartup.java | 3 +- .../startup/cmdline/CommandLineTransformer.java | 9 + .../IgniteCachePutRetryAbstractSelfTest.java | 147 ++++++++ .../dht/IgniteCachePutRetryAtomicSelfTest.java | 34 ++ ...gniteCachePutRetryTransactionalSelfTest.java | 74 ++++ ...eAtomicInvalidPartitionHandlingSelfTest.java | 5 +- .../GridCachePartitionedFailoverSelfTest.java | 5 + .../IgniteCacheFailoverTestSuite.java | 3 + modules/kafka/pom.xml | 116 ++++++ .../ignite/stream/kafka/KafkaStreamer.java | 220 +++++++++++ .../kafka/IgniteKafkaStreamerSelfTestSuite.java | 37 ++ .../stream/kafka/KafkaEmbeddedBroker.java | 378 +++++++++++++++++++ .../kafka/KafkaIgniteStreamerSelfTest.java | 227 +++++++++++ .../ignite/stream/kafka/SimplePartitioner.java | 53 +++ .../util/spring/IgniteSpringHelperImpl.java | 72 +++- .../IgniteExcludeInConfigurationTest.java | 78 ++++ .../org/apache/ignite/spring/sprint-exclude.xml | 57 +++ .../testsuites/IgniteSpringTestSuite.java | 2 + .../ignite/visor/commands/VisorConsole.scala | 3 +- .../visor/commands/open/VisorOpenCommand.scala | 319 ++++++++++++++++ .../scala/org/apache/ignite/visor/visor.scala | 230 +---------- .../ignite/visor/VisorRuntimeBaseSpec.scala | 2 + .../commands/kill/VisorKillCommandSpec.scala | 1 + .../commands/start/VisorStartCommandSpec.scala | 1 + .../commands/tasks/VisorTasksCommandSpec.scala | 1 + .../commands/vvm/VisorVvmCommandSpec.scala | 1 + pom.xml | 1 + 48 files changed, 2258 insertions(+), 375 deletions(-) ----------------------------------------------------------------------
