http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAffinityRoutingSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAffinityRoutingSelfTest.java
 
b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAffinityRoutingSelfTest.java
index dc10cde..c6a8a80 100644
--- 
a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAffinityRoutingSelfTest.java
+++ 
b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAffinityRoutingSelfTest.java
@@ -18,7 +18,6 @@ import org.apache.ignite.resources.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.cache.*;
 import org.gridgain.grid.cache.affinity.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.marshaller.optimized.*;
 import org.gridgain.grid.spi.discovery.tcp.*;
 import org.gridgain.grid.spi.discovery.tcp.ipfinder.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheGroupLockPutTask.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheGroupLockPutTask.java
 
b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheGroupLockPutTask.java
index 9ec119b..66a3fc3 100644
--- 
a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheGroupLockPutTask.java
+++ 
b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheGroupLockPutTask.java
@@ -16,7 +16,6 @@ import org.apache.ignite.lang.*;
 import org.apache.ignite.resources.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.cache.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.util.typedef.*;
 import org.jetbrains.annotations.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCachePutAllFailoverSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCachePutAllFailoverSelfTest.java
 
b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCachePutAllFailoverSelfTest.java
index b69b133..a06f4ff 100644
--- 
a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCachePutAllFailoverSelfTest.java
+++ 
b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCachePutAllFailoverSelfTest.java
@@ -9,7 +9,6 @@ import org.apache.ignite.lang.*;
 import org.apache.ignite.resources.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.cache.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.spi.*;
 import org.gridgain.grid.spi.discovery.tcp.*;
 import org.gridgain.grid.spi.discovery.tcp.ipfinder.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCachePutAllTask.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCachePutAllTask.java
 
b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCachePutAllTask.java
index 7dd8728..c697938 100644
--- 
a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCachePutAllTask.java
+++ 
b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCachePutAllTask.java
@@ -7,7 +7,6 @@ import org.apache.ignite.lang.*;
 import org.apache.ignite.resources.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.cache.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.util.typedef.*;
 import org.gridgain.grid.util.typedef.internal.*;
 import org.jetbrains.annotations.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheUtilsSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheUtilsSelfTest.java
 
b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheUtilsSelfTest.java
index 5247ddd..26b6618 100644
--- 
a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheUtilsSelfTest.java
+++ 
b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheUtilsSelfTest.java
@@ -9,7 +9,7 @@
 
 package org.gridgain.grid.kernal.processors.cache;
 
-import org.gridgain.grid.logger.*;
+import org.apache.ignite.*;
 import org.gridgain.grid.util.typedef.internal.*;
 import org.gridgain.testframework.*;
 import org.gridgain.testframework.junits.common.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheCountDownLatchSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheCountDownLatchSelfTest.java
 
b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheCountDownLatchSelfTest.java
index 0032d6e..d6f99d5 100644
--- 
a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheCountDownLatchSelfTest.java
+++ 
b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheCountDownLatchSelfTest.java
@@ -16,7 +16,6 @@ import org.apache.ignite.resources.*;
 import org.gridgain.grid.cache.*;
 import org.gridgain.grid.cache.datastructures.*;
 import org.gridgain.grid.kernal.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.spi.discovery.tcp.*;
 import org.gridgain.grid.spi.discovery.tcp.ipfinder.*;
 import org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheSequenceMultiNodeAbstractSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheSequenceMultiNodeAbstractSelfTest.java
 
b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheSequenceMultiNodeAbstractSelfTest.java
index f982456..0c7d0a2 100644
--- 
a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheSequenceMultiNodeAbstractSelfTest.java
+++ 
b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheSequenceMultiNodeAbstractSelfTest.java
@@ -15,7 +15,6 @@ import org.apache.ignite.lang.*;
 import org.apache.ignite.resources.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.cache.datastructures.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.spi.discovery.tcp.*;
 import org.gridgain.grid.spi.discovery.tcp.ipfinder.*;
 import org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtTestUtils.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtTestUtils.java
 
b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtTestUtils.java
index 5e6a84e..a54920b 100644
--- 
a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtTestUtils.java
+++ 
b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtTestUtils.java
@@ -18,7 +18,6 @@ import org.gridgain.grid.cache.affinity.consistenthash.*;
 import org.gridgain.grid.kernal.processors.cache.*;
 import org.gridgain.grid.kernal.processors.cache.distributed.dht.preloader.*;
 import org.gridgain.grid.kernal.processors.cache.distributed.near.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.util.typedef.*;
 import org.gridgain.grid.util.typedef.internal.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedAffinitySelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedAffinitySelfTest.java
 
b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedAffinitySelfTest.java
index 1afc9a4..2b7a816 100644
--- 
a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedAffinitySelfTest.java
+++ 
b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedAffinitySelfTest.java
@@ -19,7 +19,6 @@ import org.gridgain.grid.*;
 import org.gridgain.grid.cache.*;
 import org.gridgain.grid.cache.affinity.*;
 import org.gridgain.grid.cache.affinity.consistenthash.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.spi.discovery.tcp.*;
 import org.gridgain.grid.spi.discovery.tcp.ipfinder.*;
 import org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedMultiNodeCounterSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedMultiNodeCounterSelfTest.java
 
b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedMultiNodeCounterSelfTest.java
index 717eec1..9412262 100644
--- 
a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedMultiNodeCounterSelfTest.java
+++ 
b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedMultiNodeCounterSelfTest.java
@@ -20,7 +20,6 @@ import org.gridgain.grid.cache.affinity.*;
 import org.gridgain.grid.kernal.*;
 import org.gridgain.grid.kernal.processors.cache.*;
 import org.gridgain.grid.kernal.processors.cache.distributed.dht.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.spi.discovery.tcp.*;
 import org.gridgain.grid.spi.discovery.tcp.ipfinder.*;
 import org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadLifecycleSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadLifecycleSelfTest.java
 
b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadLifecycleSelfTest.java
index 83b334b..e5b768f 100644
--- 
a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadLifecycleSelfTest.java
+++ 
b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadLifecycleSelfTest.java
@@ -18,7 +18,6 @@ import org.gridgain.grid.*;
 import org.gridgain.grid.cache.*;
 import org.gridgain.grid.cache.query.*;
 import org.gridgain.grid.kernal.processors.cache.distributed.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.util.typedef.*;
 
 import java.util.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/test/java/org/gridgain/grid/kernal/processors/closure/GridClosureProcessorSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/closure/GridClosureProcessorSelfTest.java
 
b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/closure/GridClosureProcessorSelfTest.java
index b4e0960..e562a50 100644
--- 
a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/closure/GridClosureProcessorSelfTest.java
+++ 
b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/closure/GridClosureProcessorSelfTest.java
@@ -16,7 +16,6 @@ import org.apache.ignite.configuration.*;
 import org.apache.ignite.lang.*;
 import org.apache.ignite.resources.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.marshaller.optimized.*;
 import org.gridgain.grid.spi.discovery.tcp.*;
 import org.gridgain.grid.spi.discovery.tcp.ipfinder.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/test/java/org/gridgain/grid/kernal/processors/streamer/GridStreamerSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/streamer/GridStreamerSelfTest.java
 
b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/streamer/GridStreamerSelfTest.java
index 5a7f387..6b1fc7e 100644
--- 
a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/streamer/GridStreamerSelfTest.java
+++ 
b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/streamer/GridStreamerSelfTest.java
@@ -15,7 +15,6 @@ import org.apache.ignite.configuration.*;
 import org.apache.ignite.lang.*;
 import org.apache.ignite.resources.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.marshaller.optimized.*;
 import org.gridgain.grid.spi.discovery.tcp.*;
 import org.gridgain.grid.spi.discovery.tcp.ipfinder.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/test/java/org/gridgain/grid/loadtest/GridSingleExecutionTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/gridgain/grid/loadtest/GridSingleExecutionTest.java
 
