ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [47/54] [abbrv] incubator-ignite git commit: # ignite-63
Date Thu, 22 Jan 2015 15:17:56 GMT
# ignite-63


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

Branch: refs/heads/ignite-63
Commit: 7b1a738dcbc4bf121983952833776e1dcf3f9526
Parents: 3166d06
Author: sboikov <sboikov@gridgain.com>
Authored: Thu Jan 22 17:11:52 2015 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Thu Jan 22 17:13:28 2015 +0300

----------------------------------------------------------------------
 examples/config/example-cache.xml               |    2 +-
 .../examples/datagrid/CacheAffinityExample.java |    3 +-
 .../examples/datagrid/CacheApiExample.java      |    2 +-
 .../datagrid/CacheContinuousQueryExample.java   |    5 +-
 .../examples/datagrid/CacheEventsExample.java   |    3 +-
 .../datagrid/CachePopularNumbersExample.java    |    4 +-
 .../examples/datagrid/CachePutGetExample.java   |    3 +-
 .../examples/datagrid/CacheQueryExample.java    |    8 +-
 .../datagrid/CacheTransactionExample.java       |    4 +-
 .../datastructures/CacheAtomicLongExample.java  |    3 +-
 .../CacheAtomicReferenceExample.java            |    3 +-
 .../CacheAtomicSequenceExample.java             |    3 +-
 .../CacheAtomicStampedExample.java              |    3 +-
 .../CacheCountDownLatchExample.java             |    3 +-
 .../datastructures/CacheQueueExample.java       |    3 +-
 .../datastructures/CacheSetExample.java         |    3 +-
 .../HibernateL2CacheExampleNodeStartup.java     |    8 +-
 .../starschema/CacheStarSchemaExample.java      |    5 +-
 .../datagrid/starschema/DimProduct.java         |    5 +-
 .../examples/datagrid/starschema/DimStore.java  |    5 +-
 .../datagrid/starschema/FactPurchase.java       |    5 +-
 .../store/CacheNodeWithStoreStartup.java        |    2 +-
 .../datagrid/store/CacheStoreExample.java       |    2 +-
 .../store/CacheStoreLoadDataExample.java        |    5 +-
 .../store/dummy/CacheDummyPersonStore.java      |    2 +-
 .../client/memcache/MemcacheRestExample.java    |    4 +-
 .../MemcacheRestExampleNodeStartup.java         |    8 +-
 .../examples/ScalarCacheAffinityExample1.scala  |    4 +-
 .../ScalarCacheAffinitySimpleExample.scala      |    2 +-
 .../scalar/examples/ScalarCacheExample.scala    |    1 +
 .../examples/ScalarCacheQueryExample.scala      |    2 +
 .../examples/ScalarSnowflakeSchemaExample.scala |    2 +-
 ...GridClientAbstractMultiThreadedSelfTest.java |   10 +-
 .../client/GridClientPutPortableTask.java       |    2 +-
 .../client/GridClientTopologyCacheSelfTest.java |    4 +-
 .../impl/GridClientCacheFlagsCodecTest.java     |    2 +-
 .../GridClientPartitionAffinitySelfTest.java    |    6 +-
 .../GridClientAbstractMultiNodeSelfTest.java    |   10 +-
 .../integration/GridClientAbstractSelfTest.java |    8 +-
 .../jdbc/GridJdbcComplexQuerySelfTest.java      |   14 +-
 .../ignite/jdbc/GridJdbcEmptyCacheSelfTest.java |    4 +-
 .../jdbc/GridJdbcLocalCachesSelfTest.java       |    8 +-
 .../ignite/jdbc/GridJdbcMetadataSelfTest.java   |   10 +-
 .../jdbc/GridJdbcPreparedStatementSelfTest.java |    8 +-
 .../ignite/jdbc/GridJdbcResultSetSelfTest.java  |    8 +-
 .../ignite/jdbc/GridJdbcStatementSelfTest.java  |    8 +-
 .../rest/GridAbstractRestProcessorSelfTest.java |    2 +-
 .../rest/GridRestBinaryProtocolSelfTest.java    |    4 +-
 .../rest/GridRestMemcacheProtocolSelfTest.java  |    4 +-
 .../processors/rest/GridRestProcessorTest.java  |    2 +-
 .../rest/GridTaskCommandHandlerSelfTest.java    |    4 +-
 .../clients/src/test/resources/spring-cache.xml |    2 +-
 .../src/test/resources/spring-server-node.xml   |   10 +-
 .../test/resources/spring-server-ssl-node.xml   |   10 +-
 .../src/main/java/org/apache/ignite/Ignite.java |    3 +-
 .../java/org/apache/ignite/IgniteCache.java     |   36 +-
 .../java/org/apache/ignite/IgniteCluster.java   |    5 +-
 .../org/apache/ignite/IgniteDataLoader.java     |    2 +-
 .../java/org/apache/ignite/IgnitePortables.java |    9 +-
 .../org/apache/ignite/IgniteTransactions.java   |   10 +-
 .../apache/ignite/cache/CacheConfiguration.java |   23 +-
 .../apache/ignite/cache/CacheEntryEvent.java    |    2 +-
 .../cache/CachePartialUpdateException.java      |    1 +
 .../org/apache/ignite/cache/CachePeekMode.java  |    6 +-
 .../java/org/apache/ignite/cache/GridCache.java |  280 +++
 .../GridCacheAtomicUpdateTimeoutException.java  |   47 +
 .../cache/GridCacheAtomicWriteOrderMode.java    |   64 +
 .../ignite/cache/GridCacheAtomicityMode.java    |   79 +
 .../ignite/cache/GridCacheDistributionMode.java |   70 +
 .../org/apache/ignite/cache/GridCacheEntry.java |  549 +++++
 .../org/apache/ignite/cache/GridCacheFlag.java  |  111 +
 .../ignite/cache/GridCacheFlagException.java    |   67 +
 .../ignite/cache/GridCacheInterceptor.java      |  121 ++
 .../cache/GridCacheInterceptorAdapter.java      |   52 +
 .../org/apache/ignite/cache/GridCacheMBean.java |  296 +++
 .../ignite/cache/GridCacheMemoryMode.java       |   59 +
 .../apache/ignite/cache/GridCacheMetrics.java   |  103 +
 .../org/apache/ignite/cache/GridCacheMode.java  |   75 +
 .../org/apache/ignite/cache/GridCacheName.java  |   43 +
 .../cache/GridCachePartialUpdateException.java  |   64 +
 .../apache/ignite/cache/GridCachePeekMode.java  |   85 +
 .../ignite/cache/GridCachePreloadMode.java      |   69 +
 .../ignite/cache/GridCacheProjection.java       | 1914 ++++++++++++++++++
 .../GridCacheWriteSynchronizationMode.java      |   69 +
 .../cache/affinity/GridCacheAffinity.java       |  262 +++
 .../affinity/GridCacheAffinityFunction.java     |  112 +
 .../GridCacheAffinityFunctionContext.java       |   71 +
 .../cache/affinity/GridCacheAffinityKey.java    |  189 ++
 .../affinity/GridCacheAffinityKeyMapped.java    |  158 ++
 .../affinity/GridCacheAffinityKeyMapper.java    |   64 +
 ...ridCacheAffinityNodeAddressHashResolver.java |   39 +
 .../GridCacheAffinityNodeHashResolver.java      |   43 +
 .../GridCacheAffinityNodeIdHashResolver.java    |   40 +
 .../GridCacheCentralizedAffinityFunction.java   |   31 +
 ...GridCacheConsistentHashAffinityFunction.java |  704 +++++++
 .../cache/affinity/consistenthash/package.html  |   24 +
 .../fair/GridCachePartitionFairAffinity.java    |  806 ++++++++
 .../ignite/cache/affinity/fair/package.html     |   24 +
 .../apache/ignite/cache/affinity/package.html   |   24 +
 .../GridCacheRendezvousAffinityFunction.java    |  503 +++++
 .../cache/affinity/rendezvous/package.html      |   23 +
 .../cache/cloner/GridCacheBasicCloner.java      |   34 +
 .../ignite/cache/cloner/GridCacheCloner.java    |   59 +
 .../cache/cloner/GridCacheDeepCloner.java       |   87 +
 .../org/apache/ignite/cache/cloner/package.html |   24 +
 .../datastructures/GridCacheAtomicLong.java     |  157 ++
 .../GridCacheAtomicReference.java               |   93 +
 .../datastructures/GridCacheAtomicSequence.java |  130 ++
 .../datastructures/GridCacheAtomicStamped.java  |  121 ++
 .../datastructures/GridCacheCountDownLatch.java |  227 +++
 .../GridCacheDataStructureInvalidException.java |   66 +
 ...cheDataStructureInvalidRuntimeException.java |   66 +
 .../GridCacheDataStructureRemovedException.java |   61 +
 ...cheDataStructureRemovedRuntimeException.java |   61 +
 .../datastructures/GridCacheDataStructures.java |  221 ++
 .../cache/datastructures/GridCacheQueue.java    |  182 ++
 .../cache/datastructures/GridCacheSet.java      |   61 +
 .../ignite/cache/datastructures/package.html    |   24 +
 .../ignite/cache/eviction/EvictableEntry.java   |    2 +-
 .../cache/eviction/GridCacheEvictionFilter.java |   41 +
 .../cache/eviction/GridCacheEvictionPolicy.java |   54 +
 .../fifo/GridCacheFifoEvictionPolicy.java       |  209 ++
 .../fifo/GridCacheFifoEvictionPolicyMBean.java  |   58 +
 .../ignite/cache/eviction/fifo/package.html     |   23 +
 .../ggfs/GridCacheGgfsEvictionFilter.java       |   35 +
 .../GridCacheGgfsPerBlockLruEvictionPolicy.java |  354 ++++
 ...CacheGgfsPerBlockLruEvictionPolicyMBean.java |   93 +
 .../ignite/cache/eviction/ggfs/package.html     |   23 +
 .../lru/GridCacheLruEvictionPolicy.java         |  195 ++
 .../lru/GridCacheLruEvictionPolicyMBean.java    |   58 +
 .../ignite/cache/eviction/lru/package.html      |   23 +
 .../apache/ignite/cache/eviction/package.html   |   23 +
 .../random/GridCacheRandomEvictionPolicy.java   |  120 ++
 .../GridCacheRandomEvictionPolicyMBean.java     |   42 +
 .../ignite/cache/eviction/random/package.html   |   23 +
 .../java/org/apache/ignite/cache/package.html   |   24 +
 .../cache/query/GridCacheContinuousQuery.java   |  342 ++++
 .../query/GridCacheContinuousQueryEntry.java    |   49 +
 .../ignite/cache/query/GridCacheQueries.java    |  151 ++
 .../ignite/cache/query/GridCacheQuery.java      |  297 +++
 .../query/GridCacheQueryConfiguration.java      |  203 ++
 .../cache/query/GridCacheQueryFuture.java       |   66 +
 .../cache/query/GridCacheQueryGroupIndex.java   |   58 +
 .../cache/query/GridCacheQueryMetrics.java      |   60 +
 .../cache/query/GridCacheQuerySqlField.java     |  133 ++
 .../cache/query/GridCacheQuerySqlFunction.java  |   69 +
 .../cache/query/GridCacheQueryTextField.java    |   33 +
 .../ignite/cache/query/GridCacheQueryType.java  |   47 +
 .../cache/query/GridCacheQueryTypeMetadata.java |  196 ++
 .../cache/query/GridCacheQueryTypeResolver.java |   32 +
 .../cache/query/QueryContinuousPredicate.java   |    8 +-
 .../cache/query/annotations/QuerySqlField.java  |    4 +-
 .../cache/query/annotations/QueryTextField.java |    4 +-
 .../org/apache/ignite/cache/query/package.html  |   23 +
 .../cache/store/CacheLoadOnlyStoreAdapter.java  |    6 +-
 .../apache/ignite/cache/store/CacheStore.java   |    4 +-
 .../ignite/cache/store/CacheStoreAdapter.java   |    2 +-
 .../configuration/GridQueryConfiguration.java   |    3 +-
 .../events/IgniteCacheQueryExecutedEvent.java   |    2 +-
 .../events/IgniteCacheQueryReadEvent.java       |    2 +-
 .../processors/cache/IgniteCacheProxy.java      |    2 +-
 .../org/apache/ignite/jdbc/GridJdbcDriver.java  |    2 +-
 .../org/apache/ignite/lang/IgnitePredicate.java |    2 +-
 .../StreamerCacheAffinityEventRouter.java       |    1 +
 .../apache/ignite/transactions/IgniteTx.java    |   10 +-
 .../transactions/IgniteTxSynchronization.java   |    2 +-
 .../gridgain/grid/GridBasicWarmupClosure.java   |    1 +
 .../java/org/gridgain/grid/cache/GridCache.java |  280 ---
 .../GridCacheAtomicUpdateTimeoutException.java  |   47 -
 .../cache/GridCacheAtomicWriteOrderMode.java    |   64 -
 .../grid/cache/GridCacheAtomicityMode.java      |   80 -
 .../grid/cache/GridCacheDistributionMode.java   |   70 -
 .../org/gridgain/grid/cache/GridCacheEntry.java |  549 -----
 .../org/gridgain/grid/cache/GridCacheFlag.java  |  111 -
 .../grid/cache/GridCacheFlagException.java      |   67 -
 .../grid/cache/GridCacheInterceptor.java        |  121 --
 .../grid/cache/GridCacheInterceptorAdapter.java |   52 -
 .../org/gridgain/grid/cache/GridCacheMBean.java |  296 ---
 .../grid/cache/GridCacheMemoryMode.java         |   61 -
 .../gridgain/grid/cache/GridCacheMetrics.java   |  103 -
 .../org/gridgain/grid/cache/GridCacheMode.java  |   75 -
 .../org/gridgain/grid/cache/GridCacheName.java  |   43 -
 .../cache/GridCachePartialUpdateException.java  |   64 -
 .../gridgain/grid/cache/GridCachePeekMode.java  |   85 -
 .../grid/cache/GridCachePreloadMode.java        |   69 -
 .../grid/cache/GridCacheProjection.java         | 1914 ------------------
 .../GridCacheWriteSynchronizationMode.java      |   69 -
 .../grid/cache/affinity/GridCacheAffinity.java  |  262 ---
 .../affinity/GridCacheAffinityFunction.java     |  112 -
 .../GridCacheAffinityFunctionContext.java       |   71 -
 .../cache/affinity/GridCacheAffinityKey.java    |  189 --
 .../affinity/GridCacheAffinityKeyMapped.java    |  158 --
 .../affinity/GridCacheAffinityKeyMapper.java    |   64 -
 ...ridCacheAffinityNodeAddressHashResolver.java |   39 -
 .../GridCacheAffinityNodeHashResolver.java      |   43 -
 .../GridCacheAffinityNodeIdHashResolver.java    |   40 -
 .../GridCacheCentralizedAffinityFunction.java   |   31 -
 ...GridCacheConsistentHashAffinityFunction.java |  703 -------
 .../cache/affinity/consistenthash/package.html  |   24 -
 .../fair/GridCachePartitionFairAffinity.java    |  805 --------
 .../grid/cache/affinity/fair/package.html       |   24 -
 .../gridgain/grid/cache/affinity/package.html   |   24 -
 .../GridCacheRendezvousAffinityFunction.java    |  502 -----
 .../grid/cache/affinity/rendezvous/package.html |   23 -
 .../grid/cache/cloner/GridCacheBasicCloner.java |   34 -
 .../grid/cache/cloner/GridCacheCloner.java      |   59 -
 .../grid/cache/cloner/GridCacheDeepCloner.java  |   87 -
 .../org/gridgain/grid/cache/cloner/package.html |   24 -
 .../datastructures/GridCacheAtomicLong.java     |  157 --
 .../GridCacheAtomicReference.java               |   93 -
 .../datastructures/GridCacheAtomicSequence.java |  130 --
 .../datastructures/GridCacheAtomicStamped.java  |  121 --
 .../datastructures/GridCacheCountDownLatch.java |  227 ---
 .../GridCacheDataStructureInvalidException.java |   66 -
 ...cheDataStructureInvalidRuntimeException.java |   66 -
 .../GridCacheDataStructureRemovedException.java |   61 -
 ...cheDataStructureRemovedRuntimeException.java |   61 -
 .../datastructures/GridCacheDataStructures.java |  221 --
 .../cache/datastructures/GridCacheQueue.java    |  182 --
 .../grid/cache/datastructures/GridCacheSet.java |   61 -
 .../grid/cache/datastructures/package.html      |   24 -
 .../cache/eviction/GridCacheEvictionFilter.java |   41 -
 .../cache/eviction/GridCacheEvictionPolicy.java |   56 -
 .../fifo/GridCacheFifoEvictionPolicy.java       |  210 --
 .../fifo/GridCacheFifoEvictionPolicyMBean.java  |   58 -
 .../grid/cache/eviction/fifo/package.html       |   23 -
 .../ggfs/GridCacheGgfsEvictionFilter.java       |   34 -
 .../GridCacheGgfsPerBlockLruEvictionPolicy.java |  353 ----
 ...CacheGgfsPerBlockLruEvictionPolicyMBean.java |   93 -
 .../grid/cache/eviction/ggfs/package.html       |   23 -
 .../lru/GridCacheLruEvictionPolicy.java         |  194 --
 .../lru/GridCacheLruEvictionPolicyMBean.java    |   58 -
 .../grid/cache/eviction/lru/package.html        |   23 -
 .../gridgain/grid/cache/eviction/package.html   |   23 -
 .../random/GridCacheRandomEvictionPolicy.java   |  121 --
 .../GridCacheRandomEvictionPolicyMBean.java     |   42 -
 .../grid/cache/eviction/random/package.html     |   23 -
 .../java/org/gridgain/grid/cache/package.html   |   24 -
 .../cache/query/GridCacheContinuousQuery.java   |  342 ----
 .../query/GridCacheContinuousQueryEntry.java    |   49 -
 .../grid/cache/query/GridCacheQueries.java      |  151 --
 .../grid/cache/query/GridCacheQuery.java        |  297 ---
 .../query/GridCacheQueryConfiguration.java      |  203 --
 .../grid/cache/query/GridCacheQueryFuture.java  |   66 -
 .../cache/query/GridCacheQueryGroupIndex.java   |   58 -
 .../grid/cache/query/GridCacheQueryMetrics.java |   60 -
 .../cache/query/GridCacheQuerySqlField.java     |  133 --
 .../cache/query/GridCacheQuerySqlFunction.java  |   69 -
 .../cache/query/GridCacheQueryTextField.java    |   33 -
 .../grid/cache/query/GridCacheQueryType.java    |   47 -
 .../cache/query/GridCacheQueryTypeMetadata.java |  196 --
 .../cache/query/GridCacheQueryTypeResolver.java |   32 -
 .../org/gridgain/grid/cache/query/package.html  |   23 -
 .../java/org/gridgain/grid/kernal/GridEx.java   |    1 +
 .../org/gridgain/grid/kernal/GridGainEx.java    |   13 +-
 .../grid/kernal/GridJobContextImpl.java         |    3 +-
 .../grid/kernal/IgniteTransactionsEx.java       |    2 +-
 .../kernal/managers/GridManagerAdapter.java     |    2 +-
 .../loadbalancer/GridLoadBalancerManager.java   |    2 +
 .../affinity/GridAffinityAssignmentCache.java   |    1 +
 .../affinity/GridAffinityProcessor.java         |    6 +-
 .../processors/affinity/GridAffinityUtils.java  |    6 +-
 .../GridCacheAffinityFunctionContextImpl.java   |    1 +
 .../processors/cache/GridCacheAdapter.java      |   11 +-
 .../processors/cache/GridCacheAttributes.java   |    8 +-
 .../cache/GridCacheConcurrentMap.java           |    4 +-
 .../processors/cache/GridCacheContext.java      |   15 +-
 .../GridCacheDefaultAffinityKeyMapper.java      |    1 +
 .../cache/GridCacheDeploymentManager.java       |    1 +
 .../processors/cache/GridCacheEntryEx.java      |    1 +
 .../processors/cache/GridCacheEntryImpl.java    |    5 +-
 .../processors/cache/GridCacheEntrySet.java     |    2 +-
 .../cache/GridCacheEvictionEntry.java           |    5 +-
 .../cache/GridCacheEvictionManager.java         |    6 +-
 .../cache/GridCacheFilterEvaluationEntry.java   |    3 +-
 .../processors/cache/GridCacheIterator.java     |    1 +
 .../processors/cache/GridCacheKeySet.java       |    2 +-
 .../processors/cache/GridCacheMBeanAdapter.java |    3 +-
 .../processors/cache/GridCacheMapAdapter.java   |    2 +-
 .../processors/cache/GridCacheMapEntry.java     |    3 +-
 .../processors/cache/GridCacheMessage.java      |    1 +
 .../cache/GridCacheMetricsAdapter.java          |    1 +
 .../processors/cache/GridCacheMvccManager.java  |    1 +
 .../cache/GridCachePreloaderAdapter.java        |    2 +-
 .../processors/cache/GridCacheProcessor.java    |   16 +-
 .../processors/cache/GridCacheProjectionEx.java |    1 +
 .../cache/GridCacheProjectionImpl.java          |    5 +-
 .../kernal/processors/cache/GridCacheProxy.java |    1 +
 .../processors/cache/GridCacheProxyImpl.java    |    6 +-
 .../cache/GridCacheSharedContext.java           |    3 +-
 .../processors/cache/GridCacheSwapManager.java  |    2 +-
 .../kernal/processors/cache/GridCacheUtils.java |   13 +-
 .../cache/GridCacheValueCollection.java         |    1 +
 .../cache/GridCacheWriteBehindStore.java        |    2 +-
 .../cache/affinity/GridCacheAffinityImpl.java   |    1 +
 .../cache/affinity/GridCacheAffinityProxy.java  |    1 +
 .../GridAtomicCacheQueueImpl.java               |    3 +-
 .../datastructures/GridCacheAtomicLongEx.java   |    2 +-
 .../datastructures/GridCacheAtomicLongImpl.java |    3 +-
 .../GridCacheAtomicReferenceEx.java             |    3 +-
 .../GridCacheAtomicReferenceImpl.java           |    3 +-
 .../GridCacheAtomicSequenceEx.java              |    2 +-
 .../GridCacheAtomicSequenceImpl.java            |    3 +-
 .../GridCacheAtomicStampedEx.java               |    2 +-
 .../GridCacheAtomicStampedImpl.java             |    3 +-
 .../GridCacheCountDownLatchEx.java              |    2 +-
 .../GridCacheCountDownLatchImpl.java            |    1 +
 .../GridCacheDataStructuresImpl.java            |    2 +-
 .../GridCacheDataStructuresManager.java         |    9 +-
 .../GridCacheDataStructuresProxy.java           |    2 +-
 .../GridCacheInternalKeyImpl.java               |    2 +-
 .../datastructures/GridCacheQueueAdapter.java   |    9 +-
 .../datastructures/GridCacheQueueProxy.java     |    2 +-
 .../cache/datastructures/GridCacheSetImpl.java  |    7 +-
 .../cache/datastructures/GridCacheSetProxy.java |    3 +-
 .../datastructures/GridSetQueryPredicate.java   |    3 +-
 .../GridTransactionalCacheQueueImpl.java        |    3 +-
 .../GridDistributedCacheAdapter.java            |    1 +
 .../GridDistributedTxRemoteAdapter.java         |    1 +
 .../GridPartitionedCacheEntryImpl.java          |    3 +-
 .../distributed/dht/GridDhtCacheAdapter.java    |    3 +-
 .../distributed/dht/GridDhtCacheEntry.java      |    1 +
 .../distributed/dht/GridDhtCacheEntryImpl.java  |    3 +-
 .../cache/distributed/dht/GridDhtGetFuture.java |    1 +
 .../distributed/dht/GridDhtLockFuture.java      |    1 +
 .../dht/GridDhtTransactionalCacheAdapter.java   |    1 +
 .../distributed/dht/GridDhtTxLocalAdapter.java  |    1 +
 .../dht/GridPartitionedGetFuture.java           |    1 +
 .../dht/atomic/GridDhtAtomicCache.java          |    8 +-
 .../dht/atomic/GridDhtAtomicCacheEntry.java     |    1 +
 .../dht/atomic/GridDhtAtomicUpdateFuture.java   |    3 +-
 .../dht/atomic/GridDhtAtomicUpdateRequest.java  |    1 +
 .../dht/atomic/GridNearAtomicUpdateFuture.java  |    7 +-
 .../dht/atomic/GridNearAtomicUpdateRequest.java |    1 +
 .../dht/colocated/GridDhtColocatedCache.java    |    5 +-
 .../colocated/GridDhtColocatedCacheEntry.java   |    1 +
 .../colocated/GridDhtColocatedLockFuture.java   |    1 +
 .../preloader/GridDhtPartitionDemandPool.java   |    4 +-
 .../GridDhtPartitionsExchangeFuture.java        |    1 +
 .../distributed/near/GridNearAtomicCache.java   |    3 +-
 .../distributed/near/GridNearCacheAdapter.java  |    5 +-
 .../distributed/near/GridNearCacheEntry.java    |    1 +
 .../distributed/near/GridNearGetFuture.java     |    1 +
 .../distributed/near/GridNearGetRequest.java    |    1 +
 .../distributed/near/GridNearLockFuture.java    |    1 +
 .../distributed/near/GridNearLockRequest.java   |    1 +
 .../near/GridNearTransactionalCache.java        |    3 +-
 .../cache/distributed/near/GridNearTxLocal.java |    2 +-
 .../distributed/near/GridNearTxRemote.java      |    2 +-
 .../processors/cache/local/GridLocalCache.java  |    1 +
 .../cache/local/GridLocalLockFuture.java        |    1 +
 .../local/atomic/GridLocalAtomicCache.java      |    3 +-
 .../query/GridCacheDistributedQueryManager.java |    5 +-
 .../cache/query/GridCacheLocalQueryFuture.java  |    1 +
 .../cache/query/GridCacheLocalQueryManager.java |    4 +-
 .../cache/query/GridCacheQueriesEx.java         |    2 +-
 .../cache/query/GridCacheQueriesImpl.java       |    3 +-
 .../cache/query/GridCacheQueriesProxy.java      |    3 +-
 .../cache/query/GridCacheQueryAdapter.java      |    5 +-
 .../cache/query/GridCacheQueryErrorFuture.java  |    2 +-
 .../query/GridCacheQueryFutureAdapter.java      |    2 +-
 .../cache/query/GridCacheQueryInfo.java         |    1 +
 .../cache/query/GridCacheQueryManager.java      |   23 +-
 .../query/GridCacheQueryMetricsAdapter.java     |    4 +-
 .../cache/query/GridCacheQueryRequest.java      |    1 +
 .../cache/query/GridCacheQueryType.java         |    5 +-
 .../GridCacheContinuousQueryAdapter.java        |    6 +-
 .../GridCacheContinuousQueryEntry.java          |    5 +-
 .../GridCacheContinuousQueryFilterEx.java       |    2 +-
 .../GridCacheContinuousQueryHandler.java        |   19 +-
 .../GridCacheContinuousQueryManager.java        |   13 +-
 .../jdbc/GridCacheQueryJdbcMetadataTask.java    |    2 +-
 .../query/jdbc/GridCacheQueryJdbcTask.java      |    6 +-
 .../transactions/IgniteTransactionsImpl.java    |    2 +-
 .../cache/transactions/IgniteTxEntry.java       |    1 +
 .../cache/transactions/IgniteTxEx.java          |    1 +
 .../transactions/IgniteTxLocalAdapter.java      |    1 +
 .../cache/transactions/IgniteTxLocalEx.java     |    1 +
 .../closure/GridClosureProcessor.java           |    2 +
 .../dataload/GridDataLoadCacheUpdaters.java     |   19 +-
 .../dataload/IgniteDataLoaderImpl.java          |    1 +
 .../processors/ggfs/GridGgfsDataManager.java    |    4 +-
 .../processors/ggfs/GridGgfsHelperImpl.java     |    4 +-
 .../kernal/processors/ggfs/GridGgfsImpl.java    |    4 +-
 .../processors/ggfs/GridGgfsMetaManager.java    |    3 +-
 .../processors/ggfs/GridGgfsProcessor.java      |    6 +-
 .../processors/query/GridQueryProcessor.java    |    2 +-
 .../handlers/cache/GridCacheCommandHandler.java |    3 +-
 .../cache/GridCacheQueryCommandHandler.java     |    4 +-
 .../top/GridTopologyCommandHandler.java         |    2 +-
 .../service/GridServiceProcessor.java           |    3 +-
 .../processors/task/GridTaskProcessor.java      |    1 +
 .../grid/kernal/visor/cache/VisorCache.java     |    3 +-
 .../cache/VisorCacheAffinityConfiguration.java  |    3 +-
 .../kernal/visor/cache/VisorCacheClearTask.java |    1 +
 .../visor/cache/VisorCacheCompactTask.java      |    1 +
 .../visor/cache/VisorCacheConfiguration.java    |    1 +
 .../cache/VisorCacheEvictionConfiguration.java  |    2 +-
 .../kernal/visor/cache/VisorCacheLoadTask.java  |    1 +
 .../visor/cache/VisorCacheMetadataTask.java     |    1 +
 .../kernal/visor/cache/VisorCacheMetrics.java   |    1 +
 .../cache/VisorCacheMetricsCollectorTask.java   |    1 +
 .../visor/cache/VisorCachePreloadTask.java      |    1 +
 .../visor/cache/VisorCacheQueryMetrics.java     |    2 +-
 .../visor/cache/VisorCacheResetMetricsTask.java |    1 +
 .../visor/cache/VisorCacheSwapBackupsTask.java  |    1 +
 .../visor/node/VisorNodeDataCollectorJob.java   |    2 +-
 .../grid/kernal/visor/query/VisorQueryTask.java |    3 +-
 .../kernal/visor/query/VisorQueryUtils.java     |    2 +-
 .../grid/kernal/visor/util/VisorTaskUtils.java  |    9 +-
 .../java/org/gridgain/grid/util/GridUtils.java  |    1 +
 .../org/gridgain/grid/util/lang/GridFunc.java   |    1 +
 .../org/gridgain/grid/util/typedef/PCE.java     |    5 +-
 .../core/src/test/config/discovery-stress.xml   |    2 +-
 .../config/load/dsi-49-server-production.xml    |    4 +-
 .../src/test/config/load/dsi-load-server.xml    |    2 +-
 .../core/src/test/config/spring-cache-swap.xml  |    2 +-
 .../src/test/config/spring-cache-teststore.xml  |    2 +-
 .../core/src/test/config/spring-multicache.xml  |   16 +-
 ...CacheJdbcBlobStoreMultithreadedSelfTest.java |    9 +-
 .../cache/IgniteCacheAbstractTest.java          |    8 +-
 .../cache/IgniteCacheAtomicInvokeTest.java      |   10 +-
 .../cache/IgniteCacheAtomicLocalInvokeTest.java |    8 +-
 .../IgniteCacheAtomicNearEnabledInvokeTest.java |    4 +-
 ...eCacheAtomicPrimaryWriteOrderInvokeTest.java |   10 +-
 .../IgniteCacheEntryListenerAbstractTest.java   |    4 +-
 ...IgniteCacheEntryListenerAtomicLocalTest.java |    8 +-
 ...eCacheEntryListenerAtomicReplicatedTest.java |    4 +-
 .../IgniteCacheEntryListenerAtomicTest.java     |   10 +-
 .../IgniteCacheEntryListenerTxLocalTest.java    |    8 +-
 ...gniteCacheEntryListenerTxReplicatedTest.java |    4 +-
 .../cache/IgniteCacheEntryListenerTxTest.java   |    8 +-
 .../cache/IgniteCacheInvokeAbstractTest.java    |    8 +-
 .../cache/IgniteCacheInvokeReadThroughTest.java |    8 +-
 .../cache/IgniteCacheTxInvokeTest.java          |    8 +-
 .../cache/IgniteCacheTxLocalInvokeTest.java     |    8 +-
 .../IgniteCacheTxNearEnabledInvokeTest.java     |    4 +-
 .../cache/IgniteCachingProviderSelfTest.java    |    2 +-
 .../IgniteCacheAtomicExpiryPolicyTest.java      |   10 +-
 .../IgniteCacheAtomicLocalExpiryPolicyTest.java |    8 +-
 ...AtomicPrimaryWriteOrderExpiryPolicyTest.java |    4 +-
 ...teCacheAtomicReplicatedExpiryPolicyTest.java |    4 +-
 .../IgniteCacheExpiryPolicyAbstractTest.java    |   10 +-
 .../expiry/IgniteCacheTxExpiryPolicyTest.java   |    8 +-
 .../IgniteCacheTxLocalExpiryPolicyTest.java     |    8 +-
 ...IgniteCacheTxReplicatedExpiryPolicyTest.java |    6 +-
 .../IgniteCacheAtomicLoadAllTest.java           |   10 +-
 .../IgniteCacheAtomicLoaderWriterTest.java      |   10 +-
 .../IgniteCacheAtomicLocalLoadAllTest.java      |    8 +-
 ...CacheAtomicLocalNoLoadPreviousValueTest.java |    8 +-
 ...IgniteCacheAtomicLocalNoReadThroughTest.java |    8 +-
 ...gniteCacheAtomicLocalNoWriteThroughTest.java |    8 +-
 ...tomicNearEnabledNoLoadPreviousValueTest.java |    4 +-
 ...CacheAtomicNearEnabledNoReadThroughTest.java |    4 +-
 ...acheAtomicNearEnabledNoWriteThroughTest.java |    4 +-
 ...gniteCacheAtomicNoLoadPreviousValueTest.java |   10 +-
 .../IgniteCacheAtomicNoReadThroughTest.java     |   10 +-
 .../IgniteCacheAtomicNoWriteThroughTest.java    |   10 +-
 .../IgniteCacheAtomicStoreSessionTest.java      |   10 +-
 .../IgniteCacheLoadAllAbstractTest.java         |    2 +-
 ...iteCacheNoLoadPreviousValueAbstractTest.java |    7 +-
 .../IgniteCacheNoReadThroughAbstractTest.java   |    6 +-
 .../IgniteCacheNoWriteThroughAbstractTest.java  |    6 +-
 .../IgniteCacheStoreSessionAbstractTest.java    |    2 +-
 .../integration/IgniteCacheTxLoadAllTest.java   |    9 +-
 .../IgniteCacheTxLoaderWriterTest.java          |    8 +-
 .../IgniteCacheTxLocalLoadAllTest.java          |    8 +-
 ...niteCacheTxLocalNoLoadPreviousValueTest.java |    8 +-
 .../IgniteCacheTxLocalNoReadThroughTest.java    |    8 +-
 .../IgniteCacheTxLocalNoWriteThroughTest.java   |    8 +-
 ...cheTxNearEnabledNoLoadPreviousValueTest.java |    4 +-
 ...niteCacheTxNearEnabledNoReadThroughTest.java |    4 +-
 ...iteCacheTxNearEnabledNoWriteThroughTest.java |    4 +-
 .../IgniteCacheTxNoLoadPreviousValueTest.java   |    8 +-
 .../IgniteCacheTxNoReadThroughTest.java         |    8 +-
 .../IgniteCacheTxNoWriteThroughTest.java        |    8 +-
 .../IgniteCacheTxStoreSessionTest.java          |    8 +-
 ...idCacheCheckpointSpiSecondCacheSelfTest.java |    6 +-
 .../tcp/GridCacheDhtLockBackupSelfTest.java     |    5 +-
 .../GridCacheStoreValueBytesNode.java           |    4 +-
 .../GridCacheStoreValueBytesTest.java           |    2 +-
 .../grid/GridCacheAffinityBackupsSelfTest.java  |   10 +-
 ...CachePartitionFairAffinityNodesSelfTest.java |    3 +-
 .../GridCachePartitionFairAffinitySelfTest.java |    3 +-
 .../ggfs/GridGgfsEventsAbstractSelfTest.java    |    8 +-
 .../GridGgfsFragmentizerAbstractSelfTest.java   |    6 +-
 .../grid/ggfs/GridGgfsFragmentizerSelfTest.java |    2 +-
 .../grid/kernal/GridAffinityMappedTest.java     |    6 +-
 .../grid/kernal/GridAffinityP2PSelfTest.java    |    4 +-
 .../grid/kernal/GridAffinitySelfTest.java       |    2 +-
 .../grid/kernal/GridDiscoverySelfTest.java      |    2 +-
 .../kernal/GridJobMasterLeaveAwareSelfTest.java |    4 +-
 .../grid/kernal/GridMultipleJobsSelfTest.java   |    4 +-
 .../kernal/GridProjectionForCachesSelfTest.java |    2 +-
 ...ectionLocalJobMultipleArgumentsSelfTest.java |    2 +-
 .../grid/kernal/GridStartStopSelfTest.java      |    2 +-
 .../GridCheckpointManagerAbstractSelfTest.java  |    2 +-
 .../checkpoint/GridCheckpointTaskSelfTest.java  |    4 +-
 .../GridDeploymentMessageCountSelfTest.java     |    6 +-
 .../GridDiscoveryManagerAliveCacheSelfTest.java |    8 +-
 .../discovery/GridDiscoveryManagerSelfTest.java |    6 +-
 .../GridAffinityProcessorAbstractSelfTest.java  |    5 +-
 ...AffinityProcessorConsistentHashSelfTest.java |    4 +-
 ...GridAffinityProcessorRendezvousSelfTest.java |    4 +-
 .../GridCacheAbstractFailoverSelfTest.java      |    5 +-
 .../cache/GridCacheAbstractFlagsTest.java       |    4 +-
 ...cheAbstractFullApiMultithreadedSelfTest.java |    2 +-
 .../cache/GridCacheAbstractFullApiSelfTest.java |    6 +-
 .../GridCacheAbstractIteratorsSelfTest.java     |    2 +-
 .../cache/GridCacheAbstractMetricsSelfTest.java |    2 +-
 .../GridCacheAbstractProjectionSelfTest.java    |    8 +-
 .../GridCacheAbstractRemoveFailureTest.java     |    2 +-
 .../cache/GridCacheAbstractSelfTest.java        |   11 +-
 .../cache/GridCacheAbstractTxReadTest.java      |    4 +-
 .../cache/GridCacheAffinityApiSelfTest.java     |    8 +-
 .../cache/GridCacheAffinityMapperSelfTest.java  |    2 +-
 .../cache/GridCacheAffinityRoutingSelfTest.java |    8 +-
 .../cache/GridCacheAlwaysEvictionPolicy.java    |    4 +-
 .../GridCacheAtomicMessageCountSelfTest.java    |    9 +-
 .../cache/GridCacheBasicApiAbstractTest.java    |    2 +-
 .../cache/GridCacheBasicStoreAbstractTest.java  |   11 +-
 ...acheBasicStoreMultithreadedAbstractTest.java |    4 +-
 .../cache/GridCacheClearAllSelfTest.java        |   12 +-
 ...dCacheColocatedTxStoreExceptionSelfTest.java |    6 +-
 .../cache/GridCacheConcurrentMapSelfTest.java   |    6 +-
 .../cache/GridCacheConcurrentMapTest.java       |    6 +-
 .../GridCacheConcurrentTxMultiNodeTest.java     |   17 +-
 ...idCacheConfigurationConsistencySelfTest.java |   27 +-
 ...ridCacheConfigurationValidationSelfTest.java |   10 +-
 .../GridCacheDaemonNodeAbstractSelfTest.java    |    7 +-
 .../GridCacheDeploymentOffHeapSelfTest.java     |    6 +-
 .../cache/GridCacheDeploymentSelfTest.java      |   14 +-
 .../cache/GridCacheEntryMemorySizeSelfTest.java |    7 +-
 .../cache/GridCacheEntryVersionSelfTest.java    |   10 +-
 .../GridCacheEvictionEventAbstractTest.java     |    2 +-
 .../GridCacheExAbstractFullApiSelfTest.java     |    4 +-
 .../GridCacheFieldsQueryNoDataSelfTest.java     |    6 +-
 .../GridCacheFinishPartitionsSelfTest.java      |    7 +-
 ...CacheFullTextQueryMultithreadedSelfTest.java |    8 +-
 ...idCacheGetAndTransformStoreAbstractTest.java |    9 +-
 .../cache/GridCacheGlobalClearAllSelfTest.java  |   10 +-
 .../GridCacheGroupLockAbstractSelfTest.java     |    8 +-
 .../GridCacheGroupLockFailoverSelfTest.java     |    8 +-
 .../cache/GridCacheGroupLockPutTask.java        |    2 +-
 .../cache/GridCacheIncrementTransformTest.java  |   12 +-
 .../GridCacheInterceptorAbstractSelfTest.java   |   11 +-
 ...cheInterceptorAtomicNearEnabledSelfTest.java |    4 +-
 ...erceptorAtomicPrimaryWriteOrderSelfTest.java |   10 +-
 ...omicReplicatedPrimaryWriteOrderSelfTest.java |    8 +-
 ...acheInterceptorAtomicReplicatedSelfTest.java |    8 +-
 .../GridCacheInterceptorAtomicSelfTest.java     |    8 +-
 ...ceptorAtomicWithStoreReplicatedSelfTest.java |    2 +-
 ...CacheInterceptorAtomicWithStoreSelfTest.java |    2 +-
 ...GridCacheInterceptorLocalAtomicSelfTest.java |    8 +-
 ...InterceptorLocalAtomicWithStoreSelfTest.java |    2 +-
 .../GridCacheInterceptorLocalSelfTest.java      |    6 +-
 ...dCacheInterceptorLocalWithStoreSelfTest.java |    2 +-
 ...GridCacheInterceptorNearEnabledSelfTest.java |    2 +-
 .../GridCacheInterceptorReplicatedSelfTest.java |    6 +-
 ...eInterceptorReplicatedWithStoreSelfTest.java |    2 +-
 .../cache/GridCacheInterceptorSelfTest.java     |    6 +-
 .../GridCacheInterceptorWithStoreSelfTest.java  |    2 +-
 .../cache/GridCacheIteratorPerformanceTest.java |    4 +-
 .../GridCacheKeyCheckNearEnabledSelfTest.java   |    2 +-
 .../cache/GridCacheKeyCheckSelfTest.java        |    9 +-
 .../processors/cache/GridCacheLeakTest.java     |   12 +-
 .../cache/GridCacheLifecycleAwareSelfTest.java  |   12 +-
 .../GridCacheLocalTxStoreExceptionSelfTest.java |    4 +-
 .../cache/GridCacheLuceneQueryIndexTest.java    |    7 +-
 .../cache/GridCacheMemoryModeSelfTest.java      |    5 +-
 .../GridCacheMissingCommitVersionSelfTest.java  |    5 +-
 ...GridCacheMixedPartitionExchangeSelfTest.java |    8 +-
 .../cache/GridCacheMultiUpdateLockSelfTest.java |    9 +-
 ...ridCacheMultinodeUpdateAbstractSelfTest.java |    6 +-
 ...ultinodeUpdateAtomicNearEnabledSelfTest.java |    6 +-
 .../GridCacheMultinodeUpdateAtomicSelfTest.java |    6 +-
 ...CacheMultinodeUpdateNearEnabledSelfTest.java |    6 +-
 .../cache/GridCacheMultinodeUpdateSelfTest.java |    6 +-
 .../cache/GridCacheMvccFlagsTest.java           |    2 +-
 .../cache/GridCacheMvccManagerSelfTest.java     |    6 +-
 .../cache/GridCacheMvccPartitionedSelfTest.java |    6 +-
 .../processors/cache/GridCacheMvccSelfTest.java |    2 +-
 .../GridCacheNearTxStoreExceptionSelfTest.java  |    4 +-
 .../cache/GridCacheNestedTxAbstractTest.java    |    2 +-
 .../cache/GridCacheObjectToStringSelfTest.java  |   14 +-
 ...ffHeapAtomicMultiThreadedUpdateSelfTest.java |    4 +-
 ...HeapMultiThreadedUpdateAbstractSelfTest.java |   10 +-
 ...CacheOffHeapMultiThreadedUpdateSelfTest.java |    2 +-
 .../cache/GridCacheOffHeapSelfTest.java         |   10 +-
 .../processors/cache/GridCacheOffHeapTest.java  |   10 +-
 .../GridCacheOffHeapTieredAbstractSelfTest.java |   12 +-
 .../GridCacheOffHeapTieredAtomicSelfTest.java   |    4 +-
 ...heOffHeapTieredEvictionAbstractSelfTest.java |    8 +-
 ...acheOffHeapTieredEvictionAtomicSelfTest.java |    4 +-
 .../GridCacheOffHeapTieredEvictionSelfTest.java |    4 +-
 .../cache/GridCacheOffHeapTieredSelfTest.java   |    4 +-
 .../cache/GridCacheOffheapUpdateSelfTest.java   |    1 -
 .../GridCacheOrderedPreloadingSelfTest.java     |    6 +-
 .../cache/GridCacheP2PUndeploySelfTest.java     |   10 +-
 .../GridCachePartitionedAffinitySpreadTest.java |    4 +-
 .../cache/GridCachePartitionedGetSelfTest.java  |   10 +-
 ...hePartitionedProjectionAffinitySelfTest.java |   10 +-
 .../cache/GridCachePartitionedWritesTest.java   |    6 +-
 .../GridCachePreloadingEvictionsSelfTest.java   |   11 +-
 .../cache/GridCachePutAllFailoverSelfTest.java  |    5 +-
 .../processors/cache/GridCachePutAllTask.java   |    3 +-
 .../cache/GridCacheQueryEmbeddedValue.java      |    2 +-
 .../cache/GridCacheQueryIndexSelfTest.java      |    6 +-
 .../GridCacheQueryIndexingDisabledSelfTest.java |    3 +-
 .../GridCacheQueryInternalKeysSelfTest.java     |    6 +-
 .../GridCacheReferenceCleanupSelfTest.java      |    6 +-
 .../cache/GridCacheReloadSelfTest.java          |    8 +-
 ...ridCacheReplicatedSynchronousCommitTest.java |    4 +-
 ...CacheReplicatedTxStoreExceptionSelfTest.java |    6 +-
 .../GridCacheReturnValueTransferSelfTest.java   |   10 +-
 .../cache/GridCacheSlowTxWarnTest.java          |    4 +-
 .../processors/cache/GridCacheStopSelfTest.java |    6 +-
 .../cache/GridCacheStorePutxSelfTest.java       |    8 +-
 .../cache/GridCacheStoreValueBytesSelfTest.java |    6 +-
 .../cache/GridCacheSwapPreloadSelfTest.java     |    8 +-
 .../cache/GridCacheSwapReloadSelfTest.java      |    4 +-
 .../processors/cache/GridCacheTestEntryEx.java  |    2 +-
 .../processors/cache/GridCacheTestValue.java    |    4 +-
 .../processors/cache/GridCacheTestValue2.java   |    4 +-
 ...cheTransactionalAbstractMetricsSelfTest.java |    2 +-
 .../cache/GridCacheTtlManagerLoadTest.java      |    2 +-
 .../cache/GridCacheTtlManagerSelfTest.java      |    4 +-
 .../GridCacheValueBytesPreloadingSelfTest.java  |   12 +-
 ...idCacheValueConsistencyAbstractSelfTest.java |   12 +-
 ...istencyTransactionalNearEnabledSelfTest.java |    2 +-
 ...heValueConsistencyTransactionalSelfTest.java |    4 +-
 .../GridCacheVariableTopologySelfTest.java      |    5 +-
 .../GridCacheWriteBehindStoreAbstractTest.java  |    6 +-
 .../GridCacheWriteBehindStoreLocalTest.java     |    2 +-
 ...BehindStorePartitionedMultiNodeSelfTest.java |    6 +-
 ...ridCacheWriteBehindStorePartitionedTest.java |    2 +-
 ...GridCacheWriteBehindStoreReplicatedTest.java |    2 +-
 .../processors/cache/IgniteTxAbstractTest.java  |    4 +-
 .../IgniteTxExceptionAbstractSelfTest.java      |    4 +-
 .../cache/IgniteTxMultiNodeAbstractTest.java    |    8 +-
 .../IgniteTxMultiThreadedAbstractTest.java      |    2 +-
 .../cache/IgniteTxReentryAbstractSelfTest.java  |    6 +-
 .../IgniteTxStoreExceptionAbstractSelfTest.java |    4 +-
 ...eAbstractDataStructuresFailoverSelfTest.java |    4 +-
 ...actQueueFailoverDataConsistencySelfTest.java |   13 +-
 .../GridCacheAtomicLongApiSelfTest.java         |   14 +-
 ...CacheAtomicReferenceApiSelfAbstractTest.java |    7 +-
 ...cheAtomicReferenceMultiNodeAbstractTest.java |    3 +-
 ...idCacheAtomicStampedApiSelfAbstractTest.java |    2 +-
 .../GridCacheCountDownLatchSelfTest.java        |   12 +-
 .../GridCacheMultiNodeDataStructureTest.java    |    5 +-
 .../GridCacheQueueApiSelfAbstractTest.java      |    2 +-
 .../GridCacheQueueCleanupSelfTest.java          |    8 +-
 ...ridCacheQueueJoinedNodeSelfAbstractTest.java |    2 +-
 ...GridCacheQueueMultiNodeAbstractSelfTest.java |    5 +-
 ...dCacheQueueMultiNodeConsistencySelfTest.java |    5 +-
 ...CacheQueueRotativeMultiNodeAbstractTest.java |    3 +-
 .../GridCacheSequenceApiSelfAbstractTest.java   |    2 +-
 ...dCacheSequenceMultiNodeAbstractSelfTest.java |    3 +-
 .../GridCacheSetAbstractSelfTest.java           |   12 +-
 .../GridCacheSetFailoverAbstractSelfTest.java   |    8 +-
 .../GridCacheLocalAtomicQueueApiSelfTest.java   |    2 +-
 .../local/GridCacheLocalAtomicSetSelfTest.java  |    6 +-
 .../local/GridCacheLocalQueueApiSelfTest.java   |    4 +-
 .../GridCacheLocalSequenceApiSelfTest.java      |    4 +-
 .../local/GridCacheLocalSetSelfTest.java        |    4 +-
 ...dCachePartitionedAtomicQueueApiSelfTest.java |    4 +-
 ...ionedAtomicQueueCreateMultiNodeSelfTest.java |    4 +-
 ...micQueueFailoverDataConsistencySelfTest.java |    4 +-
 ...PartitionedAtomicQueueMultiNodeSelfTest.java |    4 +-
 ...itionedAtomicQueueRotativeMultiNodeTest.java |    4 +-
 ...hePartitionedAtomicReferenceApiSelfTest.java |    6 +-
 ...PartitionedAtomicReferenceMultiNodeTest.java |    4 +-
 ...titionedAtomicSequenceMultiThreadedTest.java |   10 +-
 ...chePartitionedAtomicSetFailoverSelfTest.java |    6 +-
 .../GridCachePartitionedAtomicSetSelfTest.java  |    8 +-
 ...achePartitionedAtomicStampedApiSelfTest.java |   10 +-
 ...rtitionedDataStructuresFailoverSelfTest.java |    4 +-
 ...GridCachePartitionedNodeRestartSelfTest.java |    8 +-
 ...idCachePartitionedNodeRestartTxSelfTest.java |   12 +-
 .../GridCachePartitionedQueueApiSelfTest.java   |   10 +-
 ...PartitionedQueueCreateMultiNodeSelfTest.java |   12 +-
 ...dCachePartitionedQueueEntryMoveSelfTest.java |    8 +-
 ...CachePartitionedQueueJoinedNodeSelfTest.java |   10 +-
 ...dCachePartitionedQueueMultiNodeSelfTest.java |    8 +-
 ...hePartitionedQueueRotativeMultiNodeTest.java |    6 +-
 ...GridCachePartitionedSequenceApiSelfTest.java |    8 +-
 ...chePartitionedSequenceMultiNodeSelfTest.java |    8 +-
 ...GridCachePartitionedSetFailoverSelfTest.java |    4 +-
 .../GridCachePartitionedSetSelfTest.java        |    4 +-
 ...cheReplicatedAtomicReferenceApiSelfTest.java |    4 +-
 ...eReplicatedAtomicReferenceMultiNodeTest.java |    4 +-
 ...CacheReplicatedAtomicStampedApiSelfTest.java |    4 +-
 ...eplicatedDataStructuresFailoverSelfTest.java |    4 +-
 .../GridCacheReplicatedQueueApiSelfTest.java    |    6 +-
 ...idCacheReplicatedQueueMultiNodeSelfTest.java |    6 +-
 ...cheReplicatedQueueRotativeMultiNodeTest.java |    6 +-
 .../GridCacheReplicatedSequenceApiSelfTest.java |    4 +-
 ...acheReplicatedSequenceMultiNodeSelfTest.java |    4 +-
 .../GridCacheReplicatedSetSelfTest.java         |    4 +-
 ...tractDistributedByteArrayValuesSelfTest.java |    2 +-
 .../GridCacheAbstractJobExecutionTest.java      |    4 +-
 .../GridCacheAbstractNodeRestartSelfTest.java   |    4 +-
 ...tractPartitionedByteArrayValuesSelfTest.java |   10 +-
 .../GridCacheAbstractPrimarySyncSelfTest.java   |   10 +-
 .../GridCacheAtomicTimeoutSelfTest.java         |   13 +-
 .../GridCacheBasicOpAbstractTest.java           |    2 +-
 .../GridCacheClientModesAbstractSelfTest.java   |    8 +-
 .../GridCacheEntrySetAbstractSelfTest.java      |    6 +-
 ...acheEntrySetIterationPreloadingSelfTest.java |    2 +-
 .../distributed/GridCacheEventAbstractTest.java |    2 +-
 ...heExpiredEntriesPreloadAbstractSelfTest.java |    4 +-
 .../distributed/GridCacheLockAbstractTest.java  |   11 +-
 .../distributed/GridCacheMixedModeSelfTest.java |    2 +-
 .../GridCacheModuloAffinityFunction.java        |    2 +-
 .../GridCacheMultiNodeAbstractTest.java         |    2 +-
 .../GridCacheMultiNodeLockAbstractTest.java     |    2 +-
 ...dCacheMultithreadedFailoverAbstractTest.java |   12 +-
 .../GridCacheNodeFailureAbstractTest.java       |    2 +-
 ...dCachePartitionedAffinityFilterSelfTest.java |   14 +-
 ...chePartitionedReloadAllAbstractSelfTest.java |   10 +-
 .../GridCachePreloadEventsAbstractSelfTest.java |    9 +-
 .../GridCachePreloadLifecycleAbstractTest.java  |    4 +-
 ...GridCachePreloadRestartAbstractSelfTest.java |   15 +-
 .../GridCacheTransformEventSelfTest.java        |   12 +-
 ...iteTxConsistencyRestartAbstractSelfTest.java |    8 +-
 ...xOriginatingNodeFailureAbstractSelfTest.java |    2 +-
 ...cOriginatingNodeFailureAbstractSelfTest.java |    2 +-
 .../IgniteTxPreloadAbstractTest.java            |    5 +-
 .../IgniteTxTimeoutAbstractTest.java            |    2 +-
 ...tPartitionedOnlyByteArrayValuesSelfTest.java |    7 +-
 ...heAbstractTransformWriteThroughSelfTest.java |    6 +-
 ...acheAtomicExpiredEntriesPreloadSelfTest.java |    8 +-
 .../dht/GridCacheAtomicFullApiSelfTest.java     |    8 +-
 .../dht/GridCacheAtomicNearCacheSelfTest.java   |   15 +-
 ...idCacheAtomicNearEnabledFullApiSelfTest.java |    4 +-
 ...EnabledPrimaryWriteOrderFullApiSelfTest.java |    4 +-
 ...eAtomicPrimaryWriteOrderFullApiSelfTest.java |    4 +-
 ...tomicPrimaryWriteOrderReloadAllSelfTest.java |    4 +-
 .../dht/GridCacheAtomicReloadAllSelfTest.java   |    4 +-
 .../dht/GridCacheClientOnlySelfTest.java        |    4 +-
 .../dht/GridCacheColocatedDebugTest.java        |    9 +-
 .../dht/GridCacheColocatedFailoverSelfTest.java |    6 +-
 ...eColocatedOptimisticTransactionSelfTest.java |   10 +-
 .../GridCacheColocatedPrimarySyncSelfTest.java  |    4 +-
 .../GridCacheColocatedTxExceptionSelfTest.java  |    6 +-
 ...ssimisticOriginatingNodeFailureSelfTest.java |    6 +-
 ...dCacheColocatedTxSingleThreadedSelfTest.java |    7 +-
 .../GridCacheDaemonNodePartitionedSelfTest.java |    2 +-
 ...cheDhtAtomicEvictionNearReadersSelfTest.java |    4 +-
 .../GridCacheDhtAtomicRemoveFailureTest.java    |    8 +-
 .../dht/GridCacheDhtEntrySelfTest.java          |   12 +-
 .../dht/GridCacheDhtEntrySetSelfTest.java       |    6 +-
 ...GridCacheDhtEvictionNearReadersSelfTest.java |   14 +-
 .../dht/GridCacheDhtEvictionSelfTest.java       |   14 +-
 .../GridCacheDhtEvictionsDisabledSelfTest.java  |    6 +-
 ...idCacheDhtExpiredEntriesPreloadSelfTest.java |    6 +-
 .../dht/GridCacheDhtInternalEntrySelfTest.java  |   15 +-
 .../dht/GridCacheDhtMappingSelfTest.java        |   10 +-
 .../dht/GridCacheDhtMultiBackupTest.java        |    3 +-
 .../dht/GridCacheDhtPreloadBigDataSelfTest.java |   10 +-
 .../dht/GridCacheDhtPreloadDelayedSelfTest.java |   14 +-
 .../GridCacheDhtPreloadDisabledSelfTest.java    |   11 +-
 .../GridCacheDhtPreloadMessageCountTest.java    |    7 +-
 ...ridCacheDhtPreloadMultiThreadedSelfTest.java |    4 +-
 .../dht/GridCacheDhtPreloadOffHeapSelfTest.java |    2 +-
 .../dht/GridCacheDhtPreloadPutGetSelfTest.java  |    8 +-
 .../dht/GridCacheDhtPreloadSelfTest.java        |   12 +-
 .../GridCacheDhtPreloadStartStopSelfTest.java   |   12 +-
 .../dht/GridCacheDhtPreloadUnloadSelfTest.java  |   10 +-
 .../dht/GridCacheDhtRemoveFailureTest.java      |    5 +-
 .../distributed/dht/GridCacheDhtTestUtils.java  |    7 +-
 .../dht/GridCacheDhtTxPreloadSelfTest.java      |    6 +-
 .../GridCacheExColocatedFullApiSelfTest.java    |    4 +-
 .../dht/GridCacheGlobalLoadTest.java            |    8 +-
 .../GridCacheGroupLockColocatedSelfTest.java    |    4 +-
 ...cheGroupLockPartitionedAbstractSelfTest.java |    6 +-
 ...ockPartitionedMultiNodeAbstractSelfTest.java |    4 +-
 ...ePartitionedNearDisabledFullApiSelfTest.java |    4 +-
 ...ePartitionedNearDisabledMetricsSelfTest.java |   10 +-
 ...nedNearDisabledMultiNodeFullApiSelfTest.java |    4 +-
 ...bledMultiNodeP2PDisabledFullApiSelfTest.java |    4 +-
 ...isabledTxOriginatingNodeFailureSelfTest.java |    2 +-
 ...dCachePartitionedOnlyProjectionSelfTest.java |    4 +-
 ...idCachePartitionedPreloadEventsSelfTest.java |    8 +-
 ...dCachePartitionedTopologyChangeSelfTest.java |   12 +-
 ...itionedTxOriginatingNodeFailureSelfTest.java |    2 +-
 ...ridCachePartitionedUnloadEventsSelfTest.java |    8 +-
 ...teTxConsistencyColocatedRestartSelfTest.java |    2 +-
 .../dht/IgniteTxReentryColocatedSelfTest.java   |    4 +-
 ...eAtomicInvalidPartitionHandlingSelfTest.java |   10 +-
 .../atomic/GridCacheAtomicPreloadSelfTest.java  |    7 +-
 ...lueConsistencyAtomicNearEnabledSelfTest.java |    6 +-
 ...micPrimaryWriteOrderNearEnabledSelfTest.java |    6 +-
 ...GridCacheValueConsistencyAtomicSelfTest.java |    6 +-
 ...tNearPartitionedByteArrayValuesSelfTest.java |    4 +-
 ...unctionExcludeNeighborsAbstractSelfTest.java |    6 +-
 ...tomicClientOnlyMultiNodeFullApiSelfTest.java |    6 +-
 ...GridCacheAtomicMultiNodeFullApiSelfTest.java |   10 +-
 ...omicMultiNodeP2PDisabledFullApiSelfTest.java |    7 +-
 ...omicNearEnabledMultiNodeFullApiSelfTest.java |    4 +-
 ...imaryWriteOrderMultiNodeFullApiSelfTest.java |    4 +-
 ...ridCacheAtomicNearEvictionEventSelfTest.java |    6 +-
 .../GridCacheAtomicNearEvictionSelfTest.java    |    4 +-
 .../GridCacheAtomicNearMultiNodeSelfTest.java   |    4 +-
 ...eAtomicNearOnlyMultiNodeFullApiSelfTest.java |    6 +-
 .../near/GridCacheAtomicNearOnlySelfTest.java   |    4 +-
 .../GridCacheAtomicNearReadersSelfTest.java     |    4 +-
 .../GridCacheAtomicNearRemoveFailureTest.java   |    8 +-
 .../GridCacheAtomicOffHeapFullApiSelfTest.java  |    7 +-
 ...heAtomicOffHeapMultiNodeFullApiSelfTest.java |    8 +-
 ...idCacheAtomicPartitionedMetricsSelfTest.java |   10 +-
 ...imaryWriteOrderMultiNodeFullApiSelfTest.java |    4 +-
 ...rderMultiNodeP2PDisabledFullApiSelfTest.java |    4 +-
 ...cPrimaryWriteOrderNearRemoveFailureTest.java |    8 +-
 ...PrimaryWriteOrderOffHeapFullApiSelfTest.java |    4 +-
 ...ityOrderOffHeapMultiNodeFullApiSelfTest.java |    4 +-
 ...ffinityFunctionExcludeNeighborsSelfTest.java |    4 +-
 .../near/GridCacheExNearFullApiSelfTest.java    |    6 +-
 .../near/GridCacheGetStoreErrorSelfTest.java    |    8 +-
 .../near/GridCacheGroupLockNearSelfTest.java    |    4 +-
 .../GridCacheNearEvictionEventSelfTest.java     |    4 +-
 .../near/GridCacheNearEvictionSelfTest.java     |   14 +-
 ...dCacheNearExpiredEntriesPreloadSelfTest.java |    6 +-
 .../near/GridCacheNearJobExecutionSelfTest.java |    6 +-
 .../near/GridCacheNearMetricsSelfTest.java      |    4 +-
 .../near/GridCacheNearMultiGetSelfTest.java     |   12 +-
 .../near/GridCacheNearMultiNodeSelfTest.java    |   12 +-
 .../near/GridCacheNearOneNodeSelfTest.java      |    8 +-
 ...idCacheNearOnlyMultiNodeFullApiSelfTest.java |    8 +-
 .../near/GridCacheNearOnlySelfTest.java         |    4 +-
 .../near/GridCacheNearOnlyTopologySelfTest.java |   10 +-
 .../GridCacheNearPartitionedClearSelfTest.java  |   12 +-
 .../near/GridCacheNearPrimarySyncSelfTest.java  |    4 +-
 .../GridCacheNearReaderPreloadSelfTest.java     |    9 +-
 .../near/GridCacheNearReadersSelfTest.java      |   11 +-
 .../near/GridCacheNearRemoveFailureTest.java    |    6 +-
 .../near/GridCacheNearTxExceptionSelfTest.java  |    4 +-
 .../near/GridCacheNearTxMultiNodeSelfTest.java  |   14 +-
 ...ssimisticOriginatingNodeFailureSelfTest.java |    6 +-
 .../near/GridCacheNearTxPreloadSelfTest.java    |    6 +-
 ...AffinityExcludeNeighborsPerformanceTest.java |    8 +-
 ...rtitionedAffinityHashIdResolverSelfTest.java |    6 +-
 .../GridCachePartitionedAffinitySelfTest.java   |   15 +-
 ...ionedAtomicGetAndTransformStoreSelfTest.java |    4 +-
 .../near/GridCachePartitionedBasicApiTest.java  |    6 +-
 .../GridCachePartitionedBasicOpSelfTest.java    |    6 +-
 ...ePartitionedBasicStoreMultiNodeSelfTest.java |   10 +-
 .../GridCachePartitionedBasicStoreSelfTest.java |    4 +-
 ...ionedClientOnlyNoPrimaryFullApiSelfTest.java |    2 +-
 .../GridCachePartitionedEntryLockSelfTest.java  |    4 +-
 .../near/GridCachePartitionedEventSelfTest.java |   10 +-
 .../GridCachePartitionedEvictionSelfTest.java   |    8 +-
 ...titionedExplicitLockNodeFailureSelfTest.java |    9 +-
 .../GridCachePartitionedFailoverSelfTest.java   |    4 +-
 ...GridCachePartitionedFilteredPutSelfTest.java |    8 +-
 .../near/GridCachePartitionedFlagsTest.java     |    2 +-
 ...PartitionedFullApiMultithreadedSelfTest.java |    4 +-
 .../GridCachePartitionedFullApiSelfTest.java    |    6 +-
 ...PartitionedGetAndTransformStoreSelfTest.java |    4 +-
 .../GridCachePartitionedIteratorsSelfTest.java  |    4 +-
 .../GridCachePartitionedLoadCacheSelfTest.java  |    8 +-
 .../near/GridCachePartitionedLockSelfTest.java  |    4 +-
 .../GridCachePartitionedMetricsSelfTest.java    |    6 +-
 ...achePartitionedMultiNodeCounterSelfTest.java |   11 +-
 ...achePartitionedMultiNodeFullApiSelfTest.java |   10 +-
 ...idCachePartitionedMultiNodeLockSelfTest.java |    6 +-
 .../GridCachePartitionedMultiNodeSelfTest.java  |    8 +-
 ...ePartitionedMultiThreadedPutGetSelfTest.java |   10 +-
 ...NearDisabledBasicStoreMultiNodeSelfTest.java |    4 +-
 ...itionedNearOnlyNoPrimaryFullApiSelfTest.java |    2 +-
 .../near/GridCachePartitionedNestedTxTest.java  |    4 +-
 ...GridCachePartitionedNodeFailureSelfTest.java |    8 +-
 .../GridCachePartitionedNodeRestartTest.java    |    8 +-
 ...ePartitionedOptimisticTxNodeRestartTest.java |    6 +-
 ...achePartitionedPreloadLifecycleSelfTest.java |    9 +-
 .../GridCachePartitionedProjectionSelfTest.java |    6 +-
 ...hePartitionedQueryMultiThreadedSelfTest.java |    9 +-
 .../GridCachePartitionedStorePutSelfTest.java   |    6 +-
 ...GridCachePartitionedTxConcurrentGetTest.java |    4 +-
 ...GridCachePartitionedTxMultiNodeSelfTest.java |    4 +-
 ...CachePartitionedTxMultiThreadedSelfTest.java |    4 +-
 .../near/GridCachePartitionedTxReadTest.java    |    2 +-
 .../GridCachePartitionedTxSalvageSelfTest.java  |    4 +-
 ...achePartitionedTxSingleThreadedSelfTest.java |    8 +-
 .../GridCachePartitionedTxTimeoutSelfTest.java  |    4 +-
 .../near/GridCachePutArrayValueSelfTest.java    |    3 +-
 ...idCacheRendezvousAffinityClientSelfTest.java |    8 +-
 ...ffinityFunctionExcludeNeighborsSelfTest.java |    4 +-
 .../near/GridPartitionedBackupLoadSelfTest.java |    6 +-
 .../near/IgniteTxReentryNearSelfTest.java       |    4 +-
 ...stractReplicatedByteArrayValuesSelfTest.java |    8 +-
 ...ridCacheAtomicReplicatedMetricsSelfTest.java |    6 +-
 .../GridCacheDaemonNodeReplicatedSelfTest.java  |    2 +-
 .../GridCacheExReplicatedFullApiSelfTest.java   |    4 +-
 ...cheGroupLockMultiNodeReplicatedSelfTest.java |    4 +-
 .../GridCacheGroupLockReplicatedSelfTest.java   |    4 +-
 ...ridCacheReplicatedAtomicFullApiSelfTest.java |    4 +-
 ...catedAtomicGetAndTransformStoreSelfTest.java |    4 +-
 ...eplicatedAtomicMultiNodeFullApiSelfTest.java |    6 +-
 ...imaryWriteOrderMultiNodeFullApiSelfTest.java |    4 +-
 .../GridCacheReplicatedBasicApiTest.java        |    2 +-
 .../GridCacheReplicatedBasicOpSelfTest.java     |    2 +-
 .../GridCacheReplicatedBasicStoreSelfTest.java  |    6 +-
 .../GridCacheReplicatedClientOnlySelfTest.java  |    4 +-
 .../GridCacheReplicatedEntrySetSelfTest.java    |    4 +-
 .../GridCacheReplicatedEventSelfTest.java       |    4 +-
 ...ridCacheReplicatedEvictionEventSelfTest.java |    4 +-
 .../GridCacheReplicatedEvictionSelfTest.java    |    5 +-
 .../GridCacheReplicatedFailoverSelfTest.java    |    4 +-
 .../GridCacheReplicatedFlagsTest.java           |    2 +-
 ...eReplicatedFullApiMultithreadedSelfTest.java |    4 +-
 .../GridCacheReplicatedFullApiSelfTest.java     |    5 +-
 ...eReplicatedGetAndTransformStoreSelfTest.java |    4 +-
 .../GridCacheReplicatedInvalidateSelfTest.java  |    7 +-
 .../GridCacheReplicatedIteratorsSelfTest.java   |    4 +-
 .../GridCacheReplicatedJobExecutionTest.java    |    3 +-
 .../GridCacheReplicatedLockSelfTest.java        |    4 +-
 .../GridCacheReplicatedMarshallerTxTest.java    |    4 +-
 .../GridCacheReplicatedMetricsSelfTest.java     |    2 +-
 ...ridCacheReplicatedMultiNodeLockSelfTest.java |    2 +-
 .../GridCacheReplicatedMultiNodeSelfTest.java   |    2 +-
 ...licatedNearOnlyMultiNodeFullApiSelfTest.java |    4 +-
 .../GridCacheReplicatedNearOnlySelfTest.java    |    4 +-
 .../GridCacheReplicatedNodeFailureSelfTest.java |    4 +-
 .../GridCacheReplicatedNodeRestartSelfTest.java |    6 +-
 ...ridCacheReplicatedPreloadEventsSelfTest.java |    4 +-
 .../GridCacheReplicatedProjectionSelfTest.java  |    6 +-
 ...dezvousAffinityMultiNodeFullApiSelfTest.java |    4 +-
 .../GridCacheReplicatedTxConcurrentGetTest.java |    4 +-
 .../GridCacheReplicatedTxExceptionSelfTest.java |    6 +-
 ...GridCacheReplicatedTxMultiNodeBasicTest.java |    4 +-
 ...dCacheReplicatedTxMultiThreadedSelfTest.java |    4 +-
 ...licatedTxOriginatingNodeFailureSelfTest.java |    2 +-
 ...ssimisticOriginatingNodeFailureSelfTest.java |    6 +-
 .../GridCacheReplicatedTxReadTest.java          |    2 +-
 ...CacheReplicatedTxSingleThreadedSelfTest.java |    4 +-
 .../GridCacheReplicatedTxTimeoutSelfTest.java   |    2 +-
 ...idCacheReplicatedUnswapAdvancedSelfTest.java |    4 +-
 .../GridCacheSyncReplicatedPreloadSelfTest.java |    8 +-
 .../replicated/GridReplicatedTxPreloadTest.java |    4 +-
 ...CacheReplicatedPreloadLifecycleSelfTest.java |   10 +-
 ...idCacheReplicatedPreloadOffHeapSelfTest.java |    2 +-
 .../GridCacheReplicatedPreloadSelfTest.java     |    9 +-
 ...eplicatedPreloadStartStopEventsSelfTest.java |    2 +-
 .../GridCacheBatchEvictUnswapSelfTest.java      |    5 +-
 ...heConcurrentEvictionConsistencySelfTest.java |   14 +-
 .../GridCacheConcurrentEvictionsSelfTest.java   |   14 +-
 .../GridCacheDistributedEvictionsSelfTest.java  |   10 +-
 .../GridCacheEmptyEntriesAbstractSelfTest.java  |    8 +-
 .../GridCacheEmptyEntriesLocalSelfTest.java     |    2 +-
 ...ridCacheEmptyEntriesPartitionedSelfTest.java |    2 +-
 .../eviction/GridCacheEvictionAbstractTest.java |   12 +-
 .../GridCacheEvictionFilterSelfTest.java        |   12 +-
 .../GridCacheEvictionLockUnlockSelfTest.java    |   10 +-
 .../GridCacheEvictionTouchSelfTest.java         |   11 +-
 .../cache/eviction/GridCacheMockEntry.java      |    2 +-
 ...cheSynchronousEvictionsFailoverSelfTest.java |   10 +-
 .../GridCacheFifoEvictionPolicySelfTest.java    |    6 +-
 .../lru/GridCacheLruEvictionPolicySelfTest.java |    4 +-
 .../GridCacheLruNearEvictionPolicySelfTest.java |   14 +-
 ...heNearOnlyLruNearEvictionPolicySelfTest.java |   14 +-
 .../GridCacheRandomEvictionPolicySelfTest.java  |    5 +-
 .../GridCacheAtomicLocalMetricsSelfTest.java    |    6 +-
 .../local/GridCacheDaemonNodeLocalSelfTest.java |    5 +-
 .../local/GridCacheExLocalFullApiSelfTest.java  |    2 +-
 .../GridCacheLocalAtomicBasicStoreSelfTest.java |    4 +-
 .../GridCacheLocalAtomicFullApiSelfTest.java    |    4 +-
 ...LocalAtomicGetAndTransformStoreSelfTest.java |    4 +-
 ...dCacheLocalAtomicOffHeapFullApiSelfTest.java |    4 +-
 .../GridCacheLocalAtomicProjectionSelfTest.java |    4 +-
 .../local/GridCacheLocalBasicApiSelfTest.java   |    2 +-
 ...cheLocalBasicStoreMultithreadedSelfTest.java |    2 +-
 .../local/GridCacheLocalBasicStoreSelfTest.java |    6 +-
 .../GridCacheLocalByteArrayValuesSelfTest.java  |   10 +-
 .../local/GridCacheLocalEventSelfTest.java      |    4 +-
 .../GridCacheLocalEvictionEventSelfTest.java    |    4 +-
 ...dCacheLocalFullApiMultithreadedSelfTest.java |    4 +-
 .../local/GridCacheLocalFullApiSelfTest.java    |    3 +-
 ...dCacheLocalGetAndTransformStoreSelfTest.java |    4 +-
 .../local/GridCacheLocalIteratorsSelfTest.java  |    4 +-
 .../local/GridCacheLocalLoadAllSelfTest.java    |    2 +-
 .../cache/local/GridCacheLocalLockSelfTest.java |    2 +-
 .../local/GridCacheLocalMetricsSelfTest.java    |    2 +-
 .../GridCacheLocalMultithreadedSelfTest.java    |    4 +-
 .../local/GridCacheLocalProjectionSelfTest.java |    4 +-
 .../GridCacheLocalTxExceptionSelfTest.java      |    4 +-
 .../GridCacheLocalTxMultiThreadedSelfTest.java  |    2 +-
 .../cache/local/GridCacheLocalTxReadTest.java   |    2 +-
 .../GridCacheLocalTxSingleThreadedSelfTest.java |    2 +-
 .../local/GridCacheLocalTxTimeoutSelfTest.java  |    4 +-
 .../GridCacheSwapScanQueryAbstractSelfTest.java |   14 +-
 ...ridCacheContinuousQueryAbstractSelfTest.java |   16 +-
 ...ontinuousQueryAtomicNearEnabledSelfTest.java |    4 +-
 .../GridCacheContinuousQueryAtomicSelfTest.java |    6 +-
 ...CacheContinuousQueryLocalAtomicSelfTest.java |    4 +-
 .../GridCacheContinuousQueryLocalSelfTest.java  |    4 +-
 ...eContinuousQueryPartitionedOnlySelfTest.java |    6 +-
 ...CacheContinuousQueryPartitionedSelfTest.java |    4 +-
 ...ContinuousQueryReplicatedAtomicSelfTest.java |    4 +-
 ...dCacheContinuousQueryReplicatedSelfTest.java |    6 +-
 ...dCacheAbstractReduceFieldsQuerySelfTest.java |   16 +-
 ...ridCacheReduceFieldsQueryAtomicSelfTest.java |    6 +-
 ...GridCacheReduceFieldsQueryLocalSelfTest.java |    4 +-
 ...cheReduceFieldsQueryPartitionedSelfTest.java |    6 +-
 ...acheReduceFieldsQueryReplicatedSelfTest.java |    4 +-
 .../dataload/GridDataLoaderImplSelfTest.java    |    6 +-
 .../dataload/GridDataLoaderPerformanceTest.java |    6 +-
 .../GridDataLoaderProcessorSelfTest.java        |   12 +-
 ...heGgfsPerBlockLruEvictionPolicySelfTest.java |    8 +-
 .../ggfs/GridGgfsAbstractSelfTest.java          |    7 +-
 .../processors/ggfs/GridGgfsCacheSelfTest.java  |    6 +-
 .../ggfs/GridGgfsDataManagerSelfTest.java       |    6 +-
 .../ggfs/GridGgfsDualAbstractSelfTest.java      |    2 +-
 .../ggfs/GridGgfsMetaManagerSelfTest.java       |    8 +-
 .../ggfs/GridGgfsMetricsSelfTest.java           |    6 +-
 .../processors/ggfs/GridGgfsModesSelfTest.java  |    6 +-
 .../GridGgfsPrimaryOffheapTieredSelfTest.java   |    2 +-
 .../GridGgfsPrimaryOffheapValuesSelfTest.java   |    2 +-
 .../ggfs/GridGgfsProcessorSelfTest.java         |    6 +-
 .../GridGgfsProcessorValidationSelfTest.java    |    4 +-
 ...IpcEndpointRegistrationAbstractSelfTest.java |    4 +-
 .../processors/ggfs/GridGgfsSizeSelfTest.java   |   10 +-
 .../ggfs/GridGgfsStreamsSelfTest.java           |    6 +-
 .../processors/ggfs/GridGgfsTaskSelfTest.java   |    9 +-
 .../GridGgfsAbstractRecordResolverSelfTest.java |    8 +-
 .../cache/GridCacheCommandHandlerSelfTest.java  |    1 -
 .../GridServiceProcessorAbstractSelfTest.java   |    2 +-
 .../gridgain/grid/lang/GridFuncSelfTest.java    |    2 +-
 .../marshaller/GridMarshallerAbstractTest.java  |    8 +-
 .../GridP2PContinuousDeploymentSelfTest.java    |    6 +-
 .../shmem/GridIpcSharedMemoryNodeStartup.java   |    6 +-
 ...idOffHeapPartitionedMapAbstractSelfTest.java |    4 +-
 ...apPartitionedMapPerformanceAbstractTest.java |    4 +-
 ...GridUnsafePartitionedMapPerformanceTest.java |    2 +-
 .../loadtests/GridCacheMultiNodeLoadTest.java   |   10 +-
 .../cache/GridCacheAbstractLoadTest.java        |    2 +-
 ...ridCacheAffinityTransactionsOffHeapTest.java |   12 +-
 .../loadtests/cache/GridCacheBenchmark.java     |    2 +-
 .../cache/GridCacheDataStructuresLoadTest.java  |    5 +-
 .../cache/GridCacheGroupLockComparisonTest.java |    4 +-
 .../loadtests/cache/GridCacheLoadTest.java      |    3 +-
 .../cache/GridCachePutRemoveLoadTest.java       |   10 +-
 .../cache/GridCacheSingleNodeLoadTest.java      |    7 +-
 .../loadtests/cache/GridCacheSwapLoadTest.java  |    3 +-
 .../GridCacheWriteBehindStoreLoadTest.java      |    4 +-
 .../capacity/GridCapacityLoadTest.java          |    2 +-
 .../capacity/spring-capacity-cache.xml          |    2 +-
 .../colocation/GridTestCacheStore.java          |    3 +-
 .../loadtests/colocation/GridTestKey.java       |    2 +-
 .../colocation/GridTestLifecycleBean.java       |    3 +-
 .../loadtests/colocation/GridTestMain.java      |    3 +-
 .../loadtests/colocation/spring-colocation.xml  |    2 +-
 .../GridContinuousOperationsLoadTest.java       |    6 +-
 .../GridCachePartitionedAtomicLongLoadTest.java |    9 +-
 .../gridgain/loadtests/dsi/GridDsiPerfJob.java  |    6 +-
 .../gridgain/loadtests/dsi/GridDsiRequest.java  |    2 +-
 .../gridgain/loadtests/dsi/GridDsiResponse.java |    2 +-
 .../gridgain/loadtests/dsi/GridDsiSession.java  |    2 +-
 .../cacheget/GridBenchmarkCacheGetLoadTest.java |    2 +-
 .../gridgain/loadtests/mapper/TestObject.java   |    2 +-
 ...apPartitionedMapPerformanceAbstractTest.java |    4 +-
 ...GridUnsafePartitionedMapPerformanceTest.java |    2 +-
 .../swap/GridSwapEvictAllBenchmark.java         |    4 +-
 .../gridgain/testframework/GridTestUtils.java   |    4 +-
 .../testframework/junits/GridAbstractTest.java  |    8 +-
 .../junits/common/GridCommonAbstractTest.java   |    8 +-
 .../core/src/test/webapp/META-INF/gg-config.xml |    8 +-
 .../tests/p2p/GridCacheDeploymentTestTask1.java |    2 +-
 .../tests/p2p/GridExternalAffinityFunction.java |    1 +
 .../p2p/GridExternalAffinityKeyMapper.java      |    1 +
 .../hadoop/jobtracker/GridHadoopJobTracker.java |    3 +-
 ...dGgfsHadoop20FileSystemAbstractSelfTest.java |    6 +-
 .../GridGgfsHadoopDualAbstractSelfTest.java     |    5 +-
 ...ridGgfsHadoopFileSystemAbstractSelfTest.java |    6 +-
 .../GridGgfsHadoopFileSystemClientSelfTest.java |    8 +-
 ...idGgfsHadoopFileSystemHandshakeSelfTest.java |    8 +-
 ...ridGgfsHadoopFileSystemIpcCacheSelfTest.java |    6 +-
 ...GgfsHadoopFileSystemLoggerStateSelfTest.java |    6 +-
 ...fsHadoopFileSystemSecondaryModeSelfTest.java |    6 +-
 .../ggfs/GridGgfsNearOnlyMultiNodeSelfTest.java |    7 +-
 .../hadoop/GridHadoopAbstractSelfTest.java      |    6 +-
 ...idHadoopDefaultMapReducePlannerSelfTest.java |    2 +-
 .../GridHibernateAccessStrategyAdapter.java     |    3 +-
 .../GridHibernateCollectionRegion.java          |    2 +-
 .../hibernate/GridHibernateEntityRegion.java    |    2 +-
 .../GridHibernateGeneralDataRegion.java         |    3 +-
 .../hibernate/GridHibernateNaturalIdRegion.java |    2 +-
 .../GridHibernateNonStrictAccessStrategy.java   |    3 +-
 .../GridHibernateQueryResultsRegion.java        |    2 +-
 .../GridHibernateReadOnlyAccessStrategy.java    |    3 +-
 .../GridHibernateReadWriteAccessStrategy.java   |    2 +-
 .../cache/hibernate/GridHibernateRegion.java    |    2 +-
 .../hibernate/GridHibernateRegionFactory.java   |    6 +-
 .../GridHibernateTimestampsRegion.java          |    2 +-
 ...ridHibernateTransactionalAccessStrategy.java |    5 +-
 .../GridHibernateTransactionalDataRegion.java   |    4 +-
 ...idHibernateL2CacheConfigurationSelfTest.java |    6 +-
 .../hibernate/GridHibernateL2CacheSelfTest.java |    9 +-
 ...idHibernateL2CacheTransactionalSelfTest.java |    2 +-
 .../processors/query/h2/GridH2Indexing.java     |    2 +-
 .../tcp/GridOrderedMessageCancelSelfTest.java   |    6 +-
 .../GridCacheAbstractFieldsQuerySelfTest.java   |   12 +-
 .../cache/GridCacheAbstractQuerySelfTest.java   |   14 +-
 .../cache/GridCacheCrossCacheQuerySelfTest.java |   10 +-
 .../cache/GridCacheOffHeapAndSwapSelfTest.java  |   12 +-
 .../cache/GridCacheQueryLoadSelfTest.java       |    8 +-
 .../cache/GridCacheQueryMetricsSelfTest.java    |    9 +-
 .../GridCacheQueryMultiThreadedSelfTest.java    |   10 +-
 .../cache/GridCacheQueryTestValue.java          |    2 +-
 .../GridCacheQueryUserResourceSelfTest.java     |    4 +-
 ...idCacheReduceQueryMultithreadedSelfTest.java |    7 +-
 .../GridCacheSqlQueryMultiThreadedSelfTest.java |   10 +-
 .../processors/cache/GridCacheSwapSelfTest.java |    9 +-
 .../cache/GridIndexingWithNoopSwapSelfTest.java |   12 +-
 .../GridCacheAtomicFieldsQuerySelfTest.java     |    8 +-
 ...cheAtomicNearEnabledFieldsQuerySelfTest.java |    4 +-
 ...GridCacheAtomicNearEnabledQuerySelfTest.java |    6 +-
 .../near/GridCacheAtomicQuerySelfTest.java      |    6 +-
 ...GridCachePartitionedFieldsQuerySelfTest.java |   10 +-
 ...idCachePartitionedHitsAndMissesSelfTest.java |   10 +-
 .../near/GridCachePartitionedQuerySelfTest.java |    6 +-
 .../near/GridCacheQueryNodeRestartSelfTest.java |   10 +-
 .../GridCacheReplicatedFieldsQuerySelfTest.java |    7 +-
 .../GridCacheReplicatedQuerySelfTest.java       |    6 +-
 .../GridCacheLocalAtomicQuerySelfTest.java      |    4 +-
 .../GridCacheLocalFieldsQuerySelfTest.java      |    4 +-
 .../local/GridCacheLocalQuerySelfTest.java      |    7 +-
 .../query/h2/GridH2IndexRebuildTest.java        |    4 +-
 .../query/h2/GridH2IndexingGeoSelfTest.java     |    4 +-
 .../loadtests/h2indexing/GridTestEntity.java    |    2 +-
 ...CacheJtaConfigurationValidationSelfTest.java |    2 +-
 .../processors/cache/GridCacheJtaSelfTest.java  |    3 +-
 .../cache/GridCacheReplicatedJtaSelfTest.java   |    4 +-
 .../GridTmLookupLifecycleAwareSelfTest.java     |    6 +-
 .../org/gridgain/scalar/ScalarConversions.scala |    1 +
 .../gridgain/scalar/pimps/ScalarCachePimp.scala |    3 +-
 .../pimps/ScalarCacheProjectionPimp.scala       |   35 +-
 .../main/scala/org/gridgain/scalar/scalar.scala |    2 +
 .../scalar/tests/ScalarCacheQueriesSpec.scala   |    1 +
 .../java/org/gridgain/grid/GridSpringBean.java  |    2 +-
 .../grid/cache/spring/GridSpringCache.java      |    2 +-
 .../cache/spring/GridSpringCacheManager.java    |    2 +-
 .../spring/GridSpringDynamicCacheManager.java   |    2 +-
 .../spring/GridSpringCacheManagerSelfTest.java  |    1 -
 .../GridSpringDynamicCacheManagerSelfTest.java  |    2 +-
 .../p2p/GridP2PUserVersionChangeSelfTest.java   |    1 -
 .../cache/VisorCacheClearCommandSpec.scala      |    5 +-
 .../commands/cache/VisorCacheCommandSpec.scala  |    3 +-
 .../cache/VisorCacheCompactCommandSpec.scala    |    3 +-
 .../cswap/VisorCacheSwapCommandSpec.scala       |    2 +-
 .../cache/websession/GridWebSessionFilter.java  |   15 +-
 .../websession/GridWebSessionSelfTest.java      |    2 +-
 1153 files changed, 14810 insertions(+), 14813 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/examples/config/example-cache.xml
