ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [48/51] [abbrv] incubator-ignite git commit: # ignite-164 : [core] rest of org.gridgain.grid -> org.apache.ignite renaming (part 1)
Date Wed, 04 Feb 2015 12:34:43 GMT
# ignite-164 : [core] rest of org.gridgain.grid -> org.apache.ignite renaming (part 1)


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

Branch: refs/heads/ignite-164
Commit: fc1724a1c4cc04cca98f67026ca2659231df765b
Parents: f777c26
Author: Artem SHutak <ashutak@gridgain.com>
Authored: Wed Feb 4 14:34:37 2015 +0300
Committer: Artem SHutak <ashutak@gridgain.com>
Committed: Wed Feb 4 14:34:37 2015 +0300

----------------------------------------------------------------------
 .../org/apache/ignite/internal/IgnitionEx.java  |   2 +-
 .../discovery/GridDiscoveryManager.java         |   2 +-
 .../ignite/internal/util/IgniteUtils.java       |  14 +--
 .../ignite/logger/java/IgniteJavaLogger.java    |   4 +-
 .../noop/NoopAuthenticationSpi.java             |   2 +-
 .../checkpoint/cache/CacheCheckpointSpi.java    |   2 +-
 .../spi/checkpoint/jdbc/JdbcCheckpointSpi.java  |   2 +-
 .../sharedfs/SharedFsCheckpointSpi.java         |   2 +-
 .../fifoqueue/FifoQueueCollisionSpi.java        |   2 +-
 .../jobstealing/JobStealingCollisionSpi.java    |   2 +-
 .../PriorityQueueCollisionSpi.java              |   2 +-
 .../communication/tcp/TcpCommunicationSpi.java  |   2 +-
 .../memory/MemoryEventStorageSpi.java           |   2 +-
 .../spi/failover/always/AlwaysFailoverSpi.java  |   2 +-
 .../jobstealing/JobStealingFailoverSpi.java     |  14 +--
 .../spi/failover/never/NeverFailoverSpi.java    |   2 +-
 .../adaptive/AdaptiveCpuLoadProbe.java          |   4 +-
 .../adaptive/AdaptiveJobCountLoadProbe.java     |   4 +-
 .../adaptive/AdaptiveLoadBalancingSpi.java      |   4 +-
 .../adaptive/AdaptiveLoadProbe.java             |   2 +-
 .../AdaptiveProcessingTimeLoadProbe.java        |   4 +-
 .../roundrobin/RoundRobinLoadBalancingSpi.java  |   2 +-
 .../WeightedRandomLoadBalancingSpi.java         |   2 +-
 .../noop/NoopSecureSessionSpi.java              |   2 +-
 .../spi/swapspace/file/FileSwapSpaceSpi.java    |   2 +-
 .../src/test/config/spring-cache-teststore.xml  |   2 +-
 .../internal/GridAffinityP2PSelfTest.java       |   4 +-
 .../GridCacheConcurrentTxMultiNodeTest.java     |   2 +-
 .../GridTcpCommunicationBenchmark.java          |  12 +--
 .../ignite/logger/java/GridJavaLoggerTest.java  |  65 ------------
 .../logger/java/IgniteJavaLoggerTest.java       |  65 ++++++++++++
 .../cache/CacheCheckpointSpiConfigSelfTest.java |  34 ++++++
 .../CacheCheckpointSpiSecondCacheSelfTest.java  | 106 +++++++++++++++++++
 .../cache/CacheCheckpointSpiSelfTest.java       |  29 +++++
 .../CacheCheckpointSpiStartStopSelfTest.java    |  34 ++++++
 .../GridCacheCheckpointSpiConfigSelfTest.java   |  34 ------
 ...idCacheCheckpointSpiSecondCacheSelfTest.java | 106 -------------------
 .../cache/GridCacheCheckpointSpiSelfTest.java   |  29 -----
 ...GridCacheCheckpointSpiStartStopSelfTest.java |  34 ------
 .../GridJdbcCheckpointSpiConfigSelfTest.java    |  77 --------------
 ...idJdbcCheckpointSpiCustomConfigSelfTest.java |  47 --------
 ...dJdbcCheckpointSpiDefaultConfigSelfTest.java |  45 --------
 .../GridJdbcCheckpointSpiStartStopSelfTest.java |  47 --------
 .../jdbc/JdbcCheckpointSpiConfigSelfTest.java   |  77 ++++++++++++++
 .../JdbcCheckpointSpiCustomConfigSelfTest.java  |  47 ++++++++
 .../JdbcCheckpointSpiDefaultConfigSelfTest.java |  45 ++++++++
 .../JdbcCheckpointSpiStartStopSelfTest.java     |  47 ++++++++
 .../startup/servlet/GridServletLoaderTest.java  |   2 +-
 .../junits/logger/GridTestLog4jLogger.java      |   2 +-
 .../testsuites/IgniteLoggingSelfTestSuite.java  |   2 +-
 .../IgniteSpiCheckpointSelfTestSuite.java       |  16 +--
 51 files changed, 547 insertions(+), 547 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc1724a1/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 7380e15..0a1de43 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