b/modules/core/src/test/java/org/gridgain/grid/loadtest/GridSingleExecutionTest.java
index e618c38..c1dd2e0 100644
--- 
a/modules/core/src/test/java/org/gridgain/grid/loadtest/GridSingleExecutionTest.java
+++ 
b/modules/core/src/test/java/org/gridgain/grid/loadtest/GridSingleExecutionTest.java
@@ -16,7 +16,6 @@ import org.apache.ignite.resources.*;
 import org.apache.log4j.*;
 import org.apache.log4j.varia.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.util.typedef.*;
 import org.gridgain.grid.util.typedef.internal.*;
 import org.gridgain.testframework.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/test/java/org/gridgain/grid/logger/java/GridJavaLoggerTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/gridgain/grid/logger/java/GridJavaLoggerTest.java
 
b/modules/core/src/test/java/org/gridgain/grid/logger/java/GridJavaLoggerTest.java
index bb13226..0977cbf 100644
--- 
a/modules/core/src/test/java/org/gridgain/grid/logger/java/GridJavaLoggerTest.java
+++ 
b/modules/core/src/test/java/org/gridgain/grid/logger/java/GridJavaLoggerTest.java
@@ -10,6 +10,7 @@
 package org.gridgain.grid.logger.java;
 
 import junit.framework.*;
+import org.apache.ignite.*;
 import org.gridgain.grid.logger.*;
 import org.gridgain.grid.util.typedef.internal.*;
 import org.gridgain.testframework.junits.common.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/test/java/org/gridgain/grid/marshaller/GridMarshallerAbstractTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/gridgain/grid/marshaller/GridMarshallerAbstractTest.java
 
b/modules/core/src/test/java/org/gridgain/grid/marshaller/GridMarshallerAbstractTest.java
index 15e94db..7c70c2f 100644
--- 
a/modules/core/src/test/java/org/gridgain/grid/marshaller/GridMarshallerAbstractTest.java
+++ 
b/modules/core/src/test/java/org/gridgain/grid/marshaller/GridMarshallerAbstractTest.java
@@ -26,7 +26,6 @@ import org.gridgain.grid.kernal.processors.cache.affinity.*;
 import org.gridgain.grid.kernal.processors.cache.datastructures.*;
 import org.gridgain.grid.kernal.processors.service.*;
 import org.gridgain.grid.kernal.processors.streamer.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.marshaller.optimized.*;
 import org.gridgain.grid.p2p.*;
 import org.gridgain.grid.product.*;
@@ -491,7 +490,7 @@ public abstract class GridMarshallerAbstractTest extends 
GridCommonAbstractTest
     }
 
     /**
-     * Tests marshal {@link org.gridgain.grid.logger.IgniteLogger} instance.
+     * Tests marshal {@link org.apache.ignite.IgniteLogger} instance.
      *
      * @throws Exception If test failed.
      */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/test/java/org/gridgain/grid/marshaller/GridMarshallerResourceBean.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/gridgain/grid/marshaller/GridMarshallerResourceBean.java
 
b/modules/core/src/test/java/org/gridgain/grid/marshaller/GridMarshallerResourceBean.java
index fddfc8f..b328ba5 100644
--- 
a/modules/core/src/test/java/org/gridgain/grid/marshaller/GridMarshallerResourceBean.java
+++ 
b/modules/core/src/test/java/org/gridgain/grid/marshaller/GridMarshallerResourceBean.java
@@ -9,11 +9,11 @@
 
 package org.gridgain.grid.marshaller;
 
+import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.compute.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.kernal.managers.loadbalancer.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.logger.java.*;
 import org.gridgain.grid.marshaller.jdk.*;
 import org.gridgain.grid.thread.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PRemoteClassLoadersSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PRemoteClassLoadersSelfTest.java
 
b/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PRemoteClassLoadersSelfTest.java
index db70647..dda6316 100644
--- 
a/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PRemoteClassLoadersSelfTest.java
+++ 
b/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PRemoteClassLoadersSelfTest.java
@@ -15,7 +15,6 @@ import org.apache.ignite.compute.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.resources.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.testframework.*;
 import org.gridgain.testframework.junits.common.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PTestJob.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PTestJob.java 
b/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PTestJob.java
index eba4203..a95ea6c 100644
--- a/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PTestJob.java
+++ b/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PTestJob.java
@@ -9,10 +9,10 @@
 
 package org.gridgain.grid.p2p;
 
+import org.apache.ignite.*;
 import org.apache.ignite.compute.*;
 import org.apache.ignite.resources.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.logger.*;
 
 import java.io.*;
 import java.util.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PTestTask.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PTestTask.java 
b/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PTestTask.java
index 4d5a1c2..9cc1c00 100644
--- a/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PTestTask.java
+++ b/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PTestTask.java
@@ -9,12 +9,12 @@
 
 package org.gridgain.grid.p2p;
 
+import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.compute.*;
 import org.apache.ignite.compute.gridify.*;
 import org.apache.ignite.resources.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.logger.*;
 
 import java.util.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCancelSiblingsFromFutureSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCancelSiblingsFromFutureSelfTest.java
 
b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCancelSiblingsFromFutureSelfTest.java
index 9868ad7..3d31e81 100644
--- 
a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCancelSiblingsFromFutureSelfTest.java
+++ 
b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCancelSiblingsFromFutureSelfTest.java
@@ -14,7 +14,6 @@ import org.apache.ignite.compute.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.resources.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.spi.discovery.tcp.*;
 import org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.*;
 import org.gridgain.grid.util.typedef.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCancelSiblingsFromJobSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCancelSiblingsFromJobSelfTest.java
 
b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCancelSiblingsFromJobSelfTest.java
index b7ad671..93a3b68 100644
--- 
a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCancelSiblingsFromJobSelfTest.java
+++ 
b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCancelSiblingsFromJobSelfTest.java
@@ -15,7 +15,6 @@ import org.apache.ignite.configuration.*;
 import org.apache.ignite.lang.*;
 import org.apache.ignite.resources.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.spi.discovery.tcp.*;
 import org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.*;
 import org.gridgain.grid.util.typedef.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCancelSiblingsFromTaskSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCancelSiblingsFromTaskSelfTest.java
 
b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCancelSiblingsFromTaskSelfTest.java
index 5ed53a3..f659f57 100644
--- 
a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCancelSiblingsFromTaskSelfTest.java
+++ 
b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCancelSiblingsFromTaskSelfTest.java
@@ -15,7 +15,6 @@ import org.apache.ignite.configuration.*;
 import org.apache.ignite.lang.*;
 import org.apache.ignite.resources.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.spi.discovery.tcp.*;
 import org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.*;
 import org.gridgain.grid.util.typedef.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCollisionSpiSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCollisionSpiSelfTest.java
 
b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCollisionSpiSelfTest.java
index 905adae..5516360 100644
--- 
a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCollisionSpiSelfTest.java
+++ 
b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCollisionSpiSelfTest.java
@@ -15,7 +15,6 @@ import org.apache.ignite.configuration.*;
 import org.apache.ignite.lang.*;
 import org.apache.ignite.resources.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.spi.collision.*;
 import org.gridgain.grid.spi.collision.fifoqueue.*;
 import org.gridgain.grid.util.typedef.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/test/java/org/gridgain/grid/session/GridSessionFutureWaitJobAttributeSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionFutureWaitJobAttributeSelfTest.java
 
b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionFutureWaitJobAttributeSelfTest.java
index ebd9c35..86e165c 100644
--- 
a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionFutureWaitJobAttributeSelfTest.java
+++ 
b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionFutureWaitJobAttributeSelfTest.java
@@ -13,7 +13,6 @@ import org.apache.ignite.*;
 import org.apache.ignite.compute.*;
 import org.apache.ignite.resources.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.util.typedef.*;
 import org.gridgain.testframework.*;
 import org.gridgain.testframework.junits.common.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/test/java/org/gridgain/grid/session/GridSessionFutureWaitTaskAttributeSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionFutureWaitTaskAttributeSelfTest.java
 
b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionFutureWaitTaskAttributeSelfTest.java
index 052ea4f..7233d11 100644
--- 
a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionFutureWaitTaskAttributeSelfTest.java
+++ 
b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionFutureWaitTaskAttributeSelfTest.java
@@ -13,7 +13,6 @@ import org.apache.ignite.*;
 import org.apache.ignite.compute.*;
 import org.apache.ignite.resources.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.util.typedef.*;
 import org.gridgain.testframework.*;
 import org.gridgain.testframework.junits.common.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/test/java/org/gridgain/grid/session/GridSessionJobWaitTaskAttributeSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionJobWaitTaskAttributeSelfTest.java
 
