Merge remote-tracking branch 'origin/ignite-1.3.3' into ignite-1.3.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/8cfeb8e1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/8cfeb8e1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/8cfeb8e1 Branch: refs/heads/ignite-1139 Commit: 8cfeb8e1ad264ccb48956f6f90c579d7160ff4da Parents: 4b55407 bce894f Author: Yakov Zhdanov <yzhda...@gridgain.com> Authored: Wed Jul 22 09:28:02 2015 +0300 Committer: Yakov Zhdanov <yzhda...@gridgain.com> Committed: Wed Jul 22 09:28:02 2015 +0300 ---------------------------------------------------------------------- .../src/main/java/org/apache/ignite/Ignite.java | 2 +- .../configuration/ConnectorConfiguration.java | 32 ++ .../configuration/IgniteConfiguration.java | 28 ++ .../apache/ignite/internal/IgniteKernal.java | 3 +- .../client/ssl/GridSslBasicContextFactory.java | 3 + .../client/ssl/GridSslContextFactory.java | 5 +- .../rest/protocols/tcp/GridTcpRestProtocol.java | 17 +- .../util/nio/GridNioSessionMetaKey.java | 5 +- .../util/nio/ssl/BlockingSslHandler.java | 473 +++++++++++++++++++ .../internal/util/nio/ssl/GridNioSslFilter.java | 2 + .../util/nio/ssl/GridNioSslHandler.java | 12 +- .../communication/tcp/TcpCommunicationSpi.java | 158 ++++++- .../ignite/spi/discovery/tcp/ServerImpl.java | 5 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 34 +- .../apache/ignite/ssl/SslContextFactory.java | 458 ++++++++++++++++++ .../org/apache/ignite/ssl/package-info.java | 22 + .../GridAbstractCommunicationSelfTest.java | 13 + .../tcp/GridTcpCommunicationSpiSslSelfTest.java | 38 ++ .../discovery/AbstractDiscoverySelfTest.java | 13 + .../tcp/TcpDiscoverySpiSslSelfTest.java | 28 ++ .../discovery/tcp/TcpDiscoverySslSelfTest.java | 42 ++ .../ignite/testframework/GridTestUtils.java | 20 + .../ignite/testframework/junits/IgniteMock.java | 13 + .../IgniteSpiDiscoverySelfTestSuite.java | 3 + parent/pom.xml | 2 +- 25 files changed, 1399 insertions(+), 32 deletions(-) ----------------------------------------------------------------------
