ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [21/50] [abbrv] incubator-ignite git commit: # ignite-164 : GridGain -> Ignite in string literals
Date Fri, 06 Feb 2015 12:23:14 GMT
# ignite-164 : GridGain -> Ignite in string literals


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

Branch: refs/heads/sprint-1
Commit: b4d97f5487313b2bafb5a887b8fc8c37ed634ce7
Parents: 52d3d5f
Author: Artem Shutak <ashutak@gridgain.com>
Authored: Thu Feb 5 14:20:21 2015 +0300
Committer: Artem Shutak <ashutak@gridgain.com>
Committed: Thu Feb 5 14:20:21 2015 +0300

----------------------------------------------------------------------
 .../processors/rest/RestProcessorTest.java      |  6 ++--
 .../apache/ignite/internal/GridDiagnostic.java  |  2 +-
 .../ignite/internal/GridUpdateNotifier.java     |  2 +-
 .../ignite/internal/IgniteComponentType.java    |  2 +-
 .../ignite/internal/IgniteEventsImpl.java       |  2 +-
 .../apache/ignite/internal/IgniteKernal.java    | 32 ++++++++++----------
 .../org/apache/ignite/internal/IgnitionEx.java  |  4 +--
 .../internal/managers/GridManagerAdapter.java   |  2 +-
 .../managers/communication/GridIoManager.java   |  2 +-
 .../internal/processors/fs/GridGgfsImpl.java    |  2 +-
 .../schedule/IgniteNoopScheduleProcessor.java   |  2 +-
 .../nio/GridConnectionBytesVerifyFilter.java    |  2 +-
 .../util/nodestart/GridNodeStartUtils.java      |  2 +-
 .../apache/ignite/internal/util/typedef/X.java  |  2 +-
 .../ignite/jdbc/IgniteJdbcConnection.java       |  2 +-
 .../ignite/jdbc/IgniteJdbcDatabaseMetadata.java |  6 ++--
 .../apache/ignite/jdbc/IgniteJdbcDriver.java    |  6 ++--
 .../apache/ignite/jdbc/IgniteJdbcResultSet.java |  2 +-
 .../apache/ignite/jdbc/IgniteJdbcStatement.java |  2 +-
 .../IgniteOptimizedObjectInputStream.java       |  2 +-
 .../org/apache/ignite/mxbean/IgniteMXBean.java  |  4 +--
 .../spi/discovery/tcp/TcpDiscoverySpi.java      |  4 +--
 .../ignite/startup/cmdline/AboutDialog.java     |  2 +-
 .../startup/cmdline/CommandLineStartup.java     |  4 +--
 .../startup/cmdline/CommandLineTransformer.java |  2 +-
 .../apache/ignite/internal/GridStartupMain.java |  6 ++--
 .../apache/ignite/internal/GridStartupTest.java |  6 ++--
 .../internal/GridUpdateNotifierSelfTest.java    |  2 +-
 .../communication/GridIoManagerSelfTest.java    |  4 +--
 .../apache/ignite/lang/GridFuncSelfTest.java    |  2 +-
 .../loadtests/cache/GridCacheBenchmark.java     |  8 ++---
 .../loadtests/mapper/GridNodeStartup.java       |  6 ++--
 .../AbstractDiscoveryRandomStartStopTest.java   |  2 +-
 .../startup/GridRandomCommandLineLoader.java    |  2 +-
 .../GridCommandLineTransformerSelfTest.java     |  4 +--
 .../testframework/junits/GridAbstractTest.java  |  4 +--
 .../GridHadoopClientProtocolProvider.java       |  6 ++--
 .../apache/ignite/hadoop/GridHadoopSetup.java   | 18 +++++------
 .../loadtests/ggfs/GridGgfsNodeStartup.java     |  6 ++--
 .../GridHibernateTransactionalDataRegion.java   |  6 ++--
 .../rest/protocols/http/jetty/rest.html         |  6 ++--
 .../ignite/cache/spring/SpringCacheManager.java |  2 +-
 .../util/nodestart/GridNodeCallableImpl.java    |  2 +-
 .../optimized/OptimizedClassNamesGenerator.java |  2 +-
 .../util/antgar/IgniteDeploymentGarAntTask.java |  4 +--
 .../ignite/visor/commands/VisorConsole.scala    |  2 +-
 .../commands/alert/VisorAlertCommand.scala      |  4 +--
 .../config/VisorConfigurationCommand.scala      |  2 +-
 .../commands/disco/VisorDiscoveryCommand.scala  |  6 ++--
 .../commands/events/VisorEventsCommand.scala    |  6 ++--
 .../commands/start/VisorStartCommand.scala      |  8 ++---
 .../commands/tasks/VisorTasksCommand.scala      |  6 ++--
 .../scala/org/apache/ignite/visor/visor.scala   | 26 ++++++++--------
 .../IgniteServletContextListenerStartup.java    |  4 +--
 .../startup/servlet/IgniteServletStartup.java   |  2 +-
 55 files changed, 132 insertions(+), 132 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b4d97f54/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestProcessorTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestProcessorTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestProcessorTest.java
