ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [24/50] incubator-ignite git commit: More javadoc updates. Make sure to use the new class names.
Date Wed, 29 Apr 2015 12:32:49 GMT
More javadoc updates.  Make sure to use the new class names.


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

Branch: refs/heads/ignite-500
Commit: 452c6ef5ca37de61165fc812552dc094d8a00d5c
Parents: 0d0956a
Author: Cosmin Stroe <cstroe@gmail.com>
Authored: Fri Apr 24 14:36:27 2015 -0500
Committer: avinogradov <avinogradov@gridgain.com>
Committed: Tue Apr 28 12:54:31 2015 +0300

----------------------------------------------------------------------
 .../ignite/spi/checkpoint/s3/S3CheckpointSpi.java     |  2 +-
 modules/clients/src/test/resources/spring-cache.xml   |  4 ++--
 .../clients/src/test/resources/spring-server-node.xml |  4 ++--
 .../src/test/resources/spring-server-ssl-node.xml     |  4 ++--
 .../src/main/java/org/apache/ignite/IgniteLogger.java |  6 +++---
 .../main/java/org/apache/ignite/IgniteServices.java   |  2 +-
 .../src/main/java/org/apache/ignite/Ignition.java     |  2 +-
 .../ignite/configuration/ConnectorConfiguration.java  |  2 +-
 .../ignite/configuration/IgniteConfiguration.java     |  2 +-
 .../java/org/apache/ignite/internal/IgnitionEx.java   |  2 +-
 .../managers/communication/GridIoManager.java         |  6 +++---
 .../managers/deployment/GridDeploymentManager.java    |  2 +-
 .../deployment/GridDeploymentPerVersionStore.java     |  2 +-
 .../processors/cache/GridCacheSharedContext.java      |  2 +-
 .../distributed/dht/preloader/GridDhtPreloader.java   |  2 +-
 .../internal/util/tostring/GridToStringBuilder.java   |  2 +-
 .../org/apache/ignite/logger/java/JavaLogger.java     |  8 ++++----
 .../java/org/apache/ignite/marshaller/Marshaller.java | 14 +++++++-------
 .../apache/ignite/marshaller/jdk/JdkMarshaller.java   | 10 +++++-----
 .../marshaller/optimized/OptimizedMarshaller.java     |  8 ++++----
 .../org/apache/ignite/resources/LoggerResource.java   |  2 +-
 .../org/apache/ignite/resources/SpringResource.java   |  2 +-
 .../main/java/org/apache/ignite/services/Service.java |  2 +-
 .../apache/ignite/services/ServiceConfiguration.java  |  2 +-
 .../spi/checkpoint/cache/CacheCheckpointSpi.java      |  2 +-
 .../ignite/spi/checkpoint/jdbc/JdbcCheckpointSpi.java |  2 +-
 .../checkpoint/sharedfs/SharedFsCheckpointSpi.java    |  4 ++--
 .../collision/fifoqueue/FifoQueueCollisionSpi.java    | 10 +++++-----
 .../jobstealing/JobStealingCollisionSpi.java          | 14 +++++++-------
 .../priorityqueue/PriorityQueueCollisionSpi.java      |  6 +++---
 .../spi/communication/tcp/TcpCommunicationSpi.java    | 12 ++++++------
 .../ignite/spi/discovery/tcp/TcpDiscoverySpi.java     | 10 +++++-----
 .../eventstorage/memory/MemoryEventStorageSpi.java    | 10 +++++-----
 .../ignite/spi/failover/always/AlwaysFailoverSpi.java | 10 +++++-----
 .../failover/jobstealing/JobStealingFailoverSpi.java  |  6 +++---
 .../ignite/spi/failover/never/NeverFailoverSpi.java   |  8 ++++----
 .../org/apache/ignite/spi/indexing/IndexingSpi.java   |  4 ++--
 .../adaptive/AdaptiveLoadBalancingSpi.java            | 12 ++++++------
 .../roundrobin/RoundRobinLoadBalancingSpi.java        | 10 +++++-----
 .../WeightedRandomLoadBalancingSpi.java               | 10 +++++-----
 .../ignite/spi/swapspace/file/FileSwapSpaceSpi.java   | 10 +++++-----
 modules/core/src/test/config/load/merge-sort-base.xml |  2 +-
 .../junits/logger/GridTestLog4jLogger.java            | 10 +++++-----
 .../internal/processors/hadoop/HadoopProcessor.java   |  2 +-
 .../org/apache/ignite/logger/jcl/IgniteJclLogger.java |  8 ++++----
 .../org/apache/ignite/logger/log4j/Log4JLogger.java   |  8 ++++----
 .../ignite/spi/deployment/uri/UriDeploymentSpi.java   |  2 +-
 47 files changed, 133 insertions(+), 133 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/452c6ef5/modules/aws/src/main/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpi.java
----------------------------------------------------------------------
diff --git a/modules/aws/src/main/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpi.java b/modules/aws/src/main/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpi.java
index 9a43fc6..c5a428a 100644
--- a/modules/aws/src/main/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpi.java
+++ b/modules/aws/src/main/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpi.java
@@ -55,7 +55,7 @@ import java.util.*;
  * <h2 class="header">Java Example</h2>
  * {@link S3CheckpointSpi} can be configured as follows:
  * <pre name="code" class="java">
- * GridConfiguration cfg = new GridConfiguration();
+ * IgniteConfiguration cfg = new IgniteConfiguration();
  *
  * S3CheckpointSpi spi = new S3CheckpointSpi();
  *

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/452c6ef5/modules/clients/src/test/resources/spring-cache.xml
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/resources/spring-cache.xml b/modules/clients/src/test/resources/spring-cache.xml
index 1926a33..4dbae6e 100644
--- a/modules/clients/src/test/resources/spring-cache.xml
+++ b/modules/clients/src/test/resources/spring-cache.xml
@@ -183,9 +183,9 @@
             of one or more servers which will always be started first.
         -->
         <property name="discoverySpi">
-            <bean class="org.apache.ignite.spi.discovery.tcp.GridTcpDiscoverySpi">
+            <bean class="org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi">
                 <property name="ipFinder">
-                    <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.GridTcpDiscoveryVmIpFinder">
+                    <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder">
                         <property name="addresses">
                             <list>
                                 <!--

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/452c6ef5/modules/clients/src/test/resources/spring-server-node.xml
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/resources/spring-server-node.xml b/modules/clients/src/test/resources/spring-server-node.xml
index b6f18d0..176f0d5 100644
--- a/modules/clients/src/test/resources/spring-server-node.xml
+++ b/modules/clients/src/test/resources/spring-server-node.xml
@@ -232,13 +232,13 @@
             TCP discovery SPI (uses VM-shared IP-finder).
         -->
         <property name="discoverySpi">
-            <bean class="org.apache.ignite.spi.discovery.tcp.GridTcpDiscoverySpi">
+            <bean class="org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi">
                 <!-- Make sure both servers (unsecured and SSL-protected) can start as independent grids. -->
                 <property name="localPort" value="49500"/>
 
                 <!-- Override default IP-finder.-->
                 <property name="ipFinder">
-                    <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.GridTcpDiscoveryVmIpFinder">
+                    <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder">
                         <property name="addresses">
                             <list>
                                 <!--

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/452c6ef5/modules/clients/src/test/resources/spring-server-ssl-node.xml
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/resources/spring-server-ssl-node.xml b/modules/clients/src/test/resources/spring-server-ssl-node.xml
index 61b4a4b..ceaab53 100644
--- a/modules/clients/src/test/resources/spring-server-ssl-node.xml
+++ b/modules/clients/src/test/resources/spring-server-ssl-node.xml
@@ -218,13 +218,13 @@
             TCP discovery SPI (uses VM-shared IP-finder).
         -->
         <property name="discoverySpi">
-            <bean class="org.apache.ignite.spi.discovery.tcp.GridTcpDiscoverySpi">
+            <bean class="org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi">
                 <!-- Make sure both servers (unsecured and SSL-protected) can start as independent grids. -->
                 <property name="localPort" value="48500"/>
 
                 <!-- Override default IP-finder.-->
                 <property name="ipFinder">
-                    <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.GridTcpDiscoveryVmIpFinder">
+                    <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder">
                         <property name="addresses">
                             <list>
                                 <!--

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/452c6ef5/modules/core/src/main/java/org/apache/ignite/IgniteLogger.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteLogger.java b/modules/core/src/main/java/org/apache/ignite/IgniteLogger.java
index 6aa9183..1874f4e 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteLogger.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteLogger.java
@@ -30,10 +30,10 @@ import org.jetbrains.annotations.*;
  * <p>
  * Ignite logger could be configured either from code (for example log4j logger):
  * <pre name="code" class="java">
- *      GridConfiguration cfg = new GridConfiguration();
+ *      IgniteConfiguration cfg = new IgniteConfiguration();
  *      ...
  *      URL xml = U.resolveIgniteUrl("config/custom-log4j.xml");
