# ignite-26 fixed imports

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

Branch: refs/heads/ignite-82
Commit: 752a802fc743c7c4bbbd163d6e8b6f8d2018864a
Parents: 67fa2ea
Author: sboikov <sboi...@gridgain.com>
Authored: Tue Feb 3 11:28:21 2015 +0300
Committer: sboikov <sboi...@gridgain.com>
Committed: Tue Feb 3 11:30:10 2015 +0300

----------------------------------------------------------------------
 .../aop/aspectj/GridifyAspectJAspect.java       |  3 +-
 .../aspectj/GridifySetToSetAspectJAspect.java   |  5 ++-
 .../aspectj/GridifySetToValueAspectJAspect.java |  5 ++-
 .../aop/spring/GridifySetToSetSpringAspect.java |  3 +-
 .../spring/GridifySetToValueSpringAspect.java   |  3 +-
 .../aop/spring/GridifySpringPointcut.java       |  1 +
 .../apache/ignite/gridify/AbstractAopTest.java  |  2 +-
 .../GridifySetToXXXNonSpringAopSelfTest.java    |  1 +
 .../GridifySetToXXXSpringAopSelfTest.java       |  1 +
 .../optimized/OptimizedMarshallerAopTest.java   |  2 +-
 .../singlesplit/SingleSplitTestJobTarget.java   |  1 -
 .../direct/singlesplit/SingleSplitTestTask.java |  1 -
 .../singlesplit/SingleSplitsLoadTest.java       |  6 +--
 .../gridify/GridifySingleSplitLoadTest.java     |  7 ++--
 .../gridify/ExternalNonSpringAopSelfTest.java   |  4 +-
 .../spi/checkpoint/s3/S3CheckpointData.java     |  1 +
 .../spi/checkpoint/s3/S3CheckpointSpi.java      |  6 +--
 .../tcp/ipfinder/s3/TcpDiscoveryS3IpFinder.java |  6 +--
 .../checkpoint/s3/S3CheckpointSpiSelfTest.java  |  4 +-
 .../s3/S3CheckpointSpiStartStopSelfTest.java    |  2 +-
 .../s3/S3SessionCheckpointSelfTest.java         |  2 +-
 .../s3/TcpDiscoveryS3IpFinderSelfTest.java      |  2 +-
 .../ClientAbstractMultiThreadedSelfTest.java    | 12 +++---
 .../client/ClientDefaultCacheSelfTest.java      |  4 +-
 .../ignite/client/ClientGetAffinityTask.java    |  2 +-
 .../apache/ignite/client/ClientHttpTask.java    |  1 -
 .../client/ClientPortableArgumentTask.java      |  1 -
 .../ignite/client/ClientStartNodeTask.java      |  2 +-
 .../ignite/client/ClientStopNodeTask.java       |  2 +-
 .../ignite/client/ClientStringLengthTask.java   |  1 -
 .../ClientTcpSslAuthenticationSelfTest.java     |  2 +-
 .../org/apache/ignite/client/ClientTcpTask.java |  1 -
 .../ignite/client/ClientTestPortable.java       |  2 +-
 .../org/apache/ignite/client/SleepTestTask.java |  1 -
 .../impl/ClientPartitionAffinitySelfTest.java   |  2 +-
 .../ClientAbstractConnectivitySelfTest.java     |  2 +-
 .../ClientAbstractMultiNodeSelfTest.java        | 14 +++----
 .../integration/ClientAbstractSelfTest.java     | 10 ++---
 .../integration/ClientPreferDirectSelfTest.java |  4 +-
 .../ClientTcpConnectivitySelfTest.java          |  2 +-
 .../client/router/ClientFailedInitSelfTest.java |  8 ++--
 .../router/TcpRouterAbstractSelfTest.java       |  2 +-
 .../router/TcpRouterMultiNodeSelfTest.java      |  2 +-
 .../internal/TaskEventSubjectIdSelfTest.java    |  2 +-
 .../rest/RestBinaryProtocolSelfTest.java        |  6 +--
 .../rest/RestProcessorStartSelfTest.java        |  2 +-
 .../processors/rest/RestProcessorTest.java      |  4 +-
 .../rest/TaskCommandHandlerSelfTest.java        |  8 ++--
 .../processors/rest/TestBinaryClient.java       |  4 +-
 .../processors/rest/TestMemcacheClient.java     |  2 +-
 .../internal/processors/rest/TestTask1.java     |  1 -
 .../ignite/jdbc/JdbcComplexQuerySelfTest.java   |  2 +-
 .../ignite/jdbc/JdbcMetadataSelfTest.java       |  2 +-
 .../ignite/jdbc/JdbcResultSetSelfTest.java      |  2 +-
 .../ignite/jdbc/JdbcStatementSelfTest.java      |  2 +-
 .../src/main/java/org/apache/ignite/Ignite.java |  8 ++--
 .../apache/ignite/IgniteBasicWarmupClosure.java |  4 +-
 .../java/org/apache/ignite/IgniteCluster.java   |  2 +-
 .../java/org/apache/ignite/IgniteCompute.java   |  6 +--
 .../java/org/apache/ignite/IgniteManaged.java   |  2 +-
 .../java/org/apache/ignite/IgniteMessaging.java |  2 +-
 .../apache/ignite/cache/CacheConfiguration.java |  5 +--
 .../ignite/cache/affinity/CacheAffinityKey.java |  2 +-
 .../CacheConsistentHashAffinityFunction.java    |  4 +-
 .../fair/CachePartitionFairAffinity.java        |  2 +-
 .../CacheRendezvousAffinityFunction.java        |  4 +-
 .../eviction/fifo/CacheFifoEvictionPolicy.java  |  4 +-
 .../eviction/lru/CacheLruEvictionPolicy.java    |  2 +-
 .../cache/query/CacheQueryTypeMetadata.java     |  2 +-
 .../ignite/cache/query/QueryPredicate.java      |  2 +-
 .../cache/store/CacheLoadOnlyStoreAdapter.java  |  2 +-
 .../cache/store/CacheStoreBalancingWrapper.java |  2 +-
 .../cache/store/jdbc/CacheJdbcBlobStore.java    |  4 +-
 .../ignite/client/GridClientConfiguration.java  |  4 +-
 .../balancer/GridClientBalancerAdapter.java     |  2 +-
 .../GridClientConnectionManagerAdapter.java     |  4 +-
 .../GridClientOptimizedMarshaller.java          |  2 +-
 .../router/GridTcpRouterConfiguration.java      |  4 +-
 .../impl/GridRouterCommandLineStartup.java      |  6 +--
 .../client/router/impl/GridTcpRouterImpl.java   |  4 +-
 .../ignite/cluster/ClusterNodeLocalMap.java     |  1 +
 .../ignite/compute/ComputeTaskSession.java      |  1 -
 .../ignite/compute/ComputeTaskSplitAdapter.java |  2 +-
 .../gridify/aop/GridifyDefaultRangeTask.java    |  2 +-
 .../compute/gridify/aop/GridifyDefaultTask.java |  5 ++-
 .../aop/GridifySetToSetAbstractAspect.java      |  5 ++-
 .../aop/GridifySetToValueAbstractAspect.java    |  3 +-
 .../configuration/IgniteConfiguration.java      | 18 ++++-----
 .../events/IgniteAuthenticationEvent.java       |  2 +-
 .../ignite/events/IgniteAuthorizationEvent.java |  2 +-
 .../apache/ignite/events/IgniteCacheEvent.java  |  2 +-
 .../events/IgniteCacheQueryExecutedEvent.java   |  2 +-
 .../events/IgniteCacheQueryReadEvent.java       |  2 +-
 .../ignite/events/IgniteEventAdapter.java       |  2 +-
 .../apache/ignite/events/IgniteJobEvent.java    |  2 +-
 .../ignite/events/IgniteSecureSessionEvent.java |  2 +-
 .../apache/ignite/events/IgniteTaskEvent.java   |  2 +-
 .../ignite/fs/mapreduce/IgniteFsTask.java       |  2 +-
 .../IgniteFsByteDelimiterRecordResolver.java    |  4 +-
 .../ignite/internal/ClusterGroupAdapter.java    |  2 +-
 .../internal/ComputeTaskInternalFuture.java     |  4 +-
 .../apache/ignite/internal/GridDiagnostic.java  |  2 +-
 .../internal/GridEventConsumeHandler.java       |  6 +--
 .../ignite/internal/GridJobCancelRequest.java   |  2 +-
 .../ignite/internal/GridJobContextImpl.java     |  4 +-
 .../ignite/internal/GridJobExecuteRequest.java  |  2 +-
 .../ignite/internal/GridJobExecuteResponse.java |  2 +-
 .../ignite/internal/GridJobResultImpl.java      |  2 +-
 .../ignite/internal/GridJobSessionImpl.java     |  2 +-
 .../ignite/internal/GridJobSiblingImpl.java     |  2 +-
 .../ignite/internal/GridJobSiblingsRequest.java |  2 +-
 .../internal/GridJobSiblingsResponse.java       |  2 +-
 .../ignite/internal/GridKernalContext.java      | 12 +++---
 .../ignite/internal/GridKernalContextImpl.java  | 12 +++---
 .../ignite/internal/GridKernalGatewayImpl.java  |  2 +-
 .../apache/ignite/internal/GridKillTask.java    |  1 -
 .../apache/ignite/internal/GridLoggerProxy.java |  6 +--
 .../internal/GridMessageListenHandler.java      |  2 +-
 .../ignite/internal/GridPluginComponent.java    |  1 -
 .../ignite/internal/GridPluginContext.java      |  3 +-
 .../apache/ignite/internal/GridProductImpl.java |  2 +-
 .../ignite/internal/GridTaskCancelRequest.java  |  2 +-
 .../ignite/internal/GridTaskSessionImpl.java    |  2 +-
 .../ignite/internal/GridTaskSessionRequest.java |  2 +-
 .../org/apache/ignite/internal/GridTopic.java   |  2 +-
 .../ignite/internal/GridUpdateNotifier.java     |  2 +-
 .../ignite/internal/IgniteComputeImpl.java      |  2 +-
 .../ignite/internal/IgniteEventsImpl.java       |  2 +-
 .../apache/ignite/internal/IgniteKernal.java    | 39 ++++++++++----------
 .../ignite/internal/IgniteManagedImpl.java      |  2 +-
 .../ignite/internal/IgniteSchedulerImpl.java    |  2 +-
 .../org/apache/ignite/internal/IgnitionEx.java  | 18 ++++-----
 .../ignite/internal/IgnitionMXBeanAdapter.java  |  2 +-
 .../internal/executor/GridExecutorService.java  |  2 +-
 .../fs/common/GridGgfsStreamControlRequest.java |  2 +-
 .../internal/managers/GridManagerAdapter.java   | 12 +++---
 .../checkpoint/GridCheckpointManager.java       | 10 ++---
 .../checkpoint/GridCheckpointRequest.java       |  2 +-
 .../collision/GridCollisionManager.java         |  2 +-
 .../managers/communication/GridIoManager.java   | 10 ++---
 .../managers/communication/GridIoMessage.java   |  2 +-
 .../communication/GridIoUserMessage.java        |  4 +-
 .../managers/deployment/GridDeployment.java     |  4 +-
 .../deployment/GridDeploymentClassLoader.java   |  2 +-
 .../deployment/GridDeploymentCommunication.java | 10 ++---
 .../deployment/GridDeploymentInfoBean.java      |  4 +-
 .../deployment/GridDeploymentLocalStore.java    |  4 +-
 .../deployment/GridDeploymentManager.java       |  4 +-
 .../deployment/GridDeploymentMetadata.java      |  5 ++-
 .../GridDeploymentPerLoaderStore.java           |  7 ++--
 .../GridDeploymentPerVersionStore.java          |  8 ++--
 .../deployment/GridDeploymentRequest.java       |  4 +-
 .../deployment/GridDeploymentResponse.java      |  1 -
 .../deployment/GridDeploymentStoreAdapter.java  |  2 +-
 .../protocol/gg/GridProtocolHandler.java        |  3 +-
 .../protocol/gg/GridUrlConnection.java          |  2 +-
 .../discovery/GridDiscoveryManager.java         | 20 +++++-----
 .../GridDiscoveryTopologySnapshot.java          |  2 +-
 .../eventstorage/GridEventStorageManager.java   | 12 +++---
 .../eventstorage/GridEventStorageMessage.java   |  4 +-
 .../failover/GridFailoverContextImpl.java       |  3 +-
 .../managers/failover/GridFailoverManager.java  |  2 +-
 .../managers/indexing/GridIndexingManager.java  |  4 +-
 .../loadbalancer/GridLoadBalancerManager.java   |  2 +-
 .../securesession/GridSecureSessionManager.java |  2 +-
 .../os/GridOsSecureSessionManager.java          |  2 +-
 .../managers/security/GridSecurityContext.java  |  2 +-
 .../managers/security/GridSecurityManager.java  |  2 +-
 .../security/GridSecuritySubjectAdapter.java    |  2 +-
 .../security/os/GridOsSecurityManager.java      |  4 +-
 .../swapspace/GridSwapSpaceManager.java         |  6 +--
 .../internal/processors/GridProcessor.java      |  2 +-
 .../processors/GridProcessorAdapter.java        |  4 +-
 .../affinity/GridAffinityAssignmentCache.java   |  2 +-
 .../affinity/GridAffinityMessage.java           |  4 +-
 .../affinity/GridAffinityProcessor.java         |  8 ++--
 .../processors/affinity/GridAffinityUtils.java  |  6 +--
 .../processors/cache/CacheInvokeResult.java     |  2 +-
 .../processors/cache/GridCacheAdapter.java      | 28 +++++++-------
 .../cache/GridCacheAffinityManager.java         |  2 +-
 .../processors/cache/GridCacheAttributes.java   |  2 +-
 .../cache/GridCacheConcurrentMap.java           |  2 +-
 .../processors/cache/GridCacheContext.java      | 20 +++++-----
 .../GridCacheDefaultAffinityKeyMapper.java      |  4 +-
 .../cache/GridCacheDeploymentManager.java       |  4 +-
 .../processors/cache/GridCacheEntryEx.java      |  4 +-
 .../processors/cache/GridCacheEntryImpl.java    |  2 +-
 .../processors/cache/GridCacheEntryInfo.java    |  2 +-
 .../processors/cache/GridCacheEntrySet.java     |  2 +-
 .../processors/cache/GridCacheEventManager.java |  4 +-
 .../cache/GridCacheEvictionEntry.java           |  6 +--
 .../cache/GridCacheEvictionManager.java         | 11 +++---
 .../cache/GridCacheExplicitLockSpan.java        |  6 +--
 .../cache/GridCacheFilterEvaluationEntry.java   |  2 +-
 .../processors/cache/GridCacheIoManager.java    |  4 +-
 .../processors/cache/GridCacheIterator.java     |  2 +-
 .../processors/cache/GridCacheKeySet.java       |  2 +-
 .../cache/GridCacheLoaderWriterStore.java       |  3 +-
 .../processors/cache/GridCacheLogger.java       |  4 +-
 .../processors/cache/GridCacheMapEntry.java     | 11 +++---
 .../processors/cache/GridCacheMessage.java      |  4 +-
 .../cache/GridCacheMultiTxFuture.java           |  4 +-
 .../processors/cache/GridCacheMvcc.java         |  2 +-
 .../cache/GridCacheMvccCandidate.java           |  2 +-
 .../processors/cache/GridCacheMvccManager.java  |  8 ++--
 .../cache/GridCacheOffheapSwapEntry.java        |  2 +-
 .../GridCachePartitionExchangeManager.java      |  6 +--
 .../processors/cache/GridCachePreloader.java    |  2 +-
 .../cache/GridCachePreloaderAdapter.java        |  2 +-
 .../processors/cache/GridCacheProcessor.java    | 14 +++----
 .../processors/cache/GridCacheProjectionEx.java |  2 +-
 .../cache/GridCacheProjectionImpl.java          | 10 ++---
 .../processors/cache/GridCacheProxyImpl.java    | 10 ++---
 .../processors/cache/GridCacheReturn.java       |  4 +-
 .../cache/GridCacheSharedContext.java           |  4 +-
 .../processors/cache/GridCacheStoreManager.java |  6 +--
 .../cache/GridCacheSwapEntryImpl.java           |  2 +-
 .../processors/cache/GridCacheSwapManager.java  | 10 ++---
 .../processors/cache/GridCacheTtlManager.java   |  2 +-
 .../cache/GridCacheUpdateAtomicResult.java      |  2 +-
 .../cache/GridCacheUpdateTxResult.java          |  2 +-
 .../processors/cache/GridCacheUtils.java        | 11 +++---
 .../cache/GridCacheValueCollection.java         |  2 +-
 .../cache/GridCacheWriteBehindStore.java        | 10 ++---
 .../processors/cache/GridPartitionLockKey.java  |  2 +-
 .../processors/cache/IgniteCacheProxy.java      |  4 +-
 .../cache/affinity/GridCacheAffinityImpl.java   |  2 +-
 .../GridAtomicCacheQueueImpl.java               |  1 -
 .../GridCacheAnnotationHelper.java              |  2 +-
 .../datastructures/GridCacheAtomicLongImpl.java |  2 +-
 .../GridCacheAtomicReferenceImpl.java           |  2 +-
 .../GridCacheAtomicSequenceImpl.java            |  4 +-
 .../GridCacheAtomicStampedImpl.java             |  2 +-
 .../GridCacheAtomicStampedValue.java            |  4 +-
 .../GridCacheCountDownLatchImpl.java            |  2 +-
 .../GridCacheDataStructuresManager.java         | 14 +++----
 .../GridCacheInternalKeyImpl.java               |  2 +-
 .../datastructures/GridCacheQueueAdapter.java   |  2 +-
 .../datastructures/GridCacheQueueHeader.java    |  2 +-
 .../datastructures/GridCacheQueueItemKey.java   |  2 +-
 .../datastructures/GridCacheQueueProxy.java     |  2 +-
 .../datastructures/GridCacheSetHeader.java      |  2 +-
 .../cache/datastructures/GridCacheSetImpl.java  |  4 +-
 .../datastructures/GridCacheSetItemKey.java     |  2 +-
 .../cache/datastructures/GridCacheSetProxy.java |  2 +-
 .../datastructures/GridSetQueryPredicate.java   |  2 +-
 .../distributed/GridCacheCommittedTxInfo.java   |  2 +-
 ...ridCacheOptimisticCheckPreparedTxFuture.java |  4 +-
 ...idCacheOptimisticCheckPreparedTxRequest.java |  4 +-
 ...dCacheOptimisticCheckPreparedTxResponse.java |  2 +-
 .../GridCachePerThreadTxCommitBuffer.java       |  4 +-
 ...dCachePessimisticCheckCommittedTxFuture.java |  6 +--
 ...CachePessimisticCheckCommittedTxRequest.java |  4 +-
 ...achePessimisticCheckCommittedTxResponse.java |  2 +-
 .../distributed/GridCacheTxFinishSync.java      |  2 +-
 .../GridDistributedCacheAdapter.java            |  4 +-
 .../distributed/GridDistributedLockRequest.java |  6 +--
 .../GridDistributedLockResponse.java            |  2 +-
 .../GridDistributedTxFinishRequest.java         |  4 +-
 .../GridDistributedTxFinishResponse.java        |  2 +-
 .../distributed/GridDistributedTxMapping.java   |  2 +-
 .../GridDistributedTxPrepareRequest.java        |  4 +-
 .../GridDistributedTxRemoteAdapter.java         |  8 ++--
 .../GridPartitionedCacheEntryImpl.java          |  4 +-
 .../IgniteExternalizableExpiryPolicy.java       |  2 +-
 .../dht/GridClientPartitionTopology.java        |  2 +-
 .../distributed/dht/GridDhtCacheAdapter.java    |  4 +-
 .../distributed/dht/GridDhtCacheEntry.java      |  4 +-
 .../distributed/dht/GridDhtCacheEntryImpl.java  |  2 +-
 .../distributed/dht/GridDhtEmbeddedFuture.java  |  4 +-
 .../distributed/dht/GridDhtFinishedFuture.java  |  2 +-
 .../cache/distributed/dht/GridDhtGetFuture.java |  8 ++--
 .../distributed/dht/GridDhtLocalPartition.java  |  4 +-
 .../distributed/dht/GridDhtLockFuture.java      |  8 ++--
 .../distributed/dht/GridDhtLockRequest.java     |  6 +--
 .../distributed/dht/GridDhtLockResponse.java    |  4 +-
 .../dht/GridDhtPartitionTopologyImpl.java       |  2 +-
 .../dht/GridDhtTransactionalCacheAdapter.java   | 14 +++----
 .../distributed/dht/GridDhtTxFinishFuture.java  | 10 ++---
 .../distributed/dht/GridDhtTxFinishRequest.java |  6 +--
 .../dht/GridDhtTxFinishResponse.java            |  2 +-
 .../cache/distributed/dht/GridDhtTxLocal.java   | 10 ++---
 .../distributed/dht/GridDhtTxLocalAdapter.java  |  8 ++--
 .../distributed/dht/GridDhtTxPrepareFuture.java | 12 +++---
 .../dht/GridDhtTxPrepareRequest.java            |  4 +-
 .../dht/GridDhtTxPrepareResponse.java           |  4 +-
 .../cache/distributed/dht/GridDhtTxRemote.java  |  6 +--
 .../distributed/dht/GridNoStorageCacheMap.java  |  2 +-
 .../dht/GridPartitionedGetFuture.java           |  4 +-
 .../dht/atomic/GridDhtAtomicCache.java          | 15 ++++----
 .../dht/atomic/GridDhtAtomicUpdateFuture.java   |  4 +-
 .../dht/atomic/GridNearAtomicUpdateFuture.java  |  8 ++--
 .../dht/atomic/GridNearAtomicUpdateRequest.java |  2 +-
 .../dht/colocated/GridDhtColocatedCache.java    | 10 ++---
 .../colocated/GridDhtColocatedLockFuture.java   |  8 ++--
 .../dht/preloader/GridDhtForceKeysFuture.java   |  6 +--
 .../dht/preloader/GridDhtForceKeysRequest.java  |  2 +-
 .../dht/preloader/GridDhtForceKeysResponse.java |  2 +-
 .../preloader/GridDhtPartitionDemandPool.java   |  6 +--
 .../preloader/GridDhtPartitionExchangeId.java   |  2 +-
 .../preloader/GridDhtPartitionSupplyPool.java   |  6 +--
 .../GridDhtPartitionsExchangeFuture.java        |  6 +--
 .../dht/preloader/GridDhtPreloader.java         |  6 +--
 .../distributed/near/GridNearAtomicCache.java   | 10 ++---
 .../distributed/near/GridNearCacheAdapter.java  |  6 +--
 .../distributed/near/GridNearCacheEntry.java    |  4 +-
 .../distributed/near/GridNearGetFuture.java     |  8 ++--
 .../distributed/near/GridNearGetRequest.java    |  2 +-
 .../distributed/near/GridNearGetResponse.java   |  2 +-
 .../distributed/near/GridNearLockFuture.java    |  8 ++--
 .../distributed/near/GridNearLockMapping.java   |  2 +-
 .../distributed/near/GridNearLockRequest.java   |  6 +--
 .../distributed/near/GridNearLockResponse.java  |  2 +-
 .../near/GridNearTransactionalCache.java        | 10 ++---
 .../near/GridNearTxFinishFuture.java            | 10 ++---
 .../near/GridNearTxFinishRequest.java           |  4 +-
 .../near/GridNearTxFinishResponse.java          |  2 +-
 .../cache/distributed/near/GridNearTxLocal.java | 12 +++---
 .../near/GridNearTxPrepareFuture.java           | 10 ++---
 .../near/GridNearTxPrepareRequest.java          |  2 +-
 .../near/GridNearTxPrepareResponse.java         |  4 +-
 .../distributed/near/GridNearTxRemote.java      |  4 +-
 .../processors/cache/dr/GridCacheDrManager.java |  1 -
 .../processors/cache/local/GridLocalCache.java  |  6 +--
 .../cache/local/GridLocalLockFuture.java        |  6 +--
 .../processors/cache/local/GridLocalTx.java     |  2 +-
 .../cache/local/GridLocalTxFuture.java          |  6 +--
 .../local/atomic/GridLocalAtomicCache.java      | 12 +++---
 .../query/GridCacheDistributedQueryManager.java |  6 +--
 .../cache/query/GridCacheLocalQueryFuture.java  |  4 +-
 .../cache/query/GridCacheQueriesImpl.java       |  2 +-
 .../cache/query/GridCacheQueryAdapter.java      |  4 +-
 .../cache/query/GridCacheQueryBean.java         |  2 +-
 .../query/GridCacheQueryFutureAdapter.java      |  2 +-
 .../cache/query/GridCacheQueryInfo.java         |  2 +-
 .../cache/query/GridCacheQueryManager.java      |  2 +-
 .../cache/query/GridCacheQueryRequest.java      |  4 +-
 .../GridCacheContinuousQueryAdapter.java        |  6 +--
 .../GridCacheContinuousQueryEntry.java          |  6 +--
 .../GridCacheContinuousQueryHandler.java        |  4 +-
 .../GridCacheContinuousQueryManager.java        |  4 +-
 .../jdbc/GridCacheQueryJdbcMetadataTask.java    |  6 +--
 .../query/jdbc/GridCacheQueryJdbcTask.java      |  8 ++--
 .../jdbc/GridCacheQueryJdbcValidationTask.java  |  2 +-
 .../cache/transactions/IgniteInternalTx.java    |  4 +-
 .../transactions/IgniteTransactionsImpl.java    |  2 +-
 .../cache/transactions/IgniteTxAdapter.java     | 12 +++---
 .../cache/transactions/IgniteTxEntry.java       |  4 +-
 .../cache/transactions/IgniteTxHandler.java     | 10 ++---
 .../transactions/IgniteTxLocalAdapter.java      | 16 ++++----
 .../cache/transactions/IgniteTxLocalEx.java     |  2 +-
 .../cache/transactions/IgniteTxManager.java     | 18 ++++-----
 .../cache/transactions/IgniteTxMap.java         |  2 +-
 .../transactions/IgniteTxMetricsAdapter.java    |  2 +-
 .../cache/transactions/IgniteTxProxyImpl.java   |  6 +--
 .../cache/version/GridCacheVersion.java         |  2 +-
 .../cache/version/GridCacheVersionManager.java  |  4 +-
 .../clock/GridClockDeltaSnapshot.java           |  2 +-
 .../clock/GridClockDeltaSnapshotMessage.java    |  2 +-
 .../processors/clock/GridClockServer.java       |  2 +-
 .../clock/GridClockSyncProcessor.java           |  6 +--
 .../closure/GridClosureProcessor.java           |  8 ++--
 .../continuous/GridContinuousMessage.java       |  4 +-
 .../continuous/GridContinuousProcessor.java     | 10 ++---
 .../dataload/GridDataLoadCacheUpdaters.java     |  2 +-
 .../dataload/GridDataLoadRequest.java           |  4 +-
 .../dataload/GridDataLoaderFuture.java          |  2 +-
 .../dataload/GridDataLoaderProcessor.java       |  8 ++--
 .../dataload/IgniteDataLoaderImpl.java          |  8 ++--
 .../dr/GridDrDataLoadCacheUpdater.java          |  2 +-
 .../processors/email/GridEmailHolder.java       |  2 +-
 .../processors/fs/GridGgfsAckMessage.java       |  2 +-
 .../processors/fs/GridGgfsBlockKey.java         |  2 +-
 .../processors/fs/GridGgfsBlocksMessage.java    |  2 +-
 .../fs/GridGgfsCommunicationMessage.java        |  2 +-
 .../processors/fs/GridGgfsDataManager.java      | 14 +++----
 .../processors/fs/GridGgfsDeleteMessage.java    |  4 +-
 .../processors/fs/GridGgfsDeleteWorker.java     |  4 +-
 .../fs/GridGgfsFileAffinityRange.java           |  2 +-
 .../processors/fs/GridGgfsFileInfo.java         |  4 +-
 .../internal/processors/fs/GridGgfsFileMap.java |  2 +-
 .../fs/GridGgfsFragmentizerManager.java         |  6 +--
 .../fs/GridGgfsFragmentizerRequest.java         |  4 +-
 .../fs/GridGgfsFragmentizerResponse.java        |  2 +-
 .../internal/processors/fs/GridGgfsImpl.java    |  7 ++--
 .../processors/fs/GridGgfsInputStreamImpl.java  |  2 +-
 .../processors/fs/GridGgfsIpcHandler.java       |  6 +--
 .../processors/fs/GridGgfsListingEntry.java     |  2 +-
 .../processors/fs/GridGgfsLocalMetrics.java     |  2 +-
 .../processors/fs/GridGgfsMetaManager.java      | 10 ++---
 .../internal/processors/fs/GridGgfsServer.java  |  6 +--
 .../processors/fs/GridGgfsServerManager.java    |  4 +-
 .../processors/fs/IgniteFsFileImpl.java         |  2 +-
 .../processors/fs/IgniteFsOutputStreamImpl.java |  4 +-
 .../processors/fs/IgniteFsProcessor.java        |  2 +-
 .../hadoop/IgniteHadoopNoopProcessor.java       |  2 +-
 .../hadoop/IgniteHadoopProcessorAdapter.java    |  2 +-
 .../processors/job/GridJobProcessor.java        |  8 ++--
 .../internal/processors/job/GridJobWorker.java  |  4 +-
 .../jobmetrics/GridJobMetricsProcessor.java     |  2 +-
 .../license/os/GridOsLicenseProcessor.java      |  2 +-
 .../offheap/GridOffHeapProcessor.java           |  4 +-
 .../plugin/IgnitePluginProcessor.java           |  2 +-
 .../processors/port/GridPortProcessor.java      |  2 +-
 .../processors/port/GridPortRecord.java         |  2 +-
 .../portable/GridPortableProcessor.java         |  2 +-
 .../portable/os/GridOsPortableProcessor.java    |  2 +-
 .../processors/query/GridQueryIndexing.java     |  2 +-
 .../processors/query/GridQueryProcessor.java    |  6 +--
 .../processors/resource/GridResourceField.java  |  1 +
 .../processors/resource/GridResourceIoc.java    |  2 +-
 .../resource/GridResourceLoggerInjector.java    |  2 +-
 .../processors/resource/GridResourceMethod.java |  1 +
 .../resource/GridResourceProcessor.java         |  6 +--
 .../resource/GridResourceServiceInjector.java   |  2 +-
 .../processors/rest/GridRestProcessor.java      | 12 +++---
 .../processors/rest/GridRestResponse.java       |  2 +-
 .../message/GridClientAbstractMessage.java      |  2 +-
 .../GridClientAuthenticationRequest.java        |  2 +-
 .../message/GridClientCacheQueryRequest.java    |  7 +---
 .../client/message/GridClientCacheRequest.java  |  2 +-
 .../message/GridClientGetMetaDataRequest.java   |  2 +-
 .../client/message/GridClientLogRequest.java    |  2 +-
 .../message/GridClientMetaDataResponse.java     |  2 +-
 .../rest/client/message/GridClientNodeBean.java |  2 +-
 .../message/GridClientPortableMetaData.java     |  2 +-
 .../message/GridClientPutMetaDataRequest.java   |  2 +-
 .../rest/client/message/GridClientResponse.java |  2 +-
 .../client/message/GridClientTaskRequest.java   |  2 +-
 .../message/GridClientTaskResultBean.java       |  2 +-
 .../message/GridClientTopologyRequest.java      |  2 +-
 .../cache/GridCacheClientQueryResult.java       |  2 +-
 .../handlers/cache/GridCacheCommandHandler.java |  8 ++--
 .../cache/GridCacheQueryCommandHandler.java     |  6 +--
 .../metadata/GridPortableMetadataHandler.java   |  2 +-
 .../handlers/task/GridTaskCommandHandler.java   |  9 ++---
 .../handlers/task/GridTaskResultRequest.java    |  2 +-
 .../top/GridTopologyCommandHandler.java         |  2 +-
 .../rest/protocols/GridRestProtocolAdapter.java |  2 +-
 .../tcp/GridMemcachedMessageWrapper.java        |  2 +-
 .../tcp/GridTcpMemcachedNioListener.java        |  4 +-
 .../protocols/tcp/GridTcpRestNioListener.java   |  2 +-
 .../rest/protocols/tcp/GridTcpRestParser.java   |  6 +--
 .../rest/protocols/tcp/GridTcpRestProtocol.java | 10 ++---
 .../rest/request/GridRestCacheQueryRequest.java |  2 +-
 .../service/GridServiceAssignments.java         |  4 +-
 .../service/GridServiceDeployment.java          |  2 +-
 .../service/GridServiceDeploymentFuture.java    |  2 +-
 .../service/GridServiceProcessor.java           | 16 ++++----
 .../processors/service/GridServiceProxy.java    |  6 +--
 .../service/ManagedServiceContextImpl.java      |  2 +-
 .../service/ManagedServiceDescriptorImpl.java   |  2 +-
 .../session/GridTaskSessionProcessor.java       |  4 +-
 .../spring/IgniteSpringProcessor.java           |  2 +-
 .../streamer/GridStreamProcessor.java           |  8 ++--
 .../streamer/GridStreamerAttributes.java        |  4 +-
 .../streamer/GridStreamerCancelRequest.java     |  2 +-
 .../streamer/GridStreamerContextDelegate.java   |  1 -
 .../streamer/GridStreamerContextImpl.java       |  5 +--
 .../streamer/GridStreamerExecutionBatch.java    |  6 +--
 .../streamer/GridStreamerExecutionRequest.java  |  4 +-
 .../streamer/GridStreamerResponse.java          |  2 +-
 .../GridStreamerStageExecutionFuture.java       |  8 ++--
 .../processors/streamer/IgniteStreamerImpl.java | 10 ++---
 .../streamer/StreamerMetricsAdapter.java        |  4 +-
 .../streamer/StreamerMetricsHolder.java         |  2 +-
 .../streamer/StreamerStageMetricsAdapter.java   |  2 +-
 .../streamer/StreamerStageWrapper.java          |  3 +-
 .../streamer/StreamerWindowMetricsAdapter.java  |  2 +-
 .../task/GridStreamerBroadcastTask.java         |  4 +-
 .../streamer/task/GridStreamerQueryTask.java    |  4 +-
 .../streamer/task/GridStreamerReduceTask.java   |  4 +-
 .../processors/task/GridTaskProcessor.java      | 10 ++---
 .../processors/task/GridTaskWorker.java         |  6 +--
 .../timeout/GridTimeoutObjectAdapter.java       |  2 +-
 .../timeout/GridTimeoutProcessor.java           |  2 +-
 .../org/apache/ignite/internal/util/F0.java     |  4 +-
 .../internal/util/GridAnnotationsCache.java     |  2 +-
 .../util/GridBoundedConcurrentOrderedMap.java   |  2 +-
 .../ignite/internal/util/GridByteArrayList.java |  2 +-
 .../internal/util/GridCircularBuffer.java       |  2 +-
 .../util/GridConcurrentPhantomHashSet.java      |  5 ++-
 .../util/GridConcurrentWeakHashSet.java         |  5 ++-
 .../internal/util/GridConsistentHash.java       |  4 +-
 .../apache/ignite/internal/util/GridDebug.java  |  4 +-
 .../util/GridEmptyCloseableIterator.java        |  1 -
 .../ignite/internal/util/GridEmptyIterator.java |  2 +-
 .../internal/util/GridExecutionStatistics.java  |  2 +-
 .../ignite/internal/util/GridHandleTable.java   |  1 -
 .../ignite/internal/util/GridJavaProcess.java   |  2 +-
 .../ignite/internal/util/GridLeanMap.java       |  4 +-
 .../ignite/internal/util/GridListSet.java       |  2 +-
 .../ignite/internal/util/GridLogThrottle.java   |  2 +-
 .../apache/ignite/internal/util/GridMutex.java  |  1 +
 .../apache/ignite/internal/util/GridQueue.java  |  2 +-
 .../ignite/internal/util/GridSetWrapper.java    |  2 +-
 .../util/GridSpiCloseableIteratorWrapper.java   |  3 +-
 .../internal/util/GridStripedReadWriteLock.java |  2 +-
 .../ignite/internal/util/GridThreadLocal.java   |  2 +-
 .../ignite/internal/util/GridThreadLocalEx.java |  2 +-
 .../apache/ignite/internal/util/GridUnsafe.java |  2 +-
 .../ignite/internal/util/IgniteUtils.java       | 15 ++++----
 .../GridTcpCommunicationMessageAdapter.java     |  6 +--
 .../GridTcpCommunicationMessageState.java       |  6 +--
 .../util/future/GridCompoundFuture.java         |  2 +-
 .../util/future/GridCompoundIdentityFuture.java |  2 +-
 .../util/future/GridEmbeddedFuture.java         |  2 +-
 .../util/future/GridFinishedFuture.java         |  2 +-
 .../util/future/GridFinishedFutureEx.java       |  2 +-
 .../internal/util/future/GridFutureAdapter.java |  2 +-
 .../util/future/GridFutureAdapterEx.java        |  2 +-
 .../util/future/GridFutureChainListener.java    |  4 +-
 .../util/gridify/GridifyRangeArgument.java      |  1 +
 .../internal/util/gridify/GridifyUtils.java     |  1 +
 .../internal/util/ipc/IpcEndpointFactory.java   |  2 +-
 .../util/ipc/loopback/IpcServerTcpEndpoint.java |  4 +-
 .../shmem/IpcSharedMemoryClientEndpoint.java    |  2 +-
 .../shmem/IpcSharedMemoryServerEndpoint.java    | 10 ++---
 .../util/lang/GridComputeJobWrapper.java        |  1 -
 .../ignite/internal/util/lang/GridFunc.java     |  2 +-
 .../util/lang/GridMetadataAwareAdapter.java     |  3 +-
 .../internal/util/lang/GridNodePredicate.java   |  5 ++-
 .../ignite/internal/util/lang/GridTuple.java    |  2 +-
 .../ignite/internal/util/lang/GridTuple3.java   |  2 +-
 .../ignite/internal/util/lang/GridTuple4.java   |  2 +-
 .../ignite/internal/util/lang/GridTuple5.java   |  2 +-
 .../ignite/internal/util/lang/GridTuple6.java   |  2 +-
 .../ignite/internal/util/lang/GridTupleV.java   |  2 +-
 .../internal/util/lang/IgniteClosure2X.java     |  2 +-
 .../internal/util/lang/IgniteClosureX.java      |  2 +-
 .../internal/util/lang/IgniteInClosure2X.java   |  2 +-
 .../internal/util/lang/IgniteInClosureX.java    |  2 +-
 .../internal/util/lang/IgniteOutClosureX.java   |  2 +-
 .../ignite/internal/util/lang/IgnitePair.java   |  1 +
 .../internal/util/lang/IgnitePredicate2X.java   |  2 +-
 .../internal/util/lang/IgnitePredicateX.java    |  2 +-
 .../internal/util/lang/IgniteReducerX.java      |  2 +-
 .../internal/util/nio/GridDirectParser.java     |  2 +-
 .../internal/util/nio/GridNioCodecFilter.java   |  2 +-
 .../util/nio/GridNioEmbeddedFuture.java         |  2 +-
 .../util/nio/GridNioFinishedFuture.java         |  2 +-
 .../internal/util/nio/GridNioFutureImpl.java    |  2 +-
 .../util/nio/GridNioMessageTracker.java         |  2 +-
 .../util/nio/GridNioRecoveryDescriptor.java     |  2 +-
 .../ignite/internal/util/nio/GridNioServer.java |  4 +-
 .../util/nio/GridSelectorNioSessionImpl.java    |  2 +-
 .../util/nio/GridShmemCommunicationClient.java  |  4 +-
 .../internal/util/nio/ssl/GridNioSslFilter.java |  2 +-
 .../util/nio/ssl/GridNioSslHandler.java         |  2 +-
 .../util/nodestart/GridNodeStartUtils.java      |  2 +-
 .../internal/util/offheap/GridOffHeapMap.java   |  2 +-
 .../util/offheap/GridOffHeapPartitionedMap.java |  2 +-
 .../util/offheap/unsafe/GridUnsafeLru.java      |  2 +-
 .../util/offheap/unsafe/GridUnsafeMap.java      |  2 +-
 .../unsafe/GridUnsafePartitionedMap.java        |  2 +-
 .../apache/ignite/internal/util/typedef/C1.java |  2 +-
 .../apache/ignite/internal/util/typedef/C2.java |  2 +-
 .../ignite/internal/util/typedef/CI1.java       |  2 +-
 .../ignite/internal/util/typedef/CI2.java       |  2 +-
 .../apache/ignite/internal/util/typedef/CO.java |  2 +-
 .../apache/ignite/internal/util/typedef/P1.java |  2 +-
 .../apache/ignite/internal/util/typedef/P2.java |  2 +-
 .../ignite/internal/util/typedef/PCE.java       |  2 +-
 .../apache/ignite/internal/util/typedef/PE.java |  2 +-
 .../ignite/internal/util/typedef/PKV.java       |  2 +-
 .../apache/ignite/internal/util/typedef/PN.java |  2 +-
 .../apache/ignite/internal/util/typedef/R1.java |  2 +-
 .../apache/ignite/internal/util/typedef/T2.java |  2 +-
 .../apache/ignite/internal/visor/VisorJob.java  |  2 +-
 .../internal/visor/VisorMultiNodeTask.java      |  2 +-
 .../visor/cache/VisorCacheClearTask.java        |  5 +--
 .../visor/cache/VisorCacheCompactTask.java      |  4 +-
 .../cache/VisorCacheDefaultConfiguration.java   |  2 +-
 .../visor/cache/VisorCacheLoadTask.java         |  2 +-
 .../visor/cache/VisorCacheMetadataTask.java     |  2 +-
 .../cache/VisorCacheMetricsCollectorTask.java   |  5 +--
 .../visor/cache/VisorCachePreloadTask.java      |  2 +-
 .../visor/cache/VisorCacheResetMetricsTask.java |  3 +-
 .../visor/cache/VisorCacheSwapBackupsTask.java  |  5 +--
 .../compute/VisorComputeCancelSessionsTask.java |  4 +-
 .../compute/VisorComputeResetMetricsTask.java   |  3 +-
 .../VisorComputeToggleMonitoringTask.java       |  5 +--
 .../visor/debug/VisorThreadDumpTask.java        |  5 +--
 .../event/VisorGridAuthenticationEvent.java     |  2 +-
 .../event/VisorGridAuthorizationEvent.java      |  2 +-
 .../visor/event/VisorGridDeploymentEvent.java   |  2 +-
 .../visor/event/VisorGridDiscoveryEvent.java    |  2 +-
 .../internal/visor/event/VisorGridEvent.java    |  2 +-
 .../visor/event/VisorGridEventsLost.java        |  2 +-
 .../internal/visor/event/VisorGridJobEvent.java |  2 +-
 .../visor/event/VisorGridLicenseEvent.java      |  2 +-
 .../event/VisorGridSecuritySessionEvent.java    |  2 +-
 .../visor/event/VisorGridTaskEvent.java         |  2 +-
 .../internal/visor/file/VisorFileBlockTask.java |  5 +--
 .../visor/file/VisorLatestTextFilesTask.java    |  5 +--
 .../visor/ggfs/VisorGgfsFormatTask.java         |  2 +-
 .../visor/ggfs/VisorGgfsProfilerClearTask.java  |  4 +-
 .../visor/ggfs/VisorGgfsProfilerTask.java       |  2 +-
 .../visor/ggfs/VisorGgfsResetMetricsTask.java   |  2 +-
 .../visor/ggfs/VisorGgfsSamplingStateTask.java  |  4 +-
 .../internal/visor/log/VisorLogSearchTask.java  |  4 +-
 .../internal/visor/misc/VisorAckTask.java       |  3 +-
 .../visor/misc/VisorLatestVersionTask.java      |  2 +-
 .../internal/visor/misc/VisorNopTask.java       |  1 -
 .../visor/misc/VisorResolveHostNameTask.java    |  6 +--
 .../visor/node/VisorGridConfiguration.java      |  2 +-
 .../VisorNodeConfigurationCollectorJob.java     |  2 +-
 .../visor/node/VisorNodeDataCollectorJob.java   |  6 +--
 .../visor/node/VisorNodeDataCollectorTask.java  |  2 +-
 .../node/VisorNodeEventsCollectorTask.java      |  7 ++--
 .../internal/visor/node/VisorNodeGcTask.java    |  5 +--
 .../internal/visor/node/VisorNodePingTask.java  |  2 +-
 .../visor/node/VisorNodeRestartTask.java        |  2 +-
 .../internal/visor/node/VisorNodeStopTask.java  |  2 +-
 .../node/VisorSegmentationConfiguration.java    |  2 +-
 .../visor/node/VisorSpisConfiguration.java      |  2 +-
 .../VisorPortableMetadataCollectorTask.java     |  6 +--
 .../visor/query/VisorQueryCleanupTask.java      |  3 +-
 .../visor/query/VisorQueryNextPageTask.java     |  4 +-
 .../internal/visor/query/VisorQueryTask.java    |  4 +-
 .../streamer/VisorStreamerConfiguration.java    |  2 +-
 .../visor/streamer/VisorStreamerMetrics.java    |  2 +-
 .../streamer/VisorStreamerMetricsResetTask.java |  2 +-
 .../visor/streamer/VisorStreamerResetTask.java  |  2 +-
 .../streamer/VisorStreamerStageMetrics.java     |  2 +-
 .../internal/visor/util/VisorTaskUtils.java     |  6 +--
 .../ignite/jdbc/util/IgniteJdbcUtils.java       |  2 +-
 .../java/org/apache/ignite/lang/IgniteUuid.java |  4 +-
 .../apache/ignite/lifecycle/IgniteListener.java |  1 +
 .../ignite/logger/java/IgniteJavaLogger.java    |  2 +-
 .../managed/ManagedServiceConfiguration.java    |  2 +-
 .../marshaller/IgniteMarshallerExclusions.java  |  2 +-
 .../marshaller/jdk/IgniteJdkMarshaller.java     |  2 +-
 .../IgniteOptimizedClassDescriptor.java         |  2 +-
 .../optimized/IgniteOptimizedClassResolver.java |  2 +-
 .../optimized/IgniteOptimizedMarshaller.java    |  2 +-
 .../IgniteOptimizedObjectInputStream.java       |  2 +-
 .../IgniteOptimizedObjectOutputStream.java      |  2 +-
 .../IgniteOptimizedObjectStreamRegistry.java    |  2 +-
 .../ignite/messaging/MessagingListenActor.java  |  2 +-
 .../org/apache/ignite/plugin/PluginContext.java |  2 +-
 .../security/GridSecurityCredentials.java       |  2 +-
 .../ignite/portables/PortableConfiguration.java |  2 +-
 .../java/org/apache/ignite/spi/IgniteSpi.java   |  1 +
 .../org/apache/ignite/spi/IgniteSpiAdapter.java | 10 ++---
 .../org/apache/ignite/spi/IgniteSpiContext.java |  4 +-
 .../org/apache/ignite/spi/IgniteSpiThread.java  |  1 +
 .../spi/authentication/AuthenticationSpi.java   |  2 +-
 .../noop/NoopAuthenticationSpi.java             |  8 ++--
 .../checkpoint/cache/CacheCheckpointSpi.java    |  6 +--
 .../spi/checkpoint/jdbc/JdbcCheckpointSpi.java  |  5 ++-
 .../spi/checkpoint/noop/NoopCheckpointSpi.java  |  2 +-
 .../sharedfs/SharedFsCheckpointData.java        |  1 +
 .../sharedfs/SharedFsCheckpointSpi.java         |  4 +-
 .../sharedfs/SharedFsTimeoutTask.java           |  3 +-
 .../spi/checkpoint/sharedfs/SharedFsUtils.java  |  3 +-
 .../fifoqueue/FifoQueueCollisionSpi.java        |  2 +-
 .../jobstealing/JobStealingCollisionSpi.java    |  6 +--
 .../spi/collision/noop/NoopCollisionSpi.java    |  2 +-
 .../PriorityQueueCollisionSpi.java              |  4 +-
 .../communication/tcp/TcpCommunicationSpi.java  | 12 +++---
 .../deployment/local/LocalDeploymentSpi.java    |  4 +-
 .../DiscoverySpiNodeAuthenticator.java          |  2 +-
 .../discovery/tcp/TcpClientDiscoverySpi.java    |  4 +-
 .../spi/discovery/tcp/TcpDiscoverySpi.java      | 14 +++----
 .../discovery/tcp/TcpDiscoverySpiAdapter.java   |  6 +--
 .../tcp/internal/TcpDiscoveryNode.java          |  4 +-
 .../tcp/internal/TcpDiscoveryNodesRing.java     |  2 +-
 .../tcp/internal/TcpDiscoveryStatistics.java    |  6 +--
 .../ipfinder/TcpDiscoveryIpFinderAdapter.java   |  2 +-
 .../ipfinder/jdbc/TcpDiscoveryJdbcIpFinder.java |  6 +--
 .../TcpDiscoveryMulticastIpFinder.java          |  6 +--
 .../sharedfs/TcpDiscoverySharedFsIpFinder.java  |  6 +--
 .../tcp/ipfinder/vm/TcpDiscoveryVmIpFinder.java |  6 +--
 .../messages/TcpDiscoveryAbstractMessage.java   |  2 +-
 .../TcpDiscoveryClientReconnectMessage.java     |  2 +-
 .../messages/TcpDiscoveryDiscardMessage.java    |  2 +-
 .../TcpDiscoveryDuplicateIdMessage.java         |  2 +-
 .../TcpDiscoveryJoinRequestMessage.java         |  2 +-
 .../messages/TcpDiscoveryNodeAddedMessage.java  |  4 +-
 .../TcpDiscoveryStatusCheckMessage.java         |  2 +-
 .../memory/MemoryEventStorageSpi.java           |  4 +-
 .../spi/failover/always/AlwaysFailoverSpi.java  |  4 +-
 .../jobstealing/JobStealingFailoverSpi.java     |  4 +-
 .../spi/failover/never/NeverFailoverSpi.java    |  3 +-
 .../spi/indexing/GridIndexingQueryFilter.java   |  1 -
 .../adaptive/AdaptiveLoadBalancingSpi.java      |  6 +--
 .../RoundRobinGlobalLoadBalancer.java           |  2 +-
 .../roundrobin/RoundRobinLoadBalancingSpi.java  |  4 +-
 .../WeightedRandomLoadBalancingSpi.java         |  6 +--
 .../spi/securesession/SecureSessionSpi.java     |  2 +-
 .../noop/NoopSecureSessionSpi.java              |  4 +-
 .../apache/ignite/spi/swapspace/SwapKey.java    |  2 +-
 .../spi/swapspace/file/FileSwapSpaceSpi.java    |  4 +-
 .../spi/swapspace/noop/NoopSwapSpaceSpi.java    |  2 +-
 .../ignite/startup/BasicWarmupClosure.java      |  4 +-
 .../startup/cmdline/CommandLineStartup.java     |  2 +-
 .../ignite/streamer/StreamerConfiguration.java  |  2 +-
 .../index/StreamerIndexProviderAdapter.java     |  2 +-
 .../index/hash/StreamerHashIndexProvider.java   |  2 +-
 .../index/tree/StreamerTreeIndexProvider.java   |  2 +-
 .../router/StreamerAffinityEventRouter.java     |  4 +-
 .../router/StreamerLocalEventRouter.java        |  2 +-
 .../router/StreamerRandomEventRouter.java       |  2 +-
 .../streamer/window/StreamerWindowAdapter.java  |  4 +-
 .../apache/ignite/transactions/IgniteTx.java    |  1 -
 .../ignite/GridSuppressedExceptionSelfTest.java |  1 -
 .../java/org/apache/ignite/GridTestJob.java     |  1 -
 .../apache/ignite/GridTestStoreNodeStartup.java |  1 -
 .../org/apache/ignite/GridTestTaskSession.java  |  1 -
 .../IgniteExternalizableAbstractTest.java       |  1 +
 .../store/GridCacheBalancingStoreSelfTest.java  |  2 +-
 .../GridCacheLoadOnlyStoreAdapterSelfTest.java  |  2 +-
 .../cache/store/GridGeneratingTestStore.java    |  3 +-
 ...CacheJdbcBlobStoreMultithreadedSelfTest.java |  6 +--
 .../fs/GridGgfsEventsAbstractSelfTest.java      |  2 +-
 .../GridGgfsFragmentizerAbstractSelfTest.java   |  2 +-
 .../ignite/internal/ClusterMetricsSelfTest.java |  3 +-
 .../internal/ClusterNodeMetricsSelfTest.java    |  2 +-
 .../ignite/internal/GridAffinityMappedTest.java |  2 +-
 .../internal/GridAffinityP2PSelfTest.java       |  2 +-
 .../ignite/internal/GridAffinitySelfTest.java   |  4 +-
 .../GridAlwaysFailoverSpiFailSelfTest.java      |  2 +-
 .../internal/GridCancelUnusedJobSelfTest.java   |  4 +-
 .../GridCancelledJobsMetricsSelfTest.java       |  4 +-
 .../GridCollisionJobsContextSelfTest.java       |  3 +-
 .../GridContinuousJobAnnotationSelfTest.java    |  2 +-
 .../internal/GridDiscoveryEventSelfTest.java    |  4 +-
 .../ignite/internal/GridDiscoverySelfTest.java  |  8 ++--
 .../GridEventStorageCheckAllEventsSelfTest.java |  5 +--
 ...ventStorageRuntimeConfigurationSelfTest.java |  2 +-
 .../internal/GridEventStorageSelfTest.java      |  3 +-
 .../internal/GridFactoryVmShutdownTest.java     |  2 +-
 .../GridFailoverTaskWithPredicateSelfTest.java  |  1 -
 .../GridJobCollisionCancelSelfTest.java         |  3 +-
 .../GridJobMasterLeaveAwareSelfTest.java        |  8 ++--
 .../internal/GridJobStealingSelfTest.java       |  2 +-
 .../internal/GridJobSubjectIdSelfTest.java      |  3 +-
 .../ignite/internal/GridKernalTestUtils.java    |  2 +-
 .../internal/GridLifecycleAwareSelfTest.java    |  2 +-
 .../internal/GridLifecycleBeanSelfTest.java     |  2 +-
 .../internal/GridListenActorSelfTest.java       |  2 +-
 .../internal/GridManagementJobSelfTest.java     |  2 +-
 .../internal/GridMultipleJobsSelfTest.java      |  2 +-
 .../GridMultithreadedJobStealingSelfTest.java   |  2 +-
 .../ignite/internal/GridNodeLocalSelfTest.java  |  2 +-
 .../internal/GridNonHistoryMetricsSelfTest.java |  2 +-
 .../internal/GridProjectionAbstractTest.java    |  2 +-
 .../GridProjectionForCachesSelfTest.java        |  2 +-
 ...ectionLocalJobMultipleArgumentsSelfTest.java |  2 +-
 .../ignite/internal/GridReduceSelfTest.java     |  2 +-
 .../internal/GridRuntimeExceptionSelfTest.java  |  2 +-
 .../internal/GridSameVmStartupSelfTest.java     |  2 +-
 .../apache/ignite/internal/GridSelfTest.java    |  2 +-
 .../internal/GridSpiExceptionSelfTest.java      |  2 +-
 .../ignite/internal/GridStartStopSelfTest.java  |  2 +-
 .../internal/GridStopWithWaitSelfTest.java      |  2 +-
 .../GridTaskCancelSingleNodeSelfTest.java       |  4 +-
 .../GridTaskExecutionContextSelfTest.java       |  4 +-
 .../GridTaskFutureImplStopGridSelfTest.java     |  2 +-
 .../GridTaskInstanceExecutionSelfTest.java      |  2 +-
 .../internal/GridTaskJobRejectSelfTest.java     |  2 +-
 .../internal/GridTaskListenerSelfTest.java      |  2 +-
 .../internal/GridTaskMapAsyncSelfTest.java      |  2 +-
 .../GridTaskNameAnnotationSelfTest.java         |  3 +-
 .../internal/GridTaskTimeoutSelfTest.java       |  3 +-
 .../GridTopologyBuildVersionSelfTest.java       |  2 +-
 .../ignite/internal/GridVersionSelfTest.java    |  2 +-
 .../internal/IgniteExecutorServiceTest.java     |  4 +-
 ...gniteExplicitImplicitDeploymentSelfTest.java |  2 +-
 .../managers/GridManagerStopSelfTest.java       | 20 +++++-----
 .../GridCheckpointManagerAbstractSelfTest.java  |  8 ++--
 .../checkpoint/GridCheckpointTaskSelfTest.java  |  2 +-
 ...idCommunicationManagerListenersSelfTest.java |  2 +-
 .../GridCommunicationSendMessageSelfTest.java   |  2 +-
 .../communication/GridIoManagerSelfTest.java    |  5 +--
 .../GridDeploymentManagerStopSelfTest.java      |  2 +-
 .../GridDeploymentMessageCountSelfTest.java     |  4 +-
 .../GridDiscoveryManagerAliveCacheSelfTest.java |  4 +-
 .../discovery/GridDiscoveryManagerSelfTest.java |  2 +-
 .../events/GridEventStorageManagerSelfTest.java |  5 +--
 .../GridSwapSpaceCustomLocalValue.java          |  1 +
 .../swapspace/GridSwapSpaceManagerSelfTest.java |  4 +-
 .../GridCacheAbstractFailoverSelfTest.java      |  6 +--
 ...cheAbstractFullApiMultithreadedSelfTest.java |  2 +-
 .../cache/GridCacheAbstractFullApiSelfTest.java | 10 ++---
 .../cache/GridCacheAbstractMetricsSelfTest.java |  2 +-
 .../GridCacheAbstractProjectionSelfTest.java    |  4 +-
 .../GridCacheAbstractRemoveFailureTest.java     |  2 +-
 .../cache/GridCacheAbstractSelfTest.java        |  9 ++---
 .../cache/GridCacheAffinityRoutingSelfTest.java |  6 +--
 .../GridCacheAtomicMessageCountSelfTest.java    |  6 +--
 .../cache/GridCacheBasicApiAbstractTest.java    |  5 +--
 .../cache/GridCacheBasicStoreAbstractTest.java  |  6 +--
 ...acheBasicStoreMultithreadedAbstractTest.java |  1 -
 .../cache/GridCacheClearAllSelfTest.java        |  6 +--
 .../cache/GridCacheConcurrentMapSelfTest.java   |  2 +-
 .../GridCacheConcurrentTxMultiNodeTest.java     | 10 ++---
 ...idCacheConfigurationConsistencySelfTest.java |  8 ++--
 .../GridCacheDaemonNodeAbstractSelfTest.java    |  4 +-
 .../GridCacheDeploymentOffHeapSelfTest.java     |  2 +-
 .../cache/GridCacheDeploymentSelfTest.java      | 14 +++----
 .../cache/GridCacheEntryMemorySizeSelfTest.java |  6 +--
 .../cache/GridCacheEntryVersionSelfTest.java    |  2 +-
 .../GridCacheExAbstractFullApiSelfTest.java     |  6 +--
 .../GridCacheFinishPartitionsSelfTest.java      |  6 +--
 .../cache/GridCacheGenericTestStore.java        |  2 +-
 .../GridCacheGroupLockAbstractSelfTest.java     |  8 ++--
 .../GridCacheGroupLockFailoverSelfTest.java     |  5 +--
 .../cache/GridCacheGroupLockPutTask.java        |  2 +-
 .../cache/GridCacheIncrementTransformTest.java  |  2 +-
 .../GridCacheInterceptorAbstractSelfTest.java   |  2 +-
 .../cache/GridCacheIteratorPerformanceTest.java |  2 +-
 .../cache/GridCacheLifecycleAwareSelfTest.java  |  2 +-
 .../cache/GridCacheLuceneQueryIndexTest.java    |  4 +-
 .../GridCacheMarshallerTxAbstractTest.java      |  2 +-
 .../cache/GridCacheMemoryModeSelfTest.java      |  4 +-
 ...GridCacheMixedPartitionExchangeSelfTest.java |  4 +-
 .../cache/GridCacheMultiUpdateLockSelfTest.java |  8 ++--
 .../cache/GridCacheMvccManagerSelfTest.java     |  2 +-
 .../cache/GridCacheMvccPartitionedSelfTest.java |  2 +-
 .../cache/GridCacheNestedTxAbstractTest.java    |  2 +-
 .../cache/GridCacheObjectToStringSelfTest.java  |  4 +-
 ...CacheOffHeapMultiThreadedUpdateSelfTest.java |  2 +-
 .../cache/GridCacheOffHeapSelfTest.java         |  8 ++--
 .../processors/cache/GridCacheOffHeapTest.java  |  2 +-
 ...heOffHeapTieredEvictionAbstractSelfTest.java |  2 +-
 .../cache/GridCacheOffheapUpdateSelfTest.java   |  2 +-
 .../GridCacheOrderedPreloadingSelfTest.java     |  2 +-
 .../cache/GridCacheP2PUndeploySelfTest.java     |  8 ++--
 .../cache/GridCachePartitionedGetSelfTest.java  |  2 +-
 ...hePartitionedProjectionAffinitySelfTest.java |  4 +-
 .../cache/GridCachePartitionedWritesTest.java   |  3 +-
 .../GridCachePreloadingEvictionsSelfTest.java   |  6 +--
 .../cache/GridCachePutAllFailoverSelfTest.java  |  5 +--
 .../processors/cache/GridCachePutAllTask.java   |  5 +--
 .../GridCacheReferenceCleanupSelfTest.java      |  4 +-
 .../cache/GridCacheReloadSelfTest.java          |  3 +-
 ...ridCacheReplicatedSynchronousCommitTest.java |  4 +-
 .../GridCacheReturnValueTransferSelfTest.java   |  2 +-
 .../cache/GridCacheSlowTxWarnTest.java          |  2 +-
 .../processors/cache/GridCacheStopSelfTest.java |  2 +-
 .../cache/GridCacheStorePutxSelfTest.java       |  3 +-
 .../cache/GridCacheSwapReloadSelfTest.java      |  6 +--
 .../processors/cache/GridCacheTestEntryEx.java  |  4 +-
 .../processors/cache/GridCacheTestKey.java      |  1 +
 .../processors/cache/GridCacheTestStore.java    |  6 +--
 .../processors/cache/GridCacheTestValue.java    |  1 +
 .../processors/cache/GridCacheTestValue2.java   |  1 +
 .../cache/GridCacheTtlManagerSelfTest.java      |  4 +-
 .../GridCacheValueBytesPreloadingSelfTest.java  |  2 +-
 ...idCacheValueConsistencyAbstractSelfTest.java |  2 +-
 .../GridCacheVariableTopologySelfTest.java      |  4 +-
 .../GridCacheWriteBehindStoreAbstractTest.java  |  4 +-
 ...heWriteBehindStoreMultithreadedSelfTest.java |  1 -
 ...BehindStorePartitionedMultiNodeSelfTest.java |  4 +-
 .../IgniteCacheEntryListenerAbstractTest.java   |  1 -
 .../cache/IgniteCacheInvokeAbstractTest.java    | 12 +++---
 .../cache/IgniteCachingProviderSelfTest.java    |  1 -
 .../processors/cache/IgniteTxAbstractTest.java  |  6 +--
 .../IgniteTxConcurrentGetAbstractTest.java      |  2 +-
 .../IgniteTxExceptionAbstractSelfTest.java      |  5 +--
 .../cache/IgniteTxMultiNodeAbstractTest.java    | 12 +++---
 .../IgniteTxMultiThreadedAbstractTest.java      |  2 +-
 .../cache/IgniteTxReentryAbstractSelfTest.java  |  8 ++--
 .../IgniteTxStoreExceptionAbstractSelfTest.java |  5 +--
 ...eAbstractDataStructuresFailoverSelfTest.java |  2 +-
 .../GridCacheAtomicLongApiSelfTest.java         |  2 +-
 ...CacheAtomicReferenceApiSelfAbstractTest.java |  1 -
 ...cheAtomicReferenceMultiNodeAbstractTest.java |  2 +-
 .../GridCacheCountDownLatchSelfTest.java        |  4 +-
 .../GridCacheQueueApiSelfAbstractTest.java      |  2 +-
 ...ridCacheQueueJoinedNodeSelfAbstractTest.java |  4 +-
 ...GridCacheQueueMultiNodeAbstractSelfTest.java |  6 +--
 ...CacheQueueRotativeMultiNodeAbstractTest.java |  6 +--
 .../GridCacheSequenceApiSelfAbstractTest.java   |  4 +-
 ...dCacheSequenceMultiNodeAbstractSelfTest.java |  4 +-
 .../GridCacheSetFailoverAbstractSelfTest.java   |  2 +-
 ...titionedAtomicSequenceMultiThreadedTest.java |  4 +-
 ...achePartitionedAtomicStampedApiSelfTest.java |  2 +-
 ...idCachePartitionedNodeRestartTxSelfTest.java |  6 +--
 .../GridCachePartitionedQueueApiSelfTest.java   |  2 +-
 ...PartitionedQueueCreateMultiNodeSelfTest.java |  4 +-
 ...dCachePartitionedQueueEntryMoveSelfTest.java |  4 +-
 ...CachePartitionedQueueJoinedNodeSelfTest.java |  2 +-
 ...dCachePartitionedQueueMultiNodeSelfTest.java |  2 +-
 ...GridCachePartitionedSequenceApiSelfTest.java |  2 +-
 ...chePartitionedSequenceMultiNodeSelfTest.java |  2 +-
 ...tractDistributedByteArrayValuesSelfTest.java |  2 +-
 .../GridCacheAbstractJobExecutionTest.java      |  5 +--
 .../GridCacheAbstractNodeRestartSelfTest.java   |  2 +-
 .../GridCacheAbstractPrimarySyncSelfTest.java   |  4 +-
 .../GridCacheAtomicTimeoutSelfTest.java         |  6 +--
 .../GridCacheBasicOpAbstractTest.java           |  6 +--
 .../GridCacheClientModesAbstractSelfTest.java   |  2 +-
 .../GridCacheEntrySetAbstractSelfTest.java      |  4 +-
 .../distributed/GridCacheEventAbstractTest.java |  4 +-
 .../GridCacheMultiNodeAbstractTest.java         |  6 +--
 ...dCacheMultithreadedFailoverAbstractTest.java |  8 ++--
 .../GridCacheNodeFailureAbstractTest.java       |  8 ++--
 ...dCachePartitionedAffinityFilterSelfTest.java |  4 +-
 ...chePartitionedReloadAllAbstractSelfTest.java |  5 +--
 .../GridCachePreloadEventsAbstractSelfTest.java |  8 ++--
 .../GridCachePreloadLifecycleAbstractTest.java  |  6 +--
 ...GridCachePreloadRestartAbstractSelfTest.java |  6 +--
 .../GridCacheTransformEventSelfTest.java        | 10 ++---
 ...iteTxConsistencyRestartAbstractSelfTest.java |  6 +--
 ...xOriginatingNodeFailureAbstractSelfTest.java | 10 ++---
 ...cOriginatingNodeFailureAbstractSelfTest.java | 14 +++----
 .../IgniteTxPreloadAbstractTest.java            |  4 +-
 .../IgniteTxTimeoutAbstractTest.java            |  2 +-
 ...heAbstractTransformWriteThroughSelfTest.java |  4 +-
 ...acheAtomicExpiredEntriesPreloadSelfTest.java |  2 +-
 .../dht/GridCacheColocatedFailoverSelfTest.java |  2 +-
 ...eColocatedOptimisticTransactionSelfTest.java | 10 ++---
 .../GridCacheColocatedTxExceptionSelfTest.java  |  2 +-
 ...ssimisticOriginatingNodeFailureSelfTest.java |  2 +-
 ...dCacheColocatedTxSingleThreadedSelfTest.java |  2 +-
 .../GridCacheDhtAtomicRemoveFailureTest.java    |  2 +-
 .../dht/GridCacheDhtEntrySelfTest.java          |  8 ++--
 .../dht/GridCacheDhtEntrySetSelfTest.java       |  2 +-
 ...GridCacheDhtEvictionNearReadersSelfTest.java |  6 +--
 .../dht/GridCacheDhtEvictionSelfTest.java       |  6 +--
 ...idCacheDhtExpiredEntriesPreloadSelfTest.java |  2 +-
 .../dht/GridCacheDhtInternalEntrySelfTest.java  |  6 +--
 .../dht/GridCacheDhtMappingSelfTest.java        |  2 +-
 .../dht/GridCacheDhtMultiBackupTest.java        |  2 +-
 .../dht/GridCacheDhtPreloadBigDataSelfTest.java |  2 +-
 .../dht/GridCacheDhtPreloadDelayedSelfTest.java |  8 ++--
 .../GridCacheDhtPreloadDisabledSelfTest.java    | 10 ++---
 .../GridCacheDhtPreloadMessageCountTest.java    |  6 +--
 ...ridCacheDhtPreloadMultiThreadedSelfTest.java |  2 +-
 .../dht/GridCacheDhtPreloadSelfTest.java        | 11 +++---
 .../GridCacheDhtPreloadStartStopSelfTest.java   |  2 +-
 .../dht/GridCacheDhtPreloadUnloadSelfTest.java  |  2 +-
 .../dht/GridCacheDhtRemoveFailureTest.java      |  2 +-
 .../dht/GridCacheDhtTxPreloadSelfTest.java      |  2 +-
 ...cheGroupLockPartitionedAbstractSelfTest.java |  2 +-
 ...ockPartitionedMultiNodeAbstractSelfTest.java |  2 +-
 ...dCachePartitionedTopologyChangeSelfTest.java |  8 ++--
 ...ridCachePartitionedUnloadEventsSelfTest.java |  2 +-
 ...eAtomicInvalidPartitionHandlingSelfTest.java |  6 +--
 .../atomic/GridCacheAtomicPreloadSelfTest.java  |  4 +-
 ...unctionExcludeNeighborsAbstractSelfTest.java |  2 +-
 ...tomicClientOnlyMultiNodeFullApiSelfTest.java |  2 +-
 .../near/GridCacheExNearFullApiSelfTest.java    |  2 +-
 .../near/GridCacheGetStoreErrorSelfTest.java    |  2 +-
 .../near/GridCacheNearEvictionSelfTest.java     |  2 +-
 ...dCacheNearExpiredEntriesPreloadSelfTest.java |  2 +-
 .../near/GridCacheNearMultiGetSelfTest.java     |  8 ++--
 .../near/GridCacheNearMultiNodeSelfTest.java    |  9 ++---
 .../near/GridCacheNearOneNodeSelfTest.java      |  3 +-
 ...idCacheNearOnlyMultiNodeFullApiSelfTest.java |  4 +-
 .../near/GridCacheNearOnlyTopologySelfTest.java |  4 +-
 .../GridCacheNearPartitionedClearSelfTest.java  |  4 +-
 .../GridCacheNearReaderPreloadSelfTest.java     |  2 +-
 .../near/GridCacheNearReadersSelfTest.java      |  2 +-
 .../near/GridCacheNearRemoveFailureTest.java    |  2 +-
 .../near/GridCacheNearTxMultiNodeSelfTest.java  | 10 ++---
 ...ssimisticOriginatingNodeFailureSelfTest.java |  2 +-
 .../near/GridCacheNearTxPreloadSelfTest.java    |  2 +-
 .../GridCachePartitionedAffinitySelfTest.java   | 10 ++---
 .../near/GridCachePartitionedBasicApiTest.java  |  2 +-
 ...ePartitionedBasicStoreMultiNodeSelfTest.java |  8 ++--
 ...ionedClientOnlyNoPrimaryFullApiSelfTest.java |  2 +-
 .../near/GridCachePartitionedEventSelfTest.java |  2 +-
 .../GridCachePartitionedEvictionSelfTest.java   |  8 ++--
 ...titionedExplicitLockNodeFailureSelfTest.java |  7 ++--
 ...GridCachePartitionedFilteredPutSelfTest.java |  6 +--
 .../near/GridCachePartitionedFlagsTest.java     |  4 +-
 .../GridCachePartitionedLoadCacheSelfTest.java  |  3 +-
 .../near/GridCachePartitionedLockSelfTest.java  |  2 +-
 ...achePartitionedMultiNodeCounterSelfTest.java | 10 ++---
 ...achePartitionedMultiNodeFullApiSelfTest.java |  6 +--
 .../GridCachePartitionedMultiNodeSelfTest.java  |  2 +-
 ...ePartitionedMultiThreadedPutGetSelfTest.java |  4 +-
 .../near/GridCachePartitionedNestedTxTest.java  |  3 +-
 ...GridCachePartitionedNodeFailureSelfTest.java |  2 +-
 .../GridCachePartitionedNodeRestartTest.java    |  4 +-
 ...ePartitionedOptimisticTxNodeRestartTest.java |  2 +-
 ...achePartitionedPreloadLifecycleSelfTest.java |  2 +-
 .../GridCachePartitionedProjectionSelfTest.java |  2 +-
 ...hePartitionedQueryMultiThreadedSelfTest.java |  6 +--
 .../GridCachePartitionedStorePutSelfTest.java   |  3 +-
 ...CachePartitionedTxMultiThreadedSelfTest.java |  2 +-
 .../GridCachePartitionedTxSalvageSelfTest.java  |  6 +--
 ...achePartitionedTxSingleThreadedSelfTest.java |  2 +-
 .../near/GridCachePutArrayValueSelfTest.java    |  2 +-
 .../near/GridPartitionedBackupLoadSelfTest.java |  1 -
 .../GridCacheReplicatedEvictionSelfTest.java    |  3 +-
 .../GridCacheReplicatedFlagsTest.java           |  4 +-
 ...ReplicatedFullApiMultithreadedSelfTest1.java |  2 +-
 .../GridCacheReplicatedFullApiSelfTest.java     |  2 +-
 .../GridCacheReplicatedInvalidateSelfTest.java  | 10 ++---
 ...ridCacheReplicatedPreloadEventsSelfTest.java |  2 +-
 ...dCacheReplicatedTxMultiThreadedSelfTest.java |  2 +-
 ...ssimisticOriginatingNodeFailureSelfTest.java |  2 +-
 .../GridCacheReplicatedTxReadTest.java          |  4 +-
 ...CacheReplicatedTxSingleThreadedSelfTest.java |  2 +-
 ...idCacheReplicatedUnswapAdvancedSelfTest.java |  2 +-
 .../GridCacheSyncReplicatedPreloadSelfTest.java |  2 +-
 ...CacheReplicatedPreloadLifecycleSelfTest.java |  4 +-
 .../GridCacheReplicatedPreloadSelfTest.java     |  6 +--
 .../GridCacheBatchEvictUnswapSelfTest.java      |  1 -
 ...heConcurrentEvictionConsistencySelfTest.java |  8 ++--
 .../GridCacheConcurrentEvictionsSelfTest.java   |  4 +-
 .../GridCacheDistributedEvictionsSelfTest.java  |  4 +-
 .../GridCacheEmptyEntriesAbstractSelfTest.java  | 18 ++++-----
 .../eviction/GridCacheEvictionAbstractTest.java | 10 ++---
 .../GridCacheEvictionFilterSelfTest.java        |  4 +-
 .../GridCacheEvictionLockUnlockSelfTest.java    |  4 +-
 .../GridCacheEvictionTouchSelfTest.java         |  6 +--
 .../cache/eviction/GridCacheMockEntry.java      |  2 +-
 .../IgniteCacheExpiryPolicyAbstractTest.java    |  6 +--
 .../IgniteCacheLoadAllAbstractTest.java         |  2 +-
 .../IgniteCacheNoReadThroughAbstractTest.java   |  2 +-
 .../IgniteCacheNoWriteThroughAbstractTest.java  |  1 -
 .../IgniteCacheStoreSessionAbstractTest.java    |  2 +-
 .../IgniteCacheTxStoreSessionTest.java          |  6 +--
 .../GridCacheLocalByteArrayValuesSelfTest.java  |  4 +-
 .../local/GridCacheLocalFullApiSelfTest.java    |  2 +-
 .../local/GridCacheLocalLoadAllSelfTest.java    |  2 +-
 .../GridCacheLocalTxExceptionSelfTest.java      |  2 +-
 .../local/GridCacheLocalTxTimeoutSelfTest.java  |  2 +-
 ...ridCacheContinuousQueryAbstractSelfTest.java |  7 ++--
 ...eContinuousQueryPartitionedOnlySelfTest.java |  2 +-
 ...dCacheAbstractReduceFieldsQuerySelfTest.java |  2 +-
 .../clock/GridTimeSyncProcessorSelfTest.java    |  2 +-
 .../closure/GridClosureProcessorRemoteTest.java |  3 +-
 .../closure/GridClosureProcessorSelfTest.java   |  3 +-
 .../continuous/GridEventConsumeSelfTest.java    |  5 +--
 .../continuous/GridMessageListenSelfTest.java   |  2 +-
 .../dataload/GridDataLoaderImplSelfTest.java    |  4 +-
 .../dataload/GridDataLoaderPerformanceTest.java |  6 +--
 .../GridDataLoaderProcessorSelfTest.java        |  3 +-
 ...heGgfsPerBlockLruEvictionPolicySelfTest.java |  4 +-
 .../processors/fs/GridGgfsAbstractSelfTest.java |  8 ++--
 .../fs/GridGgfsDataManagerSelfTest.java         |  6 +--
 .../processors/fs/GridGgfsFileInfoSelfTest.java |  2 +-
 .../processors/fs/GridGgfsFileMapSelfTest.java  |  2 +-
 ...GgfsGroupDataBlockKeyMapperHashSelfTest.java |  2 +-
 .../fs/GridGgfsMetaManagerSelfTest.java         |  2 +-
 .../processors/fs/GridGgfsMetricsSelfTest.java  |  4 +-
 .../processors/fs/GridGgfsModesSelfTest.java    |  6 +--
 .../GridGgfsPrimaryOffheapTieredSelfTest.java   |  2 +-
 .../GridGgfsPrimaryOffheapValuesSelfTest.java   |  2 +-
 .../fs/GridGgfsProcessorSelfTest.java           |  4 +-
 .../fs/GridGgfsProcessorValidationSelfTest.java |  4 +-
 ...IpcEndpointRegistrationAbstractSelfTest.java |  8 ++--
 .../processors/fs/GridGgfsSizeSelfTest.java     |  8 ++--
 .../processors/fs/GridGgfsStreamsSelfTest.java  |  4 +-
 .../processors/fs/GridGgfsTaskSelfTest.java     |  5 +--
 .../GridGgfsAbstractRecordResolverSelfTest.java |  2 +-
 .../cache/GridCacheCommandHandlerSelfTest.java  |  4 +-
 .../GridServiceProcessorAbstractSelfTest.java   |  5 +--
 ...ServiceProcessorMultiNodeConfigSelfTest.java |  2 +-
 .../GridServiceProcessorProxySelfTest.java      |  2 +-
 .../streamer/GridStreamerEvictionSelfTest.java  |  2 +-
 .../streamer/GridStreamerFailoverSelfTest.java  |  8 ++--
 .../GridStreamerLifecycleAwareSelfTest.java     |  2 +-
 .../streamer/GridStreamerSelfTest.java          | 10 ++---
 .../processors/streamer/GridTestStage.java      |  1 -
 .../ignite/internal/processors/streamer/SC.java |  2 +-
 .../product/GridProductVersionSelfTest.java     |  2 +-
 ...artupWithSpecifiedWorkDirectorySelfTest.java |  4 +-
 ...tartupWithUndefinedGridGainHomeSelfTest.java |  4 +-
 .../internal/util/IgniteUtilsSelfTest.java      | 34 ++++++++---------
 .../util/future/GridEmbeddedFutureSelfTest.java |  2 +-
 .../util/future/GridFinishedFutureSelfTest.java |  2 +-
 .../ipc/shmem/GgfsSharedMemoryTestClient.java   |  4 +-
 .../ipc/shmem/IpcSharedMemoryFakeClient.java    |  2 +-
 .../ipc/shmem/IpcSharedMemoryNodeStartup.java   |  6 +--
 .../LoadWithCorruptedLibFileTestRunner.java     |  4 +-
 .../IpcSharedMemoryBenchmarkWriter.java         |  2 +-
 .../offheap/GridOffHeapMapAbstractSelfTest.java |  2 +-
 ...idOffHeapPartitionedMapAbstractSelfTest.java |  2 +-
 .../unsafe/GridUnsafeMemorySelfTest.java        |  6 +--
 .../ignite/jvmtest/ConcurrentMapTest.java       |  2 +-
 .../ignite/jvmtest/MultipleFileIOTest.java      |  2 +-
 .../ignite/lang/GridByteArrayListSelfTest.java  |  1 +
 .../ignite/lang/GridFuncPerformanceTest.java    |  3 +-
 .../apache/ignite/lang/GridFuncSelfTest.java    |  8 ++--
 .../lang/GridMetadataAwareAdapterSelfTest.java  |  2 +-
 .../GridConcurrentWeakHashSetSelfTest.java      |  1 +
 .../ignite/lang/utils/GridTrieMapSelfTest.java  |  4 +-
 .../loadtest/GridSingleExecutionTest.java       |  6 +--
 ...idFileSwapSpaceSpiMultithreadedLoadTest.java |  4 +-
 .../loadtests/GridCacheLoadPopulationTask.java  |  2 +-
 .../loadtests/GridCacheMultiNodeLoadTest.java   |  2 +-
 .../cache/GridCacheAbstractLoadTest.java        |  6 +--
 ...ridCacheAffinityTransactionsOffHeapTest.java |  4 +-
 .../cache/GridCacheGroupLockComparisonTest.java |  6 +--
 .../cache/GridCachePutRemoveLoadTest.java       |  4 +-
 .../cache/GridCacheSingleNodeLoadTest.java      |  8 ++--
 .../loadtests/cache/GridCacheSwapLoadTest.java  |  2 +-
 .../GridCacheWriteBehindStoreLoadTest.java      |  3 +-
 .../colocation/GridTestCacheStore.java          |  1 -
 .../colocation/GridTestLifecycleBean.java       |  1 -
 .../loadtests/colocation/GridTestMain.java      |  3 +-
 .../communication/GridIoManagerBenchmark.java   |  2 +-
 .../communication/GridIoManagerBenchmark0.java  |  8 ++--
 .../communication/GridTestMessage.java          |  2 +-
 .../GridCachePartitionedAtomicLongLoadTest.java |  6 +--
 .../multisplit/GridMultiSplitsLoadTest.java     |  2 +-
 .../GridMultiSplitsRedeployLoadTest.java        |  2 +-
 .../GridSingleSplitNewNodesTestTask.java        |  1 -
 ...ridSingleSplitsNewNodesAbstractLoadTest.java |  4 +-
 .../GridSingleSplitsRedeployLoadTest.java       |  2 +-
 .../direct/session/GridSessionLoadTest.java     |  2 +-
 .../stealing/GridStealingLoadTestTask.java      |  1 -
 .../ignite/loadtests/dsi/GridDsiClient.java     |  2 +-
 .../ignite/loadtests/dsi/GridDsiPerfJob.java    |  6 +--
 .../loadtests/dsi/GridDsiRequestTask.java       |  1 -
 .../loadtests/dsi/GridDsiResponseTask.java      |  1 -
 ...dBoundedConcurrentLinkedHashSetLoadTest.java |  4 +-
 ...GridJobExecutionLoadTestClientSemaphore.java |  3 +-
 .../job/GridJobExecutionLoadTestJob.java        |  1 -
 .../job/GridJobExecutionLoadTestTask.java       |  1 -
 .../job/GridJobExecutionSingleNodeLoadTest.java |  1 -
 ...JobExecutionSingleNodeSemaphoreLoadTest.java |  2 +-
 .../loadtests/job/GridJobLoadTestSubmitter.java |  1 -
 .../loadtests/job/GridJobLoadTestTask.java      |  1 -
 .../mapper/GridContinuousMapperTask1.java       |  2 +-
 .../mapper/GridContinuousMapperTask2.java       |  2 +-
 .../mergesort/GridMergeSortLoadTask.java        |  3 +-
 .../mergesort/GridMergeSortLoadTest.java        |  2 +-
 .../loadtests/nio/GridNioBenchmarkTest.java     |  2 +-
 .../GridOffHeapMapPerformanceAbstractTest.java  |  2 +-
 ...apPartitionedMapPerformanceAbstractTest.java |  2 +-
 .../ignite/loadtests/streamer/EventClosure.java |  2 +-
 .../streamer/GridStreamerBenchmark.java         |  2 +-
 .../streamer/GridStreamerIndexLoadTest.java     |  4 +-
 .../ignite/loadtests/streamer/QueryClosure.java |  2 +-
 .../loadtests/streamer/average/TestStage.java   |  3 +-
 .../swap/GridSwapEvictAllBenchmark.java         |  5 +--
 .../ignite/logger/java/GridJavaLoggerTest.java  |  2 +-
 .../marshaller/GridMarshallerAbstractTest.java  | 14 +++----
 .../GridMarshallerExternalizableBean.java       |  1 +
 .../GridMarshallerPerformanceTest.java          |  4 +-
 .../marshaller/GridMarshallerResourceBean.java  |  2 +-
 .../GridOptimizedMarshallerSelfTest.java        |  2 +-
 .../optimized/GridOptimizedMarshallerTest.java  |  2 +-
 .../GridOptimizedObjectStreamSelfTest.java      |  2 +-
 .../GridTestTcpDiscoveryIpFinderAdapter.java    |  8 ++--
 .../ignite/messaging/GridMessagingSelfTest.java |  4 +-
 .../ignite/p2p/GridP2PClassLoadingSelfTest.java |  4 +-
 .../GridP2PContinuousDeploymentSelfTest.java    |  2 +-
 .../GridP2PDifferentClassLoaderSelfTest.java    |  1 +
 .../ignite/p2p/GridP2PNodeLeftSelfTest.java     |  1 +
 .../ignite/p2p/GridSwapSpaceCustomKey.java      |  1 +
 .../ignite/p2p/GridSwapSpaceCustomValue.java    |  1 +
 ...SessionCancelSiblingsFromFutureSelfTest.java |  2 +-
 ...ridSessionCancelSiblingsFromJobSelfTest.java |  2 +-
 ...idSessionCancelSiblingsFromTaskSelfTest.java |  2 +-
 .../GridSessionCheckpointAbstractSelfTest.java  |  2 +-
 .../GridSessionCollisionSpiSelfTest.java        |  2 +-
 ...idSessionFutureWaitJobAttributeSelfTest.java |  2 +-
 ...dSessionFutureWaitTaskAttributeSelfTest.java |  2 +-
 ...GridSessionJobWaitTaskAttributeSelfTest.java |  2 +-
 .../ignite/session/GridSessionLoadSelfTest.java |  2 +-
 .../GridSessionSetFutureAttributeSelfTest.java  |  2 +-
 ...nSetFutureAttributeWaitListenerSelfTest.java |  2 +-
 .../GridSessionSetJobAttributeSelfTest.java     |  2 +-
 ...sionSetJobAttributeWaitListenerSelfTest.java |  2 +-
 .../GridSessionSetTaskAttributeSelfTest.java    |  2 +-
 ...GridSessionTaskWaitJobAttributeSelfTest.java |  2 +-
 .../GridSessionWaitAttributeSelfTest.java       |  2 +-
 .../spi/GridSpiLocalHostInjectionTest.java      |  2 +-
 .../spi/GridSpiStartStopAbstractTest.java       |  1 -
 .../spi/GridTcpSpiForwardingSelfTest.java       |  4 +-
 .../cache/GridCacheCheckpointSpiSelfTest.java   |  4 +-
 .../GridJdbcCheckpointSpiConfigSelfTest.java    |  1 +
 ...GridSharedFsCheckpointSpiConfigSelfTest.java |  1 +
 ...heckpointSpiMultipleDirectoriesSelfTest.java |  2 +-
 .../GridSharedFsCheckpointSpiSelfTest.java      |  5 ++-
 .../collision/GridTestCollisionTaskSession.java |  2 -
 .../GridFifoQueueCollisionSpiSelfTest.java      |  2 +-
 ...bStealingCollisionSpiAttributesSelfTest.java |  4 +-
 ...alingCollisionSpiCustomTopologySelfTest.java |  2 +-
 .../GridJobStealingCollisionSpiSelfTest.java    |  4 +-
 ...obStealingCollisionSpiStartStopSelfTest.java |  3 +-
 .../GridAbstractCommunicationSelfTest.java      |  2 +-
 .../tcp/GridCacheDhtLockBackupSelfTest.java     |  8 ++--
 .../GridTcpCommunicationSpiAbstractTest.java    |  4 +-
 ...mmunicationSpiConcurrentConnectSelfTest.java |  6 +--
 .../tcp/GridTcpCommunicationSpiLanTest.java     |  4 +-
 ...cpCommunicationSpiMultithreadedSelfTest.java |  4 +-
 ...dTcpCommunicationSpiRecoveryAckSelfTest.java |  6 +--
 ...GridTcpCommunicationSpiRecoverySelfTest.java |  8 ++--
 .../local/GridLocalDeploymentSpiSelfTest.java   |  1 -
 .../GridAbstractDiscoverySelfTest.java          |  6 +--
 .../tcp/GridTcpClientDiscoverySelfTest.java     |  4 +-
 .../tcp/GridTcpDiscoveryMultiThreadedTest.java  |  2 +-
 .../discovery/tcp/GridTcpDiscoverySelfTest.java |  6 +--
 .../GridTcpDiscoverySnapshotHistoryTest.java    |  2 +-
 ...ridTcpDiscoveryIpFinderAbstractSelfTest.java |  2 +-
 ...MemoryEventStorageMultiThreadedSelfTest.java |  1 +
 .../GridMemoryEventStorageSpiSelfTest.java      |  2 +-
 .../spi/failover/GridFailoverTestContext.java   |  1 -
 ...idJobStealingFailoverSpiOneNodeSelfTest.java |  2 +-
 .../GridJobStealingFailoverSpiSelfTest.java     |  2 +-
 ...JobStealingFailoverSpiStartStopSelfTest.java |  1 +
 .../never/GridNeverFailoverSpiSelfTest.java     |  1 +
 ...iveLoadBalancingSpiMultipleNodeSelfTest.java |  1 +
 ...dRobinLoadBalancingSpiLocalNodeSelfTest.java |  1 +
 ...dWeightedRandomLoadBalancingSpiSelfTest.java |  1 +
 ...dRandomLoadBalancingSpiWeightedSelfTest.java |  3 +-
 .../GridSwapSpaceSpiAbstractSelfTest.java       |  4 +-
 .../file/GridFileSwapCompactionSelfTest.java    |  4 +-
 .../file/GridFileSwapSpaceSpiSelfTest.java      |  4 +-
 .../inmemory/GridTestSwapSpaceSpi.java          |  2 +-
 .../startup/GridRandomCommandLineLoader.java    |  6 +--
 .../ignite/startup/GridVmNodesStarter.java      |  4 +-
 .../cmdline/GridCommandLineLoaderTest.java      |  3 +-
 .../startup/servlet/GridServletLoaderTest.java  |  1 +
 .../GridCacheStoreValueBytesNode.java           |  4 +-
 .../GridCacheStoreValueBytesTest.java           |  2 +-
 .../index/GridStreamerIndexSelfTest.java        |  4 +-
 .../window/GridStreamerWindowSelfTest.java      |  2 +-
 .../testframework/GridSpiTestContext.java       |  8 ++--
 .../ignite/testframework/GridTestNode.java      |  2 +-
 .../ignite/testframework/GridTestUtils.java     |  6 +--
 .../config/GridTestProperties.java              |  2 +-
 .../testframework/junits/GridAbstractTest.java  | 10 ++---
 .../testframework/junits/GridTestIgnite.java    |  4 +-
 .../testframework/junits/GridTestResources.java |  6 +--
 .../cache/GridAbstractCacheStoreSelfTest.java   |  5 +--
 .../junits/cache/TestCacheSession.java          |  2 +-
 .../junits/common/GridCommonAbstractTest.java   |  4 +-
 .../logger/GridLog4jRollingFileAppender.java    |  2 +-
 .../junits/logger/GridTestLog4jLogger.java      |  6 +--
 .../junits/spi/GridSpiAbstractTest.java         |  6 +--
 .../ignite/testsuites/IgniteBasicTestSuite.java |  6 +--
 .../ignite/testsuites/IgniteCacheTestSuite.java |  8 ++--
 .../ignite/testsuites/IgniteFsTestSuite.java    |  4 +-
 .../testsuites/IgniteKernalSelfTestSuite.java   |  2 +-
 .../testsuites/IgniteLangSelfTestSuite.java     |  4 +-
 .../IgniteMarshallerSelfTestSuite.java          |  4 +-
 .../testsuites/IgniteUtilSelfTestSuite.java     | 10 ++---
 ...dConcurrentLinkedDequeMultiThreadedTest.java |  2 +-
 .../util/GridTopologyHeapSizeSelfTest.java      |  4 +-
 .../apache/ignite/util/GridTransientTest.java   |  1 +
 .../ignite/util/mbeans/GridMBeanSelfTest.java   |  1 +
 .../tests/p2p/CacheDeploymentTestTask1.java     |  3 +-
 .../tests/p2p/CacheDeploymentTestTask2.java     |  2 +-
 .../tests/p2p/CacheDeploymentTestTask3.java     |  2 +-
 .../ignite/tests/p2p/ExcludeNodeFilter.java     |  2 +-
 .../p2p/GridP2PContinuousDeploymentTask1.java   |  2 +-
 .../p2p/GridP2PContinuousDeploymentTask2.java   |  1 -
 .../tests/p2p/GridTestMessageListener.java      |  2 +-
 .../ignite/tests/p2p/JobStealingTask.java       |  2 +-
 .../tests/p2p/P2PTestTaskExternalPath1.java     |  2 +-
 .../tests/p2p/P2PTestTaskExternalPath2.java     |  2 +-
 .../ignite/tests/p2p/SingleSplitTestTask.java   |  1 -
 .../GridUriDeploymentAbstractTestTask.java      |  1 -
 .../uri/tasks/GridUriDeploymentDependency1.java |  1 +
 .../uri/tasks/GridUriDeploymentDependency2.java |  1 +
 .../tasks/GridUriDeploymentInnerTestTask.java   |  1 -
 .../GridUriDeploymentNonePublicTestTask.java    |  1 -
 .../uri/tasks/GridUriDeploymentTestTask0.java   |  1 -
 .../uri/tasks/GridUriDeploymentTestTask1.java   |  1 -
 .../uri/tasks/GridUriDeploymentTestTask2.java   |  2 +-
 .../uri/tasks/GridUriDeploymentTestTask3.java   |  1 -
 .../uri/tasks/GridUriDeploymentTestTask4.java   |  1 -
 .../uri/tasks/GridUriDeploymentTestTask5.java   |  1 -
 .../uri/tasks/GridUriDeploymentTestTask6.java   |  1 -
 .../GridUriDeploymentTestWithNameTask0.java     |  1 -
 .../GridUriDeploymentTestWithNameTask3.java     |  1 -
 .../GridUriDeploymentTestWithNameTask4.java     |  1 -
 .../GridUriDeploymentTestWithNameTask5.java     |  1 -
 .../GridUriDeploymentTestWithNameTask6.java     |  1 -
 .../GridUriDeploymentTestWithNameTask7.java     |  1 -
 .../client/hadoop/GridHadoopClientProtocol.java |  1 +
 .../GridHadoopClientProtocolProvider.java       |  2 +-
 .../fs/hadoop/v1/GridGgfsHadoopFileSystem.java  |  2 +-
 .../fs/hadoop/v2/GridGgfsHadoopFileSystem.java  |  2 +-
 .../fs/hadoop/GridGgfsHadoopEndpoint.java       |  2 +-
 .../hadoop/GridGgfsHadoopFileSystemWrapper.java | 10 ++---
 .../internal/fs/hadoop/GridGgfsHadoopIpcIo.java |  2 +-
 .../fs/hadoop/GridGgfsHadoopReader.java         |  1 +
 .../processors/hadoop/GridHadoopImpl.java       |  2 +-
 .../processors/hadoop/GridHadoopUtils.java      |  5 ++-
 .../hadoop/IgniteHadoopProcessor.java           |  2 +-
 .../counter/GridHadoopFSCounterWriter.java      |  1 +
 .../hadoop/counter/GridHadoopLongCounter.java   |  1 +
 .../hadoop/jobtracker/GridHadoopJobTracker.java |  8 ++--
 .../GridHadoopDefaultMapReducePlanner.java      |  6 +--
 .../proto/GridHadoopProtocolJobStatusTask.java  |  4 +-
 .../proto/GridHadoopProtocolTaskAdapter.java    |  4 +-
 .../hadoop/shuffle/GridHadoopShuffle.java       |  4 +-
 .../hadoop/shuffle/GridHadoopShuffleJob.java    |  6 +--
 .../collections/GridHadoopMultimapBase.java     |  2 +-
 .../GridHadoopEmbeddedTaskExecutor.java         |  2 +-
 .../taskexecutor/GridHadoopExecutorService.java |  4 +-
 .../GridHadoopExternalTaskExecutor.java         |  8 ++--
 .../child/GridHadoopChildProcessRunner.java     |  2 +-
 .../child/GridHadoopExternalProcessStarter.java |  6 +--
 .../GridHadoopExternalCommunication.java        |  6 +--
 .../GridHadoopMarshallerFilter.java             |  2 +-
 .../hadoop/v1/GridHadoopV1OutputCollector.java  |  3 --
 .../processors/hadoop/v1/GridHadoopV1Task.java  |  3 +-
 .../v2/GridHadoopSerializationWrapper.java      |  4 +-
 .../hadoop/v2/GridHadoopSplitWrapper.java       |  2 +-
 .../hadoop/v2/GridHadoopV2CleanupTask.java      |  6 ++-
 .../processors/hadoop/v2/GridHadoopV2Job.java   |  2 +-
 .../v2/GridHadoopV2JobResourceManager.java      |  7 ++--
 .../hadoop/v2/GridHadoopV2MapTask.java          | 12 ++++--
 .../hadoop/v2/GridHadoopV2ReduceTask.java       |  5 ++-
 .../hadoop/v2/GridHadoopV2SetupTask.java        |  5 ++-
 .../apache/ignite/fs/GridFileSystemLoad.java    |  3 +-
 ...dGgfsHadoop20FileSystemAbstractSelfTest.java |  6 +--
 .../fs/GridGgfsHadoopDualAbstractSelfTest.java  |  9 +++--
 ...ridGgfsHadoopFileSystemAbstractSelfTest.java | 10 ++---
 .../GridGgfsHadoopFileSystemClientSelfTest.java |  6 +--
 ...idGgfsHadoopFileSystemHandshakeSelfTest.java |  2 +-
 ...ridGgfsHadoopFileSystemIpcCacheSelfTest.java |  8 ++--
 .../GridGgfsHadoopFileSystemLoggerSelfTest.java |  1 -
 ...GgfsHadoopFileSystemLoggerStateSelfTest.java |  8 ++--
 ...fsHadoopFileSystemSecondaryModeSelfTest.java |  8 ++--
 .../fs/GridGgfsNearOnlyMultiNodeSelfTest.java   |  6 +--
 .../ignite/fs/IgniteFsEventsTestSuite.java      |  2 +-
 .../hadoop/GridHadoopAbstractWordCountTest.java |  2 +-
 .../hadoop/GridHadoopClassLoaderTest.java       |  6 +--
 .../hadoop/GridHadoopCommandLineTest.java       |  2 +-
 ...idHadoopDefaultMapReducePlannerSelfTest.java |  4 +-
 .../hadoop/GridHadoopFileSystemsTest.java       |  5 ++-
 .../hadoop/GridHadoopJobTrackerSelfTest.java    |  6 +--
 .../GridHadoopMapReduceEmbeddedSelfTest.java    |  2 +-
 .../hadoop/GridHadoopMapReduceTest.java         |  2 +-
 .../processors/hadoop/GridHadoopSharedMap.java  |  4 +-
 .../hadoop/GridHadoopTaskExecutionSelfTest.java |  3 +-
 .../GridHadoopTestRoundRobinMrPlanner.java      |  2 +-
 .../examples/GridHadoopWordCount2Mapper.java    |  6 +--
 .../examples/GridHadoopWordCount2Reducer.java   |  7 ++--
 .../GridHadoopExecutorServiceTest.java          | 12 +++---
 ...GridHadoopExternalTaskExecutionSelfTest.java |  4 +-
 ...GridHadoopExternalCommunicationSelfTest.java |  4 +-
 .../ggfs/GridGgfsPerformanceBenchmark.java      |  1 +
 .../GridHibernateAccessStrategyAdapter.java     |  2 +-
 .../GridHibernateQueryResultsRegion.java        |  2 +-
 .../hibernate/CacheHibernateBlobStore.java      |  6 +--
 ...idHibernateL2CacheConfigurationSelfTest.java |  2 -
 .../hibernate/GridHibernateL2CacheSelfTest.java |  3 +-
 ...idHibernateL2CacheTransactionalSelfTest.java |  1 -
 .../processors/query/h2/IgniteH2Indexing.java   | 15 ++++----
 .../query/h2/opt/GridH2AbstractKeyValueRow.java |  2 +-
 .../query/h2/opt/GridH2IndexBase.java           |  4 +-
 .../query/h2/opt/GridH2KeyValueRowOffheap.java  |  2 +-
 .../query/h2/opt/GridH2SpatialIndex.java        |  2 +-
 .../query/h2/opt/GridH2TreeIndex.java           |  4 +-
 .../query/h2/opt/GridLuceneDirectory.java       |  2 +-
 .../query/h2/opt/GridLuceneIndex.java           |  8 ++--
 .../query/h2/opt/GridLuceneInputStream.java     |  2 +-
 .../query/h2/opt/GridLuceneOutputStream.java    |  5 ++-
 .../query/h2/twostep/GridMapQueryExecutor.java  |  2 +-
 .../h2/twostep/GridReduceQueryExecutor.java     |  2 +-
 .../query/h2/twostep/GridResultPage.java        |  2 +-
 .../GridCacheAbstractFieldsQuerySelfTest.java   |  6 +--
 .../cache/GridCacheAbstractQuerySelfTest.java   | 13 +++----
 .../cache/GridCacheOffHeapAndSwapSelfTest.java  | 10 ++---
 .../cache/GridCacheQueryLoadSelfTest.java       |  7 ++--
 .../GridCacheQueryMultiThreadedSelfTest.java    |  8 ++--
 ...idCacheReduceQueryMultithreadedSelfTest.java |  2 +-
 .../processors/cache/GridCacheSwapSelfTest.java |  8 ++--
 .../cache/GridIndexingWithNoopSwapSelfTest.java |  2 +-
 ...idCachePartitionedHitsAndMissesSelfTest.java |  2 +-
 .../near/GridCacheQueryNodeRestartSelfTest.java |  4 +-
 .../GridCacheReplicatedFieldsQuerySelfTest.java |  4 +-
 .../GridCacheReplicatedQuerySelfTest.java       |  6 +--
 .../h2/GridIndexingSpiAbstractSelfTest.java     |  4 +-
 .../query/h2/sql/GridQueryParsingTest.java      |  4 +-
 .../tcp/GridOrderedMessageCancelSelfTest.java   |  8 ++--
 .../IgniteCacheQuerySelfTestSuite.java          |  6 +--
 .../org/jdk8/backport/ThreadLocalRandom8.java   |  2 +-
 .../cache/jta/GridCacheXAResource.java          |  2 +-
 .../processors/cache/GridCacheJtaSelfTest.java  |  1 -
 .../IgniteLog4jDailyRollingFileAppender.java    |  2 +-
 ...IgniteLog4jExternallyRolledFileAppender.java |  2 +-
 .../logger/log4j/IgniteLog4jFileAppender.java   |  2 +-
 .../ignite/logger/log4j/IgniteLog4jLogger.java  |  6 +--
 .../logger/log4j/IgniteLog4jNodeIdFilePath.java |  2 +-
 .../log4j/IgniteLog4jRollingFileAppender.java   |  2 +-
 .../log4j/GridLog4jCorrectFileNameTest.java     |  5 +--
 .../logger/log4j/GridLog4jInitializedTest.java  |  2 +-
 .../logger/log4j/GridLog4jLoggingFileTest.java  |  2 +-
 .../logger/log4j/GridLog4jLoggingPathTest.java  |  1 -
 .../logger/log4j/GridLog4jLoggingUrlTest.java   |  2 +-
 .../http/jetty/GridJettyRestHandler.java        | 10 ++---
 .../http/jetty/GridJettyRestProtocol.java       |  8 ++--
 .../schedule/IgniteScheduleProcessor.java       |  2 +-
 .../processors/schedule/ScheduleFutureImpl.java | 10 ++---
 .../schedule/GridScheduleSelfTest.java          |  5 ++-
 .../org/apache/ignite/IgniteSpringBean.java     |  6 +--
 .../apache/ignite/cache/spring/SpringCache.java |  2 +-
 .../ignite/cache/spring/SpringCacheManager.java |  6 +--
 .../cache/spring/SpringDynamicCacheManager.java |  4 +-
 .../GridResourceSpringBeanInjector.java         |  2 +-
 .../spring/IgniteSpringProcessorImpl.java       |  2 +-
 .../ignite/internal/GridFactorySelfTest.java    |  6 +--
 .../GridSpringBeanSerializationSelfTest.java    |  2 +-
 .../resource/GridLoggerInjectionSelfTest.java   |  2 +-
 .../p2p/GridP2PUserVersionChangeSelfTest.java   |  2 +-
 .../GridSpringDynamicCacheManagerSelfTest.java  |  2 -
 .../testsuites/IgniteSpringTestSuite.java       |  1 -
 .../util/nodestart/GridNodeCallableImpl.java    |  2 +-
 .../internal/GridNodeStartUtilsSelfTest.java    |  2 +-
 .../GridProjectionStartStopRestartSelfTest.java |  6 +--
 .../ignite/tools/javadoc/IgniteLinkTaglet.java  |  2 +-
 .../util/antgar/IgniteDeploymentGarAntTask.java |  1 +
 .../uri/GridUriDeploymentDiscovery.java         |  3 +-
 .../uri/GridUriDeploymentFileProcessor.java     |  2 +-
 .../GridUriDeploymentFileProcessorResult.java   |  1 +
 .../uri/GridUriDeploymentJarVerifier.java       |  1 +
 .../uri/GridUriDeploymentSpringDocument.java    |  3 +-
 .../uri/GridUriDeploymentSpringParser.java      |  3 +-
 .../uri/GridUriDeploymentUnitDescriptor.java    |  2 +-
 .../uri/GridUriDeploymentUriParser.java         |  2 +-
 .../spi/deployment/uri/UriDeploymentSpi.java    |  4 +-
 .../uri/scanners/GridUriDeploymentScanner.java  |  4 +-
 .../file/GridUriDeploymentFileScanner.java      |  6 +--
 .../ftp/GridUriDeploymentFtpClient.java         |  1 +
 .../ftp/GridUriDeploymentFtpConfiguration.java  |  2 +-
 .../scanners/ftp/GridUriDeploymentFtpFile.java  |  1 +
 .../ftp/GridUriDeploymentFtpScanner.java        |  2 +-
 .../http/GridUriDeploymentHttpScanner.java      |  6 +--
 .../GridTaskUriDeploymentDeadlockSelfTest.java  |  4 +-
 .../ignite/p2p/GridP2PDisabledSelfTest.java     |  2 +-
 .../GridUriDeploymentClassLoaderSelfTest.java   |  2 +-
 ...riDeploymentClassloaderRegisterSelfTest.java |  3 +-
 .../uri/GridUriDeploymentConfigSelfTest.java    |  1 +
 .../GridUriDeploymentFileProcessorSelfTest.java |  5 ++-
 .../uri/GridUriDeploymentMd5CheckSelfTest.java  |  7 ++--
 .../GridUriDeploymentMultiScannersSelfTest.java |  1 +
 .../uri/GridUriDeploymentSimpleSelfTest.java    |  3 +-
 .../file/GridFileDeploymentSelfTest.java        |  1 +
 .../GridFileDeploymentUndeploySelfTest.java     |  3 +-
 .../uri/scanners/ftp/GridFtpDeploymentTest.java |  1 +
 .../http/GridHttpDeploymentSelfTest.java        |  8 ++--
 .../apache/ignite/tools/GridToolsSelfTest.java  |  4 +-
 .../ignite/cache/websession/GridWebSession.java |  2 +-
 .../cache/websession/GridWebSessionFilter.java  |  6 +--
 .../IgniteServletContextListenerStartup.java    |  2 +-
 .../startup/servlet/IgniteServletStartup.java   |  2 +-
 .../internal/websession/WebSessionSelfTest.java |  6 +--
 .../websession/WebSessionServerStart.java       |  4 +-
 1445 files changed, 2657 insertions(+), 2726 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/752a802f/modules/aop/src/main/java/org/apache/ignite/compute/gridify/aop/aspectj/GridifyAspectJAspect.java
