# ignite-63

apache · Jan 22, 2015 · 21a8762 · 21a8762
1 parent 9babd5b
commit 21a8762
Show file tree

Hide file tree

Showing 43 changed files with 44 additions and 45 deletions.
diff --git a/...dht/preloader/GridDhtForceKeysFuture.java → ...dht/preloader/GridDhtForceKeysFuture.java b/...dht/preloader/GridDhtForceKeysFuture.java → ...dht/preloader/GridDhtForceKeysFuture.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.gridgain.grid.kernal.processors.cache.distributed.dht.preloader;
+package org.apache.ignite.internal.processors.cache.distributed.dht.preloader;
 
 import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;

diff --git a/...ht/preloader/GridDhtForceKeysRequest.java → ...ht/preloader/GridDhtForceKeysRequest.java b/...ht/preloader/GridDhtForceKeysRequest.java → ...ht/preloader/GridDhtForceKeysRequest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.gridgain.grid.kernal.processors.cache.distributed.dht.preloader;
+package org.apache.ignite.internal.processors.cache.distributed.dht.preloader;
 
 import org.apache.ignite.*;
 import org.apache.ignite.internal.*;

diff --git a/...t/preloader/GridDhtForceKeysResponse.java → ...t/preloader/GridDhtForceKeysResponse.java b/...t/preloader/GridDhtForceKeysResponse.java → ...t/preloader/GridDhtForceKeysResponse.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.gridgain.grid.kernal.processors.cache.distributed.dht.preloader;
+package org.apache.ignite.internal.processors.cache.distributed.dht.preloader;
 
 import org.apache.ignite.*;
 import org.apache.ignite.internal.*;

diff --git a/...loader/GridDhtPartitionDemandMessage.java → ...loader/GridDhtPartitionDemandMessage.java b/...loader/GridDhtPartitionDemandMessage.java → ...loader/GridDhtPartitionDemandMessage.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.gridgain.grid.kernal.processors.cache.distributed.dht.preloader;
+package org.apache.ignite.internal.processors.cache.distributed.dht.preloader;
 
 import org.apache.ignite.*;
 import org.apache.ignite.internal.*;

diff --git a/...preloader/GridDhtPartitionDemandPool.java → ...preloader/GridDhtPartitionDemandPool.java b/...preloader/GridDhtPartitionDemandPool.java → ...preloader/GridDhtPartitionDemandPool.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.gridgain.grid.kernal.processors.cache.distributed.dht.preloader;
+package org.apache.ignite.internal.processors.cache.distributed.dht.preloader;
 
 import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;

diff --git a/...preloader/GridDhtPartitionExchangeId.java → ...preloader/GridDhtPartitionExchangeId.java b/...preloader/GridDhtPartitionExchangeId.java → ...preloader/GridDhtPartitionExchangeId.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.gridgain.grid.kernal.processors.cache.distributed.dht.preloader;
+package org.apache.ignite.internal.processors.cache.distributed.dht.preloader;
 
 import org.apache.ignite.internal.util.typedef.internal.*;
 import org.apache.ignite.internal.util.tostring.*;

diff --git a/...ht/preloader/GridDhtPartitionFullMap.java → ...ht/preloader/GridDhtPartitionFullMap.java b/...ht/preloader/GridDhtPartitionFullMap.java → ...ht/preloader/GridDhtPartitionFullMap.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.gridgain.grid.kernal.processors.cache.distributed.dht.preloader;
+package org.apache.ignite.internal.processors.cache.distributed.dht.preloader;
 
 import org.apache.ignite.internal.util.typedef.internal.*;
 

diff --git a/...ed/dht/preloader/GridDhtPartitionMap.java → ...ed/dht/preloader/GridDhtPartitionMap.java b/...ed/dht/preloader/GridDhtPartitionMap.java → ...ed/dht/preloader/GridDhtPartitionMap.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.gridgain.grid.kernal.processors.cache.distributed.dht.preloader;
+package org.apache.ignite.internal.processors.cache.distributed.dht.preloader;
 
 import org.gridgain.grid.kernal.processors.cache.distributed.dht.*;
 import org.apache.ignite.internal.util.typedef.internal.*;

