ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yzhda...@apache.org
Subject [02/61] [abbrv] incubator-ignite git commit: ignite-42
Date Thu, 22 Jan 2015 15:41:00 GMT
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsMetaManagerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsMetaManagerSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsMetaManagerSelfTest.java
index 7e932ed..a93ca90 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsMetaManagerSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsMetaManagerSelfTest.java
@@ -17,10 +17,10 @@
 
 package org.gridgain.grid.kernal.processors.ggfs;
 
+import org.apache.ignite.cache.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.fs.*;
 import org.apache.ignite.lang.*;
-import org.gridgain.grid.cache.*;
 import org.apache.ignite.spi.discovery.tcp.*;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
@@ -88,8 +88,8 @@ public class GridGgfsMetaManagerSelfTest extends GridGgfsCommonAbstractTest {
     }
 
     /** {@inheritDoc} */
-    protected GridCacheConfiguration cacheConfiguration(String cacheName) {
-        GridCacheConfiguration cacheCfg = defaultCacheConfiguration();
+    protected CacheConfiguration cacheConfiguration(String cacheName) {
+        CacheConfiguration cacheCfg = defaultCacheConfiguration();
 
         cacheCfg.setName(cacheName);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsMetricsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsMetricsSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsMetricsSelfTest.java
index 3cebd3c..6decd26 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsMetricsSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsMetricsSelfTest.java
@@ -18,6 +18,7 @@
 package org.gridgain.grid.kernal.processors.ggfs;
 
 import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.fs.*;
 import org.gridgain.grid.cache.*;
@@ -114,7 +115,7 @@ public class GridGgfsMetricsSelfTest extends GridGgfsCommonAbstractTest {
 
         ggfsCfg.setPathModes(pathModes);
 
-        GridCacheConfiguration dataCacheCfg = defaultCacheConfiguration();
+        CacheConfiguration dataCacheCfg = defaultCacheConfiguration();
 
         dataCacheCfg.setName("dataCache");
         dataCacheCfg.setCacheMode(PARTITIONED);
@@ -125,7 +126,7 @@ public class GridGgfsMetricsSelfTest extends GridGgfsCommonAbstractTest {
         dataCacheCfg.setQueryIndexEnabled(false);
         dataCacheCfg.setAtomicityMode(TRANSACTIONAL);
 
-        GridCacheConfiguration metaCacheCfg = defaultCacheConfiguration();
+        CacheConfiguration metaCacheCfg = defaultCacheConfiguration();
 
         metaCacheCfg.setName("metaCache");
         metaCacheCfg.setCacheMode(REPLICATED);
@@ -166,7 +167,7 @@ public class GridGgfsMetricsSelfTest extends GridGgfsCommonAbstractTest {
         ggfsCfg.setDefaultMode(PRIMARY);
         ggfsCfg.setIpcEndpointConfiguration(GridGgfsTestUtils.jsonToMap(SECONDARY_REST_CFG));
 
-        GridCacheConfiguration dataCacheCfg = defaultCacheConfiguration();
+        CacheConfiguration dataCacheCfg = defaultCacheConfiguration();
 
         dataCacheCfg.setName("dataCache");
         dataCacheCfg.setCacheMode(PARTITIONED);
@@ -177,7 +178,7 @@ public class GridGgfsMetricsSelfTest extends GridGgfsCommonAbstractTest {
         dataCacheCfg.setQueryIndexEnabled(false);
         dataCacheCfg.setAtomicityMode(TRANSACTIONAL);
 
-        GridCacheConfiguration metaCacheCfg = defaultCacheConfiguration();
+        CacheConfiguration metaCacheCfg = defaultCacheConfiguration();
 
         metaCacheCfg.setName("metaCache");
         metaCacheCfg.setCacheMode(REPLICATED);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsModesSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsModesSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsModesSelfTest.java
index 013771a..4880e78 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsModesSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsModesSelfTest.java
@@ -18,6 +18,7 @@
 package org.gridgain.grid.kernal.processors.ggfs;
 
 import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.fs.*;
 import org.apache.ignite.lang.*;
@@ -100,7 +101,7 @@ public class GridGgfsModesSelfTest extends GridGgfsCommonAbstractTest {
         if (setSecondaryFs)
             ggfsCfg.setSecondaryFileSystem(ggfsSecondary);
 
-        GridCacheConfiguration cacheCfg = defaultCacheConfiguration();
+        CacheConfiguration cacheCfg = defaultCacheConfiguration();
 
         cacheCfg.setName("partitioned");
         cacheCfg.setCacheMode(PARTITIONED);
@@ -111,7 +112,7 @@ public class GridGgfsModesSelfTest extends GridGgfsCommonAbstractTest {
         cacheCfg.setQueryIndexEnabled(false);
         cacheCfg.setAtomicityMode(TRANSACTIONAL);
 
-        GridCacheConfiguration metaCacheCfg = defaultCacheConfiguration();
+        CacheConfiguration metaCacheCfg = defaultCacheConfiguration();
 
         metaCacheCfg.setName("replicated");
         metaCacheCfg.setCacheMode(REPLICATED);
@@ -154,7 +155,7 @@ public class GridGgfsModesSelfTest extends GridGgfsCommonAbstractTest {
         ggfsCfg.setDefaultMode(PRIMARY);
         ggfsCfg.setIpcEndpointConfiguration(GridGgfsTestUtils.jsonToMap("{type:'tcp', port:11500}"));
 
-        GridCacheConfiguration cacheCfg = defaultCacheConfiguration();
+        CacheConfiguration cacheCfg = defaultCacheConfiguration();
 
         cacheCfg.setName("partitioned");
         cacheCfg.setCacheMode(PARTITIONED);
@@ -165,7 +166,7 @@ public class GridGgfsModesSelfTest extends GridGgfsCommonAbstractTest {
         cacheCfg.setQueryIndexEnabled(false);
         cacheCfg.setAtomicityMode(TRANSACTIONAL);
 
-        GridCacheConfiguration metaCacheCfg = defaultCacheConfiguration();
+        CacheConfiguration metaCacheCfg = defaultCacheConfiguration();
 
         metaCacheCfg.setName("replicated");
         metaCacheCfg.setCacheMode(REPLICATED);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsProcessorSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsProcessorSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsProcessorSelfTest.java
index 0cae2a0..211d7b4 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsProcessorSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsProcessorSelfTest.java
@@ -19,10 +19,10 @@ package org.gridgain.grid.kernal.processors.ggfs;
 
 import org.apache.commons.io.*;
 import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.fs.*;
 import org.apache.ignite.lang.*;
-import org.gridgain.grid.*;
 import org.gridgain.grid.cache.*;
 import org.gridgain.grid.kernal.*;
 import org.apache.ignite.spi.discovery.tcp.*;
@@ -123,8 +123,8 @@ public class GridGgfsProcessorSelfTest extends GridGgfsCommonAbstractTest {
     }
 
     /** {@inheritDoc} */
-    protected GridCacheConfiguration cacheConfiguration(String cacheName) {
-        GridCacheConfiguration cacheCfg = defaultCacheConfiguration();
+    protected CacheConfiguration cacheConfiguration(String cacheName) {
+        CacheConfiguration cacheCfg = defaultCacheConfiguration();
 
         cacheCfg.setName(cacheName);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsProcessorValidationSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsProcessorValidationSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsProcessorValidationSelfTest.java
index 394d00b..ae4bfc8 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsProcessorValidationSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsProcessorValidationSelfTest.java
@@ -18,12 +18,12 @@
 package org.gridgain.grid.kernal.processors.ggfs;
 
 import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.fs.*;
 import org.apache.ignite.spi.discovery.tcp.*;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-import org.gridgain.grid.cache.*;
 import org.gridgain.grid.kernal.processors.cache.*;
 import org.gridgain.grid.util.typedef.*;
 
@@ -131,7 +131,7 @@ public class GridGgfsProcessorValidationSelfTest extends GridGgfsCommonAbstractT
      * @throws Exception If failed.
      */
     public void testLocalIfNoDataCacheIsConfigured() throws Exception {
-        GridCacheConfiguration cc = defaultCacheConfiguration();
+        CacheConfiguration cc = defaultCacheConfiguration();
 
         cc.setQueryIndexEnabled(false);
         cc.setName("someName");
@@ -145,7 +145,7 @@ public class GridGgfsProcessorValidationSelfTest extends GridGgfsCommonAbstractT
      * @throws Exception If failed.
      */
     public void testLocalIfNoMetadataCacheIsConfigured() throws Exception {
-        GridCacheConfiguration cc = defaultCacheConfiguration();
+        CacheConfiguration cc = defaultCacheConfiguration();
 
         cc.setQueryIndexEnabled(false);
         cc.setName(dataCache1Name);
@@ -159,9 +159,9 @@ public class GridGgfsProcessorValidationSelfTest extends GridGgfsCommonAbstractT
      * @throws Exception If failed.
      */
     public void testLocalIfAffinityMapperIsWrongClass() throws Exception {
-        g1Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), GridCacheConfiguration.class));
+        g1Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), CacheConfiguration.class));
 
-        for (GridCacheConfiguration cc : g1Cfg.getCacheConfiguration())
+        for (CacheConfiguration cc : g1Cfg.getCacheConfiguration())
             cc.setAffinityMapper(new GridCacheDefaultAffinityKeyMapper());
 
         checkGridStartFails(g1Cfg, "Invalid GGFS data cache configuration (key affinity mapper class should be", true);
@@ -171,7 +171,7 @@ public class GridGgfsProcessorValidationSelfTest extends GridGgfsCommonAbstractT
      * @throws Exception If failed.
      */
     public void testLocalIfGgfsConfigsHaveDifferentNames() throws Exception {
-        g1Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), GridCacheConfiguration.class));
+        g1Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), CacheConfiguration.class));
 
         String ggfsCfgName = "ggfs-cfg";
 
@@ -185,11 +185,11 @@ public class GridGgfsProcessorValidationSelfTest extends GridGgfsCommonAbstractT
      * @throws Exception If failed.
      */
     public void testLocalIfQueryIndexingEnabledForDataCache() throws Exception {
-        GridCacheConfiguration[] dataCaches = dataCaches(1024);
+        CacheConfiguration[] dataCaches = dataCaches(1024);
 
         dataCaches[0].setQueryIndexEnabled(true);
 
-        g1Cfg.setCacheConfiguration(concat(dataCaches, metaCaches(), GridCacheConfiguration.class));
+        g1Cfg.setCacheConfiguration(concat(dataCaches, metaCaches(), CacheConfiguration.class));
 
         checkGridStartFails(g1Cfg, "GGFS data cache cannot start with enabled query indexing", true);
     }
@@ -198,11 +198,11 @@ public class GridGgfsProcessorValidationSelfTest extends GridGgfsCommonAbstractT
      * @throws Exception If failed.
      */
     public void testLocalIfQueryIndexingEnabledForMetaCache() throws Exception {
-        GridCacheConfiguration[] metaCaches = metaCaches();
+        CacheConfiguration[] metaCaches = metaCaches();
 
         metaCaches[0].setQueryIndexEnabled(true);
 
-        g1Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches, GridCacheConfiguration.class));
+        g1Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches, CacheConfiguration.class));
 
         checkGridStartFails(g1Cfg, "GGFS metadata cache cannot start with enabled query indexing", true);
     }