----------------------------------------------------------------------
diff --git 
a/modules/aop/src/main/java/org/apache/ignite/compute/gridify/aop/aspectj/GridifyAspectJAspect.java
 
b/modules/aop/src/main/java/org/apache/ignite/compute/gridify/aop/aspectj/GridifyAspectJAspect.java
index de26d2c..1cccc1e 100644
--- 
a/modules/aop/src/main/java/org/apache/ignite/compute/gridify/aop/aspectj/GridifyAspectJAspect.java
+++ 
b/modules/aop/src/main/java/org/apache/ignite/compute/gridify/aop/aspectj/GridifyAspectJAspect.java
@@ -21,10 +21,11 @@ import org.apache.ignite.*;
 import org.apache.ignite.compute.*;
 import org.apache.ignite.compute.gridify.*;
 import org.apache.ignite.compute.gridify.aop.*;
+import org.apache.ignite.internal.util.typedef.*;
 import org.aspectj.lang.*;
 import org.aspectj.lang.annotation.*;
 import org.aspectj.lang.reflect.*;
-import org.apache.ignite.internal.util.typedef.*;
+
 import java.lang.reflect.*;
 
 import static org.apache.ignite.IgniteState.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/752a802f/modules/aop/src/main/java/org/apache/ignite/compute/gridify/aop/aspectj/GridifySetToSetAspectJAspect.java
