ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [42/61] [abbrv] incubator-ignite git commit: # ignite-63
Date Fri, 23 Jan 2015 16:12:07 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/cafee25f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/cafee25f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/cafee25f

Branch: refs/heads/ignite-66
Commit: cafee25f9ff86e0578520d2ce761bd4c68af94dc
Parents: a4065d1
Author: sboikov <sboikov@gridgain.com>
Authored: Fri Jan 23 15:22:34 2015 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Fri Jan 23 15:23:56 2015 +0300

----------------------------------------------------------------------
 examples/config/example-cache.xml               |    2 +-
 .../examples/datagrid/CacheAffinityExample.java |    6 +-
 .../examples/datagrid/CacheApiExample.java      |   20 +-
 .../datagrid/CacheContinuousQueryExample.java   |   14 +-
 .../datagrid/CacheDataLoaderExample.java        |    2 +-
 .../examples/datagrid/CacheEventsExample.java   |    2 +-
 .../datagrid/CachePopularNumbersExample.java    |    4 +-
 .../examples/datagrid/CachePutGetExample.java   |    4 +-
 .../examples/datagrid/CacheQueryExample.java    |   72 +-
 .../datagrid/CacheTransactionExample.java       |    6 +-
 .../datastructures/CacheAtomicLongExample.java  |    2 +-
 .../CacheAtomicReferenceExample.java            |    4 +-
 .../CacheAtomicSequenceExample.java             |    4 +-
 .../CacheAtomicStampedExample.java              |    4 +-
 .../CacheCountDownLatchExample.java             |    4 +-
 .../datastructures/CacheQueueExample.java       |    8 +-
 .../datastructures/CacheSetExample.java         |    8 +-
 .../HibernateL2CacheExampleNodeStartup.java     |    2 +-
 .../starschema/CacheStarSchemaExample.java      |   22 +-
 .../datagrid/starschema/DimProduct.java         |    4 +-
 .../examples/datagrid/starschema/DimStore.java  |    4 +-
 .../datagrid/starschema/FactPurchase.java       |    8 +-
 .../datagrid/store/CacheStoreExample.java       |    2 +-
 .../store/CacheStoreLoadDataExample.java        |    4 +-
 .../store/dummy/CacheDummyPersonStore.java      |    7 +-
 .../client/memcache/MemcacheRestExample.java    |    4 +-
 .../MemcacheRestExampleNodeStartup.java         |    6 +-
 .../examples/ScalarCacheAffinityExample1.scala  |   10 +-
 .../ScalarCacheAffinitySimpleExample.scala      |    4 +-
 .../scalar/examples/ScalarCacheExample.scala    |    4 +-
 .../examples/ScalarCacheQueryExample.scala      |   16 +-
 .../examples/ScalarSnowflakeSchemaExample.scala |    8 +-
 .../ClientAbstractMultiThreadedSelfTest.java    |    6 +-
 .../ignite/client/ClientPutPortableTask.java    |    2 +-
 .../client/ClientTopologyCacheSelfTest.java     |    2 +-
 .../client/impl/ClientCacheFlagsCodecTest.java  |    8 +-
 .../impl/ClientPartitionAffinitySelfTest.java   |   10 +-
 .../ClientAbstractMultiNodeSelfTest.java        |    6 +-
 .../integration/ClientAbstractSelfTest.java     |   20 +-
 .../rest/AbstractRestProcessorSelfTest.java     |    2 +-
 .../rest/RestBinaryProtocolSelfTest.java        |    2 +-
 .../rest/RestMemcacheProtocolSelfTest.java      |    2 +-
 .../processors/rest/RestProcessorTest.java      |    2 +-
 .../rest/TaskCommandHandlerSelfTest.java        |    2 +-
 .../ignite/jdbc/JdbcComplexQuerySelfTest.java   |   26 +-
 .../ignite/jdbc/JdbcEmptyCacheSelfTest.java     |    2 +-
 .../ignite/jdbc/JdbcLocalCachesSelfTest.java    |    8 +-
 .../ignite/jdbc/JdbcMetadataSelfTest.java       |   22 +-
 .../jdbc/JdbcPreparedStatementSelfTest.java     |   34 +-
 .../ignite/jdbc/JdbcResultSetSelfTest.java      |   40 +-
 .../ignite/jdbc/JdbcStatementSelfTest.java      |   12 +-
 .../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 |    6 +-
 .../apache/ignite/IgniteBasicWarmupClosure.java |   30 +-
 .../java/org/apache/ignite/IgniteCache.java     |   32 +-
 .../java/org/apache/ignite/IgniteCluster.java   |    4 +-
 .../org/apache/ignite/IgniteDataLoader.java     |    2 +-
 .../java/org/apache/ignite/IgnitePortables.java |   14 +-
 .../java/org/apache/ignite/cache/Cache.java     |  278 +++
 .../ignite/cache/CacheAtomicWriteOrderMode.java |    8 +-
 .../apache/ignite/cache/CacheConfiguration.java |  126 +-
 .../ignite/cache/CacheDistributionMode.java     |   69 +
 .../org/apache/ignite/cache/CacheEntry.java     |  621 ++++++
 .../apache/ignite/cache/CacheEntryEvent.java    |    4 +-
 .../java/org/apache/ignite/cache/CacheFlag.java |  110 +
 .../apache/ignite/cache/CacheFlagException.java |   67 +
 .../apache/ignite/cache/CacheInterceptor.java   |  120 ++
 .../ignite/cache/CacheInterceptorAdapter.java   |   52 +
 .../org/apache/ignite/cache/CacheMBean.java     |  295 +++
 .../apache/ignite/cache/CacheMemoryMode.java    |   59 +
 .../org/apache/ignite/cache/CacheMetrics.java   |  103 +
 .../java/org/apache/ignite/cache/CacheMode.java |    4 +-
 .../java/org/apache/ignite/cache/CacheName.java |   41 +
 .../org/apache/ignite/cache/CachePeekMode.java  |    6 +-
 .../apache/ignite/cache/CachePreloadMode.java   |   67 +
 .../apache/ignite/cache/CacheProjection.java    | 1912 ++++++++++++++++++
 .../cache/CacheWriteSynchronizationMode.java    |   69 +
 .../java/org/apache/ignite/cache/GridCache.java |  278 ---
 .../ignite/cache/GridCacheDistributionMode.java |   70 -
 .../org/apache/ignite/cache/GridCacheEntry.java |  622 ------
 .../org/apache/ignite/cache/GridCacheFlag.java  |  110 -
 .../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/GridCacheName.java  |   41 -
 .../apache/ignite/cache/GridCachePeekMode.java  |    6 +-
 .../ignite/cache/GridCachePreloadMode.java      |   67 -
 .../ignite/cache/GridCacheProjection.java       | 1912 ------------------
 .../GridCacheWriteSynchronizationMode.java      |   69 -
 .../ignite/cache/affinity/CacheAffinity.java    |  262 +++
 .../cache/affinity/CacheAffinityFunction.java   |  111 +
 .../affinity/CacheAffinityFunctionContext.java  |   71 +
 .../ignite/cache/affinity/CacheAffinityKey.java |  189 ++
 .../cache/affinity/CacheAffinityKeyMapped.java  |  156 ++
 .../cache/affinity/CacheAffinityKeyMapper.java  |   64 +
 .../CacheAffinityNodeAddressHashResolver.java   |   39 +
 .../affinity/CacheAffinityNodeHashResolver.java |   43 +
 .../CacheAffinityNodeIdHashResolver.java        |   40 +
 .../CacheCentralizedAffinityFunction.java       |   31 +
 .../cache/affinity/GridCacheAffinity.java       |  262 ---
 .../affinity/GridCacheAffinityFunction.java     |  111 -
 .../GridCacheAffinityFunctionContext.java       |   71 -
 .../cache/affinity/GridCacheAffinityKey.java    |  189 --
 .../affinity/GridCacheAffinityKeyMapped.java    |  156 --
 .../affinity/GridCacheAffinityKeyMapper.java    |   64 -
 ...ridCacheAffinityNodeAddressHashResolver.java |   39 -
 .../GridCacheAffinityNodeHashResolver.java      |   43 -
 .../GridCacheAffinityNodeIdHashResolver.java    |   40 -
 .../GridCacheCentralizedAffinityFunction.java   |   31 -
 .../CacheConsistentHashAffinityFunction.java    |  702 +++++++
 ...GridCacheConsistentHashAffinityFunction.java |  702 -------
 .../fair/CachePartitionFairAffinity.java        |  805 ++++++++
 .../fair/GridCachePartitionFairAffinity.java    |  805 --------
 .../CacheRendezvousAffinityFunction.java        |  502 +++++
 .../GridCacheRendezvousAffinityFunction.java    |  502 -----
 .../ignite/cache/cloner/CacheBasicCloner.java   |   34 +
 .../apache/ignite/cache/cloner/CacheCloner.java |   58 +
 .../ignite/cache/cloner/CacheDeepCloner.java    |   87 +
 .../cache/cloner/GridCacheBasicCloner.java      |   34 -
 .../ignite/cache/cloner/GridCacheCloner.java    |   58 -
 .../cache/cloner/GridCacheDeepCloner.java       |   87 -
 .../cache/datastructures/CacheAtomicLong.java   |  157 ++
 .../datastructures/CacheAtomicReference.java    |   93 +
 .../datastructures/CacheAtomicSequence.java     |  130 ++
 .../datastructures/CacheAtomicStamped.java      |  121 ++
 .../datastructures/CacheCountDownLatch.java     |  226 +++
 .../CacheDataStructureInvalidException.java     |   66 +
 ...cheDataStructureInvalidRuntimeException.java |   66 +
 .../CacheDataStructureRemovedException.java     |   61 +
 ...cheDataStructureRemovedRuntimeException.java |   61 +
 .../datastructures/CacheDataStructures.java     |  220 ++
 .../ignite/cache/datastructures/CacheQueue.java |  182 ++
 .../ignite/cache/datastructures/CacheSet.java   |   61 +
 .../datastructures/GridCacheAtomicLong.java     |  157 --
 .../GridCacheAtomicReference.java               |   93 -
 .../datastructures/GridCacheAtomicSequence.java |  130 --
 .../datastructures/GridCacheAtomicStamped.java  |  121 --
 .../datastructures/GridCacheCountDownLatch.java |  226 ---
 .../GridCacheDataStructureInvalidException.java |   66 -
 ...cheDataStructureInvalidRuntimeException.java |   66 -
 .../GridCacheDataStructureRemovedException.java |   61 -
 ...cheDataStructureRemovedRuntimeException.java |   61 -
 .../datastructures/GridCacheDataStructures.java |  220 --
 .../cache/datastructures/GridCacheQueue.java    |  182 --
 .../cache/datastructures/GridCacheSet.java      |   61 -
 .../cache/eviction/CacheEvictionFilter.java     |   40 +
 .../cache/eviction/CacheEvictionPolicy.java     |   53 +
 .../ignite/cache/eviction/EvictableEntry.java   |    2 +-
 .../cache/eviction/GridCacheEvictionFilter.java |   40 -
 .../cache/eviction/GridCacheEvictionPolicy.java |   53 -
 .../eviction/fifo/CacheFifoEvictionPolicy.java  |  207 ++
 .../fifo/CacheFifoEvictionPolicyMBean.java      |   58 +
 .../fifo/GridCacheFifoEvictionPolicy.java       |  207 --
 .../fifo/GridCacheFifoEvictionPolicyMBean.java  |   58 -
 .../eviction/ggfs/CacheGgfsEvictionFilter.java  |   34 +
 .../CacheGgfsPerBlockLruEvictionPolicy.java     |  353 ++++
 ...CacheGgfsPerBlockLruEvictionPolicyMBean.java |   93 +
 .../ggfs/GridCacheGgfsEvictionFilter.java       |   34 -
 .../GridCacheGgfsPerBlockLruEvictionPolicy.java |  353 ----
 ...CacheGgfsPerBlockLruEvictionPolicyMBean.java |   93 -
 .../eviction/lru/CacheLruEvictionPolicy.java    |  193 ++
 .../lru/CacheLruEvictionPolicyMBean.java        |   58 +
 .../lru/GridCacheLruEvictionPolicy.java         |  193 --
 .../lru/GridCacheLruEvictionPolicyMBean.java    |   58 -
 .../random/CacheRandomEvictionPolicy.java       |  118 ++
 .../random/CacheRandomEvictionPolicyMBean.java  |   42 +
 .../random/GridCacheRandomEvictionPolicy.java   |  118 --
 .../GridCacheRandomEvictionPolicyMBean.java     |   42 -
 .../cache/query/CacheContinuousQuery.java       |  341 ++++
 .../cache/query/CacheContinuousQueryEntry.java  |   49 +
 .../apache/ignite/cache/query/CacheQueries.java |  151 ++
 .../apache/ignite/cache/query/CacheQuery.java   |  295 +++
 .../cache/query/CacheQueryConfiguration.java    |  203 ++
 .../ignite/cache/query/CacheQueryFuture.java    |   66 +
 .../cache/query/CacheQueryGroupIndex.java       |   58 +
 .../ignite/cache/query/CacheQueryMetrics.java   |   60 +
 .../ignite/cache/query/CacheQuerySqlField.java  |  133 ++
 .../cache/query/CacheQuerySqlFunction.java      |   69 +
 .../ignite/cache/query/CacheQueryTextField.java |   33 +
 .../ignite/cache/query/CacheQueryType.java      |   47 +
 .../cache/query/CacheQueryTypeMetadata.java     |  196 ++
 .../cache/query/CacheQueryTypeResolver.java     |   32 +
 .../cache/query/GridCacheContinuousQuery.java   |  341 ----
 .../query/GridCacheContinuousQueryEntry.java    |   49 -
 .../ignite/cache/query/GridCacheQueries.java    |  151 --
 .../ignite/cache/query/GridCacheQuery.java      |  295 ---
 .../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   |    4 +-
 .../cache/query/annotations/QuerySqlField.java  |    4 +-
 .../query/annotations/QuerySqlFunction.java     |    2 +-
 .../cache/query/annotations/QueryTextField.java |    4 +-
 .../cache/store/CacheLoadOnlyStoreAdapter.java  |    6 +-
 .../apache/ignite/cache/store/CacheStore.java   |    4 +-
 .../ignite/cache/store/CacheStoreAdapter.java   |    2 +-
 .../configuration/GridQueryConfiguration.java   |    2 +-
 .../events/IgniteCacheQueryExecutedEvent.java   |   12 +-
 .../events/IgniteCacheQueryReadEvent.java       |   12 +-
 .../java/org/apache/ignite/internal/GridEx.java |    8 +-
 .../org/apache/ignite/internal/GridGainEx.java  |    8 +-
 .../ignite/internal/GridJobContextImpl.java     |    4 +-
 .../org/apache/ignite/internal/GridKernal.java  |   10 +-
 .../internal/managers/GridManagerAdapter.java   |    2 +-
 .../loadbalancer/GridLoadBalancerManager.java   |    4 +-
 .../affinity/GridAffinityAssignmentCache.java   |    8 +-
 .../affinity/GridAffinityProcessor.java         |   12 +-
 .../processors/affinity/GridAffinityUtils.java  |    6 +-
 .../GridCacheAffinityFunctionContextImpl.java   |    2 +-
 .../processors/cache/GridCacheAdapter.java      |  252 +--
 .../processors/cache/GridCacheAttributes.java   |   26 +-
 .../cache/GridCacheConcurrentMap.java           |   84 +-
 .../processors/cache/GridCacheContext.java      |   96 +-
 .../GridCacheDefaultAffinityKeyMapper.java      |   14 +-
 .../cache/GridCacheDeploymentManager.java       |    6 +-
 .../processors/cache/GridCacheEntryEx.java      |   34 +-
 .../processors/cache/GridCacheEntryImpl.java    |   32 +-
 .../processors/cache/GridCacheEntrySet.java     |   20 +-
 .../cache/GridCacheEvictionEntry.java           |   30 +-
 .../cache/GridCacheEvictionManager.java         |   26 +-
 .../cache/GridCacheFilterEvaluationEntry.java   |   26 +-
 .../processors/cache/GridCacheIterator.java     |   12 +-
 .../processors/cache/GridCacheKeySet.java       |   14 +-
 .../processors/cache/GridCacheMBeanAdapter.java |    4 +-
 .../processors/cache/GridCacheMapAdapter.java   |    4 +-
 .../processors/cache/GridCacheMapEntry.java     |   54 +-
 .../processors/cache/GridCacheMessage.java      |   12 +-
 .../cache/GridCacheMetricsAdapter.java          |    6 +-
 .../cache/GridCachePreloaderAdapter.java        |    2 +-
 .../processors/cache/GridCacheProcessor.java    |   78 +-
 .../processors/cache/GridCacheProjectionEx.java |   62 +-
 .../cache/GridCacheProjectionImpl.java          |  170 +-
 .../processors/cache/GridCacheProxy.java        |    2 +-
 .../processors/cache/GridCacheProxyImpl.java    |  112 +-
 .../cache/GridCacheSharedContext.java           |   10 +-
 .../processors/cache/GridCacheStoreManager.java |    2 +-
 .../processors/cache/GridCacheSwapManager.java  |    2 +-
 .../processors/cache/GridCacheUtils.java        |   52 +-
 .../cache/GridCacheValueCollection.java         |   16 +-
 .../cache/GridCacheWriteBehindStore.java        |    2 +-
 .../processors/cache/IgniteCacheProxy.java      |   18 +-
 .../cache/affinity/GridCacheAffinityImpl.java   |    2 +-
 .../cache/affinity/GridCacheAffinityProxy.java  |    6 +-
 .../GridAtomicCacheQueueImpl.java               |    2 +-
 .../datastructures/GridCacheAtomicLongEx.java   |    2 +-
 .../datastructures/GridCacheAtomicLongImpl.java |    6 +-
 .../GridCacheAtomicReferenceEx.java             |    2 +-
 .../GridCacheAtomicReferenceImpl.java           |    6 +-
 .../GridCacheAtomicSequenceEx.java              |    2 +-
 .../GridCacheAtomicSequenceImpl.java            |    6 +-
 .../GridCacheAtomicStampedEx.java               |    2 +-
 .../GridCacheAtomicStampedImpl.java             |    8 +-
 .../GridCacheCountDownLatchEx.java              |    2 +-
 .../GridCacheCountDownLatchImpl.java            |    4 +-
 .../GridCacheDataStructuresImpl.java            |   16 +-
 .../GridCacheDataStructuresManager.java         |   90 +-
 .../GridCacheDataStructuresProxy.java           |   20 +-
 .../GridCacheInternalKeyImpl.java               |    4 +-
 .../datastructures/GridCacheQueueAdapter.java   |   14 +-
 .../datastructures/GridCacheQueueProxy.java     |    2 +-
 .../cache/datastructures/GridCacheSetImpl.java  |   26 +-
 .../cache/datastructures/GridCacheSetProxy.java |    4 +-
 .../datastructures/GridSetQueryPredicate.java   |    2 +-
 .../GridTransactionalCacheQueueImpl.java        |    2 +-
 .../GridDistributedCacheAdapter.java            |    6 +-
 .../GridDistributedTxRemoteAdapter.java         |    2 +-
 .../GridPartitionedCacheEntryImpl.java          |   10 +-
 .../distributed/dht/GridDhtCacheAdapter.java    |   38 +-
 .../distributed/dht/GridDhtCacheEntry.java      |    2 +-
 .../distributed/dht/GridDhtCacheEntryImpl.java  |    6 +-
 .../cache/distributed/dht/GridDhtGetFuture.java |    4 +-
 .../distributed/dht/GridDhtLockFuture.java      |    4 +-
 .../dht/GridDhtTransactionalCacheAdapter.java   |    8 +-
 .../distributed/dht/GridDhtTxLocalAdapter.java  |    2 +-
 .../dht/GridPartitionedGetFuture.java           |    4 +-
 .../dht/atomic/GridDhtAtomicCache.java          |   46 +-
 .../dht/atomic/GridDhtAtomicCacheEntry.java     |    4 +-
 .../dht/atomic/GridDhtAtomicUpdateFuture.java   |    6 +-
 .../dht/atomic/GridDhtAtomicUpdateRequest.java  |    8 +-
 .../dht/atomic/GridNearAtomicUpdateFuture.java  |   12 +-
 .../dht/atomic/GridNearAtomicUpdateRequest.java |   14 +-
 .../dht/colocated/GridDhtColocatedCache.java    |   20 +-
 .../colocated/GridDhtColocatedCacheEntry.java   |    2 +-
 .../colocated/GridDhtColocatedLockFuture.java   |    4 +-
 .../preloader/GridDhtPartitionDemandPool.java   |    4 +-
 .../GridDhtPartitionsExchangeFuture.java        |    4 +-
 .../distributed/near/GridNearAtomicCache.java   |   38 +-
 .../distributed/near/GridNearCacheAdapter.java  |   98 +-
 .../distributed/near/GridNearCacheEntry.java    |    4 +-
 .../distributed/near/GridNearGetFuture.java     |    4 +-
 .../distributed/near/GridNearGetRequest.java    |    6 +-
 .../distributed/near/GridNearLockFuture.java    |    4 +-
 .../distributed/near/GridNearLockRequest.java   |    6 +-
 .../near/GridNearTransactionalCache.java        |   10 +-
 .../cache/distributed/near/GridNearTxLocal.java |    2 +-
 .../processors/cache/local/GridLocalCache.java  |    8 +-
 .../cache/local/GridLocalLockFuture.java        |    4 +-
 .../local/atomic/GridLocalAtomicCache.java      |   56 +-
 .../query/GridCacheDistributedQueryManager.java |   12 +-
 .../cache/query/GridCacheLocalQueryFuture.java  |    4 +-
 .../cache/query/GridCacheLocalQueryManager.java |   12 +-
 .../cache/query/GridCacheQueriesEx.java         |    6 +-
 .../cache/query/GridCacheQueriesImpl.java       |   24 +-
 .../cache/query/GridCacheQueriesProxy.java      |   22 +-
 .../cache/query/GridCacheQueryAdapter.java      |   42 +-
 .../cache/query/GridCacheQueryErrorFuture.java  |    2 +-
 .../query/GridCacheQueryFutureAdapter.java      |    2 +-
 .../cache/query/GridCacheQueryInfo.java         |    6 +-
 .../cache/query/GridCacheQueryManager.java      |  104 +-
 .../query/GridCacheQueryMetricsAdapter.java     |    4 +-
 .../cache/query/GridCacheQueryRequest.java      |    6 +-
 .../cache/query/GridCacheQueryType.java         |    4 +-
 .../GridCacheContinuousQueryAdapter.java        |   26 +-
 .../GridCacheContinuousQueryEntry.java          |   37 +-
 .../GridCacheContinuousQueryFilterEx.java       |    3 +-
 .../GridCacheContinuousQueryHandler.java        |   30 +-
 .../GridCacheContinuousQueryManager.java        |   22 +-
 .../jdbc/GridCacheQueryJdbcMetadataTask.java    |    2 +-
 .../query/jdbc/GridCacheQueryJdbcTask.java      |   16 +-
 .../transactions/IgniteTransactionsImpl.java    |    2 +-
 .../cache/transactions/IgniteTxEntry.java       |    8 +-
 .../cache/transactions/IgniteTxEx.java          |    2 +-
 .../transactions/IgniteTxLocalAdapter.java      |   24 +-
 .../cache/transactions/IgniteTxLocalEx.java     |    6 +-
 .../closure/GridClosureProcessor.java           |   16 +-
 .../dataload/GridDataLoadCacheUpdaters.java     |   18 +-
 .../processors/fs/GridGgfsDataManager.java      |    6 +-
 .../internal/processors/fs/GridGgfsImpl.java    |    8 +-
 .../processors/fs/GridGgfsMetaManager.java      |    4 +-
 .../processors/fs/IgniteFsHelperImpl.java       |   16 +-
 .../processors/fs/IgniteFsProcessor.java        |    6 +-
 .../processors/query/GridQueryProcessor.java    |   60 +-
 .../handlers/cache/GridCacheCommandHandler.java |   84 +-
 .../cache/GridCacheQueryCommandHandler.java     |    4 +-
 .../top/GridTopologyCommandHandler.java         |    4 +-
 .../service/GridServiceProcessor.java           |   22 +-
 .../processors/task/GridTaskProcessor.java      |    2 +-
 .../apache/ignite/internal/util/GridUtils.java  |    8 +-
 .../ignite/internal/util/lang/GridFunc.java     |  220 +-
 .../ignite/internal/util/typedef/PCE.java       |    8 +-
 .../ignite/internal/visor/cache/VisorCache.java |   10 +-
 .../cache/VisorCacheAffinityConfiguration.java  |    6 +-
 .../visor/cache/VisorCacheClearTask.java        |    2 +-
 .../visor/cache/VisorCacheCompactTask.java      |    2 +-
 .../visor/cache/VisorCacheConfiguration.java    |   18 +-
 .../cache/VisorCacheEvictionConfiguration.java  |    2 +-
 .../visor/cache/VisorCacheLoadTask.java         |    2 +-
 .../visor/cache/VisorCacheMetadataTask.java     |    2 +-
 .../internal/visor/cache/VisorCacheMetrics.java |    6 +-
 .../cache/VisorCacheMetricsCollectorTask.java   |    4 +-
 .../cache/VisorCachePreloadConfiguration.java   |    6 +-
 .../visor/cache/VisorCachePreloadTask.java      |    2 +-
 .../visor/cache/VisorCacheQueryMetrics.java     |    2 +-
 .../visor/cache/VisorCacheResetMetricsTask.java |    2 +-
 .../visor/cache/VisorCacheSwapBackupsTask.java  |    6 +-
 .../visor/node/VisorNodeDataCollectorJob.java   |    2 +-
 .../internal/visor/query/VisorQueryTask.java    |   14 +-
 .../internal/visor/query/VisorQueryUtils.java   |    4 +-
 .../internal/visor/util/VisorTaskUtils.java     |   14 +-
 .../apache/ignite/jdbc/IgniteJdbcDriver.java    |    2 +-
 .../org/apache/ignite/lang/IgnitePredicate.java |    2 +-
 .../apache/ignite/portables/PortableObject.java |    6 +-
 .../StreamerCacheAffinityEventRouter.java       |    2 +-
 .../apache/ignite/transactions/IgniteTx.java    |    8 +-
 .../transactions/IgniteTxSynchronization.java   |    2 +-
 .../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 +-
 .../GridCacheAffinityBackupsSelfTest.java       |   12 +-
 ...CachePartitionFairAffinityNodesSelfTest.java |    4 +-
 .../GridCachePartitionFairAffinitySelfTest.java |    5 +-
 ...CacheJdbcBlobStoreMultithreadedSelfTest.java |   14 +-
 .../fs/GridGgfsEventsAbstractSelfTest.java      |    4 +-
 .../GridGgfsFragmentizerAbstractSelfTest.java   |    6 +-
 .../ignite/fs/GridGgfsFragmentizerSelfTest.java |    2 +-
 .../ignite/internal/GridAffinityMappedTest.java |    4 +-
 .../internal/GridAffinityP2PSelfTest.java       |    4 +-
 .../GridJobMasterLeaveAwareSelfTest.java        |    6 +-
 .../internal/GridMultipleJobsSelfTest.java      |    2 +-
 .../GridCheckpointManagerAbstractSelfTest.java  |    2 +-
 .../checkpoint/GridCheckpointTaskSelfTest.java  |    2 +-
 .../GridDeploymentMessageCountSelfTest.java     |    4 +-
 .../GridDiscoveryManagerAliveCacheSelfTest.java |    6 +-
 .../discovery/GridDiscoveryManagerSelfTest.java |    4 +-
 .../GridAffinityProcessorAbstractSelfTest.java  |    4 +-
 ...AffinityProcessorConsistentHashSelfTest.java |    4 +-
 ...GridAffinityProcessorRendezvousSelfTest.java |    4 +-
 .../GridCacheAbstractFailoverSelfTest.java      |   22 +-
 .../cache/GridCacheAbstractFlagsTest.java       |    8 +-
 ...cheAbstractFullApiMultithreadedSelfTest.java |   78 +-
 .../cache/GridCacheAbstractFullApiSelfTest.java |  182 +-
 .../GridCacheAbstractIteratorsSelfTest.java     |   16 +-
 .../cache/GridCacheAbstractMetricsSelfTest.java |   12 +-
 .../GridCacheAbstractProjectionSelfTest.java    |   78 +-
 .../GridCacheAbstractRemoveFailureTest.java     |    4 +-
 .../cache/GridCacheAbstractSelfTest.java        |   70 +-
 .../cache/GridCacheAbstractTxReadTest.java      |    4 +-
 .../cache/GridCacheAffinityApiSelfTest.java     |   36 +-
 .../cache/GridCacheAffinityMapperSelfTest.java  |   15 +-
 .../cache/GridCacheAffinityRoutingSelfTest.java |   34 +-
 .../cache/GridCacheAlwaysEvictionPolicy.java    |    4 +-
 .../GridCacheAtomicMessageCountSelfTest.java    |    8 +-
 .../cache/GridCacheBasicApiAbstractTest.java    |    4 +-
 .../cache/GridCacheBasicStoreAbstractTest.java  |   28 +-
 ...acheBasicStoreMultithreadedAbstractTest.java |   10 +-
 .../cache/GridCacheClearAllSelfTest.java        |   48 +-
 ...dCacheColocatedTxStoreExceptionSelfTest.java |    4 +-
 .../cache/GridCacheConcurrentMapSelfTest.java   |   26 +-
 .../cache/GridCacheConcurrentMapTest.java       |   10 +-
 .../GridCacheConcurrentTxMultiNodeTest.java     |   62 +-
 ...idCacheConfigurationConsistencySelfTest.java |   77 +-
 ...ridCacheConfigurationValidationSelfTest.java |   12 +-
 .../GridCacheDaemonNodeAbstractSelfTest.java    |    6 +-
 .../GridCacheDeploymentOffHeapSelfTest.java     |    4 +-
 .../cache/GridCacheDeploymentSelfTest.java      |   14 +-
 .../cache/GridCacheEntryMemorySizeSelfTest.java |   12 +-
 .../cache/GridCacheEntryVersionSelfTest.java    |    2 +-
 .../GridCacheEvictionEventAbstractTest.java     |    2 +-
 .../GridCacheExAbstractFullApiSelfTest.java     |    6 +-
 .../GridCacheFieldsQueryNoDataSelfTest.java     |    4 +-
 .../GridCacheFinishPartitionsSelfTest.java      |    8 +-
 ...CacheFullTextQueryMultithreadedSelfTest.java |    8 +-
 ...idCacheGetAndTransformStoreAbstractTest.java |    8 +-
 .../cache/GridCacheGlobalClearAllSelfTest.java  |    6 +-
 .../GridCacheGroupLockAbstractSelfTest.java     |  119 +-
 .../GridCacheGroupLockFailoverSelfTest.java     |    6 +-
 .../cache/GridCacheGroupLockPutTask.java        |    4 +-
 .../cache/GridCacheIncrementTransformTest.java  |    6 +-
 .../GridCacheInterceptorAbstractSelfTest.java   |   18 +-
 ...cheInterceptorAtomicNearEnabledSelfTest.java |    6 +-
 ...erceptorAtomicPrimaryWriteOrderSelfTest.java |    6 +-
 ...omicReplicatedPrimaryWriteOrderSelfTest.java |    2 +-
 ...acheInterceptorAtomicReplicatedSelfTest.java |    2 +-
 .../GridCacheInterceptorAtomicSelfTest.java     |    6 +-
 ...ceptorAtomicWithStoreReplicatedSelfTest.java |    4 +-
 ...CacheInterceptorAtomicWithStoreSelfTest.java |    4 +-
 ...GridCacheInterceptorLocalAtomicSelfTest.java |    2 +-
 ...InterceptorLocalAtomicWithStoreSelfTest.java |    4 +-
 .../GridCacheInterceptorLocalSelfTest.java      |    2 +-
 ...dCacheInterceptorLocalWithStoreSelfTest.java |    4 +-
 ...GridCacheInterceptorNearEnabledSelfTest.java |    6 +-
 .../GridCacheInterceptorReplicatedSelfTest.java |    2 +-
 ...eInterceptorReplicatedWithStoreSelfTest.java |    4 +-
 .../cache/GridCacheInterceptorSelfTest.java     |    6 +-
 .../GridCacheInterceptorWithStoreSelfTest.java  |    4 +-
 .../cache/GridCacheIteratorPerformanceTest.java |   28 +-
 .../GridCacheKeyCheckNearEnabledSelfTest.java   |    4 +-
 .../cache/GridCacheKeyCheckSelfTest.java        |   12 +-
 .../processors/cache/GridCacheLeakTest.java     |    8 +-
 .../cache/GridCacheLifecycleAwareSelfTest.java  |   25 +-
 .../cache/GridCacheLuceneQueryIndexTest.java    |   22 +-
 .../cache/GridCacheMemoryModeSelfTest.java      |   32 +-
 .../GridCacheMissingCommitVersionSelfTest.java  |    2 +-
 ...GridCacheMixedPartitionExchangeSelfTest.java |    4 +-
 .../cache/GridCacheMultiUpdateLockSelfTest.java |   10 +-
 ...ultinodeUpdateAtomicNearEnabledSelfTest.java |    4 +-
 .../GridCacheMultinodeUpdateAtomicSelfTest.java |    4 +-
 ...CacheMultinodeUpdateNearEnabledSelfTest.java |    4 +-
 .../cache/GridCacheMultinodeUpdateSelfTest.java |    4 +-
 .../cache/GridCacheMvccManagerSelfTest.java     |    4 +-
 .../cache/GridCacheMvccPartitionedSelfTest.java |    2 +-
 .../cache/GridCacheNestedTxAbstractTest.java    |    3 +-
 .../cache/GridCacheObjectToStringSelfTest.java  |   24 +-
 ...HeapMultiThreadedUpdateAbstractSelfTest.java |   18 +-
 ...CacheOffHeapMultiThreadedUpdateSelfTest.java |    6 +-
 .../cache/GridCacheOffHeapSelfTest.java         |   34 +-
 .../processors/cache/GridCacheOffHeapTest.java  |   10 +-
 .../GridCacheOffHeapTieredAbstractSelfTest.java |   40 +-
 ...heOffHeapTieredEvictionAbstractSelfTest.java |   12 +-
 .../cache/GridCacheOffheapUpdateSelfTest.java   |   10 +-
 .../GridCacheOrderedPreloadingSelfTest.java     |    4 +-
 .../cache/GridCacheP2PUndeploySelfTest.java     |   16 +-
 .../GridCachePartitionedAffinitySpreadTest.java |    6 +-
 .../cache/GridCachePartitionedGetSelfTest.java  |   20 +-
 ...hePartitionedProjectionAffinitySelfTest.java |    6 +-
 .../cache/GridCachePartitionedWritesTest.java   |   10 +-
 .../GridCachePreloadingEvictionsSelfTest.java   |   14 +-
 .../cache/GridCachePutAllFailoverSelfTest.java  |    6 +-
 .../processors/cache/GridCachePutAllTask.java   |    2 +-
 .../cache/GridCacheQueryEmbeddedValue.java      |    8 +-
 .../cache/GridCacheQueryIndexSelfTest.java      |   12 +-
 .../GridCacheQueryIndexingDisabledSelfTest.java |    2 +-
 .../GridCacheQueryInternalKeysSelfTest.java     |    4 +-
 .../GridCacheReferenceCleanupSelfTest.java      |   14 +-
 .../cache/GridCacheReloadSelfTest.java          |   12 +-
 ...ridCacheReplicatedSynchronousCommitTest.java |    8 +-
 ...CacheReplicatedTxStoreExceptionSelfTest.java |    4 +-
 .../GridCacheReturnValueTransferSelfTest.java   |    8 +-
 .../cache/GridCacheSlowTxWarnTest.java          |    2 +-
 .../processors/cache/GridCacheStopSelfTest.java |    2 +-
 .../cache/GridCacheStorePutxSelfTest.java       |   10 +-
 .../cache/GridCacheStoreValueBytesSelfTest.java |    6 +-
 .../cache/GridCacheSwapPreloadSelfTest.java     |    8 +-
 .../cache/GridCacheSwapReloadSelfTest.java      |    3 +-
 .../processors/cache/GridCacheTestEntryEx.java  |   35 +-
 .../processors/cache/GridCacheTestValue.java    |    2 +-
 .../processors/cache/GridCacheTestValue2.java   |    2 +-
 ...cheTransactionalAbstractMetricsSelfTest.java |    8 +-
 .../GridCacheValueBytesPreloadingSelfTest.java  |   10 +-
 ...idCacheValueConsistencyAbstractSelfTest.java |   24 +-
 ...istencyTransactionalNearEnabledSelfTest.java |    4 +-
 .../GridCacheVariableTopologySelfTest.java      |    6 +-
 .../GridCacheWriteBehindStoreAbstractTest.java  |   12 +-
 ...BehindStorePartitionedMultiNodeSelfTest.java |    6 +-
 .../cache/IgniteCacheAbstractTest.java          |    7 +-
 .../cache/IgniteCacheAtomicInvokeTest.java      |    4 +-
 .../cache/IgniteCacheAtomicLocalInvokeTest.java |    4 +-
 .../IgniteCacheAtomicNearEnabledInvokeTest.java |    4 +-
 ...eCacheAtomicPrimaryWriteOrderInvokeTest.java |    4 +-
 .../IgniteCacheEntryListenerAbstractTest.java   |    2 +-
 ...IgniteCacheEntryListenerAtomicLocalTest.java |    4 +-
 .../IgniteCacheEntryListenerAtomicTest.java     |    4 +-
 .../IgniteCacheEntryListenerTxLocalTest.java    |    4 +-
 .../cache/IgniteCacheEntryListenerTxTest.java   |    4 +-
 .../cache/IgniteCacheInvokeAbstractTest.java    |    4 +-
 .../cache/IgniteCacheInvokeReadThroughTest.java |    4 +-
 .../cache/IgniteCacheTxInvokeTest.java          |    4 +-
 .../cache/IgniteCacheTxLocalInvokeTest.java     |    4 +-
 .../IgniteCacheTxNearEnabledInvokeTest.java     |    4 +-
 .../cache/IgniteCachingProviderSelfTest.java    |    4 +-
 .../processors/cache/IgniteTxAbstractTest.java  |   18 +-
 .../IgniteTxExceptionAbstractSelfTest.java      |    5 +-
 .../cache/IgniteTxMultiNodeAbstractTest.java    |   24 +-
 .../IgniteTxMultiThreadedAbstractTest.java      |    2 +-
 .../cache/IgniteTxReentryAbstractSelfTest.java  |    6 +-
 .../IgniteTxStoreExceptionAbstractSelfTest.java |    9 +-
 ...eAbstractDataStructuresFailoverSelfTest.java |   28 +-
 ...actQueueFailoverDataConsistencySelfTest.java |   14 +-
 .../GridCacheAtomicLongApiSelfTest.java         |   50 +-
 ...CacheAtomicReferenceApiSelfAbstractTest.java |   18 +-
 ...cheAtomicReferenceMultiNodeAbstractTest.java |   16 +-
 ...idCacheAtomicStampedApiSelfAbstractTest.java |    8 +-
 .../GridCacheCountDownLatchSelfTest.java        |   32 +-
 .../GridCacheMultiNodeDataStructureTest.java    |    6 +-
 .../GridCacheQueueApiSelfAbstractTest.java      |   32 +-
 .../GridCacheQueueCleanupSelfTest.java          |    8 +-
 ...ridCacheQueueJoinedNodeSelfAbstractTest.java |    6 +-
 ...GridCacheQueueMultiNodeAbstractSelfTest.java |   54 +-
 ...dCacheQueueMultiNodeConsistencySelfTest.java |   26 +-
 ...CacheQueueRotativeMultiNodeAbstractTest.java |   18 +-
 .../GridCacheSequenceApiSelfAbstractTest.java   |   46 +-
 ...dCacheSequenceMultiNodeAbstractSelfTest.java |    6 +-
 .../GridCacheSetAbstractSelfTest.java           |   44 +-
 .../GridCacheSetFailoverAbstractSelfTest.java   |    4 +-
 .../local/GridCacheLocalQueueApiSelfTest.java   |    2 +-
 .../GridCacheLocalSequenceApiSelfTest.java      |    2 +-
 ...hePartitionedAtomicReferenceApiSelfTest.java |    4 +-
 ...PartitionedAtomicReferenceMultiNodeTest.java |    2 +-
 ...titionedAtomicSequenceMultiThreadedTest.java |   58 +-
 ...achePartitionedAtomicStampedApiSelfTest.java |    6 +-
 ...GridCachePartitionedNodeRestartSelfTest.java |    6 +-
 ...idCachePartitionedNodeRestartTxSelfTest.java |    8 +-
 .../GridCachePartitionedQueueApiSelfTest.java   |    6 +-
 ...PartitionedQueueCreateMultiNodeSelfTest.java |   10 +-
 ...dCachePartitionedQueueEntryMoveSelfTest.java |   12 +-
 ...CachePartitionedQueueJoinedNodeSelfTest.java |    6 +-
 ...dCachePartitionedQueueMultiNodeSelfTest.java |    4 +-
 ...hePartitionedQueueRotativeMultiNodeTest.java |    4 +-
 ...GridCachePartitionedSequenceApiSelfTest.java |    4 +-
 ...chePartitionedSequenceMultiNodeSelfTest.java |    4 +-
 ...cheReplicatedAtomicReferenceApiSelfTest.java |    2 +-
 ...eReplicatedAtomicReferenceMultiNodeTest.java |    2 +-
 ...CacheReplicatedAtomicStampedApiSelfTest.java |    2 +-
 .../GridCacheReplicatedQueueApiSelfTest.java    |    4 +-
 ...idCacheReplicatedQueueMultiNodeSelfTest.java |    4 +-
 ...cheReplicatedQueueRotativeMultiNodeTest.java |    4 +-
 .../GridCacheReplicatedSequenceApiSelfTest.java |    2 +-
 ...acheReplicatedSequenceMultiNodeSelfTest.java |    2 +-
 ...tractDistributedByteArrayValuesSelfTest.java |   26 +-
 .../GridCacheAbstractJobExecutionTest.java      |   10 +-
 .../GridCacheAbstractNodeRestartSelfTest.java   |   16 +-
 ...tractPartitionedByteArrayValuesSelfTest.java |    6 +-
 .../GridCacheAbstractPrimarySyncSelfTest.java   |    8 +-
 .../GridCacheAtomicTimeoutSelfTest.java         |   14 +-
 .../GridCacheBasicOpAbstractTest.java           |   18 +-
 .../GridCacheClientModesAbstractSelfTest.java   |   18 +-
 .../GridCacheEntrySetAbstractSelfTest.java      |   12 +-
 ...acheEntrySetIterationPreloadingSelfTest.java |   12 +-
 .../distributed/GridCacheEventAbstractTest.java |   50 +-
 ...heExpiredEntriesPreloadAbstractSelfTest.java |    4 +-
 .../distributed/GridCacheLockAbstractTest.java  |    6 +-
 .../distributed/GridCacheMixedModeSelfTest.java |    4 +-
 .../GridCacheModuloAffinityFunction.java        |    4 +-
 .../GridCacheMultiNodeAbstractTest.java         |   10 +-
 .../GridCacheMultiNodeLockAbstractTest.java     |   12 +-
 ...dCacheMultithreadedFailoverAbstractTest.java |   16 +-
 .../GridCacheNodeFailureAbstractTest.java       |   14 +-
 ...dCachePartitionedAffinityFilterSelfTest.java |   14 +-
 ...chePartitionedReloadAllAbstractSelfTest.java |   22 +-
 .../GridCachePreloadEventsAbstractSelfTest.java |    6 +-
 .../GridCachePreloadLifecycleAbstractTest.java  |    6 +-
 ...GridCachePreloadRestartAbstractSelfTest.java |   22 +-
 .../GridCacheTransformEventSelfTest.java        |    8 +-
 ...iteTxConsistencyRestartAbstractSelfTest.java |   10 +-
 ...xOriginatingNodeFailureAbstractSelfTest.java |    4 +-
 ...cOriginatingNodeFailureAbstractSelfTest.java |    8 +-
 .../IgniteTxPreloadAbstractTest.java            |    4 +-
 .../IgniteTxTimeoutAbstractTest.java            |    4 +-
 ...tPartitionedOnlyByteArrayValuesSelfTest.java |   22 +-
 ...heAbstractTransformWriteThroughSelfTest.java |    2 +-
 ...acheAtomicExpiredEntriesPreloadSelfTest.java |    4 +-
 .../dht/GridCacheAtomicFullApiSelfTest.java     |    4 +-
 .../dht/GridCacheAtomicNearCacheSelfTest.java   |   42 +-
 ...idCacheAtomicNearEnabledFullApiSelfTest.java |    4 +-
 ...EnabledPrimaryWriteOrderFullApiSelfTest.java |    4 +-
 .../dht/GridCacheClientOnlySelfTest.java        |    4 +-
 .../dht/GridCacheColocatedDebugTest.java        |    6 +-
 .../dht/GridCacheColocatedFailoverSelfTest.java |    4 +-
 ...eColocatedOptimisticTransactionSelfTest.java |   12 +-
 .../GridCacheColocatedPrimarySyncSelfTest.java  |    4 +-
 .../GridCacheColocatedTxExceptionSelfTest.java  |    4 +-
 ...ssimisticOriginatingNodeFailureSelfTest.java |    4 +-
 ...dCacheColocatedTxSingleThreadedSelfTest.java |    6 +-
 .../GridCacheDhtAtomicRemoveFailureTest.java    |    2 +-
 .../dht/GridCacheDhtEntrySelfTest.java          |   24 +-
 .../dht/GridCacheDhtEntrySetSelfTest.java       |    2 +-
 ...GridCacheDhtEvictionNearReadersSelfTest.java |   16 +-
 .../dht/GridCacheDhtEvictionSelfTest.java       |   16 +-
 .../GridCacheDhtEvictionsDisabledSelfTest.java  |    6 +-
 ...idCacheDhtExpiredEntriesPreloadSelfTest.java |    4 +-
 .../dht/GridCacheDhtInternalEntrySelfTest.java  |   12 +-
 .../dht/GridCacheDhtMappingSelfTest.java        |    8 +-
 .../dht/GridCacheDhtMultiBackupTest.java        |    4 +-
 .../dht/GridCacheDhtPreloadBigDataSelfTest.java |   16 +-
 .../dht/GridCacheDhtPreloadDelayedSelfTest.java |   36 +-
 .../GridCacheDhtPreloadDisabledSelfTest.java    |   16 +-
 .../GridCacheDhtPreloadMessageCountTest.java    |   14 +-
 ...ridCacheDhtPreloadMultiThreadedSelfTest.java |    2 +-
 .../dht/GridCacheDhtPreloadOffHeapSelfTest.java |    2 +-
 .../dht/GridCacheDhtPreloadPutGetSelfTest.java  |   14 +-
 .../dht/GridCacheDhtPreloadSelfTest.java        |   40 +-
 .../GridCacheDhtPreloadStartStopSelfTest.java   |   24 +-
 .../dht/GridCacheDhtPreloadUnloadSelfTest.java  |   18 +-
 .../dht/GridCacheDhtRemoveFailureTest.java      |    2 +-
 .../distributed/dht/GridCacheDhtTestUtils.java  |   14 +-
 .../dht/GridCacheDhtTxPreloadSelfTest.java      |    2 +-
 .../dht/GridCacheGlobalLoadTest.java            |    5 +-
 ...cheGroupLockPartitionedAbstractSelfTest.java |   10 +-
 ...ockPartitionedMultiNodeAbstractSelfTest.java |   12 +-
 ...ePartitionedNearDisabledFullApiSelfTest.java |    4 +-
 ...ePartitionedNearDisabledMetricsSelfTest.java |   10 +-
 ...nedNearDisabledMultiNodeFullApiSelfTest.java |    4 +-
 ...bledMultiNodeP2PDisabledFullApiSelfTest.java |    4 +-
 ...isabledTxOriginatingNodeFailureSelfTest.java |    4 +-
 ...dCachePartitionedOnlyProjectionSelfTest.java |    4 +-
 ...idCachePartitionedPreloadEventsSelfTest.java |   10 +-
 ...dCachePartitionedTopologyChangeSelfTest.java |   18 +-
 ...itionedTxOriginatingNodeFailureSelfTest.java |    4 +-
 ...ridCachePartitionedUnloadEventsSelfTest.java |    6 +-
 ...teTxConsistencyColocatedRestartSelfTest.java |    4 +-
 .../dht/IgniteTxReentryColocatedSelfTest.java   |    2 +-
 ...eAtomicInvalidPartitionHandlingSelfTest.java |   10 +-
 .../atomic/GridCacheAtomicPreloadSelfTest.java  |   12 +-
 ...lueConsistencyAtomicNearEnabledSelfTest.java |    4 +-
 ...micPrimaryWriteOrderNearEnabledSelfTest.java |    4 +-
 ...GridCacheValueConsistencyAtomicSelfTest.java |    4 +-
 ...tNearPartitionedByteArrayValuesSelfTest.java |    4 +-
 ...unctionExcludeNeighborsAbstractSelfTest.java |   10 +-
 ...tomicClientOnlyMultiNodeFullApiSelfTest.java |   20 +-
 ...GridCacheAtomicMultiNodeFullApiSelfTest.java |    6 +-
 ...omicMultiNodeP2PDisabledFullApiSelfTest.java |    4 +-
 ...omicNearEnabledMultiNodeFullApiSelfTest.java |    4 +-
 ...imaryWriteOrderMultiNodeFullApiSelfTest.java |    4 +-
 ...eAtomicNearOnlyMultiNodeFullApiSelfTest.java |   10 +-
 .../GridCacheAtomicNearRemoveFailureTest.java   |    2 +-
 .../GridCacheAtomicOffHeapFullApiSelfTest.java  |    4 +-
 ...heAtomicOffHeapMultiNodeFullApiSelfTest.java |    4 +-
 ...idCacheAtomicPartitionedMetricsSelfTest.java |    4 +-
 ...cPrimaryWriteOrderNearRemoveFailureTest.java |    2 +-
 ...ffinityFunctionExcludeNeighborsSelfTest.java |    4 +-
 .../near/GridCacheExNearFullApiSelfTest.java    |    4 +-
 .../near/GridCacheGetStoreErrorSelfTest.java    |    5 +-
 .../near/GridCacheNearEvictionSelfTest.java     |   12 +-
 ...dCacheNearExpiredEntriesPreloadSelfTest.java |    4 +-
 .../near/GridCacheNearJobExecutionSelfTest.java |    4 +-
 .../near/GridCacheNearMetricsSelfTest.java      |   16 +-
 .../near/GridCacheNearMultiGetSelfTest.java     |   12 +-
 .../near/GridCacheNearMultiNodeSelfTest.java    |   40 +-
 .../near/GridCacheNearOneNodeSelfTest.java      |   20 +-
 ...idCacheNearOnlyMultiNodeFullApiSelfTest.java |   24 +-
 .../near/GridCacheNearOnlySelfTest.java         |    8 +-
 .../near/GridCacheNearOnlyTopologySelfTest.java |    6 +-
 .../GridCacheNearPartitionedClearSelfTest.java  |   14 +-
 .../near/GridCacheNearPrimarySyncSelfTest.java  |    4 +-
 .../GridCacheNearReaderPreloadSelfTest.java     |   14 +-
 .../near/GridCacheNearReadersSelfTest.java      |   30 +-
 .../near/GridCacheNearRemoveFailureTest.java    |    2 +-
 .../near/GridCacheNearTxMultiNodeSelfTest.java  |   16 +-
 ...ssimisticOriginatingNodeFailureSelfTest.java |    4 +-
 .../near/GridCacheNearTxPreloadSelfTest.java    |    2 +-
 ...AffinityExcludeNeighborsPerformanceTest.java |   12 +-
 ...rtitionedAffinityHashIdResolverSelfTest.java |    6 +-
 .../GridCachePartitionedAffinitySelfTest.java   |   24 +-
 .../near/GridCachePartitionedBasicApiTest.java  |    2 +-
 .../GridCachePartitionedBasicOpSelfTest.java    |    4 +-
 ...ePartitionedBasicStoreMultiNodeSelfTest.java |   22 +-
 ...ionedClientOnlyNoPrimaryFullApiSelfTest.java |    4 +-
 .../GridCachePartitionedEntryLockSelfTest.java  |    2 +-
 .../near/GridCachePartitionedEventSelfTest.java |    6 +-
 .../GridCachePartitionedEvictionSelfTest.java   |    8 +-
 ...titionedExplicitLockNodeFailureSelfTest.java |   14 +-
 ...GridCachePartitionedFilteredPutSelfTest.java |   14 +-
 .../GridCachePartitionedFullApiSelfTest.java    |   22 +-
 .../GridCachePartitionedLoadCacheSelfTest.java  |   12 +-
 .../GridCachePartitionedMetricsSelfTest.java    |    4 +-
 ...achePartitionedMultiNodeCounterSelfTest.java |   24 +-
 ...achePartitionedMultiNodeFullApiSelfTest.java |   40 +-
 ...idCachePartitionedMultiNodeLockSelfTest.java |    2 +-
 .../GridCachePartitionedMultiNodeSelfTest.java  |    4 +-
 ...ePartitionedMultiThreadedPutGetSelfTest.java |    8 +-
 ...NearDisabledBasicStoreMultiNodeSelfTest.java |    4 +-
 ...itionedNearOnlyNoPrimaryFullApiSelfTest.java |    4 +-
 .../near/GridCachePartitionedNestedTxTest.java  |    2 +-
 ...GridCachePartitionedNodeFailureSelfTest.java |    4 +-
 .../GridCachePartitionedNodeRestartTest.java    |    6 +-
 ...ePartitionedOptimisticTxNodeRestartTest.java |    4 +-
 ...achePartitionedPreloadLifecycleSelfTest.java |   16 +-
 .../GridCachePartitionedProjectionSelfTest.java |    4 +-
 ...hePartitionedQueryMultiThreadedSelfTest.java |   22 +-
 .../GridCachePartitionedStorePutSelfTest.java   |   12 +-
 ...GridCachePartitionedTxConcurrentGetTest.java |    2 +-
 ...GridCachePartitionedTxMultiNodeSelfTest.java |    2 +-
 ...CachePartitionedTxMultiThreadedSelfTest.java |    2 +-
 .../GridCachePartitionedTxSalvageSelfTest.java  |    6 +-
 ...achePartitionedTxSingleThreadedSelfTest.java |    6 +-
 .../near/GridCachePutArrayValueSelfTest.java    |    2 +-
 ...idCacheRendezvousAffinityClientSelfTest.java |    8 +-
 ...ffinityFunctionExcludeNeighborsSelfTest.java |    4 +-
 .../near/GridPartitionedBackupLoadSelfTest.java |   10 +-
 .../near/IgniteTxReentryNearSelfTest.java       |    2 +-
 ...stractReplicatedByteArrayValuesSelfTest.java |    4 +-
 .../GridCacheReplicatedEvictionSelfTest.java    |    4 +-
 ...ReplicatedFullApiMultithreadedSelfTest1.java |   88 +-
 .../GridCacheReplicatedFullApiSelfTest.java     |    4 +-
 .../GridCacheReplicatedInvalidateSelfTest.java  |    6 +-
 .../GridCacheReplicatedJobExecutionTest.java    |    2 +-
 .../GridCacheReplicatedMarshallerTxTest.java    |    2 +-
 .../GridCacheReplicatedNodeFailureSelfTest.java |    2 +-
 .../GridCacheReplicatedNodeRestartSelfTest.java |    4 +-
 .../GridCacheReplicatedProjectionSelfTest.java  |    2 +-
 ...dezvousAffinityMultiNodeFullApiSelfTest.java |    4 +-
 .../GridCacheReplicatedTxConcurrentGetTest.java |    2 +-
 .../GridCacheReplicatedTxExceptionSelfTest.java |    4 +-
 ...GridCacheReplicatedTxMultiNodeBasicTest.java |    2 +-
 ...dCacheReplicatedTxMultiThreadedSelfTest.java |    2 +-
 ...ssimisticOriginatingNodeFailureSelfTest.java |    4 +-
 ...CacheReplicatedTxSingleThreadedSelfTest.java |    2 +-
 ...idCacheReplicatedUnswapAdvancedSelfTest.java |    4 +-
 .../GridCacheSyncReplicatedPreloadSelfTest.java |    6 +-
 ...CacheReplicatedPreloadLifecycleSelfTest.java |   16 +-
 ...idCacheReplicatedPreloadOffHeapSelfTest.java |    2 +-
 .../GridCacheReplicatedPreloadSelfTest.java     |   48 +-
 .../GridCacheBatchEvictUnswapSelfTest.java      |   10 +-
 ...heConcurrentEvictionConsistencySelfTest.java |   36 +-
 .../GridCacheConcurrentEvictionsSelfTest.java   |   14 +-
 .../GridCacheDistributedEvictionsSelfTest.java  |   10 +-
 .../GridCacheEmptyEntriesAbstractSelfTest.java  |   28 +-
 .../eviction/GridCacheEvictionAbstractTest.java |   34 +-
 .../GridCacheEvictionFilterSelfTest.java        |   18 +-
 .../GridCacheEvictionLockUnlockSelfTest.java    |    8 +-
 .../GridCacheEvictionTouchSelfTest.java         |   60 +-
 .../cache/eviction/GridCacheMockEntry.java      |   26 +-
 ...cheSynchronousEvictionsFailoverSelfTest.java |   10 +-
 .../GridCacheFifoEvictionPolicySelfTest.java    |   22 +-
 .../lru/GridCacheLruEvictionPolicySelfTest.java |   24 +-
 .../GridCacheLruNearEvictionPolicySelfTest.java |   10 +-
 ...heNearOnlyLruNearEvictionPolicySelfTest.java |   10 +-
 .../GridCacheRandomEvictionPolicySelfTest.java  |   14 +-
 .../IgniteCacheAtomicExpiryPolicyTest.java      |    4 +-
 .../IgniteCacheAtomicLocalExpiryPolicyTest.java |    4 +-
 .../IgniteCacheExpiryPolicyAbstractTest.java    |    6 +-
 .../expiry/IgniteCacheTxExpiryPolicyTest.java   |    4 +-
 .../IgniteCacheTxLocalExpiryPolicyTest.java     |    4 +-
 .../IgniteCacheAtomicLoadAllTest.java           |    4 +-
 .../IgniteCacheAtomicLoaderWriterTest.java      |    4 +-
 .../IgniteCacheAtomicLocalLoadAllTest.java      |    4 +-
 ...CacheAtomicLocalNoLoadPreviousValueTest.java |    4 +-
 ...IgniteCacheAtomicLocalNoReadThroughTest.java |    4 +-
 ...gniteCacheAtomicLocalNoWriteThroughTest.java |    4 +-
 ...tomicNearEnabledNoLoadPreviousValueTest.java |    4 +-
 ...CacheAtomicNearEnabledNoReadThroughTest.java |    4 +-
 ...acheAtomicNearEnabledNoWriteThroughTest.java |    4 +-
 ...gniteCacheAtomicNoLoadPreviousValueTest.java |    4 +-
 .../IgniteCacheAtomicNoReadThroughTest.java     |    4 +-
 .../IgniteCacheAtomicNoWriteThroughTest.java    |    4 +-
 .../IgniteCacheAtomicStoreSessionTest.java      |    4 +-
 .../IgniteCacheLoadAllAbstractTest.java         |    2 +-
 ...iteCacheNoLoadPreviousValueAbstractTest.java |    2 +-
 .../IgniteCacheNoReadThroughAbstractTest.java   |    2 +-
 .../IgniteCacheNoWriteThroughAbstractTest.java  |    2 +-
 .../integration/IgniteCacheTxLoadAllTest.java   |    4 +-
 .../IgniteCacheTxLoaderWriterTest.java          |    4 +-
 .../IgniteCacheTxLocalLoadAllTest.java          |    4 +-
 ...niteCacheTxLocalNoLoadPreviousValueTest.java |    4 +-
 .../IgniteCacheTxLocalNoReadThroughTest.java    |    4 +-
 .../IgniteCacheTxLocalNoWriteThroughTest.java   |    4 +-
 ...cheTxNearEnabledNoLoadPreviousValueTest.java |    4 +-
 ...niteCacheTxNearEnabledNoReadThroughTest.java |    4 +-
 ...iteCacheTxNearEnabledNoWriteThroughTest.java |    4 +-
 .../IgniteCacheTxNoLoadPreviousValueTest.java   |    4 +-
 .../IgniteCacheTxNoReadThroughTest.java         |    4 +-
 .../IgniteCacheTxNoWriteThroughTest.java        |    4 +-
 .../IgniteCacheTxStoreSessionTest.java          |    4 +-
 .../GridCacheLocalByteArrayValuesSelfTest.java  |   12 +-
 .../local/GridCacheLocalFullApiSelfTest.java    |    6 +-
 .../local/GridCacheLocalIteratorsSelfTest.java  |    6 +-
 .../local/GridCacheLocalTxTimeoutSelfTest.java  |    2 +-
 .../GridCacheSwapScanQueryAbstractSelfTest.java |   34 +-
 ...ridCacheContinuousQueryAbstractSelfTest.java |  212 +-
 ...ontinuousQueryAtomicNearEnabledSelfTest.java |    4 +-
 .../GridCacheContinuousQueryAtomicSelfTest.java |    4 +-
 ...eContinuousQueryPartitionedOnlySelfTest.java |    4 +-
 ...dCacheContinuousQueryReplicatedSelfTest.java |    6 +-
 ...dCacheAbstractReduceFieldsQuerySelfTest.java |   56 +-
 ...ridCacheReduceFieldsQueryAtomicSelfTest.java |    4 +-
 ...cheReduceFieldsQueryPartitionedSelfTest.java |    2 +-
 .../dataload/GridDataLoaderImplSelfTest.java    |    4 +-
 .../dataload/GridDataLoaderPerformanceTest.java |    4 +-
 .../GridDataLoaderProcessorSelfTest.java        |   16 +-
 ...heGgfsPerBlockLruEvictionPolicySelfTest.java |   20 +-
 .../processors/fs/GridGgfsAbstractSelfTest.java |   14 +-
 .../processors/fs/GridGgfsCacheSelfTest.java    |    4 +-
 .../fs/GridGgfsDataManagerSelfTest.java         |    6 +-
 .../fs/GridGgfsDualAbstractSelfTest.java        |    2 +-
 .../fs/GridGgfsMetaManagerSelfTest.java         |    4 +-
 .../processors/fs/GridGgfsMetricsSelfTest.java  |   16 +-
 .../processors/fs/GridGgfsModesSelfTest.java    |   12 +-
 .../GridGgfsPrimaryOffheapTieredSelfTest.java   |    2 +-
 .../GridGgfsPrimaryOffheapValuesSelfTest.java   |    2 +-
 .../fs/GridGgfsProcessorSelfTest.java           |   12 +-
 .../processors/fs/GridGgfsSizeSelfTest.java     |   10 +-
 .../processors/fs/GridGgfsStreamsSelfTest.java  |   10 +-
 .../processors/fs/GridGgfsTaskSelfTest.java     |    6 +-
 .../GridGgfsAbstractRecordResolverSelfTest.java |    4 +-
 .../cache/GridCacheCommandHandlerSelfTest.java  |    2 +-
 .../GridServiceProcessorAbstractSelfTest.java   |    2 +-
 .../shmem/GridIpcSharedMemoryNodeStartup.java   |    4 +-
 ...idOffHeapPartitionedMapAbstractSelfTest.java |    2 +-
 ...apPartitionedMapPerformanceAbstractTest.java |    2 +-
 ...GridUnsafePartitionedMapPerformanceTest.java |    2 +-
 .../apache/ignite/lang/GridFuncSelfTest.java    |    8 +-
 .../loadtests/GridCacheMultiNodeLoadTest.java   |    8 +-
 .../cache/GridCacheAbstractLoadTest.java        |    6 +-
 ...ridCacheAffinityTransactionsOffHeapTest.java |   14 +-
 .../loadtests/cache/GridCacheBenchmark.java     |    2 +-
 .../cache/GridCacheDataStructuresLoadTest.java  |   96 +-
 .../cache/GridCacheGroupLockComparisonTest.java |   10 +-
 .../loadtests/cache/GridCacheLoadTest.java      |   14 +-
 .../cache/GridCachePutRemoveLoadTest.java       |   18 +-
 .../cache/GridCacheSingleNodeLoadTest.java      |    8 +-
 .../loadtests/cache/GridCacheSwapLoadTest.java  |    6 +-
 .../GridCacheWriteBehindStoreLoadTest.java      |   10 +-
 .../capacity/GridCapacityLoadTest.java          |    2 +-
 .../capacity/spring-capacity-cache.xml          |    2 +-
 .../colocation/GridTestCacheStore.java          |    8 +-
 .../loadtests/colocation/GridTestKey.java       |    2 +-
 .../colocation/GridTestLifecycleBean.java       |    2 +-
 .../loadtests/colocation/GridTestMain.java      |    8 +-
 .../loadtests/colocation/spring-colocation.xml  |    2 +-
 .../GridContinuousOperationsLoadTest.java       |    6 +-
 .../GridCachePartitionedAtomicLongLoadTest.java |   12 +-
 .../ignite/loadtests/dsi/GridDsiPerfJob.java    |   14 +-
 .../ignite/loadtests/dsi/GridDsiRequest.java    |    2 +-
 .../ignite/loadtests/dsi/GridDsiResponse.java   |    4 +-
 .../ignite/loadtests/dsi/GridDsiSession.java    |    2 +-
 .../cacheget/GridBenchmarkCacheGetLoadTest.java |    4 +-
 .../ignite/loadtests/mapper/TestObject.java     |    4 +-
 ...apPartitionedMapPerformanceAbstractTest.java |    2 +-
 ...GridUnsafePartitionedMapPerformanceTest.java |    2 +-
 .../swap/GridSwapEvictAllBenchmark.java         |   10 +-
 .../marshaller/GridMarshallerAbstractTest.java  |   16 +-
 .../GridP2PContinuousDeploymentSelfTest.java    |    4 +-
 ...idCacheCheckpointSpiSecondCacheSelfTest.java |    6 +-
 .../tcp/GridCacheDhtLockBackupSelfTest.java     |    4 +-
 .../GridCacheStoreValueBytesNode.java           |    2 +-
 .../GridCacheStoreValueBytesTest.java           |    4 +-
 .../ignite/testframework/GridTestUtils.java     |   12 +-
 .../testframework/junits/GridAbstractTest.java  |    4 +-
 .../testframework/junits/GridTestIgnite.java    |    6 +-
 .../junits/common/GridCommonAbstractTest.java   |   56 +-
 .../core/src/test/webapp/META-INF/gg-config.xml |    8 +-
 .../tests/p2p/GridCacheDeploymentTestTask1.java |    2 +-
 .../tests/p2p/GridExternalAffinityFunction.java |    4 +-
 .../p2p/GridExternalAffinityKeyMapper.java      |    2 +-
 .../hadoop/jobtracker/GridHadoopJobTracker.java |    4 +-
 ...dGgfsHadoop20FileSystemAbstractSelfTest.java |   12 +-
 .../fs/GridGgfsHadoopDualAbstractSelfTest.java  |    8 +-
 ...ridGgfsHadoopFileSystemAbstractSelfTest.java |   12 +-
 .../GridGgfsHadoopFileSystemClientSelfTest.java |    4 +-
 ...idGgfsHadoopFileSystemHandshakeSelfTest.java |    4 +-
 ...ridGgfsHadoopFileSystemIpcCacheSelfTest.java |    6 +-
 ...GgfsHadoopFileSystemLoggerStateSelfTest.java |    6 +-
 ...fsHadoopFileSystemSecondaryModeSelfTest.java |   12 +-
 .../fs/GridGgfsNearOnlyMultiNodeSelfTest.java   |    4 +-
 .../hadoop/GridHadoopAbstractSelfTest.java      |    2 +-
 ...idHadoopDefaultMapReducePlannerSelfTest.java |    6 +-
 .../GridHibernateAccessStrategyAdapter.java     |   10 +-
 .../GridHibernateCollectionRegion.java          |    2 +-
 .../hibernate/GridHibernateEntityRegion.java    |    2 +-
 .../GridHibernateGeneralDataRegion.java         |    2 +-
 .../hibernate/GridHibernateNaturalIdRegion.java |    2 +-
 .../GridHibernateNonStrictAccessStrategy.java   |    4 +-
 .../GridHibernateQueryResultsRegion.java        |    4 +-
 .../GridHibernateReadOnlyAccessStrategy.java    |    2 +-
 .../GridHibernateReadWriteAccessStrategy.java   |    2 +-
 .../cache/hibernate/GridHibernateRegion.java    |    4 +-
 .../hibernate/GridHibernateRegionFactory.java   |   10 +-
 .../GridHibernateTimestampsRegion.java          |    2 +-
 ...ridHibernateTransactionalAccessStrategy.java |    4 +-
 .../GridHibernateTransactionalDataRegion.java   |    2 +-
 ...idHibernateL2CacheConfigurationSelfTest.java |   13 +-
 .../hibernate/GridHibernateL2CacheSelfTest.java |    9 +-
 ...idHibernateL2CacheTransactionalSelfTest.java |    4 +-
 .../processors/query/h2/IgniteH2Indexing.java   |   15 +-
 .../GridCacheAbstractFieldsQuerySelfTest.java   |  122 +-
 .../cache/GridCacheAbstractQuerySelfTest.java   |  204 +-
 .../cache/GridCacheCrossCacheQuerySelfTest.java |   36 +-
 .../cache/GridCacheOffHeapAndSwapSelfTest.java  |   34 +-
 .../cache/GridCacheQueryLoadSelfTest.java       |   36 +-
 .../cache/GridCacheQueryMetricsSelfTest.java    |   16 +-
 .../GridCacheQueryMultiThreadedSelfTest.java    |   62 +-
 .../cache/GridCacheQueryTestValue.java          |   18 +-
 ...idCacheReduceQueryMultithreadedSelfTest.java |    8 +-
 .../GridCacheSqlQueryMultiThreadedSelfTest.java |   10 +-
 .../processors/cache/GridCacheSwapSelfTest.java |   36 +-
 .../cache/GridIndexingWithNoopSwapSelfTest.java |   14 +-
 .../GridCacheAtomicFieldsQuerySelfTest.java     |    6 +-
 ...cheAtomicNearEnabledFieldsQuerySelfTest.java |    4 +-
 ...GridCacheAtomicNearEnabledQuerySelfTest.java |    4 +-
 .../near/GridCacheAtomicQuerySelfTest.java      |    4 +-
 ...GridCachePartitionedFieldsQuerySelfTest.java |   14 +-
 ...idCachePartitionedHitsAndMissesSelfTest.java |    8 +-
 .../near/GridCachePartitionedQuerySelfTest.java |   36 +-
 .../near/GridCacheQueryNodeRestartSelfTest.java |   10 +-
 .../GridCacheReplicatedFieldsQuerySelfTest.java |   16 +-
 .../GridCacheReplicatedQuerySelfTest.java       |   44 +-
 .../local/GridCacheLocalQuerySelfTest.java      |    8 +-
 .../query/h2/GridH2IndexRebuildTest.java        |   34 +-
 .../query/h2/GridH2IndexingGeoSelfTest.java     |   20 +-
 .../loadtests/h2indexing/GridTestEntity.java    |    4 +-
 .../tcp/GridOrderedMessageCancelSelfTest.java   |    4 +-
 .../processors/cache/GridCacheJtaSelfTest.java  |    4 +-
 .../GridTmLookupLifecycleAwareSelfTest.java     |    6 +-
 .../ignite/scalar/ScalarConversions.scala       |   14 +-
 .../ignite/scalar/pimps/ScalarCachePimp.scala   |   10 +-
 .../pimps/ScalarCacheProjectionPimp.scala       |  192 +-
 .../scala/org/apache/ignite/scalar/scalar.scala |   20 +-
 .../scalar/tests/ScalarCacheQueriesSpec.scala   |    4 +-
 .../org/apache/ignite/IgniteSpringBean.java     |    4 +-
 .../apache/ignite/cache/spring/SpringCache.java |   13 +-
 .../ignite/cache/spring/SpringCacheManager.java |    8 +-
 .../cache/spring/SpringDynamicCacheManager.java |   19 +-
 .../p2p/GridP2PUserVersionChangeSelfTest.java   |    4 +-
 .../spring/GridSpringCacheManagerSelfTest.java  |   14 +-
 .../GridSpringDynamicCacheManagerSelfTest.java  |    9 +-
 .../commands/cache/VisorCacheCommandSpec.scala  |    4 +-
 .../cache/websession/GridWebSessionFilter.java  |    2 +-
 .../internal/websession/WebSessionSelfTest.java |    2 +-
 973 files changed, 16970 insertions(+), 16990 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/examples/config/example-cache.xml
