ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [22/38] incubator-ignite git commit: # Renaming
Date Fri, 05 Dec 2014 08:44:49 GMT
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5e4cd4d8/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 1323c4b..bbb9f2c 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
@@ -25,7 +25,7 @@ import java.util.*;
 
 import static org.gridgain.grid.cache.GridCacheAtomicityMode.*;
 import static org.gridgain.grid.cache.GridCacheMode.*;
-import static org.gridgain.grid.ggfs.GridGgfsMode.*;
+import static org.gridgain.grid.ggfs.IgniteFsMode.*;
 
 /**
  * GGFS modes self test.
@@ -41,10 +41,10 @@ public class GridGgfsModesSelfTest extends GridGgfsCommonAbstractTest {
     private GridGgfsImpl ggfsSecondary;
 
     /** Default GGFS mode. */
-    private GridGgfsMode mode;
+    private IgniteFsMode mode;
 
     /** Modes map. */
-    private Map<String, GridGgfsMode> pathModes;
+    private Map<String, IgniteFsMode> pathModes;
 
     /** Whether to set "null" mode. */
     private boolean setNullMode;
@@ -189,12 +189,12 @@ public class GridGgfsModesSelfTest extends GridGgfsCommonAbstractTest {
      * @param modes Modes.
      */
     @SafeVarargs
-    final void pathModes(IgniteBiTuple<String, GridGgfsMode>... modes) {
+    final void pathModes(IgniteBiTuple<String, IgniteFsMode>... modes) {
         assert modes != null;
 
         pathModes = new LinkedHashMap<>(modes.length, 1.0f);
 
-        for (IgniteBiTuple<String, GridGgfsMode> mode : modes)
+        for (IgniteBiTuple<String, IgniteFsMode> mode : modes)
             pathModes.put(mode.getKey(), mode.getValue());
     }
 
@@ -477,14 +477,14 @@ public class GridGgfsModesSelfTest extends GridGgfsCommonAbstractTest {
      * @param expMode Expected mode.
      * @throws Exception If failed.
      */
-    private void checkMode(String pathStr, GridGgfsMode expMode) throws Exception {
+    private void checkMode(String pathStr, IgniteFsMode expMode) throws Exception {
         assert ggfs != null;
 
         IgniteFsPath path = new IgniteFsPath(pathStr);
 
         GridGgfsModeResolver rslvr = ggfs.modeResolver();
 
-        GridGgfsMode mode = rslvr.resolveMode(path);
+        IgniteFsMode mode = rslvr.resolveMode(path);
 
         assertEquals(expMode, mode);
     }
@@ -515,7 +515,7 @@ public class GridGgfsModesSelfTest extends GridGgfsCommonAbstractTest {
         ggfs.mkdirs(dir);
 
         // Create new file.
-        GridGgfsOutputStream os = ggfs.create(file, 1024, true, null, 0, 2048, null);
+        IgniteFsOutputStream os = ggfs.create(file, 1024, true, null, 0, 2048, null);
 
         os.write(testData1);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5e4cd4d8/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsPrimaryOffheapTieredSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsPrimaryOffheapTieredSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsPrimaryOffheapTieredSelfTest.java
index b42c2d9..302dc4a 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsPrimaryOffheapTieredSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsPrimaryOffheapTieredSelfTest.java
@@ -9,7 +9,7 @@
 
 package org.gridgain.grid.kernal.processors.ggfs;
 
-import static org.gridgain.grid.ggfs.GridGgfsMode.*;
+import static org.gridgain.grid.ggfs.IgniteFsMode.*;
 import static org.gridgain.grid.cache.GridCacheMemoryMode.*;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5e4cd4d8/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsPrimaryOffheapValuesSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsPrimaryOffheapValuesSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsPrimaryOffheapValuesSelfTest.java
index 4440975..86faae8 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsPrimaryOffheapValuesSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsPrimaryOffheapValuesSelfTest.java
@@ -9,7 +9,7 @@
 
 package org.gridgain.grid.kernal.processors.ggfs;
 
-import static org.gridgain.grid.ggfs.GridGgfsMode.*;
+import static org.gridgain.grid.ggfs.IgniteFsMode.*;
 import static org.gridgain.grid.cache.GridCacheMemoryMode.*;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5e4cd4d8/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsPrimarySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsPrimarySelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsPrimarySelfTest.java
index b0f3a6c..f39fe7b 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsPrimarySelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsPrimarySelfTest.java
@@ -9,7 +9,7 @@
 
 package org.gridgain.grid.kernal.processors.ggfs;
 
-import static org.gridgain.grid.ggfs.GridGgfsMode.*;
+import static org.gridgain.grid.ggfs.IgniteFsMode.*;
 
 /**
  * Tests for PRIMARY mode.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5e4cd4d8/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 3175792..d13a1c6 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
@@ -195,7 +195,7 @@ public class GridGgfsProcessorSelfTest extends GridGgfsCommonAbstractTest {
     public void testCreate() throws Exception {
         IgniteFsPath path = path("/file");
 
-        try (GridGgfsOutputStream os = ggfs.create(path, false)) {
+        try (IgniteFsOutputStream os = ggfs.create(path, false)) {
             assert os != null;
 
             IgniteFsFileImpl info = (IgniteFsFileImpl)ggfs.info(path);
@@ -422,7 +422,7 @@ public class GridGgfsProcessorSelfTest extends GridGgfsCommonAbstractTest {
         IgniteFsPath fileSubdir1 = path("/dir1/subdir1/file");
         IgniteFsPath fileDir2 = path("/dir2/file");
 
-        GridGgfsOutputStream os = ggfs.create(fileDir1, false);
+        IgniteFsOutputStream os = ggfs.create(fileDir1, false);
         os.write(new byte[1000]);
         os.close();
 
@@ -669,7 +669,7 @@ public class GridGgfsProcessorSelfTest extends GridGgfsCommonAbstractTest {
     public void testDeleteCacheConsistency() throws Exception {
         IgniteFsPath path = new IgniteFsPath("/someFile");
 
-        try (GridGgfsOutputStream out = ggfs.create(path, true)) {
+        try (IgniteFsOutputStream out = ggfs.create(path, true)) {
             out.write(new byte[10 * 1024 * 1024]);
         }
 
@@ -786,7 +786,7 @@ public class GridGgfsProcessorSelfTest extends GridGgfsCommonAbstractTest {
         for (int i = 0; i < buf.length; i++)
             buf[i] = (byte)(i * i);
 
-        GridGgfsOutputStream os = ggfs.create(path, bufSize, true, null, 0, 1024, null);
+        IgniteFsOutputStream os = ggfs.create(path, bufSize, true, null, 0, 1024, null);
 
         try {
             for (int i = 0; i < cnt; i++)
@@ -837,7 +837,7 @@ public class GridGgfsProcessorSelfTest extends GridGgfsCommonAbstractTest {
      */
     private String create(String path, boolean overwrite, String text) throws Exception {
 
-        try (GridGgfsOutputStream out = ggfs.create(path(path), overwrite)) {
+        try (IgniteFsOutputStream out = ggfs.create(path(path), overwrite)) {
             IOUtils.write(text, out, UTF_8);
         }
 
@@ -857,7 +857,7 @@ public class GridGgfsProcessorSelfTest extends GridGgfsCommonAbstractTest {
      */
     private String append(String path, boolean create, String text) throws Exception {
 
-        try (GridGgfsOutputStream out = ggfs.append(path(path), create)) {
+        try (IgniteFsOutputStream out = ggfs.append(path(path), create)) {
             IOUtils.write(text, out, UTF_8);
         }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5e4cd4d8/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 612a4a0..a1991c5 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
@@ -24,7 +24,7 @@ import java.util.*;
 
 import static org.gridgain.grid.cache.GridCacheAtomicityMode.*;
 import static org.gridgain.grid.cache.GridCacheMode.*;
-import static org.gridgain.grid.ggfs.GridGgfsMode.*;
+import static org.gridgain.grid.ggfs.IgniteFsMode.*;
 
 /**
  * Tests for node validation logic in {@link GridGgfsProcessor}.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5e4cd4d8/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 eff53d1..9dce0df 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
@@ -421,7 +421,7 @@ public class GridGgfsSizeSelfTest extends GridGgfsCommonAbstractTest {
         final IgniteFsPath path = new IgniteFsPath("/file");
 
         // This write is expected to be successful.
-        GridGgfsOutputStream os = ggfs(0).create(path, false);
+        IgniteFsOutputStream os = ggfs(0).create(path, false);
         os.write(chunk(BLOCK_SIZE - 1));
         os.close();
 
@@ -433,7 +433,7 @@ public class GridGgfsSizeSelfTest extends GridGgfsCommonAbstractTest {
         // This write must fail w/ exception.
         GridTestUtils.assertThrows(log(), new Callable<Object>() {
             @Override public Object call() throws Exception {
-                GridGgfsOutputStream osErr = ggfs(0).append(path, false);
+                IgniteFsOutputStream osErr = ggfs(0).append(path, false);
 
                 try {
                     osErr.write(chunk(BLOCK_SIZE));
@@ -453,7 +453,7 @@ public class GridGgfsSizeSelfTest extends GridGgfsCommonAbstractTest {
                     U.closeQuiet(osErr);
                 }
             }
-        }, GridGgfsOutOfSpaceException.class, "Failed to write data block (GGFS maximum data size exceeded) [used=" +
+        }, IgniteFsOutOfSpaceException.class, "Failed to write data block (GGFS maximum data size exceeded) [used=" +
             ggfsMaxData + ", allowed=" + ggfsMaxData + ']');
     }
 
@@ -476,7 +476,7 @@ public class GridGgfsSizeSelfTest extends GridGgfsCommonAbstractTest {
         final IgniteFsPath otherPath = new IgniteFsPath("/fileOther");
 
         // Fill cache with data up to it's limit.
-        GridGgfsOutputStream os = ggfs.create(path, false);
+        IgniteFsOutputStream os = ggfs.create(path, false);
         os.write(chunk((int)ggfsMaxData));
         os.close();
 
@@ -780,7 +780,7 @@ public class GridGgfsSizeSelfTest extends GridGgfsCommonAbstractTest {
 
             // Actual write.
             for (GgfsBlock block : blocks) {
-                GridGgfsOutputStream os = ggfs(0).append(path, false);
+                IgniteFsOutputStream os = ggfs(0).append(path, false);
 
                 os.write(chunk(block.length()));
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5e4cd4d8/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 d9f6f15..b79dca0 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
@@ -194,7 +194,7 @@ public class GridGgfsStreamsSelfTest extends GridGgfsCommonAbstractTest {
             idx++;
         }
 
-        try (GridGgfsOutputStream out = fs.create(path, 1024, true, affKey, 0, 1024, null)) {
+        try (IgniteFsOutputStream out = fs.create(path, 1024, true, affKey, 0, 1024, null)) {
             // Write 5M, should be enough to test distribution.
             for (int i = 0; i < 15; i++)
                 out.write(new byte[1024 * 1024]);
@@ -226,7 +226,7 @@ public class GridGgfsStreamsSelfTest extends GridGgfsCommonAbstractTest {
             IgniteFs fs1 = grid(1).fileSystem("ggfs");
             IgniteFs fs2 = grid(2).fileSystem("ggfs");
 
-            try (GridGgfsOutputStream out = fs0.create(path, 128, false, 1, CFG_GRP_SIZE,
+            try (IgniteFsOutputStream out = fs0.create(path, 128, false, 1, CFG_GRP_SIZE,
                 F.asMap(IgniteFs.PROP_PREFER_LOCAL_WRITES, "true"))) {
                 // 1.5 blocks
                 byte[] data = new byte[CFG_BLOCK_SIZE * 3 / 2];
@@ -236,7 +236,7 @@ public class GridGgfsStreamsSelfTest extends GridGgfsCommonAbstractTest {
                 out.write(data);
             }
 
-            try (GridGgfsOutputStream out = fs1.append(path, false)) {
+            try (IgniteFsOutputStream out = fs1.append(path, false)) {
                 // 1.5 blocks.
                 byte[] data = new byte[CFG_BLOCK_SIZE * 3 / 2];
 
@@ -318,7 +318,7 @@ public class GridGgfsStreamsSelfTest extends GridGgfsCommonAbstractTest {
 
                 IgniteFsPath f = new IgniteFsPath(path.parent(), "asdf" + (id > 1 ? "-" + id : ""));
 
-                try (GridGgfsOutputStream out = fs.create(f, 0, true, null, 0, 1024, null)) {
+                try (IgniteFsOutputStream out = fs.create(f, 0, true, null, 0, 1024, null)) {
                     assertNotNull(out);
 
                     cleanUp.add(f); // Add all created into cleanup list.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5e4cd4d8/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 8eb4dbb..641977a 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
@@ -32,7 +32,7 @@ import static org.gridgain.grid.cache.GridCacheAtomicityMode.*;
 import static org.gridgain.grid.cache.GridCacheDistributionMode.*;
 import static org.gridgain.grid.cache.GridCacheMode.*;
 import static org.gridgain.grid.cache.GridCacheWriteSynchronizationMode.*;
-import static org.gridgain.grid.ggfs.GridGgfsMode.*;
+import static org.gridgain.grid.ggfs.IgniteFsMode.*;
 
 /**
  * Tests for {@link GridGgfsTask}.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5e4cd4d8/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 d348944..9199576 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
@@ -26,7 +26,7 @@ import static org.gridgain.grid.cache.GridCacheAtomicityMode.*;
 import static org.gridgain.grid.cache.GridCacheDistributionMode.*;
 import static org.gridgain.grid.cache.GridCacheMode.*;
 import static org.gridgain.grid.cache.GridCacheWriteSynchronizationMode.*;
-import static org.gridgain.grid.ggfs.GridGgfsMode.*;
+import static org.gridgain.grid.ggfs.IgniteFsMode.*;
 
 /**
  * Base class for all split resolvers
@@ -156,7 +156,7 @@ public class GridGgfsAbstractRecordResolverSelfTest extends GridCommonAbstractTe
      * @throws Exception In case of exception.
      */
     protected void write(byte[]... chunks) throws Exception {
-        GridGgfsOutputStream os =  ggfs.create(FILE, true);
+        IgniteFsOutputStream os =  ggfs.create(FILE, true);
 
         if (chunks != null) {
             for (byte[] chunk : chunks)

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5e4cd4d8/modules/hadoop/src/main/java/org/gridgain/grid/ggfs/hadoop/v1/GridGgfsHadoopFileSystem.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/gridgain/grid/ggfs/hadoop/v1/GridGgfsHadoopFileSystem.java b/modules/hadoop/src/main/java/org/gridgain/grid/ggfs/hadoop/v1/GridGgfsHadoopFileSystem.java
index 09fd723..df55bb3 100644
--- a/modules/hadoop/src/main/java/org/gridgain/grid/ggfs/hadoop/v1/GridGgfsHadoopFileSystem.java
+++ b/modules/hadoop/src/main/java/org/gridgain/grid/ggfs/hadoop/v1/GridGgfsHadoopFileSystem.java
@@ -32,7 +32,7 @@ import java.util.concurrent.atomic.*;
 
 import static org.apache.ignite.IgniteFs.*;
 import static org.gridgain.grid.ggfs.IgniteFsConfiguration.*;
-import static org.gridgain.grid.ggfs.GridGgfsMode.*;
+import static org.gridgain.grid.ggfs.IgniteFsMode.*;
 import static org.gridgain.grid.ggfs.hadoop.GridGgfsHadoopParameters.*;
 import static org.gridgain.grid.kernal.ggfs.hadoop.GridGgfsHadoopUtils.*;
 
@@ -263,8 +263,8 @@ public class GridGgfsHadoopFileSystem extends FileSystem {
             boolean initSecondary = paths.defaultMode() == PROXY;
 
             if (paths.pathModes() != null && !paths.pathModes().isEmpty()) {
-                for (T2<IgniteFsPath, GridGgfsMode> pathMode : paths.pathModes()) {
-                    GridGgfsMode mode = pathMode.getValue();
+                for (T2<IgniteFsPath, IgniteFsMode> pathMode : paths.pathModes()) {
+                    IgniteFsMode mode = pathMode.getValue();
 
                     initSecondary |= mode == PROXY;
                 }
@@ -477,7 +477,7 @@ public class GridGgfsHadoopFileSystem extends FileSystem {
 
         try {
             IgniteFsPath path = convert(f);
-            GridGgfsMode mode = mode(path);
+            IgniteFsMode mode = mode(path);
 
             if (mode == PROXY) {
                 if (secondaryFs == null) {
@@ -545,7 +545,7 @@ public class GridGgfsHadoopFileSystem extends FileSystem {
 
         try {
             IgniteFsPath path = convert(f);
-            GridGgfsMode mode = mode(path);
+            IgniteFsMode mode = mode(path);
 
             if (LOG.isDebugEnabled())
                 LOG.debug("Opening output stream in create [thread=" + Thread.currentThread().getName() + "path=" +
@@ -623,7 +623,7 @@ public class GridGgfsHadoopFileSystem extends FileSystem {
 
         try {
             IgniteFsPath path = convert(f);
-            GridGgfsMode mode = mode(path);
+            IgniteFsMode mode = mode(path);
 
             if (LOG.isDebugEnabled())
                 LOG.debug("Opening output stream in append [thread=" + Thread.currentThread().getName() +
@@ -689,7 +689,7 @@ public class GridGgfsHadoopFileSystem extends FileSystem {
         try {
             IgniteFsPath srcPath = convert(src);
             IgniteFsPath dstPath = convert(dst);
-            GridGgfsMode mode = mode(srcPath);
+            IgniteFsMode mode = mode(srcPath);
 
             if (mode == PROXY) {
                 if (secondaryFs == null) {
@@ -740,7 +740,7 @@ public class GridGgfsHadoopFileSystem extends FileSystem {
 
         try {
             IgniteFsPath path = convert(f);
-            GridGgfsMode mode = mode(path);
+            IgniteFsMode mode = mode(path);
 
             if (mode == PROXY) {
                 if (secondaryFs == null) {
@@ -785,7 +785,7 @@ public class GridGgfsHadoopFileSystem extends FileSystem {
 
         try {
             IgniteFsPath path = convert(f);
-            GridGgfsMode mode = mode(path);
+            IgniteFsMode mode = mode(path);
 
             if (mode == PROXY) {
                 if (secondaryFs == null) {
@@ -899,7 +899,7 @@ public class GridGgfsHadoopFileSystem extends FileSystem {
 
         try {
             IgniteFsPath path = convert(f);
-            GridGgfsMode mode = mode(path);
+            IgniteFsMode mode = mode(path);
 
             if (mode == PROXY) {
                 if (secondaryFs == null) {
@@ -1051,7 +1051,7 @@ public class GridGgfsHadoopFileSystem extends FileSystem {
      * @param path HDFS path.
      * @return Path mode.
      */
-    public GridGgfsMode mode(Path path) {
+    public IgniteFsMode mode(Path path) {
         return mode(convert(path));
     }
 
@@ -1061,7 +1061,7 @@ public class GridGgfsHadoopFileSystem extends FileSystem {
      * @param path GGFS path.
      * @return Path mode.
      */
-    public GridGgfsMode mode(IgniteFsPath path) {
+    public IgniteFsMode mode(IgniteFsPath path) {
         return modeRslvr.resolveMode(path);
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5e4cd4d8/modules/hadoop/src/main/java/org/gridgain/grid/ggfs/hadoop/v2/GridGgfsHadoopFileSystem.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/gridgain/grid/ggfs/hadoop/v2/GridGgfsHadoopFileSystem.java b/modules/hadoop/src/main/java/org/gridgain/grid/ggfs/hadoop/v2/GridGgfsHadoopFileSystem.java
index 201adcf..31e4ced 100644
--- a/modules/hadoop/src/main/java/org/gridgain/grid/ggfs/hadoop/v2/GridGgfsHadoopFileSystem.java
+++ b/modules/hadoop/src/main/java/org/gridgain/grid/ggfs/hadoop/v2/GridGgfsHadoopFileSystem.java
@@ -32,7 +32,7 @@ import java.util.concurrent.atomic.*;
 
 import static org.apache.ignite.IgniteFs.*;
 import static org.gridgain.grid.ggfs.IgniteFsConfiguration.*;
-import static org.gridgain.grid.ggfs.GridGgfsMode.*;
+import static org.gridgain.grid.ggfs.IgniteFsMode.*;
 import static org.gridgain.grid.ggfs.hadoop.GridGgfsHadoopParameters.*;
 import static org.gridgain.grid.kernal.ggfs.hadoop.GridGgfsHadoopUtils.*;
 
@@ -258,8 +258,8 @@ public class GridGgfsHadoopFileSystem extends AbstractFileSystem implements Clos
             boolean initSecondary = paths.defaultMode() == PROXY;
 
             if (paths.pathModes() != null) {
-                for (T2<IgniteFsPath, GridGgfsMode> pathMode : paths.pathModes()) {
-                    GridGgfsMode mode = pathMode.getValue();
+                for (T2<IgniteFsPath, IgniteFsMode> pathMode : paths.pathModes()) {
+                    IgniteFsMode mode = pathMode.getValue();
 
                     initSecondary |= mode == PROXY;
                 }
@@ -422,7 +422,7 @@ public class GridGgfsHadoopFileSystem extends AbstractFileSystem implements Clos
 
         try {
             IgniteFsPath path = convert(f);
-            GridGgfsMode mode = modeRslvr.resolveMode(path);
+            IgniteFsMode mode = modeRslvr.resolveMode(path);
 
             if (mode == PROXY) {
                 FSDataInputStream is = secondaryFs.open(toSecondary(f), bufSize);
@@ -497,7 +497,7 @@ public class GridGgfsHadoopFileSystem extends AbstractFileSystem implements Clos
 
         try {
             IgniteFsPath path = convert(f);
-            GridGgfsMode mode = modeRslvr.resolveMode(path);
+            IgniteFsMode mode = modeRslvr.resolveMode(path);
 
             if (LOG.isDebugEnabled())
                 LOG.debug("Opening output stream in create [thread=" + Thread.currentThread().getName() + "path=" +
@@ -596,7 +596,7 @@ public class GridGgfsHadoopFileSystem extends AbstractFileSystem implements Clos
         try {
             IgniteFsPath srcPath = convert(src);
             IgniteFsPath dstPath = convert(dst);
-            Set<GridGgfsMode> childrenModes = modeRslvr.resolveChildrenModes(srcPath);
+            Set<IgniteFsMode> childrenModes = modeRslvr.resolveChildrenModes(srcPath);
 
             if (childrenModes.contains(PROXY)) {
                 if (clientLog.isLogEnabled())
@@ -623,8 +623,8 @@ public class GridGgfsHadoopFileSystem extends AbstractFileSystem implements Clos
 
         try {
             IgniteFsPath path = convert(f);
-            GridGgfsMode mode = modeRslvr.resolveMode(path);
-            Set<GridGgfsMode> childrenModes = modeRslvr.resolveChildrenModes(path);
+            IgniteFsMode mode = modeRslvr.resolveMode(path);
+            Set<IgniteFsMode> childrenModes = modeRslvr.resolveChildrenModes(path);
 
             if (childrenModes.contains(PROXY)) {
                 if (clientLog.isLogEnabled())
@@ -668,7 +668,7 @@ public class GridGgfsHadoopFileSystem extends AbstractFileSystem implements Clos
 
         try {
             IgniteFsPath path = convert(f);
-            GridGgfsMode mode = modeRslvr.resolveMode(path);
+            IgniteFsMode mode = modeRslvr.resolveMode(path);
 
             if (mode == PROXY) {
                 FileStatus[] arr = secondaryFs.listStatus(toSecondary(f));
@@ -728,7 +728,7 @@ public class GridGgfsHadoopFileSystem extends AbstractFileSystem implements Clos
 
         try {
             IgniteFsPath path = convert(f);
-            GridGgfsMode mode = modeRslvr.resolveMode(path);
+            IgniteFsMode mode = modeRslvr.resolveMode(path);
 
             if (mode == PROXY) {
                 if (clientLog.isLogEnabled())
@@ -811,7 +811,7 @@ public class GridGgfsHadoopFileSystem extends AbstractFileSystem implements Clos
      * @param path HDFS path.
      * @return Path mode.
      */
-    public GridGgfsMode mode(Path path) {
+    public IgniteFsMode mode(Path path) {
         return modeRslvr.resolveMode(convert(path));
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5e4cd4d8/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopFileSystemWrapper.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopFileSystemWrapper.java b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopFileSystemWrapper.java
index 091091a..ca08ca1 100644
--- a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopFileSystemWrapper.java
+++ b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopFileSystemWrapper.java
@@ -112,7 +112,7 @@ public class GridGgfsHadoopFileSystemWrapper implements IgniteFsFileSystem, Auto
         if (e instanceof FileNotFoundException)
             return new IgniteFsFileNotFoundException(e);
         else if (e instanceof ParentNotDirectoryException)
-            return new GridGgfsParentNotDirectoryException(msg, e);
+            return new IgniteFsParentNotDirectoryException(msg, e);
         else if (e instanceof PathIsNotEmptyDirectoryException)
             return new GridGgfsDirectoryNotEmptyException(e);
         else if (e instanceof PathExistsException)

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5e4cd4d8/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopInProc.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopInProc.java b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopInProc.java
index e14f9b9..b77c49a 100644
--- a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopInProc.java
+++ b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopInProc.java
@@ -221,7 +221,7 @@ public class GridGgfsHadoopInProc implements GridGgfsHadoopEx {
     @Override public GridGgfsHadoopStreamDelegate create(IgniteFsPath path, boolean overwrite, boolean colocate,
         int replication, long blockSize, @Nullable Map<String, String> props) throws GridException {
         try {
-            GridGgfsOutputStream stream = ggfs.create(path, bufSize, overwrite,
+            IgniteFsOutputStream stream = ggfs.create(path, bufSize, overwrite,
                 colocate ? ggfs.nextAffinityKey() : null, replication, blockSize, props);
 
             return new GridGgfsHadoopStreamDelegate(this, stream);
@@ -235,7 +235,7 @@ public class GridGgfsHadoopInProc implements GridGgfsHadoopEx {
     @Override public GridGgfsHadoopStreamDelegate append(IgniteFsPath path, boolean create,
         @Nullable Map<String, String> props) throws GridException {
         try {
-            GridGgfsOutputStream stream = ggfs.append(path, bufSize, create, props);
+            IgniteFsOutputStream stream = ggfs.append(path, bufSize, create, props);
 
             return new GridGgfsHadoopStreamDelegate(this, stream);
         }
@@ -288,7 +288,7 @@ public class GridGgfsHadoopInProc implements GridGgfsHadoopEx {
     @Override public void writeData(GridGgfsHadoopStreamDelegate delegate, byte[] data, int off, int len)
         throws IOException {
         try {
-            GridGgfsOutputStream stream = delegate.target();
+            IgniteFsOutputStream stream = delegate.target();
 
             stream.write(data, off, len);
         }
@@ -308,7 +308,7 @@ public class GridGgfsHadoopInProc implements GridGgfsHadoopEx {
     /** {@inheritDoc} */
     @Override public void flush(GridGgfsHadoopStreamDelegate delegate) throws IOException {
         try {
-            GridGgfsOutputStream stream = delegate.target();
+            IgniteFsOutputStream stream = delegate.target();
 
             stream.flush();
         }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5e4cd4d8/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopUtils.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopUtils.java b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopUtils.java
index 9d52a99..17442fd 100644
--- a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopUtils.java
+++ b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopUtils.java
@@ -104,7 +104,7 @@ public class GridGgfsHadoopUtils {
             return e.getCause(IOException.class);
         else if (e instanceof IgniteFsFileNotFoundException)
             return new FileNotFoundException(path); // TODO: Or PathNotFoundException?
-        else if (e instanceof GridGgfsParentNotDirectoryException)
+        else if (e instanceof IgniteFsParentNotDirectoryException)
             return new ParentNotDirectoryException(path);
         else if (path != null && e instanceof GridGgfsDirectoryNotEmptyException)
             return new PathIsNotEmptyDirectoryException(path);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5e4cd4d8/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsEventsTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsEventsTestSuite.java b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsEventsTestSuite.java
index 176ba85..b6655ad 100644
--- a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsEventsTestSuite.java
+++ b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsEventsTestSuite.java
@@ -20,7 +20,7 @@ import org.gridgain.grid.util.ipc.shmem.*;
 import org.gridgain.testframework.*;
 import org.jetbrains.annotations.*;
 
-import static org.gridgain.grid.ggfs.GridGgfsMode.*;
+import static org.gridgain.grid.ggfs.IgniteFsMode.*;
 
 /**
  * Test suite for GGFS event tests.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5e4cd4d8/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 edeec58..53fa471 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
@@ -41,7 +41,7 @@ import java.util.concurrent.atomic.*;
 import static org.gridgain.grid.cache.GridCacheAtomicityMode.*;
 import static org.gridgain.grid.cache.GridCacheMode.*;
 import static org.apache.ignite.events.IgniteEventType.*;
-import static org.gridgain.grid.ggfs.GridGgfsMode.*;
+import static org.gridgain.grid.ggfs.IgniteFsMode.*;
 
 /**
  * Hadoop 2.x compliant file system.
@@ -63,7 +63,7 @@ public abstract class GridGgfsHadoop20FileSystemAbstractSelfTest extends GridGgf
     private static AbstractFileSystem fs;
 
     /** Default GGFS mode. */
-    protected GridGgfsMode mode;
+    protected IgniteFsMode mode;
 
     /** Primary file system URI. */
     protected URI primaryFsUri;
@@ -76,7 +76,7 @@ public abstract class GridGgfsHadoop20FileSystemAbstractSelfTest extends GridGgf
      *
      * @param mode Default GGFS mode.
      */
-    protected GridGgfsHadoop20FileSystemAbstractSelfTest(GridGgfsMode mode) {
+    protected GridGgfsHadoop20FileSystemAbstractSelfTest(IgniteFsMode mode) {
         this.mode = mode;
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5e4cd4d8/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoop20FileSystemLoopbackPrimarySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoop20FileSystemLoopbackPrimarySelfTest.java b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoop20FileSystemLoopbackPrimarySelfTest.java
index f3159e4..8040ae2 100644
--- a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoop20FileSystemLoopbackPrimarySelfTest.java
+++ b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoop20FileSystemLoopbackPrimarySelfTest.java
@@ -9,7 +9,7 @@
 
 package org.gridgain.grid.ggfs;
 
-import static org.gridgain.grid.ggfs.GridGgfsMode.*;
+import static org.gridgain.grid.ggfs.IgniteFsMode.*;
 import static org.gridgain.grid.util.ipc.shmem.GridIpcSharedMemoryServerEndpoint.*;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5e4cd4d8/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoop20FileSystemShmemPrimarySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoop20FileSystemShmemPrimarySelfTest.java b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoop20FileSystemShmemPrimarySelfTest.java
index 81d5825..8b4d071 100644
--- a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoop20FileSystemShmemPrimarySelfTest.java
+++ b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoop20FileSystemShmemPrimarySelfTest.java
@@ -9,7 +9,7 @@
 
 package org.gridgain.grid.ggfs;
 
-import static org.gridgain.grid.ggfs.GridGgfsMode.*;
+import static org.gridgain.grid.ggfs.IgniteFsMode.*;
 import static org.gridgain.grid.util.ipc.shmem.GridIpcSharedMemoryServerEndpoint.*;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5e4cd4d8/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 1f05f16..4952fe7 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
@@ -29,7 +29,7 @@ import java.util.concurrent.*;
 
 import static org.gridgain.grid.cache.GridCacheAtomicityMode.*;
 import static org.gridgain.grid.cache.GridCacheMode.*;
-import static org.gridgain.grid.ggfs.GridGgfsMode.*;
+import static org.gridgain.grid.ggfs.IgniteFsMode.*;
 import static org.gridgain.grid.ggfs.hadoop.GridGgfsHadoopParameters.*;
 import static org.gridgain.grid.kernal.processors.ggfs.GridGgfsAbstractSelfTest.*;
 
@@ -83,14 +83,14 @@ public abstract class GridGgfsHadoopDualAbstractSelfTest extends GridGgfsCommonA
     protected static GridGgfsImpl ggfsSecondary;
 
     /** GGFS mode. */
-    protected final GridGgfsMode mode;
+    protected final IgniteFsMode mode;
 
     /**
      * Constructor.
      *
      * @param mode GGFS mode.
      */
-    protected GridGgfsHadoopDualAbstractSelfTest(GridGgfsMode mode) {
+    protected GridGgfsHadoopDualAbstractSelfTest(IgniteFsMode mode) {
         this.mode = mode;
         assert mode == DUAL_SYNC || mode == DUAL_ASYNC;
     }
@@ -106,7 +106,7 @@ public abstract class GridGgfsHadoopDualAbstractSelfTest extends GridGgfsCommonA
      * @return Started grid instance.
      * @throws Exception If failed.
      */
-    protected Ignite startGridWithGgfs(String gridName, String ggfsName, GridGgfsMode mode,
+    protected Ignite startGridWithGgfs(String gridName, String ggfsName, IgniteFsMode mode,
         @Nullable IgniteFsFileSystem secondaryFs, @Nullable String restCfg) throws Exception {
         IgniteFsConfiguration ggfsCfg = new IgniteFsConfiguration();
 
@@ -207,7 +207,7 @@ public abstract class GridGgfsHadoopDualAbstractSelfTest extends GridGgfsCommonA
         // Write enough data to the secondary file system.
         final int blockSize = GGFS_BLOCK_SIZE;
 
-        GridGgfsOutputStream out = ggfsSecondary.append(FILE, false);
+        IgniteFsOutputStream out = ggfsSecondary.append(FILE, false);
 
         int totalWritten = 0;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5e4cd4d8/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopDualAsyncSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopDualAsyncSelfTest.java b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopDualAsyncSelfTest.java
index d3b0ee5..88e2977 100644
--- a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopDualAsyncSelfTest.java
+++ b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopDualAsyncSelfTest.java
@@ -9,7 +9,7 @@
 
 package org.gridgain.grid.ggfs;
 
-import static org.gridgain.grid.ggfs.GridGgfsMode.*;
+import static org.gridgain.grid.ggfs.IgniteFsMode.*;
 
 /**
  * Tests for DUAL_ASYNC mode.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5e4cd4d8/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopDualSyncSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopDualSyncSelfTest.java b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopDualSyncSelfTest.java
index 2fd5877..ede366f 100644
--- a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopDualSyncSelfTest.java
+++ b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopDualSyncSelfTest.java
@@ -9,7 +9,7 @@
 
 package org.gridgain.grid.ggfs;
 
-import static org.gridgain.grid.ggfs.GridGgfsMode.*;
+import static org.gridgain.grid.ggfs.IgniteFsMode.*;
 
 /**
  * Tests for DUAL_SYNC mode.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5e4cd4d8/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 17e0960..d0d7188 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
@@ -44,7 +44,7 @@ import java.util.concurrent.atomic.*;
 import static org.gridgain.grid.cache.GridCacheAtomicityMode.*;
 import static org.gridgain.grid.cache.GridCacheMode.*;
 import static org.apache.ignite.events.IgniteEventType.*;
-import static org.gridgain.grid.ggfs.GridGgfsMode.*;
+import static org.gridgain.grid.ggfs.IgniteFsMode.*;
 
 /**
  * Test hadoop file system implementation.
@@ -88,7 +88,7 @@ public abstract class GridGgfsHadoopFileSystemAbstractSelfTest extends GridGgfsC
     private static FileSystem fs;
 
     /** Default GGFS mode. */
-    protected final GridGgfsMode mode;
+    protected final IgniteFsMode mode;
 
     /** Skip embedded mode flag. */
     private final boolean skipEmbed;
@@ -124,7 +124,7 @@ public abstract class GridGgfsHadoopFileSystemAbstractSelfTest extends GridGgfsC
      * @param skipLocShmem Whether to skip local shmem mode.
      * @param skipLocTcp Whether to skip local TCP mode.
      */
-    protected GridGgfsHadoopFileSystemAbstractSelfTest(GridGgfsMode mode, boolean skipEmbed, boolean skipLocShmem) {
+    protected GridGgfsHadoopFileSystemAbstractSelfTest(IgniteFsMode mode, boolean skipEmbed, boolean skipLocShmem) {
         this.mode = mode;
         this.skipEmbed = skipEmbed;
         this.skipLocShmem = skipLocShmem;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5e4cd4d8/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemHandshakeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemHandshakeSelfTest.java b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemHandshakeSelfTest.java
index 1c8c59f..ce54dfb 100644
--- a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemHandshakeSelfTest.java
+++ b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemHandshakeSelfTest.java
@@ -31,7 +31,7 @@ import static org.gridgain.grid.cache.GridCacheAtomicityMode.*;
 import static org.gridgain.grid.cache.GridCacheDistributionMode.*;
 import static org.gridgain.grid.cache.GridCacheMode.*;
 import static org.gridgain.grid.cache.GridCacheWriteSynchronizationMode.*;
-import static org.gridgain.grid.ggfs.GridGgfsMode.*;
+import static org.gridgain.grid.ggfs.IgniteFsMode.*;
 import static org.gridgain.grid.kernal.ggfs.hadoop.GridGgfsHadoopUtils.*;
 import static org.gridgain.grid.util.ipc.shmem.GridIpcSharedMemoryServerEndpoint.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5e4cd4d8/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemLoggerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemLoggerSelfTest.java b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemLoggerSelfTest.java
index ad016b9..182dc49 100644
--- a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemLoggerSelfTest.java
+++ b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemLoggerSelfTest.java
@@ -16,7 +16,7 @@ import org.gridgain.grid.util.typedef.internal.*;
 import java.io.*;
 import java.util.*;
 
-import static org.gridgain.grid.ggfs.GridGgfsMode.*;
+import static org.gridgain.grid.ggfs.IgniteFsMode.*;
 import static org.gridgain.grid.kernal.ggfs.common.GridGgfsLogger.*;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5e4cd4d8/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemLoggerStateSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemLoggerStateSelfTest.java b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemLoggerStateSelfTest.java
index 03d55e3..dabfca9 100644
--- a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemLoggerStateSelfTest.java
+++ b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemLoggerStateSelfTest.java
@@ -29,7 +29,7 @@ import java.nio.file.*;
 
 import static org.gridgain.grid.cache.GridCacheAtomicityMode.*;
 import static org.gridgain.grid.cache.GridCacheMode.*;
-import static org.gridgain.grid.ggfs.GridGgfsMode.*;
+import static org.gridgain.grid.ggfs.IgniteFsMode.*;
 import static org.gridgain.grid.ggfs.hadoop.GridGgfsHadoopParameters.*;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5e4cd4d8/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemLoopbackAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemLoopbackAbstractSelfTest.java b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemLoopbackAbstractSelfTest.java
index d2a3e89..83cd2b9 100644
--- a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemLoopbackAbstractSelfTest.java
+++ b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemLoopbackAbstractSelfTest.java
@@ -22,7 +22,7 @@ public abstract class GridGgfsHadoopFileSystemLoopbackAbstractSelfTest extends
      * @param mode GGFS mode.
      * @param skipEmbed Skip embedded mode flag.
      */
-    protected GridGgfsHadoopFileSystemLoopbackAbstractSelfTest(GridGgfsMode mode, boolean skipEmbed) {
+    protected GridGgfsHadoopFileSystemLoopbackAbstractSelfTest(IgniteFsMode mode, boolean skipEmbed) {
         super(mode, skipEmbed, true);
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5e4cd4d8/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemLoopbackEmbeddedDualAsyncSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemLoopbackEmbeddedDualAsyncSelfTest.java b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemLoopbackEmbeddedDualAsyncSelfTest.java
index 487aa3d..2450d73 100644
--- a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemLoopbackEmbeddedDualAsyncSelfTest.java
+++ b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemLoopbackEmbeddedDualAsyncSelfTest.java
@@ -7,7 +7,7 @@
 
 package org.gridgain.grid.ggfs;
 
-import static org.gridgain.grid.ggfs.GridGgfsMode.*;
+import static org.gridgain.grid.ggfs.IgniteFsMode.*;
 
 /**
  * GGFS Hadoop file system IPC loopback self test in DUAL_ASYNC mode.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5e4cd4d8/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemLoopbackEmbeddedDualSyncSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemLoopbackEmbeddedDualSyncSelfTest.java b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemLoopbackEmbeddedDualSyncSelfTest.java
index fca7f2a..76da390 100644
--- a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemLoopbackEmbeddedDualSyncSelfTest.java
+++ b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemLoopbackEmbeddedDualSyncSelfTest.java
@@ -7,7 +7,7 @@
 
 package org.gridgain.grid.ggfs;
 
-import static org.gridgain.grid.ggfs.GridGgfsMode.*;
+import static org.gridgain.grid.ggfs.IgniteFsMode.*;
 
 /**
  * GGFS Hadoop file system IPC loopback self test in DUAL_SYNC mode.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5e4cd4d8/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemLoopbackEmbeddedPrimarySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemLoopbackEmbeddedPrimarySelfTest.java b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemLoopbackEmbeddedPrimarySelfTest.java
index 2b2efb4..4675501 100644
--- a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemLoopbackEmbeddedPrimarySelfTest.java
+++ b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemLoopbackEmbeddedPrimarySelfTest.java
@@ -9,7 +9,7 @@
 
 package org.gridgain.grid.ggfs;
 
-import static org.gridgain.grid.ggfs.GridGgfsMode.*;
+import static org.gridgain.grid.ggfs.IgniteFsMode.*;
 
 /**
  * GGFS Hadoop file system IPC loopback self test in PRIMARY mode.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5e4cd4d8/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemLoopbackEmbeddedSecondarySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemLoopbackEmbeddedSecondarySelfTest.java b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemLoopbackEmbeddedSecondarySelfTest.java
index c25f01a..e914278 100644
--- a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemLoopbackEmbeddedSecondarySelfTest.java
+++ b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemLoopbackEmbeddedSecondarySelfTest.java
@@ -9,7 +9,7 @@
 
 package org.gridgain.grid.ggfs;
 
-import static org.gridgain.grid.ggfs.GridGgfsMode.*;
+import static org.gridgain.grid.ggfs.IgniteFsMode.*;
 
 /**
  * GGFS Hadoop file system IPC loopback self test in SECONDARY mode.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5e4cd4d8/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemLoopbackExternalDualAsyncSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemLoopbackExternalDualAsyncSelfTest.java b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemLoopbackExternalDualAsyncSelfTest.java
index 7ead3de..eab8491 100644
--- a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemLoopbackExternalDualAsyncSelfTest.java
+++ b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemLoopbackExternalDualAsyncSelfTest.java
@@ -7,7 +7,7 @@
 
 package org.gridgain.grid.ggfs;
 
-import static org.gridgain.grid.ggfs.GridGgfsMode.*;
+import static org.gridgain.grid.ggfs.IgniteFsMode.*;
 
 /**
  * GGFS Hadoop file system IPC loopback self test in DUAL_ASYNC mode.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5e4cd4d8/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemLoopbackExternalDualSyncSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemLoopbackExternalDualSyncSelfTest.java b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemLoopbackExternalDualSyncSelfTest.java
index c4e60b2..f970dd7 100644
--- a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemLoopbackExternalDualSyncSelfTest.java
+++ b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemLoopbackExternalDualSyncSelfTest.java
@@ -7,7 +7,7 @@
 
 package org.gridgain.grid.ggfs;
 
-import static org.gridgain.grid.ggfs.GridGgfsMode.*;
+import static org.gridgain.grid.ggfs.IgniteFsMode.*;
 
 /**
  * GGFS Hadoop file system IPC loopback self test in DUAL_SYNC mode.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5e4cd4d8/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemLoopbackExternalPrimarySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemLoopbackExternalPrimarySelfTest.java b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemLoopbackExternalPrimarySelfTest.java
index 6917376..b350feb 100644
--- a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemLoopbackExternalPrimarySelfTest.java
+++ b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemLoopbackExternalPrimarySelfTest.java
@@ -9,7 +9,7 @@
 
 package org.gridgain.grid.ggfs;
 
-import static org.gridgain.grid.ggfs.GridGgfsMode.*;
+import static org.gridgain.grid.ggfs.IgniteFsMode.*;
 
 /**
  * GGFS Hadoop file system IPC loopback self test in PRIMARY mode.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5e4cd4d8/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemLoopbackExternalSecondarySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemLoopbackExternalSecondarySelfTest.java b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemLoopbackExternalSecondarySelfTest.java
index 0967608..9682207 100644
--- a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemLoopbackExternalSecondarySelfTest.java
+++ b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemLoopbackExternalSecondarySelfTest.java
@@ -9,7 +9,7 @@
 
 package org.gridgain.grid.ggfs;
 
-import static org.gridgain.grid.ggfs.GridGgfsMode.*;
+import static org.gridgain.grid.ggfs.IgniteFsMode.*;
 
 /**
  * GGFS Hadoop file system IPC loopback self test in SECONDARY mode.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5e4cd4d8/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemSecondaryModeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemSecondaryModeSelfTest.java b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemSecondaryModeSelfTest.java
index 09bf434..15270d3 100644
--- a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemSecondaryModeSelfTest.java
+++ b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemSecondaryModeSelfTest.java
@@ -28,7 +28,7 @@ import java.util.*;
 
 import static org.gridgain.grid.cache.GridCacheAtomicityMode.*;
 import static org.gridgain.grid.cache.GridCacheMode.*;
-import static org.gridgain.grid.ggfs.GridGgfsMode.*;
+import static org.gridgain.grid.ggfs.IgniteFsMode.*;
 
 /**
  * Ensures correct modes resolution for SECONDARY paths.
@@ -44,10 +44,10 @@ public class GridGgfsHadoopFileSystemSecondaryModeSelfTest extends GridGgfsCommo
     private static final String PATTERN_NOT_MATCHES = "/files";
 
     /** Default GGFS mode. */
-    private GridGgfsMode mode;
+    private IgniteFsMode mode;
 
     /** Path modes. */
-    private Map<String, GridGgfsMode> pathModes;
+    private Map<String, IgniteFsMode> pathModes;
 
     /** File system. */
     private GridGgfsHadoopFileSystem fs;
@@ -283,12 +283,12 @@ public class GridGgfsHadoopFileSystemSecondaryModeSelfTest extends GridGgfsCommo
      * @param modes Modes.
      */
     @SafeVarargs
-    final void pathModes(IgniteBiTuple<String, GridGgfsMode>... modes) {
+    final void pathModes(IgniteBiTuple<String, IgniteFsMode>... modes) {
         assert modes != null;
 
         pathModes = new LinkedHashMap<>(modes.length, 1.0f);
 
-        for (IgniteBiTuple<String, GridGgfsMode> mode : modes)
+        for (IgniteBiTuple<String, IgniteFsMode> mode : modes)
             pathModes.put(mode.getKey(), mode.getValue());
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5e4cd4d8/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemShmemAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemShmemAbstractSelfTest.java b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemShmemAbstractSelfTest.java
index 3458695..d0693e4 100644
--- a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemShmemAbstractSelfTest.java
+++ b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemShmemAbstractSelfTest.java
@@ -29,7 +29,7 @@ public abstract class GridGgfsHadoopFileSystemShmemAbstractSelfTest extends Grid
      * @param mode GGFS mode.
      * @param skipEmbed Skip embedded mode flag.
      */
-    protected GridGgfsHadoopFileSystemShmemAbstractSelfTest(GridGgfsMode mode, boolean skipEmbed) {
+    protected GridGgfsHadoopFileSystemShmemAbstractSelfTest(IgniteFsMode mode, boolean skipEmbed) {
         super(mode, skipEmbed, false);
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5e4cd4d8/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemShmemEmbeddedDualAsyncSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemShmemEmbeddedDualAsyncSelfTest.java b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemShmemEmbeddedDualAsyncSelfTest.java
index a9d7e53..e89885c 100644
--- a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemShmemEmbeddedDualAsyncSelfTest.java
+++ b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemShmemEmbeddedDualAsyncSelfTest.java
@@ -7,7 +7,7 @@
 
 package org.gridgain.grid.ggfs;
 
-import static org.gridgain.grid.ggfs.GridGgfsMode.*;
+import static org.gridgain.grid.ggfs.IgniteFsMode.*;
 
 /**
  * GGFS Hadoop file system IPC shmem self test in DUAL_ASYNC mode.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5e4cd4d8/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemShmemEmbeddedDualSyncSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemShmemEmbeddedDualSyncSelfTest.java b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemShmemEmbeddedDualSyncSelfTest.java
index a7c2003..f03a997 100644
--- a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemShmemEmbeddedDualSyncSelfTest.java
+++ b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemShmemEmbeddedDualSyncSelfTest.java
@@ -7,7 +7,7 @@
 
 package org.gridgain.grid.ggfs;
 
-import static org.gridgain.grid.ggfs.GridGgfsMode.*;
+import static org.gridgain.grid.ggfs.IgniteFsMode.*;
 
 /**
  * GGFS Hadoop file system IPC shmem self test in DUAL_SYNC mode.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5e4cd4d8/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemShmemEmbeddedPrimarySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemShmemEmbeddedPrimarySelfTest.java b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemShmemEmbeddedPrimarySelfTest.java
index 01897db..d97dde7 100644
--- a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemShmemEmbeddedPrimarySelfTest.java
+++ b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemShmemEmbeddedPrimarySelfTest.java
@@ -7,7 +7,7 @@
 
 package org.gridgain.grid.ggfs;
 
-import static org.gridgain.grid.ggfs.GridGgfsMode.*;
+import static org.gridgain.grid.ggfs.IgniteFsMode.*;
 
 /**
  * GGFS Hadoop file system IPC shmem self test in PRIMARY mode.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5e4cd4d8/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemShmemEmbeddedSecondarySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemShmemEmbeddedSecondarySelfTest.java b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemShmemEmbeddedSecondarySelfTest.java
index e3bbea2..27ac2e3 100644
--- a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemShmemEmbeddedSecondarySelfTest.java
+++ b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemShmemEmbeddedSecondarySelfTest.java
@@ -7,7 +7,7 @@
 
 package org.gridgain.grid.ggfs;
 
-import static org.gridgain.grid.ggfs.GridGgfsMode.*;
+import static org.gridgain.grid.ggfs.IgniteFsMode.*;
 
 /**
  * GGFS Hadoop file system IPC shmem self test in SECONDARY mode.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5e4cd4d8/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemShmemExternalDualAsyncSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemShmemExternalDualAsyncSelfTest.java b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemShmemExternalDualAsyncSelfTest.java
index 3d66a3e..fd70c03 100644
--- a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemShmemExternalDualAsyncSelfTest.java
+++ b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemShmemExternalDualAsyncSelfTest.java
@@ -7,7 +7,7 @@
 
 package org.gridgain.grid.ggfs;
 
-import static org.gridgain.grid.ggfs.GridGgfsMode.*;
+import static org.gridgain.grid.ggfs.IgniteFsMode.*;
 
 /**
  * GGFS Hadoop file system IPC shmem self test in DUAL_ASYNC mode.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5e4cd4d8/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemShmemExternalDualSyncSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemShmemExternalDualSyncSelfTest.java b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemShmemExternalDualSyncSelfTest.java
index 3034be1..4e6a53f 100644
--- a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemShmemExternalDualSyncSelfTest.java
+++ b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemShmemExternalDualSyncSelfTest.java
@@ -7,7 +7,7 @@
 
 package org.gridgain.grid.ggfs;
 
-import static org.gridgain.grid.ggfs.GridGgfsMode.*;
+import static org.gridgain.grid.ggfs.IgniteFsMode.*;
 
 /**
  * GGFS Hadoop file system IPC shmem self test in DUAL_SYNC mode.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5e4cd4d8/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemShmemExternalPrimarySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemShmemExternalPrimarySelfTest.java b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemShmemExternalPrimarySelfTest.java
index d185de5..8f14dde 100644
--- a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemShmemExternalPrimarySelfTest.java
+++ b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemShmemExternalPrimarySelfTest.java
@@ -7,7 +7,7 @@
 
 package org.gridgain.grid.ggfs;
 
-import static org.gridgain.grid.ggfs.GridGgfsMode.*;
+import static org.gridgain.grid.ggfs.IgniteFsMode.*;
 
 /**
  * GGFS Hadoop file system IPC shmem self test in PRIMARY mode.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5e4cd4d8/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemShmemExternalSecondarySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemShmemExternalSecondarySelfTest.java b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemShmemExternalSecondarySelfTest.java
index e7e2d96..7e602e5 100644
--- a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemShmemExternalSecondarySelfTest.java
+++ b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemShmemExternalSecondarySelfTest.java
@@ -7,7 +7,7 @@
 
 package org.gridgain.grid.ggfs;
 
-import static org.gridgain.grid.ggfs.GridGgfsMode.*;
+import static org.gridgain.grid.ggfs.IgniteFsMode.*;
 
 /**
  * GGFS Hadoop file system IPC shmem self test in SECONDARY mode.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5e4cd4d8/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopDefaultMapReducePlannerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopDefaultMapReducePlannerSelfTest.java b/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopDefaultMapReducePlannerSelfTest.java
index 1679f80..b131f20 100644
--- a/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopDefaultMapReducePlannerSelfTest.java
+++ b/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopDefaultMapReducePlannerSelfTest.java
@@ -818,30 +818,30 @@ public class GridHadoopDefaultMapReducePlannerSelfTest extends GridHadoopAbstrac
         }
 
         /** {@inheritDoc} */
-        @Override public GridGgfsOutputStream create(IgniteFsPath path, boolean overwrite) throws GridException {
+        @Override public IgniteFsOutputStream create(IgniteFsPath path, boolean overwrite) throws GridException {
             return null;
         }
 
         /** {@inheritDoc} */
-        @Override public GridGgfsOutputStream create(IgniteFsPath path, int bufSize, boolean overwrite, int replication,
+        @Override public IgniteFsOutputStream create(IgniteFsPath path, int bufSize, boolean overwrite, int replication,
             long blockSize, @Nullable Map<String, String> props) throws GridException {
             return null;
         }
 
         /** {@inheritDoc} */
-        @Override public GridGgfsOutputStream create(IgniteFsPath path, int bufSize, boolean overwrite,
+        @Override public IgniteFsOutputStream create(IgniteFsPath path, int bufSize, boolean overwrite,
             @Nullable IgniteUuid affKey, int replication, long blockSize, @Nullable Map<String, String> props)
             throws GridException {
             return null;
         }
 
         /** {@inheritDoc} */
-        @Override public GridGgfsOutputStream append(IgniteFsPath path, boolean create) throws GridException {
+        @Override public IgniteFsOutputStream append(IgniteFsPath path, boolean create) throws GridException {
             return null;
         }
 
         /** {@inheritDoc} */
-        @Override public GridGgfsOutputStream append(IgniteFsPath path, int bufSize, boolean create,
+        @Override public IgniteFsOutputStream append(IgniteFsPath path, int bufSize, boolean create,
             @Nullable Map<String, String> props) throws GridException {
             return null;
         }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5e4cd4d8/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/GridHadoopExternalTaskExecutionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/GridHadoopExternalTaskExecutionSelfTest.java b/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/GridHadoopExternalTaskExecutionSelfTest.java
index fe20f71..352a185 100644
--- a/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/GridHadoopExternalTaskExecutionSelfTest.java
+++ b/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/GridHadoopExternalTaskExecutionSelfTest.java
@@ -143,7 +143,7 @@ public class GridHadoopExternalTaskExecutionSelfTest extends GridHadoopAbstractS
     private void prepareTestFile(String filePath) throws Exception {
         IgniteFs ggfs = grid(0).fileSystem(ggfsName);
 
-        try (GridGgfsOutputStream out = ggfs.create(new IgniteFsPath(filePath), true)) {
+        try (IgniteFsOutputStream out = ggfs.create(new IgniteFsPath(filePath), true)) {
             PrintWriter wr = new PrintWriter(new OutputStreamWriter(out));
 
             for (int i = 0; i < 1000; i++)


Mime
View raw message