diff --git a/...loader/GridDhtPartitionSupplyMessage.java → ...loader/GridDhtPartitionSupplyMessage.java b/...loader/GridDhtPartitionSupplyMessage.java → ...loader/GridDhtPartitionSupplyMessage.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.gridgain.grid.kernal.processors.cache.distributed.dht.preloader;
+package org.apache.ignite.internal.processors.cache.distributed.dht.preloader;
 
 import org.apache.ignite.*;
 import org.apache.ignite.internal.*;

diff --git a/...preloader/GridDhtPartitionSupplyPool.java → ...preloader/GridDhtPartitionSupplyPool.java b/...preloader/GridDhtPartitionSupplyPool.java → ...preloader/GridDhtPartitionSupplyPool.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.gridgain.grid.kernal.processors.cache.distributed.dht.preloader;
+package org.apache.ignite.internal.processors.cache.distributed.dht.preloader;
 
 import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;

diff --git a/...der/GridDhtPartitionsAbstractMessage.java → ...der/GridDhtPartitionsAbstractMessage.java b/...der/GridDhtPartitionsAbstractMessage.java → ...der/GridDhtPartitionsAbstractMessage.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.gridgain.grid.kernal.processors.cache.distributed.dht.preloader;
+package org.apache.ignite.internal.processors.cache.distributed.dht.preloader;
 
 import org.gridgain.grid.kernal.processors.cache.*;
 import org.apache.ignite.internal.util.direct.*;

diff --git a/...ader/GridDhtPartitionsExchangeFuture.java → ...ader/GridDhtPartitionsExchangeFuture.java b/...ader/GridDhtPartitionsExchangeFuture.java → ...ader/GridDhtPartitionsExchangeFuture.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.gridgain.grid.kernal.processors.cache.distributed.dht.preloader;
+package org.apache.ignite.internal.processors.cache.distributed.dht.preloader;
 
 import org.apache.ignite.*;
 import org.apache.ignite.cache.affinity.*;

diff --git a/...eloader/GridDhtPartitionsFullMessage.java → ...eloader/GridDhtPartitionsFullMessage.java b/...eloader/GridDhtPartitionsFullMessage.java → ...eloader/GridDhtPartitionsFullMessage.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.gridgain.grid.kernal.processors.cache.distributed.dht.preloader;
+package org.apache.ignite.internal.processors.cache.distributed.dht.preloader;
 
 import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;

diff --git a/...oader/GridDhtPartitionsSingleMessage.java → ...oader/GridDhtPartitionsSingleMessage.java b/...oader/GridDhtPartitionsSingleMessage.java → ...oader/GridDhtPartitionsSingleMessage.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.gridgain.grid.kernal.processors.cache.distributed.dht.preloader;
+package org.apache.ignite.internal.processors.cache.distributed.dht.preloader;
 
 import org.apache.ignite.*;
 import org.apache.ignite.internal.*;

diff --git a/...oader/GridDhtPartitionsSingleRequest.java → ...oader/GridDhtPartitionsSingleRequest.java b/...oader/GridDhtPartitionsSingleRequest.java → ...oader/GridDhtPartitionsSingleRequest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.gridgain.grid.kernal.processors.cache.distributed.dht.preloader;
+package org.apache.ignite.internal.processors.cache.distributed.dht.preloader;
 
 import org.apache.ignite.internal.util.direct.*;
 import org.apache.ignite.internal.util.typedef.internal.*;

diff --git a/...buted/dht/preloader/GridDhtPreloader.java → ...buted/dht/preloader/GridDhtPreloader.java b/...buted/dht/preloader/GridDhtPreloader.java → ...buted/dht/preloader/GridDhtPreloader.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.gridgain.grid.kernal.processors.cache.distributed.dht.preloader;
+package org.apache.ignite.internal.processors.cache.distributed.dht.preloader;
 
 import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;

