Repository: incubator-ignite Updated Branches: refs/heads/ignite-426 9fe0a8d56 -> fa494ff1c
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-104 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e6f0ac3c Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e6f0ac3c Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e6f0ac3c Branch: refs/heads/ignite-426 Commit: e6f0ac3c40be817c08b192b753791979bed7aff4 Parents: a99ef8b a127756 Author: Valentin Kulichenko <vkuliche...@gridgain.com> Authored: Mon Jul 27 13:10:06 2015 -0700 Committer: Valentin Kulichenko <vkuliche...@gridgain.com> Committed: Mon Jul 27 13:10:06 2015 -0700 ---------------------------------------------------------------------- RELEASE_NOTES.txt | 5 + assembly/release-base.xml | 5 + config/ignite-log4j2.xml | 81 +++ config/ignite-log4j2.xml~ | 65 ++ examples/config/example-ignite.xml | 2 +- modules/clients/README.txt | 16 + modules/clients/readme.md | 32 - modules/clients/readme.pdf | Bin 47887 -> 0 bytes .../rest/AbstractRestProcessorSelfTest.java | 1 + .../JettyRestProcessorAbstractSelfTest.java | 657 ++++++++++++++++++- .../src/main/java/org/apache/ignite/Ignite.java | 2 +- .../configuration/ConnectorConfiguration.java | 32 + .../configuration/IgniteConfiguration.java | 63 +- .../apache/ignite/internal/IgniteKernal.java | 86 ++- .../GridClientConnectionManagerAdapter.java | 2 +- .../client/router/impl/GridTcpRouterImpl.java | 2 +- .../client/ssl/GridSslBasicContextFactory.java | 3 + .../client/ssl/GridSslContextFactory.java | 5 +- .../discovery/GridDiscoveryManager.java | 7 +- .../processors/cache/GridCacheAdapter.java | 2 +- .../processors/rest/GridRestCommand.java | 53 +- .../processors/rest/GridRestProcessor.java | 32 + .../handlers/cache/GridCacheCommandHandler.java | 373 ++++++++++- .../query/CacheQueryFieldsMetaResult.java | 133 ++++ .../rest/handlers/query/CacheQueryResult.java | 120 ++++ .../handlers/query/QueryCommandHandler.java | 292 +++++++++ .../version/GridVersionCommandHandler.java | 14 +- .../rest/protocols/tcp/GridTcpRestProtocol.java | 20 +- .../rest/request/RestSqlQueryRequest.java | 125 ++++ .../processors/task/GridTaskProcessor.java | 3 +- .../ignite/internal/util/nio/GridNioServer.java | 28 +- .../util/nio/GridNioSessionMetaKey.java | 5 +- .../util/nio/ssl/BlockingSslHandler.java | 519 +++++++++++++++ .../internal/util/nio/ssl/GridNioSslFilter.java | 53 +- .../util/nio/ssl/GridNioSslHandler.java | 79 ++- .../org/apache/ignite/spi/IgniteSpiAdapter.java | 58 ++ .../spi/IgniteSpiOperationTimeoutException.java | 43 ++ .../spi/IgniteSpiOperationTimeoutHelper.java | 102 +++ .../communication/tcp/TcpCommunicationSpi.java | 294 +++++++-- .../ignite/spi/discovery/tcp/ClientImpl.java | 52 +- .../ignite/spi/discovery/tcp/ServerImpl.java | 529 +++++++++------ .../spi/discovery/tcp/TcpDiscoveryImpl.java | 11 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 169 ++++- .../tcp/internal/TcpDiscoveryNode.java | 21 + .../TcpDiscoveryConnectionCheckMessage.java | 64 ++ .../apache/ignite/ssl/SslContextFactory.java | 458 +++++++++++++ .../org/apache/ignite/ssl/package-info.java | 22 + modules/core/src/test/config/log4j2-test.xml | 57 ++ modules/core/src/test/config/log4j2-test.xml~ | 63 ++ .../src/test/config/log4j2-verbose-test.xml | 48 ++ .../IgniteClientReconnectAbstractTest.java | 4 +- .../IgniteTopologyPrintFormatSelfTest.java | 6 +- .../CacheGetFutureHangsSelfTest.java | 214 ++++++ .../internal/util/nio/GridNioSslSelfTest.java | 2 +- .../GridAbstractCommunicationSelfTest.java | 13 + .../GridTcpCommunicationSpiAbstractTest.java | 2 +- ...dTcpCommunicationSpiRecoveryAckSelfTest.java | 3 +- ...tionSpiRecoveryFailureDetectionSelfTest.java | 54 ++ ...GridTcpCommunicationSpiRecoverySelfTest.java | 23 +- .../tcp/GridTcpCommunicationSpiSslSelfTest.java | 38 ++ ...unicationSpiTcpFailureDetectionSelfTest.java | 75 +++ .../tcp/IgniteCacheSslStartStopSelfTest.java | 46 ++ .../discovery/AbstractDiscoverySelfTest.java | 36 +- ...lientDiscoverySpiFailureTimeoutSelfTest.java | 205 ++++++ .../tcp/TcpClientDiscoverySpiSelfTest.java | 116 +++- .../tcp/TcpDiscoverySpiConfigSelfTest.java | 1 + .../TcpDiscoverySpiFailureTimeoutSelfTest.java | 402 ++++++++++++ .../tcp/TcpDiscoverySpiSslSelfTest.java | 28 + .../discovery/tcp/TcpDiscoverySslSelfTest.java | 42 ++ .../TcpDiscoveryIpFinderAbstractSelfTest.java | 2 +- .../ignite/testframework/GridTestUtils.java | 20 + .../ignite/testframework/junits/IgniteMock.java | 13 + .../IgniteCacheFailoverTestSuite.java | 4 +- .../IgniteSpiCommunicationSelfTestSuite.java | 3 + .../IgniteSpiDiscoverySelfTestSuite.java | 5 + .../gce/TcpDiscoveryGoogleStorageIpFinder.java | 18 + ...pDiscoveryGoogleStorageIpFinderSelfTest.java | 29 +- modules/hadoop/docs/HADOOP_README.txt | 122 ++++ modules/hadoop/docs/hadoop_readme.md | 135 ---- modules/hadoop/docs/hadoop_readme.pdf | Bin 82219 -> 0 bytes modules/log4j/README.txt | 2 +- .../apache/ignite/logger/log4j/Log4JLogger.java | 2 +- modules/log4j2/README.txt | 32 + modules/log4j2/licenses/apache-2.0.txt | 202 ++++++ modules/log4j2/pom.xml | 63 ++ modules/log4j2/pom.xml~ | 45 ++ .../ignite/logger/log4j2/Log4J2Logger.java | 486 ++++++++++++++ .../ignite/logger/log4j2/Log4J2Logger.java~ | 542 +++++++++++++++ .../ignite/logger/log4j2/Log4j2FileAware.java | 35 + .../ignite/logger/log4j2/Log4j2FileAware.java~ | 33 + .../ignite/logger/log4j2/Log4jFileAware.java~ | 13 + .../ignite/logger/log4j2/package-info.java | 22 + .../log4j2/GridLog4j2CorrectFileNameTest.java | 95 +++ .../log4j2/GridLog4j2CorrectFileNameTest.java~ | 95 +++ .../log4j2/GridLog4j2InitializedTest.java | 79 +++ .../log4j2/GridLog4j2InitializedTest.java~ | 79 +++ .../log4j2/GridLog4j2LoggingFileTest.java | 72 ++ .../log4j2/GridLog4j2LoggingFileTest.java~ | 74 +++ .../logger/log4j2/Log4j2LoggerSelfTest.java | 174 +++++ .../log4j2/Log4j2LoggerVerboseModeSelfTest.java | 117 ++++ .../ignite/logger/log4j2/package-info.java | 22 + .../testsuites/IgniteLog4j2TestSuite.java | 38 ++ .../http/jetty/GridJettyRestHandler.java | 85 ++- .../visor/commands/open/VisorOpenCommand.scala | 17 +- .../scala/org/apache/ignite/visor/visor.scala | 3 + modules/yardstick/README.md | 85 --- modules/yardstick/README.txt | 93 +++ modules/yardstick/config/benchmark.properties | 6 +- .../yardstick/IgniteBenchmarkArguments.java | 22 + .../yardstick/cache/IgnitePutAllBenchmark.java | 67 ++ .../cache/IgnitePutAllTxBenchmark.java | 68 ++ parent/pom.xml | 4 +- pom.xml | 1 + 113 files changed, 8564 insertions(+), 778 deletions(-) ----------------------------------------------------------------------