b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionJobWaitTaskAttributeSelfTest.java
index cb2ec84..6f5752d 100644
--- 
a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionJobWaitTaskAttributeSelfTest.java
+++ 
b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionJobWaitTaskAttributeSelfTest.java
@@ -14,7 +14,6 @@ import org.apache.ignite.compute.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.resources.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.spi.discovery.tcp.*;
 import org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.*;
 import org.gridgain.grid.util.typedef.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/test/java/org/gridgain/grid/session/GridSessionLoadSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionLoadSelfTest.java
 
b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionLoadSelfTest.java
index f302aa9..28a66d4 100644
--- 
a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionLoadSelfTest.java
+++ 
b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionLoadSelfTest.java
@@ -15,7 +15,6 @@ import org.apache.ignite.compute.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.resources.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.util.typedef.internal.*;
 import org.gridgain.testframework.*;
 import org.gridgain.testframework.junits.common.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetFutureAttributeSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetFutureAttributeSelfTest.java
 
b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetFutureAttributeSelfTest.java
index ea2cc09..95329b9 100644
--- 
a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetFutureAttributeSelfTest.java
+++ 
b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetFutureAttributeSelfTest.java
@@ -14,7 +14,6 @@ import org.apache.ignite.compute.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.resources.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.spi.discovery.tcp.*;
 import org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.*;
 import org.gridgain.grid.util.typedef.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetFutureAttributeWaitListenerSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetFutureAttributeWaitListenerSelfTest.java
 
b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetFutureAttributeWaitListenerSelfTest.java
index a1c0ef8..c170143 100644
--- 
a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetFutureAttributeWaitListenerSelfTest.java
+++ 
b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetFutureAttributeWaitListenerSelfTest.java
@@ -14,7 +14,6 @@ import org.apache.ignite.compute.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.resources.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.spi.discovery.tcp.*;
 import org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.*;
 import org.gridgain.grid.util.typedef.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetJobAttributeOrderSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetJobAttributeOrderSelfTest.java
 
b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetJobAttributeOrderSelfTest.java
index 8145b2e..0aad252 100644
--- 
a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetJobAttributeOrderSelfTest.java
+++ 
b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetJobAttributeOrderSelfTest.java
@@ -14,7 +14,6 @@ import org.apache.ignite.cluster.*;
 import org.apache.ignite.compute.*;
 import org.apache.ignite.resources.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.testframework.junits.common.*;
 
 import java.io.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetJobAttributeSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetJobAttributeSelfTest.java
 
b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetJobAttributeSelfTest.java
index 98eb59a..3609139 100644
--- 
a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetJobAttributeSelfTest.java
+++ 
b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetJobAttributeSelfTest.java
@@ -14,7 +14,6 @@ import org.apache.ignite.compute.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.resources.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.spi.discovery.tcp.*;
 import org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.*;
 import org.gridgain.grid.util.typedef.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetJobAttributeWaitListenerSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetJobAttributeWaitListenerSelfTest.java
 
b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetJobAttributeWaitListenerSelfTest.java
index f4484aa..559e28d 100644
--- 
a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetJobAttributeWaitListenerSelfTest.java
+++ 
b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetJobAttributeWaitListenerSelfTest.java
@@ -14,7 +14,6 @@ import org.apache.ignite.compute.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.resources.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.spi.discovery.tcp.*;
 import org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.*;
 import org.gridgain.grid.util.typedef.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetTaskAttributeSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetTaskAttributeSelfTest.java
 
b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetTaskAttributeSelfTest.java
index 859ca33..549b7ba 100644
--- 
a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetTaskAttributeSelfTest.java
+++ 
b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetTaskAttributeSelfTest.java
@@ -13,7 +13,6 @@ import org.apache.ignite.*;
 import org.apache.ignite.compute.*;
 import org.apache.ignite.resources.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.util.typedef.*;
 import org.gridgain.testframework.*;
 import org.gridgain.testframework.junits.common.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/test/java/org/gridgain/grid/session/GridSessionTaskWaitJobAttributeSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionTaskWaitJobAttributeSelfTest.java
 
b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionTaskWaitJobAttributeSelfTest.java
index c651341..ceedd49 100644
--- 
a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionTaskWaitJobAttributeSelfTest.java
+++ 
b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionTaskWaitJobAttributeSelfTest.java
@@ -13,7 +13,6 @@ import org.apache.ignite.*;
 import org.apache.ignite.compute.*;
 import org.apache.ignite.resources.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.util.typedef.*;
 import org.gridgain.testframework.*;
 import org.gridgain.testframework.junits.common.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/test/java/org/gridgain/grid/session/GridSessionWaitAttributeSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionWaitAttributeSelfTest.java
 
b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionWaitAttributeSelfTest.java
index b1d5177..4971131 100644
--- 
a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionWaitAttributeSelfTest.java
+++ 
b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionWaitAttributeSelfTest.java
@@ -15,7 +15,6 @@ import org.apache.ignite.configuration.*;
 import org.apache.ignite.lang.*;
 import org.apache.ignite.resources.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.spi.discovery.tcp.*;
 import org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.*;
 import org.gridgain.grid.util.typedef.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/test/java/org/gridgain/grid/spi/GridTcpForwarder.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/gridgain/grid/spi/GridTcpForwarder.java 
b/modules/core/src/test/java/org/gridgain/grid/spi/GridTcpForwarder.java
index a5ceb3e..58a891b 100644
--- a/modules/core/src/test/java/org/gridgain/grid/spi/GridTcpForwarder.java
+++ b/modules/core/src/test/java/org/gridgain/grid/spi/GridTcpForwarder.java
@@ -9,7 +9,7 @@
 
 package org.gridgain.grid.spi;
 
-import org.gridgain.grid.logger.*;
+import org.apache.ignite.*;
 import org.gridgain.grid.util.typedef.internal.*;
 
 import java.io.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/test/java/org/gridgain/grid/util/GridStartupWithSpecifiedWorkDirectorySelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/gridgain/grid/util/GridStartupWithSpecifiedWorkDirectorySelfTest.java
 
b/modules/core/src/test/java/org/gridgain/grid/util/GridStartupWithSpecifiedWorkDirectorySelfTest.java
index 45132bd..bbb33ea 100644
--- 
a/modules/core/src/test/java/org/gridgain/grid/util/GridStartupWithSpecifiedWorkDirectorySelfTest.java
+++ 
b/modules/core/src/test/java/org/gridgain/grid/util/GridStartupWithSpecifiedWorkDirectorySelfTest.java
@@ -13,7 +13,6 @@ import junit.framework.*;
 import org.apache.ignite.*;
 import org.apache.ignite.configuration.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.logger.java.*;
 import org.gridgain.grid.spi.discovery.tcp.*;
 import org.gridgain.grid.spi.discovery.tcp.ipfinder.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/test/java/org/gridgain/grid/util/GridStartupWithUndefinedGridGainHomeSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/gridgain/grid/util/GridStartupWithUndefinedGridGainHomeSelfTest.java
 
b/modules/core/src/test/java/org/gridgain/grid/util/GridStartupWithUndefinedGridGainHomeSelfTest.java
index d3772f5..929ec71 100644
--- 
a/modules/core/src/test/java/org/gridgain/grid/util/GridStartupWithUndefinedGridGainHomeSelfTest.java
+++ 
b/modules/core/src/test/java/org/gridgain/grid/util/GridStartupWithUndefinedGridGainHomeSelfTest.java
@@ -12,7 +12,6 @@ import junit.framework.*;
 import org.apache.ignite.*;
 import org.apache.ignite.configuration.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.logger.java.*;
 import org.gridgain.grid.spi.discovery.tcp.*;
 import org.gridgain.grid.spi.discovery.tcp.ipfinder.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/test/java/org/gridgain/grid/util/tostring/GridToStringBuilderSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/gridgain/grid/util/tostring/GridToStringBuilderSelfTest.java
 