----------------------------------------------------------------------
diff --git a/examples/config/example-cache.xml b/examples/config/example-cache.xml
index e4e513c..20c23f6 100644
--- a/examples/config/example-cache.xml
+++ b/examples/config/example-cache.xml
@@ -144,7 +144,7 @@
 
         <!-- Allow to index primitive values. -->
         <property name="queryConfiguration">
-            <bean class="org.gridgain.grid.cache.query.GridCacheQueryConfiguration">
+            <bean class="org.apache.ignite.cache.query.GridCacheQueryConfiguration">
                 <!-- Index primitives. -->
                 <property name="indexPrimitiveKey" value="true"/>
             </bean>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/examples/src/main/java/org/gridgain/examples/datagrid/CacheAffinityExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/gridgain/examples/datagrid/CacheAffinityExample.java b/examples/src/main/java/org/gridgain/examples/datagrid/CacheAffinityExample.java
index 44fa5b0..6aeb85b 100644
--- a/examples/src/main/java/org/gridgain/examples/datagrid/CacheAffinityExample.java
+++ b/examples/src/main/java/org/gridgain/examples/datagrid/CacheAffinityExample.java
@@ -18,10 +18,9 @@
 package org.gridgain.examples.datagrid;
 
 import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.lang.*;
-import org.gridgain.grid.*;
-import org.gridgain.grid.cache.*;
 
 import java.util.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/examples/src/main/java/org/gridgain/examples/datagrid/CacheApiExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/gridgain/examples/datagrid/CacheApiExample.java b/examples/src/main/java/org/gridgain/examples/datagrid/CacheApiExample.java
