Merge remote-tracking branch 'remotes/origin/sprint-2' into ignite-311
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/2ef2271b Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2ef2271b Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2ef2271b Branch: refs/heads/ignite-344 Commit: 2ef2271b3f214db6143cd4166377c46f465449f8 Parents: 6e2ef56 e1c0945 Author: ivasilinets <ivasilin...@gridgain.com> Authored: Fri Feb 27 17:56:34 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Fri Feb 27 17:56:34 2015 +0300 ---------------------------------------------------------------------- config/hadoop/default-config.xml | 12 + config/ignite-log4j.xml | 2 +- .../datagrid/CacheContinuousQueryExample.java | 2 +- ipc/shmem/Makefile.am | 15 + ipc/shmem/igniteshmem/Makefile.am | 15 + ipc/shmem/include/Makefile.am | 15 + modules/clients/src/test/keystore/generate.sh | 15 +- .../src/main/java/org/apache/ignite/Ignite.java | 4 +- .../main/java/org/apache/ignite/IgniteFs.java | 2 +- .../ignite/cache/query/ContinuousQuery.java | 18 +- .../apache/ignite/cluster/ClusterMetrics.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 | 71 + .../discovery/GridDiscoveryManager.java | 7 +- .../processors/cache/IgniteCacheProxy.java | 6 +- .../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 +- .../optimized-classnames.previous.properties | 15 + .../optimized/optimized-classnames.properties | 1565 +----------------- .../spi/discovery/tcp/TcpDiscoverySpi.java | 9 +- .../TcpDiscoveryCustomEventMessage.java | 3 + .../internal/GridDiscoveryEventSelfTest.java | 9 +- ...ridCacheContinuousQueryAbstractSelfTest.java | 8 +- ...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 - modules/winservice/IgniteService.sln | 2 +- .../IgniteService/IgniteService.csproj | 2 +- .../config/benchmark-atomic-win.properties | 15 + .../config/benchmark-atomic.properties | 15 + .../config/benchmark-compute-win.properties | 15 + .../config/benchmark-compute.properties | 15 + .../config/benchmark-multicast.properties | 15 + .../config/benchmark-query-win.properties | 15 + .../yardstick/config/benchmark-query.properties | 15 + .../config/benchmark-tx-win.properties | 15 + .../yardstick/config/benchmark-tx.properties | 15 + .../yardstick/config/benchmark-win.properties | 15 + modules/yardstick/config/benchmark.properties | 15 + pom.xml | 150 +- 86 files changed, 1280 insertions(+), 2405 deletions(-) ----------------------------------------------------------------------
