ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [08/25] incubator-ignite git commit: # ignite-164 : checkIgniteHome* -> checkIgniteHome* renaming at bat-files + rename method in GridHadoopSetup
Date Fri, 06 Feb 2015 11:05:23 GMT
# ignite-164 : checkIgniteHome* -> checkIgniteHome* renaming at bat-files + rename method
in GridHadoopSetup


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

Branch: refs/heads/ignite-164v2stable
Commit: 9a10c4c6c529715adbe939b94e7bda1307d4bc9c
Parents: 0333414
Author: Artem Shutak <ashutak@gridgain.com>
Authored: Thu Feb 5 17:07:24 2015 +0300
Committer: Artem Shutak <ashutak@gridgain.com>
Committed: Thu Feb 5 17:07:24 2015 +0300

----------------------------------------------------------------------
 bin/ignite.bat                                    | 18 +++++++++---------
 bin/ignitevisorcmd.bat                            | 18 +++++++++---------
 .../org/apache/ignite/hadoop/GridHadoopSetup.java |  4 ++--
 3 files changed, 20 insertions(+), 20 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9a10c4c6/bin/ignite.bat
----------------------------------------------------------------------
diff --git a/bin/ignite.bat b/bin/ignite.bat
index 1a3a299..6f43c4f 100644
--- a/bin/ignite.bat
+++ b/bin/ignite.bat
@@ -40,7 +40,7 @@ goto error_finish
 
 :checkJdkVersion
 "%JAVA_HOME%\bin\java.exe" -version 2>&1 | findstr "1\.[78]\." > nul
-if %ERRORLEVEL% equ 0 goto checkGridGainHome1
+if %ERRORLEVEL% equ 0 goto checkIgniteHome1
     echo %0, ERROR:
     echo The version of JAVA installed in %JAVA_HOME% is incorrect.
     echo Please point JAVA_HOME variable to installation of JDK 1.7 or JDK 1.8.
@@ -48,33 +48,33 @@ if %ERRORLEVEL% equ 0 goto checkGridGainHome1
 goto error_finish
 
 :: Check IGNITE_HOME.
-:checkGridGainHome1
-if defined IGNITE_HOME goto checkGridGainHome2
+:checkIgniteHome1
+if defined IGNITE_HOME goto checkIgniteHome2
     pushd "%~dp0"/..
     set IGNITE_HOME=%CD%
     popd
 
-:checkGridGainHome2
+:checkIgniteHome2
 :: Strip double quotes from IGNITE_HOME
 set IGNITE_HOME=%IGNITE_HOME:"=%
 
 :: remove all trailing slashes from IGNITE_HOME.
 if %IGNITE_HOME:~-1,1% == \ goto removeTrailingSlash
 if %IGNITE_HOME:~-1,1% == / goto removeTrailingSlash
-goto checkGridGainHome3
+goto checkIgniteHome3
 
 :removeTrailingSlash
 set IGNITE_HOME=%IGNITE_HOME:~0,-1%
-goto checkGridGainHome2
+goto checkIgniteHome2
 
-:checkGridGainHome3
-if exist "%IGNITE_HOME%\config" goto checkGridGainHome4
+:checkIgniteHome3
+if exist "%IGNITE_HOME%\config" goto checkIgniteHome4
     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
 
-:checkGridGainHome4
+:checkIgniteHome4
 
 ::
 :: Set SCRIPTS_HOME - base path to scripts.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9a10c4c6/bin/ignitevisorcmd.bat
----------------------------------------------------------------------
diff --git a/bin/ignitevisorcmd.bat b/bin/ignitevisorcmd.bat
index 981fa45..bf05adc 100644
--- a/bin/ignitevisorcmd.bat
+++ b/bin/ignitevisorcmd.bat
@@ -37,40 +37,40 @@ goto error_finish
 
 :checkJdkVersion
 "%JAVA_HOME%\bin\java.exe" -version 2>&1 | findstr "1\.[78]\." > nul
-if %ERRORLEVEL% equ 0 goto checkGridGainHome1
+if %ERRORLEVEL% equ 0 goto checkIgniteHome1
     echo %0, ERROR: The version of JAVA installed in %JAVA_HOME% is incorrect.
     echo %0, ERROR: Please install JDK 1.7 or 1.8.
     echo %0, ERROR: You can also download latest JDK at: http://java.sun.com/getjava
 goto error_finish
 
 :: Check IGNITE_HOME.
-:checkGridGainHome1
-if not "%IGNITE_HOME%" == "" goto checkGridGainHome2
+:checkIgniteHome1
+if not "%IGNITE_HOME%" == "" goto checkIgniteHome2
     pushd "%~dp0"/..
     set IGNITE_HOME=%CD%
     popd
 
-:checkGridGainHome2
+:checkIgniteHome2
 :: Strip double quotes from IGNITE_HOME
 set IGNITE_HOME=%IGNITE_HOME:"=%
 
 :: remove all trailing slashes from IGNITE_HOME.
 if %IGNITE_HOME:~-1,1% == \ goto removeTrailingSlash
 if %IGNITE_HOME:~-1,1% == / goto removeTrailingSlash
-goto checkGridGainHome3
+goto checkIgniteHome3
 
 :removeTrailingSlash
 set IGNITE_HOME=%IGNITE_HOME:~0,-1%
-goto checkGridGainHome2
+goto checkIgniteHome2
 
-:checkGridGainHome3
-if exist "%IGNITE_HOME%\config" goto checkGridGainHome4
+:checkIgniteHome3
+if exist "%IGNITE_HOME%\config" goto checkIgniteHome4
     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
 
-:checkGridGainHome4
+:checkIgniteHome4
 
 ::
 :: Set SCRIPTS_HOME - base path to scripts.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9a10c4c6/modules/hadoop/src/main/java/org/apache/ignite/hadoop/GridHadoopSetup.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/hadoop/GridHadoopSetup.java b/modules/hadoop/src/main/java/org/apache/ignite/hadoop/GridHadoopSetup.java
index 2ed9b4f..c8fb1d3 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/hadoop/GridHadoopSetup.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/hadoop/GridHadoopSetup.java
@@ -77,7 +77,7 @@ public class GridHadoopSetup {
 
         println("IGNITE_HOME is set to '" + igniteHome + "'.");
 
-        checkGridGainHome(igniteHome);
+        checkIgniteHome(igniteHome);
 
         String homeVar = "HADOOP_HOME";
         String hadoopHome = System.getenv(homeVar);
@@ -292,7 +292,7 @@ public class GridHadoopSetup {
      *
      * @param ggHome Ignite home.
      */
-    private static void checkGridGainHome(String ggHome) {
+    private static void checkIgniteHome(String ggHome) {
         URL jarUrl = U.class.getProtectionDomain().getCodeSource().getLocation();
 
         try {


Mime
View raw message