@@ -212,7 +212,7 @@ public class GridGgfsProcessorValidationSelfTest extends GridGgfsCommonAbstractT
      */
     @SuppressWarnings("NullableProblems")
     public void testLocalNullGgfsNameIsSupported() throws Exception {
-        g1Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), GridCacheConfiguration.class));
+        g1Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), CacheConfiguration.class));
 
         g1GgfsCfg1.setName(null);
 
@@ -223,7 +223,7 @@ public class GridGgfsProcessorValidationSelfTest extends GridGgfsCommonAbstractT
      * @throws Exception If failed.
      */
     public void testLocalIfOffheapIsDisabledAndMaxSpaceSizeIsGreater() throws Exception {
-        g1Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), GridCacheConfiguration.class));
+        g1Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), CacheConfiguration.class));
 
         g1GgfsCfg2.setMaxSpaceSize(999999999999999999L);
 
@@ -234,9 +234,9 @@ public class GridGgfsProcessorValidationSelfTest extends GridGgfsCommonAbstractT
      * @throws Exception If failed.
      */
     public void testLocalIfOffheapIsEnabledAndMaxSpaceSizeIsGreater() throws Exception {
-        g1Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), GridCacheConfiguration.class));
+        g1Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), CacheConfiguration.class));
 
-        for (GridCacheConfiguration cc : g1Cfg.getCacheConfiguration())
+        for (CacheConfiguration cc : g1Cfg.getCacheConfiguration())
             cc.setOffHeapMaxMemory(1000000);
 
         g1GgfsCfg2.setMaxSpaceSize(999999999999999999L);
@@ -249,9 +249,9 @@ public class GridGgfsProcessorValidationSelfTest extends GridGgfsCommonAbstractT
      * @throws Exception If failed.
      */
     public void testLocalIfBackupsEnabled() throws Exception {
-        g1Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), GridCacheConfiguration.class));
+        g1Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), CacheConfiguration.class));
 
-        for (GridCacheConfiguration cc : g1Cfg.getCacheConfiguration()) {
+        for (CacheConfiguration cc : g1Cfg.getCacheConfiguration()) {
             cc.setCacheMode(PARTITIONED);
             cc.setBackups(1);
         }
@@ -263,7 +263,7 @@ public class GridGgfsProcessorValidationSelfTest extends GridGgfsCommonAbstractT
      * @throws Exception If failed.
      */
     public void testLocalIfNonPrimaryModeAndHadoopFileSystemUriIsNull() throws Exception {
-        g1Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), GridCacheConfiguration.class));
+        g1Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), CacheConfiguration.class));
 
         g1GgfsCfg2.setDefaultMode(PROXY);
 
@@ -276,8 +276,8 @@ public class GridGgfsProcessorValidationSelfTest extends GridGgfsCommonAbstractT
     public void testRemoteIfDataBlockSizeDiffers() throws Exception {
         IgniteConfiguration g2Cfg = getConfiguration("g2");
 
-        g1Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), GridCacheConfiguration.class));
-        g2Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), GridCacheConfiguration.class));
+        g1Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), CacheConfiguration.class));
+        g2Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), CacheConfiguration.class));
 
         IgniteFsConfiguration g2GgfsCfg1 = new IgniteFsConfiguration(g1GgfsCfg1);
 
@@ -296,8 +296,8 @@ public class GridGgfsProcessorValidationSelfTest extends GridGgfsCommonAbstractT
     public void testRemoteIfAffinityMapperGroupSizeDiffers() throws Exception {
         IgniteConfiguration g2Cfg = getConfiguration("g2");
 
-        g1Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), GridCacheConfiguration.class));
-        g2Cfg.setCacheConfiguration(concat(dataCaches(4021), metaCaches(), GridCacheConfiguration.class));
+        g1Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), CacheConfiguration.class));
+        g2Cfg.setCacheConfiguration(concat(dataCaches(4021), metaCaches(), CacheConfiguration.class));
 
         G.start(g1Cfg);
 
@@ -317,9 +317,9 @@ public class GridGgfsProcessorValidationSelfTest extends GridGgfsCommonAbstractT
         g2GgfsCfg1.setMetaCacheName("g2MetaCache1");
         g2GgfsCfg2.setMetaCacheName("g2MetaCache2");
 
-        g1Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), GridCacheConfiguration.class));
+        g1Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), CacheConfiguration.class));
         g2Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches("g2MetaCache1", "g2MetaCache2"),
-             GridCacheConfiguration.class));
+             CacheConfiguration.class));
 
         g2Cfg.setGgfsConfiguration(g2GgfsCfg1, g2GgfsCfg2);
 
@@ -343,9 +343,9 @@ public class GridGgfsProcessorValidationSelfTest extends GridGgfsCommonAbstractT
         g2GgfsCfg1.setDataCacheName("g2DataCache1");
         g2GgfsCfg2.setDataCacheName("g2DataCache2");
 
-        g1Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), GridCacheConfiguration.class));
+        g1Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), CacheConfiguration.class));
         g2Cfg.setCacheConfiguration(concat(dataCaches(1024, "g2DataCache1", "g2DataCache2"), metaCaches(),
-             GridCacheConfiguration.class));
+             CacheConfiguration.class));
 
         g2Cfg.setGgfsConfiguration(g2GgfsCfg1, g2GgfsCfg2);
 
@@ -366,9 +366,9 @@ public class GridGgfsProcessorValidationSelfTest extends GridGgfsCommonAbstractT
         g2GgfsCfg1.setDataCacheName("g2DataCache1");
         g2GgfsCfg2.setDataCacheName("g2DataCache2");
 
-        g1Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), GridCacheConfiguration.class));
+        g1Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), CacheConfiguration.class));
         g2Cfg.setCacheConfiguration(concat(dataCaches(1024, "g2DataCache1", "g2DataCache2"), metaCaches(),
-             GridCacheConfiguration.class));
+             CacheConfiguration.class));
 
         g2Cfg.setGgfsConfiguration(g2GgfsCfg1, g2GgfsCfg2);
 
@@ -392,9 +392,9 @@ public class GridGgfsProcessorValidationSelfTest extends GridGgfsCommonAbstractT
         g2GgfsCfg1.setMetaCacheName("g2MetaCache1");
         g2GgfsCfg2.setMetaCacheName("g2MetaCache2");
 
-        g1Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), GridCacheConfiguration.class));
+        g1Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), CacheConfiguration.class));
         g2Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches("g2MetaCache1", "g2MetaCache2"),
-             GridCacheConfiguration.class));
+             CacheConfiguration.class));
 
         g2Cfg.setGgfsConfiguration(g2GgfsCfg1, g2GgfsCfg2);
 
@@ -418,8 +418,8 @@ public class GridGgfsProcessorValidationSelfTest extends GridGgfsCommonAbstractT
         g2GgfsCfg1.setDefaultMode(DUAL_SYNC);
         g2GgfsCfg2.setDefaultMode(DUAL_SYNC);
 
-        g1Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), GridCacheConfiguration.class));
-        g2Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), GridCacheConfiguration.class));
+        g1Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), CacheConfiguration.class));
+        g2Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), CacheConfiguration.class));
 
         g2Cfg.setGgfsConfiguration(g2GgfsCfg1, g2GgfsCfg2);
 
@@ -440,8 +440,8 @@ public class GridGgfsProcessorValidationSelfTest extends GridGgfsCommonAbstractT
         g2GgfsCfg1.setPathModes(Collections.singletonMap("/somePath", DUAL_SYNC));
         g2GgfsCfg2.setPathModes(Collections.singletonMap("/somePath", DUAL_SYNC));
 
