Merge branch 'ignite-1086' into ignite-1087
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/2c2def05 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2c2def05 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2c2def05 Branch: refs/heads/ignite-1087 Commit: 2c2def05266a7f8ead7629ee328b21d1a1aa56a3 Parents: 355e33d 95da662 Author: ivasilinets <ivasilin...@gridgain.com> Authored: Mon Jul 6 11:04:17 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Mon Jul 6 11:04:17 2015 +0300 ---------------------------------------------------------------------- bin/ignite.bat | 8 +- bin/ignite.sh | 6 +- bin/include/parseargs.bat | 1 + bin/include/parseargs.sh | 3 + .../startup/cmdline/CommandLineStartup.java | 3 +- .../startup/cmdline/CommandLineTransformer.java | 9 + .../GridCachePartitionedFailoverSelfTest.java | 5 + ...acheAtomicReplicatedNodeRestartSelfTest.java | 5 + .../TcpDiscoveryNodeConsistentIdSelfTest.java | 24 +- 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 + 28 files changed, 1616 insertions(+), 247 deletions(-) ----------------------------------------------------------------------
