ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [08/37] incubator-ignite git commit: Ignite-67 GRIDGAIN_HOME value fixed at IgniteSystemProperties
Date Fri, 30 Jan 2015 19:17:58 GMT
Ignite-67 GRIDGAIN_HOME value fixed at IgniteSystemProperties


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

Branch: refs/heads/sprint-1
Commit: d336959d916f29fdb31b1acbdb4b2d051bc30796
Parents: 77efad9
Author: avinogradov <avinogradov@gridgain.com>
Authored: Tue Jan 27 19:39:57 2015 +0300
Committer: avinogradov <avinogradov@gridgain.com>
Committed: Tue Jan 27 19:39:57 2015 +0300

----------------------------------------------------------------------
 bin/ggrouter.sh                                 |  10 +-
 bin/ggstart.bat                                 |  34 +-
 bin/ggstart.sh                                  |  20 +-
 bin/ggvisorcmd.bat                              |  30 +-
 bin/ggvisorcmd.sh                               |  16 +-
 bin/include/functions.sh                        |  40 +-
 bin/include/parseargs.bat                       |   2 +-
 bin/include/parseargs.sh                        |   2 +-
 bin/include/service.sh                          |   6 +-
 bin/include/setenv.bat                          |  16 +-
 bin/include/setenv.sh                           |  22 +-
 bin/include/target-classpath.bat                |   6 +-
 bin/include/target-classpath.sh                 |  10 +-
 bin/setup-hadoop.sh                             |  10 +-
 config/gridgain-log4j.xml                       |   4 +-
 config/hadoop/default-config.xml                |   2 +-
 config/java.util.logging.properties             |   2 +-
 config/router/default-router.xml                |   2 +-
 docs/core-site.gridgain.xml                     |   2 +-
 docs/gridgain_readme.md                         |   4 +-
 docs/hive-site.gridgain.xml                     |   2 +-
 docs/mapred-site.gridgain.xml                   |   4 +-
 examples/config/example-cache.xml               |   2 +-
 examples/config/example-streamer.xml            |   8 +-
 examples/config/filesystem/example-ggfs.xml     |   2 +-
 examples/rest/http-rest-example.php             |   2 +-
 examples/rest/memcache-rest-example.php         |   2 +-
 .../hibernate/HibernateL2CacheExample.java      |   2 +-
 .../streaming/StreamingCheckInExample.java      |   6 +-
 .../StreamingPopularNumbersExample.java         |   6 +-
 .../streaming/StreamingPriceBarsExample.java    |   6 +-
 .../StreamingRunningAverageExample.java         |   6 +-
 .../scalar/examples/ScalarPrimeExample.scala    |   2 +-
 .../GridMonteCarloExamplesSelfTest.java         |   4 +-
 .../GridifySetToXXXNonSpringAopSelfTest.java    |  20 +-
 .../GridifySetToXXXSpringAopSelfTest.java       |  20 +-
 .../ignite/gridify/NonSpringAopSelfTest.java    |  20 +-
 .../optimized/OptimizedMarshallerAopTest.java   |   4 +-
 .../gridify/ExternalNonSpringAopSelfTest.java   |  20 +-
 modules/clients/src/test/resources/log4j.xml    |   4 +-
 .../clients/src/test/resources/spring-cache.xml |   2 +-
 .../src/test/resources/spring-router-ssl.xml    |   2 +-
 .../src/test/resources/spring-router.xml        |   2 +-
 .../src/test/resources/spring-server-node.xml   |   2 +-
 .../test/resources/spring-server-ssl-node.xml   |   2 +-
 .../java/org/apache/ignite/IgniteCluster.java   |   2 +-
 .../java/org/apache/ignite/IgniteLogger.java    |   2 +-
 .../apache/ignite/IgniteSystemProperties.java   |   2 +-
 .../main/java/org/apache/ignite/Ignition.java   |   6 +-
 .../apache/ignite/client/GridClientCompute.java |   8 +-
 .../ignite/client/router/GridRouterFactory.java |   4 +-
 .../impl/GridRouterCommandLineStartup.java      |   2 +-
 .../apache/ignite/compute/gridify/Gridify.java  |   2 +-
 .../ignite/compute/gridify/GridifySetToSet.java |   2 +-
 .../compute/gridify/GridifySetToValue.java      |   2 +-
 .../ClientConnectionConfiguration.java          |   6 +-
 .../configuration/IgniteConfiguration.java      |  18 +-
 .../configuration/IgniteDeploymentMode.java     |   4 +-
 .../apache/ignite/fs/IgniteFsConfiguration.java |   2 +-
 .../org/apache/ignite/internal/GridGainEx.java  |  12 +-
 .../org/apache/ignite/internal/GridKernal.java  |   6 +-
 .../handlers/log/GridLogCommandHandler.java     |   2 +-
 .../internal/util/GridConfigurationFinder.java  |   4 +-
 .../apache/ignite/internal/util/GridUtils.java  |  22 +-
 .../GridIpcSharedMemoryServerEndpoint.java      |   4 +-
 .../apache/ignite/internal/util/typedef/X.java  |   2 +-
 .../visor/node/VisorBasicConfiguration.java     |   6 +-
 .../apache/ignite/jdbc/IgniteJdbcDriver.java    |   2 +-
 .../apache/ignite/lifecycle/LifecycleBean.java  |   4 +-
 .../optimized/IgniteOptimizedMarshaller.java    |   2 +-
 .../ignite/spi/IgniteSpiManagementMBean.java    |   2 +-
 .../sharedfs/SharedFsCheckpointSpi.java         |   6 +-
 .../sharedfs/TcpDiscoverySharedFsIpFinder.java  |   2 +-
 .../spi/swapspace/file/FileSwapSpaceSpi.java    |   4 +-
 .../startup/cmdline/CommandLineStartup.java     |   4 +-
 .../spring-cache-client-benchmark-1.xml         |   2 +-
 .../spring-cache-client-benchmark-2.xml         |   2 +-
 .../spring-cache-client-benchmark-3.xml         |   2 +-
 modules/core/src/test/config/example-cache.xml  |   2 +-
 modules/core/src/test/config/ggfs-loopback.xml  |   2 +-
 modules/core/src/test/config/ggfs-shmem.xml     |   2 +-
 modules/core/src/test/config/log4j-test.xml     |   2 +-
 .../core/src/test/config/spring-cache-load.xml  |   2 +-
 .../core/src/test/config/spring-multicache.xml  |   2 +-
 .../average/spring-streamer-average-base.xml    |   2 +-
 .../average/spring-streamer-average-local.xml   |   2 +-
 .../average/spring-streamer-average-random.xml  |   2 +-
 .../config/streamer/spring-streamer-base.xml    |   2 +-
 modules/core/src/test/config/tests.properties   |  10 +-
 ...tartupWithUndefinedGridGainHomeSelfTest.java |   4 +-
 .../loadtest/GridSingleExecutionTest.java       |   2 +-
 .../cache/GridCacheAbstractLoadTest.java        |   2 +-
 .../capacity/spring-capacity-cache.xml          |   2 +-
 .../loadtests/colocation/spring-colocation.xml  |   2 +-
 .../startup/GridRandomCommandLineLoader.java    |   2 +-
 .../ignite/startup/GridVmNodesStarter.java      |   2 +-
 .../ignite/testframework/GridTestUtils.java     |  10 +-
 .../config/GridTestProperties.java              |  12 +-
 .../logger/GridLog4jRollingFileAppender.java    |   2 +-
 .../src/test/resources/log/gridgain.log.tst     | 508 +++++++++----------
 .../core/src/test/webapp/META-INF/gg-config.xml |   2 +-
 .../fs/hadoop/v1/GridGgfsHadoopFileSystem.java  |   6 +-
 .../fs/hadoop/v2/GridGgfsHadoopFileSystem.java  |   6 +-
 .../apache/ignite/hadoop/GridHadoopSetup.java   |   4 +-
 .../GridHadoopExternalTaskExecutor.java         |   2 +-
 .../logger/log4j/IgniteLog4jNodeIdFilePath.java |   2 +-
 .../java/org/apache/ignite/IgniteSpring.java    |   2 +-
 .../ignite/cache/spring/SpringCacheManager.java |   2 +-
 .../util/nodestart/GridNodeCallableImpl.java    |   4 +-
 .../optimized/OptimizedClassNamesGenerator.java |   8 +-
 .../deployment/uri/GridUriDeploymentSpi.java    |   8 +-
 .../file/GridFileDeploymentSelfTest.java        |   4 +-
 .../scala/org/apache/ignite/visor/Packet.scala  |   2 +-
 .../ignite/visor/commands/deploy/Packet.scala   |   4 +-
 .../commands/deploy/VisorDeployCommand.scala    |  18 +-
 .../ignite/visor/commands/start/Packet.scala    |   2 +-
 .../commands/start/VisorStartCommand.scala      |   4 +-
 .../scala/org/apache/ignite/visor/visor.scala   |   6 +-
 .../GridServletContextListenerStartup.java      |  10 +-
 .../startup/servlet/GridServletStartup.java     |   6 +-
 pom.xml                                         |  10 +-
 121 files changed, 617 insertions(+), 617 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d336959d/bin/ggrouter.sh
----------------------------------------------------------------------
diff --git a/bin/ggrouter.sh b/bin/ggrouter.sh
index 0e01b86..29ac1d1 100755
--- a/bin/ggrouter.sh
+++ b/bin/ggrouter.sh
@@ -21,20 +21,20 @@
 #
 # Import common functions.
 #
-if [ "${GRIDGAIN_HOME}" = "" ];
-    then GRIDGAIN_HOME_TMP="$(dirname "$(cd "$(dirname "$0")"; "pwd")")";GRIDGAIN_HOME_TMP="$(dirname "${GRIDGAIN_HOME_TMP}")" # Will be removed in release.
-    else GRIDGAIN_HOME_TMP=${GRIDGAIN_HOME};
+if [ "${IGNITE_HOME}" = "" ];
+    then IGNITE_HOME_TMP="$(dirname "$(cd "$(dirname "$0")"; "pwd")")";IGNITE_HOME_TMP="$(dirname "${IGNITE_HOME_TMP}")" # Will be removed in release.
+    else IGNITE_HOME_TMP=${IGNITE_HOME};
 fi
 
 #
 # Set SCRIPTS_HOME - base path to scripts.
 #
-SCRIPTS_HOME="${GRIDGAIN_HOME_TMP}/bin"
+SCRIPTS_HOME="${IGNITE_HOME_TMP}/bin"
 
 source "${SCRIPTS_HOME}"/include/functions.sh
 
 #
-# Discover GRIDGAIN_HOME environment variable.
+# Discover IGNITE_HOME environment variable.
 #
 setGridGainHome
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d336959d/bin/ggstart.bat
----------------------------------------------------------------------
diff --git a/bin/ggstart.bat b/bin/ggstart.bat
index 73297e5..30afc0b 100644
--- a/bin/ggstart.bat
+++ b/bin/ggstart.bat
@@ -47,30 +47,30 @@ if %ERRORLEVEL% equ 0 goto checkGridGainHome1
     echo You can also download latest JDK at http://java.com/download.
 goto error_finish
 
-:: Check GRIDGAIN_HOME.
+:: Check IGNITE_HOME.
 :checkGridGainHome1
-if defined GRIDGAIN_HOME goto checkGridGainHome2
+if defined IGNITE_HOME goto checkGridGainHome2
     pushd "%~dp0"/..
-    set GRIDGAIN_HOME=%CD%
+    set IGNITE_HOME=%CD%
     popd
 
 :checkGridGainHome2
-:: Strip double quotes from GRIDGAIN_HOME
-set GRIDGAIN_HOME=%GRIDGAIN_HOME:"=%
+:: Strip double quotes from IGNITE_HOME
+set IGNITE_HOME=%IGNITE_HOME:"=%
 
-:: remove all trailing slashes from GRIDGAIN_HOME.
-if %GRIDGAIN_HOME:~-1,1% == \ goto removeTrailingSlash
-if %GRIDGAIN_HOME:~-1,1% == / goto removeTrailingSlash
+:: remove all trailing slashes from IGNITE_HOME.
+if %IGNITE_HOME:~-1,1% == \ goto removeTrailingSlash
+if %IGNITE_HOME:~-1,1% == / goto removeTrailingSlash
 goto checkGridGainHome3
 
 :removeTrailingSlash
-set GRIDGAIN_HOME=%GRIDGAIN_HOME:~0,-1%
+set IGNITE_HOME=%IGNITE_HOME:~0,-1%
 goto checkGridGainHome2
 
 :checkGridGainHome3