- *      GridLogger log = new GridLog4jLogger(xml);
+ *      IgniteLogger log = new Log4JLogger(xml);
  *      ...
  *      cfg.setGridLogger(log);
  * </pre>
@@ -55,7 +55,7 @@ import org.jetbrains.annotations.*;
  * logger in your task/job code. See {@link org.apache.ignite.resources.LoggerResource} annotation about logger
  * injection.
  * <h1 class="header">Quiet Mode</h1>
- * By default Ignite 3.0 and later starts in "quiet" mode suppressing {@code INFO} and {@code DEBUG}
+ * By default Ignite starts in "quiet" mode suppressing {@code INFO} and {@code DEBUG}
  * log output. If system property {@code IGNITE_QUIET} is set to {@code false} than Ignition
  * will operate in normal un-suppressed logging mode. Note that all output in "quiet" mode is
  * done through standard output (STDOUT).

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/452c6ef5/modules/core/src/main/java/org/apache/ignite/IgniteServices.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteServices.java b/modules/core/src/main/java/org/apache/ignite/IgniteServices.java
index df20065..f800085 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteServices.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteServices.java
@@ -60,7 +60,7 @@ import java.util.*;
  * you can also automatically deploy services on startup by specifying them in {@link IgniteConfiguration}
  * like so:
  * <pre name="code" class="java">
- * GridConfiguration gridCfg = new GridConfiguration();
+ * IgniteConfiguration gridCfg = new IgniteConfiguration();
  *
  * GridServiceConfiguration svcCfg1 = new GridServiceConfiguration();
  *

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/452c6ef5/modules/core/src/main/java/org/apache/ignite/Ignition.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/Ignition.java b/modules/core/src/main/java/org/apache/ignite/Ignition.java
index 47f3665..6ed99bd 100644
--- a/modules/core/src/main/java/org/apache/ignite/Ignition.java
+++ b/modules/core/src/main/java/org/apache/ignite/Ignition.java
@@ -42,7 +42,7 @@ import java.util.*;
  * {@link org.apache.ignite.configuration.IgniteConfiguration} to override some default configuration. Below is an
  * example on how to start grid with custom configuration for <strong>URI deployment</strong>.
  * <pre name="code" class="java">