----------------------------------------------------------------------
diff --git 
a/modules/aop/src/main/java/org/apache/ignite/compute/gridify/aop/aspectj/GridifySetToSetAspectJAspect.java
 
b/modules/aop/src/main/java/org/apache/ignite/compute/gridify/aop/aspectj/GridifySetToSetAspectJAspect.java
index 93c9faa..6d5d05f 100644
--- 
a/modules/aop/src/main/java/org/apache/ignite/compute/gridify/aop/aspectj/GridifySetToSetAspectJAspect.java
+++ 
b/modules/aop/src/main/java/org/apache/ignite/compute/gridify/aop/aspectj/GridifySetToSetAspectJAspect.java
@@ -20,11 +20,12 @@ package org.apache.ignite.compute.gridify.aop.aspectj;
 import org.apache.ignite.*;
 import org.apache.ignite.compute.gridify.*;
 import org.apache.ignite.compute.gridify.aop.*;
+import org.apache.ignite.internal.util.gridify.*;
+import org.apache.ignite.internal.util.typedef.*;
 import org.aspectj.lang.*;
 import org.aspectj.lang.annotation.*;
 import org.aspectj.lang.reflect.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.gridify.*;
+
 import java.lang.reflect.*;
 
 import static org.apache.ignite.IgniteState.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/752a802f/modules/aop/src/main/java/org/apache/ignite/compute/gridify/aop/aspectj/GridifySetToValueAspectJAspect.java