diff --git a/...reloader/GridDhtPreloaderAssignments.java → ...reloader/GridDhtPreloaderAssignments.java b/...reloader/GridDhtPreloaderAssignments.java → ...reloader/GridDhtPreloaderAssignments.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.gridgain.grid.kernal.processors.cache.distributed.dht.preloader;
+package org.apache.ignite.internal.processors.cache.distributed.dht.preloader;
 
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.internal.util.tostring.*;

diff --git a/.../main/java/org/apache/ignite/internal/util/direct/GridTcpCommunicationMessageAdapter.java b/.../main/java/org/apache/ignite/internal/util/direct/GridTcpCommunicationMessageAdapter.java
@@ -20,7 +20,7 @@
 import org.apache.ignite.internal.util.*;
 import org.apache.ignite.lang.*;
 import org.gridgain.grid.kernal.processors.cache.*;
-import org.gridgain.grid.kernal.processors.cache.distributed.dht.preloader.*;
+import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.*;
 import org.apache.ignite.internal.processors.clock.*;
 import org.apache.ignite.internal.util.nio.*;
 import org.jetbrains.annotations.*;

diff --git a/.../main/java/org/apache/ignite/internal/util/direct/GridTcpCommunicationMessageFactory.java b/.../main/java/org/apache/ignite/internal/util/direct/GridTcpCommunicationMessageFactory.java
@@ -26,7 +26,7 @@
 import org.gridgain.grid.kernal.processors.cache.distributed.*;
 import org.gridgain.grid.kernal.processors.cache.distributed.dht.*;
 import org.gridgain.grid.kernal.processors.cache.distributed.dht.atomic.*;
-import org.gridgain.grid.kernal.processors.cache.distributed.dht.preloader.*;
+import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.*;
 import org.apache.ignite.internal.processors.cache.distributed.near.*;
 import org.apache.ignite.internal.processors.cache.query.*;
 import org.apache.ignite.internal.processors.clock.*;

diff --git a/...rc/main/java/org/apache/ignite/internal/util/direct/GridTcpCommunicationMessageState.java b/...rc/main/java/org/apache/ignite/internal/util/direct/GridTcpCommunicationMessageState.java
@@ -20,7 +20,7 @@
 import org.apache.ignite.internal.util.*;
 import org.apache.ignite.lang.*;
 import org.gridgain.grid.kernal.processors.cache.*;
-import org.gridgain.grid.kernal.processors.cache.distributed.dht.preloader.*;
+import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.*;
 import org.apache.ignite.internal.processors.clock.*;
 import org.apache.ignite.internal.util.nio.*;
 import org.apache.ignite.internal.util.typedef.internal.*;

diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCache.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCache.java
@@ -23,7 +23,7 @@
 import org.apache.ignite.internal.*;
 import org.gridgain.grid.kernal.processors.cache.*;
 import org.gridgain.grid.kernal.processors.cache.distributed.dht.*;
-import org.gridgain.grid.kernal.processors.cache.distributed.dht.preloader.*;
+import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.*;
 import org.apache.ignite.internal.processors.cache.distributed.near.*;
 import org.apache.ignite.internal.util.lang.*;
 import org.apache.ignite.internal.util.typedef.internal.*;

diff --git a/...ain/java/org/gridgain/grid/kernal/processors/cache/GridCachePartitionExchangeManager.java b/...ain/java/org/gridgain/grid/kernal/processors/cache/GridCachePartitionExchangeManager.java
@@ -25,7 +25,7 @@
 import org.apache.ignite.thread.*;
 import org.apache.ignite.internal.managers.eventstorage.*;
 import org.gridgain.grid.kernal.processors.cache.distributed.dht.*;