b/modules/core/src/test/java/org/gridgain/grid/util/tostring/GridToStringBuilderSelfTest.java
index 427f844..c85b5a6 100644
--- 
a/modules/core/src/test/java/org/gridgain/grid/util/tostring/GridToStringBuilderSelfTest.java
+++ 
b/modules/core/src/test/java/org/gridgain/grid/util/tostring/GridToStringBuilderSelfTest.java
@@ -9,7 +9,7 @@
 
 package org.gridgain.grid.util.tostring;
 
-import org.gridgain.grid.logger.*;
+import org.apache.ignite.*;
 import org.gridgain.grid.util.typedef.internal.*;
 import org.gridgain.testframework.junits.common.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheAbstractLoadTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheAbstractLoadTest.java
 
b/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheAbstractLoadTest.java
index 99da46c..2c4cad4 100644
--- 
a/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheAbstractLoadTest.java
+++ 
b/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheAbstractLoadTest.java
@@ -16,7 +16,6 @@ import org.apache.log4j.*;
 import org.apache.log4j.varia.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.cache.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.util.typedef.*;
 import org.gridgain.grid.util.typedef.internal.*;
 import org.gridgain.testframework.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/test/java/org/gridgain/loadtests/colocation/GridTestCacheStore.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/gridgain/loadtests/colocation/GridTestCacheStore.java
 
b/modules/core/src/test/java/org/gridgain/loadtests/colocation/GridTestCacheStore.java
index 85f3143..ef6e897 100644
--- 
a/modules/core/src/test/java/org/gridgain/loadtests/colocation/GridTestCacheStore.java
+++ 
b/modules/core/src/test/java/org/gridgain/loadtests/colocation/GridTestCacheStore.java
@@ -15,7 +15,6 @@ import org.apache.ignite.resources.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.cache.*;
 import org.gridgain.grid.cache.store.*;
-import org.gridgain.grid.logger.*;
 import org.jdk8.backport.*;
 
 import java.util.concurrent.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/test/java/org/gridgain/loadtests/direct/session/GridSessionLoadTestJob.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/gridgain/loadtests/direct/session/GridSessionLoadTestJob.java
 
b/modules/core/src/test/java/org/gridgain/loadtests/direct/session/GridSessionLoadTestJob.java
index eaa9b91..d95e0fa 100644
--- 
a/modules/core/src/test/java/org/gridgain/loadtests/direct/session/GridSessionLoadTestJob.java
+++ 
b/modules/core/src/test/java/org/gridgain/loadtests/direct/session/GridSessionLoadTestJob.java
@@ -9,10 +9,10 @@
 
 package org.gridgain.loadtests.direct.session;
 
+import org.apache.ignite.*;
 import org.apache.ignite.compute.*;
 import org.apache.ignite.resources.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.logger.*;
 
 import java.io.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/test/java/org/gridgain/loadtests/direct/session/GridSessionLoadTestTask.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/gridgain/loadtests/direct/session/GridSessionLoadTestTask.java
 
b/modules/core/src/test/java/org/gridgain/loadtests/direct/session/GridSessionLoadTestTask.java
index 9c8396c..459b32c 100644
--- 
a/modules/core/src/test/java/org/gridgain/loadtests/direct/session/GridSessionLoadTestTask.java
+++ 
b/modules/core/src/test/java/org/gridgain/loadtests/direct/session/GridSessionLoadTestTask.java
@@ -9,11 +9,11 @@
 
 package org.gridgain.loadtests.direct.session;
 
+import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.compute.*;
 import org.apache.ignite.resources.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.logger.*;
 
 import java.util.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/test/java/org/gridgain/loadtests/direct/stealing/GridStealingLoadTestJob.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/gridgain/loadtests/direct/stealing/GridStealingLoadTestJob.java
 
b/modules/core/src/test/java/org/gridgain/loadtests/direct/stealing/GridStealingLoadTestJob.java
index 49e25f8..91dac32 100644
--- 
a/modules/core/src/test/java/org/gridgain/loadtests/direct/stealing/GridStealingLoadTestJob.java
+++ 
b/modules/core/src/test/java/org/gridgain/loadtests/direct/stealing/GridStealingLoadTestJob.java
@@ -9,10 +9,10 @@
 
 package org.gridgain.loadtests.direct.stealing;
 
+import org.apache.ignite.*;
 import org.apache.ignite.compute.*;
 import org.apache.ignite.resources.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.logger.*;
 
 import java.io.*;
 import java.util.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/test/java/org/gridgain/loadtests/job/GridJobLoadTestJob.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/gridgain/loadtests/job/GridJobLoadTestJob.java 
b/modules/core/src/test/java/org/gridgain/loadtests/job/GridJobLoadTestJob.java
index e08a704..74ad52b 100644
--- 
a/modules/core/src/test/java/org/gridgain/loadtests/job/GridJobLoadTestJob.java
+++ 
b/modules/core/src/test/java/org/gridgain/loadtests/job/GridJobLoadTestJob.java
@@ -9,10 +9,10 @@
 
 package org.gridgain.loadtests.job;
 
+import org.apache.ignite.*;
 import org.apache.ignite.compute.*;
 import org.apache.ignite.resources.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.logger.*;
 
 import java.util.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/test/java/org/gridgain/loadtests/nio/GridNioBenchmarkTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/gridgain/loadtests/nio/GridNioBenchmarkTest.java
 
b/modules/core/src/test/java/org/gridgain/loadtests/nio/GridNioBenchmarkTest.java
index 8463046..16ed442 100644
--- 
a/modules/core/src/test/java/org/gridgain/loadtests/nio/GridNioBenchmarkTest.java
+++ 
b/modules/core/src/test/java/org/gridgain/loadtests/nio/GridNioBenchmarkTest.java
@@ -9,8 +9,8 @@
 
 package org.gridgain.loadtests.nio;
 
+import org.apache.ignite.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.util.typedef.*;
 import org.gridgain.grid.util.nio.*;
 import org.gridgain.grid.util.typedef.internal.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/test/java/org/gridgain/testframework/GridStringLogger.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/gridgain/testframework/GridStringLogger.java 
b/modules/core/src/test/java/org/gridgain/testframework/GridStringLogger.java
index 65e84c8..9a788fc 100644
--- 
a/modules/core/src/test/java/org/gridgain/testframework/GridStringLogger.java
+++ 
b/modules/core/src/test/java/org/gridgain/testframework/GridStringLogger.java
@@ -9,7 +9,7 @@
 
 package org.gridgain.testframework;
 
-import org.gridgain.grid.logger.*;
+import org.apache.ignite.*;
 import org.gridgain.grid.util.typedef.internal.*;
 import org.jetbrains.annotations.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/test/java/org/gridgain/testframework/GridTestSafeThreadFactory.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/gridgain/testframework/GridTestSafeThreadFactory.java
 
b/modules/core/src/test/java/org/gridgain/testframework/GridTestSafeThreadFactory.java
index cc24827..199153e 100644
--- 
a/modules/core/src/test/java/org/gridgain/testframework/GridTestSafeThreadFactory.java
+++ 
b/modules/core/src/test/java/org/gridgain/testframework/GridTestSafeThreadFactory.java
@@ -9,8 +9,8 @@
 
 package org.gridgain.testframework;
 
+import org.apache.ignite.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.util.typedef.*;
 import org.gridgain.grid.util.typedef.internal.*;
 import org.gridgain.grid.util.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/test/java/org/gridgain/testframework/GridTestUtils.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/gridgain/testframework/GridTestUtils.java 
b/modules/core/src/test/java/org/gridgain/testframework/GridTestUtils.java
index 7bb3f7c..c90b7df 100644
--- a/modules/core/src/test/java/org/gridgain/testframework/GridTestUtils.java
+++ b/modules/core/src/test/java/org/gridgain/testframework/GridTestUtils.java
@@ -21,7 +21,6 @@ import org.gridgain.grid.kernal.*;
 import org.gridgain.grid.kernal.processors.cache.*;
 import org.gridgain.grid.kernal.processors.cache.distributed.dht.*;
 import org.gridgain.grid.kernal.processors.cache.distributed.near.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.util.*;
 import org.gridgain.grid.util.future.*;
 import org.gridgain.grid.util.lang.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/test/java/org/gridgain/testframework/junits/GridAbstractTest.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/gridgain/testframework/junits/GridAbstractTest.java
 