index ce64376..aedbe66 100644
--- a/examples/src/main/java/org/gridgain/examples/datagrid/CacheApiExample.java
+++ b/examples/src/main/java/org/gridgain/examples/datagrid/CacheApiExample.java
@@ -18,8 +18,8 @@
 package org.gridgain.examples.datagrid;
 
 import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
 import org.apache.ignite.lang.*;
-import org.gridgain.grid.cache.*;
 
 import javax.cache.processor.*;
 import java.util.concurrent.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/examples/src/main/java/org/gridgain/examples/datagrid/CacheContinuousQueryExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/gridgain/examples/datagrid/CacheContinuousQueryExample.java b/examples/src/main/java/org/gridgain/examples/datagrid/CacheContinuousQueryExample.java
index 30de489..d2e22e6 100644
--- a/examples/src/main/java/org/gridgain/examples/datagrid/CacheContinuousQueryExample.java
+++ b/examples/src/main/java/org/gridgain/examples/datagrid/CacheContinuousQueryExample.java
@@ -18,10 +18,9 @@
 package org.gridgain.examples.datagrid;
 
 import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
+import org.apache.ignite.cache.query.*;
 import org.apache.ignite.lang.*;
-import org.gridgain.grid.*;
-import org.gridgain.grid.cache.*;
-import org.gridgain.grid.cache.query.*;
 
 import java.util.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/examples/src/main/java/org/gridgain/examples/datagrid/CacheEventsExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/gridgain/examples/datagrid/CacheEventsExample.java b/examples/src/main/java/org/gridgain/examples/datagrid/CacheEventsExample.java