-        g1Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), GridCacheConfiguration.class));
-        g2Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), GridCacheConfiguration.class));
+        g1Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), CacheConfiguration.class));
+        g2Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), CacheConfiguration.class));
 
         g2Cfg.setGgfsConfiguration(g2GgfsCfg1, g2GgfsCfg2);
 
@@ -486,16 +486,16 @@ public class GridGgfsProcessorValidationSelfTest extends GridGgfsCommonAbstractT
      * @param cacheNames 2 Optional caches names.
      * @return 2 preconfigured data caches.
      */
-    private GridCacheConfiguration[] dataCaches(int grpSize, String... cacheNames) {
+    private CacheConfiguration[] dataCaches(int grpSize, String... cacheNames) {
         assertTrue(F.isEmpty(cacheNames) || cacheNames.length == 2);
 
         if (F.isEmpty(cacheNames))
             cacheNames = new String[] {dataCache1Name, dataCache2Name};
 
-        GridCacheConfiguration[] res = new GridCacheConfiguration[cacheNames.length];
+        CacheConfiguration[] res = new CacheConfiguration[cacheNames.length];
 
         for (int i = 0; i < cacheNames.length; i++) {
-            GridCacheConfiguration dataCache = defaultCacheConfiguration();
+            CacheConfiguration dataCache = defaultCacheConfiguration();
 
             dataCache.setName(cacheNames[i]);
             dataCache.setAffinityMapper(new IgniteFsGroupDataBlocksKeyMapper(grpSize));
@@ -512,16 +512,16 @@ public class GridGgfsProcessorValidationSelfTest extends GridGgfsCommonAbstractT
      * @param cacheNames 2 Optional caches names.
      * @return 2 preconfigured meta caches.
      */
-    private GridCacheConfiguration[] metaCaches(String... cacheNames) {
+    private CacheConfiguration[] metaCaches(String... cacheNames) {
         assertTrue(F.isEmpty(cacheNames) || cacheNames.length == 2);
 
         if (F.isEmpty(cacheNames))
             cacheNames = new String[] {metaCache1Name, metaCache2Name};
 
-        GridCacheConfiguration[] res = new GridCacheConfiguration[cacheNames.length];
+        CacheConfiguration[] res = new CacheConfiguration[cacheNames.length];
 
         for (int i = 0; i < cacheNames.length; i++) {
-            GridCacheConfiguration metaCache = defaultCacheConfiguration();
+            CacheConfiguration metaCache = defaultCacheConfiguration();
 
             metaCache.setName(cacheNames[i]);
             metaCache.setAtomicityMode(TRANSACTIONAL);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsServerManagerIpcEndpointRegistrationAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsServerManagerIpcEndpointRegistrationAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsServerManagerIpcEndpointRegistrationAbstractSelfTest.java
index b196f4e..10a716a 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsServerManagerIpcEndpointRegistrationAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsServerManagerIpcEndpointRegistrationAbstractSelfTest.java
@@ -18,6 +18,7 @@
 package org.gridgain.grid.kernal.processors.ggfs;
 
 import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.fs.*;
 import org.apache.ignite.spi.discovery.tcp.*;
@@ -127,7 +128,7 @@ public abstract class GridGgfsServerManagerIpcEndpointRegistrationAbstractSelfTe
 
         cfg.setDiscoverySpi(discoSpi);
 
-        GridCacheConfiguration cc = defaultCacheConfiguration();
+        CacheConfiguration cc = defaultCacheConfiguration();
 
         cc.setName("partitioned");
         cc.setCacheMode(GridCacheMode.PARTITIONED);
@@ -136,7 +137,7 @@ public abstract class GridGgfsServerManagerIpcEndpointRegistrationAbstractSelfTe
         cc.setAtomicityMode(TRANSACTIONAL);
         cc.setQueryIndexEnabled(false);
 
-        GridCacheConfiguration metaCfg = defaultCacheConfiguration();
+        CacheConfiguration metaCfg = defaultCacheConfiguration();
 
         metaCfg.setName("replicated");
         metaCfg.setCacheMode(GridCacheMode.REPLICATED);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsSizeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsSizeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsSizeSelfTest.java
index 31210f6..0853660 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsSizeSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsSizeSelfTest.java
@@ -18,6 +18,7 @@
 package org.gridgain.grid.kernal.processors.ggfs;
 
 import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.events.*;
@@ -122,7 +123,7 @@ public class GridGgfsSizeSelfTest extends GridGgfsCommonAbstractTest {
         ggfsCfg.setTrashPurgeTimeout(trashPurgeTimeout);
         ggfsCfg.setManagementPort(++mgmtPort);
 
-        GridCacheConfiguration dataCfg = defaultCacheConfiguration();
+        CacheConfiguration dataCfg = defaultCacheConfiguration();
 
         dataCfg.setName(DATA_CACHE_NAME);
         dataCfg.setCacheMode(cacheMode);
@@ -138,7 +139,7 @@ public class GridGgfsSizeSelfTest extends GridGgfsCommonAbstractTest {
         dataCfg.setQueryIndexEnabled(false);
         dataCfg.setAtomicityMode(TRANSACTIONAL);
 
-        GridCacheConfiguration metaCfg = defaultCacheConfiguration();
+        CacheConfiguration metaCfg = defaultCacheConfiguration();
 
         metaCfg.setName(META_CACHE_NAME);
         metaCfg.setCacheMode(REPLICATED);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsStreamsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsStreamsSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsStreamsSelfTest.java
index eb27894..3e5edeb 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsStreamsSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsStreamsSelfTest.java
@@ -18,10 +18,10 @@
 package org.gridgain.grid.kernal.processors.ggfs;
 
 import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.fs.*;
 import org.apache.ignite.lang.*;
-import org.gridgain.grid.*;
 import org.gridgain.grid.cache.*;
 import org.apache.ignite.spi.discovery.tcp.*;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
@@ -125,8 +125,8 @@ public class GridGgfsStreamsSelfTest extends GridGgfsCommonAbstractTest {
     }
 
     /** {@inheritDoc} */
-    protected GridCacheConfiguration cacheConfiguration(String cacheName) {
-        GridCacheConfiguration cacheCfg = defaultCacheConfiguration();
+    protected CacheConfiguration cacheConfiguration(String cacheName) {
+        CacheConfiguration cacheCfg = defaultCacheConfiguration();
 
         cacheCfg.setName(cacheName);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsTaskSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsTaskSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsTaskSelfTest.java
index 3f2121e..142baf0 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsTaskSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsTaskSelfTest.java
@@ -18,6 +18,7 @@
 package org.gridgain.grid.kernal.processors.ggfs;
 
 import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
 import org.apache.ignite.compute.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.fs.*;
@@ -25,7 +26,6 @@ import org.apache.ignite.fs.mapreduce.*;
 import org.apache.ignite.fs.mapreduce.records.*;
 import org.apache.ignite.lang.*;
 import org.apache.ignite.resources.*;
-import org.gridgain.grid.*;
 import org.gridgain.grid.cache.*;
 import org.apache.ignite.spi.discovery.tcp.*;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
@@ -107,7 +107,7 @@ public class GridGgfsTaskSelfTest extends GridGgfsCommonAbstractTest {
         ggfsCfg.setDefaultMode(PRIMARY);
         ggfsCfg.setFragmentizerEnabled(false);
 
-        GridCacheConfiguration dataCacheCfg = new GridCacheConfiguration();
+        CacheConfiguration dataCacheCfg = new CacheConfiguration();
 
         dataCacheCfg.setName("dataCache");
         dataCacheCfg.setCacheMode(PARTITIONED);
@@ -118,7 +118,7 @@ public class GridGgfsTaskSelfTest extends GridGgfsCommonAbstractTest {
         dataCacheCfg.setBackups(0);
         dataCacheCfg.setQueryIndexEnabled(false);
 
-        GridCacheConfiguration metaCacheCfg = new GridCacheConfiguration();
+        CacheConfiguration metaCacheCfg = new CacheConfiguration();
 
         metaCacheCfg.setName("metaCache");
         metaCacheCfg.setCacheMode(REPLICATED);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/split/GridGgfsAbstractRecordResolverSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/split/GridGgfsAbstractRecordResolverSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/split/GridGgfsAbstractRecordResolverSelfTest.java
index ef2ffe5..eec1ed6 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/split/GridGgfsAbstractRecordResolverSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/split/GridGgfsAbstractRecordResolverSelfTest.java
@@ -18,10 +18,10 @@
 package org.gridgain.grid.kernal.processors.ggfs.split;
 
 import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.fs.*;
 import org.apache.ignite.fs.mapreduce.*;
-import org.gridgain.grid.cache.*;
 import org.apache.ignite.spi.discovery.tcp.*;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
@@ -59,7 +59,7 @@ public class GridGgfsAbstractRecordResolverSelfTest extends GridCommonAbstractTe
         ggfsCfg.setBlockSize(512);
         ggfsCfg.setDefaultMode(PRIMARY);
 
-        GridCacheConfiguration dataCacheCfg = new GridCacheConfiguration();
+        CacheConfiguration dataCacheCfg = new CacheConfiguration();
 
         dataCacheCfg.setName("dataCache");
         dataCacheCfg.setCacheMode(PARTITIONED);
@@ -70,7 +70,7 @@ public class GridGgfsAbstractRecordResolverSelfTest extends GridCommonAbstractTe
         dataCacheCfg.setBackups(0);
         dataCacheCfg.setQueryIndexEnabled(false);
 
-        GridCacheConfiguration metaCacheCfg = new GridCacheConfiguration();
+        CacheConfiguration metaCacheCfg = new CacheConfiguration();
 
         metaCacheCfg.setName("metaCache");
         metaCacheCfg.setCacheMode(REPLICATED);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java
index 380c278..e134486 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java
@@ -18,6 +18,7 @@
 package org.gridgain.grid.kernal.processors.rest.handlers.cache;
 
 import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.lang.*;
 import org.apache.ignite.spi.discovery.tcp.*;
@@ -54,7 +55,7 @@ public class GridCacheCommandHandlerSelfTest extends GridCommonAbstractTest {
         disco.setIpFinder(new TcpDiscoveryVmIpFinder(true));
 
         // Cache config.
-        GridCacheConfiguration cacheCfg = defaultCacheConfiguration();
+        CacheConfiguration cacheCfg = defaultCacheConfiguration();
 
         cacheCfg.setCacheMode(GridCacheMode.LOCAL);
         cacheCfg.setQueryIndexEnabled(false);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/service/GridServiceProcessorAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/service/GridServiceProcessorAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/service/GridServiceProcessorAbstractSelfTest.java
index cd2259b..c08b0b3 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/service/GridServiceProcessorAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/service/GridServiceProcessorAbstractSelfTest.java
@@ -18,12 +18,12 @@
 package org.gridgain.grid.kernal.processors.service;
 
 import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.lang.*;
 import org.apache.ignite.managed.*;
 import org.apache.ignite.resources.*;
-import org.gridgain.grid.*;
 import org.gridgain.grid.cache.*;
 import org.gridgain.grid.kernal.processors.affinity.*;
 import org.apache.ignite.spi.discovery.tcp.*;
@@ -67,7 +67,7 @@ public abstract class GridServiceProcessorAbstractSelfTest extends GridCommonAbs
         if (svcs != null)
             c.setServiceConfiguration(svcs);
 
-        GridCacheConfiguration cc = new GridCacheConfiguration();
+        CacheConfiguration cc = new CacheConfiguration();
 
         cc.setName(CACHE_NAME);
         cc.setCacheMode(GridCacheMode.PARTITIONED);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/lang/GridFuncSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/lang/GridFuncSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/lang/GridFuncSelfTest.java
index 5a9641d..f79d336 100644
--- a/modules/core/src/test/java/org/gridgain/grid/lang/GridFuncSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/lang/GridFuncSelfTest.java
@@ -19,11 +19,11 @@ package org.gridgain.grid.lang;
 
 import junit.framework.*;
 import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.events.*;
 import org.apache.ignite.lang.*;
-import org.gridgain.grid.*;
 import org.gridgain.grid.cache.*;
 import org.apache.ignite.spi.discovery.tcp.*;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
@@ -2855,7 +2855,7 @@ public class GridFuncSelfTest extends GridCommonAbstractTest {
 
         cfg.setDiscoverySpi(disco);
 
-        GridCacheConfiguration ccfg = defaultCacheConfiguration();
+        CacheConfiguration ccfg = defaultCacheConfiguration();
 
         cfg.setCacheConfiguration(ccfg);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/marshaller/GridMarshallerAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/marshaller/GridMarshallerAbstractTest.java b/modules/core/src/test/java/org/gridgain/grid/marshaller/GridMarshallerAbstractTest.java
index 4ccce38..88c1221 100644
--- a/modules/core/src/test/java/org/gridgain/grid/marshaller/GridMarshallerAbstractTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/marshaller/GridMarshallerAbstractTest.java
@@ -18,6 +18,7 @@
 package org.gridgain.grid.marshaller;
 
 import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.compute.*;
 import org.apache.ignite.configuration.*;
@@ -28,7 +29,6 @@ import org.apache.ignite.marshaller.optimized.*;
 import org.apache.ignite.product.*;
 import org.apache.ignite.streamer.*;
 import org.apache.ignite.streamer.window.*;
-import org.gridgain.grid.*;
 import org.gridgain.grid.cache.*;
 import org.gridgain.grid.cache.affinity.*;
 import org.gridgain.grid.cache.datastructures.*;
@@ -104,7 +104,7 @@ public abstract class GridMarshallerAbstractTest extends GridCommonAbstractTest
     @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
         IgniteConfiguration cfg = super.getConfiguration(gridName);
 
-        GridCacheConfiguration namedCache = new GridCacheConfiguration();
+        CacheConfiguration namedCache = new CacheConfiguration();
 
         namedCache.setName(CACHE_NAME);
         namedCache.setAtomicityMode(TRANSACTIONAL);
@@ -112,7 +112,7 @@ public abstract class GridMarshallerAbstractTest extends GridCommonAbstractTest
 
         cfg.setMarshaller(new IgniteOptimizedMarshaller(false));
         cfg.setStreamerConfiguration(streamerConfiguration());
-        cfg.setCacheConfiguration(new GridCacheConfiguration(), namedCache);
+        cfg.setCacheConfiguration(new CacheConfiguration(), namedCache);
 
         return cfg;
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PContinuousDeploymentSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PContinuousDeploymentSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PContinuousDeploymentSelfTest.java
index 197f80b..2046fb3 100644
--- a/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PContinuousDeploymentSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PContinuousDeploymentSelfTest.java
@@ -18,8 +18,8 @@
 package org.gridgain.grid.p2p;
 
 import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
 import org.apache.ignite.configuration.*;
-import org.gridgain.grid.cache.*;
 import org.apache.ignite.spi.discovery.tcp.*;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
@@ -73,8 +73,8 @@ public class GridP2PContinuousDeploymentSelfTest extends GridCommonAbstractTest
      * @return Cache configuration.
      * @throws Exception In case of error.
      */
-    protected GridCacheConfiguration cacheConfiguration() throws Exception {
-        GridCacheConfiguration cfg = defaultCacheConfiguration();
+    protected CacheConfiguration cacheConfiguration() throws Exception {
+        CacheConfiguration cfg = defaultCacheConfiguration();
 
         cfg.setCacheMode(PARTITIONED);
         cfg.setBackups(1);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCheckpointSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCheckpointSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCheckpointSelfTest.java
index d1dba3d..4f252c7 100644
--- a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCheckpointSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCheckpointSelfTest.java
@@ -17,8 +17,8 @@
 
 package org.gridgain.grid.session;
 
+import org.apache.ignite.cache.*;
 import org.apache.ignite.configuration.*;
-import org.gridgain.grid.cache.*;
 import org.apache.ignite.spi.checkpoint.cache.*;
 import org.apache.ignite.spi.checkpoint.jdbc.*;
 import org.apache.ignite.spi.checkpoint.sharedfs.*;
@@ -77,7 +77,7 @@ public class GridSessionCheckpointSelfTest extends GridSessionCheckpointAbstract
 
         String cacheName = "test-checkpoints";
 
-        GridCacheConfiguration cacheCfg = defaultCacheConfiguration();
+        CacheConfiguration cacheCfg = defaultCacheConfiguration();
 
         cacheCfg.setName(cacheName);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/util/future/GridEmbeddedFutureSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/util/future/GridEmbeddedFutureSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/util/future/GridEmbeddedFutureSelfTest.java
index 7a28ed6..fa265d6 100644
--- a/modules/core/src/test/java/org/gridgain/grid/util/future/GridEmbeddedFutureSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/util/future/GridEmbeddedFutureSelfTest.java
@@ -26,7 +26,7 @@ import org.gridgain.testframework.junits.common.*;
 import java.util.*;
 
 import static java.util.concurrent.TimeUnit.*;
-import static org.gridgain.grid.cache.GridCacheConfiguration.*;
+import static org.apache.ignite.cache.CacheConfiguration.*;
 
 /**
  * Tests grid embedded future use cases.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/grid/util/ipc/shmem/GridIpcSharedMemoryNodeStartup.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/util/ipc/shmem/GridIpcSharedMemoryNodeStartup.java b/modules/core/src/test/java/org/gridgain/grid/util/ipc/shmem/GridIpcSharedMemoryNodeStartup.java
index ba0ea01..16177e9 100644
--- a/modules/core/src/test/java/org/gridgain/grid/util/ipc/shmem/GridIpcSharedMemoryNodeStartup.java
+++ b/modules/core/src/test/java/org/gridgain/grid/util/ipc/shmem/GridIpcSharedMemoryNodeStartup.java
@@ -18,9 +18,9 @@
 package org.gridgain.grid.util.ipc.shmem;
 
 import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.fs.*;
-import org.gridgain.grid.cache.*;
 import org.apache.ignite.spi.discovery.tcp.*;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
 import org.gridgain.grid.util.typedef.*;
@@ -64,7 +64,7 @@ public class GridIpcSharedMemoryNodeStartup {
 
         cfg.setGgfsConfiguration(ggfsCfg);
 
-        GridCacheConfiguration cacheCfg = new GridCacheConfiguration();
+        CacheConfiguration cacheCfg = new CacheConfiguration();
 
         cacheCfg.setName("partitioned");
         cacheCfg.setCacheMode(PARTITIONED);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/loadtests/GridCacheMultiNodeLoadTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/loadtests/GridCacheMultiNodeLoadTest.java b/modules/core/src/test/java/org/gridgain/loadtests/GridCacheMultiNodeLoadTest.java
index ee4e0b6..27134c2 100644
--- a/modules/core/src/test/java/org/gridgain/loadtests/GridCacheMultiNodeLoadTest.java
+++ b/modules/core/src/test/java/org/gridgain/loadtests/GridCacheMultiNodeLoadTest.java
@@ -18,8 +18,8 @@
 package org.gridgain.loadtests;
 
 import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
 import org.apache.ignite.configuration.*;
-import org.gridgain.grid.cache.*;
 import org.gridgain.grid.cache.eviction.lru.*;
 import org.apache.ignite.spi.discovery.tcp.*;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
@@ -58,7 +58,7 @@ public class GridCacheMultiNodeLoadTest extends GridCommonAbstractTest {
 
         cfg.setDiscoverySpi(spi);
 
-        GridCacheConfiguration cacheCfg = defaultCacheConfiguration();
+        CacheConfiguration cacheCfg = defaultCacheConfiguration();
 
         cacheCfg.setName(CACHE_NAME);
         cacheCfg.setCacheMode(PARTITIONED);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheAffinityTransactionsOffHeapTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheAffinityTransactionsOffHeapTest.java b/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheAffinityTransactionsOffHeapTest.java
index e3f4603..848a666 100644
--- a/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheAffinityTransactionsOffHeapTest.java
+++ b/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheAffinityTransactionsOffHeapTest.java
@@ -18,6 +18,7 @@
 package org.gridgain.loadtests.cache;
 
 import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.transactions.*;
 import org.gridgain.grid.cache.*;
@@ -176,7 +177,7 @@ public class GridCacheAffinityTransactionsOffHeapTest {
 
         cfg.setGridName(name);
 
-        GridCacheConfiguration cacheCfg = new GridCacheConfiguration();
+        CacheConfiguration cacheCfg = new CacheConfiguration();
 
         cacheCfg.setCacheMode(PARTITIONED);
         cacheCfg.setAtomicityMode(TRANSACTIONAL);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCachePutRemoveLoadTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCachePutRemoveLoadTest.java b/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCachePutRemoveLoadTest.java
index 41ed82a..a46e717 100644
--- a/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCachePutRemoveLoadTest.java
+++ b/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCachePutRemoveLoadTest.java
@@ -19,6 +19,7 @@ package org.gridgain.loadtests.cache;
 
 import com.beust.jcommander.*;
 import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
 import org.apache.ignite.configuration.*;
 import org.gridgain.grid.cache.*;
 import org.gridgain.grid.cache.eviction.lru.*;
@@ -102,7 +103,7 @@ public class GridCachePutRemoveLoadTest {
 
             cfg.setGridName("g" + i);
 
-            GridCacheConfiguration cacheCfg = cfg.getCacheConfiguration()[0];
+            CacheConfiguration cacheCfg = cfg.getCacheConfiguration()[0];
 
             GridCacheDistributionMode distro = i == 0 &&
                 args.distribution() == CLIENT_ONLY ? CLIENT_ONLY : PARTITIONED_ONLY;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheSingleNodeLoadTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheSingleNodeLoadTest.java b/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheSingleNodeLoadTest.java
index b8731d4..d0ec833 100644
--- a/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheSingleNodeLoadTest.java
+++ b/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheSingleNodeLoadTest.java
@@ -17,6 +17,7 @@
 
 package org.gridgain.loadtests.cache;
 
+import org.apache.ignite.cache.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.thread.*;
 import org.gridgain.grid.cache.*;
@@ -126,7 +127,7 @@ public class GridCacheSingleNodeLoadTest {
         c.setSystemExecutorService(new IgniteThreadPoolExecutor(THREADS * 2, THREADS * 2, 0L,
             new LinkedBlockingQueue<Runnable>()));
 
-        GridCacheConfiguration cc = new GridCacheConfiguration();
+        CacheConfiguration cc = new CacheConfiguration();
 
         cc.setCacheMode(PARTITIONED);
         cc.setBackups(1);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheWriteBehindStoreLoadTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheWriteBehindStoreLoadTest.java b/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheWriteBehindStoreLoadTest.java
index 6fb07ab..5ce5aa3 100644
--- a/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheWriteBehindStoreLoadTest.java
+++ b/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheWriteBehindStoreLoadTest.java
@@ -18,17 +18,17 @@
 package org.gridgain.loadtests.cache;
 
 import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
 import org.apache.ignite.cache.store.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.lang.*;
 import org.apache.ignite.spi.discovery.tcp.*;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-import org.apache.ignite.transactions.*;
 import org.gridgain.grid.cache.*;
 import org.gridgain.grid.util.typedef.internal.*;
 import org.gridgain.testframework.junits.common.*;
-import org.jetbrains.annotations.*;
 
+import javax.cache.*;
 import java.util.*;
 import java.util.concurrent.atomic.*;
 
@@ -61,12 +61,12 @@ public class GridCacheWriteBehindStoreLoadTest extends GridCommonAbstractTest {
         }
 
         /** {@inheritDoc} */
-        @Override public void put(Object key, @Nullable Object val) {
+        @Override public void write(Cache.Entry e) {
             // No-op.
         }
 
         /** {@inheritDoc} */
-        @Override public void remove(Object key) {
+        @Override public void delete(Object key) {
             // No-op.
         }
     };
@@ -104,7 +104,7 @@ public class GridCacheWriteBehindStoreLoadTest extends GridCommonAbstractTest {
 
         c.setDiscoverySpi(disco);
 
-        GridCacheConfiguration cc = defaultCacheConfiguration();
+        CacheConfiguration cc = defaultCacheConfiguration();
 
         cc.setCacheMode(cacheMode());
         cc.setWriteSynchronizationMode(FULL_SYNC);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/loadtests/capacity/spring-capacity-cache.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/loadtests/capacity/spring-capacity-cache.xml b/modules/core/src/test/java/org/gridgain/loadtests/capacity/spring-capacity-cache.xml
index 7ca639b..814842e 100644
--- a/modules/core/src/test/java/org/gridgain/loadtests/capacity/spring-capacity-cache.xml
+++ b/modules/core/src/test/java/org/gridgain/loadtests/capacity/spring-capacity-cache.xml
@@ -56,7 +56,7 @@
                 <!--
                     Partitioned cache example configuration.
                 -->
-                <bean class="org.gridgain.grid.cache.GridCacheConfiguration">
+                <bean class="org.apache.ignite.cache.CacheConfiguration">
                     <property name="cacheMode" value="PARTITIONED"/>
 
                     <!-- Initial cache size. -->

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/loadtests/colocation/GridTestCacheStore.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/loadtests/colocation/GridTestCacheStore.java b/modules/core/src/test/java/org/gridgain/loadtests/colocation/GridTestCacheStore.java
index 2ad9704..3733874 100644
--- a/modules/core/src/test/java/org/gridgain/loadtests/colocation/GridTestCacheStore.java
+++ b/modules/core/src/test/java/org/gridgain/loadtests/colocation/GridTestCacheStore.java
@@ -25,6 +25,7 @@ import org.apache.ignite.transactions.*;
 import org.gridgain.grid.cache.*;
 import org.jdk8.backport.*;
 
+import javax.cache.*;
 import javax.cache.integration.*;
 import java.util.concurrent.*;
 
@@ -123,12 +124,12 @@ public class GridTestCacheStore extends CacheStoreAdapter<GridTestKey, Long> {
     }
 
     /** {@inheritDoc} */
-    @Override public void put(GridTestKey key, Long val) {
+    @Override public void write(Cache.Entry<? extends GridTestKey, ? extends Long> e) {
         // No-op.
     }
 
     /** {@inheritDoc} */
-    @Override public void remove(GridTestKey key) {
+    @Override public void delete(Object key) {
         // No-op.
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/loadtests/colocation/spring-colocation.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/loadtests/colocation/spring-colocation.xml b/modules/core/src/test/java/org/gridgain/loadtests/colocation/spring-colocation.xml
index 2e80553..29a8c48 100644
--- a/modules/core/src/test/java/org/gridgain/loadtests/colocation/spring-colocation.xml
+++ b/modules/core/src/test/java/org/gridgain/loadtests/colocation/spring-colocation.xml
@@ -112,7 +112,7 @@
                 <!--
                     Partitioned cache example configuration.
                 -->
-                <bean class="org.gridgain.grid.cache.GridCacheConfiguration">
+                <bean class="org.apache.ignite.cache.CacheConfiguration">
                     <property name="name" value="partitioned"/>
 
                     <property name="cacheMode" value="PARTITIONED"/>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/loadtests/datastructures/GridCachePartitionedAtomicLongLoadTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/loadtests/datastructures/GridCachePartitionedAtomicLongLoadTest.java b/modules/core/src/test/java/org/gridgain/loadtests/datastructures/GridCachePartitionedAtomicLongLoadTest.java
index 3a64ce5..aaea04a 100644
--- a/modules/core/src/test/java/org/gridgain/loadtests/datastructures/GridCachePartitionedAtomicLongLoadTest.java
+++ b/modules/core/src/test/java/org/gridgain/loadtests/datastructures/GridCachePartitionedAtomicLongLoadTest.java
@@ -18,6 +18,7 @@
 package org.gridgain.loadtests.datastructures;
 
 import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.transactions.*;
 import org.gridgain.grid.cache.*;
@@ -56,7 +57,7 @@ public class GridCachePartitionedAtomicLongLoadTest extends GridCommonAbstractTe
         c.getTransactionsConfiguration().setDefaultTxConcurrency(PESSIMISTIC);
         c.getTransactionsConfiguration().setDefaultTxIsolation(REPEATABLE_READ);
 
-        GridCacheConfiguration cc = defaultCacheConfiguration();
+        CacheConfiguration cc = defaultCacheConfiguration();
 
         cc.setCacheMode(GridCacheMode.PARTITIONED);
         cc.setStartSize(200);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/loadtests/swap/GridSwapEvictAllBenchmark.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/loadtests/swap/GridSwapEvictAllBenchmark.java b/modules/core/src/test/java/org/gridgain/loadtests/swap/GridSwapEvictAllBenchmark.java
index a06df0a..6cb9de6 100644
--- a/modules/core/src/test/java/org/gridgain/loadtests/swap/GridSwapEvictAllBenchmark.java
+++ b/modules/core/src/test/java/org/gridgain/loadtests/swap/GridSwapEvictAllBenchmark.java
@@ -18,10 +18,10 @@
 package org.gridgain.loadtests.swap;
 
 import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
 import org.apache.ignite.cache.store.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.lang.*;
-import org.apache.ignite.transactions.*;
 import org.gridgain.grid.cache.*;
 import org.gridgain.grid.cache.eviction.fifo.*;
 import org.apache.ignite.spi.discovery.tcp.*;
@@ -33,6 +33,7 @@ import org.gridgain.loadtests.util.*;
 import org.gridgain.testframework.*;
 import org.jetbrains.annotations.*;
 
+import javax.cache.*;
 import java.util.*;
 import java.util.concurrent.atomic.*;
 
@@ -73,11 +74,11 @@ public class GridSwapEvictAllBenchmark {
                         c.apply((long)i, String.valueOf(i));
                 }
 
-                @Override public void put(Long key, @Nullable String val) {
+                @Override public void write(Cache.Entry<? extends Long, ? extends String> e) {
                     assert false;
                 }
 
-                @Override public void remove(Long key) {
+                @Override public void delete(Object key) {
                     assert false;
                 }
             });
@@ -260,7 +261,7 @@ public class GridSwapEvictAllBenchmark {
 
         cfg.setDiscoverySpi(disco);
 
-        GridCacheConfiguration ccfg = new GridCacheConfiguration();
+        CacheConfiguration ccfg = new CacheConfiguration();
 
         ccfg.setSwapEnabled(true);
         ccfg.setEvictSynchronized(false);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/testframework/junits/GridAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/testframework/junits/GridAbstractTest.java b/modules/core/src/test/java/org/gridgain/testframework/junits/GridAbstractTest.java
index 165605e..4ae3a9f 100644
--- a/modules/core/src/test/java/org/gridgain/testframework/junits/GridAbstractTest.java
+++ b/modules/core/src/test/java/org/gridgain/testframework/junits/GridAbstractTest.java
@@ -19,6 +19,7 @@ package org.gridgain.testframework.junits;
 
 import junit.framework.*;
 import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.events.*;
@@ -27,8 +28,6 @@ import org.apache.ignite.marshaller.*;
 import org.apache.ignite.marshaller.jdk.*;
 import org.apache.ignite.marshaller.optimized.*;
 import org.apache.log4j.*;
-import org.gridgain.grid.*;
-import org.gridgain.grid.cache.*;
 import org.gridgain.grid.kernal.*;
 import org.gridgain.grid.kernal.processors.license.*;
 import org.gridgain.grid.kernal.processors.resource.*;
@@ -1120,8 +1119,8 @@ public abstract class GridAbstractTest extends TestCase {
     /**
      * @return New cache configuration with modified defaults.
      */
-    public static GridCacheConfiguration defaultCacheConfiguration() {
-        GridCacheConfiguration cfg = new GridCacheConfiguration();
+    public static CacheConfiguration defaultCacheConfiguration() {
+        CacheConfiguration cfg = new CacheConfiguration();
 
         cfg.setStartSize(1024);
         cfg.setQueryIndexEnabled(true);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/testframework/junits/cache/GridAbstractCacheStoreSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/testframework/junits/cache/GridAbstractCacheStoreSelfTest.java b/modules/core/src/test/java/org/gridgain/testframework/junits/cache/GridAbstractCacheStoreSelfTest.java
index 657dfae..261f202 100644
--- a/modules/core/src/test/java/org/gridgain/testframework/junits/cache/GridAbstractCacheStoreSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/testframework/junits/cache/GridAbstractCacheStoreSelfTest.java
@@ -22,12 +22,14 @@ import org.apache.ignite.cache.store.*;
 import org.apache.ignite.lang.*;
 import org.apache.ignite.resources.*;
 import org.apache.ignite.transactions.*;
+import org.gridgain.grid.kernal.processors.cache.*;
 import org.gridgain.grid.util.lang.*;
 import org.gridgain.grid.util.typedef.*;
 import org.gridgain.grid.util.typedef.internal.*;
 import org.gridgain.testframework.junits.common.*;
 import org.jetbrains.annotations.*;
 
+import javax.cache.*;
 import java.util.*;
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.*;
@@ -64,8 +66,8 @@ public abstract class GridAbstractCacheStoreSelfTest<T extends CacheStore<Object
 
         ses.newSession(tx);
 
-        store.put("k1", "v1");
-        store.put("k2", "v2");
+        store.write(new CacheEntryImpl<>("k1", "v1"));
+        store.write(new CacheEntryImpl<>("k2", "v2"));
 
         store.txEnd(true);
 
@@ -77,7 +79,7 @@ public abstract class GridAbstractCacheStoreSelfTest<T extends CacheStore<Object
 
         ses.newSession(tx);
 
-        store.remove("k1");
+        store.delete("k1");
 
         store.txEnd(true);
 
@@ -97,7 +99,7 @@ public abstract class GridAbstractCacheStoreSelfTest<T extends CacheStore<Object
         ses.newSession(tx);
 
         // Put.
-        store.put("k1", "v1");
+        store.write(new CacheEntryImpl<>("k1", "v1"));
 
         store.txEnd(false); // Rollback.
 
@@ -110,7 +112,11 @@ public abstract class GridAbstractCacheStoreSelfTest<T extends CacheStore<Object
         // Put all.
         assertNull(store.load("k2"));
 
-        store.putAll(Collections.singletonMap("k2", "v2"));
+        Collection<Cache.Entry<? extends Object, ? extends Object>> col = new ArrayList<>();
+
+        col.add(new CacheEntryImpl<>("k2", "v2"));
+
+        store.writeAll(col);
 
         store.txEnd(false); // Rollback.
 
@@ -120,7 +126,11 @@ public abstract class GridAbstractCacheStoreSelfTest<T extends CacheStore<Object
 
         assertNull(store.load("k2"));
 
-        store.putAll(Collections.singletonMap("k3", "v3"));
+        col = new ArrayList<>();
+
+        col.add(new CacheEntryImpl<>("k3", "v3"));
+
+        store.writeAll(col);
 
         store.txEnd(true); // Commit.
 
@@ -130,7 +140,7 @@ public abstract class GridAbstractCacheStoreSelfTest<T extends CacheStore<Object
 
         assertEquals("v3", store.load("k3"));
 
-        store.put("k4", "v4");
+        store.write(new CacheEntryImpl<>("k4", "v4"));
 
         store.txEnd(false); // Rollback.
 
@@ -143,7 +153,7 @@ public abstract class GridAbstractCacheStoreSelfTest<T extends CacheStore<Object
         assertEquals("v3", store.load("k3"));
 
         // Remove.
-        store.remove("k3");
+        store.delete("k3");
 
         store.txEnd(false); // Rollback.
 
@@ -154,7 +164,7 @@ public abstract class GridAbstractCacheStoreSelfTest<T extends CacheStore<Object
         assertEquals("v3", store.load("k3"));
 
         // Remove all.
-        store.removeAll(Arrays.asList("k3"));
+        store.deleteAll(Arrays.asList("k3"));
 
         store.txEnd(false); // Rollback.
 
@@ -195,7 +205,7 @@ public abstract class GridAbstractCacheStoreSelfTest<T extends CacheStore<Object
         try {
             ses.newSession(tx);
 
-            store.put("key1", "val1");
+            store.write(new CacheEntryImpl<>("key1", "val1"));
 
             if (tx != null && commit) {
                 store.txEnd(true);
@@ -208,12 +218,12 @@ public abstract class GridAbstractCacheStoreSelfTest<T extends CacheStore<Object
             if (tx == null || commit)
                 assertEquals("val1", store.load("key1"));
 
-            Map<String, String> m = new HashMap<>();
+            Collection<Cache.Entry<? extends Object, ? extends Object>> col = new ArrayList<>();
 
-            m.put("key2", "val2");
-            m.put("key3", "val3");
+            col.add(new CacheEntryImpl<>("key2", "val2"));
+            col.add(new CacheEntryImpl<>("key3", "val3"));
 
-            store.putAll(m);
+            store.writeAll(col);
 
             if (tx != null && commit) {
                 store.txEnd(true);
@@ -221,31 +231,30 @@ public abstract class GridAbstractCacheStoreSelfTest<T extends CacheStore<Object
                 tx = new DummyTx();
             }
 
-            final AtomicInteger cntr = new AtomicInteger();
-
             if (tx == null || commit) {
-                store.loadAll(Arrays.asList("key1", "key2", "key3", "no_such_key"), new CI2<Object, Object>() {
-                    @Override public void apply(Object o, Object o1) {
-                        if ("key1".equals(o))
-                            assertEquals("val1", o1);
+                Map<Object, Object> loaded = store.loadAll(Arrays.asList("key1", "key2", "key3", "no_such_key"));
 
-                        if ("key2".equals(o))
-                            assertEquals("val2", o1);
+                for (Map.Entry<Object, Object> e : loaded.entrySet()) {
+                    Object key = e.getKey();
+                    Object val = e.getValue();
 
-                        if ("key3".equals(o))
-                            assertEquals("val3", o1);
+                    if ("key1".equals(key))
+                        assertEquals("val1", val);
 
-                        if ("no_such_key".equals(o))
-                            fail();
+                    if ("key2".equals(key))
+                        assertEquals("val2", val);
 
-                        cntr.incrementAndGet();
-                    }
-                });
+                    if ("key3".equals(key))
+                        assertEquals("val3", val);
+
+                    if ("no_such_key".equals(key))
+                        fail();
+                }
 
-                assertEquals(3, cntr.get());
+                assertEquals(3, loaded.size());
             }
 
-            store.removeAll(Arrays.asList("key2", "key3"));
+            store.deleteAll(Arrays.asList("key2", "key3"));
 
             if (tx != null && commit) {
                 store.txEnd(true);
@@ -261,7 +270,7 @@ public abstract class GridAbstractCacheStoreSelfTest<T extends CacheStore<Object
                 assertEquals("val1", store.load("key1"));
             }
 
-            store.remove("key1");
+            store.delete("key1");
 
             if (tx != null && commit) {
                 store.txEnd(true);
@@ -311,25 +320,17 @@ public abstract class GridAbstractCacheStoreSelfTest<T extends CacheStore<Object
                             if (rnd.nextBoolean())
                                 assertNotNull(store.load(key));
                             else {
-                                final AtomicInteger cntr = new AtomicInteger();
-
-                                store.loadAll(Collections.singleton(key), new CI2<Object, Object>() {
-                                    @Override public void apply(Object o, Object o1) {
-                                        cntr.incrementAndGet();
+                                Map<Object, Object> loaded = store.loadAll(Collections.singleton(key));
 
-                                        assertNotNull(o);
-                                        assertNotNull(o1);
+                                assertEquals(1, loaded.size());
 
-                                        UUID key = (UUID) o;
-                                        UUID val = (UUID) o1;
+                                Map.Entry<Object, Object> e = loaded.entrySet().iterator().next();
 
-                                        assertTrue(key.equals(val) ||
-                                            (key.getMostSignificantBits() == val.getLeastSignificantBits() &&
-                                                key.getLeastSignificantBits() == val.getMostSignificantBits()));
-                                    }
-                                });
+                                UUID k = (UUID)e.getKey();
+                                UUID v = (UUID)e.getValue();
 
-                                assertEquals(1, cntr.get());
+                                assertTrue(k.equals(v) || (k.getMostSignificantBits() == v.getLeastSignificantBits()
+                                    && k.getLeastSignificantBits() == v.getMostSignificantBits()));
                             }
 
                             if (tx != null)
@@ -345,9 +346,9 @@ public abstract class GridAbstractCacheStoreSelfTest<T extends CacheStore<Object
                             queueEmpty = true;
                         else {
                             if (rnd.nextBoolean())
-                                store.remove(key);
+                                store.delete(key);
                             else
-                                store.removeAll(Collections.singleton(key));
+                                store.deleteAll(Collections.singleton(key));
 
                             if (tx != null)
                                 store.txEnd(true);
@@ -362,9 +363,14 @@ public abstract class GridAbstractCacheStoreSelfTest<T extends CacheStore<Object
                             UUID val = new UUID(key.getLeastSignificantBits(), key.getMostSignificantBits());
 
                             if (rnd.nextBoolean())
-                                store.put(key, val);
-                            else
-                                store.putAll(Collections.singletonMap(key, val));
+                                store.write(new CacheEntryImpl<>(key, val));
+                            else {
+                                Collection<Cache.Entry<? extends Object, ? extends Object>> col = new ArrayList<>();
+
+                                col.add(new CacheEntryImpl<>(key, val));
+
+                                store.writeAll(col);
+                            }
 
                             if (tx != null)
                                 store.txEnd(true);
@@ -377,9 +383,14 @@ public abstract class GridAbstractCacheStoreSelfTest<T extends CacheStore<Object
                         UUID key = UUID.randomUUID();
 
                         if (rnd.nextBoolean())
-                            store.put(key, key);
-                        else
-                            store.putAll(Collections.singletonMap(key, key));
+                            store.write(new CacheEntryImpl<>(key, key));
+                        else {
+                            Collection<Cache.Entry<? extends Object, ? extends Object>> col = new ArrayList<>();
+
+                            col.add(new CacheEntryImpl<>(key, key));
+
+                            store.writeAll(col);
+                        }
 
                         if (tx != null)
                             store.txEnd(true);
@@ -425,7 +436,7 @@ public abstract class GridAbstractCacheStoreSelfTest<T extends CacheStore<Object
 
         ses.newSession(null);
 
-        store.removeAll(keys);
+        store.deleteAll(keys);
 
         keys.clear();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/testframework/junits/cache/TestCacheSession.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/testframework/junits/cache/TestCacheSession.java b/modules/core/src/test/java/org/gridgain/testframework/junits/cache/TestCacheSession.java
index 9093ddb..549ce35 100644
--- a/modules/core/src/test/java/org/gridgain/testframework/junits/cache/TestCacheSession.java
+++ b/modules/core/src/test/java/org/gridgain/testframework/junits/cache/TestCacheSession.java
@@ -50,10 +50,11 @@ public class TestCacheSession implements CacheStoreSession {
     }
 
     /** {@inheritDoc} */
-    @Override public Map<Object, Object> properties() {
+    @SuppressWarnings("unchecked")
+    @Override public <K, V> Map<K, V> properties() {
         if (props == null)
             props = U.newHashMap(1);
 
-        return props;
+        return (Map<K, V>)props;
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/testframework/junits/cache/TestThreadLocalCacheSession.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/testframework/junits/cache/TestThreadLocalCacheSession.java b/modules/core/src/test/java/org/gridgain/testframework/junits/cache/TestThreadLocalCacheSession.java
index efe0b24..34a3b20 100644
--- a/modules/core/src/test/java/org/gridgain/testframework/junits/cache/TestThreadLocalCacheSession.java
+++ b/modules/core/src/test/java/org/gridgain/testframework/junits/cache/TestThreadLocalCacheSession.java
@@ -49,9 +49,10 @@ public class TestThreadLocalCacheSession implements CacheStoreSession {
     }
 
     /** {@inheritDoc} */
-    @Override public Map<Object, Object> properties() {
+    @SuppressWarnings("unchecked")
+    @Override public <K, V> Map<K, V> properties() {
         TestCacheSession ses = sesHolder.get();
 
-        return ses != null ? ses.properties() : null;
+        return ses != null ? (Map<K, V>)ses.properties() : null;
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/java/org/gridgain/testframework/junits/common/GridCommonAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/testframework/junits/common/GridCommonAbstractTest.java b/modules/core/src/test/java/org/gridgain/testframework/junits/common/GridCommonAbstractTest.java
index 0950e25..ba834b8 100644
--- a/modules/core/src/test/java/org/gridgain/testframework/junits/common/GridCommonAbstractTest.java
+++ b/modules/core/src/test/java/org/gridgain/testframework/junits/common/GridCommonAbstractTest.java
@@ -18,6 +18,7 @@
 package org.gridgain.testframework.junits.common;
 
 import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.compute.*;
 import org.apache.ignite.configuration.*;
@@ -152,7 +153,7 @@ public abstract class GridCommonAbstractTest extends GridAbstractTest {
      * @return {@code True} if near cache is enabled.
      */
     protected static <K, V> boolean nearEnabled(GridCacheProjection<K,V> cache) {
-        GridCacheConfiguration cfg = ((GridKernal)cache.gridProjection().ignite()).
+        CacheConfiguration cfg = ((GridKernal)cache.gridProjection().ignite()).
             <K, V>internalCache(cache.name()).context().config();
 
         return isNearEnabled(cfg);
@@ -248,7 +249,7 @@ public abstract class GridCommonAbstractTest extends GridAbstractTest {
     protected void awaitPartitionMapExchange() throws InterruptedException {
         for (Ignite g : G.allGrids()) {
             for (GridCache<?, ?> c : ((GridEx)g).cachesx()) {
-                GridCacheConfiguration cfg = c.configuration();
+                CacheConfiguration cfg = c.configuration();
 
                 if (cfg.getCacheMode() == PARTITIONED && cfg.getPreloadMode() != NONE && g.cluster().nodes().size() > 1) {
                     GridCacheAffinityFunction aff = cfg.getAffinity();
@@ -650,8 +651,8 @@ public abstract class GridCommonAbstractTest extends GridAbstractTest {
      * @param cacheName Cache name.
      * @return Cache configuration.
      */
-    protected GridCacheConfiguration cacheConfiguration(IgniteConfiguration cfg, String cacheName) {
-        for (GridCacheConfiguration ccfg : cfg.getCacheConfiguration()) {
+    protected CacheConfiguration cacheConfiguration(IgniteConfiguration cfg, String cacheName) {
+        for (CacheConfiguration ccfg : cfg.getCacheConfiguration()) {
             if (F.eq(cacheName, ccfg.getName()))
                 return ccfg;
         }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/core/src/test/webapp/META-INF/gg-config.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/webapp/META-INF/gg-config.xml b/modules/core/src/test/webapp/META-INF/gg-config.xml
index b4e8651..e29ab79 100644
--- a/modules/core/src/test/webapp/META-INF/gg-config.xml
+++ b/modules/core/src/test/webapp/META-INF/gg-config.xml
@@ -88,7 +88,7 @@
                 <!--
                     Partitioned cache example configuration (Atomic mode).
                 -->
-                <bean class="org.gridgain.grid.cache.GridCacheConfiguration">
+                <bean class="org.apache.ignite.cache.CacheConfiguration">
                     <property name="name" value="partitioned"/>
 
                     <property name="cacheMode" value="PARTITIONED"/>
@@ -133,7 +133,7 @@
                 <!--
                     Partitioned cache example configuration (Transactional mode).
                 -->
-                <bean class="org.gridgain.grid.cache.GridCacheConfiguration">
+                <bean class="org.apache.ignite.cache.CacheConfiguration">
                     <property name="name" value="partitioned_tx"/>
 
                     <property name="cacheMode" value="PARTITIONED"/>
@@ -182,7 +182,7 @@
                 <!--
                     Replicated cache example configuration.
                 -->
-                <bean class="org.gridgain.grid.cache.GridCacheConfiguration">
+                <bean class="org.apache.ignite.cache.CacheConfiguration">
                     <property name="name" value="replicated"/>
 
                     <!--
@@ -220,7 +220,7 @@
                 <!--
                     Local cache example configuration.
                 -->
-                <bean class="org.gridgain.grid.cache.GridCacheConfiguration">
+                <bean class="org.apache.ignite.cache.CacheConfiguration">
                     <!-- Cache name is 'local'. -->
                     <property name="name" value="local"/>
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoop20FileSystemAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoop20FileSystemAbstractSelfTest.java b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoop20FileSystemAbstractSelfTest.java
index 7ee8605..ce009f3 100644
--- a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoop20FileSystemAbstractSelfTest.java
+++ b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoop20FileSystemAbstractSelfTest.java
@@ -22,10 +22,10 @@ import org.apache.hadoop.fs.*;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.permission.*;
 import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.fs.*;
 import org.apache.ignite.lang.*;
-import org.gridgain.grid.*;
 import org.gridgain.grid.cache.*;
 import org.gridgain.grid.kernal.ggfs.hadoop.*;
 import org.gridgain.grid.kernal.processors.ggfs.*;
@@ -155,7 +155,7 @@ public abstract class GridGgfsHadoop20FileSystemAbstractSelfTest extends GridGgf
             ggfsCfg.setBlockSize(512 * 1024);
             ggfsCfg.setPrefetchBlocks(1);
 
-            GridCacheConfiguration cacheCfg = defaultCacheConfiguration();
+            CacheConfiguration cacheCfg = defaultCacheConfiguration();
 
             cacheCfg.setName("partitioned");
             cacheCfg.setCacheMode(PARTITIONED);
@@ -166,7 +166,7 @@ public abstract class GridGgfsHadoop20FileSystemAbstractSelfTest extends GridGgf
             cacheCfg.setQueryIndexEnabled(false);
             cacheCfg.setAtomicityMode(TRANSACTIONAL);
 
-            GridCacheConfiguration metaCacheCfg = defaultCacheConfiguration();
+            CacheConfiguration metaCacheCfg = defaultCacheConfiguration();
 
             metaCacheCfg.setName("replicated");
             metaCacheCfg.setCacheMode(REPLICATED);
@@ -224,8 +224,8 @@ public abstract class GridGgfsHadoop20FileSystemAbstractSelfTest extends GridGgf
      * @param gridName Grid name.
      * @return Cache configuration.
      */
-    protected GridCacheConfiguration[] cacheConfiguration(String gridName) {
-        GridCacheConfiguration cacheCfg = defaultCacheConfiguration();
+    protected CacheConfiguration[] cacheConfiguration(String gridName) {
+        CacheConfiguration cacheCfg = defaultCacheConfiguration();
 
         cacheCfg.setName("partitioned");
         cacheCfg.setCacheMode(PARTITIONED);
@@ -236,7 +236,7 @@ public abstract class GridGgfsHadoop20FileSystemAbstractSelfTest extends GridGgf
         cacheCfg.setQueryIndexEnabled(false);
         cacheCfg.setAtomicityMode(TRANSACTIONAL);
 
-        GridCacheConfiguration metaCacheCfg = defaultCacheConfiguration();
+        CacheConfiguration metaCacheCfg = defaultCacheConfiguration();
 
         metaCacheCfg.setName("replicated");
         metaCacheCfg.setCacheMode(REPLICATED);
@@ -244,7 +244,7 @@ public abstract class GridGgfsHadoop20FileSystemAbstractSelfTest extends GridGgf
         metaCacheCfg.setQueryIndexEnabled(false);
         metaCacheCfg.setAtomicityMode(TRANSACTIONAL);
 
-        return new GridCacheConfiguration[] {metaCacheCfg, cacheCfg};
+        return new CacheConfiguration[] {metaCacheCfg, cacheCfg};
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopDualAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopDualAbstractSelfTest.java b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopDualAbstractSelfTest.java
index c790c71..9852b2e 100644
--- a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopDualAbstractSelfTest.java
+++ b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopDualAbstractSelfTest.java
@@ -20,6 +20,7 @@ package org.gridgain.grid.ggfs;
 import org.apache.hadoop.conf.*;
 import org.apache.hadoop.fs.*;
 import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.fs.*;
 import org.gridgain.grid.cache.*;
@@ -129,7 +130,7 @@ public abstract class GridGgfsHadoopDualAbstractSelfTest extends GridGgfsCommonA
         ggfsCfg.setPrefetchBlocks(PREFETCH_BLOCKS);
         ggfsCfg.setSequentialReadsBeforePrefetch(SEQ_READS_BEFORE_PREFETCH);
 
-        GridCacheConfiguration dataCacheCfg = defaultCacheConfiguration();
+        CacheConfiguration dataCacheCfg = defaultCacheConfiguration();
 
         dataCacheCfg.setName("dataCache");
         dataCacheCfg.setCacheMode(PARTITIONED);
@@ -141,7 +142,7 @@ public abstract class GridGgfsHadoopDualAbstractSelfTest extends GridGgfsCommonA
         dataCacheCfg.setAtomicityMode(TRANSACTIONAL);
         dataCacheCfg.setOffHeapMaxMemory(0);
 
-        GridCacheConfiguration metaCacheCfg = defaultCacheConfiguration();
+        CacheConfiguration metaCacheCfg = defaultCacheConfiguration();
 
         metaCacheCfg.setName("metaCache");
         metaCacheCfg.setCacheMode(REPLICATED);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0d8a67a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemAbstractSelfTest.java b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemAbstractSelfTest.java
index 2c2ca51..e84de52 100644
--- a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemAbstractSelfTest.java
+++ b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemAbstractSelfTest.java
@@ -22,6 +22,7 @@ import org.apache.hadoop.fs.*;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.permission.*;
 import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.fs.*;
 import org.apache.ignite.lang.*;
@@ -180,7 +181,7 @@ public abstract class GridGgfsHadoopFileSystemAbstractSelfTest extends GridGgfsC
             ggfsCfg.setBlockSize(512 * 1024);
             ggfsCfg.setPrefetchBlocks(1);
 
-            GridCacheConfiguration cacheCfg = defaultCacheConfiguration();
+            CacheConfiguration cacheCfg = defaultCacheConfiguration();
 
             cacheCfg.setName("partitioned");
             cacheCfg.setCacheMode(PARTITIONED);
@@ -191,7 +192,7 @@ public abstract class GridGgfsHadoopFileSystemAbstractSelfTest extends GridGgfsC
             cacheCfg.setQueryIndexEnabled(false);
             cacheCfg.setAtomicityMode(TRANSACTIONAL);
 
-            GridCacheConfiguration metaCacheCfg = defaultCacheConfiguration();
+            CacheConfiguration metaCacheCfg = defaultCacheConfiguration();
 
             metaCacheCfg.setName("replicated");
             metaCacheCfg.setCacheMode(REPLICATED);
@@ -288,8 +289,8 @@ public abstract class GridGgfsHadoopFileSystemAbstractSelfTest extends GridGgfsC
      * @param gridName Grid name.
      * @return Cache configuration.
      */
-    protected GridCacheConfiguration[] cacheConfiguration(String gridName) {
-        GridCacheConfiguration cacheCfg = defaultCacheConfiguration();
+    protected CacheConfiguration[] cacheConfiguration(String gridName) {
+        CacheConfiguration cacheCfg = defaultCacheConfiguration();
 
         cacheCfg.setName("partitioned");
         cacheCfg.setCacheMode(PARTITIONED);
@@ -300,7 +301,7 @@ public abstract class GridGgfsHadoopFileSystemAbstractSelfTest extends GridGgfsC
         cacheCfg.setQueryIndexEnabled(false);
         cacheCfg.setAtomicityMode(TRANSACTIONAL);
 
-        GridCacheConfiguration metaCacheCfg = defaultCacheConfiguration();
+        CacheConfiguration metaCacheCfg = defaultCacheConfiguration();
 
         metaCacheCfg.setName("replicated");
         metaCacheCfg.setCacheMode(REPLICATED);
@@ -308,7 +309,7 @@ public abstract class GridGgfsHadoopFileSystemAbstractSelfTest extends GridGgfsC
         metaCacheCfg.setQueryIndexEnabled(false);
         metaCacheCfg.setAtomicityMode(TRANSACTIONAL);
 
-        return new GridCacheConfiguration[] {metaCacheCfg, cacheCfg};
+        return new CacheConfiguration[] {metaCacheCfg, cacheCfg};
     }
 
     /**


Mime
View raw message