Merge branches 'ignite-335' and 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-335
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/27a160a0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/27a160a0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/27a160a0 Branch: refs/heads/sprint-2 Commit: 27a160a01584cd2c780062cee16d94a5a3d6b41c Parents: 339d57b 0e7a7ef Author: Yakov Zhdanov <yzhda...@gridgain.com> Authored: Fri Feb 27 17:05:24 2015 +0300 Committer: Yakov Zhdanov <yzhda...@gridgain.com> Committed: Fri Feb 27 17:05:24 2015 +0300 ---------------------------------------------------------------------- config/hadoop/default-config.xml | 12 + .../src/main/java/org/apache/ignite/Ignite.java | 4 +- .../main/java/org/apache/ignite/IgniteFs.java | 2 +- .../configuration/QueryConfiguration.java | 37 +- .../ignite/events/DiscoveryCustomEvent.java | 56 --- .../org/apache/ignite/events/EventType.java | 14 +- .../java/org/apache/ignite/igfs/IgfsMode.java | 6 +- .../java/org/apache/ignite/igfs/package.html | 2 +- .../internal/events/DiscoveryCustomEvent.java | 68 +++ .../discovery/GridDiscoveryManager.java | 7 +- .../cache/VisorCacheMetricsCollectorTask.java | 10 +- .../visor/node/VisorBasicConfiguration.java | 17 - .../node/VisorNodeEventsCollectorTask.java | 10 +- .../internal/visor/node/VisorNodeGcTask.java | 10 +- .../internal/visor/node/VisorNodePingTask.java | 10 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 9 +- .../internal/GridDiscoveryEventSelfTest.java | 9 +- ...dStartupWithUndefinedIgniteHomeSelfTest.java | 103 +++++ .../config/GridTestProperties.java | 10 +- .../testsuites/IgniteKernalSelfTestSuite.java | 1 + modules/extdata/p2p/pom.xml | 6 - .../client/hadoop/GridHadoopClientProtocol.java | 6 +- .../hadoop/IgfsHadoopFileSystemWrapper.java | 412 ++++++++++++++++++ .../igfs/hadoop/v1/IgfsHadoopFileSystem.java | 3 +- .../igfs/hadoop/v2/IgfsHadoopFileSystem.java | 3 +- .../java/org/apache/ignite/igfs/package.html | 2 +- .../igfs/hadoop/IgfsHadoopFSProperties.java | 10 +- .../hadoop/IgfsHadoopFileSystemWrapper.java | 413 ------------------- .../internal/igfs/hadoop/IgfsHadoopReader.java | 2 +- .../internal/igfs/hadoop/IgfsHadoopUtils.java | 4 +- .../hadoop/GridHadoopClassLoader.java | 12 +- .../processors/hadoop/GridHadoopSetup.java | 8 +- .../processors/hadoop/GridHadoopUtils.java | 4 +- .../collections/GridHadoopHashMultimapBase.java | 2 +- .../GridHadoopExternalCommunication.java | 14 +- .../hadoop/v1/GridHadoopV1MapTask.java | 6 +- .../v2/GridHadoopV2JobResourceManager.java | 2 +- .../GridHadoopClientProtocolSelfTest.java | 6 +- .../apache/ignite/igfs/IgfsEventsTestSuite.java | 2 +- .../IgfsHadoop20FileSystemAbstractSelfTest.java | 2 +- .../igfs/IgfsHadoopDualAbstractSelfTest.java | 2 +- .../IgfsHadoopFileSystemAbstractSelfTest.java | 1 + ...fsHadoopFileSystemSecondaryModeSelfTest.java | 2 +- .../hadoop/GridHadoopGroupingTest.java | 4 +- .../igfs/IgfsPerformanceBenchmark.java | 9 +- .../testsuites/IgniteHadoopTestSuite.java | 7 +- modules/hibernate/pom.xml | 6 - modules/indexing/pom.xml | 6 - modules/jta/pom.xml | 6 - modules/scalar/pom.xml | 6 - modules/spring/pom.xml | 6 - modules/visor-console/pom.xml | 7 - .../commands/alert/VisorAlertCommand.scala | 8 +- .../commands/cache/VisorCacheCommand.scala | 82 ++-- .../config/VisorConfigurationCommand.scala | 140 ++++--- .../commands/disco/VisorDiscoveryCommand.scala | 2 +- .../scala/org/apache/ignite/visor/visor.scala | 64 ++- .../commands/tasks/VisorTasksCommandSpec.scala | 2 +- modules/web/pom.xml | 6 - 59 files changed, 922 insertions(+), 760 deletions(-) ----------------------------------------------------------------------