index 5fc6ced..2b8d89e 100644
--- a/examples/src/main/java/org/gridgain/examples/datagrid/CacheEventsExample.java
+++ b/examples/src/main/java/org/gridgain/examples/datagrid/CacheEventsExample.java
@@ -18,10 +18,9 @@
 package org.gridgain.examples.datagrid;
 
 import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
 import org.apache.ignite.events.*;
 import org.apache.ignite.lang.*;
-import org.gridgain.grid.*;
-import org.gridgain.grid.cache.*;
 
 import java.util.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/examples/src/main/java/org/gridgain/examples/datagrid/CachePopularNumbersExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/gridgain/examples/datagrid/CachePopularNumbersExample.java b/examples/src/main/java/org/gridgain/examples/datagrid/CachePopularNumbersExample.java
index 60f36f6..60bd655 100644
--- a/examples/src/main/java/org/gridgain/examples/datagrid/CachePopularNumbersExample.java
+++ b/examples/src/main/java/org/gridgain/examples/datagrid/CachePopularNumbersExample.java
@@ -18,10 +18,10 @@
 package org.gridgain.examples.datagrid;
 
 import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
+import org.apache.ignite.cache.query.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.dataload.*;
-import org.gridgain.grid.cache.*;
-import org.gridgain.grid.cache.query.*;
 
 import javax.cache.processor.*;
 import java.util.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/examples/src/main/java/org/gridgain/examples/datagrid/CachePutGetExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/gridgain/examples/datagrid/CachePutGetExample.java b/examples/src/main/java/org/gridgain/examples/datagrid/CachePutGetExample.java