----------------------------------------------------------------------
diff --git 
a/modules/aop/src/main/java/org/apache/ignite/compute/gridify/aop/aspectj/GridifySetToValueAspectJAspect.java
 
b/modules/aop/src/main/java/org/apache/ignite/compute/gridify/aop/aspectj/GridifySetToValueAspectJAspect.java
index d67ef04..46d4c56 100644
--- 
a/modules/aop/src/main/java/org/apache/ignite/compute/gridify/aop/aspectj/GridifySetToValueAspectJAspect.java
+++ 
b/modules/aop/src/main/java/org/apache/ignite/compute/gridify/aop/aspectj/GridifySetToValueAspectJAspect.java
@@ -20,11 +20,12 @@ package org.apache.ignite.compute.gridify.aop.aspectj;
 import org.apache.ignite.*;
 import org.apache.ignite.compute.gridify.*;
 import org.apache.ignite.compute.gridify.aop.*;
+import org.apache.ignite.internal.util.gridify.*;
+import org.apache.ignite.internal.util.typedef.*;
 import org.aspectj.lang.*;
 import org.aspectj.lang.annotation.*;
 import org.aspectj.lang.reflect.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.gridify.*;
+
 import java.lang.reflect.*;
 
 import static org.apache.ignite.IgniteState.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/752a802f/modules/aop/src/main/java/org/apache/ignite/compute/gridify/aop/spring/GridifySetToSetSpringAspect.java