----------------------------------------------------------------------
diff --git a/examples/config/example-cache.xml b/examples/config/example-cache.xml
index 20c23f6..ebc22ca 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.apache.ignite.cache.query.GridCacheQueryConfiguration">
+            <bean class="org.apache.ignite.cache.query.CacheQueryConfiguration">
                 <!-- Index primitives. -->
                 <property name="indexPrimitiveKey" value="true"/>
             </bean>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheAffinityExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheAffinityExample.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheAffinityExample.java
index a0be78e..ff7445b 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheAffinityExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheAffinityExample.java
@@ -53,7 +53,7 @@ public final class CacheAffinityExample {
             System.out.println();
             System.out.println(">>> Cache affinity example started.");
 
-            GridCache<Integer, String> cache = g.cache(CACHE_NAME);
+            Cache<Integer, String> cache = g.cache(CACHE_NAME);
 
             // Clean up caches on all nodes before run.
             cache.globalClearAll(0);
@@ -78,7 +78,7 @@ public final class CacheAffinityExample {
     private static void visitUsingAffinityRun() throws IgniteCheckedException {
         Ignite g = Ignition.ignite();
 
-        final GridCache<Integer, String> cache = g.cache(CACHE_NAME);
+        final Cache<Integer, String> cache = g.cache(CACHE_NAME);
 
         for (int i = 0; i < KEY_CNT; i++) {
             final int key = i;
@@ -123,7 +123,7 @@ public final class CacheAffinityExample {
                 // Bring computations to the nodes where the data resides (i.e. collocation).
                 g.compute(g.cluster().forNode(node)).run(new IgniteRunnable() {
                     @Override public void run() {
-                        GridCache<Integer, String> cache = g.cache(CACHE_NAME);
+                        Cache<Integer, String> cache = g.cache(CACHE_NAME);
 
                         // Peek is a local memory lookup, however, value should never be 'null'
                         // as we are co-located with node that has a given key.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheApiExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheApiExample.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheApiExample.java
index 71666d0..e5b0bd9 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheApiExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheApiExample.java
@@ -127,34 +127,34 @@ public class CacheApiExample {
         System.out.println();
         System.out.println(">>> Local iterator examples.");
 
-        GridCache<Integer, String> cache = Ignition.ignite().cache(CACHE_NAME);
+        Cache<Integer, String> cache = Ignition.ignite().cache(CACHE_NAME);
 
         // Iterate over whole cache.
-        for (GridCacheEntry<Integer, String> e : cache)
+        for (CacheEntry<Integer, String> e : cache)
             System.out.println("Basic cache iteration [key=" + e.getKey() + ", val=" + e.getValue() + ']');
 
         // Iterate over cache projection for all keys below 5.
-        GridCacheProjection<Integer, String> keysBelow5 = cache.projection(
-            new IgnitePredicate<GridCacheEntry<Integer, String>>() {
-                @Override public boolean apply(GridCacheEntry<Integer, String> e) {
+        CacheProjection<Integer, String> keysBelow5 = cache.projection(
+            new IgnitePredicate<CacheEntry<Integer, String>>() {
+                @Override public boolean apply(CacheEntry<Integer, String> e) {
                     return e.getKey() < 5;
                 }
             }
         );
 
-        for (GridCacheEntry<Integer, String> e : keysBelow5)
+        for (CacheEntry<Integer, String> e : keysBelow5)
             System.out.println("Cache projection iteration [key=" + e.getKey() + ", val=" + e.getValue() + ']');
 
         // Iterate over each element using 'forEach' construct.
-        cache.forEach(new IgniteInClosure<GridCacheEntry<Integer, String>>() {
-            @Override public void apply(GridCacheEntry<Integer, String> e) {
+        cache.forEach(new IgniteInClosure<CacheEntry<Integer, String>>() {
+            @Override public void apply(CacheEntry<Integer, String> e) {
                 System.out.println("forEach iteration [key=" + e.getKey() + ", val=" + e.getValue() + ']');
             }
         });
 
         // Search cache for element with value "1" using 'forAll' construct.
-        cache.forAll(new IgnitePredicate<GridCacheEntry<Integer, String>>() {
-            @Override public boolean apply(GridCacheEntry<Integer, String> e) {
+        cache.forAll(new IgnitePredicate<CacheEntry<Integer, String>>() {
+            @Override public boolean apply(CacheEntry<Integer, String> e) {
                 String v = e.peek();
 
                 if ("1".equals(v)) {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheContinuousQueryExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheContinuousQueryExample.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheContinuousQueryExample.java
index 02aa4bb..e28e39e 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheContinuousQueryExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheContinuousQueryExample.java
@@ -48,7 +48,7 @@ public class CacheContinuousQueryExample {
             System.out.println();
             System.out.println(">>> Cache continuous query example started.");
 
-            GridCache<Integer, String> cache = g.cache(CACHE_NAME);
+            Cache<Integer, String> cache = g.cache(CACHE_NAME);
 
             // Clean up caches on all nodes before run.
             cache.globalClearAll(0);
@@ -59,15 +59,15 @@ public class CacheContinuousQueryExample {
                 cache.putx(i, Integer.toString(i));
 
             // Create new continuous query.
-            try (GridCacheContinuousQuery<Integer, String> qry = cache.queries().createContinuousQuery()) {
+            try (CacheContinuousQuery<Integer, String> qry = cache.queries().createContinuousQuery()) {
                 // Callback that is called locally when update notifications are received.
                 qry.localCallback(
-                    new IgniteBiPredicate<UUID, Collection<GridCacheContinuousQueryEntry<Integer, String>>>() {
+                    new IgniteBiPredicate<UUID, Collection<CacheContinuousQueryEntry<Integer, String>>>() {
                         @Override public boolean apply(
                             UUID nodeId,
-                            Collection<GridCacheContinuousQueryEntry<Integer, String>> entries
+                            Collection<CacheContinuousQueryEntry<Integer, String>> entries
                         ) {
-                            for (GridCacheContinuousQueryEntry<Integer, String> e : entries)
+                            for (CacheContinuousQueryEntry<Integer, String> e : entries)
                                 System.out.println("Queried entry [key=" + e.getKey() + ", val=" + e.getValue() + ']');
 
                             return true; // Return true to continue listening.
@@ -76,8 +76,8 @@ public class CacheContinuousQueryExample {
 
                 // This filter will be evaluated remotely on all nodes
                 // Entry that pass this filter will be sent to the caller.
-                qry.remoteFilter(new IgnitePredicate<GridCacheContinuousQueryEntry<Integer, String>>() {
-                    @Override public boolean apply(GridCacheContinuousQueryEntry<Integer, String> e) {
+                qry.remoteFilter(new IgnitePredicate<CacheContinuousQueryEntry<Integer, String>>() {
+                    @Override public boolean apply(CacheContinuousQueryEntry<Integer, String> e) {
                         return e.getKey() > 15;
                     }
                 });

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheDataLoaderExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheDataLoaderExample.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheDataLoaderExample.java
index 4ea15b8..a7da7a6 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheDataLoaderExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheDataLoaderExample.java
@@ -23,7 +23,7 @@ import org.apache.ignite.examples.*;
 /**
  * Demonstrates how cache can be populated with data utilizing {@link org.apache.ignite.IgniteDataLoader} API.
  * {@link org.apache.ignite.IgniteDataLoader} is a lot more efficient to use than standard
- * {@code GridCacheProjection.put(...)} operation as it properly buffers cache requests
+ * {@code CacheProjection.put(...)} operation as it properly buffers cache requests
  * together and properly manages load on remote nodes.
  * <p>
  * Remote nodes should always be started with special configuration file which

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheEventsExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheEventsExample.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheEventsExample.java
index bc2c01e..56f2617 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheEventsExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheEventsExample.java
@@ -51,7 +51,7 @@ public class CacheEventsExample {
             System.out.println();
             System.out.println(">>> Cache events example started.");
 
-            final GridCache<Integer, String> cache = g.cache(CACHE_NAME);
+            final Cache<Integer, String> cache = g.cache(CACHE_NAME);
 
             // Clean up caches on all nodes before run.
             cache.globalClearAll(0);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/examples/src/main/java/org/apache/ignite/examples/datagrid/CachePopularNumbersExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/CachePopularNumbersExample.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/CachePopularNumbersExample.java
index 285b374..2197e8c 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datagrid/CachePopularNumbersExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/CachePopularNumbersExample.java
@@ -114,11 +114,11 @@ public class CachePopularNumbersExample {
      */
     private static TimerTask scheduleQuery(final Ignite g, Timer timer, final int cnt) {
         TimerTask task = new TimerTask() {
-            private GridCacheQuery<List<?>> qry;
+            private CacheQuery<List<?>> qry;
 
             @Override public void run() {
                 // Get reference to cache.
-                GridCache<Integer, Long> cache = g.cache(CACHE_NAME);
+                Cache<Integer, Long> cache = g.cache(CACHE_NAME);
 
                 if (qry == null)
                     qry = cache.queries().

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/examples/src/main/java/org/apache/ignite/examples/datagrid/CachePutGetExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/CachePutGetExample.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/CachePutGetExample.java
index a6b8f6c..c568b33 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datagrid/CachePutGetExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/CachePutGetExample.java
@@ -65,7 +65,7 @@ public class CachePutGetExample {
 
         Ignite g = Ignition.ignite();
 
-        final GridCache<Integer, String> cache = g.cache(CACHE_NAME);
+        final Cache<Integer, String> cache = g.cache(CACHE_NAME);
 
         final int keyCnt = 20;
 
@@ -90,7 +90,7 @@ public class CachePutGetExample {
 
         Ignite g = Ignition.ignite();
 
-        final GridCache<Integer, String> cache = g.cache(CACHE_NAME);
+        final Cache<Integer, String> cache = g.cache(CACHE_NAME);
 
         final int keyCnt = 20;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheQueryExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheQueryExample.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheQueryExample.java
index cefda33..b187d52 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheQueryExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheQueryExample.java
@@ -47,7 +47,7 @@ import java.util.*;
  *     </li>
  *     <li>
  *         Joins will work correctly only if joined objects are stored in
- *         collocated mode. Refer to {@link org.apache.ignite.cache.affinity.GridCacheAffinityKey} javadoc for more details.
+ *         collocated mode. Refer to {@link org.apache.ignite.cache.affinity.CacheAffinityKey} javadoc for more details.
  *     </li>
  *     <li>
  *         Note that if you created query on to replicated cache, all data will
@@ -119,10 +119,10 @@ public class CacheQueryExample {
      * @throws IgniteCheckedException In case of error.
      */
     private static void sqlQuery() throws IgniteCheckedException {
-        GridCache<GridCacheAffinityKey<UUID>, Person> cache = Ignition.ignite().cache(CACHE_NAME);
+        Cache<CacheAffinityKey<UUID>, Person> cache = Ignition.ignite().cache(CACHE_NAME);
 
         // Create query which selects salaries based on range.
-        GridCacheQuery<Map.Entry<GridCacheAffinityKey<UUID>, Person>> qry =
+        CacheQuery<Map.Entry<CacheAffinityKey<UUID>, Person>> qry =
             cache.queries().createSqlQuery(Person.class, "salary > ? and salary <= ?");
 
         // Execute queries for salary ranges.
@@ -139,10 +139,10 @@ public class CacheQueryExample {
      * @throws IgniteCheckedException In case of error.
      */
     private static void sqlQueryWithJoin() throws IgniteCheckedException {
-        GridCache<GridCacheAffinityKey<UUID>, Person> cache = Ignition.ignite().cache(CACHE_NAME);
+        Cache<CacheAffinityKey<UUID>, Person> cache = Ignition.ignite().cache(CACHE_NAME);
 
         // Create query which joins on 2 types to select people for a specific organization.
-        GridCacheQuery<Map.Entry<GridCacheAffinityKey<UUID>, Person>> qry =
+        CacheQuery<Map.Entry<CacheAffinityKey<UUID>, Person>> qry =
             cache.queries().createSqlQuery(Person.class, "from Person, Organization " +
                 "where Person.orgId = Organization.id " +
                 "and lower(Organization.name) = lower(?)");
@@ -158,14 +158,14 @@ public class CacheQueryExample {
      * @throws IgniteCheckedException In case of error.
      */
     private static void textQuery() throws IgniteCheckedException {
-        GridCache<GridCacheAffinityKey<UUID>, Person> cache = Ignition.ignite().cache(CACHE_NAME);
+        Cache<CacheAffinityKey<UUID>, Person> cache = Ignition.ignite().cache(CACHE_NAME);
 
         //  Query for all people with "Master Degree" in their resumes.
-        GridCacheQuery<Map.Entry<GridCacheAffinityKey<UUID>, Person>> masters =
+        CacheQuery<Map.Entry<CacheAffinityKey<UUID>, Person>> masters =
             cache.queries().createFullTextQuery(Person.class, "Master");
 
         // Query for all people with "Bachelor Degree"in their resumes.
-        GridCacheQuery<Map.Entry<GridCacheAffinityKey<UUID>, Person>> bachelors =
+        CacheQuery<Map.Entry<CacheAffinityKey<UUID>, Person>> bachelors =
             cache.queries().createFullTextQuery(Person.class, "Bachelor");
 
         print("Following people have 'Master Degree' in their resumes: ", masters.execute().get());
@@ -179,21 +179,21 @@ public class CacheQueryExample {
      * @throws IgniteCheckedException In case of error.
      */
     private static void sqlQueryWithReducers() throws IgniteCheckedException {
-        GridCacheProjection<GridCacheAffinityKey<UUID>, Person> cache = Ignition.ignite().cache(CACHE_NAME);
+        CacheProjection<CacheAffinityKey<UUID>, Person> cache = Ignition.ignite().cache(CACHE_NAME);
 
         // Calculate average of salary of all persons in GridGain.
-        GridCacheQuery<Map.Entry<GridCacheAffinityKey<UUID>, Person>> qry = cache.queries().createSqlQuery(
+        CacheQuery<Map.Entry<CacheAffinityKey<UUID>, Person>> qry = cache.queries().createSqlQuery(
             Person.class,
             "from Person, Organization where Person.orgId = Organization.id and " +
                 "lower(Organization.name) = lower(?)");
 
         Collection<IgniteBiTuple<Double, Integer>> res = qry.execute(
-            new IgniteReducer<Map.Entry<GridCacheAffinityKey<UUID>, Person>, IgniteBiTuple<Double, Integer>>() {
+            new IgniteReducer<Map.Entry<CacheAffinityKey<UUID>, Person>, IgniteBiTuple<Double, Integer>>() {
                 private double sum;
 
                 private int cnt;
 
-                @Override public boolean collect(Map.Entry<GridCacheAffinityKey<UUID>, Person> e) {
+                @Override public boolean collect(Map.Entry<CacheAffinityKey<UUID>, Person> e) {
                     sum += e.getValue().salary;
 
                     cnt++;
@@ -228,10 +228,10 @@ public class CacheQueryExample {
      * @throws IgniteCheckedException In case of error.
      */
     private static void sqlQueryWithTransformer() throws IgniteCheckedException {
-        GridCache<GridCacheAffinityKey<UUID>, Person> cache = Ignition.ignite().cache(CACHE_NAME);
+        Cache<CacheAffinityKey<UUID>, Person> cache = Ignition.ignite().cache(CACHE_NAME);
 
         // Create query to get names of all employees working for some company.
-        GridCacheQuery<Map.Entry<GridCacheAffinityKey<UUID>, Person>> qry =
+        CacheQuery<Map.Entry<CacheAffinityKey<UUID>, Person>> qry =
             cache.queries().createSqlQuery(Person.class,
                 "from Person, Organization " +
                     "where Person.orgId = Organization.id and lower(Organization.name) = lower(?)");
@@ -239,9 +239,9 @@ public class CacheQueryExample {
         // Transformer to convert Person objects to String.
         // Since caller only needs employee names, we only
         // send names back.
-        IgniteClosure<Map.Entry<GridCacheAffinityKey<UUID>, Person>, String> trans =
-            new IgniteClosure<Map.Entry<GridCacheAffinityKey<UUID>, Person>, String>() {
-                @Override public String apply(Map.Entry<GridCacheAffinityKey<UUID>, Person> e) {
+        IgniteClosure<Map.Entry<CacheAffinityKey<UUID>, Person>, String> trans =
+            new IgniteClosure<Map.Entry<CacheAffinityKey<UUID>, Person>, String>() {
+                @Override public String apply(Map.Entry<CacheAffinityKey<UUID>, Person> e) {
                     return e.getValue().lastName;
                 }
             };
@@ -257,10 +257,10 @@ public class CacheQueryExample {
      * @throws IgniteCheckedException In case of error.
      */
     private static void sqlFieldsQuery() throws IgniteCheckedException {
-        GridCache<?, ?> cache = Ignition.ignite().cache(CACHE_NAME);
+        Cache<?, ?> cache = Ignition.ignite().cache(CACHE_NAME);
 
         // Create query to get names of all employees.
-        GridCacheQuery<List<?>> qry1 = cache.queries().createSqlFieldsQuery(
+        CacheQuery<List<?>> qry1 = cache.queries().createSqlFieldsQuery(
             "select concat(firstName, ' ', lastName) from Person");
 
         // Execute query to get collection of rows. In this particular
@@ -278,10 +278,10 @@ public class CacheQueryExample {
      * @throws IgniteCheckedException In case of error.
      */
     private static void sqlFieldsQueryWithJoin() throws IgniteCheckedException {
-        GridCache<?, ?> cache = Ignition.ignite().cache(CACHE_NAME);
+        Cache<?, ?> cache = Ignition.ignite().cache(CACHE_NAME);
 
         // Create query to get names of all employees.
-        GridCacheQuery<List<?>> qry1 = cache.queries().createSqlFieldsQuery(
+        CacheQuery<List<?>> qry1 = cache.queries().createSqlFieldsQuery(
             "select concat(firstName, ' ', lastName), Organization.name from Person, Organization where " +
                 "Person.orgId = Organization.id");
 
@@ -300,14 +300,14 @@ public class CacheQueryExample {
      * @throws InterruptedException In case of error.
      */
     private static void initialize() throws IgniteCheckedException, InterruptedException {
-        GridCache<?, ?> cache = Ignition.ignite().cache(CACHE_NAME);
+        Cache<?, ?> cache = Ignition.ignite().cache(CACHE_NAME);
 
         // Organization projection.
-        GridCacheProjection<UUID, Organization> orgCache = cache.projection(UUID.class, Organization.class);
+        CacheProjection<UUID, Organization> orgCache = cache.projection(UUID.class, Organization.class);
 
         // Person projection.
-        GridCacheProjection<GridCacheAffinityKey<UUID>, Person> personCache =
-            cache.projection(GridCacheAffinityKey.class, Person.class);
+        CacheProjection<CacheAffinityKey<UUID>, Person> personCache =
+            cache.projection(CacheAffinityKey.class, Person.class);
 
         // Organizations.
         Organization org1 = new Organization("GridGain");
@@ -374,31 +374,31 @@ public class CacheQueryExample {
      */
     private static class Person implements Serializable {
         /** Person ID (indexed). */
-        @GridCacheQuerySqlField(index = true)
+        @CacheQuerySqlField(index = true)
         private UUID id;
 
         /** Organization ID (indexed). */
-        @GridCacheQuerySqlField(index = true)
+        @CacheQuerySqlField(index = true)
         private UUID orgId;
 
         /** First name (not-indexed). */
-        @GridCacheQuerySqlField
+        @CacheQuerySqlField
         private String firstName;
 
         /** Last name (not indexed). */
-        @GridCacheQuerySqlField
+        @CacheQuerySqlField
         private String lastName;
 
         /** Resume text (create LUCENE-based TEXT index for this field). */
-        @GridCacheQueryTextField
+        @CacheQueryTextField
         private String resume;
 
         /** Salary (indexed). */
-        @GridCacheQuerySqlField
+        @CacheQuerySqlField
         private double salary;
 
         /** Custom cache key to guarantee that person is always collocated with its organization. */
-        private transient GridCacheAffinityKey<UUID> key;
+        private transient CacheAffinityKey<UUID> key;
 
         /**
          * Constructs person record.
@@ -427,9 +427,9 @@ public class CacheQueryExample {
          *
          * @return Custom affinity key to guarantee that person is always collocated with organization.
          */
-        public GridCacheAffinityKey<UUID> key() {
+        public CacheAffinityKey<UUID> key() {
             if (key == null)
-                key = new GridCacheAffinityKey<>(id, orgId);
+                key = new CacheAffinityKey<>(id, orgId);
 
             return key;
         }
@@ -450,11 +450,11 @@ public class CacheQueryExample {
      */
     private static class Organization implements Serializable {
         /** Organization ID (indexed). */
-        @GridCacheQuerySqlField(index = true)
+        @CacheQuerySqlField(index = true)
         private UUID id;
 
         /** Organization name (indexed). */
-        @GridCacheQuerySqlField(index = true)
+        @CacheQuerySqlField(index = true)
         private String name;
 
         /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheTransactionExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheTransactionExample.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheTransactionExample.java
index aba1efc..5384741 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheTransactionExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheTransactionExample.java
@@ -23,7 +23,7 @@ import org.apache.ignite.transactions.*;
 
 import java.io.*;
 
-import static org.apache.ignite.cache.GridCacheFlag.*;
+import static org.apache.ignite.cache.CacheFlag.*;
 import static org.apache.ignite.transactions.IgniteTxConcurrency.*;
 import static org.apache.ignite.transactions.IgniteTxIsolation.*;
 
@@ -54,7 +54,7 @@ public class CacheTransactionExample {
             // Clean up caches on all nodes before run.
             g.cache(CACHE_NAME).globalClearAll(0);
 
-            GridCache<Integer, Account> cache = g.cache(CACHE_NAME);
+            Cache<Integer, Account> cache = g.cache(CACHE_NAME);
 
             // Initialize.
             cache.putx(1, new Account(1, 100));
@@ -87,7 +87,7 @@ public class CacheTransactionExample {
      */
     private static void deposit(int acctId, double amount) throws IgniteCheckedException {
         // Clone every object we get from cache, so we can freely update it.
-        GridCacheProjection<Integer, Account> cache = Ignition.ignite().<Integer, Account>cache(CACHE_NAME).flagsOn(CLONE);
+        CacheProjection<Integer, Account> cache = Ignition.ignite().<Integer, Account>cache(CACHE_NAME).flagsOn(CLONE);
 
         try (IgniteTx tx = cache.txStart(PESSIMISTIC, REPEATABLE_READ)) {
             Account acct = cache.get(acctId);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/examples/src/main/java/org/apache/ignite/examples/datagrid/datastructures/CacheAtomicLongExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/datastructures/CacheAtomicLongExample.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/datastructures/CacheAtomicLongExample.java
index 34438a9..3e7996e 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datagrid/datastructures/CacheAtomicLongExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/datastructures/CacheAtomicLongExample.java
@@ -55,7 +55,7 @@ public final class CacheAtomicLongExample {
             String atomicName = UUID.randomUUID().toString();
 
             // Initialize atomic long in grid.
-            final GridCacheAtomicLong atomicLong = g.cache(CACHE_NAME).dataStructures().atomicLong(atomicName, 0, true);
+            final CacheAtomicLong atomicLong = g.cache(CACHE_NAME).dataStructures().atomicLong(atomicName, 0, true);
 
             System.out.println();
             System.out.println("Atomic long initial value : " + atomicLong.get() + '.');

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/examples/src/main/java/org/apache/ignite/examples/datagrid/datastructures/CacheAtomicReferenceExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/datastructures/CacheAtomicReferenceExample.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/datastructures/CacheAtomicReferenceExample.java
index d668576..eae31f3 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datagrid/datastructures/CacheAtomicReferenceExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/datastructures/CacheAtomicReferenceExample.java
@@ -55,7 +55,7 @@ public final class CacheAtomicReferenceExample {
             String val = UUID.randomUUID().toString();
 
             // Initialize atomic reference in grid.
-            GridCacheAtomicReference<String> ref = g.cache(CACHE_NAME).dataStructures().
+            CacheAtomicReference<String> ref = g.cache(CACHE_NAME).dataStructures().
                 atomicReference(refName, val, true);
 
             System.out.println("Atomic reference initial value : " + ref.get() + '.');
@@ -113,7 +113,7 @@ public final class CacheAtomicReferenceExample {
         /** {@inheritDoc} */
         @Override public void run() {
             try {
-                GridCacheAtomicReference<String> ref = Ignition.ignite().cache(cacheName).dataStructures().
+                CacheAtomicReference<String> ref = Ignition.ignite().cache(cacheName).dataStructures().
                     atomicReference(refName, null, true);
 
                 System.out.println("Atomic reference value is " + ref.get() + '.');


Mime
View raw message