index d089668..b5d64e9 100644
--- a/examples/src/main/java/org/gridgain/examples/datagrid/CachePutGetExample.java
+++ b/examples/src/main/java/org/gridgain/examples/datagrid/CachePutGetExample.java
@@ -18,8 +18,7 @@
 package org.gridgain.examples.datagrid;
 
 import org.apache.ignite.*;
-import org.gridgain.grid.*;
-import org.gridgain.grid.cache.*;
+import org.apache.ignite.cache.*;
 
 import java.util.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/examples/src/main/java/org/gridgain/examples/datagrid/CacheQueryExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/gridgain/examples/datagrid/CacheQueryExample.java b/examples/src/main/java/org/gridgain/examples/datagrid/CacheQueryExample.java
index 03f9c5f..3de6932 100644
--- a/examples/src/main/java/org/gridgain/examples/datagrid/CacheQueryExample.java
+++ b/examples/src/main/java/org/gridgain/examples/datagrid/CacheQueryExample.java
@@ -18,11 +18,11 @@
 package org.gridgain.examples.datagrid;
 
 import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
+import org.apache.ignite.cache.affinity.*;
+import org.apache.ignite.cache.query.*;
 import org.apache.ignite.lang.*;
-import org.gridgain.grid.*;
-import org.gridgain.grid.cache.*;
 import org.gridgain.grid.cache.affinity.*;