b/modules/core/src/test/java/org/gridgain/testframework/junits/GridAbstractTest.java
index 3a02811..411e3b6 100644
--- 
a/modules/core/src/test/java/org/gridgain/testframework/junits/GridAbstractTest.java
+++ 
b/modules/core/src/test/java/org/gridgain/testframework/junits/GridAbstractTest.java
@@ -21,7 +21,6 @@ import org.gridgain.grid.cache.*;
 import org.gridgain.grid.kernal.*;
 import org.gridgain.grid.kernal.processors.license.*;
 import org.gridgain.grid.kernal.processors.resource.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.marshaller.*;
 import org.gridgain.grid.marshaller.jdk.*;
 import org.gridgain.grid.marshaller.optimized.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/test/java/org/gridgain/testframework/junits/GridTestKernalContext.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/gridgain/testframework/junits/GridTestKernalContext.java
 
b/modules/core/src/test/java/org/gridgain/testframework/junits/GridTestKernalContext.java
index 1e62e37..0a922bc 100644
--- 
a/modules/core/src/test/java/org/gridgain/testframework/junits/GridTestKernalContext.java
+++ 
b/modules/core/src/test/java/org/gridgain/testframework/junits/GridTestKernalContext.java
@@ -9,10 +9,10 @@
 
 package org.gridgain.testframework.junits;
 
+import org.apache.ignite.*;
 import org.apache.ignite.configuration.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.kernal.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.util.typedef.internal.*;
 
 import java.util.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/test/java/org/gridgain/testframework/junits/GridTestResources.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/gridgain/testframework/junits/GridTestResources.java
 
b/modules/core/src/test/java/org/gridgain/testframework/junits/GridTestResources.java
index c6cf9f2..98b0bc8 100644
--- 
a/modules/core/src/test/java/org/gridgain/testframework/junits/GridTestResources.java
+++ 
b/modules/core/src/test/java/org/gridgain/testframework/junits/GridTestResources.java
@@ -9,10 +9,10 @@
 
 package org.gridgain.testframework.junits;
 
+import org.apache.ignite.*;
 import org.apache.ignite.resources.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.kernal.processors.resource.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.marshaller.*;
 import org.gridgain.grid.marshaller.optimized.*;
 import org.gridgain.grid.thread.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/test/java/org/gridgain/testframework/junits/logger/GridTestLog4jLogger.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/test/java/org/gridgain/testframework/junits/logger/GridTestLog4jLogger.java
 
b/modules/core/src/test/java/org/gridgain/testframework/junits/logger/GridTestLog4jLogger.java
index 5a10edf..5c4a179 100644
--- 
a/modules/core/src/test/java/org/gridgain/testframework/junits/logger/GridTestLog4jLogger.java
+++ 
b/modules/core/src/test/java/org/gridgain/testframework/junits/logger/GridTestLog4jLogger.java
@@ -9,6 +9,7 @@
 
 package org.gridgain.testframework.junits.logger;
 
+import org.apache.ignite.*;
 import org.apache.ignite.lang.*;
 import org.apache.log4j.*;
 import org.apache.log4j.varia.*;