-import org.gridgain.grid.kernal.processors.cache.distributed.dht.preloader.*;
+import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.*;
 import org.apache.ignite.internal.processors.timeout.*;
 import org.apache.ignite.internal.util.future.*;
 import org.apache.ignite.internal.util.tostring.*;
@@ -43,7 +43,7 @@
 import static java.util.concurrent.TimeUnit.*;
 import static org.apache.ignite.IgniteSystemProperties.*;
 import static org.apache.ignite.events.IgniteEventType.*;
-import static org.gridgain.grid.kernal.processors.cache.distributed.dht.preloader.GridDhtPreloader.*;
+import static org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPreloader.*;
 
 /**
  * Partition exchange manager.

diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCachePreloader.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCachePreloader.java
@@ -19,7 +19,7 @@
 
 import org.apache.ignite.*;
 import org.apache.ignite.lang.*;
-import org.gridgain.grid.kernal.processors.cache.distributed.dht.preloader.*;
+import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.*;
 import org.jetbrains.annotations.*;
 
 import java.util.*;

diff --git a/...re/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCachePreloaderAdapter.java b/...re/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCachePreloaderAdapter.java
@@ -20,7 +20,7 @@
 import org.apache.ignite.*;
 import org.apache.ignite.cache.affinity.*;
 import org.apache.ignite.lang.*;
-import org.gridgain.grid.kernal.processors.cache.distributed.dht.preloader.*;
+import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.*;
 import org.apache.ignite.internal.util.future.*;
 import org.jetbrains.annotations.*;
 

diff --git a/...rg/gridgain/grid/kernal/processors/cache/distributed/dht/GridClientPartitionTopology.java b/...rg/gridgain/grid/kernal/processors/cache/distributed/dht/GridClientPartitionTopology.java
@@ -21,7 +21,7 @@
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.internal.util.*;
 import org.gridgain.grid.kernal.processors.cache.*;
-import org.gridgain.grid.kernal.processors.cache.distributed.dht.preloader.*;
+import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.*;
 import org.apache.ignite.internal.util.tostring.*;
 import org.apache.ignite.internal.util.typedef.*;
 import org.apache.ignite.internal.util.typedef.internal.*;

diff --git a/...g/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtAssignmentFetchFuture.java b/...g/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtAssignmentFetchFuture.java
@@ -21,7 +21,7 @@
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.internal.*;
 import org.gridgain.grid.kernal.processors.cache.*;
-import org.gridgain.grid.kernal.processors.cache.distributed.dht.preloader.*;
+import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.*;
 import org.apache.ignite.internal.util.future.*;
 import org.apache.ignite.internal.util.typedef.internal.*;
 import org.jetbrains.annotations.*;

diff --git a/...n/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtCacheAdapter.java b/...n/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtCacheAdapter.java
@@ -25,7 +25,7 @@
 import org.gridgain.grid.kernal.processors.cache.*;
 import org.gridgain.grid.kernal.processors.cache.distributed.*;
 import org.gridgain.grid.kernal.processors.cache.distributed.dht.colocated.*;
-import org.gridgain.grid.kernal.processors.cache.distributed.dht.preloader.*;
+import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.*;
 import org.apache.ignite.internal.processors.cache.distributed.near.*;
 import org.apache.ignite.internal.util.future.*;
 import org.apache.ignite.internal.util.lang.*;

diff --git a/...java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtLocalPartition.java b/...java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtLocalPartition.java
@@ -21,7 +21,7 @@
 import org.apache.ignite.internal.util.*;
 import org.apache.ignite.lang.*;
 import org.gridgain.grid.kernal.processors.cache.*;
-import org.gridgain.grid.kernal.processors.cache.distributed.dht.preloader.*;
+import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.*;
 import org.apache.ignite.internal.util.future.*;
 import org.apache.ignite.internal.util.lang.*;
 import org.apache.ignite.internal.util.tostring.*;

diff --git a/...a/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtPartitionTopology.java b/...a/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtPartitionTopology.java
@@ -19,7 +19,7 @@
 
 import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;
-import org.gridgain.grid.kernal.processors.cache.distributed.dht.preloader.*;
+import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.*;
 import org.apache.ignite.internal.util.tostring.*;
 import org.jetbrains.annotations.*;
 

diff --git a/...g/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java b/...g/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java
@@ -21,7 +21,7 @@
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.internal.util.*;
 import org.gridgain.grid.kernal.processors.cache.*;
-import org.gridgain.grid.kernal.processors.cache.distributed.dht.preloader.*;
+import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.*;
 import org.apache.ignite.internal.util.tostring.*;
 import org.apache.ignite.internal.util.typedef.*;
 import org.apache.ignite.internal.util.typedef.internal.*;

diff --git a/...idgain/grid/kernal/processors/cache/distributed/dht/GridDhtTransactionalCacheAdapter.java b/...idgain/grid/kernal/processors/cache/distributed/dht/GridDhtTransactionalCacheAdapter.java
@@ -25,7 +25,7 @@
 import org.apache.ignite.transactions.*;
 import org.gridgain.grid.kernal.processors.cache.*;
 import org.gridgain.grid.kernal.processors.cache.distributed.*;
-import org.gridgain.grid.kernal.processors.cache.distributed.dht.preloader.*;
+import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.*;
 import org.apache.ignite.internal.processors.cache.distributed.near.*;
 import org.apache.ignite.internal.processors.cache.transactions.*;
 import org.apache.ignite.internal.util.future.*;

diff --git a/.../org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java b/.../org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
@@ -27,7 +27,7 @@
 import org.apache.ignite.internal.managers.communication.*;
 import org.gridgain.grid.kernal.processors.cache.*;
 import org.gridgain.grid.kernal.processors.cache.distributed.dht.*;
-import org.gridgain.grid.kernal.processors.cache.distributed.dht.preloader.*;
+import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.*;
 import org.apache.ignite.internal.processors.cache.distributed.near.*;
 import org.apache.ignite.internal.processors.cache.dr.*;
 import org.apache.ignite.internal.processors.cache.transactions.*;

diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridStartupMain.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridStartupMain.java
@@ -30,7 +30,7 @@ public class GridStartupMain {
      * @throws Exception If failed.
      */
     public static void main(String[] args) throws Exception {
-        //resetLog4j("org.gridgain.grid.kernal.processors.cache.distributed.dht.preloader", Level.DEBUG, false, 0);
+        //resetLog4j("org.apache.ignite.internal.processors.cache.distributed.dht.preloader", Level.DEBUG, false, 0);
 
         //G.start("modules/tests/config/spring-multicache.xml");
         //G.start("examples/config/example-cache.xml");

diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridStartupTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridStartupTest.java
@@ -42,7 +42,7 @@ public GridStartupTest() {
      * @throws Exception If failed.
      */
     public void testStartup() throws Exception {
-        //resetLog4j("org.gridgain.grid.kernal.processors.cache.distributed.dht.preloader", Level.DEBUG, false, 0);
+        //resetLog4j("org.apache.ignite.internal.processors.cache.distributed.dht.preloader", Level.DEBUG, false, 0);
 
         //G.start("modules/tests/config/spring-multicache.xml");
         //G.start("examples/config/example-cache.xml");

diff --git a/...gain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtPreloadDelayedSelfTest.java b/...gain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtPreloadDelayedSelfTest.java
@@ -26,7 +26,7 @@
 import org.apache.ignite.events.*;
 import org.apache.ignite.internal.*;
 import org.apache.ignite.lang.*;
-import org.gridgain.grid.kernal.processors.cache.distributed.dht.preloader.*;
+import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.*;
 import org.apache.ignite.internal.processors.cache.distributed.near.*;
 import org.apache.ignite.spi.discovery.tcp.*;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.*;

diff --git a/...ain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtPreloadDisabledSelfTest.java b/...ain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtPreloadDisabledSelfTest.java
@@ -24,7 +24,7 @@
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.events.*;
 import org.apache.ignite.lang.*;
-import org.gridgain.grid.kernal.processors.cache.distributed.dht.preloader.*;
+import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.*;
 import org.apache.ignite.spi.discovery.tcp.*;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;

diff --git a/...ain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtPreloadMessageCountTest.java b/...ain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtPreloadMessageCountTest.java
@@ -24,7 +24,7 @@
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.spi.*;
 import org.apache.ignite.internal.managers.communication.*;
-import org.gridgain.grid.kernal.processors.cache.distributed.dht.preloader.*;
+import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.*;
 import org.apache.ignite.spi.communication.tcp.*;
 import org.apache.ignite.spi.discovery.tcp.*;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.*;

diff --git a/...gain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtPreloadOffHeapSelfTest.java b/...gain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtPreloadOffHeapSelfTest.java
@@ -18,7 +18,7 @@
 package org.gridgain.grid.kernal.processors.cache.distributed.dht;
 
 import org.apache.ignite.cache.*;
-import org.gridgain.grid.kernal.processors.cache.distributed.dht.preloader.*;
+import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.*;
 
 import static org.apache.ignite.cache.GridCacheMemoryMode.*;
 

diff --git a/...dgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtPreloadPutGetSelfTest.java b/...dgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtPreloadPutGetSelfTest.java
@@ -19,10 +19,9 @@
 
 import org.apache.ignite.*;
 import org.apache.ignite.cache.*;
-import org.apache.ignite.cache.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.lang.*;
-import org.gridgain.grid.kernal.processors.cache.distributed.dht.preloader.*;
+import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.*;
 import org.apache.ignite.spi.discovery.tcp.*;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;

diff --git a/...rg/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtPreloadSelfTest.java b/...rg/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtPreloadSelfTest.java
@@ -25,7 +25,7 @@
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.events.*;
 import org.apache.ignite.lang.*;
-import org.gridgain.grid.kernal.processors.cache.distributed.dht.preloader.*;
+import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.*;
 import org.apache.ignite.spi.discovery.tcp.*;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;

diff --git a/...in/grid/kernal/processors/cache/distributed/dht/GridCacheDhtPreloadStartStopSelfTest.java b/...in/grid/kernal/processors/cache/distributed/dht/GridCacheDhtPreloadStartStopSelfTest.java
@@ -25,7 +25,7 @@
 import org.apache.ignite.internal.*;
 import org.apache.ignite.lang.*;
 import org.gridgain.grid.kernal.processors.cache.*;
-import org.gridgain.grid.kernal.processors.cache.distributed.dht.preloader.*;
+import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.*;
 import org.apache.ignite.spi.discovery.tcp.*;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;

diff --git a/...java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtTestUtils.java b/...java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtTestUtils.java
@@ -23,7 +23,7 @@
 import org.apache.ignite.cache.affinity.consistenthash.*;
 import org.apache.ignite.cluster.*;
 import org.gridgain.grid.kernal.processors.cache.*;
-import org.gridgain.grid.kernal.processors.cache.distributed.dht.preloader.*;
+import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.*;
 import org.apache.ignite.internal.processors.cache.distributed.near.*;
 import org.apache.ignite.internal.util.typedef.*;
 import org.apache.ignite.internal.util.typedef.internal.*;

diff --git a/...id/kernal/processors/cache/distributed/dht/GridCachePartitionedPreloadEventsSelfTest.java b/...id/kernal/processors/cache/distributed/dht/GridCachePartitionedPreloadEventsSelfTest.java
@@ -23,7 +23,7 @@
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.events.*;
 import org.gridgain.grid.kernal.processors.cache.distributed.*;
-import org.gridgain.grid.kernal.processors.cache.distributed.dht.preloader.*;
+import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.*;
 import org.apache.ignite.internal.util.typedef.*;
 
 import java.util.*;