Merge remote-tracking branch 'remotes/origin/sprint-1' into ignite-189
Conflicts:
modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/24b46dc4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/24b46dc4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/24b46dc4
Branch: refs/heads/ignite-189
Commit: 24b46dc4c7e74fe4f59541a0d508f1ffb3e0c08e
Parents: 6366718 d71f260
Author: ivasilinets <[email protected]>
Authored: Wed Feb 11 12:16:39 2015 +0300
Committer: ivasilinets <[email protected]>
Committed: Wed Feb 11 12:16:39 2015 +0300
----------------------------------------------------------------------
config/hadoop/default-config.xml | 6 +-
config/router/default-router.xml | 2 +-
.../HibernateL2CacheExampleNodeStartup.java | 1 +
.../MemcacheRestExampleNodeStartup.java | 2 +-
.../examples/ScalarCacheAffinityExample1.scala | 2 -
.../config/grid-client-spring-config.xml | 6 +-
.../ClientAbstractMultiThreadedSelfTest.java | 615 -------
.../client/ClientDefaultCacheSelfTest.java | 220 ---
.../ignite/client/ClientGetAffinityTask.java | 64 -
.../apache/ignite/client/ClientHttpTask.java | 58 -
.../apache/ignite/client/ClientNodeStartup.java | 57 -
.../client/ClientReconnectionSelfTest.java | 235 ---
.../ignite/client/ClientSslNodeStartup.java | 59 -
.../ignite/client/ClientStartNodeTask.java | 179 --
.../ignite/client/ClientStopNodeTask.java | 127 --
.../ignite/client/ClientStringLengthTask.java | 71 -
.../client/ClientTcpMultiThreadedSelfTest.java | 45 -
.../ClientTcpSslAuthenticationSelfTest.java | 265 ---
.../ClientTcpSslMultiThreadedSelfTest.java | 46 -
.../org/apache/ignite/client/ClientTcpTask.java | 71 -
...skExecutionAfterTopologyRestartSelfTest.java | 75 -
.../ignite/client/ClientTestRestServer.java | 281 ---
.../client/ClientTopologyCacheSelfTest.java | 288 ----
.../org/apache/ignite/client/HashMapStore.java | 53 -
.../org/apache/ignite/client/SleepTestTask.java | 66 -
.../client/TaskSingleJobSplitAdapter.java | 70 -
.../client/impl/ClientCacheFlagsCodecTest.java | 83 -
.../client/impl/ClientComputeImplSelfTest.java | 167 --
.../client/impl/ClientDataImplSelfTest.java | 268 ---
.../impl/ClientFutureAdapterSelfTest.java | 115 --
.../impl/ClientPartitionAffinitySelfTest.java | 406 -----
.../ClientPropertiesConfigurationSelfTest.java | 232 ---
.../ClientAbstractConnectivitySelfTest.java | 303 ----
.../ClientAbstractMultiNodeSelfTest.java | 834 ---------
.../integration/ClientAbstractSelfTest.java | 1601 ------------------
.../integration/ClientPreferDirectSelfTest.java | 192 ---
.../ClientTcpConnectivitySelfTest.java | 75 -
.../ClientTcpDirectMultiNodeSelfTest.java | 55 -
.../integration/ClientTcpDirectSelfTest.java | 58 -
.../integration/ClientTcpMultiNodeSelfTest.java | 35 -
.../client/integration/ClientTcpSelfTest.java | 46 -
.../ClientTcpSslDirectMultiNodeSelfTest.java | 62 -
.../integration/ClientTcpSslDirectSelfTest.java | 59 -
.../ClientTcpSslMultiNodeSelfTest.java | 42 -
.../integration/ClientTcpSslSelfTest.java | 47 -
.../ClientTcpUnreachableMultiNodeSelfTest.java | 134 --
.../ignite/client/integration/package.html | 24 -
.../client/router/ClientFailedInitSelfTest.java | 275 ---
.../client/router/RouterFactorySelfTest.java | 107 --
.../router/TcpRouterAbstractSelfTest.java | 125 --
.../router/TcpRouterMultiNodeSelfTest.java | 110 --
.../ignite/client/router/TcpRouterSelfTest.java | 35 -
.../client/router/TcpSslRouterSelfTest.java | 48 -
.../apache/ignite/client/router/package.html | 24 -
.../testsuites/IgniteRouterTestSuite.java | 41 -
.../client/suite/IgniteClientTestSuite.java | 118 --
.../ignite/client/util/ClientByteUtilsTest.java | 172 --
.../util/ClientConsistentHashSelfTest.java | 281 ---
.../client/util/ClientJavaHasherSelfTest.java | 84 -
.../internal/TaskEventSubjectIdSelfTest.java | 4 +-
.../ClientAbstractMultiThreadedSelfTest.java | 615 +++++++
.../client/ClientDefaultCacheSelfTest.java | 220 +++
.../internal/client/ClientGetAffinityTask.java | 64 +
.../ignite/internal/client/ClientHttpTask.java | 58 +
.../internal/client/ClientNodeStartup.java | 57 +
.../client/ClientReconnectionSelfTest.java | 233 +++
.../internal/client/ClientSslNodeStartup.java | 59 +
.../internal/client/ClientStartNodeTask.java | 179 ++
.../internal/client/ClientStopNodeTask.java | 127 ++
.../internal/client/ClientStringLengthTask.java | 71 +
.../client/ClientTcpMultiThreadedSelfTest.java | 45 +
.../ClientTcpSslAuthenticationSelfTest.java | 265 +++
.../ClientTcpSslMultiThreadedSelfTest.java | 46 +
.../ignite/internal/client/ClientTcpTask.java | 71 +
...skExecutionAfterTopologyRestartSelfTest.java | 75 +
.../internal/client/ClientTestRestServer.java | 281 +++
.../client/ClientTopologyCacheSelfTest.java | 288 ++++
.../ignite/internal/client/HashMapStore.java | 53 +
.../ignite/internal/client/SleepTestTask.java | 66 +
.../client/TaskSingleJobSplitAdapter.java | 70 +
.../client/impl/ClientCacheFlagsCodecTest.java | 83 +
.../client/impl/ClientComputeImplSelfTest.java | 167 ++
.../client/impl/ClientDataImplSelfTest.java | 268 +++
.../impl/ClientFutureAdapterSelfTest.java | 115 ++
.../impl/ClientPartitionAffinitySelfTest.java | 406 +++++
.../ClientPropertiesConfigurationSelfTest.java | 232 +++
.../ClientAbstractConnectivitySelfTest.java | 303 ++++
.../ClientAbstractMultiNodeSelfTest.java | 828 +++++++++
.../integration/ClientAbstractSelfTest.java | 1480 ++++++++++++++++
.../integration/ClientPreferDirectSelfTest.java | 192 +++
.../ClientTcpConnectivitySelfTest.java | 75 +
.../ClientTcpDirectMultiNodeSelfTest.java | 55 +
.../integration/ClientTcpDirectSelfTest.java | 58 +
.../integration/ClientTcpMultiNodeSelfTest.java | 35 +
.../client/integration/ClientTcpSelfTest.java | 46 +
.../ClientTcpSslDirectMultiNodeSelfTest.java | 62 +
.../integration/ClientTcpSslDirectSelfTest.java | 59 +
.../ClientTcpSslMultiNodeSelfTest.java | 42 +
.../integration/ClientTcpSslSelfTest.java | 47 +
.../ClientTcpUnreachableMultiNodeSelfTest.java | 134 ++
.../client/router/ClientFailedInitSelfTest.java | 275 +++
.../client/router/RouterFactorySelfTest.java | 107 ++
.../router/TcpRouterAbstractSelfTest.java | 125 ++
.../router/TcpRouterMultiNodeSelfTest.java | 110 ++
.../client/router/TcpRouterSelfTest.java | 35 +
.../client/router/TcpSslRouterSelfTest.java | 48 +
.../client/suite/IgniteClientTestSuite.java | 118 ++
.../client/util/ClientByteUtilsTest.java | 172 ++
.../util/ClientConsistentHashSelfTest.java | 281 +++
.../client/util/ClientJavaHasherSelfTest.java | 84 +
.../rest/AbstractRestProcessorSelfTest.java | 6 +-
.../rest/ClientMemcachedProtocolSelfTest.java | 4 +-
.../rest/JettyRestProcessorSignedSelfTest.java | 4 +-
.../rest/RestBinaryProtocolSelfTest.java | 54 +-
.../rest/RestMemcacheProtocolSelfTest.java | 8 +-
.../rest/RestProcessorMultiStartSelfTest.java | 2 +-
.../rest/RestProcessorStartSelfTest.java | 10 +-
.../processors/rest/RestProcessorTest.java | 8 +-
.../rest/TaskCommandHandlerSelfTest.java | 12 +-
.../processors/rest/TestBinaryClient.java | 23 +-
.../protocols/tcp/TcpRestParserSelfTest.java | 4 +-
.../ignite/jdbc/JdbcComplexQuerySelfTest.java | 2 +-
.../ignite/jdbc/JdbcConnectionSelfTest.java | 8 +-
.../ignite/jdbc/JdbcEmptyCacheSelfTest.java | 2 +-
.../ignite/jdbc/JdbcLocalCachesSelfTest.java | 2 +-
.../ignite/jdbc/JdbcMetadataSelfTest.java | 2 +-
.../jdbc/JdbcPreparedStatementSelfTest.java | 2 +-
.../ignite/jdbc/JdbcResultSetSelfTest.java | 2 +-
.../ignite/jdbc/JdbcStatementSelfTest.java | 2 +-
.../loadtests/client/ClientCacheBenchmark.java | 2 +-
.../client/ClientMarshallerBenchmarkTest.java | 6 +-
.../loadtests/client/ClientTcpSslLoadTest.java | 4 +-
.../clients/src/test/resources/spring-cache.xml | 5 -
.../src/test/resources/spring-router-ssl.xml | 4 +-
.../src/test/resources/spring-router.xml | 2 +-
.../src/test/resources/spring-server-node.xml | 110 +-
.../test/resources/spring-server-ssl-node.xml | 116 +-
.../main/java/org/apache/ignite/Ignition.java | 6 -
.../java/org/apache/ignite/cache/CacheName.java | 41 -
.../org/apache/ignite/client/GridClient.java | 148 --
.../GridClientAuthenticationException.java | 35 -
.../ignite/client/GridClientCacheFlag.java | 65 -
.../ignite/client/GridClientCacheMode.java | 32 -
.../client/GridClientClosedException.java | 35 -
.../apache/ignite/client/GridClientCompute.java | 476 ------
.../ignite/client/GridClientConfiguration.java | 845 ---------
.../apache/ignite/client/GridClientData.java | 443 -----
.../ignite/client/GridClientDataAffinity.java | 39 -
.../client/GridClientDataConfiguration.java | 118 --
.../ignite/client/GridClientDataMetrics.java | 77 -
.../client/GridClientDisconnectedException.java | 36 -
.../ignite/client/GridClientException.java | 111 --
.../apache/ignite/client/GridClientFactory.java | 138 --
.../apache/ignite/client/GridClientFuture.java | 68 -
.../ignite/client/GridClientFutureListener.java | 30 -
.../GridClientFutureTimeoutException.java | 45 -
.../client/GridClientHandshakeException.java | 48 -
.../apache/ignite/client/GridClientNode.java | 128 --
.../ignite/client/GridClientNodeMetrics.java | 524 ------
.../client/GridClientPartitionAffinity.java | 369 ----
.../ignite/client/GridClientPredicate.java | 38 -
.../ignite/client/GridClientProtocol.java | 26 -
.../client/GridClientTopologyListener.java | 41 -
.../client/GridServerUnreachableException.java | 45 -
.../balancer/GridClientBalancerAdapter.java | 76 -
.../client/balancer/GridClientLoadBalancer.java | 44 -
.../balancer/GridClientRandomBalancer.java | 75 -
.../balancer/GridClientRoundRobinBalancer.java | 111 --
.../apache/ignite/client/balancer/package.html | 24 -
.../impl/GridClientAbstractProjection.java | 458 -----
.../client/impl/GridClientAndPredicate.java | 52 -
.../client/impl/GridClientComputeImpl.java | 293 ----
.../ignite/client/impl/GridClientDataImpl.java | 389 -----
.../impl/GridClientDataMetricsAdapter.java | 160 --
.../client/impl/GridClientFutureAdapter.java | 349 ----
.../client/impl/GridClientFutureCallback.java | 35 -
.../ignite/client/impl/GridClientImpl.java | 527 ------
.../ignite/client/impl/GridClientNodeImpl.java | 396 -----
.../impl/GridClientNodeMetricsAdapter.java | 990 -----------
.../client/impl/GridClientThreadFactory.java | 62 -
.../impl/connection/GridClientConnection.java | 531 ------
.../GridClientConnectionCloseReason.java | 32 -
.../connection/GridClientConnectionManager.java | 71 -
.../GridClientConnectionManagerAdapter.java | 644 -------
.../GridClientConnectionManagerOsImpl.java | 48 -
.../GridClientConnectionResetException.java | 48 -
.../connection/GridClientNioTcpConnection.java | 1075 ------------
.../impl/connection/GridClientTopology.java | 450 -----
.../GridConnectionIdleClosedException.java | 36 -
.../org/apache/ignite/client/impl/package.html | 24 -
.../client/marshaller/GridClientMarshaller.java | 45 -
.../marshaller/jdk/GridClientJdkMarshaller.java | 68 -
.../ignite/client/marshaller/jdk/package.html | 24 -
.../GridClientOptimizedMarshaller.java | 103 --
.../client/marshaller/optimized/package.html | 24 -
.../ignite/client/marshaller/package.html | 24 -
.../java/org/apache/ignite/client/package.html | 24 -
.../ignite/client/router/GridRouterFactory.java | 126 --
.../ignite/client/router/GridTcpRouter.java | 76 -
.../router/GridTcpRouterConfiguration.java | 306 ----
.../client/router/GridTcpRouterMBean.java | 88 -
.../router/impl/GridRouterClientImpl.java | 200 ---
.../impl/GridRouterCommandLineStartup.java | 169 --
.../client/router/impl/GridTcpRouterImpl.java | 348 ----
.../impl/GridTcpRouterNioListenerAdapter.java | 203 ---
.../impl/GridTcpRouterNioListenerOsImpl.java | 38 -
.../router/impl/GridTcpRouterNioParser.java | 115 --
.../ignite/client/router/impl/package.html | 24 -
.../apache/ignite/client/router/package.html | 24 -
.../client/ssl/GridSslBasicContextFactory.java | 438 -----
.../client/ssl/GridSslContextFactory.java | 36 -
.../org/apache/ignite/client/ssl/package.html | 24 -
.../client/util/GridClientConsistentHash.java | 440 -----
.../client/util/GridClientStripedLock.java | 135 --
.../ignite/client/util/GridClientUtils.java | 171 --
.../client/util/GridConcurrentHashSet.java | 113 --
.../org/apache/ignite/client/util/package.html | 24 -
.../ignite/compute/ComputeJobContext.java | 20 -
.../ClientConnectionConfiguration.java | 541 ------
.../configuration/ClientMessageInterceptor.java | 45 -
.../configuration/ConnectorConfiguration.java | 518 ++++++
.../ConnectorMessageInterceptor.java | 45 +
.../configuration/IgniteConfiguration.java | 577 +------
.../ignite/internal/GridJobContextImpl.java | 20 -
.../ignite/internal/GridPluginComponent.java | 2 +
.../apache/ignite/internal/GridProductImpl.java | 6 +-
.../apache/ignite/internal/IgniteKernal.java | 25 +-
.../org/apache/ignite/internal/IgnitionEx.java | 16 +-
.../ignite/internal/client/GridClient.java | 146 ++
.../GridClientAuthenticationException.java | 35 +
.../internal/client/GridClientCacheFlag.java | 65 +
.../internal/client/GridClientCacheMode.java | 32 +
.../client/GridClientClosedException.java | 35 +
.../internal/client/GridClientCompute.java | 419 +++++
.../client/GridClientConfiguration.java | 844 +++++++++
.../ignite/internal/client/GridClientData.java | 443 +++++
.../internal/client/GridClientDataAffinity.java | 39 +
.../client/GridClientDataConfiguration.java | 118 ++
.../internal/client/GridClientDataMetrics.java | 77 +
.../client/GridClientDisconnectedException.java | 36 +
.../internal/client/GridClientException.java | 111 ++
.../internal/client/GridClientFactory.java | 138 ++
.../internal/client/GridClientFuture.java | 68 +
.../client/GridClientFutureListener.java | 30 +
.../GridClientFutureTimeoutException.java | 45 +
.../client/GridClientHandshakeException.java | 48 +
.../ignite/internal/client/GridClientNode.java | 128 ++
.../internal/client/GridClientNodeMetrics.java | 524 ++++++
.../client/GridClientPartitionAffinity.java | 369 ++++
.../internal/client/GridClientPredicate.java | 38 +
.../internal/client/GridClientProtocol.java | 26 +
.../client/GridClientTopologyListener.java | 41 +
.../client/GridServerUnreachableException.java | 45 +
.../balancer/GridClientBalancerAdapter.java | 76 +
.../client/balancer/GridClientLoadBalancer.java | 44 +
.../balancer/GridClientRandomBalancer.java | 75 +
.../balancer/GridClientRoundRobinBalancer.java | 111 ++
.../impl/GridClientAbstractProjection.java | 458 +++++
.../client/impl/GridClientAndPredicate.java | 52 +
.../client/impl/GridClientComputeImpl.java | 263 +++
.../client/impl/GridClientDataImpl.java | 389 +++++
.../impl/GridClientDataMetricsAdapter.java | 160 ++
.../client/impl/GridClientFutureAdapter.java | 349 ++++
.../client/impl/GridClientFutureCallback.java | 35 +
.../internal/client/impl/GridClientImpl.java | 527 ++++++
.../client/impl/GridClientNodeImpl.java | 396 +++++
.../impl/GridClientNodeMetricsAdapter.java | 990 +++++++++++
.../client/impl/GridClientThreadFactory.java | 62 +
.../impl/connection/GridClientConnection.java | 515 ++++++
.../GridClientConnectionCloseReason.java | 32 +
.../connection/GridClientConnectionManager.java | 71 +
.../GridClientConnectionManagerAdapter.java | 644 +++++++
.../GridClientConnectionManagerOsImpl.java | 48 +
.../GridClientConnectionResetException.java | 48 +
.../connection/GridClientNioTcpConnection.java | 1063 ++++++++++++
.../impl/connection/GridClientTopology.java | 450 +++++
.../GridConnectionIdleClosedException.java | 36 +
.../client/marshaller/GridClientMarshaller.java | 45 +
.../marshaller/jdk/GridClientJdkMarshaller.java | 68 +
.../GridClientOptimizedMarshaller.java | 103 ++
.../client/router/GridRouterFactory.java | 126 ++
.../internal/client/router/GridTcpRouter.java | 74 +
.../router/GridTcpRouterConfiguration.java | 306 ++++
.../client/router/GridTcpRouterMBean.java | 88 +
.../router/impl/GridRouterClientImpl.java | 200 +++
.../impl/GridRouterCommandLineStartup.java | 169 ++
.../client/router/impl/GridTcpRouterImpl.java | 348 ++++
.../impl/GridTcpRouterNioListenerAdapter.java | 203 +++
.../impl/GridTcpRouterNioListenerOsImpl.java | 38 +
.../router/impl/GridTcpRouterNioParser.java | 115 ++
.../client/ssl/GridSslBasicContextFactory.java | 438 +++++
.../client/ssl/GridSslContextFactory.java | 36 +
.../client/util/GridClientConsistentHash.java | 440 +++++
.../client/util/GridClientStripedLock.java | 135 ++
.../internal/client/util/GridClientUtils.java | 171 ++
.../client/util/GridConcurrentHashSet.java | 113 ++
.../ignite/internal/jdbc/JdbcConnection.java | 2 +-
.../internal/jdbc/JdbcDatabaseMetadata.java | 2 +-
.../ignite/internal/jdbc/JdbcResultSet.java | 2 +-
.../ignite/internal/jdbc/JdbcStatement.java | 2 +-
.../loadbalancer/GridLoadBalancerManager.java | 57 -
.../processors/cache/GridCacheContext.java | 8 +-
.../processors/cache/GridCacheMapEntry.java | 2 +-
.../processors/cache/GridCacheProcessor.java | 5 +-
.../cache/GridCacheUpdateAtomicResult.java | 6 +-
.../GridDistributedTxRemoteAdapter.java | 4 +-
.../dht/atomic/GridDhtAtomicCache.java | 4 +-
.../cache/transactions/IgniteTxAdapter.java | 6 +-
.../transactions/IgniteTxLocalAdapter.java | 4 +-
...ridCacheVersionAbstractConflictResolver.java | 6 +-
.../GridCacheVersionConflictContext.java | 166 +-
.../GridCacheVersionConflictContextImpl.java | 187 --
.../GridCacheVersionConflictResolver.java | 2 +-
.../closure/GridClosureProcessor.java | 286 +---
.../portable/GridPortableProcessor.java | 2 +-
.../portable/os/GridOsPortableProcessor.java | 2 +-
.../processors/rest/GridRestProcessor.java | 23 +-
.../client/message/GridClientLogRequest.java | 118 --
.../handlers/log/GridLogCommandHandler.java | 306 ----
.../processors/rest/handlers/log/package.html | 24 -
.../rest/protocols/GridRestProtocolAdapter.java | 8 +-
.../protocols/tcp/GridTcpRestNioListener.java | 15 +-
.../rest/protocols/tcp/GridTcpRestParser.java | 8 +-
.../rest/protocols/tcp/GridTcpRestProtocol.java | 40 +-
.../ignite/internal/util/IgniteUtils.java | 2 +-
.../ignite/internal/util/nio/GridNioServer.java | 4 +-
.../visor/node/VisorBasicConfiguration.java | 18 -
.../node/VisorExecutorServiceConfiguration.java | 4 +-
.../visor/node/VisorRestConfiguration.java | 13 +-
.../ignite/lang/IgniteProductVersion.java | 12 +-
.../org/apache/ignite/mxbean/IgniteMXBean.java | 8 -
.../ignite/startup/BasicWarmupClosure.java | 2 +-
.../spring-cache-client-benchmark-1.xml | 6 +-
.../spring-cache-client-benchmark-2.xml | 6 +-
.../spring-cache-client-benchmark-3.xml | 6 +-
.../test/config/default-spring-url-testing.xml | 2 +
modules/core/src/test/config/example-cache.xml | 2 +
.../src/test/config/io-manager-benchmark.xml | 1 +
.../src/test/config/job-loadtest/client.xml | 2 +
.../src/test/config/job-loadtest/server.xml | 2 +
modules/core/src/test/config/jobs-load-base.xml | 2 +
.../src/test/config/load/cache-benchmark.xml | 2 +
.../test/config/load/cache-client-benchmark.xml | 2 +
.../core/src/test/config/load/dsi-load-base.xml | 2 +
.../src/test/config/load/merge-sort-base.xml | 2 +
.../test/config/loaders/grid-cfg-2-grids.xml | 4 +
.../core/src/test/config/loaders/grid-cfg.xml | 5 +
.../config/spring-cache-put-remove-load.xml | 2 +
.../src/test/config/spring-start-nodes-attr.xml | 2 +
.../core/src/test/config/spring-start-nodes.xml | 2 +
.../config/streamer/spring-streamer-base.xml | 2 +
.../test/config/websession/spring-cache-1.xml | 2 +
.../test/config/websession/spring-cache-2.xml | 2 +
.../test/config/websession/spring-cache-3.xml | 2 +
.../org/apache/ignite/GridTestJobContext.java | 10 -
.../internal/GridDiscoveryEventSelfTest.java | 2 +
.../internal/GridLifecycleAwareSelfTest.java | 18 +-
.../ignite/internal/GridStartStopSelfTest.java | 6 +
.../cache/GridCacheAffinityRoutingSelfTest.java | 420 -----
.../GridCacheDaemonNodeAbstractSelfTest.java | 2 +
.../cache/GridCacheDeploymentSelfTest.java | 2 +
.../cache/GridCacheLuceneQueryIndexTest.java | 1 +
...GridCacheQueueMultiNodeAbstractSelfTest.java | 1 +
...dCacheMultithreadedFailoverAbstractTest.java | 1 +
.../GridCachePreloadLifecycleAbstractTest.java | 1 +
.../GridCacheNearReaderPreloadSelfTest.java | 1 +
.../dataload/GridDataLoaderPerformanceTest.java | 2 +
...heGgfsPerBlockLruEvictionPolicySelfTest.java | 2 +
.../processors/fs/GridGgfsAbstractSelfTest.java | 1 +
.../processors/fs/GridGgfsModesSelfTest.java | 2 +
.../cache/GridCacheCommandHandlerSelfTest.java | 6 +-
.../product/GridProductVersionSelfTest.java | 16 +-
...dStartupWithUndefinedIgniteHomeSelfTest.java | 105 --
.../GridTcpCommunicationBenchmark.java | 2 +-
.../ignite/loadtests/dsi/GridDsiPerfJob.java | 1 -
.../loadtests/hashmap/GridCacheTestContext.java | 2 +-
.../marshaller/GridMarshallerAbstractTest.java | 2 +-
.../marshaller/GridMarshallerResourceBean.java | 2 +-
.../marshaller/GridMarshallerTestBean.java | 2 +-
.../spi/GridTcpSpiForwardingSelfTest.java | 1 +
.../spi/discovery/tcp/TcpDiscoverySelfTest.java | 2 +
.../tcp/TcpDiscoverySnapshotHistoryTest.java | 1 +
.../ignite/testframework/GridTestUtils.java | 2 +-
.../testframework/junits/GridAbstractTest.java | 4 +-
.../testsuites/IgniteKernalSelfTestSuite.java | 1 -
.../core/src/test/webapp/META-INF/gg-config.xml | 6 +-
.../client/hadoop/GridHadoopClientProtocol.java | 2 +-
.../GridHadoopClientProtocolProvider.java | 6 +-
.../hadoop/GridHadoopClassLoader.java | 2 +-
.../GridGgfsHadoopDualAbstractSelfTest.java | 1 +
...idGgfsHadoopFileSystemHandshakeSelfTest.java | 1 +
...GgfsHadoopFileSystemLoggerStateSelfTest.java | 1 +
.../hadoop/GridHadoopAbstractSelfTest.java | 6 +-
.../log4j/GridLog4jCorrectFileNameTest.java | 1 +
.../http/jetty/GridJettyRestProtocol.java | 6 +-
.../ignite/internal/GridFactorySelfTest.java | 9 +
.../GridSpringBeanSerializationSelfTest.java | 2 +
.../commands/cache/VisorCacheCommand.scala | 2 +-
.../config/VisorConfigurationCommand.scala | 13 +-
.../scala/org/apache/ignite/visor/visor.scala | 2 +-
modules/yardstick/config/ignite-base-config.xml | 2 +
.../yardstick/config/ignite-store-config.xml | 2 +
.../org/apache/ignite/yardstick/IgniteNode.java | 8 +-
pom.xml | 91 -
404 files changed, 24190 insertions(+), 26873 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/24b46dc4/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
----------------------------------------------------------------------
diff --cc
modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
index a223903,b694d5b..d207115
---
a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
+++
b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
@@@ -25,13 -24,12 +24,14 @@@ import org.apache.ignite.internal.proce
import org.apache.ignite.internal.util.typedef.internal.*;
import org.apache.ignite.lang.*;
import org.apache.ignite.lifecycle.*;
- import org.apache.ignite.services.*;
import org.apache.ignite.marshaller.*;
import org.apache.ignite.plugin.*;
+import org.apache.ignite.spi.indexing.*;
+import org.apache.ignite.streamer.*;
import org.apache.ignite.plugin.security.*;
import org.apache.ignite.plugin.segmentation.*;
+ import org.apache.ignite.services.*;
+ import org.apache.ignite.spi.authentication.*;
import org.apache.ignite.spi.checkpoint.*;
import org.apache.ignite.spi.collision.*;
import org.apache.ignite.spi.communication.*;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/24b46dc4/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
----------------------------------------------------------------------
diff --cc
modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
index 4375bbb,a6b7737..7baad5b
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
@@@ -1353,9 -1358,33 +1346,9 @@@ public class IgniteKernal extends Clust
add(attrs, ATTR_RESTART_ENABLED,
Boolean.toString(isRestartEnabled()));
// Save port range, port numbers will be stored by rest processor at
runtime.
- if (cfg.getClientConnectionConfiguration() != null)
- add(attrs, ATTR_REST_PORT_RANGE,
cfg.getClientConnectionConfiguration().getRestPortRange());
+ if (cfg.getConnectorConfiguration() != null)
+ add(attrs, ATTR_REST_PORT_RANGE,
cfg.getConnectorConfiguration().getPortRange());
- try {
- AuthenticationSpi authSpi = cfg.getAuthenticationSpi();
-
- boolean securityEnabled = authSpi != null &&
!U.hasAnnotation(authSpi.getClass(), IgniteSpiNoop.class);
-
- GridSecurityCredentialsProvider provider =
cfg.getSecurityCredentialsProvider();
-
- if (provider != null) {
- GridSecurityCredentials cred = provider.credentials();
-
- if (cred != null)
- add(attrs, ATTR_SECURITY_CREDENTIALS, cred);
- else if (securityEnabled)
- throw new IgniteCheckedException("Failed to start node
(authentication SPI is configured, " +
- "by security credentials provider returned null).");
- }
- else if (securityEnabled)
- throw new IgniteCheckedException("Failed to start node
(authentication SPI is configured, " +
- "but security credentials provider is not set. Fix the
configuration and restart the node).");
- }
- catch (IgniteCheckedException e) {
- throw new IgniteCheckedException("Failed to create node security
credentials", e);
- }
-
// Stick in SPI versions and classes attributes.
addAttributes(attrs, cfg.getCollisionSpi());
addAttributes(attrs, cfg.getSwapSpaceSpi());
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/24b46dc4/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/24b46dc4/modules/core/src/main/java/org/apache/ignite/mxbean/IgniteMXBean.java
----------------------------------------------------------------------