@@ -422,13 +423,13 @@ public class GridTestLog4jLogger extends 
GridMetadataAwareAdapter implements Ign
     }
 
     /**
-     * Gets {@link org.gridgain.grid.logger.IgniteLogger} wrapper around log4j 
logger for the given
+     * Gets {@link org.apache.ignite.IgniteLogger} wrapper around log4j logger 
for the given
      * category. If category is {@code null}, then root logger is returned. If
      * category is an instance of {@link Class} then {@code 
(Class)ctgr).getName()}
      * is used as category name.
      *
      * @param ctgr {@inheritDoc}
-     * @return {@link org.gridgain.grid.logger.IgniteLogger} wrapper around 
log4j logger.
+     * @return {@link org.apache.ignite.IgniteLogger} wrapper around log4j 
logger.
      */
     @Override public GridTestLog4jLogger getLogger(Object ctgr) {
         return new GridTestLog4jLogger(ctgr == null ? Logger.getRootLogger() :

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/extdata/p2p/src/main/java/org/gridgain/grid/tests/p2p/GridP2PAwareTestUserResource.java
----------------------------------------------------------------------
diff --git 
a/modules/extdata/p2p/src/main/java/org/gridgain/grid/tests/p2p/GridP2PAwareTestUserResource.java
 
b/modules/extdata/p2p/src/main/java/org/gridgain/grid/tests/p2p/GridP2PAwareTestUserResource.java
index fe5d374..18f6733 100644
--- 
a/modules/extdata/p2p/src/main/java/org/gridgain/grid/tests/p2p/GridP2PAwareTestUserResource.java
+++ 
b/modules/extdata/p2p/src/main/java/org/gridgain/grid/tests/p2p/GridP2PAwareTestUserResource.java
@@ -12,7 +12,6 @@ package org.gridgain.grid.tests.p2p;
 import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.resources.*;
-import org.gridgain.grid.logger.*;
 
 /**
  * User resource, that increases node-local counters

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/extdata/p2p/src/main/java/org/gridgain/grid/tests/p2p/GridP2PTestTaskExternalPath1.java
----------------------------------------------------------------------
diff --git 
a/modules/extdata/p2p/src/main/java/org/gridgain/grid/tests/p2p/GridP2PTestTaskExternalPath1.java
 
b/modules/extdata/p2p/src/main/java/org/gridgain/grid/tests/p2p/GridP2PTestTaskExternalPath1.java
index 8b90731..44ea809 100644
--- 
a/modules/extdata/p2p/src/main/java/org/gridgain/grid/tests/p2p/GridP2PTestTaskExternalPath1.java
+++ 
b/modules/extdata/p2p/src/main/java/org/gridgain/grid/tests/p2p/GridP2PTestTaskExternalPath1.java
@@ -14,7 +14,6 @@ import org.apache.ignite.cluster.*;
 import org.apache.ignite.compute.*;
 import org.apache.ignite.resources.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.util.typedef.*;
 import org.gridgain.grid.util.typedef.internal.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/extdata/p2p/src/main/java/org/gridgain/grid/tests/p2p/GridP2PTestTaskExternalPath2.java
----------------------------------------------------------------------
diff --git 
a/modules/extdata/p2p/src/main/java/org/gridgain/grid/tests/p2p/GridP2PTestTaskExternalPath2.java
 
b/modules/extdata/p2p/src/main/java/org/gridgain/grid/tests/p2p/GridP2PTestTaskExternalPath2.java
index a5e72d5..d7640ef 100644
--- 
a/modules/extdata/p2p/src/main/java/org/gridgain/grid/tests/p2p/GridP2PTestTaskExternalPath2.java
+++ 
b/modules/extdata/p2p/src/main/java/org/gridgain/grid/tests/p2p/GridP2PTestTaskExternalPath2.java
@@ -9,11 +9,11 @@
 
 package org.gridgain.grid.tests.p2p;
 
+import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.compute.*;
 import org.apache.ignite.resources.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.util.typedef.*;
 import org.gridgain.grid.util.typedef.internal.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/extdata/p2p/src/main/java/org/gridgain/grid/tests/p2p/JobStealingTask.java
----------------------------------------------------------------------
diff --git 
a/modules/extdata/p2p/src/main/java/org/gridgain/grid/tests/p2p/JobStealingTask.java
 
b/modules/extdata/p2p/src/main/java/org/gridgain/grid/tests/p2p/JobStealingTask.java
index 703730f..8f91588 100644
--- 
a/modules/extdata/p2p/src/main/java/org/gridgain/grid/tests/p2p/JobStealingTask.java
+++ 
b/modules/extdata/p2p/src/main/java/org/gridgain/grid/tests/p2p/JobStealingTask.java
@@ -5,7 +5,6 @@ import org.apache.ignite.cluster.*;
 import org.apache.ignite.compute.*;
 import org.apache.ignite.resources.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.util.typedef.internal.*;
 import org.jetbrains.annotations.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/hadoop/src/main/java/org/gridgain/grid/hadoop/GridHadoopDefaultJobInfo.java
----------------------------------------------------------------------
diff --git 
a/modules/hadoop/src/main/java/org/gridgain/grid/hadoop/GridHadoopDefaultJobInfo.java
 
b/modules/hadoop/src/main/java/org/gridgain/grid/hadoop/GridHadoopDefaultJobInfo.java
index 881f673..c3e4cf6 100644
--- 
a/modules/hadoop/src/main/java/org/gridgain/grid/hadoop/GridHadoopDefaultJobInfo.java
+++ 
b/modules/hadoop/src/main/java/org/gridgain/grid/hadoop/GridHadoopDefaultJobInfo.java
@@ -9,10 +9,10 @@
 
 package org.gridgain.grid.hadoop;
 
+import org.apache.ignite.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.kernal.processors.hadoop.*;
 import org.gridgain.grid.kernal.processors.hadoop.v2.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.util.typedef.internal.*;
 import org.jetbrains.annotations.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopJclLogger.java
----------------------------------------------------------------------
diff --git 
a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopJclLogger.java
 
b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopJclLogger.java
index 45a548c..3ff13b1 100644
--- 
a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopJclLogger.java
+++ 
b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopJclLogger.java
@@ -10,7 +10,7 @@
 package org.gridgain.grid.kernal.ggfs.hadoop;
 
 import org.apache.commons.logging.*;
-import org.gridgain.grid.logger.*;
+import org.apache.ignite.*;
 import org.jetbrains.annotations.*;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopComponent.java
----------------------------------------------------------------------
diff --git 
a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopComponent.java
 
b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopComponent.java
index 9100fd6..15e279a 100644
--- 
a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopComponent.java
+++ 
b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopComponent.java
@@ -9,8 +9,8 @@
 
 package org.gridgain.grid.kernal.processors.hadoop;
 
+import org.apache.ignite.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.logger.*;
 
 /**
  * Abstract class for all hadoop components.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/planner/GridHadoopDefaultMapReducePlanner.java
----------------------------------------------------------------------
diff --git 
a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/planner/GridHadoopDefaultMapReducePlanner.java
 
b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/planner/GridHadoopDefaultMapReducePlanner.java
index 8b23bd5..ffd14f6 100644
--- 
a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/planner/GridHadoopDefaultMapReducePlanner.java
+++ 
b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/planner/GridHadoopDefaultMapReducePlanner.java
@@ -18,7 +18,6 @@ import org.gridgain.grid.hadoop.*;
 import org.gridgain.grid.kernal.*;
 import org.gridgain.grid.kernal.ggfs.hadoop.*;
 import org.gridgain.grid.kernal.processors.ggfs.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.util.typedef.*;
 import org.gridgain.grid.util.typedef.internal.*;
 import org.jetbrains.annotations.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/shuffle/GridHadoopShuffleJob.java
----------------------------------------------------------------------
diff --git 
a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/shuffle/GridHadoopShuffleJob.java
 
b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/shuffle/GridHadoopShuffleJob.java
index c1b0d54..38e23e1 100644
--- 
a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/shuffle/GridHadoopShuffleJob.java
+++ 
b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/shuffle/GridHadoopShuffleJob.java
@@ -9,12 +9,12 @@
 
 package org.gridgain.grid.kernal.processors.hadoop.shuffle;
 
+import org.apache.ignite.*;
 import org.apache.ignite.lang.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.hadoop.*;
 import org.gridgain.grid.kernal.processors.hadoop.counter.*;
 import org.gridgain.grid.kernal.processors.hadoop.shuffle.collections.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.thread.*;
 import org.gridgain.grid.util.future.*;
 import org.gridgain.grid.util.io.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/GridHadoopExecutorService.java
----------------------------------------------------------------------
diff --git 
a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/GridHadoopExecutorService.java
 
b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/GridHadoopExecutorService.java
index 7331958..9510c8d 100644
--- 
a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/GridHadoopExecutorService.java
+++ 
b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/GridHadoopExecutorService.java
@@ -10,9 +10,9 @@
 package org.gridgain.grid.kernal.processors.hadoop.taskexecutor;
 
 
+import org.apache.ignite.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.hadoop.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.thread.*;
 import org.gridgain.grid.util.worker.*;
 import org.jdk8.backport.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/GridHadoopRunnableTask.java
----------------------------------------------------------------------
diff --git 
a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/GridHadoopRunnableTask.java
 
b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/GridHadoopRunnableTask.java
index 2acaf91..f918bd9 100644
--- 
a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/GridHadoopRunnableTask.java
+++ 
b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/GridHadoopRunnableTask.java
@@ -9,12 +9,12 @@
 
 package org.gridgain.grid.kernal.processors.hadoop.taskexecutor;
 
+import org.apache.ignite.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.hadoop.*;
 import org.gridgain.grid.kernal.processors.hadoop.*;
 import org.gridgain.grid.kernal.processors.hadoop.counter.*;
 import org.gridgain.grid.kernal.processors.hadoop.shuffle.collections.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.util.offheap.unsafe.*;
 import org.gridgain.grid.util.typedef.internal.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/GridHadoopExternalTaskExecutor.java
----------------------------------------------------------------------
diff --git 
a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/GridHadoopExternalTaskExecutor.java
 
b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/GridHadoopExternalTaskExecutor.java
index fc98b9e..547e343 100644
--- 
a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/GridHadoopExternalTaskExecutor.java
+++ 
b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/GridHadoopExternalTaskExecutor.java
@@ -9,6 +9,7 @@
 
 package org.gridgain.grid.kernal.processors.hadoop.taskexecutor.external;
 
+import org.apache.ignite.*;
 import org.apache.ignite.lang.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.hadoop.*;
@@ -19,7 +20,6 @@ import org.gridgain.grid.kernal.processors.hadoop.message.*;
 import org.gridgain.grid.kernal.processors.hadoop.taskexecutor.*;
 import 
org.gridgain.grid.kernal.processors.hadoop.taskexecutor.external.child.*;
 import 
org.gridgain.grid.kernal.processors.hadoop.taskexecutor.external.communication.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.spi.*;
 import org.gridgain.grid.util.*;
 import org.gridgain.grid.util.future.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/child/GridHadoopChildProcessRunner.java
----------------------------------------------------------------------
diff --git 
a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/child/GridHadoopChildProcessRunner.java
 
b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/child/GridHadoopChildProcessRunner.java
index e166e08..a0b44fe 100644
--- 
a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/child/GridHadoopChildProcessRunner.java
+++ 
b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/child/GridHadoopChildProcessRunner.java
@@ -9,6 +9,7 @@
 
 package org.gridgain.grid.kernal.processors.hadoop.taskexecutor.external.child;
 
+import org.apache.ignite.*;
 import org.apache.ignite.lang.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.hadoop.*;
@@ -17,7 +18,6 @@ import org.gridgain.grid.kernal.processors.hadoop.shuffle.*;
 import org.gridgain.grid.kernal.processors.hadoop.taskexecutor.*;
 import org.gridgain.grid.kernal.processors.hadoop.taskexecutor.external.*;
 import 
org.gridgain.grid.kernal.processors.hadoop.taskexecutor.external.communication.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.util.future.*;
 import org.gridgain.grid.util.lang.*;
 import org.gridgain.grid.util.offheap.unsafe.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/child/GridHadoopExternalProcessStarter.java
----------------------------------------------------------------------
diff --git 
a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/child/GridHadoopExternalProcessStarter.java
 
b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/child/GridHadoopExternalProcessStarter.java
index 2d6d4cd..8e0851f 100644
--- 
a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/child/GridHadoopExternalProcessStarter.java
+++ 
b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/child/GridHadoopExternalProcessStarter.java
@@ -9,11 +9,11 @@
 
 package org.gridgain.grid.kernal.processors.hadoop.taskexecutor.external.child;
 
+import org.apache.ignite.*;
 import org.apache.ignite.lang.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.kernal.processors.hadoop.taskexecutor.external.*;
 import 
org.gridgain.grid.kernal.processors.hadoop.taskexecutor.external.communication.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.logger.log4j.*;
 import org.gridgain.grid.marshaller.optimized.*;
 import org.gridgain.grid.util.typedef.internal.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/communication/GridHadoopExternalCommunication.java
----------------------------------------------------------------------
diff --git 
a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/communication/GridHadoopExternalCommunication.java
 
b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/communication/GridHadoopExternalCommunication.java
index a6e86f7..bfe5446 100644
--- 
a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/communication/GridHadoopExternalCommunication.java
+++ 
b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/communication/GridHadoopExternalCommunication.java
@@ -9,10 +9,10 @@
 
 package 
org.gridgain.grid.kernal.processors.hadoop.taskexecutor.external.communication;
 
+import org.apache.ignite.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.kernal.processors.hadoop.message.*;
 import org.gridgain.grid.kernal.processors.hadoop.taskexecutor.external.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.marshaller.*;
 import org.gridgain.grid.thread.*;
 import org.gridgain.grid.util.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/communication/GridHadoopIpcToNioAdapter.java
----------------------------------------------------------------------
diff --git 
a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/communication/GridHadoopIpcToNioAdapter.java
 
b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/communication/GridHadoopIpcToNioAdapter.java
index dff804b..28ce004 100644
--- 
a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/communication/GridHadoopIpcToNioAdapter.java
+++ 
b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/communication/GridHadoopIpcToNioAdapter.java
@@ -9,8 +9,8 @@
 
 package 
org.gridgain.grid.kernal.processors.hadoop.taskexecutor.external.communication;
 
+import org.apache.ignite.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.util.ipc.*;
 import org.gridgain.grid.util.nio.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v2/GridHadoopV2Job.java
----------------------------------------------------------------------
diff --git 
a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v2/GridHadoopV2Job.java
 
b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v2/GridHadoopV2Job.java
index dcb2938..c9d4ecc 100644
--- 
a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v2/GridHadoopV2Job.java
+++ 
b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v2/GridHadoopV2Job.java
@@ -17,12 +17,12 @@ import org.apache.hadoop.mapred.*;
 import org.apache.hadoop.mapred.JobID;
 import org.apache.hadoop.mapreduce.*;
 import org.apache.hadoop.mapreduce.split.*;
+import org.apache.ignite.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.hadoop.*;
 import org.gridgain.grid.kernal.processors.hadoop.*;
 import org.gridgain.grid.kernal.processors.hadoop.fs.*;
 import org.gridgain.grid.kernal.processors.hadoop.v1.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.util.future.*;
 import org.gridgain.grid.util.typedef.*;
 import org.gridgain.grid.util.typedef.internal.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v2/GridHadoopV2JobResourceManager.java
----------------------------------------------------------------------
diff --git 
a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v2/GridHadoopV2JobResourceManager.java
 
b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v2/GridHadoopV2JobResourceManager.java
index 952ccce..f08d0dc 100644
--- 
a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v2/GridHadoopV2JobResourceManager.java
+++ 
b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v2/GridHadoopV2JobResourceManager.java
@@ -13,10 +13,10 @@ import org.apache.hadoop.fs.*;
 import org.apache.hadoop.mapred.*;
 import org.apache.hadoop.mapreduce.MRJobConfig;
 import org.apache.hadoop.util.*;
+import org.apache.ignite.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.hadoop.*;
 import org.gridgain.grid.kernal.processors.hadoop.fs.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.util.typedef.*;
 import org.gridgain.grid.util.typedef.internal.*;
 import org.jetbrains.annotations.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/shuffle/collections/GridHadoopAbstractMapTest.java
----------------------------------------------------------------------
diff --git 
a/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/shuffle/collections/GridHadoopAbstractMapTest.java
 
b/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/shuffle/collections/GridHadoopAbstractMapTest.java
index 64bb83c..8244566 100644
--- 
a/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/shuffle/collections/GridHadoopAbstractMapTest.java
+++ 
b/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/shuffle/collections/GridHadoopAbstractMapTest.java
@@ -11,10 +11,10 @@ package 
org.gridgain.grid.kernal.processors.hadoop.shuffle.collections;
 
 import org.apache.commons.collections.comparators.*;
 import org.apache.hadoop.io.*;
+import org.apache.ignite.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.hadoop.*;
 import org.gridgain.grid.kernal.processors.hadoop.v2.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.testframework.junits.common.*;
 import org.jetbrains.annotations.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/communication/GridHadoopExternalCommunicationSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/communication/GridHadoopExternalCommunicationSelfTest.java
 
b/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/communication/GridHadoopExternalCommunicationSelfTest.java
index 4d2e9a7..1526100 100644
--- 
a/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/communication/GridHadoopExternalCommunicationSelfTest.java
+++ 
b/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/communication/GridHadoopExternalCommunicationSelfTest.java
@@ -9,9 +9,9 @@
 
 package 
org.gridgain.grid.kernal.processors.hadoop.taskexecutor.external.communication;
 
+import org.apache.ignite.*;
 import org.gridgain.grid.kernal.processors.hadoop.message.*;
 import org.gridgain.grid.kernal.processors.hadoop.taskexecutor.external.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.marshaller.*;
 import org.gridgain.grid.marshaller.optimized.*;
 import org.gridgain.grid.util.typedef.internal.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/hibernate/src/main/java/org/gridgain/grid/cache/hibernate/GridHibernateAccessStrategyAdapter.java
----------------------------------------------------------------------
diff --git 
a/modules/hibernate/src/main/java/org/gridgain/grid/cache/hibernate/GridHibernateAccessStrategyAdapter.java
 
b/modules/hibernate/src/main/java/org/gridgain/grid/cache/hibernate/GridHibernateAccessStrategyAdapter.java
index 2685254..1c33809 100644
--- 
a/modules/hibernate/src/main/java/org/gridgain/grid/cache/hibernate/GridHibernateAccessStrategyAdapter.java
+++ 
b/modules/hibernate/src/main/java/org/gridgain/grid/cache/hibernate/GridHibernateAccessStrategyAdapter.java
@@ -13,7 +13,6 @@ import org.apache.ignite.*;
 import org.apache.ignite.resources.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.cache.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.util.typedef.internal.*;
 import org.hibernate.cache.*;
 import org.hibernate.cache.spi.access.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/hibernate/src/main/java/org/gridgain/grid/cache/hibernate/GridHibernateRegionFactory.java
----------------------------------------------------------------------
diff --git 
a/modules/hibernate/src/main/java/org/gridgain/grid/cache/hibernate/GridHibernateRegionFactory.java
 
b/modules/hibernate/src/main/java/org/gridgain/grid/cache/hibernate/GridHibernateRegionFactory.java
index 4e3bbac..df89360 100644
--- 
a/modules/hibernate/src/main/java/org/gridgain/grid/cache/hibernate/GridHibernateRegionFactory.java
+++ 
b/modules/hibernate/src/main/java/org/gridgain/grid/cache/hibernate/GridHibernateRegionFactory.java
@@ -12,7 +12,6 @@ package org.gridgain.grid.cache.hibernate;
 import org.apache.ignite.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.cache.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.util.typedef.*;
 import org.hibernate.cache.*;
 import org.hibernate.cache.spi.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/hibernate/src/main/java/org/gridgain/grid/cache/store/hibernate/GridCacheHibernateBlobStore.java
----------------------------------------------------------------------
diff --git 
a/modules/hibernate/src/main/java/org/gridgain/grid/cache/store/hibernate/GridCacheHibernateBlobStore.java
 
b/modules/hibernate/src/main/java/org/gridgain/grid/cache/store/hibernate/GridCacheHibernateBlobStore.java
index 0cfd627..0ae3b52 100644
--- 
a/modules/hibernate/src/main/java/org/gridgain/grid/cache/store/hibernate/GridCacheHibernateBlobStore.java
+++ 
b/modules/hibernate/src/main/java/org/gridgain/grid/cache/store/hibernate/GridCacheHibernateBlobStore.java
@@ -9,11 +9,11 @@
 
 package org.gridgain.grid.cache.store.hibernate;
 
+import org.apache.ignite.*;
 import org.apache.ignite.resources.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.cache.*;
 import org.gridgain.grid.cache.store.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.marshaller.*;
 import org.gridgain.grid.util.typedef.*;
 import org.gridgain.grid.util.typedef.internal.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/indexing/src/main/java/org/gridgain/grid/spi/indexing/h2/GridH2IndexingSpi.java
----------------------------------------------------------------------
diff --git 
a/modules/indexing/src/main/java/org/gridgain/grid/spi/indexing/h2/GridH2IndexingSpi.java
 
b/modules/indexing/src/main/java/org/gridgain/grid/spi/indexing/h2/GridH2IndexingSpi.java
index 3c728c5..acb0004 100644
--- 
a/modules/indexing/src/main/java/org/gridgain/grid/spi/indexing/h2/GridH2IndexingSpi.java
+++ 
b/modules/indexing/src/main/java/org/gridgain/grid/spi/indexing/h2/GridH2IndexingSpi.java
@@ -9,10 +9,10 @@
 
 package org.gridgain.grid.spi.indexing.h2;
 
+import org.apache.ignite.*;
 import org.apache.ignite.resources.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.cache.query.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.marshaller.*;
 import org.gridgain.grid.spi.*;
 import org.gridgain.grid.spi.indexing.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/indexing/src/test/java/org/gridgain/grid/spi/indexing/GridIndexingSpiAbstractSelfTest.java
----------------------------------------------------------------------
diff --git 
a/modules/indexing/src/test/java/org/gridgain/grid/spi/indexing/GridIndexingSpiAbstractSelfTest.java
 
b/modules/indexing/src/test/java/org/gridgain/grid/spi/indexing/GridIndexingSpiAbstractSelfTest.java
index a4f0069..4a4f38b 100644
--- 
a/modules/indexing/src/test/java/org/gridgain/grid/spi/indexing/GridIndexingSpiAbstractSelfTest.java
+++ 
b/modules/indexing/src/test/java/org/gridgain/grid/spi/indexing/GridIndexingSpiAbstractSelfTest.java
@@ -9,8 +9,8 @@
 
 package org.gridgain.grid.spi.indexing;
 
+import org.apache.ignite.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.marshaller.*;
 import org.gridgain.grid.spi.*;
 import org.gridgain.grid.spi.indexing.h2.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/jcl/src/main/java/org/gridgain/grid/logger/jcl/GridJclLogger.java
----------------------------------------------------------------------
diff --git 
a/modules/jcl/src/main/java/org/gridgain/grid/logger/jcl/GridJclLogger.java 
b/modules/jcl/src/main/java/org/gridgain/grid/logger/jcl/GridJclLogger.java
index e53611e..e82da2f 100644
--- a/modules/jcl/src/main/java/org/gridgain/grid/logger/jcl/GridJclLogger.java
+++ b/modules/jcl/src/main/java/org/gridgain/grid/logger/jcl/GridJclLogger.java
@@ -10,7 +10,7 @@
 package org.gridgain.grid.logger.jcl;
 
 import org.apache.commons.logging.*;
-import org.gridgain.grid.logger.*;
+import org.apache.ignite.*;
 import org.gridgain.grid.util.lang.*;
 import org.jetbrains.annotations.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/jcl/src/test/java/org/gridgain/grid/logger/jcl/GridJclLoggerTest.java
----------------------------------------------------------------------
diff --git 
a/modules/jcl/src/test/java/org/gridgain/grid/logger/jcl/GridJclLoggerTest.java 
b/modules/jcl/src/test/java/org/gridgain/grid/logger/jcl/GridJclLoggerTest.java
index 9c5de8a..5619269 100644
--- 
a/modules/jcl/src/test/java/org/gridgain/grid/logger/jcl/GridJclLoggerTest.java
+++ 
b/modules/jcl/src/test/java/org/gridgain/grid/logger/jcl/GridJclLoggerTest.java
@@ -11,7 +11,7 @@ package org.gridgain.grid.logger.jcl;
 
 import junit.framework.*;
 import org.apache.commons.logging.*;
-import org.gridgain.grid.logger.*;
+import org.apache.ignite.*;
 import org.gridgain.testframework.junits.common.*;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/jta/src/main/java/org/gridgain/grid/kernal/processors/cache/jta/GridCacheXAResource.java
----------------------------------------------------------------------
diff --git 
a/modules/jta/src/main/java/org/gridgain/grid/kernal/processors/cache/jta/GridCacheXAResource.java
 
b/modules/jta/src/main/java/org/gridgain/grid/kernal/processors/cache/jta/GridCacheXAResource.java
index 2daaf7c..c8bf226 100644
--- 
a/modules/jta/src/main/java/org/gridgain/grid/kernal/processors/cache/jta/GridCacheXAResource.java
+++ 
b/modules/jta/src/main/java/org/gridgain/grid/kernal/processors/cache/jta/GridCacheXAResource.java
@@ -9,10 +9,10 @@
 
 package org.gridgain.grid.kernal.processors.cache.jta;
 
+import org.apache.ignite.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.cache.*;
 import org.gridgain.grid.kernal.processors.cache.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.util.typedef.internal.*;
 
 import javax.transaction.xa.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/log4j/src/main/java/org/gridgain/grid/logger/log4j/GridLog4jLogger.java
----------------------------------------------------------------------
diff --git 
a/modules/log4j/src/main/java/org/gridgain/grid/logger/log4j/GridLog4jLogger.java
 
b/modules/log4j/src/main/java/org/gridgain/grid/logger/log4j/GridLog4jLogger.java
index ec81d0a..526bf45 100644
--- 
a/modules/log4j/src/main/java/org/gridgain/grid/logger/log4j/GridLog4jLogger.java
+++ 
b/modules/log4j/src/main/java/org/gridgain/grid/logger/log4j/GridLog4jLogger.java
@@ -9,6 +9,7 @@
 
 package org.gridgain.grid.logger.log4j;
 
+import org.apache.ignite.*;
 import org.apache.ignite.lang.*;
 import org.apache.log4j.*;
 import org.apache.log4j.varia.*;
@@ -417,13 +418,13 @@ public class GridLog4jLogger extends 
GridMetadataAwareAdapter implements IgniteL
     }
 
     /**
-     * Gets {@link org.gridgain.grid.logger.IgniteLogger} wrapper around log4j 
logger for the given
+     * Gets {@link org.apache.ignite.IgniteLogger} wrapper around log4j logger 
for the given
      * category. If category is {@code null}, then root logger is returned. If
      * category is an instance of {@link Class} then {@code 
(Class)ctgr).getName()}
      * is used as category name.
      *
      * @param ctgr {@inheritDoc}
-     * @return {@link org.gridgain.grid.logger.IgniteLogger} wrapper around 
log4j logger.
+     * @return {@link org.apache.ignite.IgniteLogger} wrapper around log4j 
logger.
      */
     @Override public GridLog4jLogger getLogger(Object ctgr) {
         return new GridLog4jLogger(ctgr == null ? Logger.getRootLogger() :

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/log4j/src/test/java/org/gridgain/grid/logger/log4j/GridLog4jInitializedTest.java
----------------------------------------------------------------------
diff --git 
a/modules/log4j/src/test/java/org/gridgain/grid/logger/log4j/GridLog4jInitializedTest.java
 
b/modules/log4j/src/test/java/org/gridgain/grid/logger/log4j/GridLog4jInitializedTest.java
index a4beead..c092abe 100644
--- 
a/modules/log4j/src/test/java/org/gridgain/grid/logger/log4j/GridLog4jInitializedTest.java
+++ 
b/modules/log4j/src/test/java/org/gridgain/grid/logger/log4j/GridLog4jInitializedTest.java
@@ -10,8 +10,8 @@
 package org.gridgain.grid.logger.log4j;
 
 import junit.framework.*;
+import org.apache.ignite.*;
 import org.apache.log4j.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.testframework.junits.common.*;
 
 /**

Reply via email to