-import org.gridgain.grid.cache.query.*;
 
 import java.io.*;
 import java.util.*;
@@ -48,7 +48,7 @@ import java.util.*;
  *     </li>
  *     <li>
  *         Joins will work correctly only if joined objects are stored in
- *         collocated mode. Refer to {@link GridCacheAffinityKey} javadoc for more details.
+ *         collocated mode. Refer to {@link org.apache.ignite.cache.affinity.GridCacheAffinityKey} javadoc for more details.
  *     </li>
  *     <li>
  *         Note that if you created query on to replicated cache, all data will

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/examples/src/main/java/org/gridgain/examples/datagrid/CacheTransactionExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/gridgain/examples/datagrid/CacheTransactionExample.java b/examples/src/main/java/org/gridgain/examples/datagrid/CacheTransactionExample.java
index 190fb0a..20dce3e 100644
--- a/examples/src/main/java/org/gridgain/examples/datagrid/CacheTransactionExample.java
+++ b/examples/src/main/java/org/gridgain/examples/datagrid/CacheTransactionExample.java
@@ -18,12 +18,12 @@
 package org.gridgain.examples.datagrid;
 
 import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
 import org.apache.ignite.transactions.*;
-import org.gridgain.grid.cache.*;
 
 import java.io.*;
 
