ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [1/2] incubator-ignite git commit: # ignite-164 : gridgain->ignite renaming [core]
Date Fri, 06 Feb 2015 14:32:52 GMT
Repository: incubator-ignite
Updated Branches:
  refs/heads/ignite-164v2stable 3efa8ae05 -> fe0d10b5e


# ignite-164 : gridgain->ignite renaming [core]


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

Branch: refs/heads/ignite-164v2stable
Commit: dc33058da3ac5e62ab38b2d158701a1986ba7629
Parents: 3efa8ae
Author: Artem Shutak <ashutak@gridgain.com>
Authored: Fri Feb 6 17:21:11 2015 +0300
Committer: Artem Shutak <ashutak@gridgain.com>
Committed: Fri Feb 6 17:21:11 2015 +0300

----------------------------------------------------------------------
 .../hadoop/GridHadoopJobProperty.java           |  2 +-
 .../ignite/internal/util/IgniteUtils.java       | 26 ++++++++++----------
 .../ignite/testframework/GridTestUtils.java     |  2 +-
 3 files changed, 15 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc33058d/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/GridHadoopJobProperty.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/GridHadoopJobProperty.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/GridHadoopJobProperty.java
index 18f422b..0ece051 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/GridHadoopJobProperty.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/GridHadoopJobProperty.java
@@ -90,7 +90,7 @@ public enum GridHadoopJobProperty {
      *
      */
     GridHadoopJobProperty() {
-        ptyName = "gridgain." + name().toLowerCase().replace('_', '.');
+        ptyName = "ignite." + name().toLowerCase().replace('_', '.');
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc33058d/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
index 9b1b223..113086e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
@@ -134,7 +134,7 @@ public abstract class IgniteUtils {
     private static volatile GridTuple<String> ggHome;
 
     /** Project work directory. */
-    private static volatile String ggWork;
+    private static volatile String igniteWork;
 
     /** OS JDK string. */
     private static String osJdkStr;
@@ -8550,18 +8550,18 @@ public abstract class IgniteUtils {
 
     /**
      * @param userWorkDir Ignite work folder provided by user.
-     * @param userGgHome Ignite home folder provided by user.
+     * @param userIgniteHome Ignite home folder provided by user.
      */
-    public static void setWorkDirectory(@Nullable String userWorkDir, @Nullable String userGgHome)
+    public static void setWorkDirectory(@Nullable String userWorkDir, @Nullable String userIgniteHome)
         throws IgniteCheckedException {
-        String ggWork0 = ggWork;
+        String igniteWork0 = igniteWork;
 
-        if (ggWork0 == null) {
+        if (igniteWork0 == null) {
             synchronized (IgniteUtils.class) {
                 // Double check.
-                ggWork0 = ggWork;
+                igniteWork0 = igniteWork;
 
-                if (ggWork0 != null)
+                if (igniteWork0 != null)
                     return;
 
                 File workDir;
@@ -8570,8 +8570,8 @@ public abstract class IgniteUtils {
                     workDir = new File(userWorkDir);
                 else if (!F.isEmpty(IGNITE_WORK_DIR))
                     workDir = new File(IGNITE_WORK_DIR);
-                else if (!F.isEmpty(userGgHome))
-                    workDir = new File(userGgHome, "work");
+                else if (!F.isEmpty(userIgniteHome))
+                    workDir = new File(userIgniteHome, "work");
                 else {
                     String tmpDirPath = System.getProperty("java.io.tmpdir");
 
@@ -8579,7 +8579,7 @@ public abstract class IgniteUtils {
                         throw new IgniteCheckedException("Failed to create work directory
in OS temp " +
                             "(property 'java.io.tmpdir' is null).");
 
-                    workDir = new File(tmpDirPath, "gridgain" + File.separator + "work");
+                    workDir = new File(tmpDirPath, "ignite" + File.separator + "work");
                 }
 
                 if (!workDir.isAbsolute())
@@ -8594,7 +8594,7 @@ public abstract class IgniteUtils {
                 if (!workDir.canWrite())
                     throw new IgniteCheckedException("Cannot write to work directory: " +
workDir);
 
-                ggWork = workDir.getAbsolutePath();
+                igniteWork = workDir.getAbsolutePath();
             }
         }
     }
@@ -8610,7 +8610,7 @@ public abstract class IgniteUtils {
      * Nullifies work directory. For test purposes only.
      */
     static void nullifyWorkDirectory() {
-        ggWork = null;
+        igniteWork = null;
     }
 
     /**
@@ -8625,7 +8625,7 @@ public abstract class IgniteUtils {
         File dir = new File(path);
 
         if (!dir.isAbsolute()) {
-            String ggWork0 = ggWork;
+            String ggWork0 = igniteWork;
 
             if (F.isEmpty(ggWork0))
                 throw new IgniteCheckedException("Failed to resolve path (work directory
has not been set): " + path);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc33058d/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java
b/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java
index 7419bde..73d6441 100644
--- a/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java
@@ -734,7 +734,7 @@ public final class GridTestUtils {
                 // Exclude log4j because of the design - 1 per VM.
                 if (name.startsWith("spring") || name.startsWith("log4j") ||
                     name.startsWith("commons-logging") || name.startsWith("junit") ||
-                    name.startsWith("gridgain-tests"))
+                    name.startsWith("ignite-tests"))
                     return false;
 
                 boolean ret = true;


Mime
View raw message