Merge branch 'sprint-2' into ignite-342
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e959d15b Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e959d15b Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e959d15b Branch: refs/heads/ignite-342 Commit: e959d15b56f30fd8d3bbf56a78ce0bd513d34ed5 Parents: 2f3b8fb 13e2d1f Author: nikolay_tikhonov <ntikho...@gridgain.com> Authored: Mon Mar 2 12:46:16 2015 +0300 Committer: nikolay_tikhonov <ntikho...@gridgain.com> Committed: Mon Mar 2 12:46:16 2015 +0300 ---------------------------------------------------------------------- config/hadoop/default-config.xml | 12 + config/ignite-log4j.xml | 2 +- .../datagrid/CacheContinuousQueryExample.java | 2 +- .../store/CacheNodeWithStoreStartup.java | 6 +- .../store/jdbc/CacheJdbcPersonStore.java | 115 +- 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/cache/store/CacheStore.java | 4 +- .../ignite/cache/store/CacheStoreAdapter.java | 2 +- .../ignite/cache/store/CacheStoreSession.java | 17 +- .../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/GridCacheStoreManager.java | 6 +- .../processors/cache/IgniteCacheProxy.java | 6 +- .../plugin/IgnitePluginProcessor.java | 24 + .../ignite/internal/util/IgniteUtils.java | 90 +- .../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 +----------------- .../apache/ignite/plugin/PluginProvider.java | 5 + .../spi/discovery/tcp/TcpDiscoverySpi.java | 137 +- .../discovery/tcp/TcpDiscoverySpiAdapter.java | 116 ++ .../TcpDiscoveryCustomEventMessage.java | 3 + .../core/src/test/config/store/jdbc/Ignite.xml | 63 +- .../internal/GridUpdateNotifierSelfTest.java | 2 +- ...ridCacheContinuousQueryAbstractSelfTest.java | 8 +- .../config/GridTestProperties.java | 10 +- .../junits/cache/TestCacheSession.java | 5 + .../cache/TestThreadLocalCacheSession.java | 5 + 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 - .../ignite/schema/generator/XmlGenerator.java | 8 +- .../apache/ignite/schema/model/PojoField.java | 11 +- .../apache/ignite/schema/load/model/Ignite.xml | 133 +- 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 + .../yardstick/config/ignite-store-config.xml | 15 +- pom.xml | 150 +- 100 files changed, 1788 insertions(+), 2647 deletions(-) ----------------------------------------------------------------------
