ignite-commits mailing list archives

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

Branch: refs/heads/ignite-49
Commit: 168d7d033d31057c88d4cde03ba1806c23d44a49
Parents: cafee25
Author: sboikov <sboikov@gridgain.com>
Authored: Fri Jan 23 15:46:57 2015 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Fri Jan 23 15:47:19 2015 +0300

----------------------------------------------------------------------
 .../examples/datagrid/CacheAffinityExample.java |   6 +-
 .../examples/datagrid/CacheApiExample.java      |   2 +-
 .../datagrid/CacheContinuousQueryExample.java   |   2 +-
 .../examples/datagrid/CacheEventsExample.java   |   2 +-
 .../datagrid/CachePopularNumbersExample.java    |   2 +-
 .../examples/datagrid/CachePutGetExample.java   |   4 +-
 .../examples/datagrid/CacheQueryExample.java    |  14 +-
 .../datagrid/CacheTransactionExample.java       |   2 +-
 .../starschema/CacheStarSchemaExample.java      |  12 +-
 .../datagrid/store/CacheStoreExample.java       |   2 +-
 .../store/CacheStoreLoadDataExample.java        |   4 +-
 .../store/dummy/CacheDummyPersonStore.java      |   4 +-
 .../client/memcache/MemcacheRestExample.java    |   2 +-
 .../ScalarCacheAffinitySimpleExample.scala      |  10 +-
 .../ignite/client/ClientPutPortableTask.java    |   2 +-
 .../ClientAbstractMultiNodeSelfTest.java        |   2 +-
 .../integration/ClientAbstractSelfTest.java     |  10 +-
 .../rest/AbstractRestProcessorSelfTest.java     |   2 +-
 .../processors/rest/RestProcessorTest.java      |   2 +-
 .../ignite/jdbc/JdbcComplexQuerySelfTest.java   |   4 +-
 .../ignite/jdbc/JdbcLocalCachesSelfTest.java    |   4 +-
 .../ignite/jdbc/JdbcMetadataSelfTest.java       |   4 +-
 .../jdbc/JdbcPreparedStatementSelfTest.java     |   2 +-
 .../ignite/jdbc/JdbcResultSetSelfTest.java      |   2 +-
 .../ignite/jdbc/JdbcStatementSelfTest.java      |   2 +-
 .../src/main/java/org/apache/ignite/Ignite.java |   6 +-
 .../apache/ignite/IgniteBasicWarmupClosure.java |  22 +-
 .../java/org/apache/ignite/IgniteCache.java     |   2 +-
 .../org/apache/ignite/IgniteDataLoader.java     |   2 +-
 .../java/org/apache/ignite/cache/Cache.java     | 278 -------------------
 .../apache/ignite/cache/CacheConfiguration.java |   2 +-
 .../org/apache/ignite/cache/CacheEntry.java     |   2 +-
 .../org/apache/ignite/cache/CacheMBean.java     |   2 +-
 .../org/apache/ignite/cache/CacheMetrics.java   |   2 +-
 .../apache/ignite/cache/CacheProjection.java    |   8 +-
 .../java/org/apache/ignite/cache/GridCache.java | 278 +++++++++++++++++++
 .../datastructures/CacheDataStructures.java     |   2 +-
 .../random/CacheRandomEvictionPolicy.java       |   2 +-
 .../cache/store/CacheLoadOnlyStoreAdapter.java  |   6 +-
 .../apache/ignite/cache/store/CacheStore.java   |   4 +-
 .../ignite/cache/store/CacheStoreAdapter.java   |   2 +-
 .../java/org/apache/ignite/internal/GridEx.java |   8 +-
 .../org/apache/ignite/internal/GridKernal.java  |  10 +-
 .../internal/managers/GridManagerAdapter.java   |   2 +-
 .../processors/cache/GridCacheAdapter.java      |   8 +-
 .../processors/cache/GridCacheEntryImpl.java    |   2 +-
 .../processors/cache/GridCacheMBeanAdapter.java |   2 +-
 .../processors/cache/GridCacheProcessor.java    |  22 +-
 .../cache/GridCacheProjectionImpl.java          |   4 +-
 .../processors/cache/GridCacheProxy.java        |   2 +-
 .../processors/cache/GridCacheProxyImpl.java    |   2 +-
 .../cache/GridCacheWriteBehindStore.java        |   2 +-
 .../GridCacheDataStructuresManager.java         |  10 +-
 .../cache/datastructures/GridCacheSetImpl.java  |   2 +-
 .../cache/query/GridCacheQueryManager.java      |   8 +-
 .../jdbc/GridCacheQueryJdbcMetadataTask.java    |   2 +-
 .../query/jdbc/GridCacheQueryJdbcTask.java      |   2 +-
 .../dataload/GridDataLoadCacheUpdaters.java     |  16 +-
 .../processors/fs/GridGgfsDataManager.java      |   2 +-
 .../processors/fs/GridGgfsMetaManager.java      |   2 +-
 .../processors/fs/IgniteFsProcessor.java        |   2 +-
 .../handlers/cache/GridCacheCommandHandler.java |   2 +-
 .../processors/task/GridTaskProcessor.java      |   2 +-
 .../ignite/internal/visor/cache/VisorCache.java |   4 +-
 .../visor/cache/VisorCacheClearTask.java        |   2 +-
 .../visor/cache/VisorCacheCompactTask.java      |   2 +-
 .../visor/cache/VisorCacheLoadTask.java         |   2 +-
 .../visor/cache/VisorCacheMetadataTask.java     |   2 +-
 .../internal/visor/cache/VisorCacheMetrics.java |   2 +-
 .../cache/VisorCacheMetricsCollectorTask.java   |   4 +-
 .../visor/cache/VisorCachePreloadTask.java      |   2 +-
 .../visor/cache/VisorCacheResetMetricsTask.java |   2 +-
 .../visor/cache/VisorCacheSwapBackupsTask.java  |   2 +-
 .../visor/node/VisorNodeDataCollectorJob.java   |   2 +-
 .../internal/visor/query/VisorQueryTask.java    |   2 +-
 .../org/apache/ignite/lang/IgnitePredicate.java |   2 +-
 .../StreamerCacheAffinityEventRouter.java       |   2 +-
 .../transactions/IgniteTxSynchronization.java   |   2 +-
 .../GridCacheAffinityBackupsSelfTest.java       |   2 +-
 ...CacheJdbcBlobStoreMultithreadedSelfTest.java |   8 +-
 .../ignite/fs/GridGgfsFragmentizerSelfTest.java |   2 +-
 .../GridDeploymentMessageCountSelfTest.java     |   2 +-
 .../GridAffinityProcessorAbstractSelfTest.java  |   2 +-
 .../cache/GridCacheAbstractFlagsTest.java       |   2 +-
 ...cheAbstractFullApiMultithreadedSelfTest.java |  64 ++---
 .../cache/GridCacheAbstractFullApiSelfTest.java |  58 ++--
 .../cache/GridCacheAbstractMetricsSelfTest.java |   8 +-
 .../GridCacheAbstractProjectionSelfTest.java    |   8 +-
 .../GridCacheAbstractRemoveFailureTest.java     |   4 +-
 .../cache/GridCacheAbstractSelfTest.java        |  18 +-
 .../cache/GridCacheAbstractTxReadTest.java      |   2 +-
 .../cache/GridCacheBasicApiAbstractTest.java    |   4 +-
 .../cache/GridCacheBasicStoreAbstractTest.java  |  16 +-
 ...acheBasicStoreMultithreadedAbstractTest.java |   6 +-
 .../cache/GridCacheClearAllSelfTest.java        |  44 +--
 .../cache/GridCacheConcurrentMapSelfTest.java   |  10 +-
 .../cache/GridCacheConcurrentMapTest.java       |   4 +-
 .../GridCacheConcurrentTxMultiNodeTest.java     |   4 +-
 ...idCacheConfigurationConsistencySelfTest.java |   1 +
 .../GridCacheDaemonNodeAbstractSelfTest.java    |   4 +-
 .../cache/GridCacheDeploymentSelfTest.java      |   4 +-
 .../cache/GridCacheEntryMemorySizeSelfTest.java |   4 +-
 .../GridCacheEvictionEventAbstractTest.java     |   2 +-
 .../GridCacheExAbstractFullApiSelfTest.java     |   2 +-
 .../GridCacheFinishPartitionsSelfTest.java      |   6 +-
 ...CacheFullTextQueryMultithreadedSelfTest.java |   2 +-
 .../cache/GridCacheGlobalClearAllSelfTest.java  |   4 +-
 .../GridCacheGroupLockAbstractSelfTest.java     |  52 ++--
 .../GridCacheGroupLockFailoverSelfTest.java     |   2 +-
 .../cache/GridCacheGroupLockPutTask.java        |   4 +-
 .../cache/GridCacheIteratorPerformanceTest.java |   4 +-
 .../cache/GridCacheKeyCheckSelfTest.java        |   6 +-
 .../processors/cache/GridCacheLeakTest.java     |   2 +-
 .../cache/GridCacheLifecycleAwareSelfTest.java  |   1 +
 .../cache/GridCacheLuceneQueryIndexTest.java    |  16 +-
 .../cache/GridCacheMemoryModeSelfTest.java      |  12 +-
 .../GridCacheMissingCommitVersionSelfTest.java  |   2 +-
 ...GridCacheMixedPartitionExchangeSelfTest.java |   2 +-
 .../cache/GridCacheMultiUpdateLockSelfTest.java |   4 +-
 .../cache/GridCacheMvccManagerSelfTest.java     |   2 +-
 .../cache/GridCacheNestedTxAbstractTest.java    |   2 +-
 .../cache/GridCacheObjectToStringSelfTest.java  |   2 +-
 ...HeapMultiThreadedUpdateAbstractSelfTest.java |  10 +-
 ...CacheOffHeapMultiThreadedUpdateSelfTest.java |   6 +-
 .../cache/GridCacheOffHeapSelfTest.java         |  10 +-
 .../processors/cache/GridCacheOffHeapTest.java  |   4 +-
 .../GridCacheOffHeapTieredAbstractSelfTest.java |  30 +-
 ...heOffHeapTieredEvictionAbstractSelfTest.java |   6 +-
 .../cache/GridCacheOffheapUpdateSelfTest.java   |   6 +-
 .../GridCacheOrderedPreloadingSelfTest.java     |   2 +-
 .../cache/GridCacheP2PUndeploySelfTest.java     |   4 +-
 .../cache/GridCachePartitionedGetSelfTest.java  |   6 +-
 .../cache/GridCachePartitionedWritesTest.java   |   4 +-
 .../GridCachePreloadingEvictionsSelfTest.java   |   2 +-
 .../cache/GridCachePutAllFailoverSelfTest.java  |   2 +-
 .../cache/GridCacheQueryIndexSelfTest.java      |   4 +-
 .../GridCacheQueryInternalKeysSelfTest.java     |   2 +-
 .../GridCacheReferenceCleanupSelfTest.java      |  10 +-
 .../cache/GridCacheReloadSelfTest.java          |   4 +-
 ...ridCacheReplicatedSynchronousCommitTest.java |   6 +-
 .../cache/GridCacheSlowTxWarnTest.java          |   2 +-
 .../processors/cache/GridCacheStopSelfTest.java |   2 +-
 .../cache/GridCacheStorePutxSelfTest.java       |   4 +-
 .../cache/GridCacheStoreValueBytesSelfTest.java |   4 +-
 .../cache/GridCacheSwapPreloadSelfTest.java     |   4 +-
 .../cache/GridCacheSwapReloadSelfTest.java      |   1 +
 ...cheTransactionalAbstractMetricsSelfTest.java |   4 +-
 ...idCacheValueConsistencyAbstractSelfTest.java |  16 +-
 .../GridCacheVariableTopologySelfTest.java      |   2 +-
 .../GridCacheWriteBehindStoreAbstractTest.java  |   8 +-
 ...BehindStorePartitionedMultiNodeSelfTest.java |   4 +-
 .../cache/IgniteCacheAbstractTest.java          |   1 +
 .../IgniteCacheEntryListenerAbstractTest.java   |   2 +-
 .../cache/IgniteCacheInvokeAbstractTest.java    |   2 +-
 .../processors/cache/IgniteTxAbstractTest.java  |   8 +-
 .../IgniteTxExceptionAbstractSelfTest.java      |   6 +-
 .../cache/IgniteTxMultiNodeAbstractTest.java    |  14 +-
 .../IgniteTxMultiThreadedAbstractTest.java      |   2 +-
 .../cache/IgniteTxReentryAbstractSelfTest.java  |   2 +-
 .../IgniteTxStoreExceptionAbstractSelfTest.java |   6 +-
 .../GridCacheAtomicLongApiSelfTest.java         |  20 +-
 ...CacheAtomicReferenceApiSelfAbstractTest.java |   4 +-
 .../GridCacheMultiNodeDataStructureTest.java    |   2 +-
 ...GridCacheQueueMultiNodeAbstractSelfTest.java |  12 +-
 .../GridCacheSetAbstractSelfTest.java           |   2 +-
 ...PartitionedQueueCreateMultiNodeSelfTest.java |   4 +-
 ...tractDistributedByteArrayValuesSelfTest.java |  26 +-
 .../GridCacheAbstractJobExecutionTest.java      |   4 +-
 .../GridCacheAbstractNodeRestartSelfTest.java   |  12 +-
 .../GridCacheAbstractPrimarySyncSelfTest.java   |   2 +-
 .../GridCacheAtomicTimeoutSelfTest.java         |   8 +-
 .../GridCacheBasicOpAbstractTest.java           |  18 +-
 .../GridCacheClientModesAbstractSelfTest.java   |  14 +-
 .../GridCacheEntrySetAbstractSelfTest.java      |   4 +-
 ...acheEntrySetIterationPreloadingSelfTest.java |   2 +-
 .../distributed/GridCacheEventAbstractTest.java |  38 +--
 ...heExpiredEntriesPreloadAbstractSelfTest.java |   2 +-
 .../distributed/GridCacheMixedModeSelfTest.java |   2 +-
 .../GridCacheMultiNodeAbstractTest.java         |  10 +-
 ...dCacheMultithreadedFailoverAbstractTest.java |   6 +-
 .../GridCacheNodeFailureAbstractTest.java       |  10 +-
 ...dCachePartitionedAffinityFilterSelfTest.java |   2 +-
 ...chePartitionedReloadAllAbstractSelfTest.java |  12 +-
 .../GridCachePreloadEventsAbstractSelfTest.java |   2 +-
 ...GridCachePreloadRestartAbstractSelfTest.java |  12 +-
 ...iteTxConsistencyRestartAbstractSelfTest.java |   4 +-
 ...xOriginatingNodeFailureAbstractSelfTest.java |   4 +-
 ...cOriginatingNodeFailureAbstractSelfTest.java |   8 +-
 .../IgniteTxTimeoutAbstractTest.java            |   4 +-
 ...tPartitionedOnlyByteArrayValuesSelfTest.java |  18 +-
 .../dht/GridCacheAtomicNearCacheSelfTest.java   |  22 +-
 ...eColocatedOptimisticTransactionSelfTest.java |   8 +-
 .../GridCacheDhtEvictionsDisabledSelfTest.java  |   2 +-
 .../dht/GridCacheDhtMappingSelfTest.java        |   2 +-
 .../dht/GridCacheDhtMultiBackupTest.java        |   4 +-
 .../dht/GridCacheDhtPreloadBigDataSelfTest.java |   8 +-
 .../dht/GridCacheDhtPreloadDelayedSelfTest.java |  20 +-
 .../GridCacheDhtPreloadDisabledSelfTest.java    |   8 +-
 .../GridCacheDhtPreloadMessageCountTest.java    |   8 +-
 .../dht/GridCacheDhtPreloadPutGetSelfTest.java  |   4 +-
 .../dht/GridCacheDhtPreloadSelfTest.java        |  26 +-
 .../GridCacheDhtPreloadStartStopSelfTest.java   |  12 +-
 .../dht/GridCacheDhtPreloadUnloadSelfTest.java  |  10 +-
 .../distributed/dht/GridCacheDhtTestUtils.java  |   2 +-
 .../dht/GridCacheGlobalLoadTest.java            |   1 +
 ...cheGroupLockPartitionedAbstractSelfTest.java |   4 +-
 ...ockPartitionedMultiNodeAbstractSelfTest.java |   4 +-
 ...ePartitionedNearDisabledMetricsSelfTest.java |   2 +-
 ...idCachePartitionedPreloadEventsSelfTest.java |   2 +-
 ...dCachePartitionedTopologyChangeSelfTest.java |   8 +-
 ...ridCachePartitionedUnloadEventsSelfTest.java |   2 +-
 .../dht/IgniteTxReentryColocatedSelfTest.java   |   2 +-
 ...eAtomicInvalidPartitionHandlingSelfTest.java |   2 +-
 .../atomic/GridCacheAtomicPreloadSelfTest.java  |   6 +-
 ...GridCacheValueConsistencyAtomicSelfTest.java |   2 +-
 ...tomicClientOnlyMultiNodeFullApiSelfTest.java |  16 +-
 ...eAtomicNearOnlyMultiNodeFullApiSelfTest.java |   6 +-
 .../near/GridCacheGetStoreErrorSelfTest.java    |   1 +
 .../near/GridCacheNearEvictionSelfTest.java     |   6 +-
 .../near/GridCacheNearMetricsSelfTest.java      |  12 +-
 .../near/GridCacheNearMultiGetSelfTest.java     |   4 +-
 .../near/GridCacheNearMultiNodeSelfTest.java    |  26 +-
 .../near/GridCacheNearOneNodeSelfTest.java      |  14 +-
 ...idCacheNearOnlyMultiNodeFullApiSelfTest.java |  18 +-
 .../near/GridCacheNearOnlySelfTest.java         |   4 +-
 .../near/GridCacheNearOnlyTopologySelfTest.java |   2 +-
 .../GridCacheNearPartitionedClearSelfTest.java  |   8 +-
 .../GridCacheNearReaderPreloadSelfTest.java     |   6 +-
 .../near/GridCacheNearReadersSelfTest.java      |  24 +-
 .../near/GridCacheNearTxMultiNodeSelfTest.java  |   6 +-
 .../GridCachePartitionedAffinitySelfTest.java   |   2 +-
 ...ePartitionedBasicStoreMultiNodeSelfTest.java |  16 +-
 ...titionedExplicitLockNodeFailureSelfTest.java |   6 +-
 ...GridCachePartitionedFilteredPutSelfTest.java |  12 +-
 .../GridCachePartitionedFullApiSelfTest.java    |   8 +-
 .../GridCachePartitionedLoadCacheSelfTest.java  |   4 +-
 ...achePartitionedMultiNodeCounterSelfTest.java |  14 +-
 ...achePartitionedMultiNodeFullApiSelfTest.java |  24 +-
 ...ePartitionedMultiThreadedPutGetSelfTest.java |   2 +-
 ...achePartitionedPreloadLifecycleSelfTest.java |  10 +-
 ...hePartitionedQueryMultiThreadedSelfTest.java |   2 +-
 .../GridCachePartitionedStorePutSelfTest.java   |   8 +-
 .../GridCachePartitionedTxSalvageSelfTest.java  |   2 +-
 .../near/GridCachePutArrayValueSelfTest.java    |   2 +-
 ...idCacheRendezvousAffinityClientSelfTest.java |   2 +-
 .../near/GridPartitionedBackupLoadSelfTest.java |   4 +-
 .../near/IgniteTxReentryNearSelfTest.java       |   2 +-
 .../GridCacheReplicatedInvalidateSelfTest.java  |   2 +-
 ...idCacheReplicatedUnswapAdvancedSelfTest.java |   4 +-
 ...CacheReplicatedPreloadLifecycleSelfTest.java |  10 +-
 .../GridCacheReplicatedPreloadSelfTest.java     |  32 +--
 .../GridCacheBatchEvictUnswapSelfTest.java      |   4 +-
 ...heConcurrentEvictionConsistencySelfTest.java |   2 +-
 .../GridCacheConcurrentEvictionsSelfTest.java   |   2 +-
 .../GridCacheDistributedEvictionsSelfTest.java  |   4 +-
 .../GridCacheEmptyEntriesAbstractSelfTest.java  |  10 +-
 .../eviction/GridCacheEvictionAbstractTest.java |   4 +-
 .../GridCacheEvictionFilterSelfTest.java        |   4 +-
 .../GridCacheEvictionTouchSelfTest.java         |  12 +-
 ...cheSynchronousEvictionsFailoverSelfTest.java |   2 +-
 .../GridCacheFifoEvictionPolicySelfTest.java    |   2 +-
 .../lru/GridCacheLruEvictionPolicySelfTest.java |   2 +-
 .../GridCacheLruNearEvictionPolicySelfTest.java |   2 +-
 ...heNearOnlyLruNearEvictionPolicySelfTest.java |   2 +-
 .../GridCacheRandomEvictionPolicySelfTest.java  |   2 +-
 .../IgniteCacheExpiryPolicyAbstractTest.java    |   4 +-
 ...iteCacheNoLoadPreviousValueAbstractTest.java |   2 +-
 .../IgniteCacheNoReadThroughAbstractTest.java   |   2 +-
 .../IgniteCacheNoWriteThroughAbstractTest.java  |   2 +-
 .../GridCacheLocalByteArrayValuesSelfTest.java  |   8 +-
 .../local/GridCacheLocalFullApiSelfTest.java    |   2 +-
 .../local/GridCacheLocalTxTimeoutSelfTest.java  |   2 +-
 .../GridCacheSwapScanQueryAbstractSelfTest.java |  10 +-
 ...ridCacheContinuousQueryAbstractSelfTest.java |  34 +--
 ...dCacheContinuousQueryReplicatedSelfTest.java |   4 +-
 ...dCacheAbstractReduceFieldsQuerySelfTest.java |   4 +-
 .../dataload/GridDataLoaderImplSelfTest.java    |   2 +-
 .../GridDataLoaderProcessorSelfTest.java        |   8 +-
 .../processors/fs/GridGgfsAbstractSelfTest.java |   2 +-
 .../fs/GridGgfsDataManagerSelfTest.java         |   2 +-
 .../fs/GridGgfsDualAbstractSelfTest.java        |   2 +-
 .../fs/GridGgfsProcessorSelfTest.java           |   6 +-
 .../processors/fs/GridGgfsSizeSelfTest.java     |   2 +-
 .../processors/fs/GridGgfsStreamsSelfTest.java  |   6 +-
 .../GridServiceProcessorAbstractSelfTest.java   |   2 +-
 .../apache/ignite/lang/GridFuncSelfTest.java    |   8 +-
 .../cache/GridCacheAbstractLoadTest.java        |   2 +-
 ...ridCacheAffinityTransactionsOffHeapTest.java |   6 +-
 .../loadtests/cache/GridCacheBenchmark.java     |   2 +-
 .../cache/GridCacheGroupLockComparisonTest.java |   4 +-
 .../loadtests/cache/GridCacheLoadTest.java      |   2 +-
 .../cache/GridCachePutRemoveLoadTest.java       |   2 +-
 .../cache/GridCacheSingleNodeLoadTest.java      |   2 +-
 .../loadtests/cache/GridCacheSwapLoadTest.java  |   6 +-
 .../GridCacheWriteBehindStoreLoadTest.java      |   6 +-
 .../capacity/GridCapacityLoadTest.java          |   2 +-
 .../colocation/GridTestCacheStore.java          |   4 +-
 .../colocation/GridTestLifecycleBean.java       |   2 +-
 .../loadtests/colocation/GridTestMain.java      |   8 +-
 .../GridContinuousOperationsLoadTest.java       |   2 +-
 .../GridCachePartitionedAtomicLongLoadTest.java |   2 +-
 .../ignite/loadtests/dsi/GridDsiPerfJob.java    |   6 +-
 .../cacheget/GridBenchmarkCacheGetLoadTest.java |   2 +-
 .../swap/GridSwapEvictAllBenchmark.java         |   6 +-
 .../marshaller/GridMarshallerAbstractTest.java  |  10 +-
 ...idCacheCheckpointSpiSecondCacheSelfTest.java |   4 +-
 .../GridCacheStoreValueBytesTest.java           |   4 +-
 .../ignite/testframework/GridTestUtils.java     |   2 +-
 .../testframework/junits/GridTestIgnite.java    |   4 +-
 .../junits/common/GridCommonAbstractTest.java   |   8 +-
 .../tests/p2p/GridCacheDeploymentTestTask1.java |   2 +-
 .../fs/GridGgfsHadoopDualAbstractSelfTest.java  |   2 +-
 ...idHadoopDefaultMapReducePlannerSelfTest.java |   6 +-
 .../GridHibernateAccessStrategyAdapter.java     |   6 +-
 .../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 |  14 +-
 .../hibernate/GridHibernateL2CacheSelfTest.java |   4 +-
 .../processors/query/h2/IgniteH2Indexing.java   |   4 +-
 .../GridCacheAbstractFieldsQuerySelfTest.java   |  16 +-
 .../cache/GridCacheAbstractQuerySelfTest.java   |  76 ++---
 .../cache/GridCacheCrossCacheQuerySelfTest.java |   4 +-
 .../cache/GridCacheOffHeapAndSwapSelfTest.java  |  18 +-
 .../cache/GridCacheQueryLoadSelfTest.java       |  22 +-
 .../cache/GridCacheQueryMetricsSelfTest.java    |   4 +-
 .../GridCacheQueryMultiThreadedSelfTest.java    |  20 +-
 ...idCacheReduceQueryMultithreadedSelfTest.java |   2 +-
 .../GridCacheSqlQueryMultiThreadedSelfTest.java |   2 +-
 .../processors/cache/GridCacheSwapSelfTest.java |  10 +-
 .../cache/GridIndexingWithNoopSwapSelfTest.java |   2 +-
 .../near/GridCachePartitionedQuerySelfTest.java |  18 +-
 .../near/GridCacheQueryNodeRestartSelfTest.java |   2 +-
 .../GridCacheReplicatedFieldsQuerySelfTest.java |   4 +-
 .../GridCacheReplicatedQuerySelfTest.java       |  12 +-
 .../local/GridCacheLocalQuerySelfTest.java      |   2 +-
 .../query/h2/GridH2IndexRebuildTest.java        |   8 +-
 .../query/h2/GridH2IndexingGeoSelfTest.java     |  12 +-
 .../processors/cache/GridCacheJtaSelfTest.java  |   4 +-
 .../ignite/scalar/ScalarConversions.scala       |   4 +-
 .../ignite/scalar/pimps/ScalarCachePimp.scala   |   8 +-
 .../scala/org/apache/ignite/scalar/scalar.scala |   8 +-
 .../scalar/tests/ScalarCacheQueriesSpec.scala   |   4 +-
 .../org/apache/ignite/IgniteSpringBean.java     |   4 +-
 .../apache/ignite/cache/spring/SpringCache.java |   3 +-
 .../ignite/cache/spring/SpringCacheManager.java |   6 +-
 .../cache/spring/SpringDynamicCacheManager.java |   4 +-
 .../p2p/GridP2PUserVersionChangeSelfTest.java   |   4 +-
 .../spring/GridSpringCacheManagerSelfTest.java  |  14 +-
 .../GridSpringDynamicCacheManagerSelfTest.java  |  10 +-
 .../internal/websession/WebSessionSelfTest.java |   2 +-
 361 files changed, 1458 insertions(+), 1451 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/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 ff7445b..a0be78e 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.");
 
