ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [5/5] incubator-ignite git commit: # ignite-164 : org.gridgain.grid.GridConfiguration -> org.apache.ignite.configuration.IgniteConfiguration, org.gridgain.grid.cache.GridCacheConfiguration -> org.apache.ignite.cache.CacheConfiguration, org.gridgain.grid.
Date Tue, 03 Feb 2015 18:11:17 GMT
# ignite-164 : org.gridgain.grid.GridConfiguration -> org.apache.ignite.configuration.IgniteConfiguration,
org.gridgain.grid.cache.GridCacheConfiguration -> org.apache.ignite.cache.CacheConfiguration,
org.gridgain.grid.cache.store.jdbc.GridCacheJdbcBlobStore -> org.apache.ignite.cache.store.jdbc.CacheJdbcBlobStore


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

Branch: refs/heads/ignite-164
Commit: aa74616e0268e3d6e7a68a9e26faca8d35e87e5f
Parents: e5e71c4
Author: Artem SHutak <ashutak@gridgain.com>
Authored: Tue Feb 3 21:11:01 2015 +0300
Committer: Artem SHutak <ashutak@gridgain.com>
Committed: Tue Feb 3 21:11:01 2015 +0300

----------------------------------------------------------------------
 .../core/src/main/java/org/apache/ignite/IgnitePortables.java    | 2 +-
 modules/core/src/main/java/org/apache/ignite/Ignition.java       | 2 +-
 .../org/apache/ignite/cache/store/jdbc/CacheJdbcBlobStore.java   | 2 +-
 .../src/main/java/org/apache/ignite/cluster/ClusterNode.java     | 2 +-
 .../org/apache/ignite/fs/IgniteFsGroupDataBlocksKeyMapper.java   | 2 +-
 .../org/apache/ignite/internal/util/GridConfigurationFinder.java | 2 +-
 .../src/main/java/org/apache/ignite/lifecycle/LifecycleBean.java | 2 +-
 .../main/java/org/apache/ignite/marshaller/IgniteMarshaller.java | 2 +-
 .../org/apache/ignite/marshaller/jdk/IgniteJdkMarshaller.java    | 2 +-
 .../ignite/marshaller/optimized/IgniteOptimizedMarshaller.java   | 2 +-
 .../ignite/spi/authentication/noop/NoopAuthenticationSpi.java    | 2 +-
 .../apache/ignite/spi/checkpoint/cache/CacheCheckpointSpi.java   | 4 ++--
 .../org/apache/ignite/spi/checkpoint/jdbc/JdbcCheckpointSpi.java | 2 +-
 .../ignite/spi/checkpoint/sharedfs/SharedFsCheckpointSpi.java    | 2 +-
 .../ignite/spi/collision/fifoqueue/FifoQueueCollisionSpi.java    | 2 +-
 .../apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java | 2 +-
 .../org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java     | 2 +-
 .../ignite/spi/eventstorage/memory/MemoryEventStorageSpi.java    | 2 +-
 .../ignite/spi/securesession/noop/NoopSecureSessionSpi.java      | 2 +-
 .../org/apache/ignite/spi/swapspace/file/FileSwapSpaceSpi.java   | 2 +-
 .../org/apache/ignite/startup/cmdline/CommandLineStartup.java    | 2 +-
 .../spring/src/main/java/org/apache/ignite/IgniteSpringBean.java | 2 +-
 .../java/org/apache/ignite/cache/spring/SpringCacheManager.java  | 2 +-
 .../org/apache/ignite/spi/deployment/uri/UriDeploymentSpi.java   | 2 +-
 24 files changed, 25 insertions(+), 25 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aa74616e/modules/core/src/main/java/org/apache/ignite/IgnitePortables.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/IgnitePortables.java b/modules/core/src/main/java/org/apache/ignite/IgnitePortables.java
index e852fdf..d571dc6 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgnitePortables.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgnitePortables.java
@@ -258,7 +258,7 @@ import java.util.Date;
  * like so:
  * <pre name=code class=xml>
  * ...
