Merge branches 'ignite-339' and 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-339
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/2710ece0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2710ece0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2710ece0 Branch: refs/heads/ignite-344 Commit: 2710ece0fb8c18fec65d7e4f745f048eca07790e Parents: 57bdd8a a792c99 Author: AKuznetsov <akuznet...@gridgain.com> Authored: Sat Feb 28 01:40:08 2015 +0700 Committer: AKuznetsov <akuznet...@gridgain.com> Committed: Sat Feb 28 01:40:08 2015 +0700 ---------------------------------------------------------------------- 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 +- .../ignite/cache/query/ContinuousQuery.java | 18 +- .../apache/ignite/cluster/ClusterMetrics.java | 2 +- .../configuration/QueryConfiguration.java | 37 +- .../java/org/apache/ignite/igfs/IgfsMode.java | 6 +- .../apache/ignite/internal/GridProperties.java | 78 - .../ignite/internal/GridUpdateNotifier.java | 2 +- .../apache/ignite/internal/IgniteKernal.java | 18 +- .../ignite/internal/IgniteProperties.java | 79 + .../ignite/internal/IgniteVersionUtils.java | 8 +- .../internal/events/DiscoveryCustomEvent.java | 3 + .../processors/cache/IgniteCacheProxy.java | 6 +- .../plugin/IgnitePluginProcessor.java | 24 + .../optimized-classnames.previous.properties | 15 + .../optimized/optimized-classnames.properties | 1565 +----------------- .../apache/ignite/plugin/PluginProvider.java | 5 + .../TcpDiscoveryCustomEventMessage.java | 3 + .../internal/GridUpdateNotifierSelfTest.java | 2 +- ...ridCacheContinuousQueryAbstractSelfTest.java | 8 +- .../config/GridTestProperties.java | 10 +- 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 +- .../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 +- modules/hibernate/pom.xml | 6 - .../HibernateReadWriteAccessStrategy.java | 81 +- 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 - 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 +- 73 files changed, 1074 insertions(+), 2273 deletions(-) ----------------------------------------------------------------------
