ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From voze...@apache.org
Subject [59/62] [abbrv] incubator-ignite git commit: # IGNITE-226: Removed Ignite FS.
Date Fri, 13 Feb 2015 16:14:23 GMT
# IGNITE-226: Removed Ignite FS.


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/fab12260
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/fab12260
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/fab12260

Branch: refs/heads/sprint-1
Commit: fab12260c75ad77fc5befa37ca082c264765b0cc
Parents: d2207c6
Author: vozerov-gridgain <vozerov@gridgain.com>
Authored: Fri Feb 13 18:39:28 2015 +0300
Committer: vozerov-gridgain <vozerov@gridgain.com>
Committed: Fri Feb 13 18:39:28 2015 +0300

----------------------------------------------------------------------
 config/hadoop/default-config.xml                |   6 +-
 docs/core-site.ignite.xml                       |  16 +-
 examples/config/filesystem/example-igfs.xml     | 165 +++++++++++
 examples/config/filesystem/example-ignitefs.xml | 165 -----------
 examples/config/filesystem/readme.txt           |   2 +-
 .../HibernateL2CacheExampleNodeStartup.java     |   2 +-
 .../ignite/examples/igfs/IgfsExample.java       | 278 +++++++++++++++++++
 .../examples/igfs/IgfsMapReduceExample.java     | 249 +++++++++++++++++
 .../ignite/examples/igfs/IgfsNodeStartup.java   |  41 +++
 .../apache/ignite/examples/igfs/package.html    |  24 ++
 .../ignite/examples/ignitefs/IgfsExample.java   | 278 -------------------
 .../examples/ignitefs/IgfsMapReduceExample.java | 249 -----------------
 .../examples/ignitefs/IgfsNodeStartup.java      |  41 ---
 .../ignite/examples/ignitefs/package.html       |  24 --
 .../MemcacheRestExampleNodeStartup.java         |   2 +-
 .../ignite/examples/IgfsExamplesSelfTest.java   |  14 +-
 .../main/java/org/apache/ignite/IgniteFs.java   |   4 +-
 .../igfs/IgfsGroupDataBlocksKeyMapper.java      |   2 +-
 .../igfs/mapreduce/IgfsRecordResolver.java      |   2 +-
 .../apache/ignite/igfs/mapreduce/IgfsTask.java  |   4 +-
 .../apache/ignite/internal/IgniteKernal.java    |   2 +-
 .../visor/igfs/VisorIgfsFormatTask.java         |   2 +-
 .../processors/igfs/IgfsAbstractSelfTest.java   |   4 +-
 ...IpcEndpointRegistrationAbstractSelfTest.java |  12 +-
 ...dpointRegistrationOnLinuxAndMacSelfTest.java |   6 +-
 ...pcEndpointRegistrationOnWindowsSelfTest.java |   2 +-
 .../IgfsHadoop20FileSystemAbstractSelfTest.java |   6 +-
 .../IgfsHadoopFileSystemAbstractSelfTest.java   |   6 +-
 pom.xml                                         |   8 +-
 29 files changed, 808 insertions(+), 808 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fab12260/config/hadoop/default-config.xml
----------------------------------------------------------------------
diff --git a/config/hadoop/default-config.xml b/config/hadoop/default-config.xml
index 33600bb..5fafad8 100644
--- a/config/hadoop/default-config.xml
+++ b/config/hadoop/default-config.xml
@@ -52,7 +52,7 @@
     <!--
         Abstract IGFS file system configuration to be used as a template.
     -->
-    <bean id="igfsCfgBase" class="org.apache.ignite.configuration.IgniteFsConfiguration" abstract="true">
+    <bean id="igfsCfgBase" class="org.apache.ignite.configuration.IgfsConfiguration" abstract="true">
         <!-- Must correlate with cache affinity mapper. -->
         <property name="blockSize" value="#{128 * 1024}"/>
         <property name="perNodeBatchSize" value="512"/>
@@ -70,7 +70,7 @@
         <property name="writeSynchronizationMode" value="FULL_SYNC"/>
         <property name="backups" value="0"/>
         <property name="affinityMapper">
-            <bean class="org.apache.ignite.igfs.IgniteFsGroupDataBlocksKeyMapper">
+            <bean class="org.apache.ignite.igfs.IgfsGroupDataBlocksKeyMapper">
                 <!-- How many sequential blocks will be stored on the same node. -->
                 <constructor-arg value="512"/>
             </bean>
@@ -114,7 +114,7 @@
         -->
         <property name="igfsConfiguration">
             <list>
-                <bean class="org.apache.ignite.configuration.IgniteFsConfiguration" parent="igfsCfgBase">
+                <bean class="org.apache.ignite.configuration.IgfsConfiguration" parent="igfsCfgBase">
                     <property name="name" value="igfs"/>
 
                     <!-- Caches with these names must be configured. -->

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fab12260/docs/core-site.ignite.xml
----------------------------------------------------------------------
diff --git a/docs/core-site.ignite.xml b/docs/core-site.ignite.xml
index 9aab773..ed11a79 100644
--- a/docs/core-site.ignite.xml
+++ b/docs/core-site.ignite.xml
@@ -20,13 +20,13 @@
 
 <!--
     This template file contains settings needed to run Apache Hadoop jobs
-    with Apache Ignite's distributed in-memory file system IgniteFS.
+    with Apache Ignite's distributed in-memory file system IGFS.
 
     You can replace '$HADOOP_HOME/etc/hadoop/core-site.xml' file with this one