- * &lt;bean class="org.gridgain.grid.cache.GridCacheConfiguration"&gt;
+ * &lt;bean class="org.apache.ignite.cache.CacheConfiguration"&gt;
  *     ...
  *     &lt;property name="queryConfiguration"&gt;
  *         &lt;bean class="CacheQueryConfiguration"&gt;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aa74616e/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 f49ff4b..9f98b49 100644
--- a/modules/core/src/main/java/org/apache/ignite/Ignition.java
+++ b/modules/core/src/main/java/org/apache/ignite/Ignition.java
@@ -56,7 +56,7 @@ import java.util.*;
  * example below configures a grid instance with additional user attributes
  * (see {@link org.apache.ignite.cluster.ClusterNode#attributes()}) and specifies a grid
name:
  * <pre name="code" class="xml">
- * &lt;bean id="grid.cfg" class="org.gridgain.grid.GridConfiguration"&gt;
+ * &lt;bean id="grid.cfg" class="org.apache.ignite.configuration.IgniteConfiguration"&gt;
  *     ...
  *     &lt;property name="gridName" value="grid"/&gt;
  *     &lt;property name="userAttributes"&gt;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aa74616e/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheJdbcBlobStore.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheJdbcBlobStore.java
b/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheJdbcBlobStore.java
index be927e9..a3efb70 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheJdbcBlobStore.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheJdbcBlobStore.java
@@ -73,7 +73,7 @@ import java.util.concurrent.atomic.*;
  * <pre name="code" class="xml">
  *     ...
  *     &lt;bean id=&quot;cache.jdbc.store&quot;
- *         class=&quot;org.gridgain.grid.cache.store.jdbc.GridCacheJdbcBlobStore&quot;&gt;
+ *         class=&quot;org.apache.ignite.cache.store.jdbc.CacheJdbcBlobStore&quot;&gt;
  *         &lt;property name=&quot;connectionUrl&quot; value=&quot;jdbc:h2:mem:&quot;/&gt;
  *         &lt;property name=&quot;createTableQuery&quot;
  *             value=&quot;create table if not exists ENTRIES (key other, val other)&quot;/&gt;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aa74616e/modules/core/src/main/java/org/apache/ignite/cluster/ClusterNode.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cluster/ClusterNode.java b/modules/core/src/main/java/org/apache/ignite/cluster/ClusterNode.java
index 52f1131..eb4a69b 100644
--- a/modules/core/src/main/java/org/apache/ignite/cluster/ClusterNode.java
+++ b/modules/core/src/main/java/org/apache/ignite/cluster/ClusterNode.java
@@ -41,7 +41,7 @@ import java.util.*;
  * {@link org.apache.ignite.configuration.IgniteConfiguration#getUserAttributes()} method
to initialize your custom
  * node attributes at startup. Here is an example of how to assign an attribute to a node
at startup:
  * <pre name="code" class="xml">
- * &lt;bean id="grid.cfg" class="org.gridgain.grid.GridConfiguration">
+ * &lt;bean id="grid.cfg" class="org.apache.ignite.configuration.IgniteConfiguration">
  *     ...
  *     &lt;property name="userAttributes">
  *         &lt;map>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aa74616e/modules/core/src/main/java/org/apache/ignite/fs/IgniteFsGroupDataBlocksKeyMapper.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/fs/IgniteFsGroupDataBlocksKeyMapper.java
b/modules/core/src/main/java/org/apache/ignite/fs/IgniteFsGroupDataBlocksKeyMapper.java
index 8ac62a3..1a8bc7c 100644
--- a/modules/core/src/main/java/org/apache/ignite/fs/IgniteFsGroupDataBlocksKeyMapper.java
+++ b/modules/core/src/main/java/org/apache/ignite/fs/IgniteFsGroupDataBlocksKeyMapper.java
@@ -41,7 +41,7 @@ import org.apache.ignite.internal.util.typedef.internal.*;
  * It is required for {@code GGFS} data cache to be configured with this mapper. Here is
an
  * example of how it can be specified in XML configuration:
  * <pre name="code" class="xml">
- * &lt;bean id="cacheCfgBase" class="org.gridgain.grid.cache.GridCacheConfiguration"
abstract="true"&gt;
+ * &lt;bean id="cacheCfgBase" class="org.apache.ignite.cache.CacheConfiguration" abstract="true"&gt;
  *     ...
  *     &lt;property name="affinityMapper"&gt;
  *         &lt;bean class="org.apache.ignite.fs.IgniteFsGroupDataBlocksKeyMapper"&gt;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aa74616e/modules/core/src/main/java/org/apache/ignite/internal/util/GridConfigurationFinder.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridConfigurationFinder.java
b/modules/core/src/main/java/org/apache/ignite/internal/util/GridConfigurationFinder.java
index 5e1cb39..c3ca5e9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridConfigurationFinder.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridConfigurationFinder.java
@@ -122,7 +122,7 @@ public final class GridConfigurationFinder {
                         if (line.contains("http://www.springframework.org/schema/beans"))
                             springCfg = true;
 
-                        if (line.contains("class=\"org.gridgain.grid.GridConfiguration\""))
+                        if (line.contains("class=\"org.apache.ignite.configuration.IgniteConfiguration\""))
                             ggCfg = true;
 
                         if (springCfg && ggCfg)

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aa74616e/modules/core/src/main/java/org/apache/ignite/lifecycle/LifecycleBean.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/lifecycle/LifecycleBean.java b/modules/core/src/main/java/org/apache/ignite/lifecycle/LifecycleBean.java
index 71a005c..b4d2255 100644
--- a/modules/core/src/main/java/org/apache/ignite/lifecycle/LifecycleBean.java
+++ b/modules/core/src/main/java/org/apache/ignite/lifecycle/LifecycleBean.java
@@ -84,7 +84,7 @@ import org.apache.ignite.*;
  * </pre>
  * or from Spring XML configuration file as follows:
  * <pre name="code" class="xml">
- * &lt;bean id="grid.cfg" class="org.gridgain.grid.GridConfiguration"&gt;
+ * &lt;bean id="grid.cfg" class="org.apache.ignite.configuration.IgniteConfiguration"&gt;
  *    ...
  *    &lt;property name="lifecycleBeans"&gt;
  *       &lt;list&gt;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aa74616e/modules/core/src/main/java/org/apache/ignite/marshaller/IgniteMarshaller.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/IgniteMarshaller.java
b/modules/core/src/main/java/org/apache/ignite/marshaller/IgniteMarshaller.java
index 561704d..ff57702 100644
--- a/modules/core/src/main/java/org/apache/ignite/marshaller/IgniteMarshaller.java
+++ b/modules/core/src/main/java/org/apache/ignite/marshaller/IgniteMarshaller.java
@@ -51,7 +51,7 @@ import java.io.*;
  * <h2 class="header">Spring Example</h2>
  * GridMarshaller can be configured from Spring XML configuration file:
  * <pre name="code" class="xml">
- * &lt;bean id="grid.custom.cfg" class="org.gridgain.grid.GridConfiguration" singleton="true"&gt;
+ * &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;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aa74616e/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/IgniteJdkMarshaller.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/IgniteJdkMarshaller.java
b/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/IgniteJdkMarshaller.java
index 92c5a61..05efd92 100644
--- a/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/IgniteJdkMarshaller.java
+++ b/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/IgniteJdkMarshaller.java
@@ -46,7 +46,7 @@ import java.io.*;
  * <h2 class="header">Spring Example</h2>
  * GridJdkMarshaller can be configured from Spring XML configuration file:
  * <pre name="code" class="xml">
- * &lt;bean id="grid.custom.cfg" class="org.gridgain.grid.GridConfiguration" singleton="true"&gt;
+ * &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;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aa74616e/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/IgniteOptimizedMarshaller.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/IgniteOptimizedMarshaller.java
b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/IgniteOptimizedMarshaller.java
index e7efb5f..921e46d 100644
--- a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/IgniteOptimizedMarshaller.java
+++ b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/IgniteOptimizedMarshaller.java
@@ -61,7 +61,7 @@ import java.util.*;
  * <h2 class="header">Spring Example</h2>
  * GridOptimizedMarshaller can be configured from Spring XML configuration file:
  * <pre name="code" class="xml">
- * &lt;bean id="grid.custom.cfg" class="org.gridgain.grid.GridConfiguration" singleton="true"&gt;
+ * &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;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aa74616e/modules/core/src/main/java/org/apache/ignite/spi/authentication/noop/NoopAuthenticationSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/authentication/noop/NoopAuthenticationSpi.java
b/modules/core/src/main/java/org/apache/ignite/spi/authentication/noop/NoopAuthenticationSpi.java
index 4e4c129..bdbcd9e 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/authentication/noop/NoopAuthenticationSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/authentication/noop/NoopAuthenticationSpi.java
@@ -50,7 +50,7 @@ import org.apache.ignite.spi.authentication.*;
  * <h2 class="header">Spring Example</h2>
  * GridNoopAuthenticationSpi can be configured from Spring XML configuration file:
  * <pre name="code" class="xml">
- * &lt;bean id="grid.custom.cfg" class="org.gridgain.grid.GridConfiguration" singleton="true"&gt;
+ * &lt;bean id="grid.custom.cfg" class="org.apache.ignite.configuration.IgniteConfiguration"
singleton="true"&gt;
  *         ...
  *         &lt;property name="authenticationSpi"&gt;
  *             &lt;bean class="org.gridgain.grid.spi.authentication.noop.GridNoopAuthenticationSpi"/&gt;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aa74616e/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 fa6233a..4083cba 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
@@ -67,12 +67,12 @@ import static org.apache.ignite.events.IgniteEventType.*;
  * <h2 class="header">Spring Example</h2>
  * {@link CacheCheckpointSpi} can be configured from Spring XML configuration file:
  * <pre name="code" class="xml">
- * &lt;bean id="grid.custom.cfg" class="org.gridgain.grid.GridConfiguration" singleton="true"&gt;
+ * &lt;bean id="grid.custom.cfg" class="org.apache.ignite.configuration.IgniteConfiguration"
singleton="true"&gt;
  *     ...
  *         &lt;!-- Cache configuration. --&gt;
  *         &lt;property name=&quot;cacheConfiguration&quot;&gt;
  *             &lt;list&gt;
- *                 &lt;bean class=&quot;org.gridgain.grid.cache.GridCacheConfiguration&quot;&gt;
+ *                 &lt;bean class=&quot;org.apache.ignite.cache.CacheConfiguration&quot;&gt;
  *                     &lt;property name=&quot;name&quot; value=&quot;CACHE_NAME&quot;/&gt;
  *                 &lt;/bean&gt;
  *             &lt;/list&gt;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aa74616e/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 f53e926..daf19be 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
@@ -83,7 +83,7 @@ import java.text.*;
  * <h2 class="header">Spring Example</h2>
  * {@link JdbcCheckpointSpi} can be configured from Spring XML configuration file:
  * <pre name="code" class="xml">
- * &lt;bean id="grid.custom.cfg" class="org.gridgain.grid.GridConfiguration" singleton="true"&gt;
+ * &lt;bean id="grid.custom.cfg" class="org.apache.ignite.configuration.IgniteConfiguration"
singleton="true"&gt;
  *     ...
  *     &lt;property name="checkpointSpi"&gt;
  *         &lt;bean class="org.gridgain.grid.spi.checkpoint.jdbc.GridJdbcCheckpointSpi"&gt;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aa74616e/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 d967b4a..7d758dd 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
@@ -76,7 +76,7 @@ import java.util.*;
  * <h2 class="header">Spring Example</h2>
  * {@link SharedFsCheckpointSpi} can be configured from Spring XML configuration file:
  * <pre name="code" class="xml">
- * &lt;bean id="grid.custom.cfg" class="org.gridgain.grid.GridConfiguration" singleton="true"&gt;
+ * &lt;bean id="grid.custom.cfg" class="org.apache.ignite.configuration.IgniteConfiguration"
singleton="true"&gt;
  *     ...
  *     &lt;property name="checkpointSpi"&gt;
  *         &lt;bean class="org.gridgain.grid.spi.checkpoint.sharedfs.GridSharedFsCheckpointSpi"&gt;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aa74616e/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 dfc6fcf..b776f76 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
@@ -59,7 +59,7 @@ import java.util.*;
  * <h2 class="header">Spring Example</h2>
  * {@code GridFifoQueueCollisionSpi} can be configured from Spring XML configuration file:
  * <pre name="code" class="xml">
- * &lt;bean id="grid.custom.cfg" class="org.gridgain.grid.GridConfiguration" singleton="true"&gt;
+ * &lt;bean id="grid.custom.cfg" class="org.apache.ignite.configuration.IgniteConfiguration"
singleton="true"&gt;
  *       ...
  *       &lt;property name="collisionSpi"&gt;
  *           &lt;bean class="org.gridgain.grid.spi.collision.fifoqueue.GridFifoQueueCollisionSpi"&gt;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aa74616e/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 bfd8de1..ca93d4c 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
@@ -124,7 +124,7 @@ import static org.apache.ignite.events.IgniteEventType.*;
  * <h2 class="header">Spring Example</h2>
  * GridTcpCommunicationSpi can be configured from Spring XML configuration file:
  * <pre name="code" class="xml">
- * &lt;bean id="grid.custom.cfg" class="org.gridgain.grid.GridConfiguration" singleton="true"&gt;
+ * &lt;bean id="grid.custom.cfg" class="org.apache.ignite.configuration.IgniteConfiguration"
singleton="true"&gt;
  *         ...
  *         &lt;property name="communicationSpi"&gt;
  *             &lt;bean class="org.gridgain.grid.spi.communication.tcp.GridTcpCommunicationSpi"&gt;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aa74616e/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 9c1c17b..e1f3555 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
@@ -119,7 +119,7 @@ import static org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryStatusChe
  * <h2 class="header">Spring Example</h2>
  * GridTcpDiscoverySpi can be configured from Spring XML configuration file:
  * <pre name="code" class="xml">
- * &lt;bean id="grid.custom.cfg" class="org.gridgain.grid.GridConfiguration" singleton="true"&gt;
+ * &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.discovery.tcp.TcpDiscoverySpi"&gt;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aa74616e/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 f227445..5579474 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
@@ -73,7 +73,7 @@ import static org.apache.ignite.events.IgniteEventType.*;
  * <h2 class="header">Spring Example</h2>
  * GridMemoryEventStorageSpi can be configured from Spring XML configuration file:
  * <pre name="code" class="xml">
- * &lt;bean id="grid.custom.cfg" class="org.gridgain.grid.GridConfiguration" singleton="true"&gt;
+ * &lt;bean id="grid.custom.cfg" class="org.apache.ignite.configuration.IgniteConfiguration"
singleton="true"&gt;
  *         ...
  *         &lt;property name="discoverySpi"&gt;
  *             &lt;bean class="org.gridgain.grid.spi.eventStorage.memory.GridMemoryEventStorageSpi"&gt;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aa74616e/modules/core/src/main/java/org/apache/ignite/spi/securesession/noop/NoopSecureSessionSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/securesession/noop/NoopSecureSessionSpi.java
b/modules/core/src/main/java/org/apache/ignite/spi/securesession/noop/NoopSecureSessionSpi.java
index 9379dab..38abacf 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/securesession/noop/NoopSecureSessionSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/securesession/noop/NoopSecureSessionSpi.java
@@ -51,7 +51,7 @@ import java.util.*;
  * <h2 class="header">Spring Example</h2>
  * GridNoopSecureSessionSpi can be configured from Spring XML configuration file:
  * <pre name="code" class="xml">
- * &lt;bean id="grid.custom.cfg" class="org.gridgain.grid.GridConfiguration" singleton="true"&gt;
+ * &lt;bean id="grid.custom.cfg" class="org.apache.ignite.configuration.IgniteConfiguration"
singleton="true"&gt;
  *         ...
  *         &lt;property name="secureSessionSpi"&gt;
  *             &lt;bean class="org.gridgain.grid.spi.SecureSession.noop.GridNoopSecureSessionSpi"/&gt;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aa74616e/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 fd7048d..3a8b236 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
@@ -83,7 +83,7 @@ import static org.apache.ignite.events.IgniteEventType.*;
  * <h2 class="header">Spring Example</h2>
  * GridFileSwapSpaceSpi can be configured from Spring XML configuration file:
  * <pre name="code" class="xml">
- * &lt;bean id=&quot;grid.cfg&quot; class=&quot;org.gridgain.grid.GridConfiguration&quot;
scope=&quot;singleton&quot;&gt;
+ * &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.gridgain.grid.spi.swapspace.file.GridFileSwapSpaceSpi&quot;&gt;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aa74616e/modules/core/src/main/java/org/apache/ignite/startup/cmdline/CommandLineStartup.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/startup/cmdline/CommandLineStartup.java
b/modules/core/src/main/java/org/apache/ignite/startup/cmdline/CommandLineStartup.java
index 6c034e6..c414db1 100644
--- a/modules/core/src/main/java/org/apache/ignite/startup/cmdline/CommandLineStartup.java
+++ b/modules/core/src/main/java/org/apache/ignite/startup/cmdline/CommandLineStartup.java
@@ -167,7 +167,7 @@ public final class CommandLineStartup {
                     "                      Path can be absolute or relative to IGNITE_HOME.",
                     " ",
                     "Spring file should contain one bean definition of Java type",
-                    "'org.gridgain.grid.GridConfiguration'. Note that bean will be",
+                    "'org.apache.ignite.configuration.IgniteConfiguration'. Note that bean
will be",
                     "fetched by the type and its ID is not used.");
             }
         }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aa74616e/modules/spring/src/main/java/org/apache/ignite/IgniteSpringBean.java
----------------------------------------------------------------------
diff --git a/modules/spring/src/main/java/org/apache/ignite/IgniteSpringBean.java b/modules/spring/src/main/java/org/apache/ignite/IgniteSpringBean.java
index cb951d6..581ec48 100644
--- a/modules/spring/src/main/java/org/apache/ignite/IgniteSpringBean.java
+++ b/modules/spring/src/main/java/org/apache/ignite/IgniteSpringBean.java
@@ -51,7 +51,7 @@ import java.util.concurrent.*;
  * <pre name="code" class="xml">
  * &lt;bean id="mySpringBean" class="org.apache.ignite.GridSpringBean"&gt;
  *     &lt;property name="configuration"&gt;
- *         &lt;bean id="grid.cfg" class="org.gridgain.grid.GridConfiguration"&gt;
+ *         &lt;bean id="grid.cfg" class="org.apache.ignite.configuration.IgniteConfiguration"&gt;
  *             &lt;property name="gridName" value="mySpringGrid"/&gt;
  *         &lt;/bean&gt;
  *     &lt;/property&gt;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aa74616e/modules/spring/src/main/java/org/apache/ignite/cache/spring/SpringCacheManager.java
----------------------------------------------------------------------
diff --git a/modules/spring/src/main/java/org/apache/ignite/cache/spring/SpringCacheManager.java
b/modules/spring/src/main/java/org/apache/ignite/cache/spring/SpringCacheManager.java
index 74aa543..a0192cc 100644
--- a/modules/spring/src/main/java/org/apache/ignite/cache/spring/SpringCacheManager.java
+++ b/modules/spring/src/main/java/org/apache/ignite/cache/spring/SpringCacheManager.java
@@ -81,7 +81,7 @@ import java.util.*;
  *     &lt;-- Provide configuration bean. --&gt;
  *     &lt;bean id="cacheManager" class="org.apache.ignite.cache.spring.GridSpringCacheManager"&gt;
  *         &lt;property name="configuration"&gt;
- *             &lt;bean id="gridCfg" class="org.gridgain.grid.GridConfiguration"&gt;
+ *             &lt;bean id="gridCfg" class="org.apache.ignite.configuration.IgniteConfiguration"&gt;
  *                 ...
  *             &lt;/bean&gt;
  *         &lt;/property&gt;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aa74616e/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 4b46aa8..deb551e 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
@@ -282,7 +282,7 @@ import java.util.Map.*;
  * <h2 class="header">Spring Example</h2>
  * UriDeploymentSpi can be configured from Spring XML configuration file:
  * <pre name="code" class="xml">
- * &lt;bean id="grid.custom.cfg" class="org.gridgain.grid.GridConfiguration" singleton="true"&gt;
+ * &lt;bean id="grid.custom.cfg" class="org.apache.ignite.configuration.IgniteConfiguration"
singleton="true"&gt;
  *         ...
  *         &lt;property name="deploymentSpi"&gt;
  *             &lt;bean class="org.gridgain.grid.spi.deployment.uri.UriDeploymentSpi"&gt;


Mime
View raw message