ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [01/25] ignite git commit: ignite-3207 Rename IgniteConfiguration.gridName -> igniteInstanceName.
Date Mon, 13 Mar 2017 11:24:28 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-2.0 d9d6ff06c -> f59f46d37


http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/spring/src/test/java/org/apache/ignite/spring/injection/spring-resource.tmpl.xml
----------------------------------------------------------------------
diff --git a/modules/spring/src/test/java/org/apache/ignite/spring/injection/spring-resource.tmpl.xml
b/modules/spring/src/test/java/org/apache/ignite/spring/injection/spring-resource.tmpl.xml
index aeee4ec..d441350 100644
--- a/modules/spring/src/test/java/org/apache/ignite/spring/injection/spring-resource.tmpl.xml
+++ b/modules/spring/src/test/java/org/apache/ignite/spring/injection/spring-resource.tmpl.xml
@@ -38,7 +38,7 @@
             <bean id="ignite.cfg" class="org.apache.ignite.configuration.IgniteConfiguration">
                 <property name="localHost" value="127.0.0.1"/>
 
-                <property name="gridName" value="springTest@GRID_IDX@"/>
+                <property name="igniteInstanceName" value="springTest@GRID_IDX@"/>
 
                 <property name="discoverySpi">
                     <bean class="org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi">

http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/spring/src/test/java/org/apache/ignite/transactions/spring/GridSpringTransactionManagerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/spring/src/test/java/org/apache/ignite/transactions/spring/GridSpringTransactionManagerSelfTest.java
b/modules/spring/src/test/java/org/apache/ignite/transactions/spring/GridSpringTransactionManagerSelfTest.java
index 35a0eda..e119d81 100644
--- a/modules/spring/src/test/java/org/apache/ignite/transactions/spring/GridSpringTransactionManagerSelfTest.java
+++ b/modules/spring/src/test/java/org/apache/ignite/transactions/spring/GridSpringTransactionManagerSelfTest.java
@@ -47,8 +47,8 @@ public class GridSpringTransactionManagerSelfTest extends GridCommonAbstractTest
      * {@inheritDoc}
      */
     @Override
-    protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
-        IgniteConfiguration cfg = super.getConfiguration(gridName);
+    protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception
{
+        IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
 
         CacheConfiguration cache = new CacheConfiguration();
 
@@ -70,7 +70,7 @@ public class GridSpringTransactionManagerSelfTest extends GridCommonAbstractTest
      * {@inheritDoc}
      */
     @Override
-    public String getTestGridName() {
+    public String getTestIgniteInstanceName() {
         return "testGrid";
     }
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/spring/src/test/java/org/apache/ignite/transactions/spring/SpringTransactionManagerContextInjectionTest.java
----------------------------------------------------------------------
diff --git a/modules/spring/src/test/java/org/apache/ignite/transactions/spring/SpringTransactionManagerContextInjectionTest.java
b/modules/spring/src/test/java/org/apache/ignite/transactions/spring/SpringTransactionManagerContextInjectionTest.java
index 467be20..8c014a9 100644
--- a/modules/spring/src/test/java/org/apache/ignite/transactions/spring/SpringTransactionManagerContextInjectionTest.java
+++ b/modules/spring/src/test/java/org/apache/ignite/transactions/spring/SpringTransactionManagerContextInjectionTest.java
@@ -99,7 +99,7 @@ public class SpringTransactionManagerContextInjectionTest extends GridCommonAbst
 
             cfg.setLocalHost("127.0.0.1");
 
-            cfg.setGridName("stmcit");
+            cfg.setIgniteInstanceName("stmcit");
 
             cfg.setLifecycleBeans(bean1(), bean2());
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/UriDeploymentSpi.java
----------------------------------------------------------------------
diff --git a/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/UriDeploymentSpi.java
b/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/UriDeploymentSpi.java
index 30940e4..ce69ce1 100644
--- a/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/UriDeploymentSpi.java
+++ b/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/UriDeploymentSpi.java
@@ -510,7 +510,7 @@ public class UriDeploymentSpi extends IgniteSpiAdapter implements DeploymentSpi,
     }
 
     /** {@inheritDoc} */
-    @Override public void spiStart(String gridName) throws IgniteSpiException {
+    @Override public void spiStart(String igniteInstanceName) throws IgniteSpiException {
         // Start SPI start stopwatch.
         startStopwatch();
 
@@ -523,7 +523,7 @@ public class UriDeploymentSpi extends IgniteSpiAdapter implements DeploymentSpi,
 
         initializeTemporaryDirectoryPath();
 
-        registerMBean(gridName, this, UriDeploymentSpiMBean.class);
+        registerMBean(igniteInstanceName, this, UriDeploymentSpiMBean.class);
 
         FilenameFilter filter = new FilenameFilter() {
             @Override public boolean accept(File dir, String name) {
@@ -621,7 +621,7 @@ public class UriDeploymentSpi extends IgniteSpiAdapter implements DeploymentSpi,
 
             for (UriDeploymentScanner scanner : scanners) {
                 if (scanner.acceptsURI(uri)) {
-                    mgr = new UriDeploymentScannerManager(gridName, uri, file, freq >
0 ? freq :
+                    mgr = new UriDeploymentScannerManager(igniteInstanceName, uri, file,
freq > 0 ? freq :
                         scanner.getDefaultScanFrequency(), filter, lsnr, log, scanner);
 
                     break;

http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/scanners/UriDeploymentScannerManager.java
----------------------------------------------------------------------
diff --git a/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/scanners/UriDeploymentScannerManager.java
b/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/scanners/UriDeploymentScannerManager.java
index 9c59dfb..be7e354 100644
--- a/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/scanners/UriDeploymentScannerManager.java
+++ b/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/scanners/UriDeploymentScannerManager.java
@@ -31,8 +31,8 @@ import org.apache.ignite.spi.IgniteSpiThread;
  * URI deployment scanner manager.
  */
 public class UriDeploymentScannerManager implements UriDeploymentScannerContext {
-    /** Grid name. */
-    private final String gridName;
+    /** Ignite instance name. */
+    private final String igniteInstanceName;
 
     /** URI that scanner should looks after. */
     @GridToStringExclude
@@ -65,7 +65,7 @@ public class UriDeploymentScannerManager implements UriDeploymentScannerContext
     /**
      * Creates new scanner.
      *
-     * @param gridName Grid name.
+     * @param igniteInstanceName Ignite instance name.
      * @param uri URI which scanner should looks after.
      * @param deployDir Temporary deployment directory.
      * @param freq Scan frequency.
@@ -75,7 +75,7 @@ public class UriDeploymentScannerManager implements UriDeploymentScannerContext
      * @param scanner Scanner.
      */
     public UriDeploymentScannerManager(
-        String gridName,
+        String igniteInstanceName,
         URI uri,
         File deployDir,
         long freq,
@@ -91,7 +91,7 @@ public class UriDeploymentScannerManager implements UriDeploymentScannerContext
         assert lsnr != null;
         assert scanner != null;
 
-        this.gridName = gridName;
+        this.igniteInstanceName = igniteInstanceName;
         this.uri = uri;
         this.deployDir = deployDir;
         this.freq = freq;
@@ -105,7 +105,7 @@ public class UriDeploymentScannerManager implements UriDeploymentScannerContext
      * Starts scanner.
      */
     public void start() {
-        scannerThread = new IgniteSpiThread(gridName, "grid-uri-scanner", log) {
+        scannerThread = new IgniteSpiThread(igniteInstanceName, "grid-uri-scanner", log)
{
             /** {@inheritDoc} */
             @SuppressWarnings({"BusyWait"})
             @Override protected void body() throws InterruptedException  {

http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/urideploy/src/test/java/org/apache/ignite/internal/GridTaskUriDeploymentDeadlockSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/urideploy/src/test/java/org/apache/ignite/internal/GridTaskUriDeploymentDeadlockSelfTest.java
b/modules/urideploy/src/test/java/org/apache/ignite/internal/GridTaskUriDeploymentDeadlockSelfTest.java
index 68280b1..22cfc56 100644
--- a/modules/urideploy/src/test/java/org/apache/ignite/internal/GridTaskUriDeploymentDeadlockSelfTest.java
+++ b/modules/urideploy/src/test/java/org/apache/ignite/internal/GridTaskUriDeploymentDeadlockSelfTest.java
@@ -38,15 +38,15 @@ import static org.apache.ignite.events.EventType.EVT_NODE_JOINED;
  */
 public class GridTaskUriDeploymentDeadlockSelfTest extends GridCommonAbstractTest {
     /** {@inheritDoc} */
-    @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception
{
-        IgniteConfiguration c = super.getConfiguration(gridName);
+    @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws
Exception {
+        IgniteConfiguration c = super.getConfiguration(igniteInstanceName);
 
         UriDeploymentSpi deploymentSpi = new UriDeploymentSpi();
 
         deploymentSpi.setUriList(
             Arrays.asList(U.resolveIgniteUrl("modules/extdata/uri/target/resources/").toURI().toString()));
 
-        if (gridName.endsWith("2")) {
+        if (igniteInstanceName.endsWith("2")) {
             // Delay deployment for 2nd grid only.
             Field f = deploymentSpi.getClass().getDeclaredField("delayOnNewOrUpdatedFile");
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/urideploy/src/test/java/org/apache/ignite/p2p/GridP2PDisabledSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/urideploy/src/test/java/org/apache/ignite/p2p/GridP2PDisabledSelfTest.java
b/modules/urideploy/src/test/java/org/apache/ignite/p2p/GridP2PDisabledSelfTest.java
index 976cfe1..da51d68 100644
--- a/modules/urideploy/src/test/java/org/apache/ignite/p2p/GridP2PDisabledSelfTest.java
+++ b/modules/urideploy/src/test/java/org/apache/ignite/p2p/GridP2PDisabledSelfTest.java
@@ -68,8 +68,8 @@ public class GridP2PDisabledSelfTest extends GridCommonAbstractTest {
     }
 
     /** {@inheritDoc} */
-    @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception
{
-        IgniteConfiguration cfg = super.getConfiguration(gridName);
+    @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws
Exception {
+        IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
 
         cfg.setPeerClassLoadingEnabled(false);
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/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 1b8bbd5..e69aa99 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
@@ -159,7 +159,7 @@ class VisorConfigurationCommand extends VisorConsoleCommand {
 
         val basic = cfg.basic()
 
-        cmnT += ("Grid name", escapeName(basic.gridName()))
+        cmnT += ("Ignite instance name", escapeName(basic.igniteInstanceName()))
         cmnT += ("Ignite home", safe(basic.ggHome()))
         cmnT += ("Localhost", safe(basic.localHost()))
         cmnT += ("Node ID", safe(basic.nodeId()))

http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/node/VisorNodeCommand.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/node/VisorNodeCommand.scala
b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/node/VisorNodeCommand.scala
index 899e495..93cf233 100644
--- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/node/VisorNodeCommand.scala
+++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/node/VisorNodeCommand.scala
@@ -168,7 +168,7 @@ class VisorNodeCommand extends VisorConsoleCommand {
 
                         val m = node.metrics
 
-                        val gridName: String = node.attribute(ATTR_GRID_NAME)
+                        val igniteInstanceName: String = node.attribute(ATTR_IGNITE_INSTANCE_NAME)
 
                         val ver = U.productVersion(node)
                         val verStr = ver.major() + "." + ver.minor() + "." + ver.maintenance()
+
@@ -187,7 +187,7 @@ class VisorNodeCommand extends VisorConsoleCommand {
                             t += ("JRE information", node.attribute(ATTR_JIT_NAME))
                             t += ("Non-loopback IPs", node.attribute(ATTR_IPS))
                             t += ("Enabled MACs", node.attribute(ATTR_MACS))
-                            t += ("Grid name", escapeName(gridName))
+                            t += ("Ignite instance name", escapeName(igniteInstanceName))
                             t += ("JVM start time", formatDateTime(m.getStartTime))
                             t += ("Node start time", formatDateTime(m.getNodeStartTime))
                             t += ("Up time", X.timeSpan2HMSM(m.getUpTime))
@@ -242,7 +242,7 @@ class VisorNodeCommand extends VisorConsoleCommand {
                             t += ("Language runtime", node.attribute(ATTR_LANG_RUNTIME))
                             t += ("Ignite version", verStr)
                             t += ("JRE information", node.attribute(ATTR_JIT_NAME))
-                            t += ("Grid name", escapeName(gridName))
+                            t += ("Ignite instance name", escapeName(igniteInstanceName))
                             t += ("JVM start time", formatDateTime(m.getStartTime))
                             t += ("Node start time", formatDateTime(m.getNodeStartTime))
                             t += ("Up time", X.timeSpan2HMSM(m.getUpTime))

http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/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 e4e7918..ea60c87 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
@@ -1334,7 +1334,7 @@ object visor extends VisorTag {
         val t = VisorTextTable()
 
         t += ("Status", if (isCon) "Connected" else "Disconnected")
-        t += ("Grid name",
+        t += ("Ignite instance name",
             if (ignite == null)
                 NA
             else {
@@ -1495,20 +1495,20 @@ object visor extends VisorTag {
     /**
      * Connects Visor console to configuration with path.
      *
-     * @param gridName Name of grid instance.
+     * @param igniteInstanceName Name of Ignite instance.
      * @param cfgPath Configuration path.
      */
-    def open(gridName: String, cfgPath: String) {
+    def open(igniteInstanceName: String, cfgPath: String) {
         this.cfgPath = cfgPath
 
         ignite =
             try
-                Ignition.ignite(gridName).asInstanceOf[IgniteEx]
+                Ignition.ignite(igniteInstanceName).asInstanceOf[IgniteEx]
             catch {
                 case _: IllegalStateException =>
                     this.cfgPath = null
 
-                    throw new IgniteException("Named grid unavailable: " + gridName)
+                    throw new IgniteException("Named Ignite instance unavailable: " + igniteInstanceName)
             }
 
         assert(cfgPath != null)

http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/visor-console/src/test/scala/org/apache/ignite/visor/VisorRuntimeBaseSpec.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/test/scala/org/apache/ignite/visor/VisorRuntimeBaseSpec.scala
b/modules/visor-console/src/test/scala/org/apache/ignite/visor/VisorRuntimeBaseSpec.scala
index 1c5e232..38db760 100644
--- a/modules/visor-console/src/test/scala/org/apache/ignite/visor/VisorRuntimeBaseSpec.scala
+++ b/modules/visor-console/src/test/scala/org/apache/ignite/visor/VisorRuntimeBaseSpec.scala
@@ -33,13 +33,13 @@ abstract class VisorRuntimeBaseSpec(private[this] val num: Int) extends
FunSpec
     /**
      * Gets grid configuration.
      *
-     * @param name Grid name.
+     * @param name Ignite instance name.
      * @return Grid configuration.
      */
     protected def config(name: String): IgniteConfiguration = {
         val cfg = new IgniteConfiguration
 
-        cfg.setGridName(name)
+        cfg.setIgniteInstanceName(name)
 
         cfg
     }

http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/alert/VisorAlertCommandSpec.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/alert/VisorAlertCommandSpec.scala
b/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/alert/VisorAlertCommandSpec.scala
index 998070c..2fce3d3 100644
--- a/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/alert/VisorAlertCommandSpec.scala
+++ b/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/alert/VisorAlertCommandSpec.scala
@@ -41,13 +41,13 @@ class VisorAlertCommandSpec extends VisorRuntimeBaseSpec(1) {
     /**
      * Creates grid configuration for provided grid host.
      *
-     * @param name Grid name.
+     * @param name Ignite instance name.
      * @return Grid configuration.
      */
     override def config(name: String): IgniteConfiguration = {
         val cfg = new IgniteConfiguration
 
-        cfg.setGridName(name)
+        cfg.setIgniteInstanceName(name)
         cfg.setLocalHost("127.0.0.1")
 
         val discoSpi: TcpDiscoverySpi = new TcpDiscoverySpi()

http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/cache/VisorCacheClearCommandSpec.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/cache/VisorCacheClearCommandSpec.scala
b/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/cache/VisorCacheClearCommandSpec.scala
index 6bb4993..fb2f8cb 100644
--- a/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/cache/VisorCacheClearCommandSpec.scala
+++ b/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/cache/VisorCacheClearCommandSpec.scala
@@ -42,13 +42,13 @@ class VisorCacheClearCommandSpec extends VisorRuntimeBaseSpec(2) {
     /**
      * Creates grid configuration for provided grid host.
      *
-     * @param name Grid name.
+     * @param name Ignite instance name.
      * @return Grid configuration.
      */
     override def config(name: String): IgniteConfiguration = {
         val cfg = new IgniteConfiguration
 
-        cfg.setGridName(name)
+        cfg.setIgniteInstanceName(name)
         cfg.setLocalHost("127.0.0.1")
         cfg.setCacheConfiguration(cacheConfig(null), cacheConfig("cache"))
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommandSpec.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommandSpec.scala
b/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommandSpec.scala
index 4859a8f..788cb7c 100644
--- a/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommandSpec.scala
+++ b/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommandSpec.scala
@@ -61,14 +61,14 @@ class VisorCacheCommandSpec extends VisorRuntimeBaseSpec(1) {
     /**
      * Creates grid configuration for provided grid host.
      *
-     * @param name Grid name.
+     * @param name Ignite instance name.
      * @return Grid configuration.
      */
     override def config(name: String): IgniteConfiguration =
     {
         val cfg = new IgniteConfiguration
 
-        cfg.setGridName(name)
+        cfg.setIgniteInstanceName(name)
         cfg.setLocalHost("127.0.0.1")
         cfg.setCacheConfiguration(cacheConfig("replicated"))
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/cache/VisorCacheResetCommandSpec.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/cache/VisorCacheResetCommandSpec.scala
b/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/cache/VisorCacheResetCommandSpec.scala
index 18f728c..abb0024 100644
--- a/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/cache/VisorCacheResetCommandSpec.scala
+++ b/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/cache/VisorCacheResetCommandSpec.scala
@@ -39,13 +39,13 @@ class VisorCacheResetCommandSpec extends VisorRuntimeBaseSpec(2) {
     /**
      * Creates grid configuration for provided grid host.
      *
-     * @param name Grid name.
+     * @param name Ignite instance name.
      * @return Grid configuration.
      */
     override def config(name: String): IgniteConfiguration = {
         val cfg = new IgniteConfiguration
 
-        cfg.setGridName(name)
+        cfg.setIgniteInstanceName(name)
         cfg.setLocalHost("127.0.0.1")
         cfg.setCacheConfiguration(cacheConfig(null), cacheConfig("cache"))
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/config/VisorConfigurationCommandSpec.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/config/VisorConfigurationCommandSpec.scala
b/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/config/VisorConfigurationCommandSpec.scala
index 72642f7..6aadf1a 100644
--- a/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/config/VisorConfigurationCommandSpec.scala
+++ b/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/config/VisorConfigurationCommandSpec.scala
@@ -30,13 +30,13 @@ class VisorConfigurationCommandSpec extends VisorRuntimeBaseSpec(1) {
     /**
      * Creates grid configuration for provided grid host.
      *
-     * @param name Grid name.
+     * @param name Ignite instance name.
      * @return Grid configuration.
      */
     override def config(name: String): IgniteConfiguration = {
         val cfg = new IgniteConfiguration
 
-        cfg.setGridName(name)
+        cfg.setIgniteInstanceName(name)
         cfg.setIncludeEventTypes(EVTS_ALL: _*)
 
         cfg

http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/cswap/VisorCacheSwapCommandSpec.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/cswap/VisorCacheSwapCommandSpec.scala
b/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/cswap/VisorCacheSwapCommandSpec.scala
index 8a0b0c8..a58a7b0 100644
--- a/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/cswap/VisorCacheSwapCommandSpec.scala
+++ b/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/cswap/VisorCacheSwapCommandSpec.scala
@@ -36,13 +36,13 @@ class VisorCacheSwapCommandSpec extends VisorRuntimeBaseSpec(2) {
     /**
      * Creates grid configuration for provided grid host.
      *
-     * @param name Grid name.
+     * @param name Ignite instance name.
      * @return Grid configuration.
      */
     override def config(name: String): IgniteConfiguration = {
         val cfg = new IgniteConfiguration
 
-        cfg.setGridName(name)
+        cfg.setIgniteInstanceName(name)
         cfg.setLocalHost("127.0.0.1")
         cfg.setCacheConfiguration(cacheConfig(null), cacheConfig("cache"))
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/disco/VisorDiscoveryCommandSpec.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/disco/VisorDiscoveryCommandSpec.scala
b/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/disco/VisorDiscoveryCommandSpec.scala
index 335a048..cb4bf3d 100644
--- a/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/disco/VisorDiscoveryCommandSpec.scala
+++ b/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/disco/VisorDiscoveryCommandSpec.scala
@@ -40,13 +40,13 @@ class VisorDiscoveryCommandSpec extends VisorRuntimeBaseSpec(4) {
     /**
      * Creates grid configuration for provided grid host.
      *
-     * @param name Grid name.
+     * @param name Ignite instance name.
      * @return Grid configuration.
      */
     override def config(name: String): IgniteConfiguration = {
         val cfg = new IgniteConfiguration
 
-        cfg.setGridName(name)
+        cfg.setIgniteInstanceName(name)
 
         cfg
     }

http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/events/VisorEventsCommandSpec.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/events/VisorEventsCommandSpec.scala
b/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/events/VisorEventsCommandSpec.scala
index 5b18590..7be3540 100644
--- a/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/events/VisorEventsCommandSpec.scala
+++ b/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/events/VisorEventsCommandSpec.scala
@@ -29,13 +29,13 @@ class VisorEventsCommandSpec extends VisorRuntimeBaseSpec(1) {
     /**
      * Creates grid configuration for provided grid host.
      *
-     * @param name Grid name.
+     * @param name Ignite instance name.
      * @return Grid configuration.
      */
     override def config(name: String): IgniteConfiguration = {
         val cfg = new IgniteConfiguration
 
-        cfg.setGridName(name)
+        cfg.setIgniteInstanceName(name)
 
         cfg
     }

http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/gc/VisorGcCommandSpec.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/gc/VisorGcCommandSpec.scala
b/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/gc/VisorGcCommandSpec.scala
index b467687..1893cdc 100644
--- a/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/gc/VisorGcCommandSpec.scala
+++ b/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/gc/VisorGcCommandSpec.scala
@@ -28,14 +28,14 @@ class VisorGcCommandSpec extends VisorRuntimeBaseSpec(1) {
     /**
      * Creates grid configuration for provided grid host.
      *
-     * @param name Grid name.
+     * @param name Ignite instance name.
      * @return Grid configuration.
      */
     override def config(name: String): IgniteConfiguration =
     {
         val cfg = new IgniteConfiguration
 
-        cfg.setGridName(name)
+        cfg.setIgniteInstanceName(name)
 
         cfg
     }

http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/tasks/VisorTasksCommandSpec.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/tasks/VisorTasksCommandSpec.scala
b/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/tasks/VisorTasksCommandSpec.scala
index fe364bc..cdc5b47 100644
--- a/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/tasks/VisorTasksCommandSpec.scala
+++ b/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/tasks/VisorTasksCommandSpec.scala
@@ -83,13 +83,13 @@ class VisorTasksCommandSpec extends FunSpec with Matchers with BeforeAndAfterAll
     /**
      * Creates grid configuration for provided grid host.
      *
-     * @param name Grid name.
+     * @param name Ignite instance name.
      * @return Grid configuration.
      */
     private def config(name: String): IgniteConfiguration = {
         val cfg = new IgniteConfiguration
 
-        cfg.setGridName(name)
+        cfg.setIgniteInstanceName(name)
         cfg.setIncludeEventTypes(EVTS_ALL: _*)
 
         cfg

http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/web-console/web-agent/src/main/java/org/apache/ignite/console/demo/AgentClusterDemo.java
----------------------------------------------------------------------
diff --git a/modules/web-console/web-agent/src/main/java/org/apache/ignite/console/demo/AgentClusterDemo.java
b/modules/web-console/web-agent/src/main/java/org/apache/ignite/console/demo/AgentClusterDemo.java
index 252692e..0648c72 100644
--- a/modules/web-console/web-agent/src/main/java/org/apache/ignite/console/demo/AgentClusterDemo.java
+++ b/modules/web-console/web-agent/src/main/java/org/apache/ignite/console/demo/AgentClusterDemo.java
@@ -70,14 +70,14 @@ public class AgentClusterDemo {
 
     /**
      * Configure node.
-     * @param gridIdx Grid name index.
+     * @param gridIdx Ignite instance name index.
      * @param client If {@code true} then start client node.
      * @return IgniteConfiguration
      */
     private static  IgniteConfiguration igniteConfiguration(int gridIdx, boolean client)
{
         IgniteConfiguration cfg = new IgniteConfiguration();
 
-        cfg.setGridName((client ? "demo-client-" : "demo-server-" ) + gridIdx);
+        cfg.setIgniteInstanceName((client ? "demo-client-" : "demo-server-" ) + gridIdx);
         cfg.setLocalHost("127.0.0.1");
         cfg.setIncludeEventTypes(EVTS_DISCOVERY);
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/web/src/main/java/org/apache/ignite/cache/websession/WebSessionFilter.java
----------------------------------------------------------------------
diff --git a/modules/web/src/main/java/org/apache/ignite/cache/websession/WebSessionFilter.java
b/modules/web/src/main/java/org/apache/ignite/cache/websession/WebSessionFilter.java
index 7b822bf..96c1717 100644
--- a/modules/web/src/main/java/org/apache/ignite/cache/websession/WebSessionFilter.java
+++ b/modules/web/src/main/java/org/apache/ignite/cache/websession/WebSessionFilter.java
@@ -241,7 +241,7 @@ public class WebSessionFilter implements Filter {
     @Override public void init(FilterConfig cfg) throws ServletException {
         ctx = cfg.getServletContext();
 
-        String gridName = U.firstNotNull(
+        String igniteInstanceName = U.firstNotNull(
             cfg.getInitParameter(WEB_SES_NAME_PARAM),
             ctx.getInitParameter(WEB_SES_NAME_PARAM));
 
@@ -277,11 +277,11 @@ public class WebSessionFilter implements Filter {
         if (!F.isEmpty(binParam))
             keepBinary = Boolean.parseBoolean(binParam);
 
-        webSesIgnite = G.ignite(gridName);
+        webSesIgnite = G.ignite(igniteInstanceName);
 
         if (webSesIgnite == null)
-            throw new IgniteException("Grid for web sessions caching is not started (is it
configured?): " +
-                gridName);
+            throw new IgniteException("Ignite instance for web sessions caching is not started
(is it configured?): " +
+                igniteInstanceName);
 
         txs = webSesIgnite.transactions();
 
@@ -320,8 +320,8 @@ public class WebSessionFilter implements Filter {
         }
 
         if (log.isInfoEnabled())
-            log.info("Started web sessions caching [gridName=" + gridName + ", cacheName="
+ cacheName +
-                ", maxRetriesOnFail=" + retries + ']');
+            log.info("Started web sessions caching [igniteInstanceName=" + igniteInstanceName
+
+                ", cacheName=" + cacheName + ", maxRetriesOnFail=" + retries + ']');
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/web/src/main/java/org/apache/ignite/startup/servlet/ServletContextListenerStartup.java
----------------------------------------------------------------------
diff --git a/modules/web/src/main/java/org/apache/ignite/startup/servlet/ServletContextListenerStartup.java
b/modules/web/src/main/java/org/apache/ignite/startup/servlet/ServletContextListenerStartup.java
index 3c57b7a..4c44ad9 100644
--- a/modules/web/src/main/java/org/apache/ignite/startup/servlet/ServletContextListenerStartup.java
+++ b/modules/web/src/main/java/org/apache/ignite/startup/servlet/ServletContextListenerStartup.java
@@ -96,8 +96,8 @@ public class ServletContextListenerStartup implements ServletContextListener
{
     /** Configuration file path parameter name. */
     public static final String IGNITE_CFG_FILE_PATH_PARAM = "IgniteConfigurationFilePath";
 
-    /** Names of started grids. */
-    private final Collection<String> gridNames = new ArrayList<>();
+    /** Names of started Ignite instances. */
+    private final Collection<String> igniteInstanceNames = new ArrayList<>();
 
     /** {@inheritDoc} */
     @Override public void contextInitialized(ServletContextEvent evt) {
@@ -154,7 +154,7 @@ public class ServletContextListenerStartup implements ServletContextListener
{
 
                 synchronized (ServletContextListenerStartup.class) {
                     try {
-                        ignite = G.ignite(cfg.getGridName());
+                        ignite = G.ignite(cfg.getIgniteInstanceName());
                     }
                     catch (IgniteIllegalStateException ignored) {
                         ignite = IgnitionEx.start(new IgniteConfiguration(cfg), rsrcCtx);
@@ -163,12 +163,12 @@ public class ServletContextListenerStartup implements ServletContextListener
{
 
                 // Check if grid is not null - started properly.
                 if (ignite != null)
-                    gridNames.add(ignite.name());
+                    igniteInstanceNames.add(ignite.name());
             }
         }
         catch (IgniteCheckedException e) {
             // Stop started grids only.
-            for (String name : gridNames)
+            for (String name : igniteInstanceNames)
                 G.stop(name, true);
 
             throw new IgniteException("Failed to start Ignite.", e);
@@ -178,7 +178,7 @@ public class ServletContextListenerStartup implements ServletContextListener
{
     /** {@inheritDoc} */
     @Override public void contextDestroyed(ServletContextEvent evt) {
         // Stop started grids only.
-        for (String name: gridNames)
+        for (String name: igniteInstanceNames)
             G.stop(name, true);
     }
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/web/src/main/java/org/apache/ignite/startup/servlet/ServletStartup.java
----------------------------------------------------------------------
diff --git a/modules/web/src/main/java/org/apache/ignite/startup/servlet/ServletStartup.java
b/modules/web/src/main/java/org/apache/ignite/startup/servlet/ServletStartup.java
index 484f0d2..ee193c7 100644
--- a/modules/web/src/main/java/org/apache/ignite/startup/servlet/ServletStartup.java
+++ b/modules/web/src/main/java/org/apache/ignite/startup/servlet/ServletStartup.java
@@ -121,7 +121,7 @@ public class ServletStartup extends HttpServlet {
     private static final String cfgFilePathParam = "cfgFilePath";
 
     /** */
-    private Collection<String> gridNames = new ArrayList<>();
+    private Collection<String> igniteInstanceNames = new ArrayList<>();
 
     /** {@inheritDoc} */
     @SuppressWarnings({"unchecked"})
@@ -159,12 +159,12 @@ public class ServletStartup extends HttpServlet {
 
                 // Test if grid is not null - started properly.
                 if (ignite != null)
-                    gridNames.add(ignite.name());
+                    igniteInstanceNames.add(ignite.name());
             }
         }
         catch (IgniteCheckedException e) {
             // Stop started grids only.
-            for (String name: gridNames)
+            for (String name: igniteInstanceNames)
                 G.stop(name, true);
 
             throw new ServletException("Failed to start Ignite.", e);
@@ -176,7 +176,7 @@ public class ServletStartup extends HttpServlet {
     /** {@inheritDoc} */
     @Override public void destroy() {
         // Stop started grids only.
-        for (String name: gridNames)
+        for (String name: igniteInstanceNames)
             G.stop(name, true);
 
         loaded = false;

http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/web/src/test/java/org/apache/ignite/internal/websession/WebSessionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/web/src/test/java/org/apache/ignite/internal/websession/WebSessionSelfTest.java
b/modules/web/src/test/java/org/apache/ignite/internal/websession/WebSessionSelfTest.java
index f6a16e2..55e46ed 100644
--- a/modules/web/src/test/java/org/apache/ignite/internal/websession/WebSessionSelfTest.java
+++ b/modules/web/src/test/java/org/apache/ignite/internal/websession/WebSessionSelfTest.java
@@ -792,11 +792,11 @@ public class WebSessionSelfTest extends GridCommonAbstractTest {
 
     /**
      * @param cfg Configuration.
-     * @param gridName Grid name.
+     * @param igniteInstanceName Ignite instance name.
      * @param servlet Servlet.
      * @return Servlet container web context for this test.
      */
-    protected WebAppContext getWebContext(@Nullable String cfg, @Nullable String gridName,
+    protected WebAppContext getWebContext(@Nullable String cfg, @Nullable String igniteInstanceName,
         boolean keepBinaryFlag, HttpServlet servlet) {
         final String path = keepBinaryFlag ? "modules/core/src/test/webapp" : "modules/web/src/test/webapp2";
 
@@ -804,7 +804,7 @@ public class WebSessionSelfTest extends GridCommonAbstractTest {
             "/ignitetest");
 
         ctx.setInitParameter("IgniteConfigurationFilePath", cfg);
-        ctx.setInitParameter("IgniteWebSessionsGridName", gridName);
+        ctx.setInitParameter("IgniteWebSessionsGridName", igniteInstanceName);
         ctx.setInitParameter("IgniteWebSessionsCacheName", getCacheName());
         ctx.setInitParameter("IgniteWebSessionsMaximumRetriesOnFail", "100");
         ctx.setInitParameter("IgniteWebSessionsKeepBinary", Boolean.toString(keepBinaryFlag));
@@ -819,16 +819,16 @@ public class WebSessionSelfTest extends GridCommonAbstractTest {
      *
      * @param port Port number.
      * @param cfg Configuration.
-     * @param gridName Grid name.
+     * @param igniteInstanceName Ignite instance name.
      * @param servlet Servlet.
      * @return Server.
      * @throws Exception In case of error.
      */
-    private Server startServer(int port, @Nullable String cfg, @Nullable String gridName,
HttpServlet servlet)
+    private Server startServer(int port, @Nullable String cfg, @Nullable String igniteInstanceName,
HttpServlet servlet)
         throws Exception {
         Server srv = new Server(port);
 
-        WebAppContext ctx = getWebContext(cfg, gridName, keepBinary(), servlet);
+        WebAppContext ctx = getWebContext(cfg, igniteInstanceName, keepBinary(), servlet);
 
         srv.setHandler(ctx);
 
@@ -842,16 +842,17 @@ public class WebSessionSelfTest extends GridCommonAbstractTest {
      *
      * @param port Port number.
      * @param cfg Configuration.
-     * @param gridName Grid name.
+     * @param igniteInstanceName Ignite instance name.
      * @param servlet Servlet.
      * @return Server.
      * @throws Exception In case of error.
      */
-    private Server startServerWithLoginService(int port, @Nullable String cfg, @Nullable
String gridName, HttpServlet servlet)
-            throws Exception {
+    private Server startServerWithLoginService(
+        int port, @Nullable String cfg, @Nullable String igniteInstanceName, HttpServlet
servlet
+    ) throws Exception {
         Server srv = new Server(port);
 
-        WebAppContext ctx = getWebContext(cfg, gridName, keepBinary(), servlet);
+        WebAppContext ctx = getWebContext(cfg, igniteInstanceName, keepBinary(), servlet);
 
         HashLoginService hashLoginService = new HashLoginService();
         hashLoginService.setName("Test Realm");

http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteBenchmarkUtils.java
----------------------------------------------------------------------
diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteBenchmarkUtils.java
b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteBenchmarkUtils.java
index c86dadb..99a8058 100644
--- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteBenchmarkUtils.java
+++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteBenchmarkUtils.java
@@ -128,7 +128,7 @@ public class IgniteBenchmarkUtils {
         for (int i = 0; i < extraNodes; i++) {
             IgniteConfiguration nodeCfg = Ignition.loadSpringBean(cfg, "grid.cfg");
 
-            nodeCfg.setGridName("node-" + i);
+            nodeCfg.setIgniteInstanceName("node-" + i);
             nodeCfg.setMetricsLogFrequency(0);
 
             Ignition.start(nodeCfg);

http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/zk/ZookeeperIpFinderTest.java
----------------------------------------------------------------------
diff --git a/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/zk/ZookeeperIpFinderTest.java
b/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/zk/ZookeeperIpFinderTest.java
index 7d50149..3aa3ce8 100644
--- a/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/zk/ZookeeperIpFinderTest.java
+++ b/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/zk/ZookeeperIpFinderTest.java
@@ -107,12 +107,12 @@ public class ZookeeperIpFinderTest extends GridCommonAbstractTest {
     /**
      * Enhances the default configuration with the {#TcpDiscoveryZookeeperIpFinder}.
      *
-     * @param gridName Grid name.
+     * @param igniteInstanceName Ignite instance name.
      * @return Ignite configuration.
      * @throws Exception If failed.
      */
-    @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception
{
-        IgniteConfiguration configuration = super.getConfiguration(gridName);
+    @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws
Exception {
+        IgniteConfiguration configuration = super.getConfiguration(igniteInstanceName);
 
         TcpDiscoverySpi tcpDisco = (TcpDiscoverySpi)configuration.getDiscoverySpi();
         TcpDiscoveryZookeeperIpFinder zkIpFinder = new TcpDiscoveryZookeeperIpFinder();
@@ -120,10 +120,10 @@ public class ZookeeperIpFinderTest extends GridCommonAbstractTest {
 
         // first node => configure with zkUrl; second node => configure with CuratorFramework;
third and subsequent
         // shall be configured through system property
-        if (gridName.equals(getTestGridName(0)))
+        if (igniteInstanceName.equals(getTestIgniteInstanceName(0)))
             zkIpFinder.setZkConnectionString(zkCluster.getConnectString());
 
-        else if (gridName.equals(getTestGridName(1))) {
+        else if (igniteInstanceName.equals(getTestIgniteInstanceName(1))) {
             zkIpFinder.setCurator(CuratorFrameworkFactory.newClient(zkCluster.getConnectString(),
                 new ExponentialBackoffRetry(100, 5)));
         }


Mime
View raw message