ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From voze...@apache.org
Subject [52/57] [abbrv] incubator-ignite git commit: # IGNITE-226: WIP (13)
Date Fri, 13 Feb 2015 10:55:02 GMT
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/88bf1443/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorGgfsConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorGgfsConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorGgfsConfiguration.java
index ac19abe..321f2b5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorGgfsConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorGgfsConfiguration.java
@@ -125,7 +125,7 @@ public class VisorGgfsConfiguration implements Serializable {
      * @param ggfs GGFS configuration.
      * @return Data transfer object for GGFS configuration properties.
      */
-    public static VisorGgfsConfiguration from(IgniteFsConfiguration ggfs) {
+    public static VisorGgfsConfiguration from(IgfsConfiguration ggfs) {
         VisorGgfsConfiguration cfg = new VisorGgfsConfiguration();
 
         cfg.name(ggfs.getName());
@@ -176,13 +176,13 @@ public class VisorGgfsConfiguration implements Serializable {
      * @param ggfss ggfs configurations.
      * @return ggfs configurations properties.
      */
-    public static Iterable<VisorGgfsConfiguration> list(IgniteFsConfiguration[] ggfss) {
+    public static Iterable<VisorGgfsConfiguration> list(IgfsConfiguration[] ggfss) {
         if (ggfss == null)
             return Collections.emptyList();
 
         final Collection<VisorGgfsConfiguration> cfgs = new ArrayList<>(ggfss.length);
 
-        for (IgniteFsConfiguration ggfs : ggfss)
+        for (IgfsConfiguration ggfs : ggfss)
             cfgs.add(from(ggfs));
 
         return cfgs;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/88bf1443/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorTaskUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorTaskUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorTaskUtils.java
index 4ab417b..a0e4871 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorTaskUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorTaskUtils.java
@@ -45,7 +45,7 @@ import java.util.concurrent.atomic.*;
 
 import static java.lang.System.*;
 import static org.apache.ignite.events.EventType.*;
-import static org.apache.ignite.configuration.IgniteFsConfiguration.*;
+import static org.apache.ignite.configuration.IgfsConfiguration.*;
 
 /**
  * Contains utility methods for Visor tasks and jobs.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/88bf1443/modules/core/src/test/config/ggfs-loopback.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/config/ggfs-loopback.xml b/modules/core/src/test/config/ggfs-loopback.xml
index e18b67e..64bbd81 100644
--- a/modules/core/src/test/config/ggfs-loopback.xml
+++ b/modules/core/src/test/config/ggfs-loopback.xml
@@ -80,7 +80,7 @@
 
         <property name="ggfsConfiguration">
             <list>
-                <bean class="org.apache.ignite.configuration.IgniteFsConfiguration">
+                <bean class="org.apache.ignite.configuration.IgfsConfiguration">
                     <property name="name" value="ggfs"/>
                     <property name="metaCacheName" value="ggfs-meta"/>
                     <property name="dataCacheName" value="ggfs-data"/>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/88bf1443/modules/core/src/test/config/ggfs-shmem.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/config/ggfs-shmem.xml b/modules/core/src/test/config/ggfs-shmem.xml
index 6b5b4a2..67c770d 100644
--- a/modules/core/src/test/config/ggfs-shmem.xml
+++ b/modules/core/src/test/config/ggfs-shmem.xml
@@ -80,7 +80,7 @@
 
         <property name="ggfsConfiguration">
             <list>
-                <bean class="org.apache.ignite.configuration.IgniteFsConfiguration">
+                <bean class="org.apache.ignite.configuration.IgfsConfiguration">
                     <property name="name" value="ggfs"/>
                     <property name="metaCacheName" value="ggfs-meta"/>
                     <property name="dataCacheName" value="ggfs-data"/>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/88bf1443/modules/core/src/test/java/org/apache/ignite/ignitefs/IgfsEventsAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/ignitefs/IgfsEventsAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/ignitefs/IgfsEventsAbstractSelfTest.java
index 45ef65e..7259ced 100644
--- a/modules/core/src/test/java/org/apache/ignite/ignitefs/IgfsEventsAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/ignitefs/IgfsEventsAbstractSelfTest.java
@@ -84,8 +84,8 @@ public abstract class IgfsEventsAbstractSelfTest extends GridCommonAbstractTest
     /**
      * @return GGFS configuration for this test.
      */
-    protected IgniteFsConfiguration getGgfsConfiguration() throws IgniteCheckedException {
-        IgniteFsConfiguration ggfsCfg = new IgniteFsConfiguration();
+    protected IgfsConfiguration getGgfsConfiguration() throws IgniteCheckedException {
+        IgfsConfiguration ggfsCfg = new IgfsConfiguration();
 
         ggfsCfg.setDataCacheName("dataCache");
         ggfsCfg.setMetaCacheName("metaCache");
@@ -109,7 +109,7 @@ public abstract class IgfsEventsAbstractSelfTest extends GridCommonAbstractTest
      * @return Grid configuration.
      * @throws Exception If failed.
      */
-    protected IgniteConfiguration getConfiguration(String gridName, IgniteFsConfiguration ggfsCfg) throws Exception {
+    protected IgniteConfiguration getConfiguration(String gridName, IgfsConfiguration ggfsCfg) throws Exception {
         IgniteConfiguration cfg = IgnitionEx.loadConfiguration("config/hadoop/default-config.xml").get1();
 
         assert cfg != null;
@@ -221,39 +221,39 @@ public abstract class IgfsEventsAbstractSelfTest extends GridCommonAbstractTest
 
         assertEquals(evtsCnt, evtList.size());
 
-        IgniteFsEvent evt = (IgniteFsEvent)evtList.get(0);
+        IgfsEvent evt = (IgfsEvent)evtList.get(0);
         assertEquals(EVT_GGFS_DIR_CREATED, evt.type());
         assertEquals(new IgfsPath("/dir1"), evt.path());
         assertTrue(evt.isDirectory());
 
-        evt = (IgniteFsEvent)evtList.get(1);
+        evt = (IgfsEvent)evtList.get(1);
         assertEquals(EVT_GGFS_DIR_CREATED, evt.type());
         assertEquals(new IgfsPath("/dir1/dir2"), evt.path());
 
-        evt = (IgniteFsEvent)evtList.get(2);
+        evt = (IgfsEvent)evtList.get(2);
         assertEquals(EVT_GGFS_DIR_CREATED, evt.type());
         assertEquals(new IgfsPath("/dir1/dir2/dir3"), evt.path());
 
-        evt = (IgniteFsEvent)evtList.get(3);
+        evt = (IgfsEvent)evtList.get(3);
         assertEquals(EVT_GGFS_FILE_CREATED, evt.type());
         assertEquals(new IgfsPath("/dir1/dir2/dir3/file1"), evt.path());
         assertFalse(evt.isDirectory());
 
-        evt = (IgniteFsEvent)evtList.get(4);
+        evt = (IgfsEvent)evtList.get(4);
         assertEquals(EVT_GGFS_FILE_OPENED_WRITE, evt.type());
         assertEquals(new IgfsPath("/dir1/dir2/dir3/file1"), evt.path());
 
-        evt = (IgniteFsEvent)evtList.get(5);
+        evt = (IgfsEvent)evtList.get(5);
         assertEquals(EVT_GGFS_FILE_CLOSED_WRITE, evt.type());
         assertEquals(new IgfsPath("/dir1/dir2/dir3/file1"), evt.path());
         assertEquals(0, evt.dataSize());
 
-        evt = (IgniteFsEvent)evtList.get(6);
+        evt = (IgfsEvent)evtList.get(6);
         assertEquals(EVT_GGFS_FILE_RENAMED, evt.type());
         assertEquals(new IgfsPath("/dir1/dir2/dir3/file1"), evt.path());
         assertEquals(new IgfsPath("/dir1/dir2/dir3/mvFile1"), evt.newPath());
 
-        evt = (IgniteFsEvent)evtList.get(7);
+        evt = (IgfsEvent)evtList.get(7);
         assertEquals(EVT_GGFS_DIR_DELETED, evt.type());
         assertEquals(new IgfsPath("/dir1/dir2"), evt.path());
     }
@@ -303,38 +303,38 @@ public abstract class IgfsEventsAbstractSelfTest extends GridCommonAbstractTest
 
         assertEquals(evtsCnt, evtList.size());
 
-        IgniteFsEvent evt = (IgniteFsEvent)evtList.get(0);
+        IgfsEvent evt = (IgfsEvent)evtList.get(0);
         assertEquals(EVT_GGFS_DIR_CREATED, evt.type());
         assertEquals(new IgfsPath("/dir1"), evt.path());
         assertTrue(evt.isDirectory());
 
-        evt = (IgniteFsEvent)evtList.get(1);
+        evt = (IgfsEvent)evtList.get(1);
         assertEquals(EVT_GGFS_FILE_CREATED, evt.type());
         assertEquals(new IgfsPath("/dir1/file1"), evt.path());
         assertFalse(evt.isDirectory());
 
-        evt = (IgniteFsEvent)evtList.get(2);
+        evt = (IgfsEvent)evtList.get(2);
         assertEquals(EVT_GGFS_FILE_OPENED_WRITE, evt.type());
         assertEquals(new IgfsPath("/dir1/file1"), evt.path());
 
-        evt = (IgniteFsEvent)evtList.get(3);
+        evt = (IgfsEvent)evtList.get(3);
         assertEquals(EVT_GGFS_FILE_CLOSED_WRITE, evt.type());
         assertEquals(new IgfsPath("/dir1/file1"), evt.path());
 
-        evt = (IgniteFsEvent)evtList.get(4);
+        evt = (IgfsEvent)evtList.get(4);
         assertEquals(EVT_GGFS_FILE_CREATED, evt.type());
         assertEquals(new IgfsPath("/dir1/file2"), evt.path());
         assertFalse(evt.isDirectory());
 
-        evt = (IgniteFsEvent)evtList.get(5);
+        evt = (IgfsEvent)evtList.get(5);
         assertEquals(EVT_GGFS_FILE_OPENED_WRITE, evt.type());
         assertEquals(new IgfsPath("/dir1/file2"), evt.path());
 
-        evt = (IgniteFsEvent)evtList.get(6);
+        evt = (IgfsEvent)evtList.get(6);
         assertEquals(EVT_GGFS_FILE_CLOSED_WRITE, evt.type());
         assertEquals(new IgfsPath("/dir1/file2"), evt.path());
 
-        evt = (IgniteFsEvent)evtList.get(7);
+        evt = (IgfsEvent)evtList.get(7);
         assertEquals(EVT_GGFS_DIR_DELETED, evt.type());
         assertEquals(new IgfsPath("/dir1"), evt.path());
     }
@@ -380,18 +380,18 @@ public abstract class IgfsEventsAbstractSelfTest extends GridCommonAbstractTest
 
         assertEquals(evtsCnt, evtList.size());
 
-        IgniteFsEvent evt = (IgniteFsEvent)evtList.get(0);
+        IgfsEvent evt = (IgfsEvent)evtList.get(0);
         assertEquals(EVT_GGFS_DIR_CREATED, evt.type());
         assertEquals(new IgfsPath("/dir1"), evt.path());
         assertTrue(evt.isDirectory());
 
-        evt = (IgniteFsEvent)evtList.get(1);
+        evt = (IgfsEvent)evtList.get(1);
         assertEquals(EVT_GGFS_DIR_RENAMED, evt.type());
         assertEquals(new IgfsPath("/dir1"), evt.path());
         assertEquals(new IgfsPath("/mvDir1"), evt.newPath());
         assertTrue(evt.isDirectory());
 
-        evt = (IgniteFsEvent)evtList.get(2);
+        evt = (IgfsEvent)evtList.get(2);
         assertEquals(EVT_GGFS_DIR_DELETED, evt.type());
         assertEquals(new IgfsPath("/mvDir1"), evt.path());
         assertTrue(evt.isDirectory());
@@ -443,33 +443,33 @@ public abstract class IgfsEventsAbstractSelfTest extends GridCommonAbstractTest
 
         assertEquals(evtsCnt, evtList.size());
 
-        IgniteFsEvent evt = (IgniteFsEvent)evtList.get(0);
+        IgfsEvent evt = (IgfsEvent)evtList.get(0);
         assertEquals(EVT_GGFS_DIR_CREATED, evt.type());
         assertEquals(new IgfsPath("/dir1"), evt.path());
         assertTrue(evt.isDirectory());
 
-        evt = (IgniteFsEvent)evtList.get(1);
+        evt = (IgfsEvent)evtList.get(1);
         assertEquals(EVT_GGFS_FILE_CREATED, evt.type());
         assertEquals(new IgfsPath("/dir1/file1"), evt.path());
 
-        evt = (IgniteFsEvent)evtList.get(2);
+        evt = (IgfsEvent)evtList.get(2);
         assertEquals(EVT_GGFS_FILE_OPENED_WRITE, evt.type());
         assertEquals(new IgfsPath("/dir1/file1"), evt.path());
 
-        evt = (IgniteFsEvent)evtList.get(3);
+        evt = (IgfsEvent)evtList.get(3);
         assertEquals(EVT_GGFS_FILE_CLOSED_WRITE, evt.type());
         assertEquals(new IgfsPath("/dir1/file1"), evt.path());
         assertEquals(0, evt.dataSize());
 
-        evt = (IgniteFsEvent)evtList.get(4);
+        evt = (IgfsEvent)evtList.get(4);
         assertEquals(EVT_GGFS_FILE_CREATED, evt.type());
         assertEquals(new IgfsPath("/dir1/file2"), evt.path());
 
-        evt = (IgniteFsEvent)evtList.get(5);
+        evt = (IgfsEvent)evtList.get(5);
         assertEquals(EVT_GGFS_FILE_OPENED_WRITE, evt.type());
         assertEquals(new IgfsPath("/dir1/file2"), evt.path());
 
-        evt = (IgniteFsEvent)evtList.get(6);
+        evt = (IgfsEvent)evtList.get(6);
         assertEquals(EVT_GGFS_FILE_CLOSED_WRITE, evt.type());
         assertEquals(new IgfsPath("/dir1/file2"), evt.path());
         assertEquals(0, evt.dataSize());
@@ -525,15 +525,15 @@ public abstract class IgfsEventsAbstractSelfTest extends GridCommonAbstractTest
 
         assertEquals(evtsCnt, evtList.size());
 
-        IgniteFsEvent evt = (IgniteFsEvent)evtList.get(0);
+        IgfsEvent evt = (IgfsEvent)evtList.get(0);
         assertEquals(EVT_GGFS_DIR_CREATED, evt.type());
         assertEquals(new IgfsPath("/dir1"), evt.path());
 
-        evt = (IgniteFsEvent)evtList.get(1);
+        evt = (IgfsEvent)evtList.get(1);
         assertEquals(EVT_GGFS_DIR_CREATED, evt.type());
         assertEquals(new IgfsPath("/dir1/dir2"), evt.path());
 
-        IgniteFsEvent evt3 = (IgniteFsEvent)evtList.get(2);
+        IgfsEvent evt3 = (IgfsEvent)evtList.get(2);
         assertEquals(EVT_GGFS_DIR_DELETED, evt3.type());
         assertEquals(new IgfsPath("/dir1/dir2"), evt3.path());
     }
@@ -577,28 +577,28 @@ public abstract class IgfsEventsAbstractSelfTest extends GridCommonAbstractTest
 
         assertEquals(evtsCnt, evtList.size());
 
-        IgniteFsEvent evt = (IgniteFsEvent)evtList.get(0);
+        IgfsEvent evt = (IgfsEvent)evtList.get(0);
         assertEquals(EVT_GGFS_DIR_CREATED, evt.type());
         assertEquals(new IgfsPath("/dir1"), evt.path());
 
-        evt = (IgniteFsEvent)evtList.get(1);
+        evt = (IgfsEvent)evtList.get(1);
         assertEquals(EVT_GGFS_DIR_CREATED, evt.type());
         assertEquals(new IgfsPath("/dir1/dir2"), evt.path());
 
-        evt = (IgniteFsEvent)evtList.get(2);
+        evt = (IgfsEvent)evtList.get(2);
         assertEquals(EVT_GGFS_FILE_CREATED, evt.type());
         assertEquals(new IgfsPath("/dir1/dir2/file1"), evt.path());
 
-        evt = (IgniteFsEvent)evtList.get(3);
+        evt = (IgfsEvent)evtList.get(3);
         assertEquals(EVT_GGFS_FILE_OPENED_WRITE, evt.type());
         assertEquals(new IgfsPath("/dir1/dir2/file1"), evt.path());
 
-        evt = (IgniteFsEvent)evtList.get(4);
+        evt = (IgfsEvent)evtList.get(4);
         assertEquals(EVT_GGFS_FILE_CLOSED_WRITE, evt.type());
         assertEquals(new IgfsPath("/dir1/dir2/file1"), evt.path());
         assertEquals(0, evt.dataSize());
 
-        IgniteFsEvent evt4 = (IgniteFsEvent)evtList.get(5);
+        IgfsEvent evt4 = (IgfsEvent)evtList.get(5);
         assertEquals(EVT_GGFS_FILE_RENAMED, evt4.type());
         assertEquals(new IgfsPath("/dir1/dir2/file1"), evt4.path());
         assertEquals(new IgfsPath("/dir1/file1"), evt4.newPath());
@@ -641,15 +641,15 @@ public abstract class IgfsEventsAbstractSelfTest extends GridCommonAbstractTest
 
         assertEquals(evtsCnt, evtList.size());
 
-        IgniteFsEvent evt = (IgniteFsEvent)evtList.get(0);
+        IgfsEvent evt = (IgfsEvent)evtList.get(0);
         assertEquals(EVT_GGFS_DIR_CREATED, evt.type());
         assertEquals(new IgfsPath("/dir1"), evt.path());
 
-        evt = (IgniteFsEvent)evtList.get(1);
+        evt = (IgfsEvent)evtList.get(1);
         assertEquals(EVT_GGFS_DIR_CREATED, evt.type());
         assertEquals(new IgfsPath("/dir1/dir2"), evt.path());
 
-        evt = (IgniteFsEvent)evtList.get(2);
+        evt = (IgfsEvent)evtList.get(2);
         assertEquals(EVT_GGFS_DIR_DELETED, evt.type());
         assertEquals(new IgfsPath("/dir1"), evt.path());
     }
@@ -698,15 +698,15 @@ public abstract class IgfsEventsAbstractSelfTest extends GridCommonAbstractTest
 
         final IgfsPath file1 = new IgfsPath("/file1");
 
-        IgniteFsEvent evt = (IgniteFsEvent)evtList.get(0);
+        IgfsEvent evt = (IgfsEvent)evtList.get(0);
         assertEquals(EVT_GGFS_FILE_CREATED, evt.type());
         assertEquals(file1, evt.path());
 
-        evt = (IgniteFsEvent)evtList.get(1);
+        evt = (IgfsEvent)evtList.get(1);
         assertEquals(EVT_GGFS_FILE_OPENED_WRITE, evt.type());
         assertEquals(file1, evt.path());
 
-        evt = (IgniteFsEvent)evtList.get(2);
+        evt = (IgfsEvent)evtList.get(2);
         assertEquals(EVT_GGFS_FILE_CLOSED_WRITE, evt.type());
         assertEquals(file1, evt.path());
         assertEquals(0, evt.dataSize());
@@ -715,35 +715,35 @@ public abstract class IgfsEventsAbstractSelfTest extends GridCommonAbstractTest
             evtList.subList(3, 8),
             new P1<Event>() {
                 @Override public boolean apply(Event e) {
-                    IgniteFsEvent e0 = (IgniteFsEvent)e;
+                    IgfsEvent e0 = (IgfsEvent)e;
 
                     return e0.type() == EVT_GGFS_FILE_DELETED && e0.path().equals(file1);
                 }
             },
             new P1<Event>() {
                 @Override public boolean apply(Event e) {
-                    IgniteFsEvent e0 = (IgniteFsEvent)e;
+                    IgfsEvent e0 = (IgfsEvent)e;
 
                     return e0.type() == EVT_GGFS_FILE_PURGED && e0.path().equals(file1);
                 }
             },
             new P1<Event>() {
                 @Override public boolean apply(Event e) {
-                    IgniteFsEvent e0 = (IgniteFsEvent)e;
+                    IgfsEvent e0 = (IgfsEvent)e;
 
                     return e0.type() == EVT_GGFS_FILE_CREATED && e0.path().equals(file1);
                 }
             },
             new P1<Event>() {
                 @Override public boolean apply(Event e) {
-                    IgniteFsEvent e0 = (IgniteFsEvent)e;
+                    IgfsEvent e0 = (IgfsEvent)e;
 
                     return e0.type() == EVT_GGFS_FILE_OPENED_WRITE && e0.path().equals(file1);
                 }
             },
             new P1<Event>() {
                 @Override public boolean apply(Event e) {
-                    IgniteFsEvent e0 = (IgniteFsEvent)e;
+                    IgfsEvent e0 = (IgfsEvent)e;
 
                     return e0.type() == EVT_GGFS_FILE_CLOSED_WRITE && e0.path().equals(file1);
                 }
@@ -795,31 +795,31 @@ public abstract class IgfsEventsAbstractSelfTest extends GridCommonAbstractTest
 
         assertEquals(evtsCnt, evtList.size());
 
-        IgniteFsEvent evt = (IgniteFsEvent)evtList.get(0);
+        IgfsEvent evt = (IgfsEvent)evtList.get(0);
         assertEquals(EVT_GGFS_FILE_CREATED, evt.type());
         assertEquals(new IgfsPath("/file1"), evt.path());
 
-        evt = (IgniteFsEvent)evtList.get(1);
+        evt = (IgfsEvent)evtList.get(1);
         assertEquals(EVT_GGFS_FILE_OPENED_WRITE, evt.type());
         assertEquals(new IgfsPath("/file1"), evt.path());
 
-        evt = (IgniteFsEvent)evtList.get(2);
+        evt = (IgfsEvent)evtList.get(2);
         assertEquals(EVT_GGFS_FILE_CLOSED_WRITE, evt.type());
         assertEquals(new IgfsPath("/file1"), evt.path());
         assertEquals((long)dataSize, evt.dataSize());
 
-        evt = (IgniteFsEvent)evtList.get(3);
+        evt = (IgfsEvent)evtList.get(3);
         assertEquals(EVT_GGFS_FILE_OPENED_READ, evt.type());
         assertEquals(new IgfsPath("/file1"), evt.path());
 
-        evt = (IgniteFsEvent)evtList.get(4);
+        evt = (IgfsEvent)evtList.get(4);
         assertEquals(EVT_GGFS_FILE_CLOSED_READ, evt.type());
         assertEquals(new IgfsPath("/file1"), evt.path());
         assertEquals((long)dataSize, evt.dataSize());
     }
 
     /**
-     * Predicate for matching {@link org.apache.ignite.events.IgniteFsEvent}.
+     * Predicate for matching {@link org.apache.ignite.events.IgfsEvent}.
      */
     private static class EventPredicate implements IgnitePredicate<Event> {
         /** */
@@ -840,7 +840,7 @@ public abstract class IgfsEventsAbstractSelfTest extends GridCommonAbstractTest
 
         /** {@inheritDoc} */
         @Override public boolean apply(Event e) {
-            IgniteFsEvent e0 = (IgniteFsEvent)e;
+            IgfsEvent e0 = (IgfsEvent)e;
 
             return e0.type() == evt && e0.path().equals(path);
         }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/88bf1443/modules/core/src/test/java/org/apache/ignite/ignitefs/IgfsFragmentizerAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/ignitefs/IgfsFragmentizerAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/ignitefs/IgfsFragmentizerAbstractSelfTest.java
index dbae0fd..d23a119 100644
--- a/modules/core/src/test/java/org/apache/ignite/ignitefs/IgfsFragmentizerAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/ignitefs/IgfsFragmentizerAbstractSelfTest.java
@@ -63,7 +63,7 @@ public class IgfsFragmentizerAbstractSelfTest extends IgfsCommonAbstractTest {
 
         cfg.setCacheConfiguration(metaConfiguration(), dataConfiguration());
 
-        IgniteFsConfiguration ggfsCfg = new IgniteFsConfiguration();
+        IgfsConfiguration ggfsCfg = new IgfsConfiguration();
 
         ggfsCfg.setName("ggfs");
         ggfsCfg.setMetaCacheName(META_CACHE_NAME);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/88bf1443/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridCacheIgfsPerBlockLruEvictionPolicySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridCacheIgfsPerBlockLruEvictionPolicySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridCacheIgfsPerBlockLruEvictionPolicySelfTest.java
index 89f3ccc..a19deaf 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridCacheIgfsPerBlockLruEvictionPolicySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridCacheIgfsPerBlockLruEvictionPolicySelfTest.java
@@ -79,7 +79,7 @@ public class GridCacheIgfsPerBlockLruEvictionPolicySelfTest extends IgfsCommonAb
      * @throws Exception If failed.
      */
     private void startPrimary() throws Exception {
-        IgniteFsConfiguration ggfsCfg = new IgniteFsConfiguration();
+        IgfsConfiguration ggfsCfg = new IgfsConfiguration();
 
         ggfsCfg.setDataCacheName("dataCache");
         ggfsCfg.setMetaCacheName("metaCache");
@@ -149,7 +149,7 @@ public class GridCacheIgfsPerBlockLruEvictionPolicySelfTest extends IgfsCommonAb
      * @throws Exception If failed.
      */
     private void startSecondary() throws Exception {
-        IgniteFsConfiguration ggfsCfg = new IgniteFsConfiguration();
+        IgfsConfiguration ggfsCfg = new IgfsConfiguration();
 
         ggfsCfg.setDataCacheName("dataCache");
         ggfsCfg.setMetaCacheName("metaCache");

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/88bf1443/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsAbstractSelfTest.java
index 45f584b..7ea0fee 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsAbstractSelfTest.java
@@ -182,7 +182,7 @@ public abstract class IgfsAbstractSelfTest extends IgfsCommonAbstractTest {
      */
     protected Ignite startGridWithGgfs(String gridName, String ggfsName, IgfsMode mode,
         @Nullable Igfs secondaryFs, @Nullable Map<String, String> restCfg) throws Exception {
-        IgniteFsConfiguration ggfsCfg = new IgniteFsConfiguration();
+        IgfsConfiguration ggfsCfg = new IgfsConfiguration();
 
         ggfsCfg.setDataCacheName("dataCache");
         ggfsCfg.setMetaCacheName("metaCache");

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/88bf1443/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsCacheSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsCacheSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsCacheSelfTest.java
index 654fb13..92c8362 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsCacheSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsCacheSelfTest.java
@@ -56,7 +56,7 @@ public class IgfsCacheSelfTest extends IgfsCommonAbstractTest {
 
         cfg.setDiscoverySpi(discoSpi);
 
-        IgniteFsConfiguration ggfsCfg = new IgniteFsConfiguration();
+        IgfsConfiguration ggfsCfg = new IgfsConfiguration();
 
         ggfsCfg.setMetaCacheName(META_CACHE_NAME);
         ggfsCfg.setDataCacheName(DATA_CACHE_NAME);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/88bf1443/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsDataManagerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsDataManagerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsDataManagerSelfTest.java
index 0bff604..962b5fa 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsDataManagerSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsDataManagerSelfTest.java
@@ -95,7 +95,7 @@ public class IgfsDataManagerSelfTest extends IgfsCommonAbstractTest {
 
         cfg.setDiscoverySpi(discoSpi);
 
-        IgniteFsConfiguration ggfsCfg = new IgniteFsConfiguration();
+        IgfsConfiguration ggfsCfg = new IgfsConfiguration();
 
         ggfsCfg.setMetaCacheName(META_CACHE_NAME);
         ggfsCfg.setDataCacheName(DATA_CACHE_NAME);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/88bf1443/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsMetaManagerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsMetaManagerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsMetaManagerSelfTest.java
index bc22782..4d3ac36 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsMetaManagerSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsMetaManagerSelfTest.java
@@ -75,7 +75,7 @@ public class IgfsMetaManagerSelfTest extends IgfsCommonAbstractTest {
 
         cfg.setDiscoverySpi(discoSpi);
 
-        IgniteFsConfiguration ggfsCfg = new IgniteFsConfiguration();
+        IgfsConfiguration ggfsCfg = new IgfsConfiguration();
 
         ggfsCfg.setMetaCacheName(META_CACHE_NAME);
         ggfsCfg.setDataCacheName(DATA_CACHE_NAME);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/88bf1443/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsMetricsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsMetricsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsMetricsSelfTest.java
index f40651d..59477bd 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsMetricsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsMetricsSelfTest.java
@@ -101,7 +101,7 @@ public class IgfsMetricsSelfTest extends IgfsCommonAbstractTest {
      * @throws Exception If failed.
      */
     private IgniteConfiguration primaryConfiguration(int idx) throws Exception {
-        IgniteFsConfiguration ggfsCfg = new IgniteFsConfiguration();
+        IgfsConfiguration ggfsCfg = new IgfsConfiguration();
 
         ggfsCfg.setDataCacheName("dataCache");
         ggfsCfg.setMetaCacheName("metaCache");
@@ -159,7 +159,7 @@ public class IgfsMetricsSelfTest extends IgfsCommonAbstractTest {
      * @throws Exception If failed.
      */
     private void startSecondary() throws Exception {
-        IgniteFsConfiguration ggfsCfg = new IgniteFsConfiguration();
+        IgfsConfiguration ggfsCfg = new IgfsConfiguration();
 
         ggfsCfg.setDataCacheName("dataCache");
         ggfsCfg.setMetaCacheName("metaCache");

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/88bf1443/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsModesSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsModesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsModesSelfTest.java
index 737e218..cfbe411 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsModesSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsModesSelfTest.java
@@ -82,7 +82,7 @@ public class IgfsModesSelfTest extends IgfsCommonAbstractTest {
     private void startUp() throws Exception {
         startUpSecondary();
 
-        IgniteFsConfiguration ggfsCfg = new IgniteFsConfiguration();
+        IgfsConfiguration ggfsCfg = new IgfsConfiguration();
 
         ggfsCfg.setDataCacheName("partitioned");
         ggfsCfg.setMetaCacheName("replicated");
@@ -144,7 +144,7 @@ public class IgfsModesSelfTest extends IgfsCommonAbstractTest {
      * @throws Exception If failed.
      */
     private void startUpSecondary() throws Exception {
-        IgniteFsConfiguration ggfsCfg = new IgniteFsConfiguration();
+        IgfsConfiguration ggfsCfg = new IgfsConfiguration();
 
         ggfsCfg.setDataCacheName("partitioned");
         ggfsCfg.setMetaCacheName("replicated");

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/88bf1443/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsProcessorSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsProcessorSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsProcessorSelfTest.java
index 11763b0..4a97575 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsProcessorSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsProcessorSelfTest.java
@@ -73,7 +73,7 @@ public class IgfsProcessorSelfTest extends IgfsCommonAbstractTest {
 
         ggfs = grid.fileSystem(ggfsName());
 
-        IgniteFsConfiguration[] cfgs = grid.configuration().getGgfsConfiguration();
+        IgfsConfiguration[] cfgs = grid.configuration().getGgfsConfiguration();
 
         assert cfgs.length == 1;
 
@@ -111,7 +111,7 @@ public class IgfsProcessorSelfTest extends IgfsCommonAbstractTest {
 
         cfg.setDiscoverySpi(discoSpi);
 
-        IgniteFsConfiguration ggfsCfg = new IgniteFsConfiguration();
+        IgfsConfiguration ggfsCfg = new IgfsConfiguration();
 
         ggfsCfg.setMetaCacheName(META_CACHE_NAME);
         ggfsCfg.setDataCacheName(DATA_CACHE_NAME);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/88bf1443/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsProcessorValidationSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsProcessorValidationSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsProcessorValidationSelfTest.java
index c6a0220..7438e07 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsProcessorValidationSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsProcessorValidationSelfTest.java
@@ -37,7 +37,7 @@ import static org.apache.ignite.ignitefs.IgfsMode.*;
  * Tests for node validation logic in {@link IgfsProcessor}.
  * <p>
  * Tests starting with "testLocal" are checking
- * {@link IgfsProcessor#validateLocalGgfsConfigurations(org.apache.ignite.configuration.IgniteFsConfiguration[])}.
+ * {@link IgfsProcessor#validateLocalGgfsConfigurations(org.apache.ignite.configuration.IgfsConfiguration[])}.
  * <p>
  * Tests starting with "testRemote" are checking {@link IgfsProcessor#checkGgfsOnRemoteNode(org.apache.ignite.cluster.ClusterNode)}.
  */
@@ -61,10 +61,10 @@ public class IgfsProcessorValidationSelfTest extends IgfsCommonAbstractTest {
     private static final String metaCache2Name = "metaCache2";
 
     /** First GGFS config in grid #1. */
-    private IgniteFsConfiguration g1GgfsCfg1 = new IgniteFsConfiguration();
+    private IgfsConfiguration g1GgfsCfg1 = new IgfsConfiguration();
 
     /** Second GGFS config in grid#1. */
-    private IgniteFsConfiguration g1GgfsCfg2 = new IgniteFsConfiguration();
+    private IgfsConfiguration g1GgfsCfg2 = new IgfsConfiguration();
 
     /** {@inheritDoc} */
     @Override protected void beforeTest() throws Exception {
@@ -278,7 +278,7 @@ public class IgfsProcessorValidationSelfTest extends IgfsCommonAbstractTest {
         g1Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), CacheConfiguration.class));
         g2Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches(), CacheConfiguration.class));
 
-        IgniteFsConfiguration g2GgfsCfg1 = new IgniteFsConfiguration(g1GgfsCfg1);
+        IgfsConfiguration g2GgfsCfg1 = new IgfsConfiguration(g1GgfsCfg1);
 
         g2GgfsCfg1.setBlockSize(g2GgfsCfg1.getBlockSize() + 100);
 
@@ -310,8 +310,8 @@ public class IgfsProcessorValidationSelfTest extends IgfsCommonAbstractTest {
     public void testRemoteIfMetaCacheNameDiffers() throws Exception {
         IgniteConfiguration g2Cfg = getConfiguration("g2");
 
-        IgniteFsConfiguration g2GgfsCfg1 = new IgniteFsConfiguration(g1GgfsCfg1);
-        IgniteFsConfiguration g2GgfsCfg2 = new IgniteFsConfiguration(g1GgfsCfg2);
+        IgfsConfiguration g2GgfsCfg1 = new IgfsConfiguration(g1GgfsCfg1);
+        IgfsConfiguration g2GgfsCfg2 = new IgfsConfiguration(g1GgfsCfg2);
 
         g2GgfsCfg1.setMetaCacheName("g2MetaCache1");
         g2GgfsCfg2.setMetaCacheName("g2MetaCache2");
@@ -333,8 +333,8 @@ public class IgfsProcessorValidationSelfTest extends IgfsCommonAbstractTest {
     public void testRemoteIfMetaCacheNameEquals() throws Exception {
         IgniteConfiguration g2Cfg = getConfiguration("g2");
 
-        IgniteFsConfiguration g2GgfsCfg1 = new IgniteFsConfiguration(g1GgfsCfg1);
-        IgniteFsConfiguration g2GgfsCfg2 = new IgniteFsConfiguration(g1GgfsCfg2);
+        IgfsConfiguration g2GgfsCfg1 = new IgfsConfiguration(g1GgfsCfg1);
+        IgfsConfiguration g2GgfsCfg2 = new IgfsConfiguration(g1GgfsCfg2);
 
         g2GgfsCfg1.setName("g2GgfsCfg1");
         g2GgfsCfg2.setName("g2GgfsCfg2");
@@ -359,8 +359,8 @@ public class IgfsProcessorValidationSelfTest extends IgfsCommonAbstractTest {
     public void testRemoteIfDataCacheNameDiffers() throws Exception {
         IgniteConfiguration g2Cfg = getConfiguration("g2");
 
-        IgniteFsConfiguration g2GgfsCfg1 = new IgniteFsConfiguration(g1GgfsCfg1);
-        IgniteFsConfiguration g2GgfsCfg2 = new IgniteFsConfiguration(g1GgfsCfg2);
+        IgfsConfiguration g2GgfsCfg1 = new IgfsConfiguration(g1GgfsCfg1);
+        IgfsConfiguration g2GgfsCfg2 = new IgfsConfiguration(g1GgfsCfg2);
 
         g2GgfsCfg1.setDataCacheName("g2DataCache1");
         g2GgfsCfg2.setDataCacheName("g2DataCache2");
@@ -382,8 +382,8 @@ public class IgfsProcessorValidationSelfTest extends IgfsCommonAbstractTest {
     public void testRemoteIfDataCacheNameEquals() throws Exception {
         IgniteConfiguration g2Cfg = getConfiguration("g2");
 
-        IgniteFsConfiguration g2GgfsCfg1 = new IgniteFsConfiguration(g1GgfsCfg1);
-        IgniteFsConfiguration g2GgfsCfg2 = new IgniteFsConfiguration(g1GgfsCfg2);
+        IgfsConfiguration g2GgfsCfg1 = new IgfsConfiguration(g1GgfsCfg1);
+        IgfsConfiguration g2GgfsCfg2 = new IgfsConfiguration(g1GgfsCfg2);
 
         g2GgfsCfg1.setName("g2GgfsCfg1");
         g2GgfsCfg2.setName("g2GgfsCfg2");
@@ -408,8 +408,8 @@ public class IgfsProcessorValidationSelfTest extends IgfsCommonAbstractTest {
     public void testRemoteIfDefaultModeDiffers() throws Exception {
         IgniteConfiguration g2Cfg = getConfiguration("g2");
 
-        IgniteFsConfiguration g2GgfsCfg1 = new IgniteFsConfiguration(g1GgfsCfg1);
-        IgniteFsConfiguration g2GgfsCfg2 = new IgniteFsConfiguration(g1GgfsCfg2);
+        IgfsConfiguration g2GgfsCfg1 = new IgfsConfiguration(g1GgfsCfg1);
+        IgfsConfiguration g2GgfsCfg2 = new IgfsConfiguration(g1GgfsCfg2);
 
         g1GgfsCfg1.setDefaultMode(DUAL_ASYNC);
         g1GgfsCfg2.setDefaultMode(DUAL_ASYNC);
@@ -433,8 +433,8 @@ public class IgfsProcessorValidationSelfTest extends IgfsCommonAbstractTest {
     public void testRemoteIfPathModeDiffers() throws Exception {
         IgniteConfiguration g2Cfg = getConfiguration("g2");
 
-        IgniteFsConfiguration g2GgfsCfg1 = new IgniteFsConfiguration(g1GgfsCfg1);
-        IgniteFsConfiguration g2GgfsCfg2 = new IgniteFsConfiguration(g1GgfsCfg2);
+        IgfsConfiguration g2GgfsCfg1 = new IgfsConfiguration(g1GgfsCfg1);
+        IgfsConfiguration g2GgfsCfg2 = new IgfsConfiguration(g1GgfsCfg2);
 
         g2GgfsCfg1.setPathModes(Collections.singletonMap("/somePath", DUAL_SYNC));
         g2GgfsCfg2.setPathModes(Collections.singletonMap("/somePath", DUAL_SYNC));

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/88bf1443/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsServerManagerIpcEndpointRegistrationAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsServerManagerIpcEndpointRegistrationAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsServerManagerIpcEndpointRegistrationAbstractSelfTest.java
index 92c67de..51d85bc 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsServerManagerIpcEndpointRegistrationAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsServerManagerIpcEndpointRegistrationAbstractSelfTest.java
@@ -36,7 +36,7 @@ import java.util.*;
 import java.util.concurrent.atomic.*;
 
 import static org.apache.ignite.cache.CacheAtomicityMode.*;
-import static org.apache.ignite.configuration.IgniteFsConfiguration.*;
+import static org.apache.ignite.configuration.IgfsConfiguration.*;
 
 /**
  * Base test class for {@link IgfsServer} checking IPC endpoint registrations.
@@ -154,7 +154,7 @@ public abstract class IgfsServerManagerIpcEndpointRegistrationAbstractSelfTest e
      * @param endPntHost End point host.
      * @return test-purposed IgniteFsConfiguration.
      */
-    protected IgniteFsConfiguration igniteFsConfiguration(@Nullable String endPntType, @Nullable Integer endPntPort,
+    protected IgfsConfiguration igniteFsConfiguration(@Nullable String endPntType, @Nullable Integer endPntPort,
         @Nullable String endPntHost) throws IgniteCheckedException {
         HashMap<String, String> endPntCfg = null;
 
@@ -170,7 +170,7 @@ public abstract class IgfsServerManagerIpcEndpointRegistrationAbstractSelfTest e
                 endPntCfg.put("host", endPntHost);
         }
 
-        IgniteFsConfiguration ggfsConfiguration = new IgniteFsConfiguration();
+        IgfsConfiguration ggfsConfiguration = new IgfsConfiguration();
 
         ggfsConfiguration.setDataCacheName("partitioned");
         ggfsConfiguration.setMetaCacheName("replicated");

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/88bf1443/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsServerManagerIpcEndpointRegistrationOnLinuxAndMacSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsServerManagerIpcEndpointRegistrationOnLinuxAndMacSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsServerManagerIpcEndpointRegistrationOnLinuxAndMacSelfTest.java
index 35f088d..d1e1dbe 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsServerManagerIpcEndpointRegistrationOnLinuxAndMacSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsServerManagerIpcEndpointRegistrationOnLinuxAndMacSelfTest.java
@@ -20,7 +20,7 @@ package org.apache.ignite.internal.processors.fs;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.internal.util.typedef.*;
 
-import static org.apache.ignite.configuration.IgniteFsConfiguration.*;
+import static org.apache.ignite.configuration.IgfsConfiguration.*;
 
 /**
  * Tests for {@link IgfsServer} that checks all IPC endpoint registration types

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/88bf1443/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsSizeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsSizeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsSizeSelfTest.java
index 29b0189..ae8abec 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsSizeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsSizeSelfTest.java
@@ -111,7 +111,7 @@ public class IgfsSizeSelfTest extends IgfsCommonAbstractTest {
     @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
         IgniteConfiguration cfg = super.getConfiguration(gridName);
 
-        IgniteFsConfiguration ggfsCfg = new IgniteFsConfiguration();
+        IgfsConfiguration ggfsCfg = new IgfsConfiguration();
 
         ggfsCfg.setDataCacheName(DATA_CACHE_NAME);
         ggfsCfg.setMetaCacheName(META_CACHE_NAME);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/88bf1443/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsStreamsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsStreamsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsStreamsSelfTest.java
index 811db2e..33069d6 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsStreamsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsStreamsSelfTest.java
@@ -110,7 +110,7 @@ public class IgfsStreamsSelfTest extends IgfsCommonAbstractTest {
 
         cfg.setDiscoverySpi(discoSpi);
 
-        IgniteFsConfiguration ggfsCfg = new IgniteFsConfiguration();
+        IgfsConfiguration ggfsCfg = new IgfsConfiguration();
 
         ggfsCfg.setMetaCacheName(META_CACHE_NAME);
         ggfsCfg.setDataCacheName(DATA_CACHE_NAME);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/88bf1443/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsTaskSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsTaskSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsTaskSelfTest.java
index 814e7c5..11be4e2 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsTaskSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/IgfsTaskSelfTest.java
@@ -97,7 +97,7 @@ public class IgfsTaskSelfTest extends IgfsCommonAbstractTest {
      * @return Grid configuration
      */
     private IgniteConfiguration config(int idx) {
-        IgniteFsConfiguration ggfsCfg = new IgniteFsConfiguration();
+        IgfsConfiguration ggfsCfg = new IgfsConfiguration();
 
         ggfsCfg.setDataCacheName("dataCache");
         ggfsCfg.setMetaCacheName("metaCache");

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/88bf1443/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/split/IgfsAbstractRecordResolverSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/split/IgfsAbstractRecordResolverSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/split/IgfsAbstractRecordResolverSelfTest.java
index 15f8d48..1035202 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/split/IgfsAbstractRecordResolverSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/split/IgfsAbstractRecordResolverSelfTest.java
@@ -50,7 +50,7 @@ public class IgfsAbstractRecordResolverSelfTest extends GridCommonAbstractTest {
 
     /** {@inheritDoc} */
     @Override protected void beforeTestsStarted() throws Exception {
-        IgniteFsConfiguration ggfsCfg = new IgniteFsConfiguration();
+        IgfsConfiguration ggfsCfg = new IgfsConfiguration();
 
         ggfsCfg.setDataCacheName("dataCache");
         ggfsCfg.setMetaCacheName("metaCache");

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/88bf1443/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryNodeStartup.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryNodeStartup.java b/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryNodeStartup.java
index 9761275..d913a50 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryNodeStartup.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryNodeStartup.java
@@ -41,7 +41,7 @@ public class IpcSharedMemoryNodeStartup {
     public static void main(String[] args) throws Exception{
         IgniteConfiguration cfg = new IgniteConfiguration();
 
-        IgniteFsConfiguration ggfsCfg = new IgniteFsConfiguration();
+        IgfsConfiguration ggfsCfg = new IgfsConfiguration();
 
         TcpDiscoverySpi discoSpi = new TcpDiscoverySpi();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/88bf1443/modules/hadoop/src/main/java/org/apache/ignite/ignitefs/hadoop/IgfsHadoopParameters.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/ignitefs/hadoop/IgfsHadoopParameters.java b/modules/hadoop/src/main/java/org/apache/ignite/ignitefs/hadoop/IgfsHadoopParameters.java
index fb7d58e..049ac1b 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/ignitefs/hadoop/IgfsHadoopParameters.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/ignitefs/hadoop/IgfsHadoopParameters.java
@@ -24,7 +24,7 @@ package org.apache.ignite.ignitefs.hadoop;
  * <ul>
  *     <li>
  *         {@code fs.ggfs.[name].open.sequential_reads_before_prefetch} - this parameter overrides
- *         the one specified in {@link org.apache.ignite.configuration.IgniteFsConfiguration#getSequentialReadsBeforePrefetch()}
+ *         the one specified in {@link org.apache.ignite.configuration.IgfsConfiguration#getSequentialReadsBeforePrefetch()}
  *         GGFS data node configuration property.
  *     </li>
  *     <li>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/88bf1443/modules/hadoop/src/main/java/org/apache/ignite/ignitefs/hadoop/v1/IgfsHadoopFileSystem.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/ignitefs/hadoop/v1/IgfsHadoopFileSystem.java b/modules/hadoop/src/main/java/org/apache/ignite/ignitefs/hadoop/v1/IgfsHadoopFileSystem.java
index b7b73e5..4029ec7 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/ignitefs/hadoop/v1/IgfsHadoopFileSystem.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/ignitefs/hadoop/v1/IgfsHadoopFileSystem.java
@@ -39,7 +39,7 @@ import java.util.*;
 import java.util.concurrent.atomic.*;
 
 import static org.apache.ignite.IgniteFs.*;
-import static org.apache.ignite.configuration.IgniteFsConfiguration.*;
+import static org.apache.ignite.configuration.IgfsConfiguration.*;
 import static org.apache.ignite.ignitefs.IgfsMode.*;
 import static org.apache.ignite.ignitefs.hadoop.IgfsHadoopParameters.*;
 import static org.apache.ignite.internal.fs.hadoop.IgfsHadoopUtils.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/88bf1443/modules/hadoop/src/main/java/org/apache/ignite/ignitefs/hadoop/v2/IgfsHadoopFileSystem.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/ignitefs/hadoop/v2/IgfsHadoopFileSystem.java b/modules/hadoop/src/main/java/org/apache/ignite/ignitefs/hadoop/v2/IgfsHadoopFileSystem.java
index 42e1716..6103dc1 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/ignitefs/hadoop/v2/IgfsHadoopFileSystem.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/ignitefs/hadoop/v2/IgfsHadoopFileSystem.java
@@ -39,7 +39,7 @@ import java.util.*;
 import java.util.concurrent.atomic.*;
 
 import static org.apache.ignite.IgniteFs.*;
-import static org.apache.ignite.configuration.IgniteFsConfiguration.*;
+import static org.apache.ignite.configuration.IgfsConfiguration.*;
 import static org.apache.ignite.ignitefs.IgfsMode.*;
 import static org.apache.ignite.ignitefs.hadoop.IgfsHadoopParameters.*;
 import static org.apache.ignite.internal.fs.hadoop.IgfsHadoopUtils.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/88bf1443/modules/hadoop/src/main/java/org/apache/ignite/internal/fs/hadoop/IgfsHadoopEndpoint.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/fs/hadoop/IgfsHadoopEndpoint.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/fs/hadoop/IgfsHadoopEndpoint.java
index 6a8670c..d4f9a0a 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/internal/fs/hadoop/IgfsHadoopEndpoint.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/fs/hadoop/IgfsHadoopEndpoint.java
@@ -26,7 +26,7 @@ import org.jetbrains.annotations.*;
 import java.io.*;
 import java.net.*;
 
-import static org.apache.ignite.configuration.IgniteFsConfiguration.*;
+import static org.apache.ignite.configuration.IgfsConfiguration.*;
 
 /**
  * GGFS endpoint abstraction.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/88bf1443/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/fs/GridHadoopDistributedFileSystem.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/fs/GridHadoopDistributedFileSystem.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/fs/GridHadoopDistributedFileSystem.java
index e66940f..e9461e2 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/fs/GridHadoopDistributedFileSystem.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/fs/GridHadoopDistributedFileSystem.java
@@ -25,7 +25,7 @@ import org.apache.hadoop.mapreduce.*;
 import java.io.*;
 import java.net.*;
 
-import static org.apache.ignite.configuration.IgniteFsConfiguration.*;
+import static org.apache.ignite.configuration.IgfsConfiguration.*;
 
 /**
  * Wrapper of HDFS for support of separated working directory.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/88bf1443/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/IgfsEventsTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/IgfsEventsTestSuite.java b/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/IgfsEventsTestSuite.java
index 6ef574f..b89addc 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/IgfsEventsTestSuite.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/IgfsEventsTestSuite.java
@@ -75,8 +75,8 @@ public class IgfsEventsTestSuite extends TestSuite {
      */
     public static class ShmemPrivate extends IgfsEventsAbstractSelfTest {
         /** {@inheritDoc} */
-        @Override protected IgniteFsConfiguration getGgfsConfiguration() throws IgniteCheckedException {
-            IgniteFsConfiguration ggfsCfg = super.getGgfsConfiguration();
+        @Override protected IgfsConfiguration getGgfsConfiguration() throws IgniteCheckedException {
+            IgfsConfiguration ggfsCfg = super.getGgfsConfiguration();
 
             ggfsCfg.setIpcEndpointConfiguration(new HashMap<String, String>() {{
                 put("type", "shmem");
@@ -92,8 +92,8 @@ public class IgfsEventsTestSuite extends TestSuite {
      */
     public static class LoopbackPrivate extends IgfsEventsAbstractSelfTest {
         /** {@inheritDoc} */
-        @Override protected IgniteFsConfiguration getGgfsConfiguration() throws IgniteCheckedException {
-            IgniteFsConfiguration ggfsCfg = super.getGgfsConfiguration();
+        @Override protected IgfsConfiguration getGgfsConfiguration() throws IgniteCheckedException {
+            IgfsConfiguration ggfsCfg = super.getGgfsConfiguration();
 
             ggfsCfg.setIpcEndpointConfiguration(new HashMap<String, String>() {{
                 put("type", "tcp");
@@ -112,8 +112,8 @@ public class IgfsEventsTestSuite extends TestSuite {
         private static IgniteFs ggfsSec;
 
         /** {@inheritDoc} */
-        @Override protected IgniteFsConfiguration getGgfsConfiguration() throws IgniteCheckedException {
-            IgniteFsConfiguration ggfsCfg = super.getGgfsConfiguration();
+        @Override protected IgfsConfiguration getGgfsConfiguration() throws IgniteCheckedException {
+            IgfsConfiguration ggfsCfg = super.getGgfsConfiguration();
 
             ggfsCfg.setSecondaryFileSystem(new IgfsHadoopFileSystemWrapper(
                 "ggfs://ggfs-secondary:grid-secondary@127.0.0.1:11500/",
@@ -125,8 +125,8 @@ public class IgfsEventsTestSuite extends TestSuite {
         /**
          * @return GGFS configuration for secondary file system.
          */
-        protected IgniteFsConfiguration getSecondaryGgfsConfiguration() throws IgniteCheckedException {
-            IgniteFsConfiguration ggfsCfg = super.getGgfsConfiguration();
+        protected IgfsConfiguration getSecondaryGgfsConfiguration() throws IgniteCheckedException {
+            IgfsConfiguration ggfsCfg = super.getGgfsConfiguration();
 
             ggfsCfg.setName("ggfs-secondary");
             ggfsCfg.setDefaultMode(PRIMARY);
@@ -183,8 +183,8 @@ public class IgfsEventsTestSuite extends TestSuite {
      */
     public static class ShmemDualSync extends PrimarySecondaryTest {
         /** {@inheritDoc} */
-        @Override protected IgniteFsConfiguration getGgfsConfiguration() throws IgniteCheckedException {
-            IgniteFsConfiguration ggfsCfg = super.getGgfsConfiguration();
+        @Override protected IgfsConfiguration getGgfsConfiguration() throws IgniteCheckedException {
+            IgfsConfiguration ggfsCfg = super.getGgfsConfiguration();
 
             ggfsCfg.setDefaultMode(DUAL_SYNC);
 
@@ -197,8 +197,8 @@ public class IgfsEventsTestSuite extends TestSuite {
      */
     public static class ShmemDualAsync extends PrimarySecondaryTest {
         /** {@inheritDoc} */
-        @Override protected IgniteFsConfiguration getGgfsConfiguration() throws IgniteCheckedException {
-            IgniteFsConfiguration ggfsCfg = super.getGgfsConfiguration();
+        @Override protected IgfsConfiguration getGgfsConfiguration() throws IgniteCheckedException {
+            IgfsConfiguration ggfsCfg = super.getGgfsConfiguration();
 
             ggfsCfg.setDefaultMode(DUAL_ASYNC);
 
@@ -211,8 +211,8 @@ public class IgfsEventsTestSuite extends TestSuite {
      */
     public abstract static class LoopbackPrimarySecondaryTest extends PrimarySecondaryTest {
         /** {@inheritDoc} */
-        @Override protected IgniteFsConfiguration getGgfsConfiguration() throws IgniteCheckedException {
-            IgniteFsConfiguration ggfsCfg = super.getGgfsConfiguration();
+        @Override protected IgfsConfiguration getGgfsConfiguration() throws IgniteCheckedException {
+            IgfsConfiguration ggfsCfg = super.getGgfsConfiguration();
 
             ggfsCfg.setSecondaryFileSystem(new IgfsHadoopFileSystemWrapper(
                 "ggfs://ggfs-secondary:grid-secondary@127.0.0.1:11500/",
@@ -222,8 +222,8 @@ public class IgfsEventsTestSuite extends TestSuite {
         }
 
         /** {@inheritDoc} */
-        @Override protected IgniteFsConfiguration getSecondaryGgfsConfiguration() throws IgniteCheckedException {
-            IgniteFsConfiguration ggfsCfg = super.getSecondaryGgfsConfiguration();
+        @Override protected IgfsConfiguration getSecondaryGgfsConfiguration() throws IgniteCheckedException {
+            IgfsConfiguration ggfsCfg = super.getSecondaryGgfsConfiguration();
 
             ggfsCfg.setName("ggfs-secondary");
             ggfsCfg.setDefaultMode(PRIMARY);
@@ -241,8 +241,8 @@ public class IgfsEventsTestSuite extends TestSuite {
      */
     public static class LoopbackDualSync extends LoopbackPrimarySecondaryTest {
         /** {@inheritDoc} */
-        @Override protected IgniteFsConfiguration getGgfsConfiguration() throws IgniteCheckedException {
-            IgniteFsConfiguration ggfsCfg = super.getGgfsConfiguration();
+        @Override protected IgfsConfiguration getGgfsConfiguration() throws IgniteCheckedException {
+            IgfsConfiguration ggfsCfg = super.getGgfsConfiguration();
 
             ggfsCfg.setDefaultMode(DUAL_SYNC);
 
@@ -255,8 +255,8 @@ public class IgfsEventsTestSuite extends TestSuite {
      */
     public static class LoopbackDualAsync extends LoopbackPrimarySecondaryTest {
         /** {@inheritDoc} */
-        @Override protected IgniteFsConfiguration getGgfsConfiguration() throws IgniteCheckedException {
-            IgniteFsConfiguration ggfsCfg = super.getGgfsConfiguration();
+        @Override protected IgfsConfiguration getGgfsConfiguration() throws IgniteCheckedException {
+            IgfsConfiguration ggfsCfg = super.getGgfsConfiguration();
 
             ggfsCfg.setDefaultMode(DUAL_ASYNC);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/88bf1443/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/IgfsHadoop20FileSystemAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/IgfsHadoop20FileSystemAbstractSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/IgfsHadoop20FileSystemAbstractSelfTest.java
index a6471eb..810ebc8 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/IgfsHadoop20FileSystemAbstractSelfTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/IgfsHadoop20FileSystemAbstractSelfTest.java
@@ -142,7 +142,7 @@ public abstract class IgfsHadoop20FileSystemAbstractSelfTest extends IgfsCommonA
     private void startNodes() throws Exception {
         if (mode != PRIMARY) {
             // Start secondary GGFS.
-            IgniteFsConfiguration ggfsCfg = new IgniteFsConfiguration();
+            IgfsConfiguration ggfsCfg = new IgfsConfiguration();
 
             ggfsCfg.setDataCacheName("partitioned");
             ggfsCfg.setMetaCacheName("replicated");
@@ -250,8 +250,8 @@ public abstract class IgfsHadoop20FileSystemAbstractSelfTest extends IgfsCommonA
      * @param gridName Grid name.
      * @return GGFS configuration.
      */
-    protected IgniteFsConfiguration ggfsConfiguration(String gridName) throws IgniteCheckedException {
-        IgniteFsConfiguration cfg = new IgniteFsConfiguration();
+    protected IgfsConfiguration ggfsConfiguration(String gridName) throws IgniteCheckedException {
+        IgfsConfiguration cfg = new IgfsConfiguration();
 
         cfg.setDataCacheName("partitioned");
         cfg.setMetaCacheName("replicated");
@@ -465,7 +465,7 @@ public abstract class IgfsHadoop20FileSystemAbstractSelfTest extends IgfsCommonA
         FSDataOutputStream os = fs.create(file, EnumSet.noneOf(CreateFlag.class),
             Options.CreateOpts.perms(FsPermission.getDefault()));
 
-        final int cnt = 5 * IgniteFsConfiguration.DFLT_BLOCK_SIZE; // Write 5 blocks.
+        final int cnt = 5 * IgfsConfiguration.DFLT_BLOCK_SIZE; // Write 5 blocks.
 
         for (int i = 0; i < cnt; i++)
             os.writeInt(i);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/88bf1443/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/IgfsHadoopDualAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/IgfsHadoopDualAbstractSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/IgfsHadoopDualAbstractSelfTest.java
index bd22437..09057c0 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/IgfsHadoopDualAbstractSelfTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/IgfsHadoopDualAbstractSelfTest.java
@@ -123,7 +123,7 @@ public abstract class IgfsHadoopDualAbstractSelfTest extends IgfsCommonAbstractT
      */
     protected Ignite startGridWithGgfs(String gridName, String ggfsName, IgfsMode mode,
         @Nullable Igfs secondaryFs, @Nullable Map<String, String> restCfg) throws Exception {
-        IgniteFsConfiguration ggfsCfg = new IgniteFsConfiguration();
+        IgfsConfiguration ggfsCfg = new IgfsConfiguration();
 
         ggfsCfg.setDataCacheName("dataCache");
         ggfsCfg.setMetaCacheName("metaCache");

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/88bf1443/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/IgfsHadoopFileSystemAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/IgfsHadoopFileSystemAbstractSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/IgfsHadoopFileSystemAbstractSelfTest.java
index 5d3ce4c..5b25a7c 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/IgfsHadoopFileSystemAbstractSelfTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/IgfsHadoopFileSystemAbstractSelfTest.java
@@ -172,7 +172,7 @@ public abstract class IgfsHadoopFileSystemAbstractSelfTest extends IgfsCommonAbs
     private void startNodes() throws Exception {
         if (mode != PRIMARY) {
             // Start secondary GGFS.
-            IgniteFsConfiguration ggfsCfg = new IgniteFsConfiguration();
+            IgfsConfiguration ggfsCfg = new IgfsConfiguration();
 
             ggfsCfg.setDataCacheName("partitioned");
             ggfsCfg.setMetaCacheName("replicated");
@@ -318,8 +318,8 @@ public abstract class IgfsHadoopFileSystemAbstractSelfTest extends IgfsCommonAbs
      * @param gridName Grid name.
      * @return GGFS configuration.
      */
-    protected IgniteFsConfiguration ggfsConfiguration(String gridName) throws IgniteCheckedException {
-        IgniteFsConfiguration cfg = new IgniteFsConfiguration();
+    protected IgfsConfiguration ggfsConfiguration(String gridName) throws IgniteCheckedException {
+        IgfsConfiguration cfg = new IgfsConfiguration();
 
         cfg.setDataCacheName("partitioned");
         cfg.setMetaCacheName("replicated");
@@ -648,7 +648,7 @@ public abstract class IgfsHadoopFileSystemAbstractSelfTest extends IgfsCommonAbs
 
         FSDataOutputStream os = fs.create(file, false, 128);
 
-        final int cnt = 5 * IgniteFsConfiguration.DFLT_BLOCK_SIZE; // Write 5 blocks.
+        final int cnt = 5 * IgfsConfiguration.DFLT_BLOCK_SIZE; // Write 5 blocks.
 
         for (int i = 0; i < cnt; i++)
             os.writeInt(i);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/88bf1443/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/IgfsHadoopFileSystemClientSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/IgfsHadoopFileSystemClientSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/IgfsHadoopFileSystemClientSelfTest.java
index 07faa60..0d85e43 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/IgfsHadoopFileSystemClientSelfTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/IgfsHadoopFileSystemClientSelfTest.java
@@ -66,7 +66,7 @@ public class IgfsHadoopFileSystemClientSelfTest extends IgfsCommonAbstractTest {
 
         cfg.setDiscoverySpi(discoSpi);
 
-        IgniteFsConfiguration ggfsCfg = new IgniteFsConfiguration();
+        IgfsConfiguration ggfsCfg = new IgfsConfiguration();
 
         ggfsCfg.setDataCacheName("partitioned");
         ggfsCfg.setMetaCacheName("replicated");

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/88bf1443/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/IgfsHadoopFileSystemHandshakeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/IgfsHadoopFileSystemHandshakeSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/IgfsHadoopFileSystemHandshakeSelfTest.java
index 6b44ea1..cb01395 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/IgfsHadoopFileSystemHandshakeSelfTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/IgfsHadoopFileSystemHandshakeSelfTest.java
@@ -227,7 +227,7 @@ public class IgfsHadoopFileSystemHandshakeSelfTest extends IgfsCommonAbstractTes
 
         cfg.setCacheConfiguration(metaCacheCfg, dataCacheCfg);
 
-        IgniteFsConfiguration ggfsCfg = new IgniteFsConfiguration();
+        IgfsConfiguration ggfsCfg = new IgfsConfiguration();
 
         ggfsCfg.setDataCacheName("partitioned");
         ggfsCfg.setMetaCacheName("replicated");

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/88bf1443/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/IgfsHadoopFileSystemIpcCacheSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/IgfsHadoopFileSystemIpcCacheSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/IgfsHadoopFileSystemIpcCacheSelfTest.java
index 7ea183c..9d94070 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/IgfsHadoopFileSystemIpcCacheSelfTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/IgfsHadoopFileSystemIpcCacheSelfTest.java
@@ -65,12 +65,12 @@ public class IgfsHadoopFileSystemIpcCacheSelfTest extends IgfsCommonAbstractTest
 
         cfg.setDiscoverySpi(discoSpi);
 
-        IgniteFsConfiguration ggfsCfg = new IgniteFsConfiguration();
+        IgfsConfiguration ggfsCfg = new IgfsConfiguration();
 
         ggfsCfg.setDataCacheName("partitioned");
         ggfsCfg.setMetaCacheName("replicated");
         ggfsCfg.setName("ggfs");
-        ggfsCfg.setManagementPort(IgniteFsConfiguration.DFLT_MGMT_PORT + cnt);
+        ggfsCfg.setManagementPort(IgfsConfiguration.DFLT_MGMT_PORT + cnt);
 
         ggfsCfg.setIpcEndpointConfiguration(new HashMap<String, String>() {{
             put("type", "shmem");

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/88bf1443/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/IgfsHadoopFileSystemLoggerStateSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/IgfsHadoopFileSystemLoggerStateSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/IgfsHadoopFileSystemLoggerStateSelfTest.java
index 6a785b9..19c0589 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/IgfsHadoopFileSystemLoggerStateSelfTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/IgfsHadoopFileSystemLoggerStateSelfTest.java
@@ -75,7 +75,7 @@ public class IgfsHadoopFileSystemLoggerStateSelfTest extends IgfsCommonAbstractT
      * @throws Exception If failed.
      */
     private void startUp() throws Exception {
-        IgniteFsConfiguration ggfsCfg = new IgniteFsConfiguration();
+        IgfsConfiguration ggfsCfg = new IgfsConfiguration();
 
         ggfsCfg.setDataCacheName("partitioned");
         ggfsCfg.setMetaCacheName("replicated");

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/88bf1443/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/IgfsHadoopFileSystemSecondaryModeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/IgfsHadoopFileSystemSecondaryModeSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/IgfsHadoopFileSystemSecondaryModeSelfTest.java
index 18e70e1..1b8605f 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/IgfsHadoopFileSystemSecondaryModeSelfTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/IgfsHadoopFileSystemSecondaryModeSelfTest.java
@@ -82,7 +82,7 @@ public class IgfsHadoopFileSystemSecondaryModeSelfTest extends IgfsCommonAbstrac
     private void startUp() throws Exception {
         startUpSecondary();
 
-        IgniteFsConfiguration ggfsCfg = new IgniteFsConfiguration();
+        IgfsConfiguration ggfsCfg = new IgfsConfiguration();
 
         ggfsCfg.setDataCacheName("partitioned");
         ggfsCfg.setMetaCacheName("replicated");
@@ -150,7 +150,7 @@ public class IgfsHadoopFileSystemSecondaryModeSelfTest extends IgfsCommonAbstrac
      * @throws Exception If failed.
      */
     private void startUpSecondary() throws Exception {
-        IgniteFsConfiguration ggfsCfg = new IgniteFsConfiguration();
+        IgfsConfiguration ggfsCfg = new IgfsConfiguration();
 
         ggfsCfg.setDataCacheName("partitioned");
         ggfsCfg.setMetaCacheName("replicated");

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/88bf1443/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/IgfsNearOnlyMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/IgfsNearOnlyMultiNodeSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/IgfsNearOnlyMultiNodeSelfTest.java
index 761de1e..f3b063c 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/IgfsNearOnlyMultiNodeSelfTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/IgfsNearOnlyMultiNodeSelfTest.java
@@ -75,7 +75,7 @@ public class IgfsNearOnlyMultiNodeSelfTest extends GridCommonAbstractTest {
 
         cfg.setDiscoverySpi(discoSpi);
 
-        IgniteFsConfiguration ggfsCfg = new IgniteFsConfiguration();
+        IgfsConfiguration ggfsCfg = new IgfsConfiguration();
 
         ggfsCfg.setDataCacheName("partitioned");
         ggfsCfg.setMetaCacheName("partitioned");

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/88bf1443/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopAbstractSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopAbstractSelfTest.java
index b422f2b..9119b79 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopAbstractSelfTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopAbstractSelfTest.java
@@ -129,8 +129,8 @@ public abstract class GridHadoopAbstractSelfTest extends GridCommonAbstractTest
     /**
      * @return GGFS configuration.
      */
-    public IgniteFsConfiguration ggfsConfiguration() {
-        IgniteFsConfiguration cfg = new IgniteFsConfiguration();
+    public IgfsConfiguration ggfsConfiguration() {
+        IgfsConfiguration cfg = new IgfsConfiguration();
 
         cfg.setName(ggfsName);
         cfg.setBlockSize(ggfsBlockSize);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/88bf1443/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopDefaultMapReducePlannerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopDefaultMapReducePlannerSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopDefaultMapReducePlannerSelfTest.java
index 10e1bd6..a516ac4 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopDefaultMapReducePlannerSelfTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopDefaultMapReducePlannerSelfTest.java
@@ -756,7 +756,7 @@ public class GridHadoopDefaultMapReducePlannerSelfTest extends GridHadoopAbstrac
         }
 
         /** {@inheritDoc} */
-        @Override public IgniteFsConfiguration configuration() {
+        @Override public IgfsConfiguration configuration() {
             return null;
         }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/88bf1443/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopTaskExecutionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopTaskExecutionSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopTaskExecutionSelfTest.java
index 4b09948..148bd59 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopTaskExecutionSelfTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopTaskExecutionSelfTest.java
@@ -72,8 +72,8 @@ public class GridHadoopTaskExecutionSelfTest extends GridHadoopAbstractSelfTest
 
 
     /** {@inheritDoc} */
-    @Override public IgniteFsConfiguration ggfsConfiguration() {
-        IgniteFsConfiguration cfg = super.ggfsConfiguration();
+    @Override public IgfsConfiguration ggfsConfiguration() {
+        IgfsConfiguration cfg = super.ggfsConfiguration();
 
         cfg.setFragmentizerEnabled(false);
 


Mime
View raw message