You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by yz...@apache.org on 2015/11/18 14:41:05 UTC

[49/50] [abbrv] ignite git commit: Merge branch 'ignite-1.5' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-638-2

Merge branch 'ignite-1.5' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-638-2


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/00584653
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/00584653
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/00584653

Branch: refs/heads/ignite-638
Commit: 00584653962ebaafbac21a35c215660bd0ade4a2
Parents: 49e4320 4c9ea58
Author: Yakov Zhdanov <yz...@gridgain.com>
Authored: Wed Nov 18 16:08:55 2015 +0300
Committer: Yakov Zhdanov <yz...@gridgain.com>
Committed: Wed Nov 18 16:08:55 2015 +0300

----------------------------------------------------------------------
 DEVNOTES.txt                                    |    5 +-
 assembly/dependencies-fabric-lgpl.xml           |  169 +
 assembly/dependencies-fabric.xml                |    3 +
 assembly/release-fabric-base.xml                |  107 +
 assembly/release-fabric-lgpl.xml                |   41 +-
 assembly/release-fabric.xml                     |   85 +-
 assembly/release-hadoop-lgpl.xml                |   39 -
 config/fabric-lgpl/default-config.xml           |   29 +
 examples-lgpl/README.txt                        |   27 -
 examples-lgpl/config/example-cache.xml          |   73 -
 examples-lgpl/config/example-ignite.xml         |   83 -
 examples-lgpl/config/hibernate/README.txt       |    8 -
 .../hibernate/example-hibernate-L2-cache.xml    |   64 -
 examples-lgpl/pom-standalone.xml                |  186 -
 examples-lgpl/pom.xml                           |  128 -
 .../hibernate/HibernateL2CacheExample.java      |  245 -
 .../examples/datagrid/hibernate/Post.java       |  130 -
 .../examples/datagrid/hibernate/User.java       |  154 -
 .../datagrid/hibernate/package-info.java        |   22 -
 .../hibernate/CacheHibernatePersonStore.java    |  122 -
 .../hibernate/CacheHibernateStoreExample.java   |  151 -
 .../datagrid/store/hibernate/Person.hbm.xml     |   34 -
 .../datagrid/store/hibernate/hibernate.cfg.xml  |   41 -
 .../datagrid/store/hibernate/package-info.java  |   22 -
 .../misc/schedule/ComputeScheduleExample.java   |   82 -
 .../examples/misc/schedule/package-info.java    |   22 -
 .../misc/schedule/ComputeScheduleExample.java   |   68 -
 .../java8/misc/schedule/package-info.java       |   22 -
 .../ignite/examples/java8/package-info.java     |   23 -
 .../scalar/examples/ScalarScheduleExample.scala |   66 -
 ...ibernateL2CacheExampleMultiNodeSelfTest.java |   31 -
 .../HibernateL2CacheExampleSelfTest.java        |   33 -
 .../IgniteLgplExamplesSelfTestSuite.java        |   48 -
 ...ibernateL2CacheExampleMultiNodeSelfTest.java |   29 -
 .../HibernateL2CacheExampleSelfTest.java        |   37 -
 .../IgniteLgplExamplesJ8SelfTestSuite.java      |   46 -
 .../ScalarLgplExamplesMultiNodeSelfTest.scala   |   33 -
 .../examples/ScalarLgplExamplesSelfTest.scala   |   36 -
 .../ScalarLgplExamplesSelfTestSuite.scala       |   37 -
 examples/README-LGPL.txt                        |   33 +
 examples/README.txt                             |   21 +-
 examples/config/hibernate/README.txt            |    8 +
 .../hibernate/example-hibernate-L2-cache.xml    |   64 +
 examples/pom-standalone-lgpl.xml                |  217 +
 examples/pom-standalone.xml                     |  156 +-
 examples/pom.xml                                |  157 +-
 .../hibernate/HibernateL2CacheExample.java      |  245 +
 .../examples/datagrid/hibernate/Post.java       |  130 +
 .../examples/datagrid/hibernate/User.java       |  154 +
 .../datagrid/hibernate/package-info.java        |   22 +
 .../hibernate/CacheHibernatePersonStore.java    |  122 +
 .../hibernate/CacheHibernateStoreExample.java   |  151 +
 .../datagrid/store/hibernate/Person.hbm.xml     |   34 +
 .../datagrid/store/hibernate/hibernate.cfg.xml  |   41 +
 .../datagrid/store/hibernate/package-info.java  |   22 +
 .../misc/schedule/ComputeScheduleExample.java   |   82 +
 .../examples/misc/schedule/package-info.java    |   22 +
 .../java8/messaging/MessagingExample.java       |    7 +-
 ...ibernateL2CacheExampleMultiNodeSelfTest.java |   31 +
 .../HibernateL2CacheExampleSelfTest.java        |   33 +
 .../IgniteLgplExamplesSelfTestSuite.java        |   48 +
 .../ClientAbstractMultiThreadedSelfTest.java    |    3 +-
 .../rest/AbstractRestProcessorSelfTest.java     |    5 +-
 .../JettyRestProcessorAbstractSelfTest.java     |  142 +-
 .../src/main/java/org/apache/ignite/Ignite.java |   10 +
 .../java/org/apache/ignite/IgniteCache.java     |    1 +
 .../apache/ignite/IgniteSystemProperties.java   |   12 +
 .../affinity/fair/FairAffinityFunction.java     |  497 +-
 .../rendezvous/RendezvousAffinityFunction.java  |  140 +-
 .../eviction/random/RandomEvictionPolicy.java   |    4 +
 .../cache/store/CacheStoreSessionListener.java  |    9 +-
 .../store/jdbc/CacheAbstractJdbcStore.java      |   34 +-
 .../jdbc/CacheJdbcStoreSessionListener.java     |    8 +-
 .../configuration/CacheConfiguration.java       |  119 +-
 .../configuration/ConnectorConfiguration.java   |   61 +-
 .../configuration/IgniteConfiguration.java      |   32 +-
 .../configuration/TransactionConfiguration.java |    6 +-
 .../internal/GridEventConsumeHandler.java       |   19 +-
 .../apache/ignite/internal/IgniteKernal.java    |  146 +-
 .../ignite/internal/IgniteNodeAttributes.java   |    3 +
 .../org/apache/ignite/internal/IgnitionEx.java  |    3 +
 .../managers/communication/GridIoMessage.java   |    4 +-
 .../communication/GridIoMessageFactory.java     |   10 +-
 .../deployment/GridDeploymentLocalStore.java    |    8 +-
 .../GridDeploymentPerLoaderStore.java           |    8 +-
 .../GridDeploymentPerVersionStore.java          |    8 +-
 .../discovery/GridDiscoveryManager.java         |    5 +-
 .../internal/portable/PortableContext.java      |   91 +-
 .../internal/portable/PortableWriterExImpl.java |   66 +-
 .../portable/api/PortableMarshaller.java        |    5 +
 .../affinity/GridAffinityAssignmentCache.java   |   13 +
 .../processors/cache/CacheMetricsImpl.java      |   12 +-
 .../processors/cache/CacheObjectContext.java    |   17 +-
 .../cache/CacheStoreBalancingWrapper.java       |    5 +-
 .../processors/cache/GridCacheAdapter.java      |  499 +-
 .../cache/GridCacheAffinityManager.java         |   28 +-
 .../processors/cache/GridCacheContext.java      |   39 +-
 .../processors/cache/GridCacheEntryEx.java      |   66 +-
 .../cache/GridCacheEvictionManager.java         |    5 +-
 .../cache/GridCacheEvictionRequest.java         |   18 +-
 .../cache/GridCacheEvictionResponse.java        |    7 +-
 .../processors/cache/GridCacheIoManager.java    |   81 +-
 .../processors/cache/GridCacheMapEntry.java     |  239 +-
 .../processors/cache/GridCacheMessage.java      |   72 +-
 .../processors/cache/GridCacheMvcc.java         |  143 +-
 .../cache/GridCacheMvccCandidate.java           |   26 +-
 .../processors/cache/GridCacheMvccManager.java  |  145 +-
 .../GridCachePartitionExchangeManager.java      |  208 +-
 .../processors/cache/GridCachePreloader.java    |   60 +-
 .../cache/GridCachePreloaderAdapter.java        |   45 +-
 .../processors/cache/GridCacheProcessor.java    |  177 +-
 .../cache/GridCacheSharedContext.java           |   34 +-
 .../processors/cache/GridCacheUtils.java        |   70 +-
 .../processors/cache/IgniteCacheProxy.java      |    6 +
 .../distributed/GridCacheTtlUpdateRequest.java  |    7 +-
 .../distributed/GridCacheTxRecoveryFuture.java  |   22 +-
 .../distributed/GridCacheTxRecoveryRequest.java |    8 +-
 .../GridCacheTxRecoveryResponse.java            |   10 +-
 .../distributed/GridDistributedBaseMessage.java |   16 +-
 .../distributed/GridDistributedCacheEntry.java  |   14 +-
 .../distributed/GridDistributedLockRequest.java |    8 +-
 .../GridDistributedLockResponse.java            |   20 +-
 .../GridDistributedTxFinishRequest.java         |    6 +-
 .../GridDistributedTxFinishResponse.java        |    7 +-
 .../distributed/GridDistributedTxMapping.java   |   84 +-
 .../GridDistributedTxPrepareRequest.java        |   13 +-
 .../GridDistributedTxPrepareResponse.java       |   12 +-
 .../GridDistributedTxRemoteAdapter.java         |  192 +-
 .../GridDistributedUnlockRequest.java           |    7 +-
 .../dht/CacheDistributedGetFutureAdapter.java   |  158 +
 .../dht/GridDhtAffinityAssignmentRequest.java   |    7 +-
 .../dht/GridDhtAffinityAssignmentResponse.java  |    7 +-
 .../distributed/dht/GridDhtCacheAdapter.java    |   20 +-
 .../distributed/dht/GridDhtCacheEntry.java      |   34 +-
 .../cache/distributed/dht/GridDhtGetFuture.java |  199 +-
 .../distributed/dht/GridDhtLocalPartition.java  |   71 +-
 .../distributed/dht/GridDhtLockFuture.java      |   17 +-
 .../distributed/dht/GridDhtLockRequest.java     |    7 +-
 .../distributed/dht/GridDhtLockResponse.java    |   14 +-
 .../dht/GridDhtPartitionsReservation.java       |    2 +-
 .../dht/GridDhtTransactionalCacheAdapter.java   |  141 +-
 .../distributed/dht/GridDhtTxFinishFuture.java  |    9 +-
 .../distributed/dht/GridDhtTxFinishRequest.java |    7 +-
 .../dht/GridDhtTxFinishResponse.java            |    2 +-
 .../cache/distributed/dht/GridDhtTxLocal.java   |   28 +-
 .../distributed/dht/GridDhtTxLocalAdapter.java  |  123 +-
 .../cache/distributed/dht/GridDhtTxMapping.java |  134 +-
 .../distributed/dht/GridDhtTxPrepareFuture.java |  261 +-
 .../dht/GridDhtTxPrepareRequest.java            |   28 +-
 .../dht/GridDhtTxPrepareResponse.java           |   13 +-
 .../cache/distributed/dht/GridDhtTxRemote.java  |   66 +-
 .../distributed/dht/GridDhtUnlockRequest.java   |    7 +-
 .../dht/GridPartitionedGetFuture.java           |  182 +-
 .../dht/atomic/GridDhtAtomicCache.java          |   29 +-
 .../GridDhtAtomicDeferredUpdateResponse.java    |   12 +-
 .../dht/atomic/GridDhtAtomicUpdateFuture.java   |    6 +-
 .../dht/atomic/GridDhtAtomicUpdateRequest.java  |   25 +-
 .../dht/atomic/GridDhtAtomicUpdateResponse.java |   11 +-
 .../dht/atomic/GridNearAtomicUpdateFuture.java  |   12 +-
 .../dht/atomic/GridNearAtomicUpdateRequest.java |   33 +-
 .../atomic/GridNearAtomicUpdateResponse.java    |   11 +-
 .../dht/colocated/GridDhtColocatedCache.java    |  145 +-
 .../colocated/GridDhtColocatedLockFuture.java   |    9 +-
 .../dht/preloader/GridDhtForceKeysFuture.java   |   19 +-
 .../dht/preloader/GridDhtForceKeysRequest.java  |   35 +-
 .../dht/preloader/GridDhtForceKeysResponse.java |   11 +-
 .../GridDhtPartitionDemandMessage.java          |   19 +-
 .../preloader/GridDhtPartitionDemandPool.java   | 1192 -----
 .../dht/preloader/GridDhtPartitionDemander.java | 1408 ++++++
 .../dht/preloader/GridDhtPartitionSupplier.java | 1037 +++++
 .../GridDhtPartitionSupplyMessage.java          |    9 +-
 .../GridDhtPartitionSupplyMessageV2.java        |  380 ++
 .../preloader/GridDhtPartitionSupplyPool.java   |  555 ---
 .../GridDhtPartitionsAbstractMessage.java       |    7 +-
 .../GridDhtPartitionsExchangeFuture.java        |    8 +
 .../dht/preloader/GridDhtPreloader.java         |  306 +-
 .../distributed/near/GridNearAtomicCache.java   |    2 -
 .../distributed/near/GridNearCacheAdapter.java  |   32 +-
 .../distributed/near/GridNearCacheEntry.java    |   81 +-
 .../distributed/near/GridNearGetFuture.java     |  345 +-
 .../distributed/near/GridNearGetRequest.java    |   15 +-
 .../distributed/near/GridNearGetResponse.java   |   12 +-
 .../distributed/near/GridNearLockFuture.java    |    3 +-
 .../distributed/near/GridNearLockRequest.java   |    8 +-
 .../distributed/near/GridNearLockResponse.java  |    8 +-
 ...arOptimisticSerializableTxPrepareFuture.java |  920 ++++
 .../near/GridNearOptimisticTxPrepareFuture.java |  353 +-
 ...ridNearOptimisticTxPrepareFutureAdapter.java |  160 +
 .../GridNearPessimisticTxPrepareFuture.java     |   12 +-
 .../near/GridNearTransactionalCache.java        |   30 +-
 .../near/GridNearTxFinishFuture.java            |  236 +-
 .../near/GridNearTxFinishRequest.java           |    7 +-
 .../near/GridNearTxFinishResponse.java          |    2 +-
 .../cache/distributed/near/GridNearTxLocal.java |  261 +-
 .../near/GridNearTxPrepareFutureAdapter.java    |   13 +-
 .../near/GridNearTxPrepareRequest.java          |   17 +-
 .../near/GridNearTxPrepareResponse.java         |    8 +-
 .../distributed/near/GridNearTxRemote.java      |   26 +-
 .../distributed/near/GridNearUnlockRequest.java |    7 +-
 .../distributed/near/IgniteTxMappings.java      |   75 +
 .../distributed/near/IgniteTxMappingsImpl.java  |   92 +
 .../near/IgniteTxMappingsSingleImpl.java        |  101 +
 .../cache/local/GridLocalCacheEntry.java        |   23 +-
 .../cache/local/GridLocalLockFuture.java        |    2 +
 .../local/atomic/GridLocalAtomicCache.java      |    9 -
 .../portable/CacheObjectPortableContext.java    |    6 +-
 .../CacheObjectPortableProcessorImpl.java       |   14 +-
 .../query/GridCacheDistributedQueryFuture.java  |    5 +-
 .../query/GridCacheDistributedQueryManager.java |   25 +-
 .../cache/query/GridCacheQueryRequest.java      |   46 +-
 .../cache/query/GridCacheQueryResponse.java     |   29 +-
 .../continuous/CacheContinuousQueryHandler.java |    8 +-
 .../continuous/CacheContinuousQueryManager.java |    6 +-
 .../store/GridCacheStoreManagerAdapter.java     |   29 +-
 .../cache/transactions/IgniteInternalTx.java    |   23 +-
 .../transactions/IgniteTransactionsImpl.java    |    6 -
 .../cache/transactions/IgniteTxAdapter.java     |  440 +-
 .../cache/transactions/IgniteTxEntry.java       |   59 +-
 .../cache/transactions/IgniteTxHandler.java     |   73 +-
 .../IgniteTxImplicitSingleStateImpl.java        |  259 ++
 .../transactions/IgniteTxLocalAdapter.java      | 2103 +++++----
 .../cache/transactions/IgniteTxLocalEx.java     |   57 +-
 .../cache/transactions/IgniteTxLocalState.java  |   44 +
 .../transactions/IgniteTxLocalStateAdapter.java |   41 +
 .../cache/transactions/IgniteTxManager.java     |  518 +--
 .../cache/transactions/IgniteTxMap.java         |    3 +-
 .../cache/transactions/IgniteTxRemoteEx.java    |   17 +-
 .../IgniteTxRemoteSingleStateImpl.java          |  108 +
 .../cache/transactions/IgniteTxRemoteState.java |   34 +
 .../IgniteTxRemoteStateAdapter.java             |  110 +
 .../transactions/IgniteTxRemoteStateImpl.java   |  124 +
 .../cache/transactions/IgniteTxState.java       |  171 +
 .../cache/transactions/IgniteTxStateImpl.java   |  375 ++
 .../cache/version/GridCacheVersionManager.java  |   73 +-
 .../IgniteCacheObjectProcessorImpl.java         |    7 +-
 .../datastreamer/DataStreamerImpl.java          |    2 +-
 .../datastructures/DataStructuresProcessor.java |    3 +
 .../GridCacheAtomicReferenceImpl.java           |    2 +-
 .../processors/igfs/IgfsMetaManager.java        |    2 +-
 .../processors/job/GridJobProcessor.java        |   96 +-
 .../handlers/cache/GridCacheCommandHandler.java |  128 +-
 .../handlers/query/QueryCommandHandler.java     |  254 +-
 .../top/GridTopologyCommandHandler.java         |    4 -
 .../service/GridServiceProcessor.java           |   31 +-
 .../processors/task/GridTaskWorker.java         |    4 +-
 .../GridBoundedConcurrentLinkedHashMap.java     |    7 +-
 .../GridBoundedConcurrentLinkedHashSet.java     |    7 +-
 .../util/GridBoundedConcurrentOrderedMap.java   |   39 +-
 .../internal/util/GridConcurrentFactory.java    |   11 +-
 .../util/GridConcurrentLinkedHashSet.java       |    9 +-
 .../ignite/internal/util/IgniteUuidCache.java   |    6 +-
 .../util/future/GridCompoundFuture.java         |  155 +-
 .../ignite/internal/util/lang/GridFunc.java     |    8 +-
 .../ignite/internal/util/lang/GridTuple4.java   |    2 +-
 .../util/nio/GridNioRecoveryDescriptor.java     |   11 +-
 .../ignite/internal/visor/cache/VisorCache.java |    5 +-
 .../ignite/marshaller/AbstractMarshaller.java   |   12 +-
 .../ignite/marshaller/jdk/JdkMarshaller.java    |    7 +-
 .../optimized/OptimizedMarshaller.java          |   14 +-
 .../optimized/OptimizedMarshallerUtils.java     |   35 +-
 .../org/apache/ignite/mxbean/IgniteMXBean.java  |    8 +-
 .../communication/tcp/TcpCommunicationSpi.java  |   40 +-
 .../ignite/spi/discovery/tcp/ClientImpl.java    |  205 +-
 .../ignite/spi/discovery/tcp/ServerImpl.java    |  632 ++-
 .../spi/discovery/tcp/TcpDiscoveryImpl.java     |    4 +-
 .../spi/discovery/tcp/TcpDiscoverySpi.java      |    2 +-
 .../tcp/internal/TcpDiscoveryNodesRing.java     |   95 +-
 .../messages/TcpDiscoveryAbstractMessage.java   |   48 +
 .../TcpDiscoveryClientReconnectMessage.java     |    1 +
 .../messages/TcpDiscoveryDiscardMessage.java    |    1 +
 .../messages/TcpDiscoveryNodeAddedMessage.java  |   39 +
 .../TcpDiscoveryStatusCheckMessage.java         |   11 +
 .../org/apache/ignite/stream/StreamAdapter.java |    2 +-
 .../apache/ignite/transactions/Transaction.java |    2 +-
 .../transactions/TransactionIsolation.java      |    3 +-
 .../java/org/jsr166/ConcurrentHashMap8.java     |    2 +-
 .../java/org/jsr166/ConcurrentLinkedDeque8.java |    2 +-
 .../org/jsr166/ConcurrentLinkedHashMap.java     |  195 +-
 modules/core/src/test/config/tests.properties   |    4 +-
 .../GridCacheAffinityBackupsSelfTest.java       |    8 +
 .../AbstractAffinityFunctionSelfTest.java       |  293 ++
 .../affinity/AffinityClientNodeSelfTest.java    |  194 +
 ...ityFunctionBackupFilterAbstractSelfTest.java |  138 +
 ...unctionExcludeNeighborsAbstractSelfTest.java |  182 +
 .../affinity/IgniteClientNodeAffinityTest.java  |  194 -
 .../fair/FairAffinityDynamicCacheSelfTest.java  |   99 +
 ...airAffinityFunctionBackupFilterSelfTest.java |   35 +
 ...ffinityFunctionExcludeNeighborsSelfTest.java |   31 +
 .../fair/FairAffinityFunctionNodesSelfTest.java |  245 +
 .../fair/FairAffinityFunctionSelfTest.java      |   31 +
 .../GridFairAffinityFunctionNodesSelfTest.java  |  245 -
 .../fair/GridFairAffinityFunctionSelfTest.java  |  270 --
 .../IgniteFairAffinityDynamicCacheSelfTest.java |   97 -
 ...ousAffinityFunctionBackupFilterSelfTest.java |   35 +
 ...ffinityFunctionExcludeNeighborsSelfTest.java |   32 +
 .../RendezvousAffinityFunctionSelfTest.java     |   50 +
 .../store/GridCacheBalancingStoreSelfTest.java  |  220 +-
 .../GridCacheLoadOnlyStoreAdapterSelfTest.java  |  145 +-
 .../GridTaskFailoverAffinityRunTest.java        |    3 +
 .../IgniteClientReconnectCacheTest.java         |   33 +
 .../GridDiscoveryManagerAttributesSelfTest.java |   51 +-
 .../processors/cache/CacheNamesSelfTest.java    |   69 +
 .../cache/CacheNearReaderUpdateTest.java        |  390 ++
 .../CacheSerializableTransactionsTest.java      | 4392 ++++++++++++++++++
 .../cache/CrossCacheTxRandomOperationsTest.java |   10 +-
 .../GridCacheAbstractFailoverSelfTest.java      |   14 +-
 .../cache/GridCacheAbstractFullApiSelfTest.java |   11 +-
 .../GridCacheAbstractLocalStoreSelfTest.java    |    5 +
 .../GridCacheAbstractRemoveFailureTest.java     |   98 +-
 ...eAtomicEntryProcessorDeploymentSelfTest.java |  211 +
 .../GridCacheConcurrentTxMultiNodeTest.java     |    3 -
 .../GridCacheConditionalDeploymentSelfTest.java |  190 +
 ...idCacheConfigurationConsistencySelfTest.java |   17 -
 .../GridCacheDeploymentOffHeapSelfTest.java     |   17 +-
 .../cache/GridCacheDeploymentSelfTest.java      |   26 +-
 .../GridCacheMissingCommitVersionSelfTest.java  |   40 +-
 .../cache/GridCacheMvccFlagsTest.java           |    6 +-
 .../cache/GridCacheMvccPartitionedSelfTest.java |  164 +
 .../processors/cache/GridCacheMvccSelfTest.java |    3 +-
 .../processors/cache/GridCacheTestEntryEx.java  |   56 +-
 ...ctionalEntryProcessorDeploymentSelfTest.java |   31 +
 .../cache/IgniteCacheCreateRestartSelfTest.java |    4 +-
 .../IgniteCacheEntryListenerAbstractTest.java   |   50 +-
 .../IgniteCacheP2pUnmarshallingErrorTest.java   |    2 +-
 .../cache/IgniteCachePutAllRestartTest.java     |    3 +
 .../cache/IgniteCacheTxNearPeekModesTest.java   |    7 +-
 .../cache/IgniteCacheTxPeekModesTest.java       |    5 +
 .../processors/cache/IgniteTxAbstractTest.java  |   42 +-
 .../IgniteTxMultiThreadedAbstractTest.java      |  106 +-
 ...CacheAtomicReferenceApiSelfAbstractTest.java |   20 +-
 .../IgniteCountDownLatchAbstractSelfTest.java   |    4 +-
 ...PartitionedQueueCreateMultiNodeSelfTest.java |    5 +-
 ...IgnitePartitionedCountDownLatchSelfTest.java |    7 +-
 .../CacheGetFutureHangsSelfTest.java            |   11 +-
 ...dCachePartitionedAffinityFilterSelfTest.java |  143 -
 ...onedNearDisabledTxMultiThreadedSelfTest.java |   31 +
 ...niteCacheClientNodeChangingTopologyTest.java |  176 +-
 .../IgniteCacheClientReconnectTest.java         |    2 +
 .../distributed/IgniteCacheManyClientsTest.java |   14 +-
 .../dht/GridCacheDhtPreloadPutGetSelfTest.java  |    3 +
 .../dht/GridCacheTxNodeFailureSelfTest.java     |   21 +-
 .../IgniteCacheCrossCacheTxFailoverTest.java    |   23 +-
 .../dht/IgniteCacheLockFailoverSelfTest.java    |   11 +
 .../IgniteCachePutRetryAbstractSelfTest.java    |    4 +-
 ...gniteCachePutRetryTransactionalSelfTest.java |   10 +
 ...eAtomicInvalidPartitionHandlingSelfTest.java |    6 +-
 ...unctionExcludeNeighborsAbstractSelfTest.java |  184 -
 ...omicMultiNodeP2PDisabledFullApiSelfTest.java |    7 +-
 ...ledFairAffinityMultiNodeFullApiSelfTest.java |    5 -
 ...omicNearEnabledMultiNodeFullApiSelfTest.java |    2 +-
 ...icOffHeapTieredMultiNodeFullApiSelfTest.java |    5 -
 .../near/GridCacheNearTxExceptionSelfTest.java  |   16 +
 ...achePartitionedMultiNodeFullApiSelfTest.java |    2 +-
 ...CachePartitionedTxMultiThreadedSelfTest.java |   15 +-
 ...ffinityFunctionExcludeNeighborsSelfTest.java |   32 -
 .../GridCacheRebalancingAsyncSelfTest.java      |   68 +
 .../GridCacheRebalancingSyncSelfTest.java       |  506 ++
 ...eRebalancingUnmarshallingFailedSelfTest.java |  147 +
 ...xcludeNeighborsMultiNodeFullApiSelfTest.java |   36 +
 ...tedFairAffinityMultiNodeFullApiSelfTest.java |   35 +
 ...xcludeNeighborsMultiNodeFullApiSelfTest.java |   36 +
 ...dezvousAffinityMultiNodeFullApiSelfTest.java |   36 +
 .../GridCacheReplicatedPreloadSelfTest.java     |   22 +-
 .../continuous/GridEventConsumeSelfTest.java    |    2 +-
 .../DataStreamerUpdateAfterLoadTest.java        |  184 +
 .../GridServiceProcessorStopSelfTest.java       |  103 +
 ...dBoundedConcurrentLinkedHashMapSelfTest.java |    2 +-
 .../GridConcurrentLinkedHashMapSelfTest.java    |   62 +-
 .../loadtests/hashmap/GridHashMapLoadTest.java  |    6 +-
 .../communication/GridCacheMessageSelfTest.java |   17 +-
 ...gniteClientReconnectMassiveShutdownTest.java |  329 ++
 .../tcp/TcpClientDiscoverySpiSelfTest.java      |    4 +-
 .../tcp/TcpDiscoveryMultiThreadedTest.java      |  326 +-
 .../discovery/tcp/TcpDiscoveryRestartTest.java  |   10 +-
 .../spi/discovery/tcp/TcpDiscoverySelfTest.java |  476 +-
 .../spi/discovery/tcp/TestTcpDiscoverySpi.java  |   46 +
 .../TcpDiscoveryMulticastIpFinderSelfTest.java  |   28 +-
 .../inmemory/GridTestSwapSpaceSpi.java          |    8 +
 .../ignite/testframework/GridTestUtils.java     |   23 +-
 .../testframework/junits/GridAbstractTest.java  |   32 +-
 .../ignite/testframework/junits/IgniteMock.java |    5 +
 .../junits/common/GridCommonAbstractTest.java   |   44 +-
 .../junits/multijvm/IgniteProcessProxy.java     |    7 +-
 .../ignite/testsuites/IgniteBasicTestSuite.java |    4 +-
 .../IgniteCacheFullApiSelfTestSuite.java        |    8 +
 .../ignite/testsuites/IgniteCacheTestSuite.java |   40 +-
 .../testsuites/IgniteCacheTestSuite2.java       |   14 +-
 .../testsuites/IgniteCacheTestSuite3.java       |   12 +-
 .../testsuites/IgniteCacheTestSuite5.java       |   40 +
 .../testsuites/IgniteKernalSelfTestSuite.java   |    2 +
 .../testsuites/IgniteP2PSelfTestSuite.java      |   16 +-
 ...rrentLinkedHashMapMultiThreadedSelfTest.java |  104 +-
 .../ignite/util/mbeans/GridMBeanSelfTest.java   |   33 +-
 .../p2p/CacheDeploymentEntryProcessor.java      |   35 +
 .../CacheDeploymentPortableEntryProcessor.java  |   35 +
 modules/extdata/uri/pom.xml                     |   21 +-
 modules/flume/README.md                         |   40 +
 modules/flume/pom.xml                           |   77 +
 .../ignite/stream/flume/EventTransformer.java   |   36 +
 .../apache/ignite/stream/flume/IgniteSink.java  |  186 +
 .../stream/flume/IgniteSinkConstants.java       |   35 +
 .../ignite/stream/flume/IgniteSinkTest.java     |  142 +
 .../stream/flume/IgniteSinkTestSuite.java       |   37 +
 .../stream/flume/TestEventTransformer.java      |   66 +
 .../flume/src/test/resources/example-ignite.xml |   71 +
 .../processors/query/h2/IgniteH2Indexing.java   |    2 +-
 .../cache/IgniteCacheAbstractQuerySelfTest.java |    4 +
 ...niteCacheP2pUnmarshallingQueryErrorTest.java |   32 +-
 .../cache/SqlFieldsQuerySelfTest.java           |    2 -
 .../tcp/GridOrderedMessageCancelSelfTest.java   |   18 +-
 modules/jms11/pom.xml                           |    9 +-
 .../stream/jms11/IgniteJmsStreamerTest.java     |    9 +-
 .../ignite/logger/log4j2/Log4J2Logger.java~     |  542 ---
 .../ignite/logger/log4j2/Log4j2FileAware.java~  |   33 -
 .../ignite/logger/log4j2/Log4jFileAware.java~   |   13 -
 .../apache/ignite/stream/mqtt/MqttStreamer.java |  386 +-
 .../stream/mqtt/IgniteMqttStreamerTest.java     |  142 +-
 .../mqtt/IgniteMqttStreamerTestSuite.java       |    4 +-
 modules/rest-http/pom.xml                       |   17 +
 .../http/jetty/GridJettyRestProtocol.java       |    4 +-
 modules/spark-2.10/pom.xml                      |    4 +-
 modules/spark/pom.xml                           |    4 +-
 .../scala/org/apache/ignite/spark/Entity.scala  |    2 +-
 .../org/apache/ignite/spark/IgniteRDDSpec.scala |  249 +
 .../org/apache/ignite/spark/IgniteRddSpec.scala |  249 -
 .../org/apache/ignite/IgniteSpringBean.java     |   10 +-
 .../GridSpringResourceInjectionSelfTest.java    |  143 +
 .../processors/resource/spring-resource.xml     |   27 +
 .../testsuites/IgniteResourceSelfTestSuite.java |    2 +
 modules/ssh/pom.xml                             |    2 +-
 .../visor/commands/open/VisorOpenCommand.scala  |   14 +-
 .../scala/org/apache/ignite/visor/visor.scala   |    3 +-
 modules/yardstick/README.txt                    |   16 +-
 .../config/benchmark-client-mode.properties     |    4 +-
 .../config/benchmark-failover.properties        |  107 +
 .../config/benchmark-multicast.properties       |   73 +-
 .../yardstick/config/benchmark-store.properties |   88 +-
 modules/yardstick/config/benchmark.properties   |    4 +-
 .../config/ignite-failover-base-config.xml      |  126 +
 .../config/ignite-failover-localhost-config.xml |   56 +
 .../yardstick/config/ignite-store-config.xml    |   31 +-
 modules/yardstick/pom.xml                       |    3 +-
 .../yardstick/IgniteAbstractBenchmark.java      |    2 +-
 .../yardstick/IgniteBenchmarkArguments.java     |   71 +-
 .../ignite/yardstick/IgniteBenchmarkUtils.java  |   75 +
 .../org/apache/ignite/yardstick/IgniteNode.java |   23 +-
 .../IgniteAccountSerializableTxBenchmark.java   |   80 +
 .../cache/IgniteAccountTxAbstractBenchmark.java |   61 +
 .../cache/IgniteAccountTxBenchmark.java         |   73 +
 .../cache/IgniteCacheAbstractBenchmark.java     |   76 +-
 .../cache/IgniteGetAllPutAllTxBenchmark.java    |   73 +
 .../yardstick/cache/IgniteGetBenchmark.java     |    4 +-
 .../cache/IgniteJdbcSqlQueryBenchmark.java      |    4 +-
 .../yardstick/cache/IgnitePutAllBenchmark.java  |    4 +-
 .../IgnitePutAllSerializableTxBenchmark.java    |   77 +
 .../cache/IgnitePutAllTxBenchmark.java          |   10 +-
 .../yardstick/cache/IgnitePutBenchmark.java     |    4 +-
 .../yardstick/cache/IgnitePutGetBenchmark.java  |    4 +-
 .../cache/IgnitePutGetTxBenchmark.java          |   45 +-
 .../cache/IgnitePutIndexedValue1Benchmark.java  |    4 +-
 .../cache/IgnitePutIndexedValue2Benchmark.java  |    4 +-
 .../cache/IgnitePutIndexedValue8Benchmark.java  |    4 +-
 .../yardstick/cache/IgnitePutTxBenchmark.java   |   14 +-
 .../cache/IgnitePutTxPrimaryOnlyBenchmark.java  |   65 +
 .../IgnitePutTxSkipLocalBackupBenchmark.java    |   65 +
 .../cache/IgniteSqlQueryBenchmark.java          |    4 +-
 .../cache/IgniteSqlQueryJoinBenchmark.java      |    4 +-
 .../cache/IgniteSqlQueryPutBenchmark.java       |    4 +-
 .../cache/WaitMapExchangeFinishCallable.java    |   95 +
 .../IgniteAtomicInvokeRetryBenchmark.java       |  214 +
 ...IgniteAtomicOffHeapInvokeRetryBenchmark.java |   31 +
 .../IgniteAtomicOffHeapRetriesBenchmark.java    |   31 +
 .../failover/IgniteAtomicRetriesBenchmark.java  |   89 +
 .../IgniteFailoverAbstractBenchmark.java        |  320 ++
 .../cache/failover/IgniteFailoverNode.java      |   60 +
 ...IgniteTransactionalInvokeRetryBenchmark.java |  212 +
 ...ransactionalOffHeapInvokeRetryBenchmark.java |   33 +
 ...ransactionalOffHeapWriteInvokeBenchmark.java |   37 +
 ...eTransactionalOffHeapWriteReadBenchmark.java |   32 +
 ...IgniteTransactionalWriteInvokeBenchmark.java |  145 +
 .../IgniteTransactionalWriteReadBenchmark.java  |  104 +
 .../ignite/yardstick/cache/model/Account.java   |   42 +
 modules/zookeeper/pom.xml                       |    2 +-
 .../ipfinder/zk/ZookeeperIpFinderTestSuite.java |   32 +
 parent/pom.xml                                  |    2 +
 pom.xml                                         |   65 +-
 486 files changed, 30214 insertions(+), 12556 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/00584653/modules/core/src/main/java/org/apache/ignite/Ignite.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/00584653/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/00584653/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/00584653/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteMock.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/00584653/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteProcessProxy.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/00584653/modules/spring/src/main/java/org/apache/ignite/IgniteSpringBean.java
----------------------------------------------------------------------