-import static org.gridgain.grid.cache.GridCacheFlag.*;
+import static org.apache.ignite.cache.GridCacheFlag.*;
 import static org.apache.ignite.transactions.IgniteTxConcurrency.*;
 import static org.apache.ignite.transactions.IgniteTxIsolation.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/examples/src/main/java/org/gridgain/examples/datagrid/datastructures/CacheAtomicLongExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/gridgain/examples/datagrid/datastructures/CacheAtomicLongExample.java b/examples/src/main/java/org/gridgain/examples/datagrid/datastructures/CacheAtomicLongExample.java
index 65a4385..d078a8c 100644
--- a/examples/src/main/java/org/gridgain/examples/datagrid/datastructures/CacheAtomicLongExample.java
+++ b/examples/src/main/java/org/gridgain/examples/datagrid/datastructures/CacheAtomicLongExample.java
@@ -18,10 +18,9 @@
 package org.gridgain.examples.datagrid.datastructures;
 
 import org.apache.ignite.*;
+import org.apache.ignite.cache.datastructures.*;
 import org.apache.ignite.lang.*;
 import org.gridgain.examples.datagrid.*;
-import org.gridgain.grid.*;
-import org.gridgain.grid.cache.datastructures.*;
 
 import java.util.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/examples/src/main/java/org/gridgain/examples/datagrid/datastructures/CacheAtomicReferenceExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/gridgain/examples/datagrid/datastructures/CacheAtomicReferenceExample.java b/examples/src/main/java/org/gridgain/examples/datagrid/datastructures/CacheAtomicReferenceExample.java