----------------------------------------------------------------------
diff --git 
a/modules/aop/src/main/java/org/apache/ignite/compute/gridify/aop/spring/GridifySetToSetSpringAspect.java
 
b/modules/aop/src/main/java/org/apache/ignite/compute/gridify/aop/spring/GridifySetToSetSpringAspect.java
index daec6d0..102b60c 100644
--- 
a/modules/aop/src/main/java/org/apache/ignite/compute/gridify/aop/spring/GridifySetToSetSpringAspect.java
+++ 
b/modules/aop/src/main/java/org/apache/ignite/compute/gridify/aop/spring/GridifySetToSetSpringAspect.java
@@ -21,8 +21,9 @@ import org.aopalliance.intercept.*;
 import org.apache.ignite.*;
 import org.apache.ignite.compute.gridify.*;
 import org.apache.ignite.compute.gridify.aop.*;
-import org.apache.ignite.internal.util.typedef.*;
 import org.apache.ignite.internal.util.gridify.*;
+import org.apache.ignite.internal.util.typedef.*;
+
 import java.lang.reflect.*;
 
 import static org.apache.ignite.IgniteState.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/752a802f/modules/aop/src/main/java/org/apache/ignite/compute/gridify/aop/spring/GridifySetToValueSpringAspect.java
----------------------------------------------------------------------
diff --git 
a/modules/aop/src/main/java/org/apache/ignite/compute/gridify/aop/spring/GridifySetToValueSpringAspect.java
 
b/modules/aop/src/main/java/org/apache/ignite/compute/gridify/aop/spring/GridifySetToValueSpringAspect.java
index 37d7d1c..cf6557c 100644
--- 
a/modules/aop/src/main/java/org/apache/ignite/compute/gridify/aop/spring/GridifySetToValueSpringAspect.java
+++ 
b/modules/aop/src/main/java/org/apache/ignite/compute/gridify/aop/spring/GridifySetToValueSpringAspect.java
@@ -21,8 +21,9 @@ import org.aopalliance.intercept.*;
 import org.apache.ignite.*;
 import org.apache.ignite.compute.gridify.*;
 import org.apache.ignite.compute.gridify.aop.*;
-import org.apache.ignite.internal.util.typedef.*;
 import org.apache.ignite.internal.util.gridify.*;
+import org.apache.ignite.internal.util.typedef.*;
+
 import java.lang.reflect.*;
 
 import static org.apache.ignite.IgniteState.*;

Reply via email to