Merge remote-tracking branch 'remotes/origin/ignite-537' into ignite-sprint-3
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/59537866 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/59537866 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/59537866 Branch: refs/heads/ignite-sprint-4 Commit: 59537866520271d27f8191690932e40985970a87 Parents: 7bb7586 98587c6 Author: sboikov <semen.boi...@inria.fr> Authored: Sat Apr 11 00:51:15 2015 +0300 Committer: sboikov <semen.boi...@inria.fr> Committed: Sat Apr 11 00:51:15 2015 +0300 ---------------------------------------------------------------------- .../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 +- .../plugin/IgnitePluginProcessor.java | 13 +- .../ignite/internal/util/GridJavaProcess.java | 38 +- .../apache/ignite/plugin/PluginProvider.java | 5 +- .../spi/discovery/DiscoverySpiDataExchange.java | 5 +- .../discovery/tcp/TcpClientDiscoverySpi.java | 14 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 474 +++++++++++++++++-- .../discovery/tcp/TcpDiscoverySpiAdapter.java | 27 ++ .../tcp/messages/TcpDiscoveryClassRequest.java | 55 +++ .../tcp/messages/TcpDiscoveryClassResponse.java | 76 +++ .../TcpDiscoveryCustomEventMessage.java | 23 +- .../TcpDiscoveryJoinRequestMessage.java | 6 +- .../messages/TcpDiscoveryNodeAddedMessage.java | 16 +- .../cache/CacheConfigurationP2PTest.java | 122 +++++ .../cache/CacheConfigurationP2PTestServer.java | 63 +++ .../continuous/GridEventConsumeSelfTest.java | 3 +- .../discovery/AbstractDiscoverySelfTest.java | 4 +- .../tcp/TcpDiscoverySpiStartStopSelfTest.java | 5 +- .../junits/spi/GridSpiAbstractTest.java | 4 +- .../p2p/startcache/CacheAllNodesFilter.java | 31 ++ .../CacheConfigurationP2PTestClient.java | 155 ++++++ 27 files changed, 1082 insertions(+), 94 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/59537866/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java ----------------------------------------------------------------------