-    to work with IgniteFS nodes running on localhost (these local nodes can be
+    to work with IGFS nodes running on localhost (these local nodes can be
     a part of distributed cluster though). To work with file system on remote
     hosts you need to change the host of file system URI to any host running
-    IgniteFS node.
+    IGFS node.
 
     Note that Ignite jars must be in Apache Hadoop client classpath to work
     with this configuration.
@@ -36,7 +36,7 @@
 
 <configuration>
     <!--
-        Set default file system to IgniteFS instance named "igfs" configured in Ignite.
+        Set default file system to IGFS instance named "igfs" configured in Ignite.
     -->
     <property>
         <name>fs.default.name</name>
@@ -44,7 +44,7 @@
     </property>
 
     <!--
-        Set Hadoop 1.* file system implementation class for IgniteFS.
+        Set Hadoop 1.* file system implementation class for IGFS.
     -->
     <property>
         <name>fs.igfs.impl</name>
@@ -52,7 +52,7 @@
     </property>
 
     <!--
-        Set Hadoop 2.* file system implementation class for IgniteFS.
+        Set Hadoop 2.* file system implementation class for IGFS.
     -->
     <property>
         <name>fs.AbstractFileSystem.igfs.impl</name>
@@ -60,7 +60,7 @@
     </property>
 
     <!--
-        Disallow data node replacement since it does not make sense for IgniteFS nodes.
+        Disallow data node replacement since it does not make sense for IGFS nodes.
     -->
     <property>
         <name>dfs.client.block.write.replace-datanode-on-failure.policy</name>
@@ -68,7 +68,7 @@
     </property>
 
     <!--
-        Allow to write the job statistics into IgniteFS.
+        Allow to write the job statistics into IGFS.
     -->
     <!--
     <property>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fab12260/examples/config/filesystem/example-igfs.xml
----------------------------------------------------------------------
diff --git a/examples/config/filesystem/example-igfs.xml b/examples/config/filesystem/example-igfs.xml
new file mode 100644
index 0000000..30cf51e
--- /dev/null
+++ b/examples/config/filesystem/example-igfs.xml
@@ -0,0 +1,165 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<!--
+    Ignite Spring configuration file to startup ignite cache.
+
+    When starting a standalone node, you need to execute the following command:
+    {IGNITE_HOME}/bin/ignite.{bat|sh} examples/config/filesystem/example-igfs.xml
+
+    When starting Ignite from Java IDE, pass path to this file into Ignition:
+    Ignition.start("examples/config/filesystem/example-igfs.xml");
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:util="http://www.springframework.org/schema/util"
+       xsi:schemaLocation="
+       http://www.springframework.org/schema/beans
+       http://www.springframework.org/schema/beans/spring-beans.xsd
+       http://www.springframework.org/schema/util
+       http://www.springframework.org/schema/util/spring-util.xsd">
+
+    <!--
+        Optional description.
+    -->
+    <description>
+        Spring file for ignite configuration with client available endpoints.
+    </description>
+
+    <!--
+        Initialize property configurer so we can reference environment variables.
+    -->
+    <bean id="propertyConfigurer" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+        <property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_FALLBACK"/>
+        <property name="searchSystemEnvironment" value="true"/>
+    </bean>
+
+    <!--
+        Configuration below demonstrates how to setup a IgniteFs node with file data.
+    -->
+    <bean id="ignite.cfg" class="org.apache.ignite.configuration.IgniteConfiguration">
+        <!-- Set to true to enable cluster-aware class loading for examples, default is false. -->
+        <property name="peerClassLoadingEnabled" value="true"/>
+
+        <property name="marshaller">
+            <bean class="org.apache.ignite.marshaller.optimized.OptimizedMarshaller">
+                <!-- Set to false to allow non-serializable objects in examples, default is true. -->
+                <property name="requireSerializable" value="false"/>
+            </bean>
+        </property>
+
+        <property name="igfsConfiguration">
+            <list>
+                <bean class="org.apache.ignite.configuration.IgfsConfiguration">
+                    <property name="name" value="igfs"/>
+                    <property name="metaCacheName" value="igfs-meta"/>
+                    <property name="dataCacheName" value="igfs-data"/>
+
+                    <!-- Must correlate with cache affinity mapper. -->
+                    <property name="blockSize" value="#{128 * 1024}"/>
+                    <property name="perNodeBatchSize" value="512"/>
+                    <property name="perNodeParallelBatchCount" value="16"/>
+
+                    <!-- Set number of prefetch blocks. -->
+                    <property name="prefetchBlocks" value="32"/>
+
+                    <!--
+                        This will disable IPC endpoint binding thus preventing Hadoop clients from connecting to IgniteFs.
+                        With this option set to false the only possible way to interact with IgniteFs is through
+                        Ignite API.
+                    -->
+                    <property name="ipcEndpointEnabled" value="false"/>
+
+                    <!--
+                        Example of configured IPC loopback endpoint.
+                    -->
+                    <!--
+                    <property name="ipcEndpointConfiguration">
+                        <map>
+                            <entry key="type" value="tcp"/>
+                        </map>
+                    </property>
+                    -->
+
+                    <!--
+                        Example of configured shared memory endpoint.
+                    -->
+                    <!--
+                    <property name="ipcEndpointConfiguration">
+                        <map>
+                            <entry key="type" value="shmem"/>
+                            <entry key="port" value="10500"/>
+                        </map>
+                    </property>
+                    -->
+                </bean>
+            </list>
+        </property>
+
+        <property name="cacheConfiguration">
+            <list>
+                <bean class="org.apache.ignite.configuration.CacheConfiguration">
+                    <property name="name" value="igfs-data"/>
+                    <property name="cacheMode" value="PARTITIONED"/>
+                    <property name="atomicityMode" value="TRANSACTIONAL"/>
+                    <property name="queryIndexEnabled" value="false"/>
+                    <property name="writeSynchronizationMode" value="FULL_SYNC"/>
+                    <property name="distributionMode" value="PARTITIONED_ONLY"/>
+                    <property name="backups" value="0"/>
+                    <property name="affinityMapper">
+                        <bean class="org.apache.ignite.igfs.IgfsGroupDataBlocksKeyMapper">
+                            <!-- Haw many blocks in row will be stored on the same node. -->
+                            <constructor-arg value="512"/>
+                        </bean>
+                    </property>
+                </bean>
+
+                <bean class="org.apache.ignite.configuration.CacheConfiguration">
+                    <property name="name" value="igfs-meta"/>
+                    <property name="cacheMode" value="REPLICATED"/>
+                    <property name="atomicityMode" value="TRANSACTIONAL"/>
+                    <property name="queryIndexEnabled" value="false"/>
+                    <property name="writeSynchronizationMode" value="FULL_SYNC"/>
+                </bean>
+            </list>
+        </property>
+
+        <!-- Explicitly configure TCP discovery SPI to provide list of initial nodes. -->
+        <property name="discoverySpi">
+            <bean class="org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi">
+                <property name="ipFinder">
+                    <!--
+                        Ignition provides several options for automatic discovery that can be used
+                        instead os static IP based discovery. For information on all options refer
+                        to our documentation: http://doc.gridgain.org/latest/Automatic+Node+Discovery
+                    -->
+                    <!-- Uncomment static IP finder to enable static-based discovery of initial nodes. -->
+                    <!--<bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder">-->
+                    <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.multicast.TcpDiscoveryMulticastIpFinder">
+                        <property name="addresses">
+                            <list>
+                                <!-- In distributed environment, replace with actual host IP address. -->
+                                <value>127.0.0.1:47500..47509</value>
+                            </list>
+                        </property>
+                    </bean>
+                </property>
+            </bean>
+        </property>
+    </bean>
+</beans>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fab12260/examples/config/filesystem/example-ignitefs.xml
----------------------------------------------------------------------
diff --git a/examples/config/filesystem/example-ignitefs.xml b/examples/config/filesystem/example-ignitefs.xml
deleted file mode 100644
index a1b0d01..0000000
--- a/examples/config/filesystem/example-ignitefs.xml
+++ /dev/null
@@ -1,165 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-
-<!--
-    Ignite Spring configuration file to startup ignite cache.
-
-    When starting a standalone node, you need to execute the following command:
-    {IGNITE_HOME}/bin/ignite.{bat|sh} examples/config/filesystem/example-ignitefs.xml
-
-    When starting Ignite from Java IDE, pass path to this file into Ignition:
-    Ignition.start("examples/config/filesystem/example-ignitefs.xml");
--->
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:util="http://www.springframework.org/schema/util"
-       xsi:schemaLocation="
-       http://www.springframework.org/schema/beans
-       http://www.springframework.org/schema/beans/spring-beans.xsd
-       http://www.springframework.org/schema/util
-       http://www.springframework.org/schema/util/spring-util.xsd">
-
-    <!--
-        Optional description.
-    -->
-    <description>
-        Spring file for ignite configuration with client available endpoints.
-    </description>
-
-    <!--
-        Initialize property configurer so we can reference environment variables.
-    -->
-    <bean id="propertyConfigurer" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
-        <property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_FALLBACK"/>
-        <property name="searchSystemEnvironment" value="true"/>
-    </bean>
-
-    <!--
-        Configuration below demonstrates how to setup a IgniteFs node with file data.
-    -->
-    <bean id="ignite.cfg" class="org.apache.ignite.configuration.IgniteConfiguration">
-        <!-- Set to true to enable cluster-aware class loading for examples, default is false. -->
-        <property name="peerClassLoadingEnabled" value="true"/>
-
-        <property name="marshaller">
-            <bean class="org.apache.ignite.marshaller.optimized.OptimizedMarshaller">
-                <!-- Set to false to allow non-serializable objects in examples, default is true. -->
-                <property name="requireSerializable" value="false"/>
-            </bean>
-        </property>
-
-        <property name="igfsConfiguration">
-            <list>
-                <bean class="org.apache.ignite.configuration.IgfsConfiguration">
-                    <property name="name" value="ignitefs"/>
-                    <property name="metaCacheName" value="ignitefs-meta"/>
-                    <property name="dataCacheName" value="ignitefs-data"/>
-
-                    <!-- Must correlate with cache affinity mapper. -->
-                    <property name="blockSize" value="#{128 * 1024}"/>
-                    <property name="perNodeBatchSize" value="512"/>
-                    <property name="perNodeParallelBatchCount" value="16"/>
-
-                    <!-- Set number of prefetch blocks. -->
-                    <property name="prefetchBlocks" value="32"/>
-
-                    <!--
-                        This will disable IPC endpoint binding thus preventing Hadoop clients from connecting to IgniteFs.
-                        With this option set to false the only possible way to interact with IgniteFs is through
-                        Ignite API.
-                    -->
-                    <property name="ipcEndpointEnabled" value="false"/>
-
-                    <!--
-                        Example of configured IPC loopback endpoint.
-                    -->
-                    <!--
-                    <property name="ipcEndpointConfiguration">
-                        <map>
-                            <entry key="type" value="tcp"/>
-                        </map>
-                    </property>
-                    -->
-
-                    <!--
-                        Example of configured shared memory endpoint.
-                    -->
-                    <!--
-                    <property name="ipcEndpointConfiguration">
-                        <map>
-                            <entry key="type" value="shmem"/>
-                            <entry key="port" value="10500"/>
-                        </map>
-                    </property>
-                    -->
-                </bean>
-            </list>
-        </property>
-
-        <property name="cacheConfiguration">
-            <list>
-                <bean class="org.apache.ignite.configuration.CacheConfiguration">
-                    <property name="name" value="ignitefs-data"/>
-                    <property name="cacheMode" value="PARTITIONED"/>
-                    <property name="atomicityMode" value="TRANSACTIONAL"/>
-                    <property name="queryIndexEnabled" value="false"/>
-                    <property name="writeSynchronizationMode" value="FULL_SYNC"/>
-                    <property name="distributionMode" value="PARTITIONED_ONLY"/>
-                    <property name="backups" value="0"/>
-                    <property name="affinityMapper">
-                        <bean class="org.apache.ignite.igfs.IgfsGroupDataBlocksKeyMapper">
-                            <!-- Haw many blocks in row will be stored on the same node. -->
-                            <constructor-arg value="512"/>
-                        </bean>
-                    </property>
-                </bean>
-
-                <bean class="org.apache.ignite.configuration.CacheConfiguration">
-                    <property name="name" value="ignitefs-meta"/>
-                    <property name="cacheMode" value="REPLICATED"/>
-                    <property name="atomicityMode" value="TRANSACTIONAL"/>
-                    <property name="queryIndexEnabled" value="false"/>
-                    <property name="writeSynchronizationMode" value="FULL_SYNC"/>
-                </bean>
-            </list>
-        </property>
-
-        <!-- Explicitly configure TCP discovery SPI to provide list of initial nodes. -->
-        <property name="discoverySpi">
-            <bean class="org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi">
-                <property name="ipFinder">
-                    <!--
-                        Ignition provides several options for automatic discovery that can be used
-                        instead os static IP based discovery. For information on all options refer
-                        to our documentation: http://doc.gridgain.org/latest/Automatic+Node+Discovery
-                    -->
-                    <!-- Uncomment static IP finder to enable static-based discovery of initial nodes. -->
-                    <!--<bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder">-->
-                    <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.multicast.TcpDiscoveryMulticastIpFinder">
-                        <property name="addresses">
-                            <list>
-                                <!-- In distributed environment, replace with actual host IP address. -->
-                                <value>127.0.0.1:47500..47509</value>
-                            </list>
-                        </property>
-                    </bean>
-                </property>
-            </bean>
-        </property>
-    </bean>
-</beans>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fab12260/examples/config/filesystem/readme.txt
----------------------------------------------------------------------
diff --git a/examples/config/filesystem/readme.txt b/examples/config/filesystem/readme.txt
index e2b1e44..c01881c 100644
--- a/examples/config/filesystem/readme.txt
+++ b/examples/config/filesystem/readme.txt
@@ -4,5 +4,5 @@ FileSystem Configuration Example
 This folder contains configuration files for IgniteFs examples located in
 org.apache.ignite.examples.fs package.
 
-- example-ignitefs.xml file is used to start Apache Ignite nodes with IgniteFS configured
+- example-igfs.xml file is used to start Apache Ignite nodes with IgniteFS configured
 - core-site.xml file is used to run Hadoop FS driver over IgniteFs

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fab12260/examples/src/main/java/org/apache/ignite/examples/datagrid/hibernate/HibernateL2CacheExampleNodeStartup.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/hibernate/HibernateL2CacheExampleNodeStartup.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/hibernate/HibernateL2CacheExampleNodeStartup.java
index c7f9c6c..cef6526 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datagrid/hibernate/HibernateL2CacheExampleNodeStartup.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/hibernate/HibernateL2CacheExampleNodeStartup.java
@@ -44,7 +44,7 @@ public class HibernateL2CacheExampleNodeStartup {
     }
 
     /**
-     * Create Ignite configuration with IgniteFs and enabled IPC.
+     * Create Ignite configuration with IGFS and enabled IPC.
      *
      * @return Ignite configuration.
      * @throws IgniteException If configuration creation failed.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fab12260/examples/src/main/java/org/apache/ignite/examples/igfs/IgfsExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/igfs/IgfsExample.java b/examples/src/main/java/org/apache/ignite/examples/igfs/IgfsExample.java
new file mode 100644
index 0000000..56f3fa4
--- /dev/null
+++ b/examples/src/main/java/org/apache/ignite/examples/igfs/IgfsExample.java
@@ -0,0 +1,278 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.examples.igfs;
+
+import org.apache.ignite.*;
+import org.apache.ignite.igfs.*;
+import org.jetbrains.annotations.*;
+
+import java.io.*;
+import java.util.*;
+
+/**
+ * Example that shows usage of {@link org.apache.ignite.IgniteFs} API. It starts a node with {@code IgniteFs}
+ * configured and performs several file system operations (create, write, append, read and delete
+ * files, create, list and delete directories).
+ * <p>
+ * Remote nodes should always be started with configuration file which includes
+ * IGFS: {@code 'ignite.sh examples/config/filesystem/example-igfs.xml'}.
+ * <p>
+ * Alternatively you can run {@link IgfsNodeStartup} in another JVM which will start
+ * node with {@code examples/config/filesystem/example-igfs.xml} configuration.
+ */
+public final class IgfsExample {
+    /**
+     * Executes example.
+     *
+     * @param args Command line arguments, none required.
+     * @throws Exception If example execution failed.
+     */
+    public static void main(String[] args) throws Exception {
+        Ignite ignite = Ignition.start("examples/config/filesystem/example-igfs.xml");
+
+        System.out.println();
+        System.out.println(">>> IGFS example started.");
+
+        try {
+            // Get an instance of Ignite File System.
+            IgniteFs fs = ignite.fileSystem("igfs");
+
+            // Working directory path.
+            IgfsPath workDir = new IgfsPath("/examples/fs");
+
+            // Cleanup working directory.
+            delete(fs, workDir);
+
+            // Create empty working directory.
+            mkdirs(fs, workDir);
+
+            // Print information for working directory.
+            printInfo(fs, workDir);
+
+            // File path.
+            IgfsPath filePath = new IgfsPath(workDir, "file.txt");
+
+            // Create file.
+            create(fs, filePath, new byte[] {1, 2, 3});
+
+            // Print information for file.
+            printInfo(fs, filePath);
+
+            // Append more data to previously created file.
+            append(fs, filePath, new byte[] {4, 5});
+
+            // Print information for file.
+            printInfo(fs, filePath);
+
+            // Read data from file.
+            read(fs, filePath);
+
+            // Delete file.
+            delete(fs, filePath);
+
+            // Print information for file.
+            printInfo(fs, filePath);
+
+            // Create several files.
+            for (int i = 0; i < 5; i++)
+                create(fs, new IgfsPath(workDir, "file-" + i + ".txt"), null);
+
+            list(fs, workDir);
+        }
+        finally {
+            Ignition.stop(false);
+        }
+    }
+
+    /**
+     * Deletes file or directory. If directory
+     * is not empty, it's deleted recursively.
+     *
+     * @param fs IGFS.
+     * @param path File or directory path.
+     * @throws IgniteException In case of error.
+     */
+    private static void delete(IgniteFs fs, IgfsPath path) throws IgniteException {
+        assert fs != null;
+        assert path != null;
+
+        if (fs.exists(path)) {
+            boolean isFile = fs.info(path).isFile();
+
+            try {
+                fs.delete(path, true);
+
+                System.out.println();
+                System.out.println(">>> Deleted " + (isFile ? "file" : "directory") + ": " + path);
+            }
+            catch (IgfsException e) {
+                System.out.println();
+                System.out.println(">>> Failed to delete " + (isFile ? "file" : "directory") + " [path=" + path +
+                    ", msg=" + e.getMessage() + ']');
+            }
+        }
+        else {
+            System.out.println();
+            System.out.println(">>> Won't delete file or directory (doesn't exist): " + path);
+        }
+    }
+
+    /**
+     * Creates directories.
+     *
+     * @param fs IGFS.
+     * @param path Directory path.
+     * @throws IgniteException In case of error.
+     */
+    private static void mkdirs(IgniteFs fs, IgfsPath path) throws IgniteException {
+        assert fs != null;
+        assert path != null;
+
+        try {
+            fs.mkdirs(path);
+
+            System.out.println();
+            System.out.println(">>> Created directory: " + path);
+        }
+        catch (IgfsException e) {
+            System.out.println();
+            System.out.println(">>> Failed to create a directory [path=" + path + ", msg=" + e.getMessage() + ']');
+        }
+
+        System.out.println();
+    }
+
+    /**
+     * Creates file and writes provided data to it.
+     *
+     * @param fs IGFS.
+     * @param path File path.
+     * @param data Data.
+     * @throws IgniteException If file can't be created.
+     * @throws IOException If data can't be written.
+     */
+    private static void create(IgniteFs fs, IgfsPath path, @Nullable byte[] data)
+        throws IgniteException, IOException {
+        assert fs != null;
+        assert path != null;
+
+        try (OutputStream out = fs.create(path, true)) {
+            System.out.println();
+            System.out.println(">>> Created file: " + path);
+
+            if (data != null) {
+                out.write(data);
+
+                System.out.println();
+                System.out.println(">>> Wrote data to file: " + path);
+            }
+        }
+
+        System.out.println();
+    }
+
+    /**
+     * Opens file and appends provided data to it.
+     *
+     * @param fs IGFS.
+     * @param path File path.
+     * @param data Data.
+     * @throws IgniteException If file can't be created.
+     * @throws IOException If data can't be written.
+     */
+    private static void append(IgniteFs fs, IgfsPath path, byte[] data) throws IgniteException, IOException {
+        assert fs != null;
+        assert path != null;
+        assert data != null;
+        assert fs.info(path).isFile();
+
+        try (OutputStream out = fs.append(path, true)) {
+            System.out.println();
+            System.out.println(">>> Opened file: " + path);
+
+            out.write(data);
+        }
+
+        System.out.println();
+        System.out.println(">>> Appended data to file: " + path);
+    }
+
+    /**
+     * Opens file and reads it to byte array.
+     *
+     * @param fs IgniteFs.
+     * @param path File path.
+     * @throws IgniteException If file can't be opened.
+     * @throws IOException If data can't be read.
+     */
+    private static void read(IgniteFs fs, IgfsPath path) throws IgniteException, IOException {
+        assert fs != null;
+        assert path != null;
+        assert fs.info(path).isFile();
+
+        byte[] data = new byte[(int)fs.info(path).length()];
+
+        try (IgfsInputStream in = fs.open(path)) {
+            in.read(data);
+        }
+
+        System.out.println();
+        System.out.println(">>> Read data from " + path + ": " + Arrays.toString(data));
+    }
+
+    /**
+     * Lists files in directory.
+     *
+     * @param fs IGFS.
+     * @param path Directory path.
+     * @throws IgniteException In case of error.
+     */
+    private static void list(IgniteFs fs, IgfsPath path) throws IgniteException {
+        assert fs != null;
+        assert path != null;
+        assert fs.info(path).isDirectory();
+
+        Collection<IgfsPath> files = fs.listPaths(path);
+
+        if (files.isEmpty()) {
+            System.out.println();
+            System.out.println(">>> No files in directory: " + path);
+        }
+        else {
+            System.out.println();
+            System.out.println(">>> List of files in directory: " + path);
+
+            for (IgfsPath f : files)
+                System.out.println(">>>     " + f.name());
+        }
+
+        System.out.println();
+    }
+
+    /**
+     * Prints information for file or directory.
+     *
+     * @param fs IGFS.
+     * @param path File or directory path.
+     * @throws IgniteException In case of error.
+     */
+    private static void printInfo(IgniteFs fs, IgfsPath path) throws IgniteException {
+        System.out.println();
+        System.out.println("Information for " + path + ": " + fs.info(path));
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fab12260/examples/src/main/java/org/apache/ignite/examples/igfs/IgfsMapReduceExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/igfs/IgfsMapReduceExample.java b/examples/src/main/java/org/apache/ignite/examples/igfs/IgfsMapReduceExample.java
new file mode 100644
index 0000000..22a66a3
--- /dev/null
+++ b/examples/src/main/java/org/apache/ignite/examples/igfs/IgfsMapReduceExample.java
@@ -0,0 +1,249 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.examples.igfs;
+
+import org.apache.ignite.*;
+import org.apache.ignite.compute.*;
+import org.apache.ignite.igfs.*;
+import org.apache.ignite.igfs.mapreduce.*;
+import org.apache.ignite.igfs.mapreduce.records.*;
+
+import java.io.*;
+import java.util.*;
+
+/**
+ * Example that shows how to use {@link org.apache.ignite.igfs.mapreduce.IgfsTask} to find lines matching particular pattern in the file in pretty
+ * the same way as {@code grep} command does.
+ * <p>
+ * Remote nodes should always be started with configuration file which includes
+ * IGFS: {@code 'ignite.sh examples/config/filesystem/example-igfs.xml'}.
+ * <p>
+ * Alternatively you can run {@link IgfsNodeStartup} in another JVM which will start
+ * node with {@code examples/config/filesystem/example-igfs.xml} configuration.
+ */
+public class IgfsMapReduceExample {
+    /**
+     * Executes example.
+     *
+     * @param args Command line arguments. First argument is file name, second argument is regex to look for.
+     * @throws Exception If failed.
+     */
+    public static void main(String[] args) throws Exception {
+        if (args.length == 0)
+            System.out.println("Please provide file name and regular expression.");
+        else if (args.length == 1)
+            System.out.println("Please provide regular expression.");
+        else {
+            try (Ignite ignite = Ignition.start("examples/config/filesystem/example-igfs.xml")) {
+                System.out.println();
+                System.out.println(">>> IGFS map reduce example started.");
+
+                // Prepare arguments.
+                String fileName = args[0];
+
+                File file = new File(fileName);
+
+                String regexStr = args[1];
+
+                // Get an instance of Ignite File System.
+                IgniteFs fs = ignite.fileSystem("igfs");
+
+                // Working directory path.
+                IgfsPath workDir = new IgfsPath("/examples/fs");
+
+                // Write file to IGFS.
+                IgfsPath fsPath = new IgfsPath(workDir, file.getName());
+
+                writeFile(fs, fsPath, file);
+
+                Collection<Line> lines = fs.execute(new GrepTask(), IgfsNewLineRecordResolver.NEW_LINE,
+                    Collections.singleton(fsPath), regexStr);
+
+                if (lines.isEmpty()) {
+                    System.out.println();
+                    System.out.println("No lines were found.");
+                }
+                else {
+                    for (Line line : lines)
+                        print(line.fileLine());
+                }
+            }
+        }
+    }
+
+    /**
+     * Write file to the Ignite file system.
+     *
+     * @param fs Ignite file system.
+     * @param fsPath Ignite file system path.
+     * @param file File to write.
+     * @throws Exception In case of exception.
+     */
+    private static void writeFile(IgniteFs fs, IgfsPath fsPath, File file) throws Exception {
+        System.out.println();
+        System.out.println("Copying file to IGFS: " + file);
+
+        try (
+            IgfsOutputStream os = fs.create(fsPath, true);
+            FileInputStream fis = new FileInputStream(file)
+        ) {
+            byte[] buf = new byte[2048];
+
+            int read = fis.read(buf);
+
+            while (read != -1) {
+                os.write(buf, 0, read);
+
+                read = fis.read(buf);
+            }
+        }
+    }
+
+    /**
+     * Print particular string.
+     *
+     * @param str String.
+     */
+    private static void print(String str) {
+        System.out.println(">>> " + str);
+    }
+
+    /**
+     * Grep task.
+     */
+    private static class GrepTask extends IgfsTask<String, Collection<Line>> {
+        /** {@inheritDoc} */
+        @Override public IgfsJob createJob(IgfsPath path, IgfsFileRange range,
+            IgfsTaskArgs<String> args) {
+            return new GrepJob(args.userArgument());
+        }
+
+        /** {@inheritDoc} */
+        @Override public Collection<Line> reduce(List<ComputeJobResult> results) {
+            Collection<Line> lines = new TreeSet<>(new Comparator<Line>() {
+                @Override public int compare(Line line1, Line line2) {
+                    return line1.rangePosition() < line2.rangePosition() ? -1 :
+                        line1.rangePosition() > line2.rangePosition() ? 1 : line1.lineIndex() - line2.lineIndex();
+                }
+            });
+
+            for (ComputeJobResult res : results) {
+                if (res.getException() != null)
+                    throw res.getException();
+
+                Collection<Line> line = res.getData();
+
+                if (line != null)
+                    lines.addAll(line);
+            }
+
+            return lines;
+        }
+    }
+
+    /**
+     * Grep job.
+     */
+    private static class GrepJob extends IgfsInputStreamJobAdapter {
+        /** Regex string. */
+        private final String regex;
+
+        /**
+         * Constructor.
+         *
+         * @param regex Regex string.
+         */
+        private GrepJob(String regex) {
+            this.regex = regex;
+        }
+
+        /**  {@inheritDoc} */
+        @Override public Object execute(IgniteFs igfs, IgfsRangeInputStream in) throws IgniteException, IOException {
+            Collection<Line> res = null;
+
+            long start = in.startOffset();
+
+            try (BufferedReader br = new BufferedReader(new InputStreamReader(in))) {
+                int ctr = 0;
+
+                String line = br.readLine();
+
+                while (line != null) {
+                    if (line.matches(".*" + regex + ".*")) {
+                        if (res == null)
+                            res = new HashSet<>();
+
+                        res.add(new Line(start, ctr++, line));
+                    }
+
+                    line = br.readLine();
+                }
+            }
+
+            return res;
+        }
+    }
+
+    /**
+     * Single file line with it's position.
+     */
+    private static class Line {
+        /** Line start position in the file. */
+        private long rangePos;
+
+        /** Matching line index within the range. */
+        private final int lineIdx;
+
+        /** File line. */
+        private String line;
+
+        /**
+         * Constructor.
+         *
+         * @param rangePos Range position.
+         * @param lineIdx Matching line index within the range.
+         * @param line File line.
+         */
+        private Line(long rangePos, int lineIdx, String line) {
+            this.rangePos = rangePos;
+            this.lineIdx = lineIdx;
+            this.line = line;
+        }
+
+        /**
+         * @return Range position.
+         */
+        public long rangePosition() {
+            return rangePos;
+        }
+
+        /**
+         * @return Matching line index within the range.
+         */
+        public int lineIndex() {
+            return lineIdx;
+        }
+
+        /**
+         * @return File line.
+         */
+        public String fileLine() {
+            return line;
+        }
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fab12260/examples/src/main/java/org/apache/ignite/examples/igfs/IgfsNodeStartup.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/igfs/IgfsNodeStartup.java b/examples/src/main/java/org/apache/ignite/examples/igfs/IgfsNodeStartup.java
new file mode 100644
index 0000000..20ddcbd
--- /dev/null
+++ b/examples/src/main/java/org/apache/ignite/examples/igfs/IgfsNodeStartup.java
@@ -0,0 +1,41 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.examples.igfs;
+
+import org.apache.ignite.*;
+
+/**
+ * Starts up an empty node with IGFS configuration.
+ * You can also start a stand-alone Ignite instance by passing the path
+ * to configuration file to {@code 'ignite.{sh|bat}'} script, like so:
+ * {@code 'ignite.sh examples/config/filesystem/example-igfs.xml'}.
+ * <p>
+ * The difference is that running this class from IDE adds all example classes to classpath
+ * but running from command line doesn't.
+ */
+public class IgfsNodeStartup {
+    /**
+     * Start up an empty node with specified cache configuration.
+     *
+     * @param args Command line arguments, none required.
+     * @throws IgniteException If example execution failed.
+     */
+    public static void main(String[] args) throws IgniteException {
+        Ignition.start("examples/config/filesystem/example-igfs.xml");
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fab12260/examples/src/main/java/org/apache/ignite/examples/igfs/package.html
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/igfs/package.html b/examples/src/main/java/org/apache/ignite/examples/igfs/package.html
new file mode 100644
index 0000000..1257c60
--- /dev/null
+++ b/examples/src/main/java/org/apache/ignite/examples/igfs/package.html
@@ -0,0 +1,24 @@
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<body>
+    <!-- Package description. -->
+    Demonstrates usage of Ignite File System.
+</body>
+</html>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fab12260/examples/src/main/java/org/apache/ignite/examples/ignitefs/IgfsExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/ignitefs/IgfsExample.java b/examples/src/main/java/org/apache/ignite/examples/ignitefs/IgfsExample.java
deleted file mode 100644
index 375fc4d..0000000
--- a/examples/src/main/java/org/apache/ignite/examples/ignitefs/IgfsExample.java
+++ /dev/null
@@ -1,278 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.examples.ignitefs;
-
-import org.apache.ignite.*;
-import org.apache.ignite.igfs.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.util.*;
-
-/**
- * Example that shows usage of {@link org.apache.ignite.IgniteFs} API. It starts a node with {@code IgniteFs}
- * configured and performs several file system operations (create, write, append, read and delete
- * files, create, list and delete directories).
- * <p>
- * Remote nodes should always be started with configuration file which includes
- * IgniteFs: {@code 'ignite.sh examples/config/filesystem/example-ignitefs.xml'}.
- * <p>
- * Alternatively you can run {@link IgfsNodeStartup} in another JVM which will start
- * node with {@code examples/config/filesystem/example-ignitefs.xml} configuration.
- */
-public final class IgfsExample {
-    /**
-     * Executes example.
-     *
-     * @param args Command line arguments, none required.
-     * @throws Exception If example execution failed.
-     */
-    public static void main(String[] args) throws Exception {
-        Ignite ignite = Ignition.start("examples/config/filesystem/example-ignitefs.xml");
-
-        System.out.println();
-        System.out.println(">>> IgniteFs example started.");
-
-        try {
-            // Get an instance of Ignite File System.
-            IgniteFs fs = ignite.fileSystem("ignitefs");
-
-            // Working directory path.
-            IgfsPath workDir = new IgfsPath("/examples/fs");
-
-            // Cleanup working directory.
-            delete(fs, workDir);
-
-            // Create empty working directory.
-            mkdirs(fs, workDir);
-
-            // Print information for working directory.
-            printInfo(fs, workDir);
-
-            // File path.
-            IgfsPath filePath = new IgfsPath(workDir, "file.txt");
-
-            // Create file.
-            create(fs, filePath, new byte[] {1, 2, 3});
-
-            // Print information for file.
-            printInfo(fs, filePath);
-
-            // Append more data to previously created file.
-            append(fs, filePath, new byte[] {4, 5});
-
-            // Print information for file.
-            printInfo(fs, filePath);
-
-            // Read data from file.
-            read(fs, filePath);
-
-            // Delete file.
-            delete(fs, filePath);
-
-            // Print information for file.
-            printInfo(fs, filePath);
-
-            // Create several files.
-            for (int i = 0; i < 5; i++)
-                create(fs, new IgfsPath(workDir, "file-" + i + ".txt"), null);
-
-            list(fs, workDir);
-        }
-        finally {
-            Ignition.stop(false);
-        }
-    }
-
-    /**
-     * Deletes file or directory. If directory
-     * is not empty, it's deleted recursively.
-     *
-     * @param fs IgniteFs.
-     * @param path File or directory path.
-     * @throws IgniteException In case of error.
-     */
-    private static void delete(IgniteFs fs, IgfsPath path) throws IgniteException {
-        assert fs != null;
-        assert path != null;
-
-        if (fs.exists(path)) {
-            boolean isFile = fs.info(path).isFile();
-
-            try {
-                fs.delete(path, true);
-
-                System.out.println();
-                System.out.println(">>> Deleted " + (isFile ? "file" : "directory") + ": " + path);
-            }
-            catch (IgfsException e) {
-                System.out.println();
-                System.out.println(">>> Failed to delete " + (isFile ? "file" : "directory") + " [path=" + path +
-                    ", msg=" + e.getMessage() + ']');
-            }
-        }
-        else {
-            System.out.println();
-            System.out.println(">>> Won't delete file or directory (doesn't exist): " + path);
-        }
-    }
-
-    /**
-     * Creates directories.
-     *
-     * @param fs IgniteFs.
-     * @param path Directory path.
-     * @throws IgniteException In case of error.
-     */
-    private static void mkdirs(IgniteFs fs, IgfsPath path) throws IgniteException {
-        assert fs != null;
-        assert path != null;
-
-        try {
-            fs.mkdirs(path);
-
-            System.out.println();
-            System.out.println(">>> Created directory: " + path);
-        }
-        catch (IgfsException e) {
-            System.out.println();
-            System.out.println(">>> Failed to create a directory [path=" + path + ", msg=" + e.getMessage() + ']');
-        }
-
-        System.out.println();
-    }
-
-    /**
-     * Creates file and writes provided data to it.
-     *
-     * @param fs IgniteFs.
-     * @param path File path.
-     * @param data Data.
-     * @throws IgniteException If file can't be created.
-     * @throws IOException If data can't be written.
-     */
-    private static void create(IgniteFs fs, IgfsPath path, @Nullable byte[] data)
-        throws IgniteException, IOException {
-        assert fs != null;
-        assert path != null;
-
-        try (OutputStream out = fs.create(path, true)) {
-            System.out.println();
-            System.out.println(">>> Created file: " + path);
-
-            if (data != null) {
-                out.write(data);
-
-                System.out.println();
-                System.out.println(">>> Wrote data to file: " + path);
-            }
-        }
-
-        System.out.println();
-    }
-
-    /**
-     * Opens file and appends provided data to it.
-     *
-     * @param fs IgniteFs.
-     * @param path File path.
-     * @param data Data.
-     * @throws IgniteException If file can't be created.
-     * @throws IOException If data can't be written.
-     */
-    private static void append(IgniteFs fs, IgfsPath path, byte[] data) throws IgniteException, IOException {
-        assert fs != null;
-        assert path != null;
-        assert data != null;
-        assert fs.info(path).isFile();
-
-        try (OutputStream out = fs.append(path, true)) {
-            System.out.println();
-            System.out.println(">>> Opened file: " + path);
-
-            out.write(data);
-        }
-
-        System.out.println();
-        System.out.println(">>> Appended data to file: " + path);
-    }
-
-    /**
-     * Opens file and reads it to byte array.
-     *
-     * @param fs IgniteFs.
-     * @param path File path.
-     * @throws IgniteException If file can't be opened.
-     * @throws IOException If data can't be read.
-     */
-    private static void read(IgniteFs fs, IgfsPath path) throws IgniteException, IOException {
-        assert fs != null;
-        assert path != null;
-        assert fs.info(path).isFile();
-
-        byte[] data = new byte[(int)fs.info(path).length()];
-
-        try (IgfsInputStream in = fs.open(path)) {
-            in.read(data);
-        }
-
-        System.out.println();
-        System.out.println(">>> Read data from " + path + ": " + Arrays.toString(data));
-    }
-
-    /**
-     * Lists files in directory.
-     *
-     * @param fs IgniteFs.
-     * @param path Directory path.
-     * @throws IgniteException In case of error.
-     */
-    private static void list(IgniteFs fs, IgfsPath path) throws IgniteException {
-        assert fs != null;
-        assert path != null;
-        assert fs.info(path).isDirectory();
-
-        Collection<IgfsPath> files = fs.listPaths(path);
-
-        if (files.isEmpty()) {
-            System.out.println();
-            System.out.println(">>> No files in directory: " + path);
-        }
-        else {
-            System.out.println();
-            System.out.println(">>> List of files in directory: " + path);
-
-            for (IgfsPath f : files)
-                System.out.println(">>>     " + f.name());
-        }
-
-        System.out.println();
-    }
-
-    /**
-     * Prints information for file or directory.
-     *
-     * @param fs IgniteFs.
-     * @param path File or directory path.
-     * @throws IgniteException In case of error.
-     */
-    private static void printInfo(IgniteFs fs, IgfsPath path) throws IgniteException {
-        System.out.println();
-        System.out.println("Information for " + path + ": " + fs.info(path));
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fab12260/examples/src/main/java/org/apache/ignite/examples/ignitefs/IgfsMapReduceExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/ignitefs/IgfsMapReduceExample.java b/examples/src/main/java/org/apache/ignite/examples/ignitefs/IgfsMapReduceExample.java
deleted file mode 100644
index e55a714..0000000
--- a/examples/src/main/java/org/apache/ignite/examples/ignitefs/IgfsMapReduceExample.java
+++ /dev/null
@@ -1,249 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.examples.ignitefs;
-
-import org.apache.ignite.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.igfs.*;
-import org.apache.ignite.igfs.mapreduce.*;
-import org.apache.ignite.igfs.mapreduce.records.*;
-
-import java.io.*;
-import java.util.*;
-
-/**
- * Example that shows how to use {@link org.apache.ignite.igfs.mapreduce.IgfsTask} to find lines matching particular pattern in the file in pretty
- * the same way as {@code grep} command does.
- * <p>
- * Remote nodes should always be started with configuration file which includes
- * IgniteFs: {@code 'ignite.sh examples/config/filesystem/example-ignitefs.xml'}.
- * <p>
- * Alternatively you can run {@link IgfsNodeStartup} in another JVM which will start
- * node with {@code examples/config/filesystem/example-ignitefs.xml} configuration.
- */
-public class IgfsMapReduceExample {
-    /**
-     * Executes example.
-     *
-     * @param args Command line arguments. First argument is file name, second argument is regex to look for.
-     * @throws Exception If failed.
-     */
-    public static void main(String[] args) throws Exception {
-        if (args.length == 0)
-            System.out.println("Please provide file name and regular expression.");
-        else if (args.length == 1)
-            System.out.println("Please provide regular expression.");
-        else {
-            try (Ignite ignite = Ignition.start("examples/config/filesystem/example-ignitefs.xml")) {
-                System.out.println();
-                System.out.println(">>> IgniteFs map reduce example started.");
-
-                // Prepare arguments.
-                String fileName = args[0];
-
-                File file = new File(fileName);
-
-                String regexStr = args[1];
-
-                // Get an instance of Ignite File System.
-                IgniteFs fs = ignite.fileSystem("ignitefs");
-
-                // Working directory path.
-                IgfsPath workDir = new IgfsPath("/examples/fs");
-
-                // Write file to IGFS.
-                IgfsPath fsPath = new IgfsPath(workDir, file.getName());
-
-                writeFile(fs, fsPath, file);
-
-                Collection<Line> lines = fs.execute(new GrepTask(), IgfsNewLineRecordResolver.NEW_LINE,
-                    Collections.singleton(fsPath), regexStr);
-
-                if (lines.isEmpty()) {
-                    System.out.println();
-                    System.out.println("No lines were found.");
-                }
-                else {
-                    for (Line line : lines)
-                        print(line.fileLine());
-                }
-            }
-        }
-    }
-
-    /**
-     * Write file to the Ignite file system.
-     *
-     * @param fs Ignite file system.
-     * @param fsPath Ignite file system path.
-     * @param file File to write.
-     * @throws Exception In case of exception.
-     */
-    private static void writeFile(IgniteFs fs, IgfsPath fsPath, File file) throws Exception {
-        System.out.println();
-        System.out.println("Copying file to IgniteFs: " + file);
-
-        try (
-            IgfsOutputStream os = fs.create(fsPath, true);
-            FileInputStream fis = new FileInputStream(file)
-        ) {
-            byte[] buf = new byte[2048];
-
-            int read = fis.read(buf);
-
-            while (read != -1) {
-                os.write(buf, 0, read);
-
-                read = fis.read(buf);
-            }
-        }
-    }
-
-    /**
-     * Print particular string.
-     *
-     * @param str String.
-     */
-    private static void print(String str) {
-        System.out.println(">>> " + str);
-    }
-
-    /**
-     * Grep task.
-     */
-    private static class GrepTask extends IgfsTask<String, Collection<Line>> {
-        /** {@inheritDoc} */
-        @Override public IgfsJob createJob(IgfsPath path, IgfsFileRange range,
-            IgfsTaskArgs<String> args) {
-            return new GrepJob(args.userArgument());
-        }
-
-        /** {@inheritDoc} */
-        @Override public Collection<Line> reduce(List<ComputeJobResult> results) {
-            Collection<Line> lines = new TreeSet<>(new Comparator<Line>() {
-                @Override public int compare(Line line1, Line line2) {
-                    return line1.rangePosition() < line2.rangePosition() ? -1 :
-                        line1.rangePosition() > line2.rangePosition() ? 1 : line1.lineIndex() - line2.lineIndex();
-                }
-            });
-
-            for (ComputeJobResult res : results) {
-                if (res.getException() != null)
-                    throw res.getException();
-
-                Collection<Line> line = res.getData();
-
-                if (line != null)
-                    lines.addAll(line);
-            }
-
-            return lines;
-        }
-    }
-
-    /**
-     * Grep job.
-     */
-    private static class GrepJob extends IgfsInputStreamJobAdapter {
-        /** Regex string. */
-        private final String regex;
-
-        /**
-         * Constructor.
-         *
-         * @param regex Regex string.
-         */
-        private GrepJob(String regex) {
-            this.regex = regex;
-        }
-
-        /**  {@inheritDoc} */
-        @Override public Object execute(IgniteFs igfs, IgfsRangeInputStream in) throws IgniteException, IOException {
-            Collection<Line> res = null;
-
-            long start = in.startOffset();
-
-            try (BufferedReader br = new BufferedReader(new InputStreamReader(in))) {
-                int ctr = 0;
-
-                String line = br.readLine();
-
-                while (line != null) {
-                    if (line.matches(".*" + regex + ".*")) {
-                        if (res == null)
-                            res = new HashSet<>();
-
-                        res.add(new Line(start, ctr++, line));
-                    }
-
-                    line = br.readLine();
-                }
-            }
-
-            return res;
-        }
-    }
-
-    /**
-     * Single file line with it's position.
-     */
-    private static class Line {
-        /** Line start position in the file. */
-        private long rangePos;
-
-        /** Matching line index within the range. */
-        private final int lineIdx;
-
-        /** File line. */
-        private String line;
-
-        /**
-         * Constructor.
-         *
-         * @param rangePos Range position.
-         * @param lineIdx Matching line index within the range.
-         * @param line File line.
-         */
-        private Line(long rangePos, int lineIdx, String line) {
-            this.rangePos = rangePos;
-            this.lineIdx = lineIdx;
-            this.line = line;
-        }
-
-        /**
-         * @return Range position.
-         */
-        public long rangePosition() {
-            return rangePos;
-        }
-
-        /**
-         * @return Matching line index within the range.
-         */
-        public int lineIndex() {
-            return lineIdx;
-        }
-
-        /**
-         * @return File line.
-         */
-        public String fileLine() {
-            return line;
-        }
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fab12260/examples/src/main/java/org/apache/ignite/examples/ignitefs/IgfsNodeStartup.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/ignitefs/IgfsNodeStartup.java b/examples/src/main/java/org/apache/ignite/examples/ignitefs/IgfsNodeStartup.java
deleted file mode 100644
index cbf2b77..0000000
--- a/examples/src/main/java/org/apache/ignite/examples/ignitefs/IgfsNodeStartup.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.examples.ignitefs;
-
-import org.apache.ignite.*;
-
-/**
- * Starts up an empty node with IgniteFs configuration.
- * You can also start a stand-alone Ignite instance by passing the path
- * to configuration file to {@code 'ignite.{sh|bat}'} script, like so:
- * {@code 'ignite.sh examples/config/filesystem/example-ignitefs.xml'}.
- * <p>
- * The difference is that running this class from IDE adds all example classes to classpath
- * but running from command line doesn't.
- */
-public class IgfsNodeStartup {
-    /**
-     * Start up an empty node with specified cache configuration.
-     *
-     * @param args Command line arguments, none required.
-     * @throws IgniteException If example execution failed.
-     */
-    public static void main(String[] args) throws IgniteException {
-        Ignition.start("examples/config/filesystem/example-ignitefs.xml");
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fab12260/examples/src/main/java/org/apache/ignite/examples/ignitefs/package.html
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/ignitefs/package.html b/examples/src/main/java/org/apache/ignite/examples/ignitefs/package.html
deleted file mode 100644
index 1257c60..0000000
--- a/examples/src/main/java/org/apache/ignite/examples/ignitefs/package.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<body>
-    <!-- Package description. -->
-    Demonstrates usage of Ignite File System.
-</body>
-</html>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fab12260/examples/src/main/java/org/apache/ignite/examples/misc/client/memcache/MemcacheRestExampleNodeStartup.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/misc/client/memcache/MemcacheRestExampleNodeStartup.java b/examples/src/main/java/org/apache/ignite/examples/misc/client/memcache/MemcacheRestExampleNodeStartup.java
index 96d4286..1b2b41e 100644
--- a/examples/src/main/java/org/apache/ignite/examples/misc/client/memcache/MemcacheRestExampleNodeStartup.java
+++ b/examples/src/main/java/org/apache/ignite/examples/misc/client/memcache/MemcacheRestExampleNodeStartup.java
@@ -49,7 +49,7 @@ public class MemcacheRestExampleNodeStartup {
     }
 
     /**
-     * Create Ignite configuration with IgniteFs and enabled IPC.
+     * Create Ignite configuration with IGFS and enabled IPC.
      *
      * @return Ignite configuration.
      * @throws IgniteException If configuration creation failed.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fab12260/examples/src/test/java/org/apache/ignite/examples/IgfsExamplesSelfTest.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java/org/apache/ignite/examples/IgfsExamplesSelfTest.java b/examples/src/test/java/org/apache/ignite/examples/IgfsExamplesSelfTest.java
index daf1953..8365b00 100644
--- a/examples/src/test/java/org/apache/ignite/examples/IgfsExamplesSelfTest.java
+++ b/examples/src/test/java/org/apache/ignite/examples/IgfsExamplesSelfTest.java
@@ -17,25 +17,25 @@
 
 package org.apache.ignite.examples;
 
-import org.apache.ignite.examples.ignitefs.*;
+import org.apache.ignite.examples.igfs.*;
 import org.apache.ignite.internal.util.typedef.internal.*;
 import org.apache.ignite.testframework.junits.common.*;
 
 /**
- * IgniteFs examples self test.
+ * IGFS examples self test.
  */
 public class IgfsExamplesSelfTest extends GridAbstractExamplesTest {
-    /** IgniteFs config with shared memory IPC. */
-    private static final String IGNITEFS_SHMEM_CFG = "modules/core/src/test/config/igfs-shmem.xml";
+    /** IGFS config with shared memory IPC. */
+    private static final String IGFS_SHMEM_CFG = "modules/core/src/test/config/igfs-shmem.xml";
 
-    /** IgniteFs config with loopback IPC. */
-    private static final String IGNITEFS_LOOPBACK_CFG = "modules/core/src/test/config/igfs-loopback.xml";
+    /** IGFS config with loopback IPC. */
+    private static final String IGFS_LOOPBACK_CFG = "modules/core/src/test/config/igfs-loopback.xml";
 
     /**
      * @throws Exception If failed.
      */
     public void testIgniteFsApiExample() throws Exception {
-        String configPath = U.isWindows() ? IGNITEFS_LOOPBACK_CFG : IGNITEFS_SHMEM_CFG;
+        String configPath = U.isWindows() ? IGFS_LOOPBACK_CFG : IGFS_SHMEM_CFG;
 
         try {
             startGrid("test1", configPath);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fab12260/modules/core/src/main/java/org/apache/ignite/IgniteFs.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteFs.java b/modules/core/src/main/java/org/apache/ignite/IgniteFs.java
index ce8ebcf..044c03b 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteFs.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteFs.java
@@ -64,9 +64,9 @@ public interface IgniteFs extends Igfs, IgniteAsyncSupport {
     public static final String PROP_PREFER_LOCAL_WRITES = "locWrite";
 
     /**
-     * Gets IgniteFS name.
+     * Gets IGFS name.
      *
-     * @return IgniteFS name, or {@code null} for default file system.
+     * @return IGFS name, or {@code null} for default file system.
      */
     public String name();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fab12260/modules/core/src/main/java/org/apache/ignite/igfs/IgfsGroupDataBlocksKeyMapper.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsGroupDataBlocksKeyMapper.java b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsGroupDataBlocksKeyMapper.java
index 0012550..1c49232 100644
--- a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsGroupDataBlocksKeyMapper.java
+++ b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsGroupDataBlocksKeyMapper.java
@@ -44,7 +44,7 @@ import org.apache.ignite.internal.util.typedef.internal.*;
  * &lt;bean id="cacheCfgBase" class="org.apache.ignite.cache.CacheConfiguration" abstract="true"&gt;
  *     ...
  *     &lt;property name="affinityMapper"&gt;
- *         &lt;bean class="org.apache.ignite.ignitefs.IgniteFsGroupDataBlocksKeyMapper"&gt;
+ *         &lt;bean class="org.apache.ignite.igfs.IgfsGroupDataBlocksKeyMapper"&gt;
  *             &lt;!-- How many sequential blocks will be stored on the same node. --&gt;
  *             &lt;constructor-arg value="512"/&gt;
  *         &lt;/bean&gt;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fab12260/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/IgfsRecordResolver.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/IgfsRecordResolver.java b/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/IgfsRecordResolver.java
index c3c62c1..52afeda 100644
--- a/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/IgfsRecordResolver.java
+++ b/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/IgfsRecordResolver.java
@@ -44,7 +44,7 @@ public interface IgfsRecordResolver extends Serializable {
     /**
      * Adjusts record start offset and length.
      *
-     * @param fs IgniteFs instance to use.
+     * @param fs IGFS instance to use.
      * @param stream Input stream for split file.
      * @param suggestedRecord Suggested file system record.
      * @return New adjusted record. If this method returns {@code null}, original record is ignored.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fab12260/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/IgfsTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/IgfsTask.java b/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/IgfsTask.java
index 92ea5d9..e42b012 100644
--- a/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/IgfsTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/IgfsTask.java
@@ -36,7 +36,7 @@ import java.util.*;
  * {@link IgfsTask#createJob(org.apache.ignite.igfs.IgfsPath, IgfsFileRange, IgfsTaskArgs)} method.
  * <p>
  * Each file participating in IGFS task is split into {@link IgfsFileRange}s first. Normally range is a number of
- * consequent bytes located on a single node (see {@code IgniteFsGroupDataBlocksKeyMapper}). In case maximum range size
+ * consequent bytes located on a single node (see {@code IgfssGroupDataBlocksKeyMapper}). In case maximum range size
  * is provided (either through {@link org.apache.ignite.configuration.IgfsConfiguration#getMaximumTaskRangeLength()} or {@code IgniteFs.execute()}
  * argument), then ranges could be further divided into smaller chunks.
  * <p>
@@ -102,7 +102,7 @@ public abstract class IgfsTask<T, R> extends ComputeTaskAdapter<IgfsTaskArgs<T>,
                 if (args.skipNonExistentFiles())
                     continue;
                 else
-                    throw new IgniteException("Failed to process IgniteFs file because it doesn't exist: " + path);
+                    throw new IgniteException("Failed to process IGFS file because it doesn't exist: " + path);
             }
 
             Collection<IgfsBlockLocation> aff = fs.affinity(path, 0, file.length(), args.maxRangeLength());

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fab12260/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
index 45972a6..1683815 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
@@ -2899,7 +2899,7 @@ public class IgniteKernal extends ClusterGroupAdapter implements IgniteEx, Ignit
             IgniteFs fs = ctx.igfs().igfs(name);
 
             if (fs == null)
-                throw new IllegalArgumentException("IgniteFs is not configured: " + name);
+                throw new IllegalArgumentException("IGFS is not configured: " + name);
 
             return fs;
         }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fab12260/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsFormatTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsFormatTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsFormatTask.java
index 50893cb..cccc03c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsFormatTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsFormatTask.java
@@ -56,7 +56,7 @@ public class VisorIgfsFormatTask extends VisorOneNodeTask<String, Void> {
                 ignite.fileSystem(igfsName).format();
             }
             catch (IllegalArgumentException iae) {
-                throw new IgniteException("Failed to format IgniteFs: " + igfsName, iae);
+                throw new IgniteException("Failed to format IGFS: " + igfsName, iae);
             }
 
             return null;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fab12260/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsAbstractSelfTest.java
index 0b0557a..9279b08 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsAbstractSelfTest.java
@@ -150,9 +150,9 @@ public abstract class IgfsAbstractSelfTest extends IgfsCommonAbstractTest {
         for (int i = 0; i < chunk.length; i++)
             chunk[i] = (byte)i;
 
-        Ignite igniteSecondary = startGridWithIgfs("ignite-secondary", "ignitefs-secondary", PRIMARY, null, SECONDARY_REST_CFG);
+        Ignite igniteSecondary = startGridWithIgfs("ignite-secondary", "igfs-secondary", PRIMARY, null, SECONDARY_REST_CFG);
 
-        igfsSecondary = (IgfsImpl) igniteSecondary.fileSystem("ignitefs-secondary");
+        igfsSecondary = (IgfsImpl) igniteSecondary.fileSystem("igfs-secondary");
 
         Ignite ignite = startGridWithIgfs("ignite", "igfs", mode, igfsSecondary, PRIMARY_REST_CFG);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fab12260/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsServerManagerIpcEndpointRegistrationAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsServerManagerIpcEndpointRegistrationAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsServerManagerIpcEndpointRegistrationAbstractSelfTest.java
index 70f04fb..ee8e7bd 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsServerManagerIpcEndpointRegistrationAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsServerManagerIpcEndpointRegistrationAbstractSelfTest.java
@@ -59,7 +59,7 @@ public abstract class IgfsServerManagerIpcEndpointRegistrationAbstractSelfTest e
         IgniteConfiguration cfg = gridConfiguration();
 
         cfg.setIgfsConfiguration(
-            igniteFsConfiguration("tcp", DFLT_IPC_PORT, null)
+            igfsConfiguration("tcp", DFLT_IPC_PORT, null)
         );
 
         G.start(cfg);
@@ -78,8 +78,8 @@ public abstract class IgfsServerManagerIpcEndpointRegistrationAbstractSelfTest e
         IgniteConfiguration cfg = gridConfiguration();
 
         cfg.setIgfsConfiguration(
-            igniteFsConfiguration("tcp", DFLT_IPC_PORT, "127.0.0.1"),
-            igniteFsConfiguration("tcp", DFLT_IPC_PORT + 1, U.getLocalHost().getHostName()));
+            igfsConfiguration("tcp", DFLT_IPC_PORT, "127.0.0.1"),
+            igfsConfiguration("tcp", DFLT_IPC_PORT + 1, U.getLocalHost().getHostName()));
 
         G.start(cfg);
 
@@ -147,14 +147,14 @@ public abstract class IgfsServerManagerIpcEndpointRegistrationAbstractSelfTest e
     }
 
     /**
-     * Creates test-purposed IgniteFsConfiguration.
+     * Creates test-purposed IgfsConfiguration.
      *
      * @param endPntType End point type.
      * @param endPntPort End point port.
      * @param endPntHost End point host.
-     * @return test-purposed IgniteFsConfiguration.
+     * @return test-purposed IgfsConfiguration.
      */
-    protected IgfsConfiguration igniteFsConfiguration(@Nullable String endPntType, @Nullable Integer endPntPort,
+    protected IgfsConfiguration igfsConfiguration(@Nullable String endPntType, @Nullable Integer endPntPort,
         @Nullable String endPntHost) throws IgniteCheckedException {
         HashMap<String, String> endPntCfg = null;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fab12260/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsServerManagerIpcEndpointRegistrationOnLinuxAndMacSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsServerManagerIpcEndpointRegistrationOnLinuxAndMacSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsServerManagerIpcEndpointRegistrationOnLinuxAndMacSelfTest.java
index bc9cbf0..d7319f4 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsServerManagerIpcEndpointRegistrationOnLinuxAndMacSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsServerManagerIpcEndpointRegistrationOnLinuxAndMacSelfTest.java
@@ -35,9 +35,9 @@ public class IgfsServerManagerIpcEndpointRegistrationOnLinuxAndMacSelfTest
         IgniteConfiguration cfg = gridConfiguration();
 
         cfg.setIgfsConfiguration(
-            igniteFsConfiguration(null, null, null), // Check null IPC endpoint config won't bring any hassles.
-            igniteFsConfiguration("tcp", DFLT_IPC_PORT + 1, null),
-            igniteFsConfiguration("shmem", DFLT_IPC_PORT + 2, null));
+            igfsConfiguration(null, null, null), // Check null IPC endpoint config won't bring any hassles.
+            igfsConfiguration("tcp", DFLT_IPC_PORT + 1, null),
+            igfsConfiguration("shmem", DFLT_IPC_PORT + 2, null));
 
         G.start(cfg);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fab12260/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsServerManagerIpcEndpointRegistrationOnWindowsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsServerManagerIpcEndpointRegistrationOnWindowsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsServerManagerIpcEndpointRegistrationOnWindowsSelfTest.java
index bcdf1d7..259f31a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsServerManagerIpcEndpointRegistrationOnWindowsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsServerManagerIpcEndpointRegistrationOnWindowsSelfTest.java
@@ -40,7 +40,7 @@ public class IgfsServerManagerIpcEndpointRegistrationOnWindowsSelfTest
             @Override public Object call() throws Exception {
                 IgniteConfiguration cfg = gridConfiguration();
 
-                cfg.setIgfsConfiguration(igniteFsConfiguration("shmem", IpcSharedMemoryServerEndpoint.DFLT_IPC_PORT,
+                cfg.setIgfsConfiguration(igfsConfiguration("shmem", IpcSharedMemoryServerEndpoint.DFLT_IPC_PORT,
                     null));
 
                 return G.start(cfg);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fab12260/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoop20FileSystemAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoop20FileSystemAbstractSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoop20FileSystemAbstractSelfTest.java
index 635c988..cd299b4 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoop20FileSystemAbstractSelfTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoop20FileSystemAbstractSelfTest.java
@@ -1298,13 +1298,13 @@ public abstract class IgfsHadoop20FileSystemAbstractSelfTest extends IgfsCommonA
                 out.write(new byte[1024 * 1024]);
             }
 
-            IgniteFs igniteFs = grid(0).fileSystem("igfs");
+            IgniteFs igfs = grid(0).fileSystem("igfs");
 
             IgfsPath filePath = new IgfsPath("/someFile");
 
-            IgfsFile fileInfo = igniteFs.info(filePath);
+            IgfsFile fileInfo = igfs.info(filePath);
 
-            Collection<IgfsBlockLocation> locations = igniteFs.affinity(filePath, 0, fileInfo.length());
+            Collection<IgfsBlockLocation> locations = igfs.affinity(filePath, 0, fileInfo.length());
 
             assertEquals(1, locations.size());
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fab12260/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemAbstractSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemAbstractSelfTest.java
index d40bb89..606eb48 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemAbstractSelfTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemAbstractSelfTest.java
@@ -1536,13 +1536,13 @@ public abstract class IgfsHadoopFileSystemAbstractSelfTest extends IgfsCommonAbs
                 out.write(new byte[1024 * 1024]);
             }
 
-            IgniteFs igniteFs = grid(0).fileSystem("igfs");
+            IgniteFs igfs = grid(0).fileSystem("igfs");
 
             IgfsPath filePath = new IgfsPath("/someFile");
 
-            IgfsFile fileInfo = igniteFs.info(filePath);
+            IgfsFile fileInfo = igfs.info(filePath);
 
-            Collection<IgfsBlockLocation> locations = igniteFs.affinity(filePath, 0, fileInfo.length());
+            Collection<IgfsBlockLocation> locations = igfs.affinity(filePath, 0, fileInfo.length());
 
             assertEquals(1, locations.size());
 


Mime
View raw message