index e096f1e..fee16d8 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestProcessorTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestProcessorTest.java
@@ -80,14 +80,14 @@ public class RestProcessorTest extends GridCommonAbstractTest {
         JOptionPane.showMessageDialog(
             null,
             new JComponent[] {
-                new JLabel("GridGain started."),
+                new JLabel("Ignite started."),
                 new JLabel(
                     "<html>" +
                         "You can use JMX console at <u>http://localhost:1234</u>" +
                         "</html>"),
-                new JLabel("Press OK to stop GridGain.")
+                new JLabel("Press OK to stop Ignite.")
             },
-            "GridGain Startup JUnit",
+            "Ignite Startup JUnit",
             JOptionPane.INFORMATION_MESSAGE
         );
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b4d97f54/modules/core/src/main/java/org/apache/ignite/internal/GridDiagnostic.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridDiagnostic.java b/modules/core/src/main/java/org/apache/ignite/internal/GridDiagnostic.java
index 28ed4e4..e6b52a7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridDiagnostic.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridDiagnostic.java
@@ -165,7 +165,7 @@ final class GridDiagnostic {
         }
         catch (RejectedExecutionException e) {
             U.error(log, "Failed to start background network diagnostics check due to thread pool execution " +
-                "rejection. In most cases it indicates a severe configuration problem with GridGain.",
+                "rejection. In most cases it indicates a severe configuration problem with Ignite.",
                 "Failed to start background network diagnostics.", e);
         }
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b4d97f54/modules/core/src/main/java/org/apache/ignite/internal/GridUpdateNotifier.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridUpdateNotifier.java b/modules/core/src/main/java/org/apache/ignite/internal/GridUpdateNotifier.java
index 1006a6c..738d9ed 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridUpdateNotifier.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridUpdateNotifier.java
@@ -326,7 +326,7 @@ class GridUpdateNotifier {
                     }
                     catch (IOException e) {
                         if (log.isDebugEnabled())
-                            log.debug("Failed to connect to GridGain update server. " + e.getMessage());
+                            log.debug("Failed to connect to Ignite update server. " + e.getMessage());
                     }
 
                     if (dom != null)

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b4d97f54/modules/core/src/main/java/org/apache/ignite/internal/IgniteComponentType.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteComponentType.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteComponentType.java
index 0d66c93..120cb65 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteComponentType.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteComponentType.java
@@ -277,7 +277,7 @@ public enum IgniteComponentType {
      * @return Component creation exception.
      */
     private IgniteCheckedException componentException(Exception err) {
-        return new IgniteCheckedException("Failed to create GridGain component (consider adding " + module +
+        return new IgniteCheckedException("Failed to create Ignite component (consider adding " + module +
             " module to classpath) [component=" + this + ", cls=" + clsName + ']', err);
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b4d97f54/modules/core/src/main/java/org/apache/ignite/internal/IgniteEventsImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteEventsImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteEventsImpl.java
index a8b6d74..d4f8994 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteEventsImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteEventsImpl.java
@@ -164,7 +164,7 @@ public class IgniteEventsImpl extends IgniteAsyncSupportAdapter<IgniteEvents> im
 
         if (evt.type() <= 1000)
             throw new IllegalArgumentException("All types in range from 1 to 1000 are reserved for " +
-                "internal GridGain events [evtType=" + evt.type() + ", evt=" + evt + ']');
+                "internal Ignite events [evtType=" + evt.type() + ", evt=" + evt + ']');
 
         guard();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b4d97f54/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
index 4532b06..452362d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
@@ -931,7 +931,7 @@ public class IgniteKernal extends ClusterGroupAdapter implements IgniteEx, Ignit
                     // This exception thrown here means that grace period, if any,
                     // has expired and license violation is still unresolved.
                     catch (IgniteProductLicenseException ignored) {
-                        U.error(log, "License violation is unresolved. GridGain node will shutdown in " +
+                        U.error(log, "License violation is unresolved. Ignite node will shutdown in " +
                             (SHUTDOWN_DELAY / 1000) + " sec.");
                         U.error(log, "  ^-- Contact your support for immediate assistance (!)");
 
@@ -1070,10 +1070,10 @@ public class IgniteKernal extends ClusterGroupAdapter implements IgniteEx, Ignit
             IgniteProductLicense lic = ctx.license().license();
 
             String body =
-                "GridGain node started with the following parameters:" + NL +
+                "Ignite node started with the following parameters:" + NL +
                 NL +
                 "----" + NL +
-                "GridGain ver. " + COMPOUND_VER + '#' + BUILD_TSTAMP_STR + "-sha1:" + REV_HASH + NL +
+                "Ignite ver. " + COMPOUND_VER + '#' + BUILD_TSTAMP_STR + "-sha1:" + REV_HASH + NL +
                 "Grid name: " + gridName + NL +
                 "Node ID: " + nid + NL +
                 "Node order: " + localNode().order() + NL +
@@ -1106,7 +1106,7 @@ public class IgniteKernal extends ClusterGroupAdapter implements IgniteEx, Ignit
                 "| " + SITE + NL +
                 "| support@gridgain.com" + NL;
 
-            sendAdminEmailAsync("GridGain node started: " + nid8, body, false);
+            sendAdminEmailAsync("Ignite node started: " + nid8, body, false);
         }
     }
 
@@ -1303,9 +1303,9 @@ public class IgniteKernal extends ClusterGroupAdapter implements IgniteEx, Ignit
 
         // Warn about loopback.
         if (ips.isEmpty() && macs.isEmpty())
-            U.warn(log, "GridGain is starting on loopback address... Only nodes on the same physical " +
+            U.warn(log, "Ignite is starting on loopback address... Only nodes on the same physical " +
                 "computer can participate in topology.",
-                "GridGain is starting on loopback address...");
+                "Ignite is starting on loopback address...");
 
         // Stick in network context into attributes.
         add(attrs, ATTR_IPS, (ips.isEmpty() ? "" : ips));
@@ -1749,14 +1749,14 @@ public class IgniteKernal extends ClusterGroupAdapter implements IgniteEx, Ignit
     private void ackStart(RuntimeMXBean rtBean) {
         if (log.isQuiet()) {
             U.quiet(false, "");
-            U.quiet(false, "GridGain node started OK (id=" + U.id8(localNode().id()) +
+            U.quiet(false, "Ignite node started OK (id=" + U.id8(localNode().id()) +
                 (F.isEmpty(gridName) ? "" : ", grid=" + gridName) + ')');
         }
 
         if (log.isInfoEnabled()) {
             log.info("");
 
-            String ack = "GridGain ver. " + COMPOUND_VER + '#' + BUILD_TSTAMP_STR + "-sha1:" + REV_HASH;
+            String ack = "Ignite ver. " + COMPOUND_VER + '#' + BUILD_TSTAMP_STR + "-sha1:" + REV_HASH;
 
             String dash = U.dash(ack.length());
 
@@ -1782,7 +1782,7 @@ public class IgniteKernal extends ClusterGroupAdapter implements IgniteEx, Ignit
                     ">>> Local node addresses: " + U.addressesAsString(localNode()) + NL +
                     ">>> Local ports: " + sb + NL;
 
-            str += ">>> GridGain documentation: http://" + SITE + "/documentation" + NL;
+            str += ">>> Ignite documentation: http://" + SITE + "/documentation" + NL;
 
             log.info(str);
         }
@@ -2013,16 +2013,16 @@ public class IgniteKernal extends ClusterGroupAdapter implements IgniteEx, Ignit
             // Ack stop.
             if (log.isQuiet()) {
                 if (!errOnStop)
-                    U.quiet(false, "GridGain node stopped OK [uptime=" +
+                    U.quiet(false, "Ignite node stopped OK [uptime=" +
                         X.timeSpan2HMSM(U.currentTimeMillis() - startTime) + ']');
                 else
-                    U.quiet(true, "GridGain node stopped wih ERRORS [uptime=" +
+                    U.quiet(true, "Ignite node stopped wih ERRORS [uptime=" +
                         X.timeSpan2HMSM(U.currentTimeMillis() - startTime) + ']');
             }
 
             if (log.isInfoEnabled())
                 if (!errOnStop) {
-                    String ack = "GridGain ver. " + COMPOUND_VER + '#' + BUILD_TSTAMP_STR + "-sha1:" + REV_HASH +
+                    String ack = "Ignite ver. " + COMPOUND_VER + '#' + BUILD_TSTAMP_STR + "-sha1:" + REV_HASH +
                         " stopped OK";
 
                     String dash = U.dash(ack.length());
@@ -2037,7 +2037,7 @@ public class IgniteKernal extends ClusterGroupAdapter implements IgniteEx, Ignit
                         NL);
                 }
                 else {
-                    String ack = "GridGain ver. " + COMPOUND_VER + '#' + BUILD_TSTAMP_STR + "-sha1:" + REV_HASH +
+                    String ack = "Ignite ver. " + COMPOUND_VER + '#' + BUILD_TSTAMP_STR + "-sha1:" + REV_HASH +
                         " stopped with ERRORS";
 
                     String dash = U.dash(ack.length());
@@ -2059,16 +2059,16 @@ public class IgniteKernal extends ClusterGroupAdapter implements IgniteEx, Ignit
             if (isSmtpEnabled() && isAdminEmailsSet() && cfg.isLifeCycleEmailNotification()) {
                 String errOk = errOnStop ? "with ERRORS" : "OK";
 
-                String headline = "GridGain ver. " + COMPOUND_VER + '#' + BUILD_TSTAMP_STR +
+                String headline = "Ignite ver. " + COMPOUND_VER + '#' + BUILD_TSTAMP_STR +
                     " stopped " + errOk + ":";
-                String subj = "GridGain node stopped " + errOk + ": " + nid8;
+                String subj = "Ignite node stopped " + errOk + ": " + nid8;
 
                 IgniteProductLicense lic = ctx.license() != null ? ctx.license().license() : null;
 
                 String body =
                     headline + NL + NL +
                     "----" + NL +
-                    "GridGain ver. " + COMPOUND_VER + '#' + BUILD_TSTAMP_STR + "-sha1:" + REV_HASH + NL +
+                    "Ignite ver. " + COMPOUND_VER + '#' + BUILD_TSTAMP_STR + "-sha1:" + REV_HASH + NL +
                     "Grid name: " + gridName + NL +
                     "Node ID: " + nid + NL +
                     "Node uptime: " + X.timeSpan2HMSM(U.currentTimeMillis() - startTime) + NL;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b4d97f54/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
index e6fb76b..a073a6b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
@@ -140,7 +140,7 @@ public class IgnitionEx {
         // Check 1.8 just in case for forward compatibility.
         if (!U.jdkVersion().contains("1.7") &&
             !U.jdkVersion().contains("1.8"))
-            throw new IllegalStateException("GridGain requires Java 7 or above. Current Java version " +
+            throw new IllegalStateException("Ignite requires Java 7 or above. Current Java version " +
                 "is not supported: " + U.jdkVersion());
 
         // To avoid nasty race condition in UUID.randomUUID() in JDK prior to 6u34.
@@ -1396,7 +1396,7 @@ public class IgnitionEx {
                 File ggHomeFile = new File(ggHome);
 
                 if (!ggHomeFile.exists() || !ggHomeFile.isDirectory())
-                    throw new IgniteCheckedException("Invalid GridGain installation home folder: " + ggHome);
+                    throw new IgniteCheckedException("Invalid Ignite installation home folder: " + ggHome);
             }
 
             myCfg.setIgniteHome(ggHome);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b4d97f54/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManagerAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManagerAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManagerAdapter.java
index 32baa8c..972b5d2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManagerAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManagerAdapter.java
@@ -150,7 +150,7 @@ public abstract class GridManagerAdapter<T extends IgniteSpi> implements GridMan
                                 ", attr=" + e.getKey() + ']' +
                                 ". Attribute set by one SPI implementation has the same name (name collision) as " +
                                 "attribute set by other SPI implementation. Such overriding is not allowed. " +
-                                "Please check your GridGain configuration and/or SPI implementation to avoid " +
+                                "Please check your Ignite configuration and/or SPI implementation to avoid " +
                                 "attribute name collisions.");
 
                         attrs.put(e.getKey(), e.getValue());

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b4d97f54/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
index 4ccd7e9..a9ba714 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
@@ -1186,7 +1186,7 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa
 
         if (!ordered)
             assert F.find(nodes, null, F.localNode(locNodeId)) == null :
-                "Internal GridGain code should never call the method with local node in a node list.";
+                "Internal Ignite code should never call the method with local node in a node list.";
 
         try {
             // Small optimization, as communication SPIs may have lighter implementation for sending

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b4d97f54/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsImpl.java
index 9da410c..59c7595 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsImpl.java
@@ -166,7 +166,7 @@ public final class GridGgfsImpl implements GridGgfsEx {
                 if (!dfltModes.containsKey(e.getKey()))
                     cfgModes.put(e.getKey(), e.getValue());
                 else
-                    U.warn(log, "Ignoring path mode because it conflicts with GridGain reserved path " +
+                    U.warn(log, "Ignoring path mode because it conflicts with Ignite reserved path " +
                         "(use another path) [mode=" + e.getValue() + ", path=" + e.getKey() + ']');
             }
         }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b4d97f54/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 ab6e322..56fd2f3 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
@@ -48,7 +48,7 @@ public class IgniteNoopScheduleProcessor extends IgniteScheduleProcessorAdapter
      * @return No-op processor usage exception;
      */
     private IgniteException processorException() {
-        return new IgniteException("Current GridGain configuration does not support schedule functionality " +
+        return new IgniteException("Current Ignite configuration does not support schedule functionality " +
             "(consider adding gridgain-schedule module to classpath).");
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b4d97f54/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridConnectionBytesVerifyFilter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridConnectionBytesVerifyFilter.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridConnectionBytesVerifyFilter.java
index a89da98..8bee151 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridConnectionBytesVerifyFilter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridConnectionBytesVerifyFilter.java
@@ -115,7 +115,7 @@ public class GridConnectionBytesVerifyFilter extends GridNioFilterAdapter {
                 ses.close();
 
                 LT.warn(log, null, "Unknown connection detected (is some other software connecting to this " +
-                    "GridGain port?) [rmtAddr=" + ses.remoteAddress() + ", locAddr=" + ses.localAddress() + ']');
+                    "Ignite port?) [rmtAddr=" + ses.remoteAddress() + ", locAddr=" + ses.localAddress() + ']');
             }
         }
         else

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b4d97f54/modules/core/src/main/java/org/apache/ignite/internal/util/nodestart/GridNodeStartUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nodestart/GridNodeStartUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nodestart/GridNodeStartUtils.java
index 76f81b5..34d42fc 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/nodestart/GridNodeStartUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nodestart/GridNodeStartUtils.java
@@ -133,7 +133,7 @@ public class GridNodeStartUtils {
                 }
                 else if (l.contains("=")) {
                     if (section == null)
-                        throw new IgniteCheckedException("GridGain ini format doesn't support unnamed section.");
+                        throw new IgniteCheckedException("Ignite ini format doesn't support unnamed section.");
 
                     String key = l.substring(0, l.indexOf('='));
                     String val = line.substring(line.indexOf('=') + 1);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b4d97f54/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 df943f0..d01b1cf 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
@@ -878,7 +878,7 @@ public final class X {
         if (var != null)
             return var;
         else
-            throw new IgniteCheckedException("Failed to resolve GridGain home folder " +
+            throw new IgniteCheckedException("Failed to resolve Ignite home folder " +
                 "(please set 'IGNITE_HOME' environment or system variable)");
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b4d97f54/modules/core/src/main/java/org/apache/ignite/jdbc/IgniteJdbcConnection.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/jdbc/IgniteJdbcConnection.java b/modules/core/src/main/java/org/apache/ignite/jdbc/IgniteJdbcConnection.java
index c07be60..ece1f10 100644
--- a/modules/core/src/main/java/org/apache/ignite/jdbc/IgniteJdbcConnection.java
+++ b/modules/core/src/main/java/org/apache/ignite/jdbc/IgniteJdbcConnection.java
@@ -86,7 +86,7 @@ class IgniteJdbcConnection implements Connection {
             client = GridClientFactory.start(cfg);
         }
         catch (GridClientException e) {
-            throw new SQLException("Failed to start GridGain client.", e);
+            throw new SQLException("Failed to start Ignite client.", e);
         }
 
         if (!isValid(2))

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b4d97f54/modules/core/src/main/java/org/apache/ignite/jdbc/IgniteJdbcDatabaseMetadata.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/jdbc/IgniteJdbcDatabaseMetadata.java b/modules/core/src/main/java/org/apache/ignite/jdbc/IgniteJdbcDatabaseMetadata.java
index d4b7919..7e41be6 100644
--- a/modules/core/src/main/java/org/apache/ignite/jdbc/IgniteJdbcDatabaseMetadata.java
+++ b/modules/core/src/main/java/org/apache/ignite/jdbc/IgniteJdbcDatabaseMetadata.java
@@ -100,7 +100,7 @@ class IgniteJdbcDatabaseMetadata implements DatabaseMetaData {
 
     /** {@inheritDoc} */
     @Override public String getDatabaseProductName() throws SQLException {
-        return "GridGain Cache";
+        return "Ignite Cache";
     }
 
     /** {@inheritDoc} */
@@ -110,7 +110,7 @@ class IgniteJdbcDatabaseMetadata implements DatabaseMetaData {
 
     /** {@inheritDoc} */
     @Override public String getDriverName() throws SQLException {
-        return "GridGain JDBC Driver";
+        return "Ignite JDBC Driver";
     }
 
     /** {@inheritDoc} */
@@ -1296,7 +1296,7 @@ class IgniteJdbcDatabaseMetadata implements DatabaseMetaData {
             }
         }
         catch (GridClientException e) {
-            throw new SQLException("Failed to get meta data from GridGain.", e);
+            throw new SQLException("Failed to get meta data from Ignite.", e);
         }
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b4d97f54/modules/core/src/main/java/org/apache/ignite/jdbc/IgniteJdbcDriver.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/jdbc/IgniteJdbcDriver.java b/modules/core/src/main/java/org/apache/ignite/jdbc/IgniteJdbcDriver.java
index b1075f7..3ffcfc7 100644
--- a/modules/core/src/main/java/org/apache/ignite/jdbc/IgniteJdbcDriver.java
+++ b/modules/core/src/main/java/org/apache/ignite/jdbc/IgniteJdbcDriver.java
@@ -269,7 +269,7 @@ public class IgniteJdbcDriver implements Driver {
             DriverManager.registerDriver(new IgniteJdbcDriver());
         }
         catch (SQLException e) {
-            throw new RuntimeException("Failed to register GridGain JDBC driver.", e);
+            throw new RuntimeException("Failed to register Ignite JDBC driver.", e);
         }
     }
 
@@ -311,14 +311,14 @@ public class IgniteJdbcDriver implements Driver {
             "SunX509"), "Key manager algorithm.");
         props[10] = new PropertyInfo("gg.client.ssl.keystore.location",
             info.getProperty("gg.client.ssl.keystore.location", ""),
-            "Key store to be used by client to connect with GridGain topology.");
+            "Key store to be used by client to connect with Ignite topology.");
         props[11] = new PropertyInfo("gg.client.ssl.keystore.password",
             info.getProperty("gg.client.ssl.keystore.password", ""), "Key store password.");
         props[12] = new PropertyInfo("gg.client.ssl.keystore.type", info.getProperty("gg.client.ssl.keystore.type",
             "jks"), "Key store type.");
         props[13] = new PropertyInfo("gg.client.ssl.truststore.location",
             info.getProperty("gg.client.ssl.truststore.location", ""),
-            "Trust store to be used by client to connect with GridGain topology.");
+            "Trust store to be used by client to connect with Ignite topology.");
         props[14] = new PropertyInfo("gg.client.ssl.keystore.password",
             info.getProperty("gg.client.ssl.truststore.password", ""), "Trust store password.");
         props[15] = new PropertyInfo("gg.client.ssl.truststore.type", info.getProperty("gg.client.ssl.truststore.type",

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b4d97f54/modules/core/src/main/java/org/apache/ignite/jdbc/IgniteJdbcResultSet.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/jdbc/IgniteJdbcResultSet.java b/modules/core/src/main/java/org/apache/ignite/jdbc/IgniteJdbcResultSet.java
index 6d839b8..3ac6e2e 100644
--- a/modules/core/src/main/java/org/apache/ignite/jdbc/IgniteJdbcResultSet.java
+++ b/modules/core/src/main/java/org/apache/ignite/jdbc/IgniteJdbcResultSet.java
@@ -176,7 +176,7 @@ class IgniteJdbcResultSet implements ResultSet {
                 }
             }
             catch (GridClientException e) {
-                throw new SQLException("Failed to query GridGain.", e);
+                throw new SQLException("Failed to query Ignite.", e);
             }
         }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b4d97f54/modules/core/src/main/java/org/apache/ignite/jdbc/IgniteJdbcStatement.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/jdbc/IgniteJdbcStatement.java b/modules/core/src/main/java/org/apache/ignite/jdbc/IgniteJdbcStatement.java
index 027768d..d2aa3e7 100644
--- a/modules/core/src/main/java/org/apache/ignite/jdbc/IgniteJdbcStatement.java
+++ b/modules/core/src/main/java/org/apache/ignite/jdbc/IgniteJdbcStatement.java
@@ -107,7 +107,7 @@ class IgniteJdbcStatement implements Statement {
             }
         }
         catch (GridClientException e) {
-            throw new SQLException("Failed to query GridGain.", e);
+            throw new SQLException("Failed to query Ignite.", e);
         }
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b4d97f54/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/IgniteOptimizedObjectInputStream.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/IgniteOptimizedObjectInputStream.java b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/IgniteOptimizedObjectInputStream.java
index 690bdd6..e92a233 100644
--- a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/IgniteOptimizedObjectInputStream.java
+++ b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/IgniteOptimizedObjectInputStream.java
@@ -153,7 +153,7 @@ class IgniteOptimizedObjectInputStream extends ObjectInputStream {
                 if (curCls != null)
                     msg.a(" of an instance of the class: ").a(curCls.getName());
 
-                msg.a(". Check that all nodes are running the same version of GridGain and that all nodes have " +
+                msg.a(". Check that all nodes are running the same version of Ignite and that all nodes have " +
                     "GridOptimizedMarshaller configured with identical optimized classes lists, if any " +
                     "(see setClassNames and setClassNamesPath methods). If your serialized classes implement " +
                     "java.io.Externalizable interface, verify that serialization logic is correct.");

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b4d97f54/modules/core/src/main/java/org/apache/ignite/mxbean/IgniteMXBean.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/mxbean/IgniteMXBean.java b/modules/core/src/main/java/org/apache/ignite/mxbean/IgniteMXBean.java
index 3a7b80f..5580d52 100644
--- a/modules/core/src/main/java/org/apache/ignite/mxbean/IgniteMXBean.java
+++ b/modules/core/src/main/java/org/apache/ignite/mxbean/IgniteMXBean.java
@@ -46,7 +46,7 @@ public interface IgniteMXBean {
      *
      * @return Copyright statement for Ignite product.
      */
-    @IgniteMXBeanDescription("Copyright statement for GridGain product.")
+    @IgniteMXBeanDescription("Copyright statement for Ignite product.")
     public String getCopyright();
 
     /**
@@ -114,7 +114,7 @@ public interface IgniteMXBean {
      *
      * @return Ignite installation home.
      */
-    @IgniteMXBeanDescription("GridGain installation home folder.")
+    @IgniteMXBeanDescription("Ignite installation home folder.")
     public String getIgniteHome();
 
     /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b4d97f54/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
index 8190edc..20e8680 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
@@ -4609,12 +4609,12 @@ public class TcpDiscoverySpi extends TcpDiscoverySpiAdapter implements TcpDiscov
                     if (!U.bytesEqual(buf, 0, U.IGNITE_HEADER, 0, 4)) {
                         if (log.isDebugEnabled())
                             log.debug("Unknown connection detected (is some other software connecting to " +
-                                "this GridGain port?) " +
+                                "this Ignite port?) " +
                                 "[rmtAddr=" + sock.getRemoteSocketAddress() +
                                 ", locAddr=" + sock.getLocalSocketAddress() + ']');
 
                         LT.warn(log, null, "Unknown connection detected (is some other software connecting to " +
-                            "this GridGain port?) [rmtAddr=" + sock.getRemoteSocketAddress() +
+                            "this Ignite port?) [rmtAddr=" + sock.getRemoteSocketAddress() +
                             ", locAddr=" + sock.getLocalSocketAddress() + ']');
 
                         return;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b4d97f54/modules/core/src/main/java/org/apache/ignite/startup/cmdline/AboutDialog.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/startup/cmdline/AboutDialog.java b/modules/core/src/main/java/org/apache/ignite/startup/cmdline/AboutDialog.java
index 8217353..22f5000 100644
--- a/modules/core/src/main/java/org/apache/ignite/startup/cmdline/AboutDialog.java
+++ b/modules/core/src/main/java/org/apache/ignite/startup/cmdline/AboutDialog.java
@@ -131,7 +131,7 @@ public class AboutDialog extends JDialog {
         msgPanel.setLayout(new BoxLayout(msgPanel, BoxLayout.Y_AXIS));
         msgPanel.setBackground(Color.WHITE);
 
-        msgPanel.add(new JLabel("<html><b>About GridGain</b></html>"));
+        msgPanel.add(new JLabel("<html><b>About Ignite</b></html>"));
         msgPanel.add(Box.createVerticalStrut(5));
         msgPanel.add(new JLabel(appName));
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b4d97f54/modules/core/src/main/java/org/apache/ignite/startup/cmdline/CommandLineStartup.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/startup/cmdline/CommandLineStartup.java b/modules/core/src/main/java/org/apache/ignite/startup/cmdline/CommandLineStartup.java
index 7ce7783..66ca184 100644
--- a/modules/core/src/main/java/org/apache/ignite/startup/cmdline/CommandLineStartup.java
+++ b/modules/core/src/main/java/org/apache/ignite/startup/cmdline/CommandLineStartup.java
@@ -111,7 +111,7 @@ public final class CommandLineStartup {
                 new Class<?>[] {aboutHndCls},
                 new InvocationHandler() {
                     @Override public Object invoke(Object proxy, Method mtd, Object[] args) throws Throwable {
-                        AboutDialog.centerShow("GridGain Node", bannerUrl.toExternalForm(), VER,
+                        AboutDialog.centerShow("Ignite Node", bannerUrl.toExternalForm(), VER,
                             releaseDate, COPYRIGHT);
 
                         return null;
@@ -248,7 +248,7 @@ public final class CommandLineStartup {
      */
     public static void main(String[] args) {
         if (!QUITE) {
-            X.println("GridGain Command Line Startup, ver. " + ACK_VER);
+            X.println("Ignite Command Line Startup, ver. " + ACK_VER);
             X.println(COPYRIGHT);
             X.println();
         }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b4d97f54/modules/core/src/main/java/org/apache/ignite/startup/cmdline/CommandLineTransformer.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/startup/cmdline/CommandLineTransformer.java b/modules/core/src/main/java/org/apache/ignite/startup/cmdline/CommandLineTransformer.java
index 0c1452c..cfed5e9 100644
--- a/modules/core/src/main/java/org/apache/ignite/startup/cmdline/CommandLineTransformer.java
+++ b/modules/core/src/main/java/org/apache/ignite/startup/cmdline/CommandLineTransformer.java
@@ -195,7 +195,7 @@ public class CommandLineTransformer {
                 String jvmOpt = arg.substring(JVM_OPTION_PREFIX.length());
 
                 if (!checkJVMOptionIsSupported(jvmOpt))
-                    throw new RuntimeException(JVM_OPTION_PREFIX + " JVM parameters for GridGain batch scripts " +
+                    throw new RuntimeException(JVM_OPTION_PREFIX + " JVM parameters for Ignite batch scripts " +
                         "with double quotes are not supported. " +
                         "Use JVM_OPTS environment variable to pass any custom JVM option.");
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b4d97f54/modules/core/src/test/java/org/apache/ignite/internal/GridStartupMain.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridStartupMain.java b/modules/core/src/test/java/org/apache/ignite/internal/GridStartupMain.java
index 8ed4149..bf24941 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridStartupMain.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridStartupMain.java
@@ -41,14 +41,14 @@ public class GridStartupMain {
         JOptionPane.showMessageDialog(
             null,
             new JComponent[] {
-                new JLabel("GridGain started."),
+                new JLabel("Ignite started."),
                 new JLabel(
                     "<html>" +
                         "You can use JMX console at <u>http://localhost:1234</u>" +
                     "</html>"),
-                new JLabel("Press OK to stop GridGain.")
+                new JLabel("Press OK to stop Ignite.")
             },
-            "GridGain Startup JUnit",
+            "Ignite Startup JUnit",
             JOptionPane.INFORMATION_MESSAGE
         );
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b4d97f54/modules/core/src/test/java/org/apache/ignite/internal/GridStartupTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridStartupTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridStartupTest.java
index 6ac4e79..ccd331f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridStartupTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridStartupTest.java
@@ -53,14 +53,14 @@ public class GridStartupTest extends GridCommonAbstractTest {
         JOptionPane.showMessageDialog(
             null,
             new JComponent[] {
-                new JLabel("GridGain started."),
+                new JLabel("Ignite started."),
                 new JLabel(
                     "<html>" +
                         "You can use JMX console at <u>http://localhost:1234</u>" +
                     "</html>"),
-                new JLabel("Press OK to stop GridGain.")
+                new JLabel("Press OK to stop Ignite.")
             },
-            "GridGain Startup JUnit",
+            "Ignite Startup JUnit",
             JOptionPane.INFORMATION_MESSAGE
         );
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b4d97f54/modules/core/src/test/java/org/apache/ignite/internal/GridUpdateNotifierSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridUpdateNotifierSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridUpdateNotifierSelfTest.java
index 51142d0..efcc00e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridUpdateNotifierSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridUpdateNotifierSelfTest.java
@@ -45,7 +45,7 @@ public class GridUpdateNotifierSelfTest extends GridCommonAbstractTest {
 
         info("Latest version: " + ver);
 
-        assertNotNull("GridGain latest version has not been detected.", ver);
+        assertNotNull("Ignite latest version has not been detected.", ver);
 
         ntf.reportStatus(log);
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b4d97f54/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridIoManagerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridIoManagerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridIoManagerSelfTest.java
index 1d29e2a..5b94d7b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridIoManagerSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridIoManagerSelfTest.java
@@ -82,7 +82,7 @@ public class GridIoManagerSelfTest extends GridCommonAbstractTest {
 
                 return null;
             }
-        }, AssertionError.class, "Internal GridGain code should never call the method with local node in a node list.");
+        }, AssertionError.class, "Internal Ignite code should never call the method with local node in a node list.");
     }
 
     /**
@@ -96,7 +96,7 @@ public class GridIoManagerSelfTest extends GridCommonAbstractTest {
 
                 return null;
             }
-        }, AssertionError.class, "Internal GridGain code should never call the method with local node in a node list.");
+        }, AssertionError.class, "Internal Ignite code should never call the method with local node in a node list.");
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b4d97f54/modules/core/src/test/java/org/apache/ignite/lang/GridFuncSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/lang/GridFuncSelfTest.java b/modules/core/src/test/java/org/apache/ignite/lang/GridFuncSelfTest.java
index 0911283..80a6903 100644
--- a/modules/core/src/test/java/org/apache/ignite/lang/GridFuncSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/lang/GridFuncSelfTest.java
@@ -837,7 +837,7 @@ public class GridFuncSelfTest extends GridCommonAbstractTest {
 
         Collection<String> strs = new ArrayList<>();
 
-        strs.add("GridGain");
+        strs.add("Ignite");
         strs.add("Cloud");
         strs.add("Compute");
         strs.add("Data");

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b4d97f54/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheBenchmark.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheBenchmark.java b/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheBenchmark.java
index b781f59..a76c757 100644
--- a/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheBenchmark.java
+++ b/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheBenchmark.java
@@ -126,7 +126,7 @@ public class GridCacheBenchmark {
 
                 opCnt.set(0);
 
-                X.println("Starting GridGain cache putx() benchmark...");
+                X.println("Starting Ignite cache putx() benchmark...");
 
                 long durPutx = GridLoadTestUtils.measureTime(new Callable<Object>() {
                     @Nullable @Override public Object call() throws Exception {
@@ -149,7 +149,7 @@ public class GridCacheBenchmark {
                 }, THREADS);
 
                 X.println(">>>");
-                X.println(">> GridGain cache putx() benchmark results [duration=" + durPutx + " ms, tx/sec=" +
+                X.println(">> Ignite cache putx() benchmark results [duration=" + durPutx + " ms, tx/sec=" +
                     (opCnt.get() * 1000 / durPutx) + ", total=" + opCnt.get() + ']');
                 X.println(">>>");
 
@@ -159,7 +159,7 @@ public class GridCacheBenchmark {
 
                 opCnt.set(0);
 
-                X.println("Starting GridGain cache get() benchmark...");
+                X.println("Starting Ignite cache get() benchmark...");
 
                 long durGet = GridLoadTestUtils.measureTime(new Callable<Object>() {
                     @Nullable @Override public Object call() throws Exception {
@@ -182,7 +182,7 @@ public class GridCacheBenchmark {
                 }, THREADS);
 
                 X.println(">>>");
-                X.println(">> GridGain cache get() benchmark results [duration=" + durGet + " ms, tx/sec=" +
+                X.println(">> Ignite cache get() benchmark results [duration=" + durGet + " ms, tx/sec=" +
                     (opCnt.get() * 1000 / durGet) + ", total=" + opCnt.get() + ']');
                 X.println(">>>");
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b4d97f54/modules/core/src/test/java/org/apache/ignite/loadtests/mapper/GridNodeStartup.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/mapper/GridNodeStartup.java b/modules/core/src/test/java/org/apache/ignite/loadtests/mapper/GridNodeStartup.java
index 928df5c..15fdcb6 100644
--- a/modules/core/src/test/java/org/apache/ignite/loadtests/mapper/GridNodeStartup.java
+++ b/modules/core/src/test/java/org/apache/ignite/loadtests/mapper/GridNodeStartup.java
@@ -44,10 +44,10 @@ public class GridNodeStartup {
             JOptionPane.showMessageDialog(
                 null,
                 new JComponent[] {
-                    new JLabel("GridGain started."),
-                    new JLabel("Press OK to stop GridGain.")
+                    new JLabel("Ignite started."),
+                    new JLabel("Press OK to stop Ignite.")
                 },
-                "GridGain",
+                "Ignite",
                 JOptionPane.INFORMATION_MESSAGE
             );
         }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b4d97f54/modules/core/src/test/java/org/apache/ignite/spi/discovery/AbstractDiscoveryRandomStartStopTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/AbstractDiscoveryRandomStartStopTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/AbstractDiscoveryRandomStartStopTest.java
index 96d15ac..5ce1a0d 100644
--- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/AbstractDiscoveryRandomStartStopTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/AbstractDiscoveryRandomStartStopTest.java
@@ -135,7 +135,7 @@ public abstract class AbstractDiscoveryRandomStartStopTest<T extends DiscoverySp
                     new JLabel("Test started."),
                     new JLabel("Press OK to stop test.")
                 },
-                "GridGain",
+                "Ignite",
                 JOptionPane.INFORMATION_MESSAGE
             );
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b4d97f54/modules/core/src/test/java/org/apache/ignite/startup/GridRandomCommandLineLoader.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/startup/GridRandomCommandLineLoader.java b/modules/core/src/test/java/org/apache/ignite/startup/GridRandomCommandLineLoader.java
index b4d1533..bf179c8 100644
--- a/modules/core/src/test/java/org/apache/ignite/startup/GridRandomCommandLineLoader.java
+++ b/modules/core/src/test/java/org/apache/ignite/startup/GridRandomCommandLineLoader.java
@@ -144,7 +144,7 @@ public final class GridRandomCommandLineLoader {
      * Prints logo.
      */
     private static void logo() {
-        echo("GridGain Random Command Line Loader, ver. " + VER);
+        echo("Ignite Random Command Line Loader, ver. " + VER);
         echo(COPYRIGHT);
         echo("");
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b4d97f54/modules/core/src/test/java/org/apache/ignite/startup/cmdline/GridCommandLineTransformerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/startup/cmdline/GridCommandLineTransformerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/startup/cmdline/GridCommandLineTransformerSelfTest.java
index a7dccec..ec85532 100644
--- a/modules/core/src/test/java/org/apache/ignite/startup/cmdline/GridCommandLineTransformerSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/startup/cmdline/GridCommandLineTransformerSelfTest.java
@@ -71,7 +71,7 @@ public class GridCommandLineTransformerSelfTest extends GridCommonAbstractTest {
                 return CommandLineTransformer.transform("-J-Xmx1g", "-J-XX:OnError=\"dir c:\\\"");
             }
         }, RuntimeException.class, CommandLineTransformer.JVM_OPTION_PREFIX +
-            " JVM parameters for GridGain batch scripts " +
+            " JVM parameters for Ignite batch scripts " +
             "with double quotes are not supported. " +
             "Use JVM_OPTS environment variable to pass any custom JVM option.");
 
@@ -80,7 +80,7 @@ public class GridCommandLineTransformerSelfTest extends GridCommonAbstractTest {
                 return CommandLineTransformer.transform("-J-Xmx1g", "-J-XX:OnOutOfMemoryError=\"dir c:\\\"");
             }
         }, RuntimeException.class, CommandLineTransformer.JVM_OPTION_PREFIX +
-            " JVM parameters for GridGain batch scripts " +
+            " JVM parameters for Ignite batch scripts " +
             "with double quotes are not supported. " +
             "Use JVM_OPTS environment variable to pass any custom JVM option.");
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b4d97f54/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
index 994390f..e67ddc7 100644
--- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
@@ -694,7 +694,7 @@ public abstract class GridAbstractTest extends TestCase {
         try {
             Ignite ignite = G.ignite(gridName);
 
-            assert ignite != null : "GridGain returned null grid for name: " + gridName;
+            assert ignite != null : "Ignite returned null grid for name: " + gridName;
 
             info(">>> Stopping grid [name=" + ignite.name() + ", id=" + ignite.cluster().localNode().id() + ']');
 
@@ -921,7 +921,7 @@ public abstract class GridAbstractTest extends TestCase {
         try {
             Ignite ignite = G.ignite(gridName);
 
-            assert ignite != null : "GridGain returned null grid for name: " + gridName;
+            assert ignite != null : "Ignite returned null grid for name: " + gridName;
 
             info(">>> Stopping grid [name=" + ignite.name() + ", id=" + ignite.cluster().localNode().id() + ']');
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b4d97f54/modules/hadoop/src/main/java/org/apache/ignite/client/hadoop/GridHadoopClientProtocolProvider.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/client/hadoop/GridHadoopClientProtocolProvider.java b/modules/hadoop/src/main/java/org/apache/ignite/client/hadoop/GridHadoopClientProtocolProvider.java
index ff01bf8..fdb6afb 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/client/hadoop/GridHadoopClientProtocolProvider.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/client/hadoop/GridHadoopClientProtocolProvider.java
@@ -54,7 +54,7 @@ public class GridHadoopClientProtocolProvider extends ClientProtocolProvider {
 
             if (F.eq(addr, "local"))
                 throw new IOException("Local execution mode is not supported, please point " +
-                    MRConfig.MASTER_ADDRESS + " to real GridGain node.");
+                    MRConfig.MASTER_ADDRESS + " to real Ignite node.");
 
             return createProtocol(addr, conf);
         }
@@ -123,7 +123,7 @@ public class GridHadoopClientProtocolProvider extends ClientProtocolProvider {
                     catch (GridClientException e) {
                         fut0.onDone(e);
 
-                        throw new IOException("Failed to establish connection with GridGain node: " + addr, e);
+                        throw new IOException("Failed to establish connection with Ignite node: " + addr, e);
                     }
                 }
             }
@@ -131,7 +131,7 @@ public class GridHadoopClientProtocolProvider extends ClientProtocolProvider {
                 return fut.get();
         }
         catch (IgniteCheckedException e) {
-            throw new IOException("Failed to establish connection with GridGain node: " + addr, e);
+            throw new IOException("Failed to establish connection with Ignite node: " + addr, e);
         }
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b4d97f54/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 6b414e7..01ea86d 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
@@ -174,7 +174,7 @@ public class GridHadoopSetup {
         File gridgainLibs = new File(new File(gridgainHome), "libs");
 
         if (!gridgainLibs.exists())
-            exit("GridGain 'libs' folder is not found.", null);
+            exit("Ignite 'libs' folder is not found.", null);
 
         Collection<File> jarFiles = new ArrayList<>();
 
@@ -193,11 +193,11 @@ public class GridHadoopSetup {
         }
 
         if (!jarsLinksCorrect) {
-            if (ask("GridGain JAR files are not found in Hadoop 'lib' directory. " +
+            if (ask("Ignite JAR files are not found in Hadoop 'lib' directory. " +
                 "Create appropriate symbolic links?")) {
                 File[] oldGridGainJarFiles = hadoopCommonLibDir.listFiles(IGNITE_JARS);
 
-                if (oldGridGainJarFiles.length > 0 && ask("The Hadoop 'lib' directory contains JARs from other GridGain " +
+                if (oldGridGainJarFiles.length > 0 && ask("The Hadoop 'lib' directory contains JARs from other Ignite " +
                     "installation. They must be deleted to continue. Continue?")) {
                     for (File file : oldGridGainJarFiles) {
                         println("Deleting file '" + file.getAbsolutePath() + "'.");
@@ -227,7 +227,7 @@ public class GridHadoopSetup {
                 }
             }
             else
-                println("Ok. But Hadoop client will not be able to talk to GridGain cluster without those JARs in classpath...");
+                println("Ok. But Hadoop client will not be able to talk to Ignite cluster without those JARs in classpath...");
         }
 
         File hadoopEtc = new File(hadoopDir, "etc" + File.separator + "hadoop");
@@ -235,7 +235,7 @@ public class GridHadoopSetup {
         File gridgainDocs = new File(gridgainHome, "docs");
 
         if (!gridgainDocs.canRead())
-            exit("Failed to read GridGain 'docs' folder at '" + gridgainDocs.getAbsolutePath() + "'.", null);
+            exit("Failed to read Ignite 'docs' folder at '" + gridgainDocs.getAbsolutePath() + "'.", null);
 
         if (hadoopEtc.canWrite()) { // TODO Bigtop
             if (ask("Replace 'core-site.xml' and 'mapred-site.xml' files with preconfigured templates " +
@@ -245,7 +245,7 @@ public class GridHadoopSetup {
                 replaceWithBackup(new File(gridgainDocs, "mapred-site.ignite.xml"), new File(hadoopEtc, "mapred-site.xml"));
             }
             else
-                println("Ok. You can configure them later, the templates are available at GridGain's 'docs' directory...");
+                println("Ok. You can configure them later, the templates are available at Ignite's 'docs' directory...");
         }
 
         if (!F.isEmpty(hiveHome)) {
@@ -253,11 +253,11 @@ public class GridHadoopSetup {
 
             if (!hiveConfDir.canWrite())
                 warn("Can not write to '" + hiveConfDir.getAbsolutePath() + "'. To run Hive queries you have to " +
-                    "configure 'hive-site.xml' manually. The template is available at GridGain's 'docs' directory.");
+                    "configure 'hive-site.xml' manually. The template is available at Ignite's 'docs' directory.");
             else if (ask("Replace 'hive-site.xml' with preconfigured template (existing file will be backed up)?"))
                 replaceWithBackup(new File(gridgainDocs, "hive-site.ignite.xml"), new File(hiveConfDir, "hive-site.xml"));
             else
-                println("Ok. You can configure it later, the template is available at GridGain's 'docs' directory...");
+                println("Ok. You can configure it later, the template is available at Ignite's 'docs' directory...");
         }
 
         println("Apache Hadoop setup is complete.");
@@ -300,7 +300,7 @@ public class GridHadoopSetup {
             Path gg = Paths.get(ggHome);
 
             if (!jar.startsWith(gg))
-                exit("GridGain JAR files are not under IGNITE_HOME.", null);
+                exit("Ignite JAR files are not under IGNITE_HOME.", null);
         }
         catch (Exception e) {
             exit(e.getMessage(), e);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b4d97f54/modules/hadoop/src/test/java/org/apache/ignite/loadtests/ggfs/GridGgfsNodeStartup.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/loadtests/ggfs/GridGgfsNodeStartup.java b/modules/hadoop/src/test/java/org/apache/ignite/loadtests/ggfs/GridGgfsNodeStartup.java
index 341d315..07714cf 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/loadtests/ggfs/GridGgfsNodeStartup.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/loadtests/ggfs/GridGgfsNodeStartup.java
@@ -38,10 +38,10 @@ public class GridGgfsNodeStartup {
             JOptionPane.showMessageDialog(
                 null,
                 new JComponent[] {
-                    new JLabel("GridGain started."),
-                    new JLabel("Press OK to stop GridGain.")
+                    new JLabel("Ignite started."),
+                    new JLabel("Press OK to stop Ignite.")
                 },
-                "GridGain",
+                "Ignite",
                 JOptionPane.INFORMATION_MESSAGE
             );
         }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b4d97f54/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateTransactionalDataRegion.java
----------------------------------------------------------------------
diff --git a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateTransactionalDataRegion.java b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateTransactionalDataRegion.java
index 04fd877..cca42de 100644
--- a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateTransactionalDataRegion.java
+++ b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateTransactionalDataRegion.java
@@ -73,18 +73,18 @@ public class GridHibernateTransactionalDataRegion extends GridHibernateRegion im
 
             case READ_WRITE:
                 if (cache.configuration().getAtomicityMode() != TRANSACTIONAL)
-                    throw new CacheException("Hibernate READ-WRITE access strategy must have GridGain cache with " +
+                    throw new CacheException("Hibernate READ-WRITE access strategy must have Ignite cache with " +
                         "'TRANSACTIONAL' atomicity mode: " + cache.name());
 
                 return new GridHibernateReadWriteAccessStrategy(ignite, cache, factory.threadLocalForCache(cache.name()));
 
             case TRANSACTIONAL:
                 if (cache.configuration().getAtomicityMode() != TRANSACTIONAL)
-                    throw new CacheException("Hibernate TRANSACTIONAL access strategy must have GridGain cache with " +
+                    throw new CacheException("Hibernate TRANSACTIONAL access strategy must have Ignite cache with " +
                         "'TRANSACTIONAL' atomicity mode: " + cache.name());
 
                 if (cache.configuration().getTransactionManagerLookupClassName() == null)
-                    throw new CacheException("Hibernate TRANSACTIONAL access strategy must have GridGain cache with " +
+                    throw new CacheException("Hibernate TRANSACTIONAL access strategy must have Ignite cache with " +
                         "TransactionManagerLookup configured: " + cache.name());
 
                 return new GridHibernateTransactionalAccessStrategy(ignite, cache);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b4d97f54/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/rest.html
----------------------------------------------------------------------
diff --git a/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/rest.html b/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/rest.html
index b7b9601..f2eb3bb 100644
--- a/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/rest.html
+++ b/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/rest.html
@@ -81,15 +81,15 @@
         </a>
         &nbsp;&nbsp;
         <a class='img_link' target=meetup href='http://www.meetup.com/GridGain-Bay-Area-Meetup-Group/'>
-            <img border=0 align=absmiddle src='http://www.gridgain.com/images/meetup_logo_small.png' alt='Join GridGain Meetup'/>
+            <img border=0 align=absmiddle src='http://www.gridgain.com/images/meetup_logo_small.png' alt='Join Ignite Meetup'/>
         </a>
         &nbsp;&nbsp;
         <a class='img_link' target=twitter href='http://www.twitter.com/gridgain'>
-            <img border=0 align=absmiddle src='http://www.gridgain.com/images/twitter.gif' alt='Follow GridGain on Twitter'/>
+            <img border=0 align=absmiddle src='http://www.gridgain.com/images/twitter.gif' alt='Follow Ignite on Twitter'/>
         </a>
         &nbsp;&nbsp;
         <a class='img_link' target=vimeo href='http://www.vimeo.com/gridgain'>
-            <img border=0 align=absmiddle src='http://www.gridgain.com/images/vimeo.png' alt='Follow GridGain on Vimeo'/>
+            <img border=0 align=absmiddle src='http://www.gridgain.com/images/vimeo.png' alt='Follow Ignite on Vimeo'/>
         </a>
     </center>
 </body>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b4d97f54/modules/spring/src/main/java/org/apache/ignite/cache/spring/SpringCacheManager.java
----------------------------------------------------------------------
diff --git a/modules/spring/src/main/java/org/apache/ignite/cache/spring/SpringCacheManager.java b/modules/spring/src/main/java/org/apache/ignite/cache/spring/SpringCacheManager.java
index 2f26b47..5e2d054 100644
--- a/modules/spring/src/main/java/org/apache/ignite/cache/spring/SpringCacheManager.java
+++ b/modules/spring/src/main/java/org/apache/ignite/cache/spring/SpringCacheManager.java
@@ -203,7 +203,7 @@ public class SpringCacheManager implements CacheManager, InitializingBean {
 
         if (cfgPath != null && cfg != null) {
             throw new IllegalArgumentException("Both 'configurationPath' and 'configuration' are " +
-                "provided. Set only one of these properties if you need to start a GridGain node inside of " +
+                "provided. Set only one of these properties if you need to start a Ignite node inside of " +
                 "GridSpringCacheManager. If you already have a node running, omit both of them and set" +
                 "'gridName' property.");
         }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b4d97f54/modules/ssh/src/main/java/org/apache/ignite/internal/util/nodestart/GridNodeCallableImpl.java
----------------------------------------------------------------------
diff --git a/modules/ssh/src/main/java/org/apache/ignite/internal/util/nodestart/GridNodeCallableImpl.java b/modules/ssh/src/main/java/org/apache/ignite/internal/util/nodestart/GridNodeCallableImpl.java
index a135094..a12a12c 100644
--- a/modules/ssh/src/main/java/org/apache/ignite/internal/util/nodestart/GridNodeCallableImpl.java
+++ b/modules/ssh/src/main/java/org/apache/ignite/internal/util/nodestart/GridNodeCallableImpl.java
@@ -146,7 +146,7 @@ public class GridNodeCallableImpl implements GridNodeCallable {
 
                 UUID id = UUID.randomUUID();
 
-                String svcName = "GridGain-" + id;
+                String svcName = "Ignite-" + id;
                 String svcPath = ggHome + '\\' + SVC_EXE;
 
                 startNodeCmd = new SB().

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b4d97f54/modules/tools/src/main/java/org/apache/ignite/tools/marshaller/optimized/OptimizedClassNamesGenerator.java
----------------------------------------------------------------------
diff --git a/modules/tools/src/main/java/org/apache/ignite/tools/marshaller/optimized/OptimizedClassNamesGenerator.java b/modules/tools/src/main/java/org/apache/ignite/tools/marshaller/optimized/OptimizedClassNamesGenerator.java
index 12dacb2..dd27177 100644
--- a/modules/tools/src/main/java/org/apache/ignite/tools/marshaller/optimized/OptimizedClassNamesGenerator.java
+++ b/modules/tools/src/main/java/org/apache/ignite/tools/marshaller/optimized/OptimizedClassNamesGenerator.java
@@ -290,7 +290,7 @@ public class OptimizedClassNamesGenerator {
             String home = home();
 
             if (home == null)
-                throw new Exception("Failed to find GridGain home.");
+                throw new Exception("Failed to find Ignite home.");
 
             dir = new File(home, "/os/modules/core/src/main/java/org/apache/ignite/marshaller/optimized");
         }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b4d97f54/modules/tools/src/main/java/org/apache/ignite/util/antgar/IgniteDeploymentGarAntTask.java
----------------------------------------------------------------------
diff --git a/modules/tools/src/main/java/org/apache/ignite/util/antgar/IgniteDeploymentGarAntTask.java b/modules/tools/src/main/java/org/apache/ignite/util/antgar/IgniteDeploymentGarAntTask.java
index 45bdc17..e75230c 100644
--- a/modules/tools/src/main/java/org/apache/ignite/util/antgar/IgniteDeploymentGarAntTask.java
+++ b/modules/tools/src/main/java/org/apache/ignite/util/antgar/IgniteDeploymentGarAntTask.java
@@ -118,7 +118,7 @@ public class IgniteDeploymentGarAntTask extends Zip {
             // File was defined in source.
             if (desc != null) {
                 if (descDir != null) {
-                    throw new BuildException("GridGain descriptor '" + DESC_NAME + "' is already " +
+                    throw new BuildException("Ignite descriptor '" + DESC_NAME + "' is already " +
                         "defined in source folder.");
                 }
             }
@@ -133,7 +133,7 @@ public class IgniteDeploymentGarAntTask extends Zip {
                 descFile = new File(getFullPath(descDir.getAbsolutePath(), DESC_NAME));
 
                 if (!descFile.exists()) {
-                    throw new BuildException("Folder doesn't contain GridGain descriptor [path=" +
+                    throw new BuildException("Folder doesn't contain Ignite descriptor [path=" +
                             descDir.getAbsolutePath() + ']');
                 }
             }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b4d97f54/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/VisorConsole.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/VisorConsole.scala b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/VisorConsole.scala
index d983025..714b92b 100644
--- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/VisorConsole.scala
+++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/VisorConsole.scala
@@ -208,7 +208,7 @@ object VisorConsole extends App {
                 Array[Class[_]](aboutHndCls),
                 new java.lang.reflect.InvocationHandler {
                     def invoke(proxy: Any, mth: java.lang.reflect.Method, args: Array[Object]) = {
-                        AboutDialog.centerShow("Visor - GridGain Shell Console", bannerIconUrl.toExternalForm,
+                        AboutDialog.centerShow("Visor - Ignite Shell Console", bannerIconUrl.toExternalForm,
                             VISOR_VER, releaseDate, VISOR_COPYRIGHT)
 
                         null

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b4d97f54/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/alert/VisorAlertCommand.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/alert/VisorAlertCommand.scala b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/alert/VisorAlertCommand.scala
index edbcdcb..034d3de 100644
--- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/alert/VisorAlertCommand.scala
+++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/alert/VisorAlertCommand.scala
@@ -476,7 +476,7 @@ class VisorAlertCommand {
         assert(n != null)
 
         val subj = "Visor alert triggered: '" + a.spec + '\''
-        val headline = "GridGain ver. " + grid.product().version()
+        val headline = "Ignite ver. " + grid.product().version()
 
         val stat = stats(a.id)
 
@@ -761,7 +761,7 @@ object VisorAlertCommand {
                 "Note that only one of the '-u' or '-r' is allowed.",
                 "If neither '-u' or '-r' provided - all alerts will be printed.",
                 "",
-                "NOTE: Email settings can be specified in GridGain configuration file.",
+                "NOTE: Email settings can be specified in Ignite configuration file.",
                 "      Email notification will be sent for the alert only when all",
                 "      provided mnemonic predicates evaluate to 'true'."
             ),

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b4d97f54/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/config/VisorConfigurationCommand.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/config/VisorConfigurationCommand.scala b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/config/VisorConfigurationCommand.scala
index 3a76a5a..5971573 100644
--- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/config/VisorConfigurationCommand.scala
+++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/config/VisorConfigurationCommand.scala
@@ -223,7 +223,7 @@ class VisorConfigurationCommand {
             val cmnT = VisorTextTable()
 
             cmnT += ("Grid name", safe(cfg.basic().gridName(), "<default>"))
-            cmnT += ("GridGain home", safe(cfg.basic().ggHome(), DFLT))
+            cmnT += ("Ignite home", safe(cfg.basic().ggHome(), DFLT))
             cmnT += ("Localhost", safe(cfg.basic().localHost(), DFLT))
             cmnT += ("Node ID", safe(cfg.basic().nodeId(), DFLT))
             cmnT += ("Marshaller", cfg.basic().marshaller())

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b4d97f54/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/disco/VisorDiscoveryCommand.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/disco/VisorDiscoveryCommand.scala b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/disco/VisorDiscoveryCommand.scala
index f7226f2..29910cc 100644
--- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/disco/VisorDiscoveryCommand.scala
+++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/disco/VisorDiscoveryCommand.scala
@@ -249,14 +249,14 @@ object VisorDiscoveryCommand {
             "Prints topology change log as seen from the oldest node.",
             "Timeframe for querying events can be specified in arguments.",
             " ",
-            "Note that this command depends on GridGain events.",
+            "Note that this command depends on Ignite events.",
             " ",
-            "GridGain events can be individually enabled and disabled and disabled events",
+            "Ignite events can be individually enabled and disabled and disabled events",
             "can affect the results produced by this command. Note also that configuration",
             "of Event Storage SPI that is responsible for temporary storage of generated",
             "events on each node can also affect the functionality of this command.",
             " ",
-            "By default - all events are disabled and GridGain stores last 10,000 local",
+            "By default - all events are disabled and Ignite stores last 10,000 local",
             "events on each node. Both of these defaults can be changed in configuration."
         ),
         spec = List(

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b4d97f54/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/events/VisorEventsCommand.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/events/VisorEventsCommand.scala b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/events/VisorEventsCommand.scala
index 22a1156..b491315 100644
--- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/events/VisorEventsCommand.scala
+++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/events/VisorEventsCommand.scala
@@ -437,14 +437,14 @@ object VisorEventsCommand {
         longInfo = List(
             "Print events from a node.",
             " ",
-            "Note that this command depends on GridGain events.",
+            "Note that this command depends on Ignite events.",
             " ",
-            "GridGain events can be individually enabled and disabled and disabled events",
+            "Ignite events can be individually enabled and disabled and disabled events",
             "can affect the results produced by this command. Note also that configuration",
             "of Event Storage SPI that is responsible for temporary storage of generated",
             "events on each node can also affect the functionality of this command.",
             " ",
-            "By default - all events are disabled and GridGain stores last 10,000 local",
+            "By default - all events are disabled and Ignite stores last 10,000 local",
             "events on each node. Both of these defaults can be changed in configuration."
         ),
         spec = List(

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b4d97f54/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/start/VisorStartCommand.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/start/VisorStartCommand.scala b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/start/VisorStartCommand.scala
index 9e7abae..2f18147 100644
--- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/start/VisorStartCommand.scala
+++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/start/VisorStartCommand.scala
@@ -375,15 +375,15 @@ object VisorStartCommand {
                 "If current count of nodes is equal to this number and '-r' flag is not set, then nothing will happen."
             ),
             "-g=<path>" -> List(
-                "Path to GridGain installation folder.",
+                "Path to Ignite installation folder.",
                 "If not defined, IGNITE_HOME environment variable must be set on remote hosts."
             ),
             "-c=<path>" -> List(
-                "Path to configuration file (relative to GridGain home).",
-                "If not provided, default GridGain configuration is used."
+                "Path to configuration file (relative to Ignite home).",
+                "If not provided, default Ignite configuration is used."
             ),
             "-s=<path>" -> List(
-                "Path to start script (relative to GridGain home).",
+                "Path to start script (relative to Ignite home).",
                 "Default is \"bin/ignite.sh\" for Unix or",
                 "\"bin\\ignite.bat\" for Windows."
             ),

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b4d97f54/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/tasks/VisorTasksCommand.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/tasks/VisorTasksCommand.scala b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/tasks/VisorTasksCommand.scala
index 6d2dd3f..1950cad 100644
--- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/tasks/VisorTasksCommand.scala
+++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/tasks/VisorTasksCommand.scala
@@ -1370,14 +1370,14 @@ object VisorTasksCommand {
         longInfo = List(
             "Prints statistics about tasks and executions.",
             " ",
-            "Note that this command depends on GridGain events.",
+            "Note that this command depends on Ignite events.",
             " ",
-            "GridGain events can be individually enabled and disabled and disabled events",
+            "Ignite events can be individually enabled and disabled and disabled events",
             "can affect the results produced by this command. Note also that configuration",
             "of Event Storage SPI that is responsible for temporary storage of generated",
             "events on each node can also affect the functionality of this command.",
             " ",
-            "By default - all events are enabled and GridGain stores last 10,000 local",
+            "By default - all events are enabled and Ignite stores last 10,000 local",
             "events on each node. Both of these defaults can be changed in configuration."
         ),
         spec = List(

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b4d97f54/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala b/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala
index fb163b6..b10fb96 100644
--- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala
+++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala
@@ -390,7 +390,7 @@ object visor extends VisorTag {
             "should be enabled on all nodes.",
             " ",
             "If neither '-cpath' or '-d' are provided, command will ask",
-            "user to select GridGain configuration file in interactive mode."
+            "user to select Ignite configuration file in interactive mode."
         ),
         spec = Seq(
             "open -cpath=<path>",
@@ -398,21 +398,21 @@ object visor extends VisorTag {
         ),
         args = Seq(
             "-cpath=<path>" -> Seq(
-                "GridGain configuration path.",
-                "Can be absolute, relative to GridGain home folder or any well formed URL."
+                "Ignite configuration path.",
+                "Can be absolute, relative to Ignite home folder or any well formed URL."
             ),
             "-d" -> Seq(
-                "Flag forces the command to connect to grid using default GridGain configuration file.",
+                "Flag forces the command to connect to grid using default Ignite configuration file.",
                 "without interactive mode."
             )
         ),
         examples = Seq(
             "open" ->
-                "Prompts user to select GridGain configuration file in interactive mode.",
+                "Prompts user to select Ignite configuration file in interactive mode.",
             "open -d" ->
-                "Connects Visor console to grid using default GridGain configuration file.",
+                "Connects Visor console to grid using default Ignite configuration file.",
             "open -cpath=/gg/config/mycfg.xml" ->
-                "Connects Visor console to grid using GridGain configuration from provided file."
+                "Connects Visor console to grid using Ignite configuration from provided file."
         ),
         ref = VisorConsoleCommand(open, open)
     )
@@ -448,7 +448,7 @@ object visor extends VisorTag {
             "Logging starts by default when Visor starts.",
             " ",
             "Events are logged to a file. If path is not provided,",
-            "it will log into '<GridGain home folder>/work/visor/visor-log'.",
+            "it will log into '<Ignite home folder>/work/visor/visor-log'.",
             " ",
             "File is always opened in append mode.",
             "If file doesn't exist, it will be created.",
@@ -477,7 +477,7 @@ object visor extends VisorTag {
             ),
             "-f=<path>" -> Seq(
                 "Provides path to the file.",
-                "Path to the file can be absolute or relative to GridGain home folder."
+                "Path to the file can be absolute or relative to Ignite home folder."
             ),
             "-p=<num>" -> Seq(
                 "Provides period of querying events (in seconds).",
@@ -502,15 +502,15 @@ object visor extends VisorTag {
             "log -l -f=/home/user/visor-log" ->
                 "Starts logging to file 'visor-log' located at '/home/user'.",
             "log -l -f=log/visor-log" ->
-                "Starts logging to file 'visor-log' located at '<GridGain home folder>/log'.",
+                "Starts logging to file 'visor-log' located at '<Ignite home folder>/log'.",
             ("log -l -p=20",
-                "Starts logging to file '<GridGain home folder>/work/visor/visor-log' " +
+                "Starts logging to file '<Ignite home folder>/work/visor/visor-log' " +
                 "with querying events period of 20 seconds."),
             ("log -l -t=30",
-                "Starts logging to file '<GridGain home folder>/work/visor/visor-log' " +
+                "Starts logging to file '<Ignite home folder>/work/visor/visor-log' " +
                 "with topology snapshot logging period of 30 seconds."),
             ("log -l -dl",
-                "Starts logging to file '<GridGain home folder>/work/visor/visor-log' " +
+                "Starts logging to file '<Ignite home folder>/work/visor/visor-log' " +
                 "with disabled collection events from remote nodes."),
             "log -s" ->
                 "Stops logging."


Mime
View raw message