#ignite-164: remove gridgain from code.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/1fbba7e6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1fbba7e6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1fbba7e6 Branch: refs/heads/ignite-57 Commit: 1fbba7e65ca2293c7de858f40127b7be621d3793 Parents: bcec7d9 Author: ivasilinets <vasilinetc....@gmail.com> Authored: Thu Feb 5 21:44:52 2015 +0300 Committer: ivasilinets <vasilinetc....@gmail.com> Committed: Thu Feb 5 21:44:52 2015 +0300 ---------------------------------------------------------------------- .../apache/ignite/internal/processors/rest/GridRestProcessor.java | 2 +- .../internal/processors/schedule/IgniteNoopScheduleProcessor.java | 2 +- .../src/main/java/org/apache/ignite/internal/util/IgniteUtils.java | 2 +- .../src/main/java/org/apache/ignite/internal/util/typedef/X.java | 2 +- .../main/java/org/apache/ignite/spi/IgniteSpiManagementMBean.java | 2 +- .../core/src/main/java/org/apache/ignite/spi/IgniteSpiThread.java | 2 +- .../main/java/org/apache/ignite/startup/BasicWarmupClosure.java | 2 +- .../core/src/main/java/org/apache/ignite/thread/IgniteThread.java | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1fbba7e6/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProcessor.java index f1f92d0..bc5d1e6 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProcessor.java @@ -656,7 +656,7 @@ public class GridRestProcessor extends GridProcessorAdapter { startProtocol(proto); } catch (ClassNotFoundException ignored) { - U.quietAndWarn(log, "Failed to initialize HTTP REST protocol (consider adding gridgain-rest-http " + + U.quietAndWarn(log, "Failed to initialize HTTP REST protocol (consider adding ignite-rest-http " + "module to classpath)."); } catch (NoSuchMethodException | InvocationTargetException | InstantiationException | IllegalAccessException e) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1fbba7e6/modules/core/src/main/java/org/apache/ignite/internal/processors/schedule/IgniteNoopScheduleProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/schedule/IgniteNoopScheduleProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/schedule/IgniteNoopScheduleProcessor.java index 56fd2f3..4d90be8 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/schedule/IgniteNoopScheduleProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/schedule/IgniteNoopScheduleProcessor.java @@ -49,6 +49,6 @@ public class IgniteNoopScheduleProcessor extends IgniteScheduleProcessorAdapter */ private IgniteException processorException() { return new IgniteException("Current Ignite configuration does not support schedule functionality " + - "(consider adding gridgain-schedule module to classpath)."); + "(consider adding ignite-schedule module to classpath)."); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1fbba7e6/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 c1ff3b7..3a36fbd 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 @@ -2167,7 +2167,7 @@ public abstract class IgniteUtils { } } } - }, "gridgain-clock"); + }, "ignite-clock"); timer.setDaemon(true); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1fbba7e6/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/X.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/X.java b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/X.java index b822a23..63b0470 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/X.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/X.java @@ -853,7 +853,7 @@ public final class X { * @return Installation home folder. * @throws IgniteCheckedException If Ignite home folder was not set. */ - public static String resolveGridGainHome() throws IgniteCheckedException { + public static String resolveIgniteHome() throws IgniteCheckedException { String var = IgniteSystemProperties.getString(IGNITE_HOME); if (var != null) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1fbba7e6/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiManagementMBean.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiManagementMBean.java b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiManagementMBean.java index 31bf44c..f58aae8 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiManagementMBean.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiManagementMBean.java @@ -64,7 +64,7 @@ public interface IgniteSpiManagementMBean { * * @return Ignite installation home folder. */ - @IgniteMXBeanDescription("Gridgain installation home folder.") + @IgniteMXBeanDescription("Ignite installation home folder.") public String getIgniteHome(); /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1fbba7e6/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiThread.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiThread.java b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiThread.java index 8c833d7..313807d 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiThread.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiThread.java @@ -32,7 +32,7 @@ import java.util.concurrent.atomic.*; */ public abstract class IgniteSpiThread extends Thread { /** Default thread's group. */ - public static final ThreadGroup DFLT_GRP = new ThreadGroup("gridgain-spi"); + public static final ThreadGroup DFLT_GRP = new ThreadGroup("ignite-spi"); /** Number of all system threads in the system. */ private static final AtomicLong cntr = new AtomicLong(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1fbba7e6/modules/core/src/main/java/org/apache/ignite/startup/BasicWarmupClosure.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/startup/BasicWarmupClosure.java b/modules/core/src/main/java/org/apache/ignite/startup/BasicWarmupClosure.java index 9847089..2f089d1 100644 --- a/modules/core/src/main/java/org/apache/ignite/startup/BasicWarmupClosure.java +++ b/modules/core/src/main/java/org/apache/ignite/startup/BasicWarmupClosure.java @@ -211,7 +211,7 @@ public class BasicWarmupClosure implements IgniteInClosure<IgniteConfiguration> cfg0.setGridLogger(new IgniteNullLogger()); - cfg0.setGridName("gridgain-warmup-grid-" + i); + cfg0.setGridName("ignite-warmup-grid-" + i); ignites.add(Ignition.start(cfg0)); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1fbba7e6/modules/core/src/main/java/org/apache/ignite/thread/IgniteThread.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/thread/IgniteThread.java b/modules/core/src/main/java/org/apache/ignite/thread/IgniteThread.java index 8dfd37e..a956e30 100644 --- a/modules/core/src/main/java/org/apache/ignite/thread/IgniteThread.java +++ b/modules/core/src/main/java/org/apache/ignite/thread/IgniteThread.java @@ -34,7 +34,7 @@ import java.util.concurrent.atomic.*; */ public class IgniteThread extends Thread { /** Default thread's group. */ - private static final ThreadGroup DFLT_GRP = new ThreadGroup("gridgain"); + private static final ThreadGroup DFLT_GRP = new ThreadGroup("ignite"); /** Number of all grid threads in the system. */ private static final AtomicLong threadCntr = new AtomicLong(0);