@@ -1903,7 +1903,7 @@ public class IgnitionEx {
 
             try {
                 // Use reflection to avoid loading undesired classes.
-                Class helperCls = Class.forName("org.gridgain.grid.util.GridConfigurationHelper");
+                Class helperCls = Class.forName("org.apache.ignite.util.GridConfigurationHelper");
 
                 helperCls.getMethod("overrideConfiguration", IgniteConfiguration.class, Properties.class,
                     String.class, IgniteLogger.class).invoke(helperCls, myCfg, System.getProperties(), name, log);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc1724a1/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
index 7d51c17..d85d7b4 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
@@ -179,7 +179,7 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi> {
         // at java.lang.management.MemoryUsage.<init>(MemoryUsage.java:105)
         // at com.ibm.lang.management.MemoryMXBeanImpl.getNonHeapMemoryUsageImpl(Native Method)
         // at com.ibm.lang.management.MemoryMXBeanImpl.getNonHeapMemoryUsage(MemoryMXBeanImpl.java:143)
-        // at org.gridgain.grid.spi.metrics.jdk.GridJdkLocalMetricsSpi.getMetrics(GridJdkLocalMetricsSpi.java:242)
+        // at org.apache.ignite.spi.metrics.jdk.GridJdkLocalMetricsSpi.getMetrics(GridJdkLocalMetricsSpi.java:242)
         //
         // We so had to workaround this with exception handling, because we can not control classes from WebSphere.
         try {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc1724a1/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
index fc4de8c..1d25504 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
@@ -5742,18 +5742,18 @@ public abstract class IgniteUtils {
     }
 
     /**
-     * Replaces all occurrences of {@code org.gridgain.} with {@code o.g.},
-     * {@code org.gridgain.grid.} with {@code o.g.g.}, {@code org.gridgain.visor.} with {@code o.g.v.} and
-     * {@code org.gridgain.scalar.} with {@code o.g.s.}.
+     * Replaces all occurrences of {@code org.apache.ignite.} with {@code o.a.i.},
+     * {@code org.apache.ignite.internal.} with {@code o.a.i.i.}, {@code org.apache.ignite.visor.} with {@code o.a.i.v.} and
+     * {@code org.apache.ignite.scalar.} with {@code o.a.i.s.}.
      *
      * @param s String to replace in.
      * @return Replaces string.
      */
     public static String compact(String s) {
-        return s.replace("org.gridgain.grid.", "o.g.g.").
-            replace("org.gridgain.visor.", "o.g.v.").
-            replace("org.gridgain.scalar.", "o.g.s.").
-            replace("org.gridgain.", "o.g.");
+        return s.replace("org.apache.ignite.internal.", "o.a.i.i.").
+            replace("org.apache.ignite.visor.", "o.a.i.v.").
+            replace("org.apache.ignite.scalar.", "o.a.i.s.").
+            replace("org.apache.ignite.", "o.a.i.");
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc1724a1/modules/core/src/main/java/org/apache/ignite/logger/java/IgniteJavaLogger.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/logger/java/IgniteJavaLogger.java b/modules/core/src/main/java/org/apache/ignite/logger/java/IgniteJavaLogger.java
index 38c17e1..82624a8 100644
--- a/modules/core/src/main/java/org/apache/ignite/logger/java/IgniteJavaLogger.java
+++ b/modules/core/src/main/java/org/apache/ignite/logger/java/IgniteJavaLogger.java
@@ -40,7 +40,7 @@ import static org.apache.ignite.IgniteSystemProperties.*;
  * <pre name="code" class="xml">
  *      ...
  *      &lt;property name="gridLogger"&gt;
- *          &lt;bean class="org.gridgain.grid.logger.java.GridJavaLogger"&gt;
+ *          &lt;bean class="org.apache.ignite.logger.java.IgniteJavaLogger"&gt;
  *              &lt;constructor-arg type="java.util.logging.Logger"&gt;
  *                  &lt;bean class="java.util.logging.Logger"&gt;
  *                      &lt;constructor-arg type="java.lang.String" value="global"/&gt;
@@ -54,7 +54,7 @@ import static org.apache.ignite.IgniteSystemProperties.*;
  * <pre name="code" class="xml">
  *      ...
  *      &lt;property name="gridLogger"&gt;
- *          &lt;bean class="org.gridgain.grid.logger.java.GridJavaLogger"/&gt;
+ *          &lt;bean class="org.apache.ignite.logger.java.IgniteJavaLogger"/&gt;
  *      &lt;/property&gt;
  *      ...
  * </pre>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc1724a1/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 bdbcd9e..d80f44b 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
@@ -53,7 +53,7 @@ import org.apache.ignite.spi.authentication.*;
  * &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;
+ *             &lt;bean class="org.apache.ignite.spi.authentication.noop.NoopAuthenticationSpi"/&gt;
  *         &lt;/property&gt;
  *         ...
  * &lt;/bean&gt;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc1724a1/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 4083cba..20b258a 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
@@ -80,7 +80,7 @@ import static org.apache.ignite.events.IgniteEventType.*;
  *
  *         &lt;!-- SPI configuration. --&gt;
  *         &lt;property name=&quot;checkpointSpi&quot;&gt;
- *             &lt;bean class=&quot;org.gridgain.grid.spi.checkpoint.cache.GridCacheCheckpointSpi&quot;&gt;
+ *             &lt;bean class=&quot;org.apache.ignite.spi.checkpoint.cache.CacheCheckpointSpi&quot;&gt;
  *                 &lt;property name=&quot;cacheName&quot; value=&quot;CACHE_NAME&quot;/&gt;
  *             &lt;/bean&gt;
  *         &lt;/property&gt;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc1724a1/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 daf19be..ad2a49a 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
@@ -86,7 +86,7 @@ import java.text.*;
  * &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;
+ *         &lt;bean class="org.apache.ignite.spi.checkpoint.jdbc.JdbcCheckpointSpi"&gt;
  *             &lt;property name="dataSrc"&gt;&lt;ref bean="anyPooledDataSourceBean" /&gt;&lt;/property&gt;
  *             &lt;property name="checkpointTableName" value="GRID_CHECKPOINTS" /&gt;
  *             &lt;property name="user" value="test" /&gt;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc1724a1/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 7d758dd..b5ed8f0 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
@@ -79,7 +79,7 @@ import java.util.*;
  * &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;
+ *         &lt;bean class="org.apache.ignite.spi.checkpoint.sharedfs.GridSharedFsCheckpointSpi"&gt;
  *             &lt;!-- Change to shared directory path in your environment. --&gt;
  *             &lt;property name="directoryPaths"&gt;
  *                 &lt;list&gt;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc1724a1/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 b776f76..af80e2e 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
@@ -62,7 +62,7 @@ import java.util.*;
  * &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;
+ *           &lt;bean class="org.apache.ignite.spi.collision.fifoqueue.GridFifoQueueCollisionSpi"&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/fc1724a1/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 9264cc1..aa999b9 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
@@ -141,7 +141,7 @@ import static org.apache.ignite.events.IgniteEventType.*;
  * 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.gridgain.grid.spi.collision.jobstealing.GridJobStealingCollisionSpi"&gt;
+ *     &lt;bean class="org.apache.ignite.spi.collision.jobstealing.GridJobStealingCollisionSpi"&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/fc1724a1/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 a55e7258..92d3f32 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
@@ -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.gridgain.grid.spi.collision.priorityqueue.GridPriorityQueueCollisionSpi"&gt;
+ *     &lt;bean class="org.apache.ignite.spi.collision.priorityqueue.GridPriorityQueueCollisionSpi"&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/fc1724a1/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 ca93d4c..68c06ba 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
@@ -127,7 +127,7 @@ import static org.apache.ignite.events.IgniteEventType.*;
  * &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;
+ *             &lt;bean class="org.apache.ignite.spi.communication.tcp.GridTcpCommunicationSpi"&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/fc1724a1/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 5579474..0468f23 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
@@ -76,7 +76,7 @@ import static org.apache.ignite.events.IgniteEventType.*;
  * &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;
+ *             &lt;bean class="org.apache.ignite.spi.eventStorage.memory.GridMemoryEventStorageSpi"&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/fc1724a1/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 26ea7e0..02a577b 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
@@ -68,7 +68,7 @@ import java.util.*;
  * Here is an example of how to configure {@code GridAlwaysFailoverSpi} from Spring XML configuration file.
  * <pre name="code" class="xml">
  * &lt;property name="failoverSpi"&gt;
- *     &lt;bean class="org.gridgain.grid.spi.failover.always.GridAlwaysFailoverSpi"&gt;
+ *     &lt;bean class="org.apache.ignite.spi.failover.always.GridAlwaysFailoverSpi"&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/fc1724a1/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 32e47a2..0e3be1b 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
@@ -33,15 +33,15 @@ import static org.apache.ignite.spi.collision.jobstealing.JobStealingCollisionSp
  * Job stealing failover SPI needs to always be used in conjunction with
  * {@link org.apache.ignite.spi.collision.jobstealing.JobStealingCollisionSpi} SPI. When {@link org.apache.ignite.spi.collision.jobstealing.JobStealingCollisionSpi}
  * receives a <b>steal</b> request and rejects jobs so they can be routed to the
- * appropriate node, it is the responsibility of this {@code GridJobStealingFailoverSpi}
+ * appropriate node, it is the responsibility of this {@code JobStealingFailoverSpi}
  * SPI to make sure that the job is indeed re-routed to the node that has sent the initial
  * request to <b>steal</b> it.
  * <p>
- * {@code GridJobStealingFailoverSpi} knows where to route a job based on the
+ * {@code JobStealingFailoverSpi} knows where to route a job based on the
  * {@link org.apache.ignite.spi.collision.jobstealing.JobStealingCollisionSpi#THIEF_NODE_ATTR} job context attribute (see {@link org.apache.ignite.compute.ComputeJobContext}).
  * Prior to rejecting a job,  {@link org.apache.ignite.spi.collision.jobstealing.JobStealingCollisionSpi} will populate this
  * attribute with the ID of the node that wants to <b>steal</b> this job.
- * Then {@code GridJobStealingFailoverSpi} will read the value of this attribute and
+ * Then {@code JobStealingFailoverSpi} will read the value of this attribute and
  * route the job to the node specified.
  * <p>
  * If failure is caused by a node crash, and not by <b>steal</b> request, then this
@@ -56,9 +56,9 @@ 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 GridJobStealingFailoverSpi}.
+ * Here is a Java example on how to configure grid with {@code JobStealingFailoverSpi}.
  * <pre name="code" class="java">
- * GridJobStealingFailoverSpi spi = new GridJobStealingFailoverSpi();
+ * JobStealingFailoverSpi spi = new JobStealingFailoverSpi();
  *
  * // Override maximum failover attempts.
  * spi.setMaximumFailoverAttempts(5);
@@ -71,10 +71,10 @@ import static org.apache.ignite.spi.collision.jobstealing.JobStealingCollisionSp
  * // Starts grid.
  * G.start(cfg);
  </pre>
- * Here is an example of how to configure {@code GridJobStealingFailoverSpi} from Spring XML configuration file.
+ * Here is an example of how to configure {@code JobStealingFailoverSpi} from Spring XML configuration file.
  * <pre name="code" class="xml">
  * &lt;property name="failoverSpi"&gt;
- *     &lt;bean class="org.gridgain.grid.spi.failover.jobstealing.GridJobStealingFailoverSpi"&gt;
+ *     &lt;bean class="org.apache.ignite.spi.failover.jobstealing.JobStealingFailoverSpi"&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/fc1724a1/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 8a12443..410a7ac 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
@@ -51,7 +51,7 @@ import java.util.*;
  * Here is an example on how to configure grid with {@code GridNeverFailoverSpi} from Spring XML configuration file:
  * <pre name="code" class="xml">
  * &lt;property name="failoverSpi"&gt;
- *     &lt;bean class="org.gridgain.grid.spi.failover.never.GridNeverFailoverSpi"/&gt;
+ *     &lt;bean class="org.apache.ignite.spi.failover.never.GridNeverFailoverSpi"/&gt;
  * &lt;/property&gt;
  * </pre>
  * <p>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc1724a1/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/adaptive/AdaptiveCpuLoadProbe.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/adaptive/AdaptiveCpuLoadProbe.java b/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/adaptive/AdaptiveCpuLoadProbe.java
index fdb70cd..10ff19b 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/adaptive/AdaptiveCpuLoadProbe.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/adaptive/AdaptiveCpuLoadProbe.java
@@ -45,9 +45,9 @@ import org.apache.ignite.internal.util.typedef.internal.*;
  * Spring configuration file:
  * <pre name="code" class="xml">
  * &lt;property name="loadBalancingSpi"&gt;
- *     &lt;bean class="org.gridgain.grid.spi.loadBalancing.adaptive.GridAdaptiveLoadBalancingSpi"&gt;
+ *     &lt;bean class="org.apache.ignite.spi.loadBalancing.adaptive.GridAdaptiveLoadBalancingSpi"&gt;
  *         &lt;property name="loadProbe"&gt;
- *             &lt;bean class="org.gridgain.grid.spi.loadBalancing.adaptive.GridAdaptiveCpuLoadProbe"&gt;
+ *             &lt;bean class="org.apache.ignite.spi.loadBalancing.adaptive.GridAdaptiveCpuLoadProbe"&gt;
  *                 &lt;property name="useAverage" value="true"/&gt;
  *                 &lt;property name="useProcessors" value="true"/&gt;
  *                 &lt;property name="processorCoefficient" value="0.9"/&gt;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc1724a1/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/adaptive/AdaptiveJobCountLoadProbe.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/adaptive/AdaptiveJobCountLoadProbe.java b/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/adaptive/AdaptiveJobCountLoadProbe.java
index 377aa3c..b3d98a8 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/adaptive/AdaptiveJobCountLoadProbe.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/adaptive/AdaptiveJobCountLoadProbe.java
@@ -31,9 +31,9 @@ import org.apache.ignite.internal.util.typedef.internal.*;
  * Spring configuration file:
  * <pre name="code" class="xml">
  * &lt;property name="loadBalancingSpi"&gt;
- *     &lt;bean class="org.gridgain.grid.spi.loadBalancing.adaptive.GridAdaptiveLoadBalancingSpi"&gt;
+ *     &lt;bean class="org.apache.ignite.spi.loadBalancing.adaptive.GridAdaptiveLoadBalancingSpi"&gt;
  *         &lt;property name="loadProbe"&gt;
- *             &lt;bean class="org.gridgain.grid.spi.loadBalancing.adaptive.GridAdaptiveJobCountLoadProbe"&gt;
+ *             &lt;bean class="org.apache.ignite.spi.loadBalancing.adaptive.GridAdaptiveJobCountLoadProbe"&gt;
  *                 &lt;property name="useAverage" value="true"/&gt;
  *             &lt;/bean&gt;
  *         &lt;/property&gt;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc1724a1/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 b4c8e62..61f1379 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
@@ -214,9 +214,9 @@ import static org.apache.ignite.events.IgniteEventType.*;
  * 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.gridgain.grid.spi.loadBalancing.adaptive.GridAdaptiveLoadBalancingSpi"&gt;
+ *     &lt;bean class="org.apache.ignite.spi.loadBalancing.adaptive.GridAdaptiveLoadBalancingSpi"&gt;
  *         &lt;property name="loadProbe"&gt;
- *             &lt;bean class="org.gridgain.grid.spi.loadBalancing.adaptive.GridAdaptiveProcessingTimeLoadProbe"&gt;
+ *             &lt;bean class="org.apache.ignite.spi.loadBalancing.adaptive.GridAdaptiveProcessingTimeLoadProbe"&gt;
  *                 &lt;constructor-arg value="false"/&gt;
  *             &lt;/bean&gt;
  *         &lt;/property&gt;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc1724a1/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/adaptive/AdaptiveLoadProbe.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/adaptive/AdaptiveLoadProbe.java b/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/adaptive/AdaptiveLoadProbe.java
index a5d31ad..7ac214f 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/adaptive/AdaptiveLoadProbe.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/adaptive/AdaptiveLoadProbe.java
@@ -65,7 +65,7 @@ import org.apache.ignite.cluster.*;
  * SPI:
  * <pre name="code" class="xml">
  * &lt;property name="loadBalancingSpi"&gt;
- *     &lt;bean class="org.gridgain.grid.spi.loadBalancing.adaptive.GridAdaptiveLoadBalancingSpi"&gt;
+ *     &lt;bean class="org.apache.ignite.spi.loadBalancing.adaptive.GridAdaptiveLoadBalancingSpi"&gt;
  *         &lt;property name="loadProbe"&gt;
  *             &lt;bean class="foo.bar.FooBarLoadProbe"&gt;
  *                 &lt;constructor-arg value="true"/&gt;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc1724a1/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/adaptive/AdaptiveProcessingTimeLoadProbe.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/adaptive/AdaptiveProcessingTimeLoadProbe.java b/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/adaptive/AdaptiveProcessingTimeLoadProbe.java
index 15e13fe..dfc646f 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/adaptive/AdaptiveProcessingTimeLoadProbe.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/adaptive/AdaptiveProcessingTimeLoadProbe.java
@@ -31,9 +31,9 @@ import org.apache.ignite.internal.util.typedef.internal.*;
  * Spring configuration file:
  * <pre name="code" class="xml">
  * &lt;property name="loadBalancingSpi"&gt;
- *     &lt;bean class="org.gridgain.grid.spi.loadBalancing.adaptive.GridAdaptiveLoadBalancingSpi"&gt;
+ *     &lt;bean class="org.apache.ignite.spi.loadBalancing.adaptive.GridAdaptiveLoadBalancingSpi"&gt;
  *         &lt;property name="loadProbe"&gt;
- *             &lt;bean class="org.gridgain.grid.spi.loadBalancing.adaptive.GridAdaptiveProcessingTimeLoadProbe"&gt;
+ *             &lt;bean class="org.apache.ignite.spi.loadBalancing.adaptive.GridAdaptiveProcessingTimeLoadProbe"&gt;
  *                 &lt;property name="useAverage" value="true"/&gt;
  *             &lt;/bean&gt;
  *         &lt;/property&gt;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc1724a1/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 53232da..e78d52c 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
@@ -148,7 +148,7 @@ import static org.apache.ignite.events.IgniteEventType.*;
  * Here is how you can configure {@code GridRandomLoadBalancingSpi} using Spring XML configuration:
  * <pre name="code" class="xml">
  * &lt;property name="loadBalancingSpi"&gt;
- *     &lt;bean class="org.gridgain.grid.spi.loadBalancing.roundrobin.GridRoundRobinLoadBalancingSpi"&gt;
+ *     &lt;bean class="org.apache.ignite.spi.loadBalancing.roundrobin.GridRoundRobinLoadBalancingSpi"&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/fc1724a1/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 b6f193b..31b6366 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
@@ -146,7 +146,7 @@ import static org.apache.ignite.events.IgniteEventType.*;
  * Here is how you can configure {@code GridRandomLoadBalancingSpi} using Spring XML configuration:
  * <pre name="code" class="xml">
  * &lt;property name="loadBalancingSpi"&gt;
- *     &lt;bean class="org.gridgain.grid.spi.loadBalancing.weightedrandom.GridWeightedRandomLoadBalancingSpi"&gt;
+ *     &lt;bean class="org.apache.ignite.spi.loadBalancing.weightedrandom.GridWeightedRandomLoadBalancingSpi"&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/fc1724a1/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 38abacf..fa0ca49 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
@@ -54,7 +54,7 @@ import java.util.*;
  * &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;
+ *             &lt;bean class="org.apache.ignite.spi.SecureSession.noop.GridNoopSecureSessionSpi"/&gt;
  *         &lt;/property&gt;
  *         ...
  * &lt;/bean&gt;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc1724a1/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 3a8b236..89d979f 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
@@ -86,7 +86,7 @@ import static org.apache.ignite.events.IgniteEventType.*;
  * &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;
+ *         &lt;bean class=&quot;org.apache.ignite.spi.swapspace.file.GridFileSwapSpaceSpi&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/fc1724a1/modules/core/src/test/config/spring-cache-teststore.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/config/spring-cache-teststore.xml b/modules/core/src/test/config/spring-cache-teststore.xml
index 7eee096..3ba7830 100644
--- a/modules/core/src/test/config/spring-cache-teststore.xml
+++ b/modules/core/src/test/config/spring-cache-teststore.xml
@@ -41,7 +41,7 @@
                 </property>
 
                 <property name="store">
-                    <bean class="org.gridgain.grid.cache.store.GridGeneratingTestStore"/>
+                    <bean class="org.apache.ignite.cache.store.GridGeneratingTestStore"/>
                 </property>
             </bean>
         </property>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc1724a1/modules/core/src/test/java/org/apache/ignite/internal/GridAffinityP2PSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridAffinityP2PSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridAffinityP2PSelfTest.java
index b678910..62bd2b0 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridAffinityP2PSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridAffinityP2PSelfTest.java
@@ -44,10 +44,10 @@ public class GridAffinityP2PSelfTest extends GridCommonAbstractTest {
     private static TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true);
 
     /** */
-    private static final String EXT_AFFINITY_MAPPER_CLS_NAME = "org.gridgain.grid.tests.p2p.GridExternalAffinityMapper";
+    private static final String EXT_AFFINITY_MAPPER_CLS_NAME = "org.apache.ignite.tests.p2p.GridExternalAffinityMapper";
 
     /** */
-    private static final String EXT_AFFINITY_CLS_NAME = "org.gridgain.grid.tests.p2p.GridExternalAffinity";
+    private static final String EXT_AFFINITY_CLS_NAME = "org.apache.ignite.tests.p2p.GridExternalAffinity";
 
     /** URL of classes. */
     private static final URL[] URLS;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc1724a1/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentTxMultiNodeTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentTxMultiNodeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentTxMultiNodeTest.java
index caa7875..471e041 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentTxMultiNodeTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentTxMultiNodeTest.java
@@ -127,7 +127,7 @@ public class GridCacheConcurrentTxMultiNodeTest extends GridCommonAbstractTest {
         c.setPeerClassLoadingEnabled(false);
 
         // Enable tracing.
-//        Logger.getLogger("org.gridgain.grid.kernal.processors.cache.GridCacheDgcManager.trace").setLevel(Level.DEBUG);
+//        Logger.getLogger("org.apache.ignite.kernal.processors.cache.GridCacheDgcManager.trace").setLevel(Level.DEBUG);
 
         return c;
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc1724a1/modules/core/src/test/java/org/apache/ignite/loadtests/communication/GridTcpCommunicationBenchmark.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/communication/GridTcpCommunicationBenchmark.java b/modules/core/src/test/java/org/apache/ignite/loadtests/communication/GridTcpCommunicationBenchmark.java
index 73561fe..0bb832e 100644
--- a/modules/core/src/test/java/org/apache/ignite/loadtests/communication/GridTcpCommunicationBenchmark.java
+++ b/modules/core/src/test/java/org/apache/ignite/loadtests/communication/GridTcpCommunicationBenchmark.java
@@ -17,14 +17,14 @@
 
 package org.apache.ignite.loadtests.communication;
 //
-//import org.gridgain.grid.*;
+//import org.apache.ignite.*;
 //import org.apache.ignite.lang.*;
 //import org.apache.ignite.lang.utils.*;
-//import org.gridgain.grid.spi.*;
-//import org.gridgain.grid.spi.communication.*;
-//import org.gridgain.grid.spi.communication.tcp.*;
-//import org.gridgain.grid.typedef.*;
-//import org.gridgain.grid.typedef.internal.*;
+//import org.apache.ignite.spi.*;
+//import org.apache.ignite.spi.communication.*;
+//import org.apache.ignite.spi.communication.tcp.*;
+//import org.apache.ignite.typedef.*;
+//import org.apache.ignite.typedef.internal.*;
 //import org.apache.ignite.testframework.*;
 //import org.apache.ignite.testframework.junits.*;
 //import org.apache.ignite.testframework.junits.spi.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc1724a1/modules/core/src/test/java/org/apache/ignite/logger/java/GridJavaLoggerTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/logger/java/GridJavaLoggerTest.java b/modules/core/src/test/java/org/apache/ignite/logger/java/GridJavaLoggerTest.java
deleted file mode 100644
index e10a264..0000000
--- a/modules/core/src/test/java/org/apache/ignite/logger/java/GridJavaLoggerTest.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.logger.java;
-
-import junit.framework.*;
-import org.apache.ignite.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.logger.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import java.util.*;
-
-/**
- * Java logger test.
- */
-@GridCommonTest(group = "Logger")
-public class GridJavaLoggerTest extends TestCase {
-    /** */
-    @SuppressWarnings({"FieldCanBeLocal"})
-    private IgniteLogger log;
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testLogInitialize() throws Exception {
-        U.setWorkDirectory(null, U.getGridGainHome());
-
-        log = new IgniteJavaLogger();
-
-        ((IgniteLoggerNodeIdAware)log).setNodeId(UUID.fromString("00000000-1111-2222-3333-444444444444"));
-
-        if (log.isDebugEnabled())
-            log.debug("This is 'debug' message.");
-
-        assert log.isInfoEnabled();
-
-        log.info("This is 'info' message.");
-        log.warning("This is 'warning' message.");
-        log.warning("This is 'warning' message.", new Exception("It's a test warning exception"));
-        log.error("This is 'error' message.");
-        log.error("This is 'error' message.", new Exception("It's a test error exception"));
-
-        assert log.getLogger(GridJavaLoggerTest.class.getName()) instanceof IgniteJavaLogger;
-
-        assert log.fileName() != null;
-
-        // Ensure we don't get pattern, only actual file name is allowed here.
-        assert !log.fileName().contains("%");
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc1724a1/modules/core/src/test/java/org/apache/ignite/logger/java/IgniteJavaLoggerTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/logger/java/IgniteJavaLoggerTest.java b/modules/core/src/test/java/org/apache/ignite/logger/java/IgniteJavaLoggerTest.java
new file mode 100644
index 0000000..676f78e
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/logger/java/IgniteJavaLoggerTest.java
@@ -0,0 +1,65 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.logger.java;
+
+import junit.framework.*;
+import org.apache.ignite.*;
+import org.apache.ignite.internal.util.typedef.internal.*;
+import org.apache.ignite.logger.*;
+import org.apache.ignite.testframework.junits.common.*;
+
+import java.util.*;
+
+/**
+ * Java logger test.
+ */
+@GridCommonTest(group = "Logger")
+public class IgniteJavaLoggerTest extends TestCase {
+    /** */
+    @SuppressWarnings({"FieldCanBeLocal"})
+    private IgniteLogger log;
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testLogInitialize() throws Exception {
+        U.setWorkDirectory(null, U.getGridGainHome());
+
+        log = new IgniteJavaLogger();
+
+        ((IgniteLoggerNodeIdAware)log).setNodeId(UUID.fromString("00000000-1111-2222-3333-444444444444"));
+
+        if (log.isDebugEnabled())
+            log.debug("This is 'debug' message.");
+
+        assert log.isInfoEnabled();
+
+        log.info("This is 'info' message.");
+        log.warning("This is 'warning' message.");
+        log.warning("This is 'warning' message.", new Exception("It's a test warning exception"));
+        log.error("This is 'error' message.");
+        log.error("This is 'error' message.", new Exception("It's a test error exception"));
+
+        assert log.getLogger(IgniteJavaLoggerTest.class.getName()) instanceof IgniteJavaLogger;
+
+        assert log.fileName() != null;
+
+        // Ensure we don't get pattern, only actual file name is allowed here.
+        assert !log.fileName().contains("%");
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc1724a1/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/cache/CacheCheckpointSpiConfigSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/cache/CacheCheckpointSpiConfigSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/cache/CacheCheckpointSpiConfigSelfTest.java
new file mode 100644
index 0000000..8fd5fd1
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/cache/CacheCheckpointSpiConfigSelfTest.java
@@ -0,0 +1,34 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.spi.checkpoint.cache;
+
+import org.apache.ignite.testframework.junits.spi.*;
+
+/**
+ * Grid cache checkpoint SPI config self test.
+ */
+@GridSpiTest(spi = CacheCheckpointSpi.class, group = "Checkpoint SPI")
+public class CacheCheckpointSpiConfigSelfTest extends GridSpiAbstractConfigTest<CacheCheckpointSpi> {
+    /**
+     * @throws Exception If failed.
+     */
+    public void testNegativeConfig() throws Exception {
+        checkNegativeSpiProperty(new CacheCheckpointSpi(), "cacheName", null);
+        checkNegativeSpiProperty(new CacheCheckpointSpi(), "cacheName", "");
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc1724a1/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/cache/CacheCheckpointSpiSecondCacheSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/cache/CacheCheckpointSpiSecondCacheSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/cache/CacheCheckpointSpiSecondCacheSelfTest.java
new file mode 100644
index 0000000..9432d1d
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/cache/CacheCheckpointSpiSecondCacheSelfTest.java
@@ -0,0 +1,106 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.spi.checkpoint.cache;
+
+import org.apache.ignite.cache.*;
+import org.apache.ignite.configuration.*;
+import org.apache.ignite.spi.discovery.tcp.*;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
+import org.apache.ignite.testframework.junits.common.*;
+
+import static org.apache.ignite.cache.CacheMode.*;
+import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
+
+/**
+ * Test for cache checkpoint SPI with second cache configured.
+ */
+public class CacheCheckpointSpiSecondCacheSelfTest extends GridCommonAbstractTest {
+    /** IP finder. */
+    private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true);
+
+    /** Data cache name. */
+    private static final String DATA_CACHE = null;
+
+    /** Checkpoints cache name. */
+    private static final String CP_CACHE = "checkpoints";
+
+    /** Starts grid. */
+    public CacheCheckpointSpiSecondCacheSelfTest() {
+        super(true);
+    }
+
+    /** {@inheritDoc} */
+    @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
+        IgniteConfiguration cfg = super.getConfiguration(gridName);
+
+        TcpDiscoverySpi disco = new TcpDiscoverySpi();
+
+        disco.setIpFinder(IP_FINDER);
+
+        cfg.setDiscoverySpi(disco);
+
+        CacheConfiguration cacheCfg1 = defaultCacheConfiguration();
+
+        cacheCfg1.setName(DATA_CACHE);
+        cacheCfg1.setCacheMode(REPLICATED);
+        cacheCfg1.setWriteSynchronizationMode(FULL_SYNC);
+
+        CacheConfiguration cacheCfg2 = defaultCacheConfiguration();
+
+        cacheCfg2.setName(CP_CACHE);
+        cacheCfg2.setCacheMode(REPLICATED);
+        cacheCfg2.setWriteSynchronizationMode(FULL_SYNC);
+
+        cfg.setCacheConfiguration(cacheCfg1, cacheCfg2);
+
+        CacheCheckpointSpi cp = new CacheCheckpointSpi();
+
+        cp.setCacheName(CP_CACHE);
+
+        cfg.setCheckpointSpi(cp);
+
+        return cfg;
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testSecondCachePutRemove() throws Exception {
+        GridCache<Integer, Integer> data = grid().cache(DATA_CACHE);
+        GridCache<Integer, String> cp = grid().cache(CP_CACHE);
+
+        assertTrue(data.putx(1, 1));
+        assertTrue(cp.putx(1, "1"));
+
+        Integer v = data.get(1);
+
+        assertNotNull(v);
+        assertEquals(Integer.valueOf(1), data.get(1));
+
+        assertTrue(data.removex(1));
+
+        assertNull(data.get(1));
+
+        assertTrue(data.isEmpty());
+
+        assertEquals(1, cp.size());
+        assertEquals("1", cp.get(1));
+
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc1724a1/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/cache/CacheCheckpointSpiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/cache/CacheCheckpointSpiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/cache/CacheCheckpointSpiSelfTest.java
new file mode 100644
index 0000000..ce934ec
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/cache/CacheCheckpointSpiSelfTest.java
@@ -0,0 +1,29 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.spi.checkpoint.cache;
+
+import org.apache.ignite.spi.checkpoint.*;
+import org.apache.ignite.testframework.junits.spi.*;
+
+/**
+ * Grid cache checkpoint SPI self test.
+ */
+@GridSpiTest(spi = CacheCheckpointSpi.class, group = "Checkpoint SPI")
+public class CacheCheckpointSpiSelfTest extends GridCheckpointSpiAbstractTest<CacheCheckpointSpi> {
+    // No-op.
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc1724a1/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/cache/CacheCheckpointSpiStartStopSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/cache/CacheCheckpointSpiStartStopSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/cache/CacheCheckpointSpiStartStopSelfTest.java
new file mode 100644
index 0000000..a95e072
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/cache/CacheCheckpointSpiStartStopSelfTest.java
@@ -0,0 +1,34 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.spi.checkpoint.cache;
+
+import org.apache.ignite.spi.*;
+import org.apache.ignite.testframework.junits.spi.*;
+
+/**
+ * Grid cache checkpoint SPI start stop self test.
+ */
+@GridSpiTest(spi = CacheCheckpointSpi.class, group = "Checkpoint SPI")
+public class CacheCheckpointSpiStartStopSelfTest extends GridSpiStartStopAbstractTest<CacheCheckpointSpi> {
+    /** {@inheritDoc} */
+    @Override protected void spiConfigure(CacheCheckpointSpi spi) throws Exception {
+        spi.setCacheName("test-checkpoints");
+
+        super.spiConfigure(spi);
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc1724a1/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/cache/GridCacheCheckpointSpiConfigSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/cache/GridCacheCheckpointSpiConfigSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/cache/GridCacheCheckpointSpiConfigSelfTest.java
deleted file mode 100644
index ba88945..0000000
--- a/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/cache/GridCacheCheckpointSpiConfigSelfTest.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.spi.checkpoint.cache;
-
-import org.apache.ignite.testframework.junits.spi.*;
-
-/**
- * Grid cache checkpoint SPI config self test.
- */
-@GridSpiTest(spi = CacheCheckpointSpi.class, group = "Checkpoint SPI")
-public class GridCacheCheckpointSpiConfigSelfTest extends GridSpiAbstractConfigTest<CacheCheckpointSpi> {
-    /**
-     * @throws Exception If failed.
-     */
-    public void testNegativeConfig() throws Exception {
-        checkNegativeSpiProperty(new CacheCheckpointSpi(), "cacheName", null);
-        checkNegativeSpiProperty(new CacheCheckpointSpi(), "cacheName", "");
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc1724a1/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/cache/GridCacheCheckpointSpiSecondCacheSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/cache/GridCacheCheckpointSpiSecondCacheSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/cache/GridCacheCheckpointSpiSecondCacheSelfTest.java
deleted file mode 100644
index 8bf28ca..0000000
--- a/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/cache/GridCacheCheckpointSpiSecondCacheSelfTest.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.spi.checkpoint.cache;
-
-import org.apache.ignite.cache.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
-
-/**
- * Test for cache checkpoint SPI with second cache configured.
- */
-public class GridCacheCheckpointSpiSecondCacheSelfTest extends GridCommonAbstractTest {
-    /** IP finder. */
-    private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true);
-
-    /** Data cache name. */
-    private static final String DATA_CACHE = null;
-
-    /** Checkpoints cache name. */
-    private static final String CP_CACHE = "checkpoints";
-
-    /** Starts grid. */
-    public GridCacheCheckpointSpiSecondCacheSelfTest() {
-        super(true);
-    }
-
-    /** {@inheritDoc} */
-    @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
-        IgniteConfiguration cfg = super.getConfiguration(gridName);
-
-        TcpDiscoverySpi disco = new TcpDiscoverySpi();
-
-        disco.setIpFinder(IP_FINDER);
-
-        cfg.setDiscoverySpi(disco);
-
-        CacheConfiguration cacheCfg1 = defaultCacheConfiguration();
-
-        cacheCfg1.setName(DATA_CACHE);
-        cacheCfg1.setCacheMode(REPLICATED);
-        cacheCfg1.setWriteSynchronizationMode(FULL_SYNC);
-
-        CacheConfiguration cacheCfg2 = defaultCacheConfiguration();
-
-        cacheCfg2.setName(CP_CACHE);
-        cacheCfg2.setCacheMode(REPLICATED);
-        cacheCfg2.setWriteSynchronizationMode(FULL_SYNC);
-
-        cfg.setCacheConfiguration(cacheCfg1, cacheCfg2);
-
-        CacheCheckpointSpi cp = new CacheCheckpointSpi();
-
-        cp.setCacheName(CP_CACHE);
-
-        cfg.setCheckpointSpi(cp);
-
-        return cfg;
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testSecondCachePutRemove() throws Exception {
-        GridCache<Integer, Integer> data = grid().cache(DATA_CACHE);
-        GridCache<Integer, String> cp = grid().cache(CP_CACHE);
-
-        assertTrue(data.putx(1, 1));
-        assertTrue(cp.putx(1, "1"));
-
-        Integer v = data.get(1);
-
-        assertNotNull(v);
-        assertEquals(Integer.valueOf(1), data.get(1));
-
-        assertTrue(data.removex(1));
-
-        assertNull(data.get(1));
-
-        assertTrue(data.isEmpty());
-
-        assertEquals(1, cp.size());
-        assertEquals("1", cp.get(1));
-
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc1724a1/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/cache/GridCacheCheckpointSpiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/cache/GridCacheCheckpointSpiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/cache/GridCacheCheckpointSpiSelfTest.java
deleted file mode 100644
index 64e57e3..0000000
--- a/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/cache/GridCacheCheckpointSpiSelfTest.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.spi.checkpoint.cache;
-
-import org.apache.ignite.spi.checkpoint.*;
-import org.apache.ignite.testframework.junits.spi.*;
-
-/**
- * Grid cache checkpoint SPI self test.
- */
-@GridSpiTest(spi = CacheCheckpointSpi.class, group = "Checkpoint SPI")
-public class GridCacheCheckpointSpiSelfTest extends GridCheckpointSpiAbstractTest<CacheCheckpointSpi> {
-    // No-op.
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc1724a1/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/cache/GridCacheCheckpointSpiStartStopSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/cache/GridCacheCheckpointSpiStartStopSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/cache/GridCacheCheckpointSpiStartStopSelfTest.java
deleted file mode 100644
index 7380f04..0000000
--- a/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/cache/GridCacheCheckpointSpiStartStopSelfTest.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.spi.checkpoint.cache;
-
-import org.apache.ignite.spi.*;
-import org.apache.ignite.testframework.junits.spi.*;
-
-/**
- * Grid cache checkpoint SPI start stop self test.
- */
-@GridSpiTest(spi = CacheCheckpointSpi.class, group = "Checkpoint SPI")
-public class GridCacheCheckpointSpiStartStopSelfTest extends GridSpiStartStopAbstractTest<CacheCheckpointSpi> {
-    /** {@inheritDoc} */
-    @Override protected void spiConfigure(CacheCheckpointSpi spi) throws Exception {
-        spi.setCacheName("test-checkpoints");
-
-        super.spiConfigure(spi);
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc1724a1/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/jdbc/GridJdbcCheckpointSpiConfigSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/jdbc/GridJdbcCheckpointSpiConfigSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/jdbc/GridJdbcCheckpointSpiConfigSelfTest.java
deleted file mode 100644
index 57733e4..0000000
--- a/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/jdbc/GridJdbcCheckpointSpiConfigSelfTest.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.spi.checkpoint.jdbc;
-
-import org.apache.ignite.testframework.junits.spi.*;
-import org.hsqldb.jdbc.*;
-
-import javax.sql.*;
-
-import static org.apache.ignite.spi.checkpoint.jdbc.JdbcCheckpointSpi.*;
-
-/**
- * Grid jdbc checkpoint SPI config self test.
- */
-@GridSpiTest(spi = JdbcCheckpointSpi.class, group = "Checkpoint SPI")
-public class GridJdbcCheckpointSpiConfigSelfTest extends GridSpiAbstractConfigTest<JdbcCheckpointSpi> {
-    /**
-     * @throws Exception If failed.
-     */
-    public void testNegativeConfig() throws Exception {
-        checkNegativeSpiProperty(new JdbcCheckpointSpi(), "dataSource", null);
-
-        DataSource ds = new jdbcDataSource();
-
-        JdbcCheckpointSpi spi = new JdbcCheckpointSpi();
-
-        spi.setDataSource(ds);
-
-        checkNegativeSpiProperty(spi, "checkpointTableName", null);
-        checkNegativeSpiProperty(spi, "checkpointTableName", "");
-
-        spi.setCheckpointTableName(DFLT_CHECKPOINT_TABLE_NAME);
-
-        checkNegativeSpiProperty(spi, "keyFieldName", null);
-        checkNegativeSpiProperty(spi, "keyFieldName", "");
-
-        spi.setKeyFieldName(DFLT_KEY_FIELD_NAME);
-
-        checkNegativeSpiProperty(spi, "keyFieldType", null);
-        checkNegativeSpiProperty(spi, "keyFieldType", "");
-
-        spi.setKeyFieldType(DFLT_KEY_FIELD_TYPE);
-
-        checkNegativeSpiProperty(spi, "valueFieldName", null);
-        checkNegativeSpiProperty(spi, "valueFieldName", "");
-
-        spi.setValueFieldName(DFLT_VALUE_FIELD_NAME);
-
-        checkNegativeSpiProperty(spi, "valueFieldType", null);
-        checkNegativeSpiProperty(spi, "valueFieldType", "");
-
-        spi.setValueFieldType(DFLT_VALUE_FIELD_TYPE);
-
-        checkNegativeSpiProperty(spi, "expireDateFieldName", null);
-        checkNegativeSpiProperty(spi, "expireDateFieldName", "");
-
-        spi.setExpireDateFieldName(DFLT_EXPIRE_DATE_FIELD_NAME);
-
-        checkNegativeSpiProperty(spi, "expireDateFieldType", null);
-        checkNegativeSpiProperty(spi, "expireDateFieldType", "");
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc1724a1/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/jdbc/GridJdbcCheckpointSpiCustomConfigSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/jdbc/GridJdbcCheckpointSpiCustomConfigSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/jdbc/GridJdbcCheckpointSpiCustomConfigSelfTest.java
deleted file mode 100644
index 24fb396..0000000
--- a/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/jdbc/GridJdbcCheckpointSpiCustomConfigSelfTest.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.spi.checkpoint.jdbc;
-
-import org.apache.ignite.spi.checkpoint.*;
-import org.apache.ignite.testframework.junits.spi.*;
-import org.hsqldb.jdbc.*;
-
-/**
- * Grid jdbc checkpoint SPI custom config self test.
- */
-@GridSpiTest(spi = JdbcCheckpointSpi.class, group = "Checkpoint SPI")
-public class GridJdbcCheckpointSpiCustomConfigSelfTest extends
-    GridCheckpointSpiAbstractTest<JdbcCheckpointSpi> {
-    /** {@inheritDoc} */
-    @Override protected void spiConfigure(JdbcCheckpointSpi spi) throws Exception {
-        jdbcDataSource ds = new jdbcDataSource();
-
-        ds.setDatabase("jdbc:hsqldb:mem:gg_test_" + getClass().getSimpleName());
-        ds.setUser("sa");
-        ds.setPassword("");
-
-        spi.setDataSource(ds);
-        spi.setCheckpointTableName("custom_config_checkpoints");
-        spi.setKeyFieldName("key");
-        spi.setValueFieldName("value");
-        spi.setValueFieldType("longvarbinary");
-        spi.setExpireDateFieldName("expire_date");
-
-        super.spiConfigure(spi);
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc1724a1/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/jdbc/GridJdbcCheckpointSpiDefaultConfigSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/jdbc/GridJdbcCheckpointSpiDefaultConfigSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/jdbc/GridJdbcCheckpointSpiDefaultConfigSelfTest.java
deleted file mode 100644
index b2e7e72..0000000
--- a/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/jdbc/GridJdbcCheckpointSpiDefaultConfigSelfTest.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.spi.checkpoint.jdbc;
-
-import org.apache.ignite.spi.checkpoint.*;
-import org.apache.ignite.testframework.junits.spi.*;
-import org.hsqldb.jdbc.*;
-
-/**
- * Grid jdbc checkpoint SPI default config self test.
- */
-@GridSpiTest(spi = JdbcCheckpointSpi.class, group = "Checkpoint SPI")
-public class GridJdbcCheckpointSpiDefaultConfigSelfTest extends
-    GridCheckpointSpiAbstractTest<JdbcCheckpointSpi> {
-    /** {@inheritDoc} */
-    @Override protected void spiConfigure(JdbcCheckpointSpi spi) throws Exception {
-        jdbcDataSource ds = new jdbcDataSource();
-
-        ds.setDatabase("jdbc:hsqldb:mem:gg_test_" + getClass().getSimpleName());
-        ds.setUser("sa");
-        ds.setPassword("");
-
-        spi.setDataSource(ds);
-
-        // Default BLOB type is not valid for hsqldb.
-        spi.setValueFieldType("longvarbinary");
-
-        super.spiConfigure(spi);
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc1724a1/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/jdbc/GridJdbcCheckpointSpiStartStopSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/jdbc/GridJdbcCheckpointSpiStartStopSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/jdbc/GridJdbcCheckpointSpiStartStopSelfTest.java
deleted file mode 100644
index 9088a27..0000000
--- a/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/jdbc/GridJdbcCheckpointSpiStartStopSelfTest.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.spi.checkpoint.jdbc;
-
-import org.apache.ignite.spi.*;
-import org.apache.ignite.testframework.junits.spi.*;
-import org.hsqldb.jdbc.*;
-
-/**
- * Grid jdbc checkpoint SPI start stop self test.
- */
-@GridSpiTest(spi = JdbcCheckpointSpi.class, group = "Checkpoint SPI")
-public class GridJdbcCheckpointSpiStartStopSelfTest
-    extends GridSpiStartStopAbstractTest<JdbcCheckpointSpi> {
-    /** {@inheritDoc} */
-    @Override protected void spiConfigure(JdbcCheckpointSpi spi) throws Exception {
-        jdbcDataSource ds = new jdbcDataSource();
-
-        ds.setDatabase("jdbc:hsqldb:mem:gg_test_" + getClass().getSimpleName());
-        ds.setUser("sa");
-        ds.setPassword("");
-
-        spi.setDataSource(ds);
-        spi.setCheckpointTableName("startstop_checkpoints");
-        spi.setKeyFieldName("key");
-        spi.setValueFieldName("value");
-        spi.setValueFieldType("longvarbinary");
-        spi.setExpireDateFieldName("expire_date");
-
-        super.spiConfigure(spi);
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc1724a1/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/jdbc/JdbcCheckpointSpiConfigSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/jdbc/JdbcCheckpointSpiConfigSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/jdbc/JdbcCheckpointSpiConfigSelfTest.java
new file mode 100644
index 0000000..2b005c2
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/jdbc/JdbcCheckpointSpiConfigSelfTest.java
@@ -0,0 +1,77 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.spi.checkpoint.jdbc;
+
+import org.apache.ignite.testframework.junits.spi.*;
+import org.hsqldb.jdbc.*;
+
+import javax.sql.*;
+
+import static org.apache.ignite.spi.checkpoint.jdbc.JdbcCheckpointSpi.*;
+
+/**
+ * Grid jdbc checkpoint SPI config self test.
+ */
+@GridSpiTest(spi = JdbcCheckpointSpi.class, group = "Checkpoint SPI")
+public class JdbcCheckpointSpiConfigSelfTest extends GridSpiAbstractConfigTest<JdbcCheckpointSpi> {
+    /**
+     * @throws Exception If failed.
+     */
+    public void testNegativeConfig() throws Exception {
+        checkNegativeSpiProperty(new JdbcCheckpointSpi(), "dataSource", null);
+
+        DataSource ds = new jdbcDataSource();
+
+        JdbcCheckpointSpi spi = new JdbcCheckpointSpi();
+
+        spi.setDataSource(ds);
+
+        checkNegativeSpiProperty(spi, "checkpointTableName", null);
+        checkNegativeSpiProperty(spi, "checkpointTableName", "");
+
+        spi.setCheckpointTableName(DFLT_CHECKPOINT_TABLE_NAME);
+
+        checkNegativeSpiProperty(spi, "keyFieldName", null);
+        checkNegativeSpiProperty(spi, "keyFieldName", "");
+
+        spi.setKeyFieldName(DFLT_KEY_FIELD_NAME);
+
+        checkNegativeSpiProperty(spi, "keyFieldType", null);
+        checkNegativeSpiProperty(spi, "keyFieldType", "");
+
+        spi.setKeyFieldType(DFLT_KEY_FIELD_TYPE);
+
+        checkNegativeSpiProperty(spi, "valueFieldName", null);
+        checkNegativeSpiProperty(spi, "valueFieldName", "");
+
+        spi.setValueFieldName(DFLT_VALUE_FIELD_NAME);
+
+        checkNegativeSpiProperty(spi, "valueFieldType", null);
+        checkNegativeSpiProperty(spi, "valueFieldType", "");
+
+        spi.setValueFieldType(DFLT_VALUE_FIELD_TYPE);
+
+        checkNegativeSpiProperty(spi, "expireDateFieldName", null);
+        checkNegativeSpiProperty(spi, "expireDateFieldName", "");
+
+        spi.setExpireDateFieldName(DFLT_EXPIRE_DATE_FIELD_NAME);
+
+        checkNegativeSpiProperty(spi, "expireDateFieldType", null);
+        checkNegativeSpiProperty(spi, "expireDateFieldType", "");
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc1724a1/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/jdbc/JdbcCheckpointSpiCustomConfigSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/jdbc/JdbcCheckpointSpiCustomConfigSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/jdbc/JdbcCheckpointSpiCustomConfigSelfTest.java
new file mode 100644
index 0000000..c4b4aa5
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/jdbc/JdbcCheckpointSpiCustomConfigSelfTest.java
@@ -0,0 +1,47 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.spi.checkpoint.jdbc;
+
+import org.apache.ignite.spi.checkpoint.*;
+import org.apache.ignite.testframework.junits.spi.*;
+import org.hsqldb.jdbc.*;
+
+/**
+ * Grid jdbc checkpoint SPI custom config self test.
+ */
+@GridSpiTest(spi = JdbcCheckpointSpi.class, group = "Checkpoint SPI")
+public class JdbcCheckpointSpiCustomConfigSelfTest extends
+    GridCheckpointSpiAbstractTest<JdbcCheckpointSpi> {
+    /** {@inheritDoc} */
+    @Override protected void spiConfigure(JdbcCheckpointSpi spi) throws Exception {
+        jdbcDataSource ds = new jdbcDataSource();
+
+        ds.setDatabase("jdbc:hsqldb:mem:gg_test_" + getClass().getSimpleName());
+        ds.setUser("sa");
+        ds.setPassword("");
+
+        spi.setDataSource(ds);
+        spi.setCheckpointTableName("custom_config_checkpoints");
+        spi.setKeyFieldName("key");
+        spi.setValueFieldName("value");
+        spi.setValueFieldType("longvarbinary");
+        spi.setExpireDateFieldName("expire_date");
+
+        super.spiConfigure(spi);
+    }
+}


Mime
View raw message