-if exist "%GRIDGAIN_HOME%\config" goto checkGridGainHome4
-    echo %0, ERROR: GridGain installation folder is not found or GRIDGAIN_HOME environment variable is not valid.
-    echo Please create GRIDGAIN_HOME environment variable pointing to location of
+if exist "%IGNITE_HOME%\config" goto checkGridGainHome4
+    echo %0, ERROR: GridGain installation folder is not found or IGNITE_HOME environment variable is not valid.
+    echo Please create IGNITE_HOME environment variable pointing to location of
     echo GridGain installation folder.
     goto error_finish
 
@@ -79,13 +79,13 @@ if exist "%GRIDGAIN_HOME%\config" goto checkGridGainHome4
 ::
 :: Set SCRIPTS_HOME - base path to scripts.
 ::
-set SCRIPTS_HOME=%GRIDGAIN_HOME%\bin
+set SCRIPTS_HOME=%IGNITE_HOME%\bin
 
 :: Remove trailing spaces
 for /l %%a in (1,1,31) do if /i "%SCRIPTS_HOME:~-1%" == " " set SCRIPTS_HOME=%SCRIPTS_HOME:~0,-1%
 
 if /i "%SCRIPTS_HOME%\" == "%~dp0" goto setProgName
-    echo %0, WARN: GRIDGAIN_HOME environment variable may be pointing to wrong folder: %GRIDGAIN_HOME%
+    echo %0, WARN: IGNITE_HOME environment variable may be pointing to wrong folder: %IGNITE_HOME%
 
 :setProgName
 ::
@@ -119,7 +119,7 @@ if %ERRORLEVEL% neq 0 (
 set RANDOM_NUMBER_COMMAND="%JAVA_HOME%\bin\java.exe" -cp %CP% org.apache.ignite.startup.cmdline.CommandLineRandomNumberGenerator
 for /f "usebackq tokens=*" %%i in (`"%RANDOM_NUMBER_COMMAND%"`) do set RANDOM_NUMBER=%%i
 
-set RESTART_SUCCESS_FILE="%GRIDGAIN_HOME%\work\ignite_success_%RANDOM_NUMBER%"
+set RESTART_SUCCESS_FILE="%IGNITE_HOME%\work\ignite_success_%RANDOM_NUMBER%"
 set RESTART_SUCCESS_OPT=-DIGNITE_SUCCESS_FILE=%RESTART_SUCCESS_FILE%
 
 ::
@@ -198,11 +198,11 @@ if "%MAIN_CLASS%" == "" set MAIN_CLASS=org.apache.ignite.startup.cmdline.Command
 
 if "%INTERACTIVE%" == "1" (
     "%JAVA_HOME%\bin\java.exe" %JVM_OPTS% %QUIET% %RESTART_SUCCESS_OPT% %JMX_MON% ^
-    -DIGNITE_UPDATE_NOTIFIER=false -DGRIDGAIN_HOME="%GRIDGAIN_HOME%" -DIGNITE_PROG_NAME="%PROG_NAME%" %JVM_XOPTS% ^
+    -DIGNITE_UPDATE_NOTIFIER=false -DIGNITE_HOME="%IGNITE_HOME%" -DIGNITE_PROG_NAME="%PROG_NAME%" %JVM_XOPTS% ^
     -cp "%CP%" %MAIN_CLASS%
 ) else (
     "%JAVA_HOME%\bin\java.exe" %JVM_OPTS% %QUIET% %RESTART_SUCCESS_OPT% %JMX_MON% ^
-    -DIGNITE_UPDATE_NOTIFIER=false -DGRIDGAIN_HOME="%GRIDGAIN_HOME%" -DIGNITE_PROG_NAME="%PROG_NAME%" %JVM_XOPTS% ^
+    -DIGNITE_UPDATE_NOTIFIER=false -DIGNITE_HOME="%IGNITE_HOME%" -DIGNITE_PROG_NAME="%PROG_NAME%" %JVM_XOPTS% ^
     -cp "%CP%" %MAIN_CLASS% "%CONFIG%"
 )
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d336959d/bin/ggstart.sh
----------------------------------------------------------------------
diff --git a/bin/ggstart.sh b/bin/ggstart.sh
index 0be0635..7262ceb 100755
--- a/bin/ggstart.sh
+++ b/bin/ggstart.sh
@@ -21,15 +21,15 @@
 #
 # Import common functions.
 #
-if [ "${GRIDGAIN_HOME}" = "" ];
-    then GRIDGAIN_HOME_TMP="$(dirname "$(cd "$(dirname "$0")"; "pwd")")";
-    else GRIDGAIN_HOME_TMP=${GRIDGAIN_HOME};
+if [ "${IGNITE_HOME}" = "" ];
+    then IGNITE_HOME_TMP="$(dirname "$(cd "$(dirname "$0")"; "pwd")")";
+    else IGNITE_HOME_TMP=${IGNITE_HOME};
 fi
 
 #
 # Set SCRIPTS_HOME - base path to scripts.
 #
-SCRIPTS_HOME="${GRIDGAIN_HOME_TMP}/bin"
+SCRIPTS_HOME="${IGNITE_HOME_TMP}/bin"
 
 source "${SCRIPTS_HOME}"/include/functions.sh
 
@@ -39,7 +39,7 @@ source "${SCRIPTS_HOME}"/include/functions.sh
 checkJava
 
 #
-# Discover GRIDGAIN_HOME environment variable.
+# Discover IGNITE_HOME environment variable.
 #
 setGridGainHome
 
@@ -61,7 +61,7 @@ CP="${GRIDGAIN_LIBS}"
 
 RANDOM_NUMBER=$("$JAVA" -cp "${CP}" org.apache.ignite.startup.cmdline.CommandLineRandomNumberGenerator)
 
-RESTART_SUCCESS_FILE="${GRIDGAIN_HOME}/work/ignite_success_${RANDOM_NUMBER}"
+RESTART_SUCCESS_FILE="${IGNITE_HOME}/work/ignite_success_${RANDOM_NUMBER}"
 RESTART_SUCCESS_OPT="-DIGNITE_SUCCESS_FILE=${RESTART_SUCCESS_FILE}"
 
 #
@@ -138,12 +138,12 @@ do
         case $osname in
             Darwin*)
                 "$JAVA" ${JVM_OPTS} ${QUIET} "${DOCK_OPTS}" "${RESTART_SUCCESS_OPT}" ${JMX_MON} \
-                -DIGNITE_UPDATE_NOTIFIER=false -DGRIDGAIN_HOME="${GRIDGAIN_HOME}" \
+                -DIGNITE_UPDATE_NOTIFIER=false -DIGNITE_HOME="${IGNITE_HOME}" \
                 -DIGNITE_PROG_NAME="$0" ${JVM_XOPTS} -cp "${CP}" ${MAIN_CLASS}
             ;;
             *)
                 "$JAVA" ${JVM_OPTS} ${QUIET} "${RESTART_SUCCESS_OPT}" ${JMX_MON} \
-                -DIGNITE_UPDATE_NOTIFIER=false -DGRIDGAIN_HOME="${GRIDGAIN_HOME}" \
+                -DIGNITE_UPDATE_NOTIFIER=false -DIGNITE_HOME="${IGNITE_HOME}" \
                 -DIGNITE_PROG_NAME="$0" ${JVM_XOPTS} -cp "${CP}" ${MAIN_CLASS}
             ;;
         esac
@@ -151,12 +151,12 @@ do
         case $osname in
             Darwin*)
                 "$JAVA" ${JVM_OPTS} ${QUIET} "${DOCK_OPTS}" "${RESTART_SUCCESS_OPT}" ${JMX_MON} \
-                 -DIGNITE_UPDATE_NOTIFIER=false -DGRIDGAIN_HOME="${GRIDGAIN_HOME}" \
+                 -DIGNITE_UPDATE_NOTIFIER=false -DIGNITE_HOME="${IGNITE_HOME}" \
                  -DIGNITE_PROG_NAME="$0" ${JVM_XOPTS} -cp "${CP}" ${MAIN_CLASS} "${CONFIG}"
             ;;
             *)
                 "$JAVA" ${JVM_OPTS} ${QUIET} "${RESTART_SUCCESS_OPT}" ${JMX_MON} \
-                 -DIGNITE_UPDATE_NOTIFIER=false -DGRIDGAIN_HOME="${GRIDGAIN_HOME}" \
+                 -DIGNITE_UPDATE_NOTIFIER=false -DIGNITE_HOME="${IGNITE_HOME}" \
                  -DIGNITE_PROG_NAME="$0" ${JVM_XOPTS} -cp "${CP}" ${MAIN_CLASS} "${CONFIG}"
             ;;
         esac

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d336959d/bin/ggvisorcmd.bat
----------------------------------------------------------------------
diff --git a/bin/ggvisorcmd.bat b/bin/ggvisorcmd.bat
index 3614cc4..84ab073 100644
--- a/bin/ggvisorcmd.bat
+++ b/bin/ggvisorcmd.bat
@@ -43,30 +43,30 @@ if %ERRORLEVEL% equ 0 goto checkGridGainHome1
     echo %0, ERROR: You can also download latest JDK at: http://java.sun.com/getjava
 goto error_finish
 
-:: Check GRIDGAIN_HOME.
+:: Check IGNITE_HOME.
 :checkGridGainHome1
-if not "%GRIDGAIN_HOME%" == "" goto checkGridGainHome2
+if not "%IGNITE_HOME%" == "" goto checkGridGainHome2
     pushd "%~dp0"/..
-    set GRIDGAIN_HOME=%CD%
+    set IGNITE_HOME=%CD%
     popd
 
 :checkGridGainHome2
-:: Strip double quotes from GRIDGAIN_HOME
-set GRIDGAIN_HOME=%GRIDGAIN_HOME:"=%
+:: Strip double quotes from IGNITE_HOME
+set IGNITE_HOME=%IGNITE_HOME:"=%
 
-:: remove all trailing slashes from GRIDGAIN_HOME.
-if %GRIDGAIN_HOME:~-1,1% == \ goto removeTrailingSlash
-if %GRIDGAIN_HOME:~-1,1% == / goto removeTrailingSlash
+:: remove all trailing slashes from IGNITE_HOME.
+if %IGNITE_HOME:~-1,1% == \ goto removeTrailingSlash
+if %IGNITE_HOME:~-1,1% == / goto removeTrailingSlash
 goto checkGridGainHome3
 
 :removeTrailingSlash
-set GRIDGAIN_HOME=%GRIDGAIN_HOME:~0,-1%
+set IGNITE_HOME=%IGNITE_HOME:~0,-1%
 goto checkGridGainHome2
 
 :checkGridGainHome3
-if exist "%GRIDGAIN_HOME%\config" goto checkGridGainHome4
-    echo %0, ERROR: GridGain installation folder is not found or GRIDGAIN_HOME environment variable is not valid.
-    echo Please create GRIDGAIN_HOME environment variable pointing to location of
+if exist "%IGNITE_HOME%\config" goto checkGridGainHome4
+    echo %0, ERROR: GridGain installation folder is not found or IGNITE_HOME environment variable is not valid.
+    echo Please create IGNITE_HOME environment variable pointing to location of
     echo GridGain installation folder.
     goto error_finish
 
@@ -75,13 +75,13 @@ if exist "%GRIDGAIN_HOME%\config" goto checkGridGainHome4
 ::
 :: Set SCRIPTS_HOME - base path to scripts.
 ::
-set SCRIPTS_HOME=%GRIDGAIN_HOME%\bin
+set SCRIPTS_HOME=%IGNITE_HOME%\bin
 
 :: Remove trailing spaces
 for /l %%a in (1,1,31) do if /i "%SCRIPTS_HOME:~-1%" == " " set SCRIPTS_HOME=%SCRIPTS_HOME:~0,-1%
 
 if /i "%SCRIPTS_HOME%\" == "%~dp0" goto run
-    echo %0, WARN: GRIDGAIN_HOME environment variable may be pointing to wrong folder: %GRIDGAIN_HOME%
+    echo %0, WARN: IGNITE_HOME environment variable may be pointing to wrong folder: %IGNITE_HOME%
 
 :run
 
@@ -90,7 +90,7 @@ if /i "%SCRIPTS_HOME%\" == "%~dp0" goto run
 ::
 call "%SCRIPTS_HOME%\include\setenv.bat"
 call "%SCRIPTS_HOME%\include\target-classpath.bat" &:: Will be removed in release.
-set CP=%GRIDGAIN_HOME%\bin\include\visor-common\*;%GRIDGAIN_HOME%\bin\include\visorcmd\*;%GRIDGAIN_LIBS%
+set CP=%IGNITE_HOME%\bin\include\visor-common\*;%IGNITE_HOME%\bin\include\visorcmd\*;%GRIDGAIN_LIBS%
 
 ::
 :: Parse command line parameters.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d336959d/bin/ggvisorcmd.sh
----------------------------------------------------------------------
diff --git a/bin/ggvisorcmd.sh b/bin/ggvisorcmd.sh
index 86b7135..6f4ea76 100755
--- a/bin/ggvisorcmd.sh
+++ b/bin/ggvisorcmd.sh
@@ -17,15 +17,15 @@
 #
 # Import common functions.
 #
-if [ "${GRIDGAIN_HOME}" = "" ];
-    then GRIDGAIN_HOME_TMP="$(dirname "$(cd "$(dirname "$0")"; "pwd")")";GRIDGAIN_HOME_TMP="$(dirname "${GRIDGAIN_HOME_TMP}")" # Will be removed in release.
-    else GRIDGAIN_HOME_TMP=${GRIDGAIN_HOME};
+if [ "${IGNITE_HOME}" = "" ];
+    then IGNITE_HOME_TMP="$(dirname "$(cd "$(dirname "$0")"; "pwd")")";IGNITE_HOME_TMP="$(dirname "${IGNITE_HOME_TMP}")" # Will be removed in release.
+    else IGNITE_HOME_TMP=${IGNITE_HOME};
 fi
 
 #
 # Set SCRIPTS_HOME - base path to scripts.
 #
-SCRIPTS_HOME="${GRIDGAIN_HOME_TMP}/bin"
+SCRIPTS_HOME="${IGNITE_HOME_TMP}/bin"
 
 source "${SCRIPTS_HOME}"/include/functions.sh
 
@@ -35,7 +35,7 @@ source "${SCRIPTS_HOME}"/include/functions.sh
 checkJava
 
 #
-# Discover GRIDGAIN_HOME environment variable.
+# Discover IGNITE_HOME environment variable.
 #
 setGridGainHome
 
@@ -49,7 +49,7 @@ setGridGainHome
 #
 . "${SCRIPTS_HOME}"/include/setenv.sh
 . "${SCRIPTS_HOME}"/include/target-classpath.sh # Will be removed in release.
-CP="${GRIDGAIN_HOME}/bin/include/visor-common/*${SEP}${GRIDGAIN_HOME}/bin/include/visorcmd/*${SEP}${GRIDGAIN_LIBS}"
+CP="${IGNITE_HOME}/bin/include/visor-common/*${SEP}${IGNITE_HOME}/bin/include/visorcmd/*${SEP}${GRIDGAIN_LIBS}"
 
 #
 # JVM options. See http://java.sun.com/javase/technologies/hotspot/vmoptions.jsp for more details.
@@ -106,13 +106,13 @@ trap restoreSttySettings INT
 case $osname in
     Darwin*)
         "$JAVA" ${JVM_OPTS} ${QUIET} "${DOCK_OPTS}" \
-        -DIGNITE_UPDATE_NOTIFIER=false -DGRIDGAIN_HOME="${GRIDGAIN_HOME}" -DIGNITE_PROG_NAME="$0" \
+        -DIGNITE_UPDATE_NOTIFIER=false -DIGNITE_HOME="${IGNITE_HOME}" -DIGNITE_PROG_NAME="$0" \
         -DIGNITE_DEPLOYMENT_MODE_OVERRIDE=ISOLATED ${JVM_XOPTS} -cp "${CP}" \
         org.apache.ignite.visor.commands.VisorConsole
     ;;
     *)
         "$JAVA" ${JVM_OPTS} ${QUIET} -DIGNITE_UPDATE_NOTIFIER=false \
-        -DGRIDGAIN_HOME="${GRIDGAIN_HOME}" -DIGNITE_PROG_NAME="$0" -DIGNITE_DEPLOYMENT_MODE_OVERRIDE=ISOLATED \
+        -DIGNITE_HOME="${IGNITE_HOME}" -DIGNITE_PROG_NAME="$0" -DIGNITE_DEPLOYMENT_MODE_OVERRIDE=ISOLATED \
         ${JVM_XOPTS} -cp "${CP}" \
         org.apache.ignite.visor.commands.VisorConsole
     ;;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d336959d/bin/include/functions.sh
----------------------------------------------------------------------
diff --git a/bin/include/functions.sh b/bin/include/functions.sh
index 248776c..fb8d229 100755
--- a/bin/include/functions.sh
+++ b/bin/include/functions.sh
@@ -17,12 +17,12 @@
 #
 # This is a collection of utility functions to be used in other GridGain scripts.
 # Before calling any function from this file you have to import it:
-#   if [ "${GRIDGAIN_HOME}" = "" ];
-#       then GRIDGAIN_HOME_TMP="$(dirname "$(cd "$(dirname "$0")"; "pwd")")";
-#       else GRIDGAIN_HOME_TMP=${GRIDGAIN_HOME};
+#   if [ "${IGNITE_HOME}" = "" ];
+#       then IGNITE_HOME_TMP="$(dirname "$(cd "$(dirname "$0")"; "pwd")")";
+#       else IGNITE_HOME_TMP=${IGNITE_HOME};
 #   fi
 #
-#   source "${GRIDGAIN_HOME_TMP}"/bin/include/functions.sh
+#   source "${IGNITE_HOME_TMP}"/bin/include/functions.sh
 #
 
 #
@@ -74,35 +74,35 @@ checkJava() {
 }
 
 #
-# Discovers GRIDGAIN_HOME environment variable.
-# The function expects GRIDGAIN_HOME_TMP variable is set and points to the directory where the callee script resides.
-# The function exports GRIDGAIN_HOME variable with path to GridGain home directory.
+# Discovers IGNITE_HOME environment variable.
+# The function expects IGNITE_HOME_TMP variable is set and points to the directory where the callee script resides.
+# The function exports IGNITE_HOME variable with path to GridGain home directory.
 #
 setGridGainHome() {
     #
-    # Set GRIDGAIN_HOME, if needed.
+    # Set IGNITE_HOME, if needed.
     #
-    if [ "${GRIDGAIN_HOME}" = "" ]; then
-        export GRIDGAIN_HOME=${GRIDGAIN_HOME_TMP}
+    if [ "${IGNITE_HOME}" = "" ]; then
+        export IGNITE_HOME=${IGNITE_HOME_TMP}
     fi
 
     #
-    # Check GRIDGAIN_HOME is valid.
+    # Check IGNITE_HOME is valid.
     #
-    if [ ! -d "${GRIDGAIN_HOME}/config" ]; then
+    if [ ! -d "${IGNITE_HOME}/config" ]; then
         echo $0", ERROR:"
-        echo "GridGain installation folder is not found or GRIDGAIN_HOME environment variable is not valid."
-        echo "Please create GRIDGAIN_HOME environment variable pointing to location of GridGain installation folder."
+        echo "GridGain installation folder is not found or IGNITE_HOME environment variable is not valid."
+        echo "Please create IGNITE_HOME environment variable pointing to location of GridGain installation folder."
 
         exit 1
     fi
 
     #
-    # Check GRIDGAIN_HOME points to current installation.
+    # Check IGNITE_HOME points to current installation.
     #
-    if [ "${GRIDGAIN_HOME}" != "${GRIDGAIN_HOME_TMP}" ] &&
-       [ "${GRIDGAIN_HOME}" != "${GRIDGAIN_HOME_TMP}/" ]; then
-        echo $0", WARN: GRIDGAIN_HOME environment variable may be pointing to wrong folder: $GRIDGAIN_HOME"
+    if [ "${IGNITE_HOME}" != "${IGNITE_HOME_TMP}" ] &&
+       [ "${IGNITE_HOME}" != "${IGNITE_HOME_TMP}/" ]; then
+        echo $0", WARN: IGNITE_HOME environment variable may be pointing to wrong folder: $IGNITE_HOME"
     fi
 }
 
@@ -141,11 +141,11 @@ getClassPathSeparator() {
     case "`uname`" in
         MINGW*)
             SEP=";";
-            export GRIDGAIN_HOME=`echo $GRIDGAIN_HOME | sed -e 's/^\/\([a-zA-Z]\)/\1:/'`
+            export IGNITE_HOME=`echo $IGNITE_HOME | sed -e 's/^\/\([a-zA-Z]\)/\1:/'`
             ;;
         CYGWIN*)
             SEP=";";
-            export GRIDGAIN_HOME=`echo $GRIDGAIN_HOME | sed -e 's/^\/\([a-zA-Z]\)/\1:/'`
+            export IGNITE_HOME=`echo $IGNITE_HOME | sed -e 's/^\/\([a-zA-Z]\)/\1:/'`
             ;;
     esac
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d336959d/bin/include/parseargs.bat
----------------------------------------------------------------------
diff --git a/bin/include/parseargs.bat b/bin/include/parseargs.bat
index adf5c42..c62a6a2 100644
--- a/bin/include/parseargs.bat
+++ b/bin/include/parseargs.bat
@@ -29,7 +29,7 @@
 :: DEFAULT_CONFIG
 ::
 :: Can be used like:
-:: call "%GRIDGAIN_HOME%\bin\include\parseargs.bat" %*
+:: call "%IGNITE_HOME%\bin\include\parseargs.bat" %*
 :: if %ERRORLEVEL% neq 0 (
 ::     echo Arguments parsing failed
 ::     exit /b %ERRORLEVEL%

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d336959d/bin/include/parseargs.sh
----------------------------------------------------------------------
diff --git a/bin/include/parseargs.sh b/bin/include/parseargs.sh
index e9f0ea6..c213cfc 100755
--- a/bin/include/parseargs.sh
+++ b/bin/include/parseargs.sh
@@ -27,7 +27,7 @@
 # DEFAULT_CONFIG
 #
 # Can be used like:
-#       . "${GRIDGAIN_HOME}"/bin/include/parseargs.sh
+#       . "${IGNITE_HOME}"/bin/include/parseargs.sh
 # in other scripts to parse common command lines parameters.
 #
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d336959d/bin/include/service.sh
----------------------------------------------------------------------
diff --git a/bin/include/service.sh b/bin/include/service.sh
index 8b9eb1a..577eab8 100755
--- a/bin/include/service.sh
+++ b/bin/include/service.sh
@@ -41,7 +41,7 @@ case "$1" in
         DEFAULT_CONFIG="default-config.xml"
 
         # Is needed for setenv
-        SCRIPTS_HOME=${GRIDGAIN_HOME}/bin
+        SCRIPTS_HOME=${IGNITE_HOME}/bin
 
         # Load GridGain functions.
         source "${SCRIPTS_HOME}/include/functions.sh"
@@ -56,7 +56,7 @@ case "$1" in
         fi
 
         # Resolve config directory.
-        GRIDGAIN_CONF_DIR=${GRIDGAIN_CONF_DIR-"${GRIDGAIN_HOME}/config"}
+        GRIDGAIN_CONF_DIR=${GRIDGAIN_CONF_DIR-"${IGNITE_HOME}/config"}
 
         # Resolve full config path.
         [[ "$DEFAULT_CONFIG" != /* ]] && DEFAULT_CONFIG="$GRIDGAIN_CONF_DIR/$DEFAULT_CONFIG"
@@ -65,7 +65,7 @@ case "$1" in
         checkJava
 
         # And run.
-        $JAVA $JVM_OPTS -DIGNITE_UPDATE_NOTIFIER=false -DGRIDGAIN_HOME="${GRIDGAIN_HOME}" \
+        $JAVA $JVM_OPTS -DIGNITE_UPDATE_NOTIFIER=false -DIGNITE_HOME="${IGNITE_HOME}" \
         -DIGNITE_PROG_NAME="$0" -cp "$GRIDGAIN_LIBS" "$MAIN_CLASS" "$DEFAULT_CONFIG" &>/dev/null &
 
         # Write process id.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d336959d/bin/include/setenv.bat
----------------------------------------------------------------------
diff --git a/bin/include/setenv.bat b/bin/include/setenv.bat
index 0e0800a..e568673 100644
--- a/bin/include/setenv.bat
+++ b/bin/include/setenv.bat
@@ -15,9 +15,9 @@
 
 ::
 :: Exports GRIDGAIN_LIBS variable containing classpath for GridGain.
-:: Expects GRIDGAIN_HOME to be set.
+:: Expects IGNITE_HOME to be set.
 :: Can be used like:
-::      call %GRIDGAIN_HOME%\bin\include\setenv.bat
+::      call %IGNITE_HOME%\bin\include\setenv.bat
 :: in other scripts to set classpath using exported GRIDGAIN_LIBS variable.
 ::
 
@@ -27,21 +27,21 @@
 :: set USER_LIBS=
 
 ::
-:: Check GRIDGAIN_HOME.
+:: Check IGNITE_HOME.
 ::
-if defined GRIDGAIN_HOME goto run
+if defined IGNITE_HOME goto run
     echo %0, ERROR: GridGain installation folder is not found.
-    echo Please create GRIDGAIN_HOME environment variable pointing to location of
+    echo Please create IGNITE_HOME environment variable pointing to location of
     echo GridGain installation folder.
 goto :eof
 
 :run
 :: The following libraries are required for GridGain.
-set GRIDGAIN_LIBS=%GRIDGAIN_HOME%\libs\*
+set GRIDGAIN_LIBS=%IGNITE_HOME%\libs\*
 
-for /D %%F in (%GRIDGAIN_HOME%\libs\*) do if not "%%F" == "%GRIDGAIN_HOME%\libs\optional" call :concat %%F\*
+for /D %%F in (%IGNITE_HOME%\libs\*) do if not "%%F" == "%IGNITE_HOME%\libs\optional" call :concat %%F\*
 
-if exist %GRIDGAIN_HOME%\libs\gridgain-hadoop set HADOOP_EDITION=1
+if exist %IGNITE_HOME%\libs\gridgain-hadoop set HADOOP_EDITION=1
 
 if defined USER_LIBS set GRIDGAIN_LIBS=%USER_LIBS%;%GRIDGAIN_LIBS%
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d336959d/bin/include/setenv.sh
----------------------------------------------------------------------
diff --git a/bin/include/setenv.sh b/bin/include/setenv.sh
index 4ec08c5..d09223c 100755
--- a/bin/include/setenv.sh
+++ b/bin/include/setenv.sh
@@ -16,18 +16,18 @@
 
 #
 # Exports GRIDGAIN_LIBS variable containing classpath for GridGain.
-# Expects GRIDGAIN_HOME to be set.
+# Expects IGNITE_HOME to be set.
 # Can be used like:
-#       . "${GRIDGAIN_HOME}"/bin/include/setenv.sh
+#       . "${IGNITE_HOME}"/bin/include/setenv.sh
 # in other scripts to set classpath using exported GRIDGAIN_LIBS variable.
 #
 
 #
-# Check GRIDGAIN_HOME.
+# Check IGNITE_HOME.
 #
-if [ "${GRIDGAIN_HOME}" = "" ]; then
+if [ "${IGNITE_HOME}" = "" ]; then
     echo $0", ERROR: GridGain installation folder is not found."
-    echo "Please create GRIDGAIN_HOME variable pointing to location of"
+    echo "Please create IGNITE_HOME variable pointing to location of"
     echo "GridGain installation folder."
 
     exit 1
@@ -41,26 +41,26 @@ SEP=":";
 case "`uname`" in
     MINGW*)
         SEP=";";
-        export GRIDGAIN_HOME=`echo $GRIDGAIN_HOME | sed -e 's/^\/\([a-zA-Z]\)/\1:/'`
+        export IGNITE_HOME=`echo $IGNITE_HOME | sed -e 's/^\/\([a-zA-Z]\)/\1:/'`
         ;;
     CYGWIN*)
         SEP=";";
-        export GRIDGAIN_HOME=`echo $GRIDGAIN_HOME | sed -e 's/^\/\([a-zA-Z]\)/\1:/'`
+        export IGNITE_HOME=`echo $IGNITE_HOME | sed -e 's/^\/\([a-zA-Z]\)/\1:/'`
         ;;
 esac
 
 #
 # Libraries included in classpath.
 #
-GRIDGAIN_LIBS="${GRIDGAIN_HOME}/libs/*"
+GRIDGAIN_LIBS="${IGNITE_HOME}/libs/*"
 
-for file in ${GRIDGAIN_HOME}/libs/*
+for file in ${IGNITE_HOME}/libs/*
 do
-    if [ -d ${file} ] && [ "${file}" != "${GRIDGAIN_HOME}"/libs/optional ]; then
+    if [ -d ${file} ] && [ "${file}" != "${IGNITE_HOME}"/libs/optional ]; then
         GRIDGAIN_LIBS=${GRIDGAIN_LIBS}${SEP}${file}/*
     fi
 
-    if [ -d ${file} ] && [ "${file}" == "${GRIDGAIN_HOME}"/libs/gridgain-hadoop ]; then
+    if [ -d ${file} ] && [ "${file}" == "${IGNITE_HOME}"/libs/gridgain-hadoop ]; then
         HADOOP_EDITION=1
     fi
 done

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d336959d/bin/include/target-classpath.bat
----------------------------------------------------------------------
diff --git a/bin/include/target-classpath.bat b/bin/include/target-classpath.bat
index 8e125ca..a86c71f 100644
--- a/bin/include/target-classpath.bat
+++ b/bin/include/target-classpath.bat
@@ -16,16 +16,16 @@
 :: Target class path resolver.
 ::
 :: Can be used like:
-::       call "%GRIDGAIN_HOME%\os\bin\include\target-classpath.bat"
+::       call "%IGNITE_HOME%\os\bin\include\target-classpath.bat"
 :: in other scripts to set classpath using libs from target folder.
 ::
 :: Will be excluded in release.
 
 @echo off
 
-for /D %%F in (%GRIDGAIN_HOME%\os\modules\*) do if not %%F == "%GRIDGAIN_HOME%\os\modules" call :includeToClassPath %%F
+for /D %%F in (%IGNITE_HOME%\os\modules\*) do if not %%F == "%IGNITE_HOME%\os\modules" call :includeToClassPath %%F
 
-for /D %%F in (%GRIDGAIN_HOME%\modules\*) do if not %%F == "%GRIDGAIN_HOME%\modules" call :includeToClassPath %%F
+for /D %%F in (%IGNITE_HOME%\modules\*) do if not %%F == "%IGNITE_HOME%\modules" call :includeToClassPath %%F
 
 goto :eof
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d336959d/bin/include/target-classpath.sh
----------------------------------------------------------------------
diff --git a/bin/include/target-classpath.sh b/bin/include/target-classpath.sh
index 6d90a3e..4294e36 100644
--- a/bin/include/target-classpath.sh
+++ b/bin/include/target-classpath.sh
@@ -17,7 +17,7 @@
 # Target class path resolver.
 #
 # Can be used like:
-#       . "${GRIDGAIN_HOME}"/os/bin/include/target-classpath.sh
+#       . "${IGNITE_HOME}"/os/bin/include/target-classpath.sh
 # in other scripts to set classpath using libs from target folder.
 #
 # Will be excluded in release.
@@ -31,11 +31,11 @@ SEP=":";
 case "`uname`" in
     MINGW*)
         SEP=";";
-        export GRIDGAIN_HOME=`echo $GRIDGAIN_HOME | sed -e 's/^\/\([a-zA-Z]\)/\1:/'`
+        export IGNITE_HOME=`echo $IGNITE_HOME | sed -e 's/^\/\([a-zA-Z]\)/\1:/'`
         ;;
     CYGWIN*)
         SEP=";";
-        export GRIDGAIN_HOME=`echo $GRIDGAIN_HOME | sed -e 's/^\/\([a-zA-Z]\)/\1:/'`
+        export IGNITE_HOME=`echo $IGNITE_HOME | sed -e 's/^\/\([a-zA-Z]\)/\1:/'`
         ;;
 esac
 
@@ -57,9 +57,9 @@ includeToClassPath() {
 #
 # Include target libraries for opensourse modules to classpath.
 #
-includeToClassPath ${GRIDGAIN_HOME}/os/modules
+includeToClassPath ${IGNITE_HOME}/os/modules
 
 #
 # Include target libraries for enterprise modules to classpath.
 #
-includeToClassPath ${GRIDGAIN_HOME}/modules
+includeToClassPath ${IGNITE_HOME}/modules

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d336959d/bin/setup-hadoop.sh
----------------------------------------------------------------------
diff --git a/bin/setup-hadoop.sh b/bin/setup-hadoop.sh
index 6f50faa..342916f 100755
--- a/bin/setup-hadoop.sh
+++ b/bin/setup-hadoop.sh
@@ -32,20 +32,20 @@ fi
 #
 # Import common functions.
 #
-if [ "${GRIDGAIN_HOME}" = "" ];
-    then GRIDGAIN_HOME_TMP="$(dirname "$(cd "$(dirname "$0")"; "pwd")")";GRIDGAIN_HOME_TMP="$(dirname "${GRIDGAIN_HOME_TMP}")" # Will be removed in release.
-    else GRIDGAIN_HOME_TMP=${GRIDGAIN_HOME};
+if [ "${IGNITE_HOME}" = "" ];
+    then IGNITE_HOME_TMP="$(dirname "$(cd "$(dirname "$0")"; "pwd")")";IGNITE_HOME_TMP="$(dirname "${IGNITE_HOME_TMP}")" # Will be removed in release.
+    else IGNITE_HOME_TMP=${IGNITE_HOME};
 fi
 
 #
 # Set SCRIPTS_HOME - base path to scripts.
 #
-SCRIPTS_HOME="${GRIDGAIN_HOME_TMP}/bin"
+SCRIPTS_HOME="${IGNITE_HOME_TMP}/bin"
 
 source "${SCRIPTS_HOME}"/include/functions.sh
 
 #
-# Discover GRIDGAIN_HOME environment variable.
+# Discover IGNITE_HOME environment variable.
 #
 setGridGainHome
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d336959d/config/gridgain-log4j.xml
----------------------------------------------------------------------
diff --git a/config/gridgain-log4j.xml b/config/gridgain-log4j.xml
index dbf3baf..c8d6012 100644
--- a/config/gridgain-log4j.xml
+++ b/config/gridgain-log4j.xml
@@ -65,11 +65,11 @@
 
     <!--
         Logs all output to specified file.
-        By default, the logging goes to GRIDGAIN_HOME/work/log folder
+        By default, the logging goes to IGNITE_HOME/work/log folder
     -->
     <appender name="FILE" class="org.gridgain.grid.logger.log4j.GridLog4jRollingFileAppender">
         <param name="Threshold" value="DEBUG"/>
-        <param name="File" value="${GRIDGAIN_HOME}/work/log/gridgain.log"/>
+        <param name="File" value="${IGNITE_HOME}/work/log/gridgain.log"/>
         <param name="Append" value="true"/>
         <param name="MaxFileSize" value="10MB"/>
         <param name="MaxBackupIndex" value="10"/>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d336959d/config/hadoop/default-config.xml
----------------------------------------------------------------------
diff --git a/config/hadoop/default-config.xml b/config/hadoop/default-config.xml
index e076524..03b45fa 100644
--- a/config/hadoop/default-config.xml
+++ b/config/hadoop/default-config.xml
@@ -21,7 +21,7 @@
     GridGain Spring configuration file.
 
     When starting a standalone GridGain node, you need to execute the following command:
-    {GRIDGAIN_HOME}/bin/ggstart.{bat|sh} path-to-this-file/default-config.xml
+    {IGNITE_HOME}/bin/ggstart.{bat|sh} path-to-this-file/default-config.xml
 
     When starting GridGain from Java IDE, pass path to this file into GridGain:
     GridGain.start("path-to-this-file/default-config.xml");

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d336959d/config/java.util.logging.properties
----------------------------------------------------------------------
diff --git a/config/java.util.logging.properties b/config/java.util.logging.properties
index 3ffdde3..3e11d63 100644
--- a/config/java.util.logging.properties
+++ b/config/java.util.logging.properties
@@ -65,7 +65,7 @@ java.util.logging.ConsoleHandler.level=INFO
 
 #
 # File handler logs all messages into files with pattern `gridgain-%{id8}.%g.log`
-# under `$GRIDGAIN_HOME/work/log/` directory. The placeholder `%{id8}` is a truncated node ID.
+# under `$IGNITE_HOME/work/log/` directory. The placeholder `%{id8}` is a truncated node ID.
 #
 org.gridgain.grid.logger.java.GridJavaLoggerFileHandler.formatter=org.apache.ignite.logger.java.IgniteJavaLoggerFormatter
 org.gridgain.grid.logger.java.GridJavaLoggerFileHandler.pattern=gridgain-%{id8}.%g.log

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d336959d/config/router/default-router.xml
----------------------------------------------------------------------
diff --git a/config/router/default-router.xml b/config/router/default-router.xml
index 88d794f..6a8f831 100644
--- a/config/router/default-router.xml
+++ b/config/router/default-router.xml
@@ -21,7 +21,7 @@
     Default rest router configuration.
 
     This file is automatically scanned by
-    $GRIDGAIN_HOME/bin/ggrouter.sh and $GRIDGAIN_HOME/bin/ggrouter.bat
+    $IGNITE_HOME/bin/ggrouter.sh and $IGNITE_HOME/bin/ggrouter.bat
     for org.gridgain.client.router.GridTcpRestRouterConfiguration  bean definition.
     First found is used to start router instance.
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d336959d/docs/core-site.gridgain.xml
----------------------------------------------------------------------
diff --git a/docs/core-site.gridgain.xml b/docs/core-site.gridgain.xml
index 0054b60..f1d6e51 100644
--- a/docs/core-site.gridgain.xml
+++ b/docs/core-site.gridgain.xml
@@ -30,7 +30,7 @@
     Note that GridGain jars must be in Apache Hadoop client classpath to work
     with this configuration.
 
-    Run script '$GRIDGAIN_HOME/bin/setup-hadoop.{sh|bat}' for Apache Hadoop client setup.
+    Run script '$IGNITE_HOME/bin/setup-hadoop.{sh|bat}' for Apache Hadoop client setup.
 -->
 
 <configuration>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d336959d/docs/gridgain_readme.md
----------------------------------------------------------------------
diff --git a/docs/gridgain_readme.md b/docs/gridgain_readme.md
index 2bd7370..9cea2b2 100644
--- a/docs/gridgain_readme.md
+++ b/docs/gridgain_readme.md
@@ -25,7 +25,7 @@ Enterprise Features:
 * GUI Management & Monitoring
 
 ## 2. GridGain Installation
-GridGain distribution comes in a ZIP file that simply needs to be unzipped, and `GRIDGAIN_HOME` environment variable
+GridGain distribution comes in a ZIP file that simply needs to be unzipped, and `IGNITE_HOME` environment variable
 can optionally be set to point to it.
 
 There are no additional steps required for GridGain installation in such multi machine setup.
@@ -35,7 +35,7 @@ Installation requirements:
 1. Windows, Linux, or MacOS environment.
 2. Java 7 or 8 (latest update is advisable).
 3. Point `JAVA_HOME` environment variable to your JDK or JRE installation.
-4. Optional: point `GRIDGAIN_HOME` environment variable to the GridGain installation folder.
+4. Optional: point `IGNITE_HOME` environment variable to the GridGain installation folder.
 
 ### 2.1 Check GridGain Installation
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d336959d/docs/hive-site.gridgain.xml
----------------------------------------------------------------------
diff --git a/docs/hive-site.gridgain.xml b/docs/hive-site.gridgain.xml
index e93be35..b6a737b 100644
--- a/docs/hive-site.gridgain.xml
+++ b/docs/hive-site.gridgain.xml
@@ -22,7 +22,7 @@
     with GridGain In-Memory Accelerator.
 
     You can replace '$HIVE_HOME/conf/hive-site.xml' file with this one or
-    run script '$GRIDGAIN_HOME/bin/setup-hadoop.{sh|bat}' for Apache Hadoop
+    run script '$IGNITE_HOME/bin/setup-hadoop.{sh|bat}' for Apache Hadoop
     and Hive client setup.
 -->
 <configuration>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d336959d/docs/mapred-site.gridgain.xml
----------------------------------------------------------------------
diff --git a/docs/mapred-site.gridgain.xml b/docs/mapred-site.gridgain.xml
index c9b95c4..3bfa698 100644
--- a/docs/mapred-site.gridgain.xml
+++ b/docs/mapred-site.gridgain.xml
@@ -43,11 +43,11 @@
     Note that GridGain jars must be in Apache Hadoop client classpath to work
     with this configuration.
 
-    Run script '$GRIDGAIN_HOME/bin/setup-hadoop.{sh|bat}' for Apache Hadoop client setup.
+    Run script '$IGNITE_HOME/bin/setup-hadoop.{sh|bat}' for Apache Hadoop client setup.
 -->
 
 <configuration>
-    <!-- 
+    <!--
         Framework name must be set to 'gridgain'.
     -->
     <property>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d336959d/examples/config/example-cache.xml
----------------------------------------------------------------------
diff --git a/examples/config/example-cache.xml b/examples/config/example-cache.xml
index db4cabd..682a8a3 100644
--- a/examples/config/example-cache.xml
+++ b/examples/config/example-cache.xml
@@ -21,7 +21,7 @@
     GridGain Spring configuration file to startup grid cache.
 
     When starting a standalone GridGain node, you need to execute the following command:
-    {GRIDGAIN_HOME}/bin/ggstart.{bat|sh} examples/config/example-cache.xml
+    {IGNITE_HOME}/bin/ggstart.{bat|sh} examples/config/example-cache.xml
 
     When starting GridGain from Java IDE, pass path to this file to GridGain:
     GridGain.start("examples/config/example-cache.xml");

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d336959d/examples/config/example-streamer.xml
----------------------------------------------------------------------
diff --git a/examples/config/example-streamer.xml b/examples/config/example-streamer.xml
index 3afd8a8..6674b24 100644
--- a/examples/config/example-streamer.xml
+++ b/examples/config/example-streamer.xml
@@ -21,12 +21,12 @@
     GridGain Spring configuration file to startup grid with streamers.
 
     When starting a standalone GridGain node, you need to execute the following command:
-    {GRIDGAIN_HOME}/bin/ggstart.{bat|sh} examples/config/example-streamer.xml
+    {IGNITE_HOME}/bin/ggstart.{bat|sh} examples/config/example-streamer.xml
     When starting nodes this way JAR file containing the examples code
-    should be placed to {GRIDGAIN_HOME}/libs folder. You can build
-    gridgain-examples.jar by running "mvn package" in {GRIDGAIN_HOME}/examples folder.
+    should be placed to {IGNITE_HOME}/libs folder. You can build
+    gridgain-examples.jar by running "mvn package" in {IGNITE_HOME}/examples folder.
     After that gridgain-examples.jar will be generated by Maven in
-    {GRIDGAIN_HOME}/examples/target folder.
+    {IGNITE_HOME}/examples/target folder.
 
     When starting GridGain from Java IDE, pass path to this file into GridGain:
     GridGain.start("examples/config/example-streamer.xml");

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d336959d/examples/config/filesystem/example-ggfs.xml
----------------------------------------------------------------------
diff --git a/examples/config/filesystem/example-ggfs.xml b/examples/config/filesystem/example-ggfs.xml
index 11867e9..08ac4cd 100644
--- a/examples/config/filesystem/example-ggfs.xml
+++ b/examples/config/filesystem/example-ggfs.xml
@@ -21,7 +21,7 @@
     GridGain Spring configuration file to startup grid cache.
 
     When starting a standalone GridGain node, you need to execute the following command:
-    {GRIDGAIN_HOME}/bin/ggstart.{bat|sh} examples/config/filesystem/example-ggfs.xml
+    {IGNITE_HOME}/bin/ggstart.{bat|sh} examples/config/filesystem/example-ggfs.xml
 
     When starting GridGain from Java IDE, pass path to this file into GridGain:
     GridGain.start("examples/config/filesystem/example-ggfs.xml");

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d336959d/examples/rest/http-rest-example.php
----------------------------------------------------------------------
diff --git a/examples/rest/http-rest-example.php b/examples/rest/http-rest-example.php
index 6e76eea..9c02a16 100644
--- a/examples/rest/http-rest-example.php
+++ b/examples/rest/http-rest-example.php
@@ -22,7 +22,7 @@
  * To execute this script simply start up an instance of GridGain with cache enabled.
  * You can use any cache configuration from examples/config folder as follows:
  * ----
- * ${GRIDGAIN_HOME}/bin/ggstart.sh examples/config/example-cache.xml
+ * ${IGNITE_HOME}/bin/ggstart.sh examples/config/example-cache.xml
  * ----
  *
  * Make sure you have correctly specified $CACHE_NAME script global variable

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d336959d/examples/rest/memcache-rest-example.php
----------------------------------------------------------------------
diff --git a/examples/rest/memcache-rest-example.php b/examples/rest/memcache-rest-example.php
index 0466fb6..9507e19 100644
--- a/examples/rest/memcache-rest-example.php
+++ b/examples/rest/memcache-rest-example.php
@@ -27,7 +27,7 @@
  * You can use default cache configuration from examples/config folder to
  * start up an instance of GridGain with cache enabled as follows:
  * ----
- * ${GRIDGAIN_HOME}/bin/ggstart.sh examples/config/example-cache-default.xml
+ * ${IGNITE_HOME}/bin/ggstart.sh examples/config/example-cache-default.xml
  * ----
  */
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d336959d/examples/src/main/java/org/apache/ignite/examples/datagrid/hibernate/HibernateL2CacheExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/hibernate/HibernateL2CacheExample.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/hibernate/HibernateL2CacheExample.java
index 7773980..20c377c 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datagrid/hibernate/HibernateL2CacheExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/hibernate/HibernateL2CacheExample.java
@@ -61,7 +61,7 @@ import java.util.*;
  * <p>
  * Note: this example uses {@link AccessType#READ_ONLY} L2 cache access type, but you
  * can experiment with other access types by modifying the Hibernate configuration file
- * {@code GRIDGAIN_HOME/examples/config/hibernate/example-hibernate-L2-cache.xml}, used by the example.
+ * {@code IGNITE_HOME/examples/config/hibernate/example-hibernate-L2-cache.xml}, used by the example.
  * <p>
  * Remote nodes should always be started using {@link HibernateL2CacheExampleNodeStartup}
  */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d336959d/examples/src/main/java/org/apache/ignite/examples/streaming/StreamingCheckInExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/streaming/StreamingCheckInExample.java b/examples/src/main/java/org/apache/ignite/examples/streaming/StreamingCheckInExample.java
index 758ec3b..2b3c0e8 100644
--- a/examples/src/main/java/org/apache/ignite/examples/streaming/StreamingCheckInExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/streaming/StreamingCheckInExample.java
@@ -54,10 +54,10 @@ import java.util.concurrent.*;
  * Remote nodes should always be started with special configuration file:
  * {@code 'ggstart.{sh|bat} examples/config/example-streamer.xml'}.
  * When starting nodes this way JAR file containing the examples code
- * should be placed to {@code GRIDGAIN_HOME/libs} folder. You can build
+ * should be placed to {@code IGNITE_HOME/libs} folder. You can build
  * {@code gridgain-examples.jar} by running {@code mvn package} in
- * {@code GRIDGAIN_HOME/examples} folder. After that {@code gridgain-examples.jar}
- * will be generated by Maven in {@code GRIDGAIN_HOME/examples/target} folder.
+ * {@code IGNITE_HOME/examples} folder. After that {@code gridgain-examples.jar}
+ * will be generated by Maven in {@code IGNITE_HOME/examples/target} folder.
  * <p>
  * Alternatively you can run {@link StreamingNodeStartup} in another JVM which will start GridGain node
  * with {@code examples/config/example-streamer.xml} configuration.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d336959d/examples/src/main/java/org/apache/ignite/examples/streaming/StreamingPopularNumbersExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/streaming/StreamingPopularNumbersExample.java b/examples/src/main/java/org/apache/ignite/examples/streaming/StreamingPopularNumbersExample.java
index 53ef58a..56712bf 100644
--- a/examples/src/main/java/org/apache/ignite/examples/streaming/StreamingPopularNumbersExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/streaming/StreamingPopularNumbersExample.java
@@ -37,10 +37,10 @@ import java.util.*;
  * Remote nodes should always be started with special configuration file:
  * {@code 'ggstart.{sh|bat} examples/config/example-streamer.xml'}.
  * When starting nodes this way JAR file containing the examples code
- * should be placed to {@code GRIDGAIN_HOME/libs} folder. You can build
+ * should be placed to {@code IGNITE_HOME/libs} folder. You can build
  * {@code gridgain-examples.jar} by running {@code mvn package} in
- * {@code GRIDGAIN_HOME/examples} folder. After that {@code gridgain-examples.jar}
- * will be generated by Maven in {@code GRIDGAIN_HOME/examples/target} folder.
+ * {@code IGNITE_HOME/examples} folder. After that {@code gridgain-examples.jar}
+ * will be generated by Maven in {@code IGNITE_HOME/examples/target} folder.
  * <p>
  * Alternatively you can run {@link StreamingNodeStartup} in another JVM which will start GridGain node
  * with {@code examples/config/example-streamer.xml} configuration.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d336959d/examples/src/main/java/org/apache/ignite/examples/streaming/StreamingPriceBarsExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/streaming/StreamingPriceBarsExample.java b/examples/src/main/java/org/apache/ignite/examples/streaming/StreamingPriceBarsExample.java
index c351bbe..708564e 100644
--- a/examples/src/main/java/org/apache/ignite/examples/streaming/StreamingPriceBarsExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/streaming/StreamingPriceBarsExample.java
@@ -48,10 +48,10 @@ import java.util.concurrent.*;
  * Remote nodes should always be started with special configuration file:
  * {@code 'ggstart.{sh|bat} examples/config/example-streamer.xml'}.
  * When starting nodes this way JAR file containing the examples code
- * should be placed to {@code GRIDGAIN_HOME/libs} folder. You can build
+ * should be placed to {@code IGNITE_HOME/libs} folder. You can build
  * {@code gridgain-examples.jar} by running {@code mvn package} in
- * {@code GRIDGAIN_HOME/examples} folder. After that {@code gridgain-examples.jar}
- * will be generated by Maven in {@code GRIDGAIN_HOME/examples/target} folder.
+ * {@code IGNITE_HOME/examples} folder. After that {@code gridgain-examples.jar}
+ * will be generated by Maven in {@code IGNITE_HOME/examples/target} folder.
  * <p>
  * Alternatively you can run {@link StreamingNodeStartup} in another JVM which will start GridGain node
  * with {@code examples/config/example-streamer.xml} configuration.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d336959d/examples/src/main/java/org/apache/ignite/examples/streaming/StreamingRunningAverageExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/streaming/StreamingRunningAverageExample.java b/examples/src/main/java/org/apache/ignite/examples/streaming/StreamingRunningAverageExample.java
index a0d51d9..3b6f52e 100644
--- a/examples/src/main/java/org/apache/ignite/examples/streaming/StreamingRunningAverageExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/streaming/StreamingRunningAverageExample.java
@@ -34,10 +34,10 @@ import java.util.concurrent.*;
  * Remote nodes should always be started with special configuration file:
  * {@code 'ggstart.{sh|bat} examples/config/example-streamer.xml'}.
  * When starting nodes this way JAR file containing the examples code
- * should be placed to {@code GRIDGAIN_HOME/libs} folder. You can build
+ * should be placed to {@code IGNITE_HOME/libs} folder. You can build
  * {@code gridgain-examples.jar} by running {@code mvn package} in
- * {@code GRIDGAIN_HOME/examples} folder. After that {@code gridgain-examples.jar}
- * will be generated by Maven in {@code GRIDGAIN_HOME/examples/target} folder.
+ * {@code IGNITE_HOME/examples} folder. After that {@code gridgain-examples.jar}
+ * will be generated by Maven in {@code IGNITE_HOME/examples/target} folder.
  * <p>
  * Alternatively you can run {@link StreamingNodeStartup} in another JVM which will start GridGain node
  * with {@code examples/config/example-streamer.xml} configuration.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d336959d/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarPrimeExample.scala
----------------------------------------------------------------------
diff --git a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarPrimeExample.scala b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarPrimeExample.scala
index 102b52b..1165ef9 100644
--- a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarPrimeExample.scala
+++ b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarPrimeExample.scala
@@ -30,7 +30,7 @@ import scala.util.control.Breaks._
  * ==Starting Remote Nodes==
  * To try this example you should (but don't have to) start remote grid instances.
  * You can start as many as you like by executing the following script:
- * `{GRIDGAIN_HOME}/bin/ggstart.{bat|sh} examples/config/example-compute.xml`
+ * `{IGNITE_HOME}/bin/ggstart.{bat|sh} examples/config/example-compute.xml`
  *
  * Once remote instances are started, you can execute this example from
  * Eclipse, IntelliJ IDEA, or NetBeans (and any other Java IDE) by simply hitting run

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d336959d/examples/src/test/java/org/apache/ignite/examples/GridMonteCarloExamplesSelfTest.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java/org/apache/ignite/examples/GridMonteCarloExamplesSelfTest.java b/examples/src/test/java/org/apache/ignite/examples/GridMonteCarloExamplesSelfTest.java
index 487af99..3d0a30c 100644
--- a/examples/src/test/java/org/apache/ignite/examples/GridMonteCarloExamplesSelfTest.java
+++ b/examples/src/test/java/org/apache/ignite/examples/GridMonteCarloExamplesSelfTest.java
@@ -58,10 +58,10 @@ import org.apache.ignite.testframework.junits.common.*;
  * <ul>
  * <li>
  *      JVM configuration should include:
- *      {@code -javaagent:${GRIDGAIN_HOME}/libs/aspectjweaver-1.7.2.jar}
+ *      {@code -javaagent:${IGNITE_HOME}/libs/aspectjweaver-1.7.2.jar}
  * </li>
  * <li>
- *      Classpath should contain the {@code ${GRIDGAIN_HOME}/modules/tests/config/aop/aspectj} folder.
+ *      Classpath should contain the {@code ${IGNITE_HOME}/modules/tests/config/aop/aspectj} folder.
  * </li>
  */
 public class GridMonteCarloExamplesSelfTest extends GridAbstractExamplesTest {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d336959d/modules/aop/src/test/java/org/apache/ignite/gridify/GridifySetToXXXNonSpringAopSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/aop/src/test/java/org/apache/ignite/gridify/GridifySetToXXXNonSpringAopSelfTest.java b/modules/aop/src/test/java/org/apache/ignite/gridify/GridifySetToXXXNonSpringAopSelfTest.java
index 15539fc..d005183 100644
--- a/modules/aop/src/test/java/org/apache/ignite/gridify/GridifySetToXXXNonSpringAopSelfTest.java
+++ b/modules/aop/src/test/java/org/apache/ignite/gridify/GridifySetToXXXNonSpringAopSelfTest.java
@@ -24,25 +24,25 @@ import java.util.*;
  * To run this test with JBoss AOP make sure of the following:
  *
  * 1. The JVM is started with following parameters to enable jboss online weaving
- *      (replace ${GRIDGAIN_HOME} to you $GRIDGAIN_HOME):
- *      -javaagent:${GRIDGAIN_HOME}libs/jboss-aop-jdk50-4.0.4.jar
+ *      (replace ${IGNITE_HOME} to you $IGNITE_HOME):
+ *      -javaagent:${IGNITE_HOME}libs/jboss-aop-jdk50-4.0.4.jar
  *      -Djboss.aop.class.path=[path to grid compiled classes (Idea out folder) or path to gridgain.jar]
  *      -Djboss.aop.exclude=org,com -Djboss.aop.include=org.gridgain
  *
  * 2. The following jars should be in a classpath:
- *      ${GRIDGAIN_HOME}libs/javassist-3.x.x.jar
- *      ${GRIDGAIN_HOME}libs/jboss-aop-jdk50-4.0.4.jar
- *      ${GRIDGAIN_HOME}libs/jboss-aspect-library-jdk50-4.0.4.jar
- *      ${GRIDGAIN_HOME}libs/jboss-common-4.2.2.jar
- *      ${GRIDGAIN_HOME}libs/trove-1.0.2.jar
+ *      ${IGNITE_HOME}libs/javassist-3.x.x.jar
+ *      ${IGNITE_HOME}libs/jboss-aop-jdk50-4.0.4.jar
+ *      ${IGNITE_HOME}libs/jboss-aspect-library-jdk50-4.0.4.jar
+ *      ${IGNITE_HOME}libs/jboss-common-4.2.2.jar
+ *      ${IGNITE_HOME}libs/trove-1.0.2.jar
  *
  * To run this test with AspectJ APO make sure of the following:
  *
  * 1. The JVM is started with following parameters for enable AspectJ online weaving
- *      (replace ${GRIDGAIN_HOME} to you $GRIDGAIN_HOME):
- *      -javaagent:${GRIDGAIN_HOME}/libs/aspectjweaver-1.7.2.jar
+ *      (replace ${IGNITE_HOME} to you $IGNITE_HOME):
+ *      -javaagent:${IGNITE_HOME}/libs/aspectjweaver-1.7.2.jar
  *
- * 2. Classpath should contains the ${GRIDGAIN_HOME}/modules/tests/config/aop/aspectj folder.
+ * 2. Classpath should contains the ${IGNITE_HOME}/modules/tests/config/aop/aspectj folder.
  */
 @GridCommonTest(group="AOP")
 public class GridifySetToXXXNonSpringAopSelfTest extends GridCommonAbstractTest {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d336959d/modules/aop/src/test/java/org/apache/ignite/gridify/GridifySetToXXXSpringAopSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/aop/src/test/java/org/apache/ignite/gridify/GridifySetToXXXSpringAopSelfTest.java b/modules/aop/src/test/java/org/apache/ignite/gridify/GridifySetToXXXSpringAopSelfTest.java
index 65f731e..72fe1f8 100644
--- a/modules/aop/src/test/java/org/apache/ignite/gridify/GridifySetToXXXSpringAopSelfTest.java
+++ b/modules/aop/src/test/java/org/apache/ignite/gridify/GridifySetToXXXSpringAopSelfTest.java
@@ -25,25 +25,25 @@ import java.util.*;
  * To run this test with JBoss AOP make sure of the following:
  *
  * 1. The JVM is started with following parameters to enable jboss online weaving
- *      (replace ${GRIDGAIN_HOME} to you $GRIDGAIN_HOME):
- *      -javaagent:${GRIDGAIN_HOME}libs/jboss-aop-jdk50-4.0.4.jar
+ *      (replace ${IGNITE_HOME} to you $IGNITE_HOME):
+ *      -javaagent:${IGNITE_HOME}libs/jboss-aop-jdk50-4.0.4.jar
  *      -Djboss.aop.class.path=[path to grid compiled classes (Idea out folder) or path to gridgain.jar]
  *      -Djboss.aop.exclude=org,com -Djboss.aop.include=org.gridgain
  *
  * 2. The following jars should be in a classpath:
- *      ${GRIDGAIN_HOME}libs/javassist-3.x.x.jar
- *      ${GRIDGAIN_HOME}libs/jboss-aop-jdk50-4.0.4.jar
- *      ${GRIDGAIN_HOME}libs/jboss-aspect-library-jdk50-4.0.4.jar
- *      ${GRIDGAIN_HOME}libs/jboss-common-4.2.2.jar
- *      ${GRIDGAIN_HOME}libs/trove-1.0.2.jar
+ *      ${IGNITE_HOME}libs/javassist-3.x.x.jar
+ *      ${IGNITE_HOME}libs/jboss-aop-jdk50-4.0.4.jar
+ *      ${IGNITE_HOME}libs/jboss-aspect-library-jdk50-4.0.4.jar
+ *      ${IGNITE_HOME}libs/jboss-common-4.2.2.jar
+ *      ${IGNITE_HOME}libs/trove-1.0.2.jar
  *
  * To run this test with AspectJ APO make sure of the following:
  *
  * 1. The JVM is started with following parameters for enable AspectJ online weaving
- *      (replace ${GRIDGAIN_HOME} to you $GRIDGAIN_HOME):
- *      -javaagent:${GRIDGAIN_HOME}/libs/aspectjweaver-1.7.2.jar
+ *      (replace ${IGNITE_HOME} to you $IGNITE_HOME):
+ *      -javaagent:${IGNITE_HOME}/libs/aspectjweaver-1.7.2.jar
  *
- * 2. Classpath should contains the ${GRIDGAIN_HOME}/modules/tests/config/aop/aspectj folder.
+ * 2. Classpath should contains the ${IGNITE_HOME}/modules/tests/config/aop/aspectj folder.
  */
 @GridCommonTest(group="AOP")
 public class GridifySetToXXXSpringAopSelfTest extends GridCommonAbstractTest {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d336959d/modules/aop/src/test/java/org/apache/ignite/gridify/NonSpringAopSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/aop/src/test/java/org/apache/ignite/gridify/NonSpringAopSelfTest.java b/modules/aop/src/test/java/org/apache/ignite/gridify/NonSpringAopSelfTest.java
index 1c1fa9f..1a1ac44 100644
--- a/modules/aop/src/test/java/org/apache/ignite/gridify/NonSpringAopSelfTest.java
+++ b/modules/aop/src/test/java/org/apache/ignite/gridify/NonSpringAopSelfTest.java
@@ -23,25 +23,25 @@ import org.apache.ignite.testframework.junits.common.*;
  * To run this test with JBoss AOP make sure of the following:
  *
  * 1. The JVM is started with following parameters to enable jboss online weaving
- *      (replace ${GRIDGAIN_HOME} to you $GRIDGAIN_HOME):
- *      -javaagent:${GRIDGAIN_HOME}libs/jboss-aop-jdk50-4.0.4.jar
+ *      (replace ${IGNITE_HOME} to you $IGNITE_HOME):
+ *      -javaagent:${IGNITE_HOME}libs/jboss-aop-jdk50-4.0.4.jar
  *      -Djboss.aop.class.path=[path to grid compiled classes (Idea out folder) or path to gridgain.jar]
  *      -Djboss.aop.exclude=org,com -Djboss.aop.include=org.gridgain
  *
  * 2. The following jars should be in a classpath:
- *      ${GRIDGAIN_HOME}libs/javassist-3.x.x.jar
- *      ${GRIDGAIN_HOME}libs/jboss-aop-jdk50-4.0.4.jar
- *      ${GRIDGAIN_HOME}libs/jboss-aspect-library-jdk50-4.0.4.jar
- *      ${GRIDGAIN_HOME}libs/jboss-common-4.2.2.jar
- *      ${GRIDGAIN_HOME}libs/trove-1.0.2.jar
+ *      ${IGNITE_HOME}libs/javassist-3.x.x.jar
+ *      ${IGNITE_HOME}libs/jboss-aop-jdk50-4.0.4.jar
+ *      ${IGNITE_HOME}libs/jboss-aspect-library-jdk50-4.0.4.jar
+ *      ${IGNITE_HOME}libs/jboss-common-4.2.2.jar
+ *      ${IGNITE_HOME}libs/trove-1.0.2.jar
  *
  * To run this test with AspectJ AOP make sure of the following:
  *
  * 1. The JVM is started with following parameters for enable AspectJ online weaving
- *      (replace ${GRIDGAIN_HOME} to you $GRIDGAIN_HOME):
- *      -javaagent:${GRIDGAIN_HOME}/libs/optional/gridgain-aop/aspectjweaver-1.7.2.jar
+ *      (replace ${IGNITE_HOME} to you $IGNITE_HOME):
+ *      -javaagent:${IGNITE_HOME}/libs/optional/gridgain-aop/aspectjweaver-1.7.2.jar
  *
- * 2. Classpath should contains the ${GRIDGAIN_HOME}/modules/tests/config/aop/aspectj folder.
+ * 2. Classpath should contains the ${IGNITE_HOME}/modules/tests/config/aop/aspectj folder.
  */
 @GridCommonTest(group="AOP")
 public class NonSpringAopSelfTest extends AbstractAopTest {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d336959d/modules/aop/src/test/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerAopTest.java
----------------------------------------------------------------------
diff --git a/modules/aop/src/test/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerAopTest.java b/modules/aop/src/test/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerAopTest.java
index 53d00c8..4bd4a3a 100644
--- a/modules/aop/src/test/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerAopTest.java
+++ b/modules/aop/src/test/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerAopTest.java
@@ -36,10 +36,10 @@ import static org.apache.ignite.events.IgniteEventType.*;
  * <ul>
  * <li>
  *      JVM configuration should include:
- *      <tt>-javaagent:[GRIDGAIN_HOME]/libs/aspectjweaver-1.7.2.jar</tt>
+ *      <tt>-javaagent:[IGNITE_HOME]/libs/aspectjweaver-1.7.2.jar</tt>
  * </li>
  * <li>
- *      Classpath should contain the <tt>[GRIDGAIN_HOME]/modules/tests/config/aop/aspectj</tt> folder.
+ *      Classpath should contain the <tt>[IGNITE_HOME]/modules/tests/config/aop/aspectj</tt> folder.
  * </li>
  * </ul>
  */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d336959d/modules/aop/src/test/java/org/test/gridify/ExternalNonSpringAopSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/aop/src/test/java/org/test/gridify/ExternalNonSpringAopSelfTest.java b/modules/aop/src/test/java/org/test/gridify/ExternalNonSpringAopSelfTest.java
index f68a0c5..6d4ee53 100644
--- a/modules/aop/src/test/java/org/test/gridify/ExternalNonSpringAopSelfTest.java
+++ b/modules/aop/src/test/java/org/test/gridify/ExternalNonSpringAopSelfTest.java
@@ -28,25 +28,25 @@ import org.apache.ignite.testframework.junits.common.*;
  * To run this test with JBoss AOP make sure of the following:
  *
  * 1. The JVM is started with following parameters to enable jboss online weaving
- *      (replace ${GRIDGAIN_HOME} to you $GRIDGAIN_HOME):
- *      -javaagent:${GRIDGAIN_HOME}libs/jboss-aop-jdk50-4.0.4.jar
+ *      (replace ${IGNITE_HOME} to you $IGNITE_HOME):
+ *      -javaagent:${IGNITE_HOME}libs/jboss-aop-jdk50-4.0.4.jar
  *      -Djboss.aop.class.path=[path to grid compiled classes (Idea out folder) or path to gridgain.jar]
  *      -Djboss.aop.exclude=org,com -Djboss.aop.include=org.gridgain
  *
  * 2. The following jars should be in a classpath:
- *      ${GRIDGAIN_HOME}libs/javassist-3.x.x.jar
- *      ${GRIDGAIN_HOME}libs/jboss-aop-jdk50-4.0.4.jar
- *      ${GRIDGAIN_HOME}libs/jboss-aspect-library-jdk50-4.0.4.jar
- *      ${GRIDGAIN_HOME}libs/jboss-common-4.2.2.jar
- *      ${GRIDGAIN_HOME}libs/trove-1.0.2.jar
+ *      ${IGNITE_HOME}libs/javassist-3.x.x.jar
+ *      ${IGNITE_HOME}libs/jboss-aop-jdk50-4.0.4.jar
+ *      ${IGNITE_HOME}libs/jboss-aspect-library-jdk50-4.0.4.jar
+ *      ${IGNITE_HOME}libs/jboss-common-4.2.2.jar
+ *      ${IGNITE_HOME}libs/trove-1.0.2.jar
  *
  * To run this test with AspectJ AOP make sure of the following:
  *
  * 1. The JVM is started with following parameters for enable AspectJ online weaving
- *      (replace ${GRIDGAIN_HOME} to you $GRIDGAIN_HOME):
- *      -javaagent:${GRIDGAIN_HOME}/libs/aspectjweaver-1.7.2.jar
+ *      (replace ${IGNITE_HOME} to you $IGNITE_HOME):
+ *      -javaagent:${IGNITE_HOME}/libs/aspectjweaver-1.7.2.jar
  *
- * 2. Classpath should contains the ${GRIDGAIN_HOME}/modules/tests/config/aop/aspectj folder.
+ * 2. Classpath should contains the ${IGNITE_HOME}/modules/tests/config/aop/aspectj folder.
  */
 @GridCommonTest(group="AOP")
 public class ExternalNonSpringAopSelfTest extends GridCommonAbstractTest {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d336959d/modules/clients/src/test/resources/log4j.xml
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/resources/log4j.xml b/modules/clients/src/test/resources/log4j.xml
index 88f6b73..68ea393 100644
--- a/modules/clients/src/test/resources/log4j.xml
+++ b/modules/clients/src/test/resources/log4j.xml
@@ -63,14 +63,14 @@
 
     <!--
         Logs all output to specified file.
-        By default, the logging goes to GRIDGAIN_HOME/work/log folder
+        By default, the logging goes to IGNITE_HOME/work/log folder
 
         Note, this appender is disabled by default.
         To enable, uncomment the section below and also FILE appender in the <root> element.
     -->
     <appender name="FILE" class="org.apache.log4j.RollingFileAppender">
         <param name="Threshold" value="DEBUG"/>
-        <param name="File" value="${GRIDGAIN_HOME}/work/log/gridgain.log"/>
+        <param name="File" value="${IGNITE_HOME}/work/log/gridgain.log"/>
         <param name="Append" value="true"/>
         <param name="MaxFileSize" value="10MB"/>
         <param name="MaxBackupIndex" value="10"/>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d336959d/modules/clients/src/test/resources/spring-cache.xml
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/resources/spring-cache.xml b/modules/clients/src/test/resources/spring-cache.xml
index d843f9e..b675635 100644
--- a/modules/clients/src/test/resources/spring-cache.xml
+++ b/modules/clients/src/test/resources/spring-cache.xml
@@ -21,7 +21,7 @@
     GridGain Spring configuration file to startup grid cache.
 
     When starting a standalone GridGain node, you need to execute the following command:
-    {GRIDGAIN_HOME}/bin/ggstart.{bat|sh} examples/config/example-cache.xml
+    {IGNITE_HOME}/bin/ggstart.{bat|sh} examples/config/example-cache.xml
 
     When starting GridGain from Java IDE, pass path to this file into GridGain:
     GridGain.start("examples/config/example-cache.xml");

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d336959d/modules/clients/src/test/resources/spring-router-ssl.xml
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/resources/spring-router-ssl.xml b/modules/clients/src/test/resources/spring-router-ssl.xml
index ad22064..e4906c9 100644
--- a/modules/clients/src/test/resources/spring-router-ssl.xml
+++ b/modules/clients/src/test/resources/spring-router-ssl.xml
@@ -21,7 +21,7 @@
     Default rest router configuration.
 
     This file is automatically scanned by
-    $GRIDGAIN_HOME/bin/ggrouter.sh and $GRIDGAIN_HOME/bin/ggrouter.bat
+    $IGNITE_HOME/bin/ggrouter.sh and $IGNITE_HOME/bin/ggrouter.bat
     for org.gridgain.client.router.GridTcpRestRouterConfiguration and
     org.gridgain.client.router.GridHttpRestRouterConfiguration bean definitions.
     First found are used to start corresponding router instances.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d336959d/modules/clients/src/test/resources/spring-router.xml
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/resources/spring-router.xml b/modules/clients/src/test/resources/spring-router.xml
index 602a6e0..09e68d8 100644
--- a/modules/clients/src/test/resources/spring-router.xml
+++ b/modules/clients/src/test/resources/spring-router.xml
@@ -21,7 +21,7 @@
     Default rest router configuration.
 
     This file is automatically scanned by
-    $GRIDGAIN_HOME/bin/ggrouter.sh and $GRIDGAIN_HOME/bin/ggrouter.bat
+    $IGNITE_HOME/bin/ggrouter.sh and $IGNITE_HOME/bin/ggrouter.bat
     for org.gridgain.client.router.GridTcpRestRouterConfiguration and
     org.gridgain.client.router.GridHttpRestRouterConfiguration bean definitions.
     First found are used to start corresponding router instances.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d336959d/modules/clients/src/test/resources/spring-server-node.xml
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/resources/spring-server-node.xml b/modules/clients/src/test/resources/spring-server-node.xml
index ab3a263..690fd7d 100644
--- a/modules/clients/src/test/resources/spring-server-node.xml
+++ b/modules/clients/src/test/resources/spring-server-node.xml
@@ -21,7 +21,7 @@
     GridGain Spring configuration file to startup grid cache.
 
     When starting a standalone GridGain node, you need to execute the following command:
-    {GRIDGAIN_HOME}/bin/ggstart.{bat|sh} path-to-this-file/example-cache.xml
+    {IGNITE_HOME}/bin/ggstart.{bat|sh} path-to-this-file/example-cache.xml
 
     When starting GridGain from Java IDE, pass path to this file into GridGain:
     GridGain.start("path-to-this-file/example-benchmark.xml");

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d336959d/modules/clients/src/test/resources/spring-server-ssl-node.xml
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/resources/spring-server-ssl-node.xml b/modules/clients/src/test/resources/spring-server-ssl-node.xml
index 3ef3ace..e02727d 100644
--- a/modules/clients/src/test/resources/spring-server-ssl-node.xml
+++ b/modules/clients/src/test/resources/spring-server-ssl-node.xml
@@ -21,7 +21,7 @@
     GridGain Spring configuration file to startup grid cache.
 
     When starting a standalone GridGain node, you need to execute the following command:
-    {GRIDGAIN_HOME}/bin/ggstart.{bat|sh} path-to-this-file/example-cache.xml
+    {IGNITE_HOME}/bin/ggstart.{bat|sh} path-to-this-file/example-cache.xml
 
     When starting GridGain from Java IDE, pass path to this file into GridGain:
     GridGain.start("path-to-this-file/example-benchmark.xml");

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d336959d/modules/core/src/main/java/org/apache/ignite/IgniteCluster.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteCluster.java b/modules/core/src/main/java/org/apache/ignite/IgniteCluster.java
index 5d17bca..b7359a8 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteCluster.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteCluster.java
@@ -234,7 +234,7 @@ public interface IgniteCluster extends ClusterGroup, IgniteAsyncSupport {
      *             <td><b>ggHome</b></td>
      *             <td>String</td>
      *             <td>
-     *                 Path to GridGain installation folder. If not defined, GRIDGAIN_HOME
+     *                 Path to GridGain installation folder. If not defined, IGNITE_HOME
      *                 environment variable must be set on remote hosts.
      *             </td>
      *         </tr>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d336959d/modules/core/src/main/java/org/apache/ignite/IgniteLogger.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteLogger.java b/modules/core/src/main/java/org/apache/ignite/IgniteLogger.java
index aa304e9..7951ca0 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteLogger.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteLogger.java
@@ -60,7 +60,7 @@ import org.jetbrains.annotations.*;
  * will operate in normal un-suppressed logging mode. Note that all output in "quiet" mode is
  * done through standard output (STDOUT).
  * <p>
- * Note that GridGain's standard startup scripts <tt>$GRIDGAIN_HOME/bin/ggstart.{sh|bat}</tt> start
+ * Note that GridGain's standard startup scripts <tt>$IGNITE_HOME/bin/ggstart.{sh|bat}</tt> start
  * by default in "quiet" mode. Both scripts accept {@code -v} arguments to turn off "quiet" mode.
  */
 @GridToStringExclude

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d336959d/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java b/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java
index b54275c..90d069e 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java
@@ -46,7 +46,7 @@ public final class IgniteSystemProperties {
     public static final String GG_DAEMON = "IGNITE_DAEMON";
 
     /** Defines GridGain installation folder. */
-    public static final String GG_HOME = "GRIDGAIN_HOME";
+    public static final String GG_HOME = "IGNITE_HOME";
 
     /** If this system property is set to {@code false} - no shutdown hook will be set. */
     public static final String GG_NO_SHUTDOWN_HOOK = "IGNITE_NO_SHUTDOWN_HOOK";

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d336959d/modules/core/src/main/java/org/apache/ignite/Ignition.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/Ignition.java b/modules/core/src/main/java/org/apache/ignite/Ignition.java
index 568b520..a193b26 100644
--- a/modules/core/src/main/java/org/apache/ignite/Ignition.java
+++ b/modules/core/src/main/java/org/apache/ignite/Ignition.java
@@ -68,8 +68,8 @@ import java.util.*;
  * </pre>
  * A grid instance with Spring configuration above can be started as following. Note that
  * you do not need to pass path to Spring XML file if you are using
- * {@code GRIDGAIN_HOME/config/default-config.xml}. Also note, that the path can be
- * absolute or relative to GRIDGAIN_HOME.
+ * {@code IGNITE_HOME/config/default-config.xml}. Also note, that the path can be
+ * absolute or relative to IGNITE_HOME.
  * <pre name="code" class="java">
  * ...
  * GridGain.start("/path/to/spring/xml/file.xml");
@@ -264,7 +264,7 @@ public class Ignition {
 
     /**
      * Starts grid with default configuration. By default this method will
-     * use grid configuration defined in {@code GRIDGAIN_HOME/config/default-config.xml}
+     * use grid configuration defined in {@code IGNITE_HOME/config/default-config.xml}
      * configuration file. If such file is not found, then all system defaults will be used.
      *
      * @return Started grid.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d336959d/modules/core/src/main/java/org/apache/ignite/client/GridClientCompute.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/client/GridClientCompute.java b/modules/core/src/main/java/org/apache/ignite/client/GridClientCompute.java
index c50ca93..6e9033f 100644
--- a/modules/core/src/main/java/org/apache/ignite/client/GridClientCompute.java
+++ b/modules/core/src/main/java/org/apache/ignite/client/GridClientCompute.java
@@ -413,7 +413,7 @@ public interface GridClientCompute {
     public GridClientFuture<List<GridClientNode>> refreshTopologyAsync(boolean includeAttrs, boolean includeMetrics);
 
     /**
-     * Gets contents of default log file ({@code GRIDGAIN_HOME/work/log/gridgain.log}).
+     * Gets contents of default log file ({@code IGNITE_HOME/work/log/gridgain.log}).
      * Note that backward reading (with negative line indexes) supported for only 8-bit character encodings.
      *
      * @param lineFrom Index of line from which log is get, inclusive. Negative values mean line numbers
@@ -429,7 +429,7 @@ public interface GridClientCompute {
 
     /**
      * Asynchronously gets contents of default log file
-     * ({@code GRIDGAIN_HOME/work/log/gridgain.log}).
+     * ({@code IGNITE_HOME/work/log/gridgain.log}).
      * Note that backward reading (with negative line indexes) supported for only 8-bit character encodings.
      *
      * @param lineFrom Index of line from which log is get, inclusive. Negative values mean line numbers
@@ -444,7 +444,7 @@ public interface GridClientCompute {
      * Gets contents of custom log file, i.e. log file in a non-default location.
      * Note that backward reading (with negative line indexes) supported for only 8-bit character encodings.
      *
-     * @param path Log file path. Can be absolute or relative to GRIDGAIN_HOME.
+     * @param path Log file path. Can be absolute or relative to IGNITE_HOME.
      * @param lineFrom Index of line from which log is get, inclusive. Negative values mean line numbers
      *      from the end of the file.
      * @param lineTo Index of line to which log is get, inclusive. Negative values mean line numbers
@@ -460,7 +460,7 @@ public interface GridClientCompute {
      * Asynchronously gets contents of custom log file.
      * Note that backward reading (with negative line indexes) supported for only 8-bit character encodings.
      *
-     * @param path Log file path. Can be absolute or relative to GRIDGAIN_HOME.
+     * @param path Log file path. Can be absolute or relative to IGNITE_HOME.
      * @param lineFrom Index of line from which log is get, inclusive. Negative values mean line numbers
      *      from the end of the file.
      * @param lineTo Index of line to which log is get, inclusive. Negative values mean line numbers

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d336959d/modules/core/src/main/java/org/apache/ignite/client/router/GridRouterFactory.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/client/router/GridRouterFactory.java b/modules/core/src/main/java/org/apache/ignite/client/router/GridRouterFactory.java
index ed96190..d8ea4f4 100644
--- a/modules/core/src/main/java/org/apache/ignite/client/router/GridRouterFactory.java
+++ b/modules/core/src/main/java/org/apache/ignite/client/router/GridRouterFactory.java
@@ -34,9 +34,9 @@ import java.util.concurrent.*;
  * See {@link GridTcpRouter} for example on how to configure and start embedded router.
  * <h1 class="header">Standalone router startup</h1>
  * Alternatively you can run routers as a standalone processes by executing
- * {@code GRIDGAIN_HOME/bin/ggrouter.sh} or {@code GRIDGAIN_HOME/bin/ggrouter.bat}.
+ * {@code IGNITE_HOME/bin/ggrouter.sh} or {@code IGNITE_HOME/bin/ggrouter.bat}.
  * They both accept path to a configuration file as first command line argument.
- * See {@code GRIDGAIN_HOME/config/router/default-router.xml} for configuration example.
+ * See {@code IGNITE_HOME/config/router/default-router.xml} for configuration example.
  *
  * @see GridTcpRouter
  */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d336959d/modules/core/src/main/java/org/apache/ignite/client/router/impl/GridRouterCommandLineStartup.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/client/router/impl/GridRouterCommandLineStartup.java b/modules/core/src/main/java/org/apache/ignite/client/router/impl/GridRouterCommandLineStartup.java
index 691e35a..6187a5e 100644
--- a/modules/core/src/main/java/org/apache/ignite/client/router/impl/GridRouterCommandLineStartup.java
+++ b/modules/core/src/main/java/org/apache/ignite/client/router/impl/GridRouterCommandLineStartup.java
@@ -123,7 +123,7 @@ public class GridRouterCommandLineStartup {
         URL cfgUrl = U.resolveGridGainUrl(cfgPath);
 
         if (cfgUrl == null) {
-            X.error("Spring XML file not found (is GRIDGAIN_HOME set?): " + cfgPath);
+            X.error("Spring XML file not found (is IGNITE_HOME set?): " + cfgPath);
 
             System.exit(1);
         }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d336959d/modules/core/src/main/java/org/apache/ignite/compute/gridify/Gridify.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/compute/gridify/Gridify.java b/modules/core/src/main/java/org/apache/ignite/compute/gridify/Gridify.java
index 527cbd9..4014b9d 100644
--- a/modules/core/src/main/java/org/apache/ignite/compute/gridify/Gridify.java
+++ b/modules/core/src/main/java/org/apache/ignite/compute/gridify/Gridify.java
@@ -129,7 +129,7 @@ import java.lang.annotation.*;
  * <ul>
  * <li>
  *      JVM configuration should include:
- *      {@code -javaagent:${GRIDGAIN_HOME}/libs/aspectjweaver-1.7.2.jar}
+ *      {@code -javaagent:${IGNITE_HOME}/libs/aspectjweaver-1.7.2.jar}
  * </li>
  * <li>
  *      META-INF/aop.xml file should be created and specified on the classpath.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d336959d/modules/core/src/main/java/org/apache/ignite/compute/gridify/GridifySetToSet.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/compute/gridify/GridifySetToSet.java b/modules/core/src/main/java/org/apache/ignite/compute/gridify/GridifySetToSet.java
index e51af8d..ab54429 100644
--- a/modules/core/src/main/java/org/apache/ignite/compute/gridify/GridifySetToSet.java
+++ b/modules/core/src/main/java/org/apache/ignite/compute/gridify/GridifySetToSet.java
@@ -125,7 +125,7 @@ import java.lang.annotation.*;
  * <ul>
  * <li>
  *      JVM configuration should include:
- *      {@code -javaagent:${GRIDGAIN_HOME}/libs/aspectjweaver-1.7.2.jar}
+ *      {@code -javaagent:${IGNITE_HOME}/libs/aspectjweaver-1.7.2.jar}
  * </li>
  * <li>
  *      META-INF/aop.xml file should be created and specified on the classpath.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d336959d/modules/core/src/main/java/org/apache/ignite/compute/gridify/GridifySetToValue.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/compute/gridify/GridifySetToValue.java b/modules/core/src/main/java/org/apache/ignite/compute/gridify/GridifySetToValue.java
index c22c5ab..d67dc2b 100644
--- a/modules/core/src/main/java/org/apache/ignite/compute/gridify/GridifySetToValue.java
+++ b/modules/core/src/main/java/org/apache/ignite/compute/gridify/GridifySetToValue.java
@@ -123,7 +123,7 @@ import java.lang.annotation.*;
  * <ul>
  * <li>
  *      JVM configuration should include:
- *      {@code -javaagent:${GRIDGAIN_HOME}/libs/aspectjweaver-1.7.2.jar}
+ *      {@code -javaagent:${IGNITE_HOME}/libs/aspectjweaver-1.7.2.jar}
  * </li>
  * <li>
  *      META-INF/aop.xml file should be created and specified on the classpath.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d336959d/modules/core/src/main/java/org/apache/ignite/configuration/ClientConnectionConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/ClientConnectionConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/ClientConnectionConfiguration.java
index 29faa8a..c11f769 100644
--- a/modules/core/src/main/java/org/apache/ignite/configuration/ClientConnectionConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/ClientConnectionConfiguration.java
@@ -149,7 +149,7 @@ public class ClientConnectionConfiguration {
     }
 
     /**
-     * Sets path, either absolute or relative to {@code GRIDGAIN_HOME}, to {@code JETTY}
+     * Sets path, either absolute or relative to {@code IGNITE_HOME}, to {@code JETTY}
      * XML configuration file. {@code JETTY} is used to support REST over HTTP protocol for
      * accessing GridGain APIs remotely.
      *
@@ -160,7 +160,7 @@ public class ClientConnectionConfiguration {
     }
 
     /**
-     * Gets path, either absolute or relative to {@code GRIDGAIN_HOME}, to {@code Jetty}
+     * Gets path, either absolute or relative to {@code IGNITE_HOME}, to {@code Jetty}
      * XML configuration file. {@code Jetty} is used to support REST over HTTP protocol for
      * accessing GridGain APIs remotely.
      * <p>
@@ -473,7 +473,7 @@ public class ClientConnectionConfiguration {
      * a log file, file path is checked against this list. If requested file is not located in any
      * sub-folder of these folders, request is not processed.
      * <p>
-     * By default, list consists of a single {@code GRIDGAIN_HOME} folder. If {@code GRIDGAIN_HOME}
+     * By default, list consists of a single {@code IGNITE_HOME} folder. If {@code IGNITE_HOME}
      * could not be detected and property is not specified, no restrictions applied.
      *
      * @return Array of folders that are allowed be read by remote clients.


Mime
View raw message