Merge branch 'ignite-sprint-3' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-721
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c0085a30 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c0085a30 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c0085a30 Branch: refs/heads/ignite-sprint-4 Commit: c0085a30eb350e0202879fd4443d6dcf716cd7db Parents: 2d3eac7 df1fbef Author: Alexey Goncharuk <agoncha...@gridgain.com> Authored: Sat Apr 11 00:44:41 2015 -0700 Committer: Alexey Goncharuk <agoncha...@gridgain.com> Committed: Sat Apr 11 00:44:41 2015 -0700 ---------------------------------------------------------------------- examples/pom.xml | 2 +- modules/aop/pom.xml | 2 +- modules/aws/pom.xml | 2 +- modules/clients/pom.xml | 2 +- modules/codegen/pom.xml | 2 +- modules/core/pom.xml | 2 +- .../apache/ignite/internal/GridComponent.java | 5 +- .../ignite/internal/GridPluginComponent.java | 5 +- .../internal/managers/GridManagerAdapter.java | 4 +- .../discovery/GridDiscoveryManager.java | 10 +- .../processors/GridProcessorAdapter.java | 5 +- .../processors/cache/GridCacheProcessor.java | 4 +- .../continuous/GridContinuousProcessor.java | 4 +- .../processors/igfs/IgfsInputStreamImpl.java | 2 +- .../processors/igfs/IgfsOutputStreamImpl.java | 6 +- .../plugin/IgnitePluginProcessor.java | 13 +- .../ignite/internal/util/GridJavaProcess.java | 38 +- .../internal/visor/query/VisorQueryTask.java | 4 +- .../apache/ignite/plugin/PluginProvider.java | 5 +- .../spi/discovery/DiscoverySpiDataExchange.java | 5 +- .../discovery/tcp/TcpClientDiscoverySpi.java | 10 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 479 +++++++++++++++++-- .../discovery/tcp/TcpDiscoverySpiAdapter.java | 27 ++ .../tcp/internal/TcpDiscoveryNode.java | 12 +- .../tcp/messages/TcpDiscoveryClassRequest.java | 55 +++ .../tcp/messages/TcpDiscoveryClassResponse.java | 76 +++ .../TcpDiscoveryCustomEventMessage.java | 23 +- .../TcpDiscoveryJoinRequestMessage.java | 6 +- .../messages/TcpDiscoveryNodeAddedMessage.java | 16 +- .../CacheMetricsForClusterGroupSelfTest.java | 18 +- .../continuous/GridEventConsumeSelfTest.java | 3 +- .../discovery/AbstractDiscoverySelfTest.java | 4 +- .../tcp/TcpDiscoverySpiStartStopSelfTest.java | 5 +- .../junits/spi/GridSpiAbstractTest.java | 4 +- modules/extdata/p2p/pom.xml | 2 +- .../p2p/startcache/CacheAllNodesFilter.java | 31 ++ .../CacheConfigurationP2PTestClient.java | 114 +++++ .../tests/p2p/startcache/Organization1.java | 52 ++ .../tests/p2p/startcache/Organization2.java | 52 ++ modules/extdata/uri/pom.xml | 2 +- modules/geospatial/pom.xml | 2 +- modules/hadoop/pom.xml | 2 +- modules/hibernate/pom.xml | 2 +- modules/indexing/pom.xml | 2 +- .../cache/CacheConfigurationP2PTest.java | 177 +++++++ .../cache/CacheConfigurationP2PTestServer.java | 49 ++ .../IgniteCacheWithIndexingTestSuite.java | 2 + modules/jcl/pom.xml | 2 +- modules/jta/pom.xml | 2 +- modules/log4j/pom.xml | 2 +- modules/rest-http/pom.xml | 2 +- modules/scalar/pom.xml | 2 +- modules/schedule/pom.xml | 2 +- modules/schema-import/pom.xml | 2 +- modules/slf4j/pom.xml | 2 +- modules/spring/pom.xml | 2 +- modules/ssh/pom.xml | 2 +- modules/tools/pom.xml | 2 +- modules/urideploy/pom.xml | 2 +- modules/visor-console/pom.xml | 2 +- modules/visor-plugins/pom.xml | 2 +- modules/web/pom.xml | 2 +- modules/yardstick/pom.xml | 2 +- pom.xml | 2 +- 64 files changed, 1248 insertions(+), 135 deletions(-) ----------------------------------------------------------------------