index 66b8157..c91e3cc 100644
--- a/examples/src/main/java/org/gridgain/examples/datagrid/datastructures/CacheAtomicReferenceExample.java
+++ b/examples/src/main/java/org/gridgain/examples/datagrid/datastructures/CacheAtomicReferenceExample.java
@@ -18,10 +18,9 @@
 package org.gridgain.examples.datagrid.datastructures;
 
 import org.apache.ignite.*;
+import org.apache.ignite.cache.datastructures.*;
 import org.apache.ignite.lang.*;
 import org.gridgain.examples.datagrid.*;
-import org.gridgain.grid.*;
-import org.gridgain.grid.cache.datastructures.*;
 
 import java.util.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/examples/src/main/java/org/gridgain/examples/datagrid/datastructures/CacheAtomicSequenceExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/gridgain/examples/datagrid/datastructures/CacheAtomicSequenceExample.java b/examples/src/main/java/org/gridgain/examples/datagrid/datastructures/CacheAtomicSequenceExample.java
index 5bba9f0..55ef7c4 100644
--- a/examples/src/main/java/org/gridgain/examples/datagrid/datastructures/CacheAtomicSequenceExample.java
+++ b/examples/src/main/java/org/gridgain/examples/datagrid/datastructures/CacheAtomicSequenceExample.java
@@ -18,10 +18,9 @@
 package org.gridgain.examples.datagrid.datastructures;
 
 import org.apache.ignite.*;
+import org.apache.ignite.cache.datastructures.*;
 import org.apache.ignite.lang.*;
 import org.gridgain.examples.datagrid.*;
-import org.gridgain.grid.*;
-import org.gridgain.grid.cache.datastructures.*;
 
 import java.util.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/examples/src/main/java/org/gridgain/examples/datagrid/datastructures/CacheAtomicStampedExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/gridgain/examples/datagrid/datastructures/CacheAtomicStampedExample.java b/examples/src/main/java/org/gridgain/examples/datagrid/datastructures/CacheAtomicStampedExample.java
index 5802c21..af4b63c 100644
--- a/examples/src/main/java/org/gridgain/examples/datagrid/datastructures/CacheAtomicStampedExample.java
+++ b/examples/src/main/java/org/gridgain/examples/datagrid/datastructures/CacheAtomicStampedExample.java
@@ -18,10 +18,9 @@
 package org.gridgain.examples.datagrid.datastructures;
 
 import org.apache.ignite.*;
+import org.apache.ignite.cache.datastructures.*;
 import org.apache.ignite.lang.*;
 import org.gridgain.examples.datagrid.*;
-import org.gridgain.grid.*;
-import org.gridgain.grid.cache.datastructures.*;
 
 import java.util.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/examples/src/main/java/org/gridgain/examples/datagrid/datastructures/CacheCountDownLatchExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/gridgain/examples/datagrid/datastructures/CacheCountDownLatchExample.java b/examples/src/main/java/org/gridgain/examples/datagrid/datastructures/CacheCountDownLatchExample.java
index a522503..81af55f 100644
--- a/examples/src/main/java/org/gridgain/examples/datagrid/datastructures/CacheCountDownLatchExample.java
+++ b/examples/src/main/java/org/gridgain/examples/datagrid/datastructures/CacheCountDownLatchExample.java
@@ -18,10 +18,9 @@
 package org.gridgain.examples.datagrid.datastructures;
 
 import org.apache.ignite.*;
+import org.apache.ignite.cache.datastructures.*;
 import org.apache.ignite.lang.*;
 import org.gridgain.examples.datagrid.*;
-import org.gridgain.grid.*;
-import org.gridgain.grid.cache.datastructures.*;
 
 import java.util.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/examples/src/main/java/org/gridgain/examples/datagrid/datastructures/CacheQueueExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/gridgain/examples/datagrid/datastructures/CacheQueueExample.java b/examples/src/main/java/org/gridgain/examples/datagrid/datastructures/CacheQueueExample.java
index 75ceb43..3466c01 100644
--- a/examples/src/main/java/org/gridgain/examples/datagrid/datastructures/CacheQueueExample.java
+++ b/examples/src/main/java/org/gridgain/examples/datagrid/datastructures/CacheQueueExample.java
@@ -18,10 +18,9 @@
 package org.gridgain.examples.datagrid.datastructures;
 
 import org.apache.ignite.*;
+import org.apache.ignite.cache.datastructures.*;
 import org.apache.ignite.lang.*;
 import org.gridgain.examples.datagrid.*;
-import org.gridgain.grid.*;
-import org.gridgain.grid.cache.datastructures.*;
 
 import java.util.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/examples/src/main/java/org/gridgain/examples/datagrid/datastructures/CacheSetExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/gridgain/examples/datagrid/datastructures/CacheSetExample.java b/examples/src/main/java/org/gridgain/examples/datagrid/datastructures/CacheSetExample.java
index 8a742ce..03269a6 100644
--- a/examples/src/main/java/org/gridgain/examples/datagrid/datastructures/CacheSetExample.java
+++ b/examples/src/main/java/org/gridgain/examples/datagrid/datastructures/CacheSetExample.java
@@ -18,10 +18,9 @@
 package org.gridgain.examples.datagrid.datastructures;
 
 import org.apache.ignite.*;
+import org.apache.ignite.cache.datastructures.*;
 import org.apache.ignite.lang.*;
 import org.gridgain.examples.datagrid.*;
-import org.gridgain.grid.*;
-import org.gridgain.grid.cache.datastructures.*;
 
 import java.util.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/examples/src/main/java/org/gridgain/examples/datagrid/hibernate/HibernateL2CacheExampleNodeStartup.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/gridgain/examples/datagrid/hibernate/HibernateL2CacheExampleNodeStartup.java b/examples/src/main/java/org/gridgain/examples/datagrid/hibernate/HibernateL2CacheExampleNodeStartup.java
index 1a23d72..37d216b 100644
--- a/examples/src/main/java/org/gridgain/examples/datagrid/hibernate/HibernateL2CacheExampleNodeStartup.java
+++ b/examples/src/main/java/org/gridgain/examples/datagrid/hibernate/HibernateL2CacheExampleNodeStartup.java
@@ -19,16 +19,16 @@ package org.gridgain.examples.datagrid.hibernate;
 
 import org.apache.ignite.*;
 import org.apache.ignite.cache.*;
+import org.apache.ignite.cache.*;
 import org.apache.ignite.configuration.*;
-import org.gridgain.grid.cache.*;
 import org.apache.ignite.spi.discovery.tcp.*;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
 
 import java.util.*;
 
-import static org.gridgain.grid.cache.GridCacheAtomicityMode.*;
-import static org.gridgain.grid.cache.GridCacheMode.*;
-import static org.gridgain.grid.cache.GridCacheWriteSynchronizationMode.*;
+import static org.apache.ignite.cache.GridCacheAtomicityMode.*;
+import static org.apache.ignite.cache.GridCacheMode.*;
+import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*;
 
 /**
  * Starts up an empty node with example cache configuration.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/examples/src/main/java/org/gridgain/examples/datagrid/starschema/CacheStarSchemaExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/gridgain/examples/datagrid/starschema/CacheStarSchemaExample.java b/examples/src/main/java/org/gridgain/examples/datagrid/starschema/CacheStarSchemaExample.java
index 076f8d4..fe8ee01 100644
--- a/examples/src/main/java/org/gridgain/examples/datagrid/starschema/CacheStarSchemaExample.java
+++ b/examples/src/main/java/org/gridgain/examples/datagrid/starschema/CacheStarSchemaExample.java
@@ -18,10 +18,9 @@
 package org.gridgain.examples.datagrid.starschema;
 
 import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
+import org.apache.ignite.cache.query.*;
 import org.gridgain.examples.datagrid.*;
-import org.gridgain.grid.*;
-import org.gridgain.grid.cache.*;
-import org.gridgain.grid.cache.query.*;
 
 import java.util.*;
 import java.util.concurrent.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/examples/src/main/java/org/gridgain/examples/datagrid/starschema/DimProduct.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/gridgain/examples/datagrid/starschema/DimProduct.java b/examples/src/main/java/org/gridgain/examples/datagrid/starschema/DimProduct.java
index 627cba9..bc796be 100644
--- a/examples/src/main/java/org/gridgain/examples/datagrid/starschema/DimProduct.java
+++ b/examples/src/main/java/org/gridgain/examples/datagrid/starschema/DimProduct.java
@@ -17,12 +17,11 @@
 
 package org.gridgain.examples.datagrid.starschema;
 
-import org.gridgain.grid.cache.*;
-import org.gridgain.grid.cache.query.*;
+import org.apache.ignite.cache.query.*;
 
 /**
  * Represents a product available for purchase. In our {@code snowflake} schema a {@code product}
- * is a {@code 'dimension'} and will be cached in {@link GridCacheMode#REPLICATED}
+ * is a {@code 'dimension'} and will be cached in {@link org.apache.ignite.cache.GridCacheMode#REPLICATED}
  * cache.
  */
 public class DimProduct {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/examples/src/main/java/org/gridgain/examples/datagrid/starschema/DimStore.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/gridgain/examples/datagrid/starschema/DimStore.java b/examples/src/main/java/org/gridgain/examples/datagrid/starschema/DimStore.java
index 05d9d86..aed8741 100644
--- a/examples/src/main/java/org/gridgain/examples/datagrid/starschema/DimStore.java
+++ b/examples/src/main/java/org/gridgain/examples/datagrid/starschema/DimStore.java
@@ -17,12 +17,11 @@
 
 package org.gridgain.examples.datagrid.starschema;
 
-import org.gridgain.grid.cache.*;
-import org.gridgain.grid.cache.query.*;
+import org.apache.ignite.cache.query.*;
 
 /**
  * Represents a physical store location. In our {@code snowflake} schema a {@code store}
- * is a {@code 'dimension'} and will be cached in {@link GridCacheMode#REPLICATED}
+ * is a {@code 'dimension'} and will be cached in {@link org.apache.ignite.cache.GridCacheMode#REPLICATED}
  * cache.
  */
 public class DimStore {


Mime
View raw message