- * GridConfiguration cfg = new GridConfiguration();
+ * IgniteConfiguration cfg = new IgniteConfiguration();
  *
  * GridUriDeployment deploySpi = new GridUriDeployment();
  *

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/452c6ef5/modules/core/src/main/java/org/apache/ignite/configuration/ConnectorConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/ConnectorConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/ConnectorConfiguration.java
index f0f87dc..970c54b 100644
--- a/modules/core/src/main/java/org/apache/ignite/configuration/ConnectorConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/ConnectorConfiguration.java
@@ -397,7 +397,7 @@ public class ConnectorConfiguration {
      * Sets whether Secure Socket Layer should be enabled for REST TCP binary protocol.
      * <p/>
      * Note that if this flag is set to {@code true}, then a valid instance of {@link GridSslContextFactory}
-     * should be provided in {@code GridConfiguration}. Otherwise, TCP binary protocol will fail to start.
+     * should be provided in {@link IgniteConfiguration}. Otherwise, TCP binary protocol will fail to start.
      *
      * @param sslEnabled {@code True} if SSL should be enabled.
      */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/452c6ef5/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
index 252eb19..76f3043 100644
--- a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
@@ -1416,7 +1416,7 @@ public class IgniteConfiguration {
      * on arrive to mapped node. This approach suits well for large amount of small
      * jobs (which is a wide-spread use case). User still can control the number
      * of concurrent jobs by setting maximum thread pool size defined by
-     * GridConfiguration.getPublicThreadPoolSize() configuration property.
+     * IgniteConfiguration.getPublicThreadPoolSize() configuration property.
      *
      * @return Grid collision SPI implementation or {@code null} to use default implementation.
      */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/452c6ef5/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 c5145d6..58a8c8d 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
@@ -1856,7 +1856,7 @@ public class IgnitionEx {
                 if (!U.discoOrdered(cfg.getDiscoverySpi()) && !U.relaxDiscoveryOrdered())
                     throw new IgniteCheckedException("Discovery SPI implementation does not support node ordering and " +
                         "cannot be used with cache (use SPI with @GridDiscoverySpiOrderSupport annotation, " +
-                        "like GridTcpDiscoverySpi)");
+                        "like TcpDiscoverySpi)");
 
                 for (CacheConfiguration ccfg : userCaches) {
                     if (CU.isHadoopSystemCache(ccfg.getName()))

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/452c6ef5/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 c2df045..1ad6c8d 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
@@ -600,7 +600,7 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa
         }
         catch (RejectedExecutionException e) {
             U.error(log, "Failed to process P2P message due to execution rejection. Increase the upper bound " +
-                "on 'ExecutorService' provided by 'GridConfiguration.getPeerClassLoadingThreadPoolSize()'. " +
+                "on 'ExecutorService' provided by 'IgniteConfiguration.getPeerClassLoadingThreadPoolSize()'. " +
                 "Will attempt to process message in the listener thread instead.", e);
 
             c.run();
@@ -639,7 +639,7 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa
         }
         catch (RejectedExecutionException e) {
             U.error(log, "Failed to process regular message due to execution rejection. Increase the upper bound " +
-                "on 'ExecutorService' provided by 'GridConfiguration.getPublicThreadPoolSize()'. " +
+                "on 'ExecutorService' provided by 'IgniteConfiguration.getPublicThreadPoolSize()'. " +
                 "Will attempt to process message in the listener thread instead.", e);
 
             c.run();
@@ -1342,7 +1342,7 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa
             }
             catch (RejectedExecutionException e) {
                 U.error(log, "Failed to process delayed message due to execution rejection. Increase the upper bound " +
-                    "on executor service provided in 'GridConfiguration.getPublicThreadPoolSize()'). Will attempt to " +
+                    "on executor service provided in 'IgniteConfiguration.getPublicThreadPoolSize()'). Will attempt to " +
                     "process message in the listener thread instead.", e);
 
                 for (GridCommunicationMessageSet msgSet : msgSets)

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/452c6ef5/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentManager.java
index 3d3bdc8..75fe98f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentManager.java
@@ -462,7 +462,7 @@ public class GridDeploymentManager extends GridManagerAdapter<DeploymentSpi> {
                 if (locDep != null) {
                     if (!isPerVersionMode(locDep.deployMode())) {
                         U.warn(log, "Failed to deploy class in SHARED or CONTINUOUS mode (class is locally deployed " +
-                            "in some other mode). Either change GridConfiguration.getDeploymentMode() property to " +
+                            "in some other mode). Either change IgniteConfiguration.getDeploymentMode() property to " +
                             "SHARED or CONTINUOUS or remove class from local classpath and any of " +
                             "the local GAR deployments that may have it [cls=" + meta.className() + ", depMode=" +
                             locDep.deployMode() + ']', "Failed to deploy class in SHARED or CONTINUOUS mode.");

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/452c6ef5/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentPerVersionStore.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentPerVersionStore.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentPerVersionStore.java
index ba264fb..bc3b074 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentPerVersionStore.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentPerVersionStore.java
@@ -293,7 +293,7 @@ public class GridDeploymentPerVersionStore extends GridDeploymentStoreAdapter {
                             // Warn only if mode is not CONTINUOUS.
                             if (meta.deploymentMode() != CONTINUOUS)
                                 LT.warn(log, null, "Local node is in participants (most probably, " +
-                                    "GridConfiguration.getPeerClassLoadingLocalClassPathExclude() is not used properly " +
+                                    "IgniteConfiguration.getPeerClassLoadingLocalClassPathExclude() is not used properly " +
                                     "[locNodeId=" + ctx.localNodeId() + ", meta=" + meta + ']');
 
                             continue;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/452c6ef5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java
index 12086b9..294c2b0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java
@@ -390,7 +390,7 @@ public class GridCacheSharedContext<K, V> {
      * Gets grid logger for given class.
      *
      * @param cls Class to get logger for.
-     * @return GridLogger instance.
+     * @return IgniteLogger instance.
      */
     public IgniteLogger logger(Class<?> cls) {
         return kernalCtx.log(cls);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/452c6ef5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java
index 8afcdd3..d6373f0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java
@@ -100,7 +100,7 @@ public class GridDhtPreloader<K, V> extends GridCachePreloaderAdapter<K, V> {
 
                 boolean set = topVer.setIfGreater(e.topologyVersion());
 
-                assert set : "Have you configured GridTcpDiscoverySpi for your in-memory data grid? [newVer=" +
+                assert set : "Have you configured TcpDiscoverySpi for your in-memory data grid? [newVer=" +
                     e.topologyVersion() + ", curVer=" + topVer.get() + ']';
 
                 if (e.type() == EVT_NODE_LEFT || e.type() == EVT_NODE_FAILED) {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/452c6ef5/modules/core/src/main/java/org/apache/ignite/internal/util/tostring/GridToStringBuilder.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/tostring/GridToStringBuilder.java b/modules/core/src/main/java/org/apache/ignite/internal/util/tostring/GridToStringBuilder.java
index 0248489..3ff6f3c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/tostring/GridToStringBuilder.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/tostring/GridToStringBuilder.java
@@ -40,7 +40,7 @@ import java.util.concurrent.locks.*;
  *      <li>GridManagerRegistry
  *      <li>GridProcessor
  *      <li>GridProcessorRegistry
- *      <li>GridLogger
+ *      <li>IgniteLogger
  *      <li>GridDiscoveryMetricsProvider
  *      <li>GridByteArrayList
  *      </ul>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/452c6ef5/modules/core/src/main/java/org/apache/ignite/logger/java/JavaLogger.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/logger/java/JavaLogger.java b/modules/core/src/main/java/org/apache/ignite/logger/java/JavaLogger.java
index ab9bc61..e08ae64 100644
--- a/modules/core/src/main/java/org/apache/ignite/logger/java/JavaLogger.java
+++ b/modules/core/src/main/java/org/apache/ignite/logger/java/JavaLogger.java
@@ -60,17 +60,17 @@ import static org.apache.ignite.IgniteSystemProperties.*;
  * </pre>
  * And the same configuration if you'd like to configure Ignite in your code:
  * <pre name="code" class="java">
- *      GridConfiguration cfg = new GridConfiguration();
+ *      IgniteConfiguration cfg = new IgniteConfiguration();
  *      ...
- *      GridLogger log = new GridJavaLogger(Logger.global);
+ *      IgniteLogger log = new JavaLogger(Logger.global);
  *      ...
  *      cfg.setGridLogger(log);
  * </pre>
  * or which is actually the same:
  * <pre name="code" class="java">
- *      GridConfiguration cfg = new GridConfiguration();
+ *      IgniteConfiguration cfg = new IgniteConfiguration();
  *      ...
- *      GridLogger log = new GridJavaLogger();
+ *      IgniteLogger log = new JavaLogger();
  *      ...
  *      cfg.setGridLogger(log);
  * </pre>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/452c6ef5/modules/core/src/main/java/org/apache/ignite/marshaller/Marshaller.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/Marshaller.java b/modules/core/src/main/java/org/apache/ignite/marshaller/Marshaller.java
index 528fded..c25e74e 100644
--- a/modules/core/src/main/java/org/apache/ignite/marshaller/Marshaller.java
+++ b/modules/core/src/main/java/org/apache/ignite/marshaller/Marshaller.java
@@ -23,11 +23,11 @@ import org.jetbrains.annotations.*;
 import java.io.*;
 
 /**
- * {@code GridMarshaller} allows to marshal or unmarshal objects in grid. It provides
+ * {@code Marshaller} allows to marshal or unmarshal objects in grid. It provides
  * serialization/deserialization mechanism for all instances that are sent across networks
  * or are otherwise serialized.
  * <p>
- * Ignite provides the following {@code GridMarshaller} implementations:
+ * Ignite provides the following {@code Marshaller} implementations:
  * <ul>
  * <li>{@link org.apache.ignite.marshaller.optimized.OptimizedMarshaller} - default</li>
  * <li>{@link org.apache.ignite.marshaller.jdk.JdkMarshaller}</li>
@@ -36,11 +36,11 @@ import java.io.*;
  * Below are examples of marshaller configuration, usage, and injection into tasks, jobs,
  * and SPI's.
  * <h2 class="header">Java Example</h2>
- * {@code GridMarshaller} can be explicitely configured in code.
+ * {@code Marshaller} can be explicitly configured in code.
  * <pre name="code" class="java">
- * GridJdkMarshaller marshaller = new GridJdkMarshaller();
+ * JdkMarshaller marshaller = new JdkMarshaller();
  *
- * GridConfiguration cfg = new GridConfiguration();
+ * IgniteConfiguration cfg = new IgniteConfiguration();
  *
  * // Override marshaller.
  * cfg.setMarshaller(marshaller);
@@ -49,12 +49,12 @@ import java.io.*;
  * G.start(cfg);
  * </pre>
  * <h2 class="header">Spring Example</h2>
- * GridMarshaller can be configured from Spring XML configuration file:
+ * Marshaller can be configured from Spring XML configuration file:
  * <pre name="code" class="xml">
  * &lt;bean id="grid.custom.cfg" class="org.apache.ignite.configuration.IgniteConfiguration" singleton="true"&gt;
  *     ...
  *     &lt;property name="marshaller"&gt;
- *         &lt;bean class="org.apache.ignite.marshaller.jdk.GridJdkMarshaller"/&gt;
+ *         &lt;bean class="org.apache.ignite.marshaller.jdk.JdkMarshaller"/&gt;
  *     &lt;/property&gt;
  *     ...
  * &lt;/bean&gt;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/452c6ef5/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/JdkMarshaller.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/JdkMarshaller.java b/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/JdkMarshaller.java
index a76bb5f..8a61c41 100644
--- a/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/JdkMarshaller.java
+++ b/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/JdkMarshaller.java
@@ -31,11 +31,11 @@ import java.io.*;
  * <h2 class="header">Mandatory</h2>
  * This marshaller has no mandatory configuration parameters.
  * <h2 class="header">Java Example</h2>
- * {@code GridJdkMarshaller} needs to be explicitly configured to override default {@link org.apache.ignite.marshaller.optimized.OptimizedMarshaller}.
+ * {@code JdkMarshaller} needs to be explicitly configured to override default {@link org.apache.ignite.marshaller.optimized.OptimizedMarshaller}.
  * <pre name="code" class="java">
- * GridJdkMarshaller marshaller = new GridJdkMarshaller();
+ * JdkMarshaller marshaller = new JdkMarshaller();
  *
- * GridConfiguration cfg = new GridConfiguration();
+ * IgniteConfiguration cfg = new IgniteConfiguration();
  *
  * // Override default marshaller.
  * cfg.setMarshaller(marshaller);
@@ -44,12 +44,12 @@ import java.io.*;
  * G.start(cfg);
  * </pre>
  * <h2 class="header">Spring Example</h2>
- * GridJdkMarshaller can be configured from Spring XML configuration file:
+ * JdkMarshaller can be configured from Spring XML configuration file:
  * <pre name="code" class="xml">
  * &lt;bean id="grid.custom.cfg" class="org.apache.ignite.configuration.IgniteConfiguration" singleton="true"&gt;
  *     ...
  *     &lt;property name="marshaller"&gt;
- *         &lt;bean class="org.apache.ignite.marshaller.jdk.GridJdkMarshaller"/&gt;
+ *         &lt;bean class="org.apache.ignite.marshaller.jdk.JdkMarshaller"/&gt;
  *     &lt;/property&gt;
  *     ...
  * &lt;/bean&gt;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/452c6ef5/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshaller.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshaller.java b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshaller.java
index e62951e..accfeb7 100644
--- a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshaller.java
+++ b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshaller.java
@@ -35,7 +35,7 @@ import java.util.concurrent.*;
  * about 20 times faster as it removes lots of serialization overhead that exists in
  * default JDK implementation.
  * <p>
- * {@code GridOptimizedMarshaller} is tested only on Java HotSpot VM on other VMs
+ * {@code OptimizedMarshaller} is tested only on Java HotSpot VM on other VMs
  * it could yield unexpected results. It is the default marshaller on Java HotSpot VMs
  * and will be used if no other marshaller was explicitly configured.
  * <p>
@@ -44,12 +44,12 @@ import java.util.concurrent.*;
  * This marshaller has no mandatory configuration parameters.
  * <h2 class="header">Java Example</h2>
  * <pre name="code" class="java">
- * GridOptimizedMarshaller marshaller = new GridOptimizedMarshaller();
+ * OptimizedMarshaller marshaller = new OptimizedMarshaller();
  *
  * // Enforce Serializable interface.
  * marshaller.setRequireSerializable(true);
  *
- * GridConfiguration cfg = new GridConfiguration();
+ * IgniteConfiguration cfg = new IgniteConfiguration();
  *
  * // Override marshaller.
  * cfg.setMarshaller(marshaller);
@@ -63,7 +63,7 @@ import java.util.concurrent.*;
  * &lt;bean id="grid.custom.cfg" class="org.apache.ignite.configuration.IgniteConfiguration" singleton="true"&gt;
  *     ...
  *     &lt;property name="marshaller"&gt;
- *         &lt;bean class="org.apache.ignite.marshaller.optimized.GridOptimizedMarshaller"&gt;
+ *         &lt;bean class="org.apache.ignite.marshaller.optimized.OptimizedMarshaller"&gt;
  *             &lt;property name="requireSerializable"&gt;true&lt;/property&gt;
  *         &lt;/bean&gt;
  *     &lt;/property&gt;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/452c6ef5/modules/core/src/main/java/org/apache/ignite/resources/LoggerResource.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/resources/LoggerResource.java b/modules/core/src/main/java/org/apache/ignite/resources/LoggerResource.java
index 6e21168..3f68f73 100644
--- a/modules/core/src/main/java/org/apache/ignite/resources/LoggerResource.java
+++ b/modules/core/src/main/java/org/apache/ignite/resources/LoggerResource.java
@@ -36,7 +36,7 @@ import java.lang.annotation.*;
  * public class MyGridJob implements ComputeJob {
  *      ...
  *      &#64;LoggerResource
- *      private GridLogger log;
+ *      private IgniteLogger log;
  *      ...
  *  }
  * </pre>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/452c6ef5/modules/core/src/main/java/org/apache/ignite/resources/SpringResource.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/resources/SpringResource.java b/modules/core/src/main/java/org/apache/ignite/resources/SpringResource.java
index e74be9b..0d6a207 100644
--- a/modules/core/src/main/java/org/apache/ignite/resources/SpringResource.java
+++ b/modules/core/src/main/java/org/apache/ignite/resources/SpringResource.java
@@ -77,7 +77,7 @@ import java.lang.annotation.*;
  *     ...
  *     // Inject logger (or any other resource).
  *     &#64;LoggerResource
- *     private GridLogger log;
+ *     private IgniteLogger log;
  *
  *     // Inject ignite instance (or any other resource).
  *     &#64;IgniteInstanceResource

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/452c6ef5/modules/core/src/main/java/org/apache/ignite/services/Service.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/services/Service.java b/modules/core/src/main/java/org/apache/ignite/services/Service.java
index 9c57a7c..2bd5649 100644
--- a/modules/core/src/main/java/org/apache/ignite/services/Service.java
+++ b/modules/core/src/main/java/org/apache/ignite/services/Service.java
@@ -62,7 +62,7 @@ import java.io.*;
  * </pre>
  * Or from grid configuration on startup:
  * <pre name="code" class="java">
- * GridConfiguration gridCfg = new GridConfiguration();
+ * IgniteConfiguration gridCfg = new IgniteConfiguration();
  *
  * GridServiceConfiguration svcCfg = new GridServiceConfiguration();
  *

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/452c6ef5/modules/core/src/main/java/org/apache/ignite/services/ServiceConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/services/ServiceConfiguration.java b/modules/core/src/main/java/org/apache/ignite/services/ServiceConfiguration.java
index 04321a2..fbc0e09 100644
--- a/modules/core/src/main/java/org/apache/ignite/services/ServiceConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/services/ServiceConfiguration.java
@@ -30,7 +30,7 @@ import java.io.*;
  * can also be automatically deployed on startup by specifying them in {@link org.apache.ignite.configuration.IgniteConfiguration}
  * like so:
  * <pre name="code" class="java">
- * GridConfiguration gridCfg = new GridConfiguration();
+ * IgniteConfiguration gridCfg = new IgniteConfiguration();
  *
  * GridServiceConfiguration svcCfg1 = new GridServiceConfiguration();
  *

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/452c6ef5/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/cache/CacheCheckpointSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/cache/CacheCheckpointSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/cache/CacheCheckpointSpi.java
index 5f76b33..db6d1b0 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/cache/CacheCheckpointSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/cache/CacheCheckpointSpi.java
@@ -44,7 +44,7 @@ import static org.apache.ignite.events.EventType.*;
  * <h2 class="header">Java Example</h2>
  * {@link CacheCheckpointSpi} can be configured as follows:
  * <pre name="code" class="java">
- * GridConfiguration cfg = new GridConfiguration();
+ * IgniteConfiguration cfg = new IgniteConfiguration();
  *
  * String cacheName = "checkpoints";
  *

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/452c6ef5/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/jdbc/JdbcCheckpointSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/jdbc/JdbcCheckpointSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/jdbc/JdbcCheckpointSpi.java
index 158d530..f25c46d 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/jdbc/JdbcCheckpointSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/jdbc/JdbcCheckpointSpi.java
@@ -62,7 +62,7 @@ import java.text.*;
  * <h2 class="header">Java Example</h2>
  * {@link JdbcCheckpointSpi} can be configured as follows:
  * <pre name="code" class="java">
- * GridConfiguration cfg = new GridConfiguration();
+ * IgniteConfiguration cfg = new IgniteConfiguration();
  *
  * GridJdbcCheckpointSpi checkpointSpi = new GridJdbcCheckpointSpi();
  *

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/452c6ef5/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/sharedfs/SharedFsCheckpointSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/sharedfs/SharedFsCheckpointSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/sharedfs/SharedFsCheckpointSpi.java
index c244e49..21880de 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/sharedfs/SharedFsCheckpointSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/sharedfs/SharedFsCheckpointSpi.java
@@ -54,9 +54,9 @@ import java.util.*;
  * <h2 class="header">Java Example</h2>
  * {@link SharedFsCheckpointSpi} can be configured as follows:
  * <pre name="code" class="java">
- * GridConfiguration cfg = new GridConfiguration();
+ * IgniteConfiguration cfg = new IgniteConfiguration();
  *
- * GridSharedFsCheckpointSpi checkpointSpi = new GridSharedFsCheckpointSpi();
+ * SharedFsCheckpointSpi checkpointSpi = new SharedFsCheckpointSpi();
  *
  * // List of checkpoint directories where all files are stored.
  * Collection<String> dirPaths = new ArrayList<String>();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/452c6ef5/modules/core/src/main/java/org/apache/ignite/spi/collision/fifoqueue/FifoQueueCollisionSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/collision/fifoqueue/FifoQueueCollisionSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/collision/fifoqueue/FifoQueueCollisionSpi.java
index ea2e791..5bdab6f 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/collision/fifoqueue/FifoQueueCollisionSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/collision/fifoqueue/FifoQueueCollisionSpi.java
@@ -41,14 +41,14 @@ import java.util.*;
  * </li>
  * </ul>
  * <h2 class="header">Java Example</h2>
- * {@code GridFifoQueueCollisionSpi} can be configured as follows:
+ * {@code FifoQueueCollisionSpi} can be configured as follows:
  * <pre name="code" class="java">
- * GridFifoQueueCollisionSpi colSpi = new GridFifoQueueCollisionSpi();
+ * FifoQueueCollisionSpi colSpi = new FifoQueueCollisionSpi();
  *
  * // Execute all jobs sequentially by setting parallel job number to 1.
  * colSpi.setParallelJobsNumber(1);
  *
- * GridConfiguration cfg = new GridConfiguration();
+ * IgniteConfiguration cfg = new IgniteConfiguration();
  *
  * // Override default collision SPI.
  * cfg.setCollisionSpi(colSpi);
@@ -57,12 +57,12 @@ import java.util.*;
  * G.start(cfg);
  * </pre>
  * <h2 class="header">Spring Example</h2>
- * {@code GridFifoQueueCollisionSpi} can be configured from Spring XML configuration file:
+ * {@code FifoQueueCollisionSpi} can be configured from Spring XML configuration file:
  * <pre name="code" class="xml">
  * &lt;bean id="grid.custom.cfg" class="org.apache.ignite.configuration.IgniteConfiguration" singleton="true"&gt;
  *       ...
  *       &lt;property name="collisionSpi"&gt;
- *           &lt;bean class="org.apache.ignite.spi.collision.fifoqueue.GridFifoQueueCollisionSpi"&gt;
+ *           &lt;bean class="org.apache.ignite.spi.collision.fifoqueue.FifoQueueCollisionSpi"&gt;
  *               &lt;property name="parallelJobsNumber" value="1"/&gt;
  *           &lt;/bean&gt;
  *       &lt;/property&gt;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/452c6ef5/modules/core/src/main/java/org/apache/ignite/spi/collision/jobstealing/JobStealingCollisionSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/collision/jobstealing/JobStealingCollisionSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/collision/jobstealing/JobStealingCollisionSpi.java
index 95c2dc1..8a397ce 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/collision/jobstealing/JobStealingCollisionSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/collision/jobstealing/JobStealingCollisionSpi.java
@@ -62,21 +62,21 @@ import static org.apache.ignite.events.EventType.*;
  * <p>
  * <i>
  * Note that this SPI must always be used in conjunction with
- * {@link org.apache.ignite.spi.failover.jobstealing.JobStealingFailoverSpi}.
+ * {@link org.apache.ignite.spi.failover.jobstealing.JobStealingFailoverSpi JobStealingFailoverSpi}.
  * Also note that job metrics update should be enabled in order for this SPI
- * to work properly (i.e. {@link org.apache.ignite.configuration.IgniteConfiguration#getMetricsUpdateFrequency()}
+ * to work properly (i.e. {@link org.apache.ignite.configuration.IgniteConfiguration#getMetricsUpdateFrequency() IgniteConfiguration#getMetricsUpdateFrequency()}
  * should be set to {@code 0} or greater value).
  * The responsibility of Job Stealing Failover SPI is to properly route <b>stolen</b>
  * jobs to the nodes that initially requested (<b>stole</b>) these jobs. The
  * SPI maintains a counter of how many times a jobs was stolen and
- * hence traveled to another node. {@code GridJobStealingCollisionSpi}
+ * hence traveled to another node. {@link JobStealingCollisionSpi}
  * checks this counter and will not allow a job to be stolen if this counter
  * exceeds a certain threshold {@link JobStealingCollisionSpi#setMaximumStealingAttempts(int)}.
  * </i>
  * <p>
  * <h1 class="header">Configuration</h1>
  * In order to use this SPI, you should configure your grid instance
- * to use {@code GridJobStealingCollisionSpi} either from Spring XML file or
+ * to use {@link JobStealingCollisionSpi JobStealingCollisionSpi} either from Spring XML file or
  * directly. The following configuration parameters are supported:
  * <h2 class="header">Mandatory</h2>
  * This SPI has no mandatory configuration parameters.
@@ -110,7 +110,7 @@ import static org.apache.ignite.events.EventType.*;
  * </ul>
  * Below is example of configuring this SPI from Java code:
  * <pre name="code" class="java">
- * GridJobStealingCollisionSpi spi = new GridJobStealingCollisionSpi();
+ * JobStealingCollisionSpi spi = new JobStealingCollisionSpi();
  *
  * // Configure number of waiting jobs
  * // in the queue for job stealing.
@@ -133,7 +133,7 @@ import static org.apache.ignite.events.EventType.*;
  * // Set stealing attribute to steal from/to nodes that have it.
  * spi.setStealingAttributes(Collections.singletonMap("node.segment", "foobar"));
  *
- * GridConfiguration cfg = new GridConfiguration();
+ * IgniteConfiguration cfg = new IgniteConfiguration();
  *
  * // Override default Collision SPI.
  * cfg.setCollisionSpi(spi);
@@ -141,7 +141,7 @@ import static org.apache.ignite.events.EventType.*;
  * Here is an example of how this SPI can be configured from Spring XML configuration:
  * <pre name="code" class="xml">
  * &lt;property name="collisionSpi"&gt;
- *     &lt;bean class="org.apache.ignite.spi.collision.jobstealing.GridJobStealingCollisionSpi"&gt;
+ *     &lt;bean class="org.apache.ignite.spi.collision.jobstealing.JobStealingCollisionSpi"&gt;
  *         &lt;property name="activeJobsThreshold" value="100"/&gt;
  *         &lt;property name="waitJobsThreshold" value="0"/&gt;
  *         &lt;property name="messageExpireTime" value="1000"/&gt;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/452c6ef5/modules/core/src/main/java/org/apache/ignite/spi/collision/priorityqueue/PriorityQueueCollisionSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/collision/priorityqueue/PriorityQueueCollisionSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/collision/priorityqueue/PriorityQueueCollisionSpi.java
index 4ad15fa..24da2f9 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/collision/priorityqueue/PriorityQueueCollisionSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/collision/priorityqueue/PriorityQueueCollisionSpi.java
@@ -67,12 +67,12 @@ import java.util.*;
  * </ul>
  * Below is a Java example of configuration for priority collision SPI:
  * <pre name="code" class="java">
- * GridPriorityQueueCollisionSpi colSpi = new GridPriorityQueueCollisionSpi();
+ * PriorityQueueCollisionSpi colSpi = new PriorityQueueCollisionSpi();
  *
  * // Execute all jobs sequentially by setting parallel job number to 1.
  * colSpi.setParallelJobsNumber(1);
  *
- * GridConfiguration cfg = new GridConfiguration();
+ * IgniteConfiguration cfg = new IgniteConfiguration();
  *
  * // Override default collision SPI.
  * cfg.setCollisionSpi(colSpi);
@@ -83,7 +83,7 @@ import java.util.*;
  * Here is Spring XML configuration example:
  * <pre name="code" class="xml">
  * &lt;property name="collisionSpi"&gt;
- *     &lt;bean class="org.apache.ignite.spi.collision.priorityqueue.GridPriorityQueueCollisionSpi"&gt;
+ *     &lt;bean class="org.apache.ignite.spi.collision.priorityqueue.PriorityQueueCollisionSpi"&gt;
  *         &lt;property name="priorityAttributeKey" value="myPriorityAttributeKey"/&gt;
  *         &lt;property name="parallelJobsNumber" value="10"/&gt;
  *     &lt;/bean&gt;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/452c6ef5/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
index c3bfb87..2d5c541 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
@@ -50,7 +50,7 @@ import static org.apache.ignite.IgniteSystemProperties.*;
 import static org.apache.ignite.events.EventType.*;
 
 /**
- * <tt>GridTcpCommunicationSpi</tt> is default communication SPI which uses
+ * <tt>TcpCommunicationSpi</tt> is default communication SPI which uses
  * TCP/IP protocol and Java NIO to communicate with other nodes.
  * <p>
  * To enable communication with other nodes, this SPI adds {@link #ATTR_ADDRS}
@@ -99,15 +99,15 @@ import static org.apache.ignite.events.EventType.*;
  * <li>Maximum number of unacknowledged messages (see {@link #setUnacknowledgedMessagesBufferSize(int)})</li>
  * </ul>
  * <h2 class="header">Java Example</h2>
- * GridTcpCommunicationSpi is used by default and should be explicitly configured
+ * TcpCommunicationSpi is used by default and should be explicitly configured
  * only if some SPI configuration parameters need to be overridden.
  * <pre name="code" class="java">
- * GridTcpCommunicationSpi commSpi = new GridTcpCommunicationSpi();
+ * TcpCommunicationSpi commSpi = new TcpCommunicationSpi();
  *
  * // Override local port.
  * commSpi.setLocalPort(4321);
  *
- * GridConfiguration cfg = new GridConfiguration();
+ * IgniteConfiguration cfg = new IgniteConfiguration();
  *
  * // Override default communication SPI.
  * cfg.setCommunicationSpi(commSpi);
@@ -116,12 +116,12 @@ import static org.apache.ignite.events.EventType.*;
  * Ignition.start(cfg);
  * </pre>
  * <h2 class="header">Spring Example</h2>
- * GridTcpCommunicationSpi can be configured from Spring XML configuration file:
+ * TcpCommunicationSpi can be configured from Spring XML configuration file:
  * <pre name="code" class="xml">
  * &lt;bean id="grid.custom.cfg" class="org.apache.ignite.configuration.IgniteConfiguration" singleton="true"&gt;
  *         ...
  *         &lt;property name="communicationSpi"&gt;
- *             &lt;bean class="org.apache.ignite.spi.communication.tcp.GridTcpCommunicationSpi"&gt;
+ *             &lt;bean class="org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi"&gt;
  *                 &lt;!-- Override local port. --&gt;
  *                 &lt;property name="localPort" value="4321"/&gt;
  *             &lt;/bean&gt;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/452c6ef5/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 6a5eb25..206a8c3 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
@@ -108,14 +108,14 @@ import static org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryStatusChe
  * </ul>
  * <h2 class="header">Java Example</h2>
  * <pre name="code" class="java">
- * GridTcpDiscoverySpi spi = new GridTcpDiscoverySpi();
+ * TcpDiscoverySpi spi = new TcpDiscoverySpi();
  *
- * GridTcpDiscoveryVmIpFinder finder =
+ * TcpDiscoveryVmIpFinder finder =
  *     new GridTcpDiscoveryVmIpFinder();
  *
  * spi.setIpFinder(finder);
  *
- * GridConfiguration cfg = new GridConfiguration();
+ * IgniteConfiguration cfg = new IgniteConfiguration();
  *
  * // Override default discovery SPI.
  * cfg.setDiscoverySpi(spi);
@@ -124,7 +124,7 @@ import static org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryStatusChe
  * Ignition.start(cfg);
  * </pre>
  * <h2 class="header">Spring Example</h2>
- * GridTcpDiscoverySpi can be configured from Spring XML configuration file:
+ * TcpDiscoverySpi can be configured from Spring XML configuration file:
  * <pre name="code" class="xml">
  * &lt;bean id="grid.custom.cfg" class="org.apache.ignite.configuration.IgniteConfiguration" singleton="true"&gt;
  *         ...
@@ -1393,7 +1393,7 @@ public class TcpDiscoverySpi extends TcpDiscoverySpiAdapter implements TcpDiscov
                     LT.warn(log, null, "Node has not been connected to topology and will repeat join process. " +
                         "Check remote nodes logs for possible error messages. " +
                         "Note that large topology may require significant time to start. " +
-                        "Increase 'GridTcpDiscoverySpi.networkTimeout' configuration property " +
+                        "Increase 'TcpDiscoverySpi.networkTimeout' configuration property " +
                         "if getting this message on the starting nodes [networkTimeout=" + netTimeout + ']');
             }
         }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/452c6ef5/modules/core/src/main/java/org/apache/ignite/spi/eventstorage/memory/MemoryEventStorageSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/eventstorage/memory/MemoryEventStorageSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/eventstorage/memory/MemoryEventStorageSpi.java
index d8208f6..46029a9 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/eventstorage/memory/MemoryEventStorageSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/eventstorage/memory/MemoryEventStorageSpi.java
@@ -53,16 +53,16 @@ import static org.apache.ignite.events.EventType.*;
  * <li>{@link #setFilter(org.apache.ignite.lang.IgnitePredicate)} - Event filter that should be used for decision to accept event.</li>
  * </ul>
  * <h2 class="header">Java Example</h2>
- * GridMemoryEventStorageSpi is used by default and should be explicitly configured only
+ * MemoryEventStorageSpi is used by default and should be explicitly configured only
  * if some SPI configuration parameters need to be overridden. Examples below insert own
  * events queue size value that differs from default 10000.
  * <pre name="code" class="java">
- * GridMemoryEventStorageSpi = new GridMemoryEventStorageSpi();
+ * MemoryEventStorageSpi = new MemoryEventStorageSpi();
  *
  * // Init own events size.
  * spi.setExpireCount(2000);
  *
- * GridConfiguration cfg = new GridConfiguration();
+ * IgniteConfiguration cfg = new IgniteConfiguration();
  *
  * // Override default event storage SPI.
  * cfg.setEventStorageSpi(spi);
@@ -71,12 +71,12 @@ import static org.apache.ignite.events.EventType.*;
  * G.start(cfg);
  * </pre>
  * <h2 class="header">Spring Example</h2>
- * GridMemoryEventStorageSpi can be configured from Spring XML configuration file:
+ * MemoryEventStorageSpi can be configured from Spring XML configuration file:
  * <pre name="code" class="xml">
  * &lt;bean id="grid.custom.cfg" class="org.apache.ignite.configuration.IgniteConfiguration" singleton="true"&gt;
  *         ...
  *         &lt;property name="discoverySpi"&gt;
- *             &lt;bean class="org.apache.ignite.spi.eventStorage.memory.GridMemoryEventStorageSpi"&gt;
+ *             &lt;bean class="org.apache.ignite.spi.eventStorage.memory.MemoryEventStorageSpi"&gt;
  *                 &lt;property name="expireCount" value="2000"/&gt;
  *             &lt;/bean&gt;
  *         &lt;/property&gt;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/452c6ef5/modules/core/src/main/java/org/apache/ignite/spi/failover/always/AlwaysFailoverSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/failover/always/AlwaysFailoverSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/failover/always/AlwaysFailoverSpi.java
index 68f212e..e075d3e 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/failover/always/AlwaysFailoverSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/failover/always/AlwaysFailoverSpi.java
@@ -50,14 +50,14 @@ import java.util.*;
  *          hence, will fail.
  *      </li>
  * </ul>
- * Here is a Java example how to configure grid with {@code GridAlwaysFailoverSpi} failover SPI.
+ * Here is a Java example how to configure grid with {@link AlwaysFailoverSpi} failover SPI.
  * <pre name="code" class="java">
- * GridAlwaysFailoverSpi spi = new GridAlwaysFailoverSpi();
+ * AlwaysFailoverSpi spi = new AlwaysFailoverSpi();
  *
  * // Override maximum failover attempts.
  * spi.setMaximumFailoverAttempts(5);
  *
- * GridConfiguration cfg = new GridConfiguration();
+ * IgniteConfiguration cfg = new IgniteConfiguration();
  *
  * // Override default failover SPI.
  * cfg.setFailoverSpiSpi(spi);
@@ -65,10 +65,10 @@ import java.util.*;
  * // Starts grid.
  * G.start(cfg);
  * </pre>
- * Here is an example of how to configure {@code GridAlwaysFailoverSpi} from Spring XML configuration file.
+ * Here is an example of how to configure {@code AlwaysFailoverSpi} from Spring XML configuration file.
  * <pre name="code" class="xml">
  * &lt;property name="failoverSpi"&gt;
- *     &lt;bean class="org.apache.ignite.spi.failover.always.GridAlwaysFailoverSpi"&gt;
+ *     &lt;bean class="org.apache.ignite.spi.failover.always.AlwaysFailoverSpi"&gt;
  *         &lt;property name="maximumFailoverAttempts" value="5"/&gt;
  *     &lt;/bean&gt;
  * &lt;/property&gt;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/452c6ef5/modules/core/src/main/java/org/apache/ignite/spi/failover/jobstealing/JobStealingFailoverSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/failover/jobstealing/JobStealingFailoverSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/failover/jobstealing/JobStealingFailoverSpi.java
index 6c7749f..eef1f28 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/failover/jobstealing/JobStealingFailoverSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/failover/jobstealing/JobStealingFailoverSpi.java
@@ -56,14 +56,14 @@ import static org.apache.ignite.spi.collision.jobstealing.JobStealingCollisionSp
  * <ul>
  * <li>Maximum failover attempts for a single job (see {@link #setMaximumFailoverAttempts(int)}).</li>
  * </ul>
- * Here is a Java example on how to configure grid with {@code JobStealingFailoverSpi}.
+ * Here is a Java example on how to configure grid with {@link JobStealingFailoverSpi}.
  * <pre name="code" class="java">
  * JobStealingFailoverSpi spi = new JobStealingFailoverSpi();
  *
  * // Override maximum failover attempts.
  * spi.setMaximumFailoverAttempts(5);
  *
- * GridConfiguration cfg = new GridConfiguration();
+ * IgniteConfiguration cfg = new IgniteConfiguration();
  *
  * // Override default failover SPI.
  * cfg.setFailoverSpiSpi(spi);
@@ -71,7 +71,7 @@ import static org.apache.ignite.spi.collision.jobstealing.JobStealingCollisionSp
  * // Starts grid.
  * G.start(cfg);
  </pre>
- * Here is an example of how to configure {@code JobStealingFailoverSpi} from Spring XML configuration file.
+ * Here is an example of how to configure {@link JobStealingFailoverSpi} from Spring XML configuration file.
  * <pre name="code" class="xml">
  * &lt;property name="failoverSpi"&gt;
  *     &lt;bean class="org.apache.ignite.spi.failover.jobstealing.JobStealingFailoverSpi"&gt;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/452c6ef5/modules/core/src/main/java/org/apache/ignite/spi/failover/never/NeverFailoverSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/failover/never/NeverFailoverSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/failover/never/NeverFailoverSpi.java
index ee31d64..68a24df 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/failover/never/NeverFailoverSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/failover/never/NeverFailoverSpi.java
@@ -38,9 +38,9 @@ import java.util.*;
  * <p>
  * Here is a Java example on how to configure grid with {@code GridNeverFailoverSpi}:
  * <pre name="code" class="java">
- * GridNeverFailoverSpi spi = new GridNeverFailoverSpi();
+ * NeverFailoverSpi spi = new NeverFailoverSpi();
  *
- * GridConfiguration cfg = new GridConfiguration();
+ * IgniteConfiguration cfg = new IgniteConfiguration();
  *
  * // Override default failover SPI.
  * cfg.setFailoverSpiSpi(spi);
@@ -48,10 +48,10 @@ import java.util.*;
  * // Starts grid.
  * G.start(cfg);
  * </pre>
- * Here is an example on how to configure grid with {@code GridNeverFailoverSpi} from Spring XML configuration file:
+ * Here is an example on how to configure grid with {@link NeverFailoverSpi} from Spring XML configuration file:
  * <pre name="code" class="xml">
  * &lt;property name="failoverSpi"&gt;
- *     &lt;bean class="org.apache.ignite.spi.failover.never.GridNeverFailoverSpi"/&gt;
+ *     &lt;bean class="org.apache.ignite.spi.failover.never.NeverFailoverSpi"/&gt;
  * &lt;/property&gt;
  * </pre>
  * <p>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/452c6ef5/modules/core/src/main/java/org/apache/ignite/spi/indexing/IndexingSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/indexing/IndexingSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/indexing/IndexingSpi.java
index d148fbe..15c6fe4 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/indexing/IndexingSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/indexing/IndexingSpi.java
@@ -36,9 +36,9 @@ import java.util.*;
  *
  * Here is a Java example on how to configure SPI.
  * <pre name="code" class="java">
- * GridIndexingSpi spi = new MyIndexingSpi();
+ * IndexingSpi spi = new MyIndexingSpi();
  *
- * GridConfiguration cfg = new GridConfiguration();
+ * IgniteConfiguration cfg = new IgniteConfiguration();
  *
  * // Overrides default indexing SPI.
  * cfg.setIndexingSpi(spi);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/452c6ef5/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/adaptive/AdaptiveLoadBalancingSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/adaptive/AdaptiveLoadBalancingSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/adaptive/AdaptiveLoadBalancingSpi.java
index 5d2a158..8d4d41a 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/adaptive/AdaptiveLoadBalancingSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/adaptive/AdaptiveLoadBalancingSpi.java
@@ -179,7 +179,7 @@ import static org.apache.ignite.events.EventType.*;
  * <p>
  * <h1 class="header">Configuration</h1>
  * In order to use this load balancer, you should configure your grid instance
- * to use {@code GridJobsLoadBalancingSpi} either from Spring XML file or
+ * to use {@code JobsLoadBalancingSpi} either from Spring XML file or
  * directly. The following configuration parameters are supported:
  * <h2 class="header">Mandatory</h2>
  * This SPI has no mandatory configuration parameters.
@@ -196,14 +196,14 @@ import static org.apache.ignite.events.EventType.*;
  * <p>
  * Below is Java configuration example:
  * <pre name="code" class="java">
- * GridAdaptiveLoadBalancingSpi spi = new GridAdaptiveLoadBalancingSpi();
+ * AdaptiveLoadBalancingSpi spi = new AdaptiveLoadBalancingSpi();
  *
  * // Configure probe to use latest job execution time vs. average.
- * GridAdaptiveProcessingTimeLoadProbe probe = new GridAdaptiveProcessingTimeLoadProbe(false);
+ * AdaptiveProcessingTimeLoadProbe probe = new AdaptiveProcessingTimeLoadProbe(false);
  *
  * spi.setLoadProbe(probe);
  *
- * GridConfiguration cfg = new GridConfiguration();
+ * IgniteConfiguration cfg = new IgniteConfiguration();
  *
  * // Override default load balancing SPI.
  * cfg.setLoadBalancingSpi(spi);
@@ -214,9 +214,9 @@ import static org.apache.ignite.events.EventType.*;
  * Here is how you can configure {@code GridJobsLoadBalancingSpi} using Spring XML configuration:
  * <pre name="code" class="xml">
  * &lt;property name="loadBalancingSpi"&gt;
- *     &lt;bean class="org.apache.ignite.spi.loadBalancing.adaptive.GridAdaptiveLoadBalancingSpi"&gt;
+ *     &lt;bean class="org.apache.ignite.spi.loadBalancing.adaptive.AdaptiveLoadBalancingSpi"&gt;
  *         &lt;property name="loadProbe"&gt;
- *             &lt;bean class="org.apache.ignite.spi.loadBalancing.adaptive.GridAdaptiveProcessingTimeLoadProbe"&gt;
+ *             &lt;bean class="org.apache.ignite.spi.loadBalancing.adaptive.AdaptiveProcessingTimeLoadProbe"&gt;
  *                 &lt;constructor-arg value="false"/&gt;
  *             &lt;/bean&gt;
  *         &lt;/property&gt;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/452c6ef5/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/roundrobin/RoundRobinLoadBalancingSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/roundrobin/RoundRobinLoadBalancingSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/roundrobin/RoundRobinLoadBalancingSpi.java
index 24ec84d..6ae9e99 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/roundrobin/RoundRobinLoadBalancingSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/roundrobin/RoundRobinLoadBalancingSpi.java
@@ -118,7 +118,7 @@ import static org.apache.ignite.events.EventType.*;
  * <p>
  * <h1 class="header">Configuration</h1>
  * In order to use this load balancer, you should configure your grid instance
- * to use {@code GridRoundRobinLoadBalancingSpi} either from Spring XML file or
+ * to use {@link RoundRobinLoadBalancingSpi} either from Spring XML file or
  * directly. The following configuration parameters are supported:
  * <h2 class="header">Mandatory</h2>
  * This SPI has no mandatory configuration parameters.
@@ -132,12 +132,12 @@ import static org.apache.ignite.events.EventType.*;
  * </ul>
  * Below is Java configuration example:
  * <pre name="code" class="java">
- * GridRandomLoadBalancingSpi = new GridRandomLoadBalancingSpi();
+ * RoundRobinLoadBalancingSpi spi = new RoundRobinLoadBalancingSpi();
  *
  * // Configure SPI to use global round-robin mode.
  * spi.setPerTask(false);
  *
- * GridConfiguration cfg = new GridConfiguration();
+ * IgniteConfiguration cfg = new IgniteConfiguration();
  *
  * // Override default load balancing SPI.
  * cfg.setLoadBalancingSpi(spi);
@@ -145,10 +145,10 @@ import static org.apache.ignite.events.EventType.*;
  * // Starts grid.
  * G.start(cfg);
  * </pre>
- * Here is how you can configure {@code GridRandomLoadBalancingSpi} using Spring XML configuration:
+ * Here is how you can configure {@link RoundRobinLoadBalancingSpi} using Spring XML configuration:
  * <pre name="code" class="xml">
  * &lt;property name="loadBalancingSpi"&gt;
- *     &lt;bean class="org.apache.ignite.spi.loadBalancing.roundrobin.GridRoundRobinLoadBalancingSpi"&gt;
+ *     &lt;bean class="org.apache.ignite.spi.loadBalancing.roundrobin.RoundRobinLoadBalancingSpi"&gt;
  *         &lt;!-- Set to global round-robin mode. --&gt;
  *         &lt;property name="perTask" value="false"/&gt;
  *     &lt;/bean&gt;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/452c6ef5/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/weightedrandom/WeightedRandomLoadBalancingSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/weightedrandom/WeightedRandomLoadBalancingSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/weightedrandom/WeightedRandomLoadBalancingSpi.java
index 4143cae..6fcce26 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/weightedrandom/WeightedRandomLoadBalancingSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/weightedrandom/WeightedRandomLoadBalancingSpi.java
@@ -108,7 +108,7 @@ import static org.apache.ignite.events.EventType.*;
  * <p>
  * <h1 class="header">Configuration</h1>
  * In order to use this load balancer, you should configure your grid instance
- * to use {@code GridRandomLoadBalancingSpi} either from Spring XML file or
+ * to use {@link WeightedRandomLoadBalancingSpi} either from Spring XML file or
  * directly. The following configuration parameters are supported:
  * <h2 class="header">Mandatory</h2>
  * This SPI has no mandatory configuration parameters.
@@ -126,7 +126,7 @@ import static org.apache.ignite.events.EventType.*;
  * </ul>
  * Below is Java configuration example:
  * <pre name="code" class="java">
- * GridWeightedRandomLoadBalancingSpi = new GridWeightedLoadBalancingSpi();
+ * WeightedRandomLoadBalancingSpi spi = new WeightedRandomLoadBalancingSpi();
  *
  * // Configure SPI to used weighted
  * // random load balancing.
@@ -135,7 +135,7 @@ import static org.apache.ignite.events.EventType.*;
  * // Set weight for the local node.
  * spi.setWeight( *);
  *
- * GridConfiguration cfg = new GridConfiguration();
+ * IgniteConfiguration cfg = new IgniteConfiguration();
  *
  * // Override default load balancing SPI.
  * cfg.setLoadBalancingSpi(spi);
@@ -143,10 +143,10 @@ import static org.apache.ignite.events.EventType.*;
  * // Starts grid.
  * G.start(cfg);
  * </pre>
- * Here is how you can configure {@code GridRandomLoadBalancingSpi} using Spring XML configuration:
+ * Here is how you can configure {@link WeightedRandomLoadBalancingSpi} using Spring XML configuration:
  * <pre name="code" class="xml">
  * &lt;property name="loadBalancingSpi"&gt;
- *     &lt;bean class="org.apache.ignite.spi.loadBalancing.weightedrandom.GridWeightedRandomLoadBalancingSpi"&gt;
+ *     &lt;bean class="org.apache.ignite.spi.loadBalancing.weightedrandom.WeightedRandomLoadBalancingSpi"&gt;
  *         &lt;property name="useWeights" value="true"/&gt;
  *         &lt;property name="nodeWeight" value="10"/&gt;
  *     &lt;/bean&gt;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/452c6ef5/modules/core/src/main/java/org/apache/ignite/spi/swapspace/file/FileSwapSpaceSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/swapspace/file/FileSwapSpaceSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/swapspace/file/FileSwapSpaceSpi.java
index 5df37d7..e7db285 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/swapspace/file/FileSwapSpaceSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/swapspace/file/FileSwapSpaceSpi.java
@@ -64,15 +64,15 @@ import static org.apache.ignite.events.EventType.*;
  * </ul>
  *
  * <h2 class="header">Java Example</h2>
- * GridFileSwapSpaceSpi is configured by default and should be explicitly configured
+ * FileSwapSpaceSpi is configured by default and should be explicitly configured
  * only if some SPI configuration parameters need to be overridden.
  * <pre name="code" class="java">
- * GridFileSwapSpaceSpi spi = new GridFileSwapSpaceSpi();
+ * FileSwapSpaceSpi spi = new FileSwapSpaceSpi();
  *
  * // Configure root folder path.
  * spi.setBaseDirectory("/path/to/swap/folder");
  *
- * GridConfiguration cfg = new GridConfiguration();
+ * IgniteConfiguration cfg = new IgniteConfiguration();
  *
  * // Override default swap space SPI.
  * cfg.setSwapSpaceSpi(spi);
@@ -81,12 +81,12 @@ import static org.apache.ignite.events.EventType.*;
  * G.start(cfg);
  * </pre>
  * <h2 class="header">Spring Example</h2>
- * GridFileSwapSpaceSpi can be configured from Spring XML configuration file:
+ * FileSwapSpaceSpi can be configured from Spring XML configuration file:
  * <pre name="code" class="xml">
  * &lt;bean id=&quot;grid.cfg&quot; class=&quot;org.apache.ignite.configuration.IgniteConfiguration&quot; scope=&quot;singleton&quot;&gt;
  *     ...
  *     &lt;property name=&quot;swapSpaceSpi&quot;&gt;
- *         &lt;bean class=&quot;org.apache.ignite.spi.swapspace.file.GridFileSwapSpaceSpi&quot;&gt;
+ *         &lt;bean class=&quot;org.apache.ignite.spi.swapspace.file.FileSwapSpaceSpi&quot;&gt;
  *             &lt;property name=&quot;baseDirectory&quot; value=&quot;/path/to/swap/folder&quot;/&gt;
  *         &lt;/bean&gt;
  *     &lt;/property&gt;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/452c6ef5/modules/core/src/test/config/load/merge-sort-base.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/config/load/merge-sort-base.xml b/modules/core/src/test/config/load/merge-sort-base.xml
index b753693..aba0108 100644
--- a/modules/core/src/test/config/load/merge-sort-base.xml
+++ b/modules/core/src/test/config/load/merge-sort-base.xml
@@ -42,7 +42,7 @@
             performance degradation.
 
             It is highly recommended to enable only those events that your application logic requires by using
-            either GridConfiguration.getExcludeEventTypes() orGridConfiguration.getIncludeEventTypes() methods
+            either IgniteConfiguration.getExcludeEventTypes() or IgniteConfiguration.getIncludeEventTypes() methods
             in Ignite configuration. Note that certain events are required for Ignite's internal operations
             and such events will still be generated but not stored by event storage SPI if they are disabled in
             Ignite configuration.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/452c6ef5/modules/core/src/test/java/org/apache/ignite/testframework/junits/logger/GridTestLog4jLogger.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/logger/GridTestLog4jLogger.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/logger/GridTestLog4jLogger.java
index 31b3253..8f45062 100644
--- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/logger/GridTestLog4jLogger.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/logger/GridTestLog4jLogger.java
@@ -42,17 +42,17 @@ import static org.apache.ignite.IgniteSystemProperties.*;
  * Here is a typical example of configuring log4j logger in Ignite configuration file:
  * <pre name="code" class="xml">
  *      &lt;property name="gridLogger"&gt;
- *          &lt;bean class="org.apache.ignite.logger.log4j.GridLog4jLogger"&gt;
+ *          &lt;bean class="org.apache.ignite.logger.log4j.Log4JLogger"&gt;
  *              &lt;constructor-arg type="java.lang.String" value="config/ignite-log4j.xml"/&gt;
  *          &lt;/bean>
  *      &lt;/property&gt;
  * </pre>
  * and from your code:
  * <pre name="code" class="java">
- *      GridConfiguration cfg = new GridConfiguration();
+ *      IgniteConfiguration cfg = new IgniteConfiguration();
  *      ...
  *      URL xml = U.resolveIgniteUrl("config/custom-log4j.xml");
- *      GridLogger log = new GridLog4jLogger(xml);
+ *      IgniteLogger log = new Log4JLogger(xml);
  *      ...
  *      cfg.setGridLogger(log);
  * </pre>
@@ -95,9 +95,9 @@ public class GridTestLog4jLogger implements IgniteLogger, LoggerNodeIdAware {
      * Creates new logger and automatically detects if root logger already
      * has appenders configured. If it does not, the root logger will be
      * configured with default appender (analogous to calling
-     * {@link #GridTestLog4jLogger(boolean) GridLog4jLogger(boolean)}
+     * {@link #GridTestLog4jLogger(boolean) Log4jLogger(boolean)}
      * with parameter {@code true}, otherwise, existing appenders will be used (analogous
-     * to calling {@link #GridTestLog4jLogger(boolean) GridLog4jLogger(boolean)}
+     * to calling {@link #GridTestLog4jLogger(boolean) Log4jLogger(boolean)}
      * with parameter {@code false}).
      */
     public GridTestLog4jLogger() {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/452c6ef5/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopProcessor.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopProcessor.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopProcessor.java
index 9bb6a0e..3590603 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopProcessor.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopProcessor.java
@@ -224,6 +224,6 @@ public class HadoopProcessor extends HadoopProcessorAdapter {
     private void validate(HadoopConfiguration hadoopCfg) throws IgniteCheckedException {
         if (ctx.config().isPeerClassLoadingEnabled())
             throw new IgniteCheckedException("Peer class loading cannot be used with Hadoop (disable it using " +
-                "GridConfiguration.setPeerClassLoadingEnabled()).");
+                "IgniteConfiguration.setPeerClassLoadingEnabled()).");
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/452c6ef5/modules/jcl/src/main/java/org/apache/ignite/logger/jcl/IgniteJclLogger.java
----------------------------------------------------------------------
diff --git a/modules/jcl/src/main/java/org/apache/ignite/logger/jcl/IgniteJclLogger.java b/modules/jcl/src/main/java/org/apache/ignite/logger/jcl/IgniteJclLogger.java
index 90ff263..30a15f8 100644
--- a/modules/jcl/src/main/java/org/apache/ignite/logger/jcl/IgniteJclLogger.java
+++ b/modules/jcl/src/main/java/org/apache/ignite/logger/jcl/IgniteJclLogger.java
@@ -52,17 +52,17 @@ import org.jetbrains.annotations.*;
  * </pre>
  * And the same configuration if you'd like to configure Ignite in your code:
  * <pre name="code" class="java">
- *      GridConfiguration cfg = new GridConfiguration();
+ *      IgniteConfiguration cfg = new IgniteConfiguration();
  *      ...
- *      GridLogger log = new IgniteJclLogger(new Log4JLogger("config/ignite-log4j.xml"));
+ *      IgniteLogger log = new IgniteJclLogger(new Log4JLogger("config/ignite-log4j.xml"));
  *      ...
  *      cfg.setGridLogger(log);
  * </pre>
  * or following for the configuration by means of system properties:
  * <pre name="code" class="java">
- *      GridConfiguration cfg = new GridConfiguration();
+ *      IgniteConfiguration cfg = new IgniteConfiguration();
  *      ...
- *      GridLogger log = new IgniteJclLogger();
+ *      IgniteLogger log = new IgniteJclLogger();
  *      ...
  *      cfg.setGridLogger(log);
  * </pre>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/452c6ef5/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/Log4JLogger.java
----------------------------------------------------------------------
diff --git a/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/Log4JLogger.java b/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/Log4JLogger.java
index e9fde2c..333b1da 100644
--- a/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/Log4JLogger.java
+++ b/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/Log4JLogger.java
@@ -49,10 +49,10 @@ import static org.apache.ignite.IgniteSystemProperties.*;
  * </pre>
  * and from your code:
  * <pre name="code" class="java">
- *      GridConfiguration cfg = new GridConfiguration();
+ *      IgniteConfiguration cfg = new IgniteConfiguration();
  *      ...
  *      URL xml = U.resolveIgniteUrl("config/custom-log4j.xml");
- *      GridLogger log = new GridLog4jLogger(xml);
+ *      IgniteLogger log = new Log4JLogger(xml);
  *      ...
  *      cfg.setGridLogger(log);
  * </pre>
@@ -95,9 +95,9 @@ public class Log4JLogger implements IgniteLogger, LoggerNodeIdAware, Log4jFileAw
      * Creates new logger and automatically detects if root logger already
      * has appenders configured. If it does not, the root logger will be
      * configured with default appender (analogous to calling
-     * {@link #Log4JLogger(boolean) GridLog4jLogger(boolean)}
+     * {@link #Log4JLogger(boolean) Log4JLogger(boolean)}
      * with parameter {@code true}, otherwise, existing appenders will be used (analogous
-     * to calling {@link #Log4JLogger(boolean) GridLog4jLogger(boolean)}
+     * to calling {@link #Log4JLogger(boolean) Log4JLogger(boolean)}
      * with parameter {@code false}).
      */
     public Log4JLogger() {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/452c6ef5/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 cb089c3..3a397c2 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
@@ -208,7 +208,7 @@ import java.util.Map.*;
  * <pre name="code" class="java">
  * UriDeploymentSpi deploySpi = new UriDeploymentSpi();
  *
- * GridConfiguration cfg = new GridConfiguration();
+ * IgniteConfiguration cfg = new IgniteConfiguration();
  *
  * List&lt;String&gt; uris = new ArrayList&lt;String&gt;(5);
  *


Mime
View raw message