Merge branches 'ignite-1026' and 'ignite-sprint-7' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-1026
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/3089ace6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/3089ace6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/3089ace6 Branch: refs/heads/ignite-648 Commit: 3089ace6c9de37765b6f4fa0697b1430f4cb417e Parents: d27453f f72b291 Author: Valentin Kulichenko <vkuliche...@gridgain.com> Authored: Sun Jul 5 11:55:10 2015 -0700 Committer: Valentin Kulichenko <vkuliche...@gridgain.com> Committed: Sun Jul 5 11:55:10 2015 -0700 ---------------------------------------------------------------------- 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 + 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 + 26 files changed, 1593 insertions(+), 241 deletions(-) ----------------------------------------------------------------------