-            Cache<Integer, String> cache = g.cache(CACHE_NAME);
+            GridCache<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 Cache<Integer, String> cache = g.cache(CACHE_NAME);
+        final GridCache<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() {
-                        Cache<Integer, String> cache = g.cache(CACHE_NAME);
+                        GridCache<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/168d7d03/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 e5b0bd9..218d734 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,7 +127,7 @@ public class CacheApiExample {
         System.out.println();
         System.out.println(">>> Local iterator examples.");
 
-        Cache<Integer, String> cache = Ignition.ignite().cache(CACHE_NAME);
+        GridCache<Integer, String> cache = Ignition.ignite().cache(CACHE_NAME);
 
         // Iterate over whole cache.
         for (CacheEntry<Integer, String> e : cache)

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/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 e28e39e..2084921 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.");
 
-            Cache<Integer, String> cache = g.cache(CACHE_NAME);
+            GridCache<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/168d7d03/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 56f2617..bc2c01e 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 Cache<Integer, String> cache = g.cache(CACHE_NAME);
+            final GridCache<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/168d7d03/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 2197e8c..ac73134 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
@@ -118,7 +118,7 @@ public class CachePopularNumbersExample {
 
             @Override public void run() {
                 // Get reference to cache.
-                Cache<Integer, Long> cache = g.cache(CACHE_NAME);
+                GridCache<Integer, Long> cache = g.cache(CACHE_NAME);
 
                 if (qry == null)
                     qry = cache.queries().

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/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 c568b33..a6b8f6c 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 Cache<Integer, String> cache = g.cache(CACHE_NAME);
+        final GridCache<Integer, String> cache = g.cache(CACHE_NAME);
 
         final int keyCnt = 20;
 
@@ -90,7 +90,7 @@ public class CachePutGetExample {
 
         Ignite g = Ignition.ignite();
 
-        final Cache<Integer, String> cache = g.cache(CACHE_NAME);
+        final GridCache<Integer, String> cache = g.cache(CACHE_NAME);
 
         final int keyCnt = 20;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/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 b187d52..f7ade22 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
@@ -119,7 +119,7 @@ public class CacheQueryExample {
      * @throws IgniteCheckedException In case of error.
      */
     private static void sqlQuery() throws IgniteCheckedException {
-        Cache<CacheAffinityKey<UUID>, Person> cache = Ignition.ignite().cache(CACHE_NAME);
+        GridCache<CacheAffinityKey<UUID>, Person> cache = Ignition.ignite().cache(CACHE_NAME);
 
         // Create query which selects salaries based on range.
         CacheQuery<Map.Entry<CacheAffinityKey<UUID>, Person>> qry =
@@ -139,7 +139,7 @@ public class CacheQueryExample {
      * @throws IgniteCheckedException In case of error.
      */
     private static void sqlQueryWithJoin() throws IgniteCheckedException {
-        Cache<CacheAffinityKey<UUID>, Person> cache = Ignition.ignite().cache(CACHE_NAME);
+        GridCache<CacheAffinityKey<UUID>, Person> cache = Ignition.ignite().cache(CACHE_NAME);
 
         // Create query which joins on 2 types to select people for a specific organization.
         CacheQuery<Map.Entry<CacheAffinityKey<UUID>, Person>> qry =
@@ -158,7 +158,7 @@ public class CacheQueryExample {
      * @throws IgniteCheckedException In case of error.
      */
     private static void textQuery() throws IgniteCheckedException {
-        Cache<CacheAffinityKey<UUID>, Person> cache = Ignition.ignite().cache(CACHE_NAME);
+        GridCache<CacheAffinityKey<UUID>, Person> cache = Ignition.ignite().cache(CACHE_NAME);
 
         //  Query for all people with "Master Degree" in their resumes.
         CacheQuery<Map.Entry<CacheAffinityKey<UUID>, Person>> masters =
@@ -228,7 +228,7 @@ public class CacheQueryExample {
      * @throws IgniteCheckedException In case of error.
      */
     private static void sqlQueryWithTransformer() throws IgniteCheckedException {
-        Cache<CacheAffinityKey<UUID>, Person> cache = Ignition.ignite().cache(CACHE_NAME);
+        GridCache<CacheAffinityKey<UUID>, Person> cache = Ignition.ignite().cache(CACHE_NAME);
 
         // Create query to get names of all employees working for some company.
         CacheQuery<Map.Entry<CacheAffinityKey<UUID>, Person>> qry =
@@ -257,7 +257,7 @@ public class CacheQueryExample {
      * @throws IgniteCheckedException In case of error.
      */
     private static void sqlFieldsQuery() throws IgniteCheckedException {
-        Cache<?, ?> cache = Ignition.ignite().cache(CACHE_NAME);
+        GridCache<?, ?> cache = Ignition.ignite().cache(CACHE_NAME);
 
         // Create query to get names of all employees.
         CacheQuery<List<?>> qry1 = cache.queries().createSqlFieldsQuery(
@@ -278,7 +278,7 @@ public class CacheQueryExample {
      * @throws IgniteCheckedException In case of error.
      */
     private static void sqlFieldsQueryWithJoin() throws IgniteCheckedException {
-        Cache<?, ?> cache = Ignition.ignite().cache(CACHE_NAME);
+        GridCache<?, ?> cache = Ignition.ignite().cache(CACHE_NAME);
 
         // Create query to get names of all employees.
         CacheQuery<List<?>> qry1 = cache.queries().createSqlFieldsQuery(
@@ -300,7 +300,7 @@ public class CacheQueryExample {
      * @throws InterruptedException In case of error.
      */
     private static void initialize() throws IgniteCheckedException, InterruptedException {
-        Cache<?, ?> cache = Ignition.ignite().cache(CACHE_NAME);
+        GridCache<?, ?> cache = Ignition.ignite().cache(CACHE_NAME);
 
         // Organization projection.
         CacheProjection<UUID, Organization> orgCache = cache.projection(UUID.class, Organization.class);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/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 5384741..b5b43e3 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
@@ -54,7 +54,7 @@ public class CacheTransactionExample {
             // Clean up caches on all nodes before run.
             g.cache(CACHE_NAME).globalClearAll(0);
 
-            Cache<Integer, Account> cache = g.cache(CACHE_NAME);
+            GridCache<Integer, Account> cache = g.cache(CACHE_NAME);
 
             // Initialize.
             cache.putx(1, new Account(1, 100));

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/examples/src/main/java/org/apache/ignite/examples/datagrid/starschema/CacheStarSchemaExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/starschema/CacheStarSchemaExample.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/starschema/CacheStarSchemaExample.java
index c9ae8c9..65bd6c3 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datagrid/starschema/CacheStarSchemaExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/starschema/CacheStarSchemaExample.java
@@ -92,7 +92,7 @@ public class CacheStarSchemaExample {
      * @throws IgniteCheckedException If failed.
      */
     private static void populateDimensions() throws IgniteCheckedException {
-        Cache<Integer, Object> cache = Ignition.ignite().cache(REPLICATED_CACHE_NAME);
+        GridCache<Integer, Object> cache = Ignition.ignite().cache(REPLICATED_CACHE_NAME);
 
         DimStore store1 = new DimStore(idGen++, "Store1", "12345", "321 Chilly Dr, NY");
         DimStore store2 = new DimStore(idGen++, "Store2", "54321", "123 Windy Dr, San Francisco");
@@ -115,8 +115,8 @@ public class CacheStarSchemaExample {
      * @throws IgniteCheckedException If failed.
      */
     private static void populateFacts() throws IgniteCheckedException {
-        Cache<Integer, Object> dimCache = Ignition.ignite().cache(REPLICATED_CACHE_NAME);
-        Cache<Integer, Object> factCache = Ignition.ignite().cache(PARTITIONED_CACHE_NAME);
+        GridCache<Integer, Object> dimCache = Ignition.ignite().cache(REPLICATED_CACHE_NAME);
+        GridCache<Integer, Object> factCache = Ignition.ignite().cache(PARTITIONED_CACHE_NAME);
 
         CacheProjection<Integer, DimStore> stores = dimCache.projection(Integer.class, DimStore.class);
         CacheProjection<Integer, DimProduct> prods = dimCache.projection(Integer.class, DimProduct.class);
@@ -139,7 +139,7 @@ public class CacheStarSchemaExample {
      * @throws IgniteCheckedException If failed.
      */
     private static void queryStorePurchases() throws IgniteCheckedException {
-        Cache<Integer, FactPurchase> factCache = Ignition.ignite().cache(PARTITIONED_CACHE_NAME);
+        GridCache<Integer, FactPurchase> factCache = Ignition.ignite().cache(PARTITIONED_CACHE_NAME);
 
         // All purchases for store1.
         // ========================
@@ -163,8 +163,8 @@ public class CacheStarSchemaExample {
      * @throws IgniteCheckedException If failed.
      */
     private static void queryProductPurchases() throws IgniteCheckedException {
-        Cache<Integer, Object> dimCache = Ignition.ignite().cache(REPLICATED_CACHE_NAME);
-        Cache<Integer, FactPurchase> factCache = Ignition.ignite().cache(PARTITIONED_CACHE_NAME);
+        GridCache<Integer, Object> dimCache = Ignition.ignite().cache(REPLICATED_CACHE_NAME);
+        GridCache<Integer, FactPurchase> factCache = Ignition.ignite().cache(PARTITIONED_CACHE_NAME);
 
         CacheProjection<Integer, DimProduct> prods = dimCache.projection(Integer.class, DimProduct.class);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/examples/src/main/java/org/apache/ignite/examples/datagrid/store/CacheStoreExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/CacheStoreExample.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/CacheStoreExample.java
index e97879e..9eb6d43 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/CacheStoreExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/CacheStoreExample.java
@@ -49,7 +49,7 @@ public class CacheStoreExample {
             System.out.println();
             System.out.println(">>> Cache store example started.");
 
-            Cache<Long, Person> cache = g.cache(null);
+            GridCache<Long, Person> cache = g.cache(null);
 
             // Clean up caches on all nodes before run.
             cache.globalClearAll(0);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/examples/src/main/java/org/apache/ignite/examples/datagrid/store/CacheStoreLoadDataExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/CacheStoreLoadDataExample.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/CacheStoreLoadDataExample.java
index 9f65d58..7fded3c 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/CacheStoreLoadDataExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/CacheStoreLoadDataExample.java
@@ -24,7 +24,7 @@ import org.apache.ignite.lang.*;
 
 /**
  * Loads data from persistent store at cache startup by calling
- * {@link org.apache.ignite.cache.Cache#loadCache(org.apache.ignite.lang.IgniteBiPredicate, long, Object...)} method on
+ * {@link org.apache.ignite.cache.GridCache#loadCache(org.apache.ignite.lang.IgniteBiPredicate, long, Object...)} method on
  * all nodes.
  * <p>
  * Remote nodes should always be started using {@link CacheNodeWithStoreStartup}.
@@ -51,7 +51,7 @@ public class CacheStoreLoadDataExample {
             System.out.println();
             System.out.println(">>> Cache store load data example started.");
 
-            final Cache<String, Integer> cache = g.cache(null);
+            final GridCache<String, Integer> cache = g.cache(null);
 
             // Clean up caches on all nodes before run.
             cache.globalClearAll(0);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/examples/src/main/java/org/apache/ignite/examples/datagrid/store/dummy/CacheDummyPersonStore.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/dummy/CacheDummyPersonStore.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/dummy/CacheDummyPersonStore.java
index 3a6949b..ed47df0 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/dummy/CacheDummyPersonStore.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/dummy/CacheDummyPersonStore.java
@@ -18,7 +18,7 @@
 package org.apache.ignite.examples.datagrid.store.dummy;
 
 import org.apache.ignite.*;
-import org.apache.ignite.cache.Cache;
+import org.apache.ignite.cache.GridCache;
 import org.apache.ignite.cache.store.*;
 import org.apache.ignite.examples.datagrid.store.*;
 import org.apache.ignite.lang.*;
@@ -80,7 +80,7 @@ public class CacheDummyPersonStore extends CacheStoreAdapter<Long, Person> {
 
         System.out.println(">>> Store loadCache for entry count: " + cnt);
 
-        Cache<Long, Person> cache = ignite.cache(cacheName);
+        GridCache<Long, Person> cache = ignite.cache(cacheName);
 
         for (int i = 0; i < cnt; i++) {
             // Generate dummy person on the fly.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/examples/src/main/java/org/apache/ignite/examples/misc/client/memcache/MemcacheRestExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/misc/client/memcache/MemcacheRestExample.java b/examples/src/main/java/org/apache/ignite/examples/misc/client/memcache/MemcacheRestExample.java
index c45c390..04597b2 100644
--- a/examples/src/main/java/org/apache/ignite/examples/misc/client/memcache/MemcacheRestExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/misc/client/memcache/MemcacheRestExample.java
@@ -51,7 +51,7 @@ public class MemcacheRestExample {
             System.out.println();
             System.out.println(">>> Memcache REST example started.");
 
-            Cache<String, Object> cache = g.cache(null);
+            GridCache<String, Object> cache = g.cache(null);
 
             client = startMemcachedClient(host, port);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheAffinitySimpleExample.scala
----------------------------------------------------------------------
diff --git a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheAffinitySimpleExample.scala b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheAffinitySimpleExample.scala
index ac56786..dd62b9e 100644
--- a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheAffinitySimpleExample.scala
+++ b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheAffinitySimpleExample.scala
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package org.gridgain.scalar.examples
+package org.apache.ignite.scalar.examples
 
-import org.apache.ignite.cache.Cache
+import org.apache.ignite.cache.GridCache
 import org.gridgain.scalar.scalar
 import scalar._
 
@@ -43,7 +43,7 @@ object ScalarCacheAffinitySimpleExample extends App {
     private val NAME = "partitioned"
 
     /** Type alias. */
-    type Cache = Cache[Int, String]
+    type GridCache = GridCache[Int, String]
 
     /*
      * Note that in case of `LOCAL` configuration,
@@ -65,7 +65,7 @@ object ScalarCacheAffinitySimpleExample extends App {
      *
      * @param c Cache to use.
      */
-    private def visit(c: Cache) {
+    private def visit(c: GridCache) {
         (0 until KEY_CNT).foreach(i =>
             grid$.compute().affinityRun(NAME, i,
                 () => println("Co-located [key= " + i + ", value=" + c.peek(i) + ']'))
@@ -77,7 +77,7 @@ object ScalarCacheAffinitySimpleExample extends App {
      *
      * @param c Cache to populate.
      */
-    private def populate(c: Cache) {
+    private def populate(c: GridCache) {
         (0 until KEY_CNT).foreach(i => c += (i -> i.toString))
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/clients/src/test/java/org/apache/ignite/client/ClientPutPortableTask.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/client/ClientPutPortableTask.java b/modules/clients/src/test/java/org/apache/ignite/client/ClientPutPortableTask.java
index 2a405d8..cd5f85c 100644
--- a/modules/clients/src/test/java/org/apache/ignite/client/ClientPutPortableTask.java
+++ b/modules/clients/src/test/java/org/apache/ignite/client/ClientPutPortableTask.java
@@ -33,7 +33,7 @@ public class ClientPutPortableTask extends TaskSingleJobSplitAdapter {
     @Override protected Object executeJob(int gridSize, Object arg) throws IgniteCheckedException {
         String cacheName = (String)arg;
 
-        Cache<Object, Object> cache = ignite.cache(cacheName);
+        GridCache<Object, Object> cache = ignite.cache(cacheName);
 
         ClientTestPortable p = new ClientTestPortable(100, true);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientAbstractMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientAbstractMultiNodeSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientAbstractMultiNodeSelfTest.java
index 6a58ef1..ca921da 100644
--- a/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientAbstractMultiNodeSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientAbstractMultiNodeSelfTest.java
@@ -400,7 +400,7 @@ public abstract class ClientAbstractMultiNodeSelfTest extends GridCommonAbstract
     public void testInvalidateFlag() throws Exception {
         GridEx g0 = grid(0);
 
-        Cache<String, String> cache = g0.cache(PARTITIONED_CACHE_NAME);
+        GridCache<String, String> cache = g0.cache(PARTITIONED_CACHE_NAME);
 
         String key = null;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientAbstractSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientAbstractSelfTest.java
index a746c4b..1a19139 100644
--- a/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientAbstractSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientAbstractSelfTest.java
@@ -21,7 +21,7 @@ import junit.framework.*;
 import net.sf.json.*;
 import org.apache.ignite.*;
 import org.apache.ignite.cache.*;
-import org.apache.ignite.cache.Cache;
+import org.apache.ignite.cache.GridCache;
 import org.apache.ignite.cache.affinity.consistenthash.*;
 import org.apache.ignite.cache.store.*;
 import org.apache.ignite.compute.*;
@@ -464,8 +464,8 @@ public abstract class ClientAbstractSelfTest extends GridCommonAbstractTest {
      * @throws Exception If failed.
      */
     public void testPut() throws Exception {
-        Cache<String, String> dfltCache = grid().cache(null);
-        Cache<Object, Object> namedCache = grid().cache(CACHE_NAME);
+        GridCache<String, String> dfltCache = grid().cache(null);
+        GridCache<Object, Object> namedCache = grid().cache(CACHE_NAME);
 
         GridClientData dfltData = client.data();
 
@@ -871,14 +871,14 @@ public abstract class ClientAbstractSelfTest extends GridCommonAbstractTest {
         assertNotNull(datas[0]);
         assertNotNull(datas[1]);
 
-        Cache[] caches = new Cache[] {
+        GridCache[] caches = new GridCache[] {
             grid().cache(null),
             grid().cache(CACHE_NAME)
         };
 
         for (int i = 0; i < datas.length; i++) {
             GridClientData data = datas[i];
-            Cache<String, String> cache = (Cache<String, String>)caches[i];
+            GridCache<String, String> cache = (GridCache<String, String>)caches[i];
 
             assertFalse(data.cas("key", null, null));
             assertTrue(cache.putx("key", "val"));

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/AbstractRestProcessorSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/AbstractRestProcessorSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/AbstractRestProcessorSelfTest.java
index fd29292..f7decdf 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/AbstractRestProcessorSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/AbstractRestProcessorSelfTest.java
@@ -89,7 +89,7 @@ abstract class AbstractRestProcessorSelfTest extends GridCommonAbstractTest {
     /**
      * @return Cache.
      */
-    @Override protected <K, V> Cache<K, V> cache() {
+    @Override protected <K, V> GridCache<K, V> cache() {
         return grid(0).cache(null);
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestProcessorTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestProcessorTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestProcessorTest.java
index 0e8f36e..9ccc397 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestProcessorTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestProcessorTest.java
@@ -135,7 +135,7 @@ public class RestProcessorTest extends GridCommonAbstractTest {
      * @throws IgniteCheckedException If failed.
      */
     private void populateCache() throws IgniteCheckedException {
-        Cache<String, Object> cache = G.ignite().cache(null);
+        GridCache<String, Object> cache = G.ignite().cache(null);
 
         cache.put("int", intValue());
         cache.put("string", "cacheString");

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcComplexQuerySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcComplexQuerySelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcComplexQuerySelfTest.java
index aa0d6d3..9f5a676 100644
--- a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcComplexQuerySelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcComplexQuerySelfTest.java
@@ -77,14 +77,14 @@ public class JdbcComplexQuerySelfTest extends GridCommonAbstractTest {
     @Override protected void beforeTestsStarted() throws Exception {
         startGrids(3);
 
-        Cache<String, Organization> orgCache = grid(0).cache(null);
+        GridCache<String, Organization> orgCache = grid(0).cache(null);
 
         assert orgCache != null;
 
         orgCache.put("o1", new Organization(1, "A"));
         orgCache.put("o2", new Organization(2, "B"));
 
-        Cache<CacheAffinityKey<String>, Person> personCache = grid(0).cache(null);
+        GridCache<CacheAffinityKey<String>, Person> personCache = grid(0).cache(null);
 
         assert personCache != null;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcLocalCachesSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcLocalCachesSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcLocalCachesSelfTest.java
index ae6f6fa..244133f 100644
--- a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcLocalCachesSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcLocalCachesSelfTest.java
@@ -78,14 +78,14 @@ public class JdbcLocalCachesSelfTest extends GridCommonAbstractTest {
     @Override protected void beforeTestsStarted() throws Exception {
         startGridsMultiThreaded(2);
 
-        Cache<Object, Object> cache1 = grid(0).cache(CACHE_NAME);
+        GridCache<Object, Object> cache1 = grid(0).cache(CACHE_NAME);
 
         assert cache1 != null;
 
         assert cache1.putx("key1", 1);
         assert cache1.putx("key2", 2);
 
-        Cache<Object, Object> cache2 = grid(1).cache(CACHE_NAME);
+        GridCache<Object, Object> cache2 = grid(1).cache(CACHE_NAME);
 
         assert cache2 != null;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcMetadataSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcMetadataSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcMetadataSelfTest.java
index e764ef6..10f9dbf 100644
--- a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcMetadataSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcMetadataSelfTest.java
@@ -72,14 +72,14 @@ public class JdbcMetadataSelfTest extends GridCommonAbstractTest {
     @Override protected void beforeTestsStarted() throws Exception {
         startGridsMultiThreaded(3);
 
-        Cache<String, Organization> orgCache = grid(0).cache(null);
+        GridCache<String, Organization> orgCache = grid(0).cache(null);
 
         assert orgCache != null;
 
         orgCache.put("o1", new Organization(1, "A"));
         orgCache.put("o2", new Organization(2, "B"));
 
-        Cache<CacheAffinityKey<String>, Person> personCache = grid(0).cache(null);
+        GridCache<CacheAffinityKey<String>, Person> personCache = grid(0).cache(null);
 
         assert personCache != null;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcPreparedStatementSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcPreparedStatementSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcPreparedStatementSelfTest.java
index 5cbb3d8..5850f5a 100644
--- a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcPreparedStatementSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcPreparedStatementSelfTest.java
@@ -78,7 +78,7 @@ public class JdbcPreparedStatementSelfTest extends GridCommonAbstractTest {
     @Override protected void beforeTestsStarted() throws Exception {
         startGridsMultiThreaded(3);
 
-        Cache<Integer, TestObject> cache = grid(0).cache(null);
+        GridCache<Integer, TestObject> cache = grid(0).cache(null);
 
         assert cache != null;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcResultSetSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcResultSetSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcResultSetSelfTest.java
index bdcc180..1a58580 100644
--- a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcResultSetSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcResultSetSelfTest.java
@@ -85,7 +85,7 @@ public class JdbcResultSetSelfTest extends GridCommonAbstractTest {
     @Override protected void beforeTestsStarted() throws Exception {
         startGridsMultiThreaded(3);
 
-        Cache<Integer, TestObject> cache = grid(0).cache(null);
+        GridCache<Integer, TestObject> cache = grid(0).cache(null);
 
         assert cache != null;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcStatementSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcStatementSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcStatementSelfTest.java
index b833bdd..235738f 100644
--- a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcStatementSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcStatementSelfTest.java
@@ -78,7 +78,7 @@ public class JdbcStatementSelfTest extends GridCommonAbstractTest {
     @Override protected void beforeTestsStarted() throws Exception {
         startGridsMultiThreaded(3);
 
-        Cache<String, Person> cache = grid(0).cache(null);
+        GridCache<String, Person> cache = grid(0).cache(null);
 
         assert cache != null;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/main/java/org/apache/ignite/Ignite.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/Ignite.java b/modules/core/src/main/java/org/apache/ignite/Ignite.java
index ef4e66c..1565130 100644
--- a/modules/core/src/main/java/org/apache/ignite/Ignite.java
+++ b/modules/core/src/main/java/org/apache/ignite/Ignite.java
@@ -43,7 +43,7 @@ import java.util.concurrent.*;
  * <p>
  * In addition to {@link ClusterGroup} functionality, from here you can get the following:
  * <ul>
- * <li>{@link org.apache.ignite.cache.Cache} - functionality for in-memory distributed cache.</li>
+ * <li>{@link org.apache.ignite.cache.GridCache} - functionality for in-memory distributed cache.</li>
  * <li>{@link IgniteDataLoader} - functionality for loading data large amounts of data into cache.</li>
  * <li>{@link IgniteFs} - functionality for distributed Hadoop-compliant in-memory file system and map-reduce.</li>
  * <li>{@link IgniteStreamer} - functionality for streaming events workflow with queries and indexes into rolling windows.</li>
@@ -217,7 +217,7 @@ public interface Ignite extends AutoCloseable {
      * @see IgniteFsConfiguration#getDataCacheName()
      * @see IgniteFsConfiguration#getMetaCacheName()
      */
-    public <K, V> Cache<K, V> cache(@Nullable String name);
+    public <K, V> GridCache<K, V> cache(@Nullable String name);
 
     /**
      * Gets all configured caches.
@@ -228,7 +228,7 @@ public interface Ignite extends AutoCloseable {
      * @see IgniteFsConfiguration#getMetaCacheName()
      * @return All configured caches.
      */
-    public Collection<Cache<?, ?>> caches();
+    public Collection<GridCache<?, ?>> caches();
 
     /**
      * Gets an instance of {@link IgniteCache} API. {@code IgniteCache} is a fully-compatible

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/main/java/org/apache/ignite/IgniteBasicWarmupClosure.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteBasicWarmupClosure.java b/modules/core/src/main/java/org/apache/ignite/IgniteBasicWarmupClosure.java
index 462ddf2..679be27 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteBasicWarmupClosure.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteBasicWarmupClosure.java
@@ -242,8 +242,8 @@ public class IgniteBasicWarmupClosure implements IgniteInClosure<IgniteConfigura
         ExecutorService svc = Executors.newFixedThreadPool(threadCnt);
 
         try {
-            for (Cache<?, ?> cache : first.caches()) {
-                Cache<Object, Object> cache0 = first.cache(cache.name());
+            for (GridCache<?, ?> cache : first.caches()) {
+                GridCache<Object, Object> cache0 = first.cache(cache.name());
 
                 for (String warmupMethod : warmupMethods) {
                     Collection<Future> futs = new ArrayList<>(threadCnt);
@@ -411,12 +411,12 @@ public class IgniteBasicWarmupClosure implements IgniteInClosure<IgniteConfigura
      */
     private abstract class BaseWarmupCallable implements Callable<Object> {
         /** Cache. */
-        protected final Cache<Object, Object> cache;
+        protected final GridCache<Object, Object> cache;
 
         /**
          * @param cache Cache.
          */
-        protected BaseWarmupCallable(Cache<Object, Object> cache) {
+        protected BaseWarmupCallable(GridCache<Object, Object> cache) {
             this.cache = cache;
         }
 
@@ -446,7 +446,7 @@ public class IgniteBasicWarmupClosure implements IgniteInClosure<IgniteConfigura
         /**
          * @param cache Cache.
          */
-        private GetCallable(Cache<Object, Object> cache) {
+        private GetCallable(GridCache<Object, Object> cache) {
             super(cache);
         }
 
@@ -463,7 +463,7 @@ public class IgniteBasicWarmupClosure implements IgniteInClosure<IgniteConfigura
         /**
          * @param cache Cache.
          */
-        private PutCallable(Cache<Object, Object> cache) {
+        private PutCallable(GridCache<Object, Object> cache) {
             super(cache);
         }
 
@@ -480,7 +480,7 @@ public class IgniteBasicWarmupClosure implements IgniteInClosure<IgniteConfigura
         /**
          * @param cache Cache.
          */
-        private PutxCallable(Cache<Object, Object> cache) {
+        private PutxCallable(GridCache<Object, Object> cache) {
             super(cache);
         }
 
@@ -497,7 +497,7 @@ public class IgniteBasicWarmupClosure implements IgniteInClosure<IgniteConfigura
         /**
          * @param cache Cache.
          */
-        private RemoveCallable(Cache<Object, Object> cache) {
+        private RemoveCallable(GridCache<Object, Object> cache) {
             super(cache);
         }
 
@@ -514,7 +514,7 @@ public class IgniteBasicWarmupClosure implements IgniteInClosure<IgniteConfigura
         /**
          * @param cache Cache.
          */
-        private RemovexCallable(Cache<Object, Object> cache) {
+        private RemovexCallable(GridCache<Object, Object> cache) {
             super(cache);
         }
 
@@ -531,7 +531,7 @@ public class IgniteBasicWarmupClosure implements IgniteInClosure<IgniteConfigura
         /**
          * @param cache Cache.
          */
-        private PutIfAbsentCallable(Cache<Object, Object> cache) {
+        private PutIfAbsentCallable(GridCache<Object, Object> cache) {
             super(cache);
         }
 
@@ -548,7 +548,7 @@ public class IgniteBasicWarmupClosure implements IgniteInClosure<IgniteConfigura
         /**
          * @param cache Cache.
          */
-        private ReplaceCallable(Cache<Object, Object> cache) {
+        private ReplaceCallable(GridCache<Object, Object> cache) {
             super(cache);
         }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteCache.java b/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
index 893d52a..122fad2 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
@@ -242,7 +242,7 @@ public interface IgniteCache<K, V> extends javax.cache.Cache<K, V>, IgniteAsyncS
      * This method does not participate in any transactions, however, it will
      * peek at transactional value according to the {@link org.apache.ignite.cache.GridCachePeekMode#SMART} mode
      * semantics. If you need to look at global cached value even from within transaction,
-     * you can use {@link org.apache.ignite.cache.Cache#peek(Object, Collection)} method.
+     * you can use {@link org.apache.ignite.cache.GridCache#peek(Object, Collection)} method.
      *
      * @param key Entry key.
      * @return Peeked value.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/main/java/org/apache/ignite/IgniteDataLoader.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteDataLoader.java b/modules/core/src/main/java/org/apache/ignite/IgniteDataLoader.java
index c55310b..a4b41dd 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteDataLoader.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteDataLoader.java
@@ -34,7 +34,7 @@ import java.util.*;
  * the loader.
  * <p>
  * Also note that {@code GridDataLoader} is not the only way to load data into cache.
- * Alternatively you can use {@link org.apache.ignite.cache.Cache#loadCache(org.apache.ignite.lang.IgniteBiPredicate, long, Object...)}
+ * Alternatively you can use {@link org.apache.ignite.cache.GridCache#loadCache(org.apache.ignite.lang.IgniteBiPredicate, long, Object...)}
  * method to load data from underlying data store. You can also use standard
  * cache {@code put(...)} and {@code putAll(...)} operations as well, but they most
  * likely will not perform as well as this class for loading data. And finally,

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/main/java/org/apache/ignite/cache/Cache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/Cache.java b/modules/core/src/main/java/org/apache/ignite/cache/Cache.java
deleted file mode 100644
index 2a8fbcc..0000000
--- a/modules/core/src/main/java/org/apache/ignite/cache/Cache.java
+++ /dev/null
@@ -1,278 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.cache;
-
-import org.apache.ignite.*;
-import org.apache.ignite.cache.affinity.*;
-import org.apache.ignite.cache.datastructures.*;
-import org.apache.ignite.cache.store.CacheStore;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.transactions.*;
-import org.jetbrains.annotations.*;
-
-import java.util.*;
-
-/**
- * Main entry point for all <b>Data Grid APIs.</b> You can get a named cache by calling {@link org.apache.ignite.Ignite#cache(String)}
- * method.
- * <h1 class="header">Functionality</h1>
- * This API extends {@link CacheProjection} API which contains vast majority of cache functionality
- * and documentation. In addition to {@link CacheProjection} functionality this API provides:
- * <ul>
- * <li>
- *  Various {@code 'loadCache(..)'} methods to load cache either synchronously or asynchronously.
- *  These methods don't specify any keys to load, and leave it to the underlying storage to load cache
- *  data based on the optionally passed in arguments.
- * </li>
- * <li>
- *     Method {@link #affinity()} provides {@link org.apache.ignite.cache.affinity.CacheAffinityFunction} service for information on
- *     data partitioning and mapping keys to grid nodes responsible for caching those keys.
- * </li>
- * <li>
- *     Method {@link #dataStructures()} provides {@link org.apache.ignite.cache.datastructures.CacheDataStructures} service for
- *     creating and working with distributed concurrent data structures, such as
- *     {@link org.apache.ignite.cache.datastructures.CacheAtomicLong}, {@link org.apache.ignite.cache.datastructures.CacheAtomicReference}, {@link org.apache.ignite.cache.datastructures.CacheQueue}, etc.
- * </li>
- * <li>
- *  Methods like {@code 'tx{Un}Synchronize(..)'} witch allow to get notifications for transaction state changes.
- *  This feature is very useful when integrating cache transactions with some other in-house transactions.
- * </li>
- * <li>Method {@link #metrics()} to provide metrics for the whole cache.</li>
- * <li>Method {@link #configuration()} to provide cache configuration bean.</li>
- * </ul>
- *
- * @param <K> Cache key type.
- * @param <V> Cache value type.
- */
-public interface Cache<K, V> extends CacheProjection<K, V> {
-    /**
-     * Gets configuration bean for this cache.
-     *
-     * @return Configuration bean for this cache.
-     */
-    public CacheConfiguration configuration();
-
-    /**
-     * Registers transactions synchronizations for all transactions started by this cache.
-     * Use it whenever you need to get notifications on transaction lifecycle and possibly change
-     * its course. It is also particularly useful when integrating cache transactions
-     * with some other in-house transactions.
-     *
-     * @param syncs Transaction synchronizations to register.
-     */
-    public void txSynchronize(@Nullable IgniteTxSynchronization syncs);
-
-    /**
-     * Removes transaction synchronizations.
-     *
-     * @param syncs Transactions synchronizations to remove.
-     * @see #txSynchronize(IgniteTxSynchronization)
-     */
-    public void txUnsynchronize(@Nullable IgniteTxSynchronization syncs);
-
-    /**
-     * Gets registered transaction synchronizations.
-     *
-     * @return Registered transaction synchronizations.
-     * @see #txSynchronize(IgniteTxSynchronization)
-     */
-    public Collection<IgniteTxSynchronization> txSynchronizations();
-
-    /**
-     * Gets affinity service to provide information about data partitioning
-     * and distribution.
-     *
-     * @return Cache data affinity service.
-     */
-    public CacheAffinity<K> affinity();
-
-    /**
-     * Gets data structures service to provide a gateway for creating various
-     * distributed data structures similar in APIs to {@code java.util.concurrent} package.
-     *
-     * @return Cache data structures service.
-     */
-    public CacheDataStructures dataStructures();
-
-    /**
-     * Gets metrics (statistics) for this cache.
-     *
-     * @return Cache metrics.
-     */
-    public CacheMetrics metrics();
-
-    /**
-     * Gets size (in bytes) of all entries swapped to disk.
-     *
-     * @return Size (in bytes) of all entries swapped to disk.
-     * @throws IgniteCheckedException In case of error.
-     */
-    public long overflowSize() throws IgniteCheckedException;
-
-    /**
-     * Gets number of cache entries stored in off-heap memory.
-     *
-     * @return Number of cache entries stored in off-heap memory.
-     */
-    public long offHeapEntriesCount();
-
-    /**
-     * Gets memory size allocated in off-heap.
-     *
-     * @return Allocated memory size.
-     */
-    public long offHeapAllocatedSize();
-
-    /**
-     * Gets size in bytes for swap space.
-     *
-     * @return Size in bytes.
-     * @throws IgniteCheckedException If failed.
-     */
-    public long swapSize() throws IgniteCheckedException;
-
-    /**
-     * Gets number of swap entries (keys).
-     *
-     * @return Number of entries stored in swap.
-     * @throws IgniteCheckedException If failed.
-     */
-    public long swapKeys() throws IgniteCheckedException;
-
-    /**
-     * Gets iterator over keys and values belonging to this cache swap space on local node. This
-     * iterator is thread-safe, which means that cache (and therefore its swap space)
-     * may be modified concurrently with iteration over swap.
-     * <p>
-     * Returned iterator supports {@code remove} operation which delegates to
-     * {@link #removex(Object, org.apache.ignite.lang.IgnitePredicate[])} method.
-     * <h2 class="header">Cache Flags</h2>
-     * This method is not available if any of the following flags are set on projection:
-     * {@link CacheFlag#SKIP_SWAP}.
-     *
-     * @return Iterator over keys.
-     * @throws IgniteCheckedException If failed.
-     * @see #promote(Object)
-     */
-    public Iterator<Map.Entry<K, V>> swapIterator() throws IgniteCheckedException;
-
-    /**
-     * Gets iterator over keys and values belonging to this cache off-heap memory on local node. This
-     * iterator is thread-safe, which means that cache (and therefore its off-heap memory)
-     * may be modified concurrently with iteration over off-heap. To achieve better performance
-     * the keys and values deserialized on demand, whenever accessed.
-     * <p>
-     * Returned iterator supports {@code remove} operation which delegates to
-     * {@link #removex(Object, org.apache.ignite.lang.IgnitePredicate[])} method.
-     *
-     * @return Iterator over keys.
-     * @throws IgniteCheckedException If failed.
-     */
-    public Iterator<Map.Entry<K, V>> offHeapIterator() throws IgniteCheckedException;
-
-    /**
-     * Delegates to {@link CacheStore#loadCache(org.apache.ignite.lang.IgniteBiInClosure,Object...)} method
-     * to load state from the underlying persistent storage. The loaded values
-     * will then be given to the optionally passed in predicate, and, if the predicate returns
-     * {@code true}, will be stored in cache. If predicate is {@code null}, then
-     * all loaded values will be stored in cache.
-     * <p>
-     * Note that this method does not receive keys as a parameter, so it is up to
-     * {@link CacheStore} implementation to provide all the data to be loaded.
-     * <p>
-     * This method is not transactional and may end up loading a stale value into
-     * cache if another thread has updated the value immediately after it has been
-     * loaded. It is mostly useful when pre-loading the cache from underlying
-     * data store before start, or for read-only caches.
-     *
-     * @param p Optional predicate (may be {@code null}). If provided, will be used to
-     *      filter values to be put into cache.
-     * @param ttl Time to live for loaded entries ({@code 0} for infinity).
-     * @param args Optional user arguments to be passed into
-     *      {@link CacheStore#loadCache(org.apache.ignite.lang.IgniteBiInClosure, Object...)} method.
-     * @throws IgniteCheckedException If loading failed.
-     */
-    public void loadCache(@Nullable IgniteBiPredicate<K, V> p, long ttl, @Nullable Object... args) throws IgniteCheckedException;
-
-    /**
-     * Asynchronously delegates to {@link CacheStore#loadCache(org.apache.ignite.lang.IgniteBiInClosure, Object...)} method
-     * to reload state from the underlying persistent storage. The reloaded values
-     * will then be given to the optionally passed in predicate, and if the predicate returns
-     * {@code true}, will be stored in cache. If predicate is {@code null}, then
-     * all reloaded values will be stored in cache.
-     * <p>
-     * Note that this method does not receive keys as a parameter, so it is up to
-     * {@link CacheStore} implementation to provide all the data to be loaded.
-     * <p>
-     * This method is not transactional and may end up loading a stale value into
-     * cache if another thread has updated the value immediately after it has been
-     * loaded. It is mostly useful when pre-loading the cache from underlying
-     * data store before start, or for read-only caches.
-     *
-     * @param p Optional predicate (may be {@code null}). If provided, will be used to
-     *      filter values to be put into cache.
-     * @param ttl Time to live for loaded entries ({@code 0} for infinity).
-     * @param args Optional user arguments to be passed into
-     *      {@link CacheStore#loadCache(org.apache.ignite.lang.IgniteBiInClosure,Object...)} method.
-     * @return Future to be completed whenever loading completes.
-     */
-    public IgniteFuture<?> loadCacheAsync(@Nullable IgniteBiPredicate<K, V> p, long ttl, @Nullable Object... args);
-
-    /**
-     * Gets a random entry out of cache. In the worst cache scenario this method
-     * has complexity of <pre>O(S * N/64)</pre> where {@code N} is the size of internal hash
-     * table and {@code S} is the number of hash table buckets to sample, which is {@code 5}
-     * by default. However, if the table is pretty dense, with density factor of {@code N/64},
-     * which is true for near fully populated caches, this method will generally perform significantly
-     * faster with complexity of O(S) where {@code S = 5}.
-     * <p>
-     * Note that this method is not available on {@link CacheProjection} API since it is
-     * impossible (or very hard) to deterministically return a number value when pre-filtering
-     * and post-filtering is involved (e.g. projection level predicate filters).
-     *
-     * @return Random entry, or {@code null} if cache is empty.
-     */
-    @Nullable public CacheEntry<K, V> randomEntry();
-
-    /**
-     * Forces this cache node to re-balance its partitions. This method is usually used when
-     * {@link CacheConfiguration#getPreloadPartitionedDelay()} configuration parameter has non-zero value.
-     * When many nodes are started or stopped almost concurrently, it is more efficient to delay
-     * preloading until the node topology is stable to make sure that no redundant re-partitioning
-     * happens.
-     * <p>
-     * In case of{@link CacheMode#PARTITIONED} caches, for better efficiency user should
-     * usually make sure that new nodes get placed on the same place of consistent hash ring as
-     * the left nodes, and that nodes are restarted before
-     * {@link CacheConfiguration#getPreloadPartitionedDelay() preloadDelay} expires. To place nodes
-     * on the same place in consistent hash ring, use
-     * {@link org.apache.ignite.cache.affinity.consistenthash.CacheConsistentHashAffinityFunction#setHashIdResolver(org.apache.ignite.cache.affinity.CacheAffinityNodeHashResolver)} to make sure that
-     * a node maps to the same hash ID if re-started.
-     * <p>
-     * See {@link CacheConfiguration#getPreloadPartitionedDelay()} for more information on how to configure
-     * preload re-partition delay.
-     * <p>
-     * @return Future that will be completed when preloading is finished.
-     */
-    public IgniteFuture<?> forceRepartition();
-
-    /**
-     * Resets metrics for current cache.
-     */
-    public void resetMetrics();
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/main/java/org/apache/ignite/cache/CacheConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/CacheConfiguration.java b/modules/core/src/main/java/org/apache/ignite/cache/CacheConfiguration.java
index d550531..00be379 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/CacheConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/CacheConfiguration.java
@@ -1431,7 +1431,7 @@ public class CacheConfiguration extends MutableConfiguration {
      * <p>
      * Default value is {@code 0} which means that repartitioning and preloading will start
      * immediately upon node leaving topology. If {@code -1} is returned, then preloading
-     * will only be started manually by calling {@link Cache#forceRepartition()} method or
+     * will only be started manually by calling {@link GridCache#forceRepartition()} method or
      * from management console.
      *
      * @return Preloading delay, {@code 0} to start preloading immediately, {@code -1} to

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/main/java/org/apache/ignite/cache/CacheEntry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/CacheEntry.java b/modules/core/src/main/java/org/apache/ignite/cache/CacheEntry.java
index 08789f6..575c2ee 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/CacheEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/CacheEntry.java
@@ -87,7 +87,7 @@ import java.util.concurrent.*;
  * @param <K> Key type.
  * @param <V> Value type.
  */
-public interface CacheEntry<K, V> extends Map.Entry<K, V>, Cache.Entry<K, V> {
+public interface CacheEntry<K, V> extends Map.Entry<K, V>, javax.cache.Cache.Entry<K, V> {
     /**
      * Cache projection to which this entry belongs. Note that entry and its
      * parent projections have same flags and filters.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/main/java/org/apache/ignite/cache/CacheMBean.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/CacheMBean.java b/modules/core/src/main/java/org/apache/ignite/cache/CacheMBean.java
index 643f9b5..36a010f 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/CacheMBean.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/CacheMBean.java
@@ -20,7 +20,7 @@ package org.apache.ignite.cache;
 import org.apache.ignite.mbean.*;
 
 /**
- * This interface defines JMX view on {@link Cache}.
+ * This interface defines JMX view on {@link GridCache}.
  */
 @IgniteMBeanDescription("MBean that provides access to cache descriptor.")
 public interface CacheMBean {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/main/java/org/apache/ignite/cache/CacheMetrics.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/CacheMetrics.java b/modules/core/src/main/java/org/apache/ignite/cache/CacheMetrics.java
index 1410e5b..c0dafdc 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/CacheMetrics.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/CacheMetrics.java
@@ -21,7 +21,7 @@ import java.io.*;
 
 /**
  * Cache metrics used to obtain statistics on cache itself.
- * Use {@link Cache#metrics()} to obtain metrics for a cache.
+ * Use {@link GridCache#metrics()} to obtain metrics for a cache.
  */
 public interface CacheMetrics extends Serializable {
     /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/168d7d03/modules/core/src/main/java/org/apache/ignite/cache/CacheProjection.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/CacheProjection.java b/modules/core/src/main/java/org/apache/ignite/cache/CacheProjection.java
index cfbfb85..ba3c43e 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/CacheProjection.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/CacheProjection.java
@@ -104,7 +104,7 @@ import java.util.concurrent.*;
  *  for nodes on which given keys reside. All {@code 'gridProjection(..)'} methods are not
  *  transactional and will not enlist keys into ongoing transaction.
  * </li>
- * <li>Method {@link Cache#toMap()} to convert this interface into standard Java {@link ConcurrentMap} interface.
+ * <li>Method {@link GridCache#toMap()} to convert this interface into standard Java {@link ConcurrentMap} interface.
  * </ul>
  * <h1 class="header">Extended Put And Remove Methods</h1>
  * All methods that end with {@code 'x'} provide the same functionality as their sibling
@@ -202,7 +202,7 @@ public interface CacheProjection<K, V> extends Iterable<CacheEntry<K, V>> {
      * @return Base cache for this projection.
      */
     @SuppressWarnings({"ClassReferencesSubclass"})
-    public <K1, V1> Cache<K1, V1> cache();
+    public <K1, V1> GridCache<K1, V1> cache();
 
     /**
      * Gets cache flags enabled on this projection.
@@ -455,7 +455,7 @@ public interface CacheProjection<K, V> extends Iterable<CacheEntry<K, V>> {
      * This method does not participate in any transactions, however, it will
      * peek at transactional value according to the {@link GridCachePeekMode#SMART} mode
      * semantics. If you need to look at global cached value even from within transaction,
-     * you can use {@link Cache#peek(Object, Collection)} method.
+     * you can use {@link GridCache#peek(Object, Collection)} method.
      *
      * @param key Entry key.
      * @return Peeked value.
@@ -1828,7 +1828,7 @@ public interface CacheProjection<K, V> extends Iterable<CacheEntry<K, V>> {
 
     /**
      * Gets the number of all entries cached on this node. This method will return the count of
-     * all cache entries and has O(1) complexity on base {@link Cache} projection. It is essentially the
+     * all cache entries and has O(1) complexity on base {@link GridCache} projection. It is essentially the
      * size of cache key set and is semantically identical to {{@code Cache.keySet().size()}.
      * <p>
      * NOTE: this operation is not distributed and returns only the number of entries cached on this node.


